From: Matt Corallo Date: Fri, 12 Aug 2022 23:18:41 +0000 (+0000) Subject: [TS] Update auto-generated TS bindings X-Git-Tag: v0.0.110.2~1^2~1 X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=f6d7282fcf6324519ea1fe4b584c8d02c95acd9e;p=ldk-java [TS] Update auto-generated TS bindings --- diff --git a/ts/bindings.c b/ts/bindings.c index 27d8f80f..fec9d658 100644 --- a/ts/bindings.c +++ b/ts/bindings.c @@ -50,6 +50,7 @@ _Static_assert(sizeof(void*) == 4, "Pointers mut be 32 bits"); } DECL_ARR_TYPE(int64_t, int64_t); +DECL_ARR_TYPE(uint64_t, uint64_t); DECL_ARR_TYPE(int8_t, int8_t); DECL_ARR_TYPE(uint32_t, uint32_t); DECL_ARR_TYPE(void*, ptr); @@ -94,6 +95,62 @@ jstring __attribute__((export_name("TS_get_ldk_version"))) get_ldk_version() { } #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 void* untag_ptr(uint64_t ptr) { + if (ptr < 4096) return (void*)ptr; + if (sizeof(void*) == 4) { + // For 32-bit systems, store pointers as 64-bit ints and use the 31st bit + return (void*)(uintptr_t)ptr; + } else { + // For 64-bit systems, assume the top byte is used for tagging, then + // use bit 9 ^ bit 10. + uint64_t tenth_bit = (((uintptr_t)ptr) & (1ULL << 54)) >> 54; + uintptr_t p = (ptr & ~(1ULL << 55)) | (tenth_bit << 55); +#ifdef LDK_DEBUG_BUILD + // On debug builds we also use the 11th bit as a debug flag + uintptr_t eleventh_bit = (((uintptr_t)ptr) & (1ULL << 53)) >> 53; + CHECK(tenth_bit != eleventh_bit); + p ^= 1ULL << 53; +#endif + return (void*)p; + } +} +static inline bool ptr_is_owned(uint64_t ptr) { + if(ptr < 4096) return true; + if (sizeof(void*) == 4) { + return ptr & (1ULL << 32); + } else { + uintptr_t ninth_bit = (((uintptr_t)ptr) & (1ULL << 55)) >> 55; + uintptr_t tenth_bit = (((uintptr_t)ptr) & (1ULL << 54)) >> 54; +#ifdef LDK_DEBUG_BUILD + // On debug builds we also use the 11th bit as a debug flag + uintptr_t eleventh_bit = (((uintptr_t)ptr) & (1ULL << 53)) >> 53; + CHECK(tenth_bit != eleventh_bit); +#endif + return (ninth_bit ^ tenth_bit) ? true : false; + } +} +static inline uint64_t tag_ptr(const void* ptr, bool is_owned) { + if ((uintptr_t)ptr < 4096) return (uint64_t)ptr; + if (sizeof(void*) == 4) { + return (((uint64_t)ptr) | ((is_owned ? 1ULL : 0) << 32)); + } else { + CHECK(sizeof(uintptr_t) == 8); + uintptr_t tenth_bit = (((uintptr_t)ptr) & (1ULL << 54)) >> 54; + uintptr_t t = (((uintptr_t)ptr) | (((is_owned ? 1ULL : 0ULL) ^ tenth_bit) << 55)); +#ifdef LDK_DEBUG_BUILD + uintptr_t ninth_bit = (((uintptr_t)ptr) & (1ULL << 55)) >> 55; + uintptr_t eleventh_bit = (((uintptr_t)ptr) & (1ULL << 53)) >> 53; + CHECK(ninth_bit == tenth_bit); + CHECK(ninth_bit == eleventh_bit); + t ^= 1ULL << 53; +#endif + CHECK(ptr_is_owned(t) == is_owned); + CHECK(untag_ptr(t) == ptr); + return t; + } +} + static inline LDKAccessError LDKAccessError_from_js(int32_t ord) { switch (ord) { case 0: return LDKAccessError_UnknownChain; @@ -372,8 +429,8 @@ static inline int32_t LDKSiPrefix_to_js(LDKSiPrefix val) { default: abort(); } } -uint32_t __attribute__((export_name("TS_LDKBech32Error_ty_from_ptr"))) TS_LDKBech32Error_ty_from_ptr(uint32_t ptr) { - LDKBech32Error *obj = (LDKBech32Error*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKBech32Error_ty_from_ptr"))) TS_LDKBech32Error_ty_from_ptr(uint64_t ptr) { + LDKBech32Error *obj = (LDKBech32Error*)untag_ptr(ptr); switch(obj->tag) { case LDKBech32Error_MissingSeparator: return 0; case LDKBech32Error_InvalidChecksum: return 1; @@ -385,14 +442,14 @@ uint32_t __attribute__((export_name("TS_LDKBech32Error_ty_from_ptr"))) TS_LDKBec default: abort(); } } -int32_t __attribute__((export_name("TS_LDKBech32Error_InvalidChar_get_invalid_char"))) TS_LDKBech32Error_InvalidChar_get_invalid_char(uint32_t ptr) { - LDKBech32Error *obj = (LDKBech32Error*)(ptr & ~1); +int32_t __attribute__((export_name("TS_LDKBech32Error_InvalidChar_get_invalid_char"))) TS_LDKBech32Error_InvalidChar_get_invalid_char(uint64_t ptr) { + LDKBech32Error *obj = (LDKBech32Error*)untag_ptr(ptr); assert(obj->tag == LDKBech32Error_InvalidChar); int32_t invalid_char_conv = obj->invalid_char; return invalid_char_conv; } -int8_t __attribute__((export_name("TS_LDKBech32Error_InvalidData_get_invalid_data"))) TS_LDKBech32Error_InvalidData_get_invalid_data(uint32_t ptr) { - LDKBech32Error *obj = (LDKBech32Error*)(ptr & ~1); +int8_t __attribute__((export_name("TS_LDKBech32Error_InvalidData_get_invalid_data"))) TS_LDKBech32Error_InvalidData_get_invalid_data(uint64_t ptr) { + LDKBech32Error *obj = (LDKBech32Error*)untag_ptr(ptr); assert(obj->tag == LDKBech32Error_InvalidData); int8_t invalid_data_conv = obj->invalid_data; return invalid_data_conv; @@ -402,8 +459,8 @@ static inline LDKCVec_u8Z CVec_u8Z_clone(const LDKCVec_u8Z *orig) { memcpy(ret.data, orig->data, sizeof(int8_t) * ret.datalen); return ret; } -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); +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(uint64_t thing) { + LDKTxOut* thing_conv = (LDKTxOut*)untag_ptr(thing); LDKCVec_u8Z ret_var = TxOut_get_script_pubkey(thing_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -411,8 +468,8 @@ struct LDKCVec_u8Z TxOut_get_script_pubkey (struct LDKTxOut* thing) { return CVe return ret_arr; } -uint64_t TxOut_get_value (struct LDKTxOut* thing) { return thing->value;}int64_t __attribute__((export_name("TS_TxOut_get_value"))) TS_TxOut_get_value(uint32_t thing) { - LDKTxOut* thing_conv = (LDKTxOut*)(thing & ~1); +uint64_t TxOut_get_value (struct LDKTxOut* thing) { return thing->value;}int64_t __attribute__((export_name("TS_TxOut_get_value"))) TS_TxOut_get_value(uint64_t thing) { + LDKTxOut* thing_conv = (LDKTxOut*)untag_ptr(thing); int64_t ret_conv = TxOut_get_value(thing_conv); return ret_conv; } @@ -421,8 +478,8 @@ static inline void CResult_NoneNoneZ_get_ok(LDKCResult_NoneNoneZ *NONNULL_PTR ow CHECK(owner->result_ok); return *owner->contents.result; } -void __attribute__((export_name("TS_CResult_NoneNoneZ_get_ok"))) TS_CResult_NoneNoneZ_get_ok(uint32_t owner) { - LDKCResult_NoneNoneZ* owner_conv = (LDKCResult_NoneNoneZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_NoneNoneZ_get_ok"))) TS_CResult_NoneNoneZ_get_ok(uint64_t owner) { + LDKCResult_NoneNoneZ* owner_conv = (LDKCResult_NoneNoneZ*)untag_ptr(owner); CResult_NoneNoneZ_get_ok(owner_conv); } @@ -430,8 +487,8 @@ static inline void CResult_NoneNoneZ_get_err(LDKCResult_NoneNoneZ *NONNULL_PTR o CHECK(!owner->result_ok); return *owner->contents.err; } -void __attribute__((export_name("TS_CResult_NoneNoneZ_get_err"))) TS_CResult_NoneNoneZ_get_err(uint32_t owner) { - LDKCResult_NoneNoneZ* owner_conv = (LDKCResult_NoneNoneZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_NoneNoneZ_get_err"))) TS_CResult_NoneNoneZ_get_err(uint64_t owner) { + LDKCResult_NoneNoneZ* owner_conv = (LDKCResult_NoneNoneZ*)untag_ptr(owner); CResult_NoneNoneZ_get_err(owner_conv); } @@ -439,17 +496,12 @@ static inline struct LDKCounterpartyCommitmentSecrets CResult_CounterpartyCommit CHECK(owner->result_ok); return CounterpartyCommitmentSecrets_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_get_ok"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* owner_conv = (LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_get_ok"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* owner_conv = (LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ*)untag_ptr(owner); LDKCounterpartyCommitmentSecrets ret_var = CResult_CounterpartyCommitmentSecretsDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -457,17 +509,12 @@ static inline struct LDKDecodeError CResult_CounterpartyCommitmentSecretsDecodeE CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_get_err"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_get_err(uint32_t owner) { - LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* owner_conv = (LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_get_err"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* owner_conv = (LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_CounterpartyCommitmentSecretsDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -475,8 +522,8 @@ static inline struct LDKSecretKey CResult_SecretKeyErrorZ_get_ok(LDKCResult_Secr CHECK(owner->result_ok); return *owner->contents.result; } -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 __attribute__((export_name("TS_CResult_SecretKeyErrorZ_get_ok"))) TS_CResult_SecretKeyErrorZ_get_ok(uint64_t owner) { + LDKCResult_SecretKeyErrorZ* owner_conv = (LDKCResult_SecretKeyErrorZ*)untag_ptr(owner); int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, CResult_SecretKeyErrorZ_get_ok(owner_conv).bytes, 32); return ret_arr; @@ -486,8 +533,8 @@ static inline enum LDKSecp256k1Error CResult_SecretKeyErrorZ_get_err(LDKCResult_ CHECK(!owner->result_ok); return *owner->contents.err; } -uint32_t __attribute__((export_name("TS_CResult_SecretKeyErrorZ_get_err"))) TS_CResult_SecretKeyErrorZ_get_err(uint32_t owner) { - LDKCResult_SecretKeyErrorZ* owner_conv = (LDKCResult_SecretKeyErrorZ*)(owner & ~1); +uint32_t __attribute__((export_name("TS_CResult_SecretKeyErrorZ_get_err"))) TS_CResult_SecretKeyErrorZ_get_err(uint64_t owner) { + LDKCResult_SecretKeyErrorZ* owner_conv = (LDKCResult_SecretKeyErrorZ*)untag_ptr(owner); uint32_t ret_conv = LDKSecp256k1Error_to_js(CResult_SecretKeyErrorZ_get_err(owner_conv)); return ret_conv; } @@ -496,8 +543,8 @@ static inline struct LDKPublicKey CResult_PublicKeyErrorZ_get_ok(LDKCResult_Publ CHECK(owner->result_ok); return *owner->contents.result; } -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 __attribute__((export_name("TS_CResult_PublicKeyErrorZ_get_ok"))) TS_CResult_PublicKeyErrorZ_get_ok(uint64_t owner) { + LDKCResult_PublicKeyErrorZ* owner_conv = (LDKCResult_PublicKeyErrorZ*)untag_ptr(owner); 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; @@ -507,8 +554,8 @@ static inline enum LDKSecp256k1Error CResult_PublicKeyErrorZ_get_err(LDKCResult_ CHECK(!owner->result_ok); return *owner->contents.err; } -uint32_t __attribute__((export_name("TS_CResult_PublicKeyErrorZ_get_err"))) TS_CResult_PublicKeyErrorZ_get_err(uint32_t owner) { - LDKCResult_PublicKeyErrorZ* owner_conv = (LDKCResult_PublicKeyErrorZ*)(owner & ~1); +uint32_t __attribute__((export_name("TS_CResult_PublicKeyErrorZ_get_err"))) TS_CResult_PublicKeyErrorZ_get_err(uint64_t owner) { + LDKCResult_PublicKeyErrorZ* owner_conv = (LDKCResult_PublicKeyErrorZ*)untag_ptr(owner); uint32_t ret_conv = LDKSecp256k1Error_to_js(CResult_PublicKeyErrorZ_get_err(owner_conv)); return ret_conv; } @@ -517,17 +564,12 @@ static inline struct LDKTxCreationKeys CResult_TxCreationKeysDecodeErrorZ_get_ok CHECK(owner->result_ok); return TxCreationKeys_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_get_ok"))) TS_CResult_TxCreationKeysDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_TxCreationKeysDecodeErrorZ* owner_conv = (LDKCResult_TxCreationKeysDecodeErrorZ*)untag_ptr(owner); LDKTxCreationKeys ret_var = CResult_TxCreationKeysDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -535,17 +577,12 @@ static inline struct LDKDecodeError CResult_TxCreationKeysDecodeErrorZ_get_err(L CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_get_err"))) TS_CResult_TxCreationKeysDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_TxCreationKeysDecodeErrorZ* owner_conv = (LDKCResult_TxCreationKeysDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_TxCreationKeysDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -553,17 +590,12 @@ static inline struct LDKChannelPublicKeys CResult_ChannelPublicKeysDecodeErrorZ_ CHECK(owner->result_ok); return ChannelPublicKeys_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_get_ok"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ChannelPublicKeysDecodeErrorZ* owner_conv = (LDKCResult_ChannelPublicKeysDecodeErrorZ*)untag_ptr(owner); LDKChannelPublicKeys ret_var = CResult_ChannelPublicKeysDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -571,17 +603,12 @@ static inline struct LDKDecodeError CResult_ChannelPublicKeysDecodeErrorZ_get_er CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_get_err"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ChannelPublicKeysDecodeErrorZ* owner_conv = (LDKCResult_ChannelPublicKeysDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ChannelPublicKeysDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -589,17 +616,12 @@ static inline struct LDKTxCreationKeys CResult_TxCreationKeysErrorZ_get_ok(LDKCR CHECK(owner->result_ok); return TxCreationKeys_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_get_ok"))) TS_CResult_TxCreationKeysErrorZ_get_ok(uint64_t owner) { + LDKCResult_TxCreationKeysErrorZ* owner_conv = (LDKCResult_TxCreationKeysErrorZ*)untag_ptr(owner); LDKTxCreationKeys ret_var = CResult_TxCreationKeysErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -607,22 +629,22 @@ static inline enum LDKSecp256k1Error CResult_TxCreationKeysErrorZ_get_err(LDKCRe CHECK(!owner->result_ok); return *owner->contents.err; } -uint32_t __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_get_err"))) TS_CResult_TxCreationKeysErrorZ_get_err(uint32_t owner) { - LDKCResult_TxCreationKeysErrorZ* owner_conv = (LDKCResult_TxCreationKeysErrorZ*)(owner & ~1); +uint32_t __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_get_err"))) TS_CResult_TxCreationKeysErrorZ_get_err(uint64_t owner) { + LDKCResult_TxCreationKeysErrorZ* owner_conv = (LDKCResult_TxCreationKeysErrorZ*)untag_ptr(owner); uint32_t ret_conv = LDKSecp256k1Error_to_js(CResult_TxCreationKeysErrorZ_get_err(owner_conv)); return ret_conv; } -uint32_t __attribute__((export_name("TS_LDKCOption_u32Z_ty_from_ptr"))) TS_LDKCOption_u32Z_ty_from_ptr(uint32_t ptr) { - LDKCOption_u32Z *obj = (LDKCOption_u32Z*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKCOption_u32Z_ty_from_ptr"))) TS_LDKCOption_u32Z_ty_from_ptr(uint64_t ptr) { + LDKCOption_u32Z *obj = (LDKCOption_u32Z*)untag_ptr(ptr); switch(obj->tag) { case LDKCOption_u32Z_Some: return 0; case LDKCOption_u32Z_None: return 1; default: abort(); } } -int32_t __attribute__((export_name("TS_LDKCOption_u32Z_Some_get_some"))) TS_LDKCOption_u32Z_Some_get_some(uint32_t ptr) { - LDKCOption_u32Z *obj = (LDKCOption_u32Z*)(ptr & ~1); +int32_t __attribute__((export_name("TS_LDKCOption_u32Z_Some_get_some"))) TS_LDKCOption_u32Z_Some_get_some(uint64_t ptr) { + LDKCOption_u32Z *obj = (LDKCOption_u32Z*)untag_ptr(ptr); assert(obj->tag == LDKCOption_u32Z_Some); int32_t some_conv = obj->some; return some_conv; @@ -631,17 +653,12 @@ static inline struct LDKHTLCOutputInCommitment CResult_HTLCOutputInCommitmentDec CHECK(owner->result_ok); return HTLCOutputInCommitment_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_get_ok"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* owner_conv = (LDKCResult_HTLCOutputInCommitmentDecodeErrorZ*)untag_ptr(owner); LDKHTLCOutputInCommitment ret_var = CResult_HTLCOutputInCommitmentDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -649,17 +666,12 @@ static inline struct LDKDecodeError CResult_HTLCOutputInCommitmentDecodeErrorZ_g CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_get_err"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* owner_conv = (LDKCResult_HTLCOutputInCommitmentDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_HTLCOutputInCommitmentDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -667,17 +679,12 @@ static inline struct LDKCounterpartyChannelTransactionParameters CResult_Counter CHECK(owner->result_ok); return CounterpartyChannelTransactionParameters_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_get_ok"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* owner_conv = (LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ*)untag_ptr(owner); LDKCounterpartyChannelTransactionParameters ret_var = CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -685,17 +692,12 @@ static inline struct LDKDecodeError CResult_CounterpartyChannelTransactionParame CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_get_err"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* owner_conv = (LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -703,17 +705,12 @@ static inline struct LDKChannelTransactionParameters CResult_ChannelTransactionP CHECK(owner->result_ok); return ChannelTransactionParameters_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_get_ok"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ChannelTransactionParametersDecodeErrorZ* owner_conv = (LDKCResult_ChannelTransactionParametersDecodeErrorZ*)untag_ptr(owner); LDKChannelTransactionParameters ret_var = CResult_ChannelTransactionParametersDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -721,17 +718,12 @@ static inline struct LDKDecodeError CResult_ChannelTransactionParametersDecodeEr CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_get_err"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ChannelTransactionParametersDecodeErrorZ* owner_conv = (LDKCResult_ChannelTransactionParametersDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ChannelTransactionParametersDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -739,17 +731,12 @@ static inline struct LDKHolderCommitmentTransaction CResult_HolderCommitmentTran CHECK(owner->result_ok); return HolderCommitmentTransaction_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_get_ok"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_HolderCommitmentTransactionDecodeErrorZ* owner_conv = (LDKCResult_HolderCommitmentTransactionDecodeErrorZ*)untag_ptr(owner); LDKHolderCommitmentTransaction ret_var = CResult_HolderCommitmentTransactionDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -757,17 +744,12 @@ static inline struct LDKDecodeError CResult_HolderCommitmentTransactionDecodeErr CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_get_err"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_HolderCommitmentTransactionDecodeErrorZ* owner_conv = (LDKCResult_HolderCommitmentTransactionDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_HolderCommitmentTransactionDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -775,17 +757,12 @@ static inline struct LDKBuiltCommitmentTransaction CResult_BuiltCommitmentTransa CHECK(owner->result_ok); return BuiltCommitmentTransaction_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_get_ok"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* owner_conv = (LDKCResult_BuiltCommitmentTransactionDecodeErrorZ*)untag_ptr(owner); LDKBuiltCommitmentTransaction ret_var = CResult_BuiltCommitmentTransactionDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -793,17 +770,12 @@ static inline struct LDKDecodeError CResult_BuiltCommitmentTransactionDecodeErro CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_get_err"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* owner_conv = (LDKCResult_BuiltCommitmentTransactionDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_BuiltCommitmentTransactionDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -811,14 +783,12 @@ static inline struct LDKTrustedClosingTransaction *CResult_TrustedClosingTransac CHECK(owner->result_ok); return &*owner->contents.result; } -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); +uint64_t __attribute__((export_name("TS_CResult_TrustedClosingTransactionNoneZ_get_ok"))) TS_CResult_TrustedClosingTransactionNoneZ_get_ok(uint64_t owner) { + LDKCResult_TrustedClosingTransactionNoneZ* owner_conv = (LDKCResult_TrustedClosingTransactionNoneZ*)untag_ptr(owner); LDKTrustedClosingTransaction ret_var = *CResult_TrustedClosingTransactionNoneZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner & ~1; + ret_ref = tag_ptr(ret_var.inner, false); return ret_ref; } @@ -826,8 +796,8 @@ static inline void CResult_TrustedClosingTransactionNoneZ_get_err(LDKCResult_Tru CHECK(!owner->result_ok); return *owner->contents.err; } -void __attribute__((export_name("TS_CResult_TrustedClosingTransactionNoneZ_get_err"))) TS_CResult_TrustedClosingTransactionNoneZ_get_err(uint32_t owner) { - LDKCResult_TrustedClosingTransactionNoneZ* owner_conv = (LDKCResult_TrustedClosingTransactionNoneZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_TrustedClosingTransactionNoneZ_get_err"))) TS_CResult_TrustedClosingTransactionNoneZ_get_err(uint64_t owner) { + LDKCResult_TrustedClosingTransactionNoneZ* owner_conv = (LDKCResult_TrustedClosingTransactionNoneZ*)untag_ptr(owner); CResult_TrustedClosingTransactionNoneZ_get_err(owner_conv); } @@ -835,17 +805,12 @@ static inline struct LDKCommitmentTransaction CResult_CommitmentTransactionDecod CHECK(owner->result_ok); return CommitmentTransaction_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_get_ok"))) TS_CResult_CommitmentTransactionDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_CommitmentTransactionDecodeErrorZ* owner_conv = (LDKCResult_CommitmentTransactionDecodeErrorZ*)untag_ptr(owner); LDKCommitmentTransaction ret_var = CResult_CommitmentTransactionDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -853,17 +818,12 @@ static inline struct LDKDecodeError CResult_CommitmentTransactionDecodeErrorZ_ge CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_get_err"))) TS_CResult_CommitmentTransactionDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_CommitmentTransactionDecodeErrorZ* owner_conv = (LDKCResult_CommitmentTransactionDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_CommitmentTransactionDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -871,14 +831,12 @@ static inline struct LDKTrustedCommitmentTransaction *CResult_TrustedCommitmentT CHECK(owner->result_ok); return &*owner->contents.result; } -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); +uint64_t __attribute__((export_name("TS_CResult_TrustedCommitmentTransactionNoneZ_get_ok"))) TS_CResult_TrustedCommitmentTransactionNoneZ_get_ok(uint64_t owner) { + LDKCResult_TrustedCommitmentTransactionNoneZ* owner_conv = (LDKCResult_TrustedCommitmentTransactionNoneZ*)untag_ptr(owner); LDKTrustedCommitmentTransaction ret_var = *CResult_TrustedCommitmentTransactionNoneZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner & ~1; + ret_ref = tag_ptr(ret_var.inner, false); return ret_ref; } @@ -886,8 +844,8 @@ static inline void CResult_TrustedCommitmentTransactionNoneZ_get_err(LDKCResult_ CHECK(!owner->result_ok); return *owner->contents.err; } -void __attribute__((export_name("TS_CResult_TrustedCommitmentTransactionNoneZ_get_err"))) TS_CResult_TrustedCommitmentTransactionNoneZ_get_err(uint32_t owner) { - LDKCResult_TrustedCommitmentTransactionNoneZ* owner_conv = (LDKCResult_TrustedCommitmentTransactionNoneZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_TrustedCommitmentTransactionNoneZ_get_err"))) TS_CResult_TrustedCommitmentTransactionNoneZ_get_err(uint64_t owner) { + LDKCResult_TrustedCommitmentTransactionNoneZ* owner_conv = (LDKCResult_TrustedCommitmentTransactionNoneZ*)untag_ptr(owner); CResult_TrustedCommitmentTransactionNoneZ_get_err(owner_conv); } @@ -895,8 +853,8 @@ static inline struct LDKCVec_SignatureZ CResult_CVec_SignatureZNoneZ_get_ok(LDKC CHECK(owner->result_ok); return *owner->contents.result; } -ptrArray __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_get_ok"))) TS_CResult_CVec_SignatureZNoneZ_get_ok(uint32_t owner) { - LDKCResult_CVec_SignatureZNoneZ* owner_conv = (LDKCResult_CVec_SignatureZNoneZ*)(owner & ~1); +ptrArray __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_get_ok"))) TS_CResult_CVec_SignatureZNoneZ_get_ok(uint64_t owner) { + LDKCResult_CVec_SignatureZNoneZ* owner_conv = (LDKCResult_CVec_SignatureZNoneZ*)untag_ptr(owner); LDKCVec_SignatureZ ret_var = CResult_CVec_SignatureZNoneZ_get_ok(owner_conv); ptrArray ret_arr = NULL; ret_arr = init_ptrArray(ret_var.datalen, __LINE__); @@ -914,8 +872,8 @@ static inline void CResult_CVec_SignatureZNoneZ_get_err(LDKCResult_CVec_Signatur CHECK(!owner->result_ok); return *owner->contents.err; } -void __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_get_err"))) TS_CResult_CVec_SignatureZNoneZ_get_err(uint32_t owner) { - LDKCResult_CVec_SignatureZNoneZ* owner_conv = (LDKCResult_CVec_SignatureZNoneZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_get_err"))) TS_CResult_CVec_SignatureZNoneZ_get_err(uint64_t owner) { + LDKCResult_CVec_SignatureZNoneZ* owner_conv = (LDKCResult_CVec_SignatureZNoneZ*)untag_ptr(owner); CResult_CVec_SignatureZNoneZ_get_err(owner_conv); } @@ -923,17 +881,12 @@ static inline struct LDKShutdownScript CResult_ShutdownScriptDecodeErrorZ_get_ok CHECK(owner->result_ok); return ShutdownScript_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_get_ok"))) TS_CResult_ShutdownScriptDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ShutdownScriptDecodeErrorZ* owner_conv = (LDKCResult_ShutdownScriptDecodeErrorZ*)untag_ptr(owner); LDKShutdownScript ret_var = CResult_ShutdownScriptDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -941,17 +894,12 @@ static inline struct LDKDecodeError CResult_ShutdownScriptDecodeErrorZ_get_err(L CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_get_err"))) TS_CResult_ShutdownScriptDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ShutdownScriptDecodeErrorZ* owner_conv = (LDKCResult_ShutdownScriptDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ShutdownScriptDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -959,17 +907,12 @@ static inline struct LDKShutdownScript CResult_ShutdownScriptInvalidShutdownScri CHECK(owner->result_ok); return ShutdownScript_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_get_ok"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_get_ok(uint64_t owner) { + LDKCResult_ShutdownScriptInvalidShutdownScriptZ* owner_conv = (LDKCResult_ShutdownScriptInvalidShutdownScriptZ*)untag_ptr(owner); LDKShutdownScript ret_var = CResult_ShutdownScriptInvalidShutdownScriptZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -977,17 +920,12 @@ static inline struct LDKInvalidShutdownScript CResult_ShutdownScriptInvalidShutd CHECK(!owner->result_ok); return InvalidShutdownScript_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_get_err"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_get_err(uint64_t owner) { + LDKCResult_ShutdownScriptInvalidShutdownScriptZ* owner_conv = (LDKCResult_ShutdownScriptInvalidShutdownScriptZ*)untag_ptr(owner); LDKInvalidShutdownScript ret_var = CResult_ShutdownScriptInvalidShutdownScriptZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -995,17 +933,12 @@ static inline struct LDKRouteHop CResult_RouteHopDecodeErrorZ_get_ok(LDKCResult_ CHECK(owner->result_ok); return RouteHop_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_get_ok"))) TS_CResult_RouteHopDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_RouteHopDecodeErrorZ* owner_conv = (LDKCResult_RouteHopDecodeErrorZ*)untag_ptr(owner); LDKRouteHop ret_var = CResult_RouteHopDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -1013,17 +946,12 @@ static inline struct LDKDecodeError CResult_RouteHopDecodeErrorZ_get_err(LDKCRes CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_get_err"))) TS_CResult_RouteHopDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_RouteHopDecodeErrorZ* owner_conv = (LDKCResult_RouteHopDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_RouteHopDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -1045,17 +973,12 @@ static inline struct LDKRoute CResult_RouteDecodeErrorZ_get_ok(LDKCResult_RouteD CHECK(owner->result_ok); return Route_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_get_ok"))) TS_CResult_RouteDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_RouteDecodeErrorZ* owner_conv = (LDKCResult_RouteDecodeErrorZ*)untag_ptr(owner); LDKRoute ret_var = CResult_RouteDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -1063,17 +986,12 @@ static inline struct LDKDecodeError CResult_RouteDecodeErrorZ_get_err(LDKCResult CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_get_err"))) TS_CResult_RouteDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_RouteDecodeErrorZ* owner_conv = (LDKCResult_RouteDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_RouteDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -1081,17 +999,12 @@ static inline struct LDKRouteParameters CResult_RouteParametersDecodeErrorZ_get_ CHECK(owner->result_ok); return RouteParameters_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_get_ok"))) TS_CResult_RouteParametersDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_RouteParametersDecodeErrorZ* owner_conv = (LDKCResult_RouteParametersDecodeErrorZ*)untag_ptr(owner); LDKRouteParameters ret_var = CResult_RouteParametersDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -1099,17 +1012,12 @@ static inline struct LDKDecodeError CResult_RouteParametersDecodeErrorZ_get_err( CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_get_err"))) TS_CResult_RouteParametersDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_RouteParametersDecodeErrorZ* owner_conv = (LDKCResult_RouteParametersDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_RouteParametersDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -1120,16 +1028,16 @@ static inline LDKCVec_RouteHintZ CVec_RouteHintZ_clone(const LDKCVec_RouteHintZ } return ret; } -uint32_t __attribute__((export_name("TS_LDKCOption_u64Z_ty_from_ptr"))) TS_LDKCOption_u64Z_ty_from_ptr(uint32_t ptr) { - LDKCOption_u64Z *obj = (LDKCOption_u64Z*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKCOption_u64Z_ty_from_ptr"))) TS_LDKCOption_u64Z_ty_from_ptr(uint64_t ptr) { + LDKCOption_u64Z *obj = (LDKCOption_u64Z*)untag_ptr(ptr); switch(obj->tag) { case LDKCOption_u64Z_Some: return 0; case LDKCOption_u64Z_None: return 1; default: abort(); } } -int64_t __attribute__((export_name("TS_LDKCOption_u64Z_Some_get_some"))) TS_LDKCOption_u64Z_Some_get_some(uint32_t ptr) { - LDKCOption_u64Z *obj = (LDKCOption_u64Z*)(ptr & ~1); +int64_t __attribute__((export_name("TS_LDKCOption_u64Z_Some_get_some"))) TS_LDKCOption_u64Z_Some_get_some(uint64_t ptr) { + LDKCOption_u64Z *obj = (LDKCOption_u64Z*)untag_ptr(ptr); assert(obj->tag == LDKCOption_u64Z_Some); int64_t some_conv = obj->some; return some_conv; @@ -1143,17 +1051,12 @@ static inline struct LDKPaymentParameters CResult_PaymentParametersDecodeErrorZ_ CHECK(owner->result_ok); return PaymentParameters_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_get_ok"))) TS_CResult_PaymentParametersDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_PaymentParametersDecodeErrorZ* owner_conv = (LDKCResult_PaymentParametersDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_get_ok"))) TS_CResult_PaymentParametersDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_PaymentParametersDecodeErrorZ* owner_conv = (LDKCResult_PaymentParametersDecodeErrorZ*)untag_ptr(owner); LDKPaymentParameters ret_var = CResult_PaymentParametersDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -1161,17 +1064,12 @@ static inline struct LDKDecodeError CResult_PaymentParametersDecodeErrorZ_get_er CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_get_err"))) TS_CResult_PaymentParametersDecodeErrorZ_get_err(uint32_t owner) { - LDKCResult_PaymentParametersDecodeErrorZ* owner_conv = (LDKCResult_PaymentParametersDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_get_err"))) TS_CResult_PaymentParametersDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_PaymentParametersDecodeErrorZ* owner_conv = (LDKCResult_PaymentParametersDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_PaymentParametersDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -1186,17 +1084,12 @@ static inline struct LDKRouteHint CResult_RouteHintDecodeErrorZ_get_ok(LDKCResul CHECK(owner->result_ok); return RouteHint_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_get_ok"))) TS_CResult_RouteHintDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_RouteHintDecodeErrorZ* owner_conv = (LDKCResult_RouteHintDecodeErrorZ*)untag_ptr(owner); LDKRouteHint ret_var = CResult_RouteHintDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -1204,17 +1097,12 @@ static inline struct LDKDecodeError CResult_RouteHintDecodeErrorZ_get_err(LDKCRe CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_get_err"))) TS_CResult_RouteHintDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_RouteHintDecodeErrorZ* owner_conv = (LDKCResult_RouteHintDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_RouteHintDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -1222,17 +1110,12 @@ static inline struct LDKRouteHintHop CResult_RouteHintHopDecodeErrorZ_get_ok(LDK CHECK(owner->result_ok); return RouteHintHop_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_get_ok"))) TS_CResult_RouteHintHopDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_RouteHintHopDecodeErrorZ* owner_conv = (LDKCResult_RouteHintHopDecodeErrorZ*)untag_ptr(owner); LDKRouteHintHop ret_var = CResult_RouteHintHopDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -1240,17 +1123,12 @@ static inline struct LDKDecodeError CResult_RouteHintHopDecodeErrorZ_get_err(LDK CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_get_err"))) TS_CResult_RouteHintHopDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_RouteHintHopDecodeErrorZ* owner_conv = (LDKCResult_RouteHintHopDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_RouteHintHopDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -1265,17 +1143,12 @@ static inline struct LDKRoute CResult_RouteLightningErrorZ_get_ok(LDKCResult_Rou CHECK(owner->result_ok); return Route_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_RouteLightningErrorZ_get_ok"))) TS_CResult_RouteLightningErrorZ_get_ok(uint64_t owner) { + LDKCResult_RouteLightningErrorZ* owner_conv = (LDKCResult_RouteLightningErrorZ*)untag_ptr(owner); LDKRoute ret_var = CResult_RouteLightningErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -1283,44 +1156,39 @@ static inline struct LDKLightningError CResult_RouteLightningErrorZ_get_err(LDKC CHECK(!owner->result_ok); return LightningError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_RouteLightningErrorZ_get_err"))) TS_CResult_RouteLightningErrorZ_get_err(uint64_t owner) { + LDKCResult_RouteLightningErrorZ* owner_conv = (LDKCResult_RouteLightningErrorZ*)untag_ptr(owner); LDKLightningError ret_var = CResult_RouteLightningErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_LDKPaymentPurpose_ty_from_ptr"))) TS_LDKPaymentPurpose_ty_from_ptr(uint32_t ptr) { - LDKPaymentPurpose *obj = (LDKPaymentPurpose*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKPaymentPurpose_ty_from_ptr"))) TS_LDKPaymentPurpose_ty_from_ptr(uint64_t ptr) { + LDKPaymentPurpose *obj = (LDKPaymentPurpose*)untag_ptr(ptr); switch(obj->tag) { case LDKPaymentPurpose_InvoicePayment: return 0; case LDKPaymentPurpose_SpontaneousPayment: return 1; default: abort(); } } -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); +int8_tArray __attribute__((export_name("TS_LDKPaymentPurpose_InvoicePayment_get_payment_preimage"))) TS_LDKPaymentPurpose_InvoicePayment_get_payment_preimage(uint64_t ptr) { + LDKPaymentPurpose *obj = (LDKPaymentPurpose*)untag_ptr(ptr); assert(obj->tag == LDKPaymentPurpose_InvoicePayment); 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); +int8_tArray __attribute__((export_name("TS_LDKPaymentPurpose_InvoicePayment_get_payment_secret"))) TS_LDKPaymentPurpose_InvoicePayment_get_payment_secret(uint64_t ptr) { + LDKPaymentPurpose *obj = (LDKPaymentPurpose*)untag_ptr(ptr); assert(obj->tag == LDKPaymentPurpose_InvoicePayment); 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); +int8_tArray __attribute__((export_name("TS_LDKPaymentPurpose_SpontaneousPayment_get_spontaneous_payment"))) TS_LDKPaymentPurpose_SpontaneousPayment_get_spontaneous_payment(uint64_t ptr) { + LDKPaymentPurpose *obj = (LDKPaymentPurpose*)untag_ptr(ptr); assert(obj->tag == LDKPaymentPurpose_SpontaneousPayment); int8_tArray spontaneous_payment_arr = init_int8_tArray(32, __LINE__); memcpy(spontaneous_payment_arr->elems, obj->spontaneous_payment.data, 32); @@ -1330,11 +1198,11 @@ static inline struct LDKPaymentPurpose CResult_PaymentPurposeDecodeErrorZ_get_ok CHECK(owner->result_ok); return PaymentPurpose_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_PaymentPurposeDecodeErrorZ_get_ok"))) TS_CResult_PaymentPurposeDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_PaymentPurposeDecodeErrorZ* owner_conv = (LDKCResult_PaymentPurposeDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_PaymentPurposeDecodeErrorZ_get_ok"))) TS_CResult_PaymentPurposeDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_PaymentPurposeDecodeErrorZ* owner_conv = (LDKCResult_PaymentPurposeDecodeErrorZ*)untag_ptr(owner); LDKPaymentPurpose *ret_copy = MALLOC(sizeof(LDKPaymentPurpose), "LDKPaymentPurpose"); *ret_copy = CResult_PaymentPurposeDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } @@ -1342,22 +1210,17 @@ static inline struct LDKDecodeError CResult_PaymentPurposeDecodeErrorZ_get_err(L CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_PaymentPurposeDecodeErrorZ_get_err"))) TS_CResult_PaymentPurposeDecodeErrorZ_get_err(uint32_t owner) { - LDKCResult_PaymentPurposeDecodeErrorZ* owner_conv = (LDKCResult_PaymentPurposeDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_PaymentPurposeDecodeErrorZ_get_err"))) TS_CResult_PaymentPurposeDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_PaymentPurposeDecodeErrorZ* owner_conv = (LDKCResult_PaymentPurposeDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_PaymentPurposeDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_LDKClosureReason_ty_from_ptr"))) TS_LDKClosureReason_ty_from_ptr(uint32_t ptr) { - LDKClosureReason *obj = (LDKClosureReason*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKClosureReason_ty_from_ptr"))) TS_LDKClosureReason_ty_from_ptr(uint64_t ptr) { + LDKClosureReason *obj = (LDKClosureReason*)untag_ptr(ptr); switch(obj->tag) { case LDKClosureReason_CounterpartyForceClosed: return 0; case LDKClosureReason_HolderForceClosed: return 1; @@ -1370,43 +1233,43 @@ uint32_t __attribute__((export_name("TS_LDKClosureReason_ty_from_ptr"))) TS_LDKC default: abort(); } } -jstring __attribute__((export_name("TS_LDKClosureReason_CounterpartyForceClosed_get_peer_msg"))) TS_LDKClosureReason_CounterpartyForceClosed_get_peer_msg(uint32_t ptr) { - LDKClosureReason *obj = (LDKClosureReason*)(ptr & ~1); +jstring __attribute__((export_name("TS_LDKClosureReason_CounterpartyForceClosed_get_peer_msg"))) TS_LDKClosureReason_CounterpartyForceClosed_get_peer_msg(uint64_t ptr) { + LDKClosureReason *obj = (LDKClosureReason*)untag_ptr(ptr); assert(obj->tag == LDKClosureReason_CounterpartyForceClosed); LDKStr peer_msg_str = obj->counterparty_force_closed.peer_msg; jstring peer_msg_conv = str_ref_to_ts(peer_msg_str.chars, peer_msg_str.len); return peer_msg_conv; } -jstring __attribute__((export_name("TS_LDKClosureReason_ProcessingError_get_err"))) TS_LDKClosureReason_ProcessingError_get_err(uint32_t ptr) { - LDKClosureReason *obj = (LDKClosureReason*)(ptr & ~1); +jstring __attribute__((export_name("TS_LDKClosureReason_ProcessingError_get_err"))) TS_LDKClosureReason_ProcessingError_get_err(uint64_t ptr) { + LDKClosureReason *obj = (LDKClosureReason*)untag_ptr(ptr); assert(obj->tag == LDKClosureReason_ProcessingError); LDKStr err_str = obj->processing_error.err; jstring err_conv = str_ref_to_ts(err_str.chars, err_str.len); return err_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); +uint32_t __attribute__((export_name("TS_LDKCOption_ClosureReasonZ_ty_from_ptr"))) TS_LDKCOption_ClosureReasonZ_ty_from_ptr(uint64_t ptr) { + LDKCOption_ClosureReasonZ *obj = (LDKCOption_ClosureReasonZ*)untag_ptr(ptr); switch(obj->tag) { case LDKCOption_ClosureReasonZ_Some: return 0; case LDKCOption_ClosureReasonZ_None: return 1; default: abort(); } } -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); +uint64_t __attribute__((export_name("TS_LDKCOption_ClosureReasonZ_Some_get_some"))) TS_LDKCOption_ClosureReasonZ_Some_get_some(uint64_t ptr) { + LDKCOption_ClosureReasonZ *obj = (LDKCOption_ClosureReasonZ*)untag_ptr(ptr); assert(obj->tag == LDKCOption_ClosureReasonZ_Some); - uint32_t some_ref = ((uintptr_t)&obj->some) | 1; + uint64_t some_ref = tag_ptr(&obj->some, false); return some_ref; } static inline struct LDKCOption_ClosureReasonZ CResult_COption_ClosureReasonZDecodeErrorZ_get_ok(LDKCResult_COption_ClosureReasonZDecodeErrorZ *NONNULL_PTR owner){ CHECK(owner->result_ok); return COption_ClosureReasonZ_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErrorZ_get_ok"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_COption_ClosureReasonZDecodeErrorZ* owner_conv = (LDKCResult_COption_ClosureReasonZDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErrorZ_get_ok"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_COption_ClosureReasonZDecodeErrorZ* owner_conv = (LDKCResult_COption_ClosureReasonZDecodeErrorZ*)untag_ptr(owner); LDKCOption_ClosureReasonZ *ret_copy = MALLOC(sizeof(LDKCOption_ClosureReasonZ), "LDKCOption_ClosureReasonZ"); *ret_copy = CResult_COption_ClosureReasonZDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } @@ -1414,22 +1277,17 @@ static inline struct LDKDecodeError CResult_COption_ClosureReasonZDecodeErrorZ_g CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErrorZ_get_err"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_COption_ClosureReasonZDecodeErrorZ* owner_conv = (LDKCResult_COption_ClosureReasonZDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_COption_ClosureReasonZDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_LDKHTLCDestination_ty_from_ptr"))) TS_LDKHTLCDestination_ty_from_ptr(uint32_t ptr) { - LDKHTLCDestination *obj = (LDKHTLCDestination*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKHTLCDestination_ty_from_ptr"))) TS_LDKHTLCDestination_ty_from_ptr(uint64_t ptr) { + LDKHTLCDestination *obj = (LDKHTLCDestination*)untag_ptr(ptr); switch(obj->tag) { case LDKHTLCDestination_NextHopChannel: return 0; case LDKHTLCDestination_UnknownNextHop: return 1; @@ -1437,56 +1295,56 @@ uint32_t __attribute__((export_name("TS_LDKHTLCDestination_ty_from_ptr"))) TS_LD default: abort(); } } -int8_tArray __attribute__((export_name("TS_LDKHTLCDestination_NextHopChannel_get_node_id"))) TS_LDKHTLCDestination_NextHopChannel_get_node_id(uint32_t ptr) { - LDKHTLCDestination *obj = (LDKHTLCDestination*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKHTLCDestination_NextHopChannel_get_node_id"))) TS_LDKHTLCDestination_NextHopChannel_get_node_id(uint64_t ptr) { + LDKHTLCDestination *obj = (LDKHTLCDestination*)untag_ptr(ptr); assert(obj->tag == LDKHTLCDestination_NextHopChannel); int8_tArray node_id_arr = init_int8_tArray(33, __LINE__); memcpy(node_id_arr->elems, obj->next_hop_channel.node_id.compressed_form, 33); return node_id_arr; } -int8_tArray __attribute__((export_name("TS_LDKHTLCDestination_NextHopChannel_get_channel_id"))) TS_LDKHTLCDestination_NextHopChannel_get_channel_id(uint32_t ptr) { - LDKHTLCDestination *obj = (LDKHTLCDestination*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKHTLCDestination_NextHopChannel_get_channel_id"))) TS_LDKHTLCDestination_NextHopChannel_get_channel_id(uint64_t ptr) { + LDKHTLCDestination *obj = (LDKHTLCDestination*)untag_ptr(ptr); assert(obj->tag == LDKHTLCDestination_NextHopChannel); int8_tArray channel_id_arr = init_int8_tArray(32, __LINE__); memcpy(channel_id_arr->elems, obj->next_hop_channel.channel_id.data, 32); return channel_id_arr; } -int64_t __attribute__((export_name("TS_LDKHTLCDestination_UnknownNextHop_get_requested_forward_scid"))) TS_LDKHTLCDestination_UnknownNextHop_get_requested_forward_scid(uint32_t ptr) { - LDKHTLCDestination *obj = (LDKHTLCDestination*)(ptr & ~1); +int64_t __attribute__((export_name("TS_LDKHTLCDestination_UnknownNextHop_get_requested_forward_scid"))) TS_LDKHTLCDestination_UnknownNextHop_get_requested_forward_scid(uint64_t ptr) { + LDKHTLCDestination *obj = (LDKHTLCDestination*)untag_ptr(ptr); assert(obj->tag == LDKHTLCDestination_UnknownNextHop); int64_t requested_forward_scid_conv = obj->unknown_next_hop.requested_forward_scid; return requested_forward_scid_conv; } -int8_tArray __attribute__((export_name("TS_LDKHTLCDestination_FailedPayment_get_payment_hash"))) TS_LDKHTLCDestination_FailedPayment_get_payment_hash(uint32_t ptr) { - LDKHTLCDestination *obj = (LDKHTLCDestination*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKHTLCDestination_FailedPayment_get_payment_hash"))) TS_LDKHTLCDestination_FailedPayment_get_payment_hash(uint64_t ptr) { + LDKHTLCDestination *obj = (LDKHTLCDestination*)untag_ptr(ptr); assert(obj->tag == LDKHTLCDestination_FailedPayment); int8_tArray payment_hash_arr = init_int8_tArray(32, __LINE__); memcpy(payment_hash_arr->elems, obj->failed_payment.payment_hash.data, 32); return payment_hash_arr; } -uint32_t __attribute__((export_name("TS_LDKCOption_HTLCDestinationZ_ty_from_ptr"))) TS_LDKCOption_HTLCDestinationZ_ty_from_ptr(uint32_t ptr) { - LDKCOption_HTLCDestinationZ *obj = (LDKCOption_HTLCDestinationZ*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKCOption_HTLCDestinationZ_ty_from_ptr"))) TS_LDKCOption_HTLCDestinationZ_ty_from_ptr(uint64_t ptr) { + LDKCOption_HTLCDestinationZ *obj = (LDKCOption_HTLCDestinationZ*)untag_ptr(ptr); switch(obj->tag) { case LDKCOption_HTLCDestinationZ_Some: return 0; case LDKCOption_HTLCDestinationZ_None: return 1; default: abort(); } } -uint32_t __attribute__((export_name("TS_LDKCOption_HTLCDestinationZ_Some_get_some"))) TS_LDKCOption_HTLCDestinationZ_Some_get_some(uint32_t ptr) { - LDKCOption_HTLCDestinationZ *obj = (LDKCOption_HTLCDestinationZ*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKCOption_HTLCDestinationZ_Some_get_some"))) TS_LDKCOption_HTLCDestinationZ_Some_get_some(uint64_t ptr) { + LDKCOption_HTLCDestinationZ *obj = (LDKCOption_HTLCDestinationZ*)untag_ptr(ptr); assert(obj->tag == LDKCOption_HTLCDestinationZ_Some); - uint32_t some_ref = ((uintptr_t)&obj->some) | 1; + uint64_t some_ref = tag_ptr(&obj->some, false); return some_ref; } static inline struct LDKCOption_HTLCDestinationZ CResult_COption_HTLCDestinationZDecodeErrorZ_get_ok(LDKCResult_COption_HTLCDestinationZDecodeErrorZ *NONNULL_PTR owner){ CHECK(owner->result_ok); return COption_HTLCDestinationZ_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_COption_HTLCDestinationZDecodeErrorZ_get_ok"))) TS_CResult_COption_HTLCDestinationZDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_COption_HTLCDestinationZDecodeErrorZ* owner_conv = (LDKCResult_COption_HTLCDestinationZDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_COption_HTLCDestinationZDecodeErrorZ_get_ok"))) TS_CResult_COption_HTLCDestinationZDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_COption_HTLCDestinationZDecodeErrorZ* owner_conv = (LDKCResult_COption_HTLCDestinationZDecodeErrorZ*)untag_ptr(owner); LDKCOption_HTLCDestinationZ *ret_copy = MALLOC(sizeof(LDKCOption_HTLCDestinationZ), "LDKCOption_HTLCDestinationZ"); *ret_copy = CResult_COption_HTLCDestinationZDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } @@ -1494,22 +1352,17 @@ static inline struct LDKDecodeError CResult_COption_HTLCDestinationZDecodeErrorZ CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_COption_HTLCDestinationZDecodeErrorZ_get_err"))) TS_CResult_COption_HTLCDestinationZDecodeErrorZ_get_err(uint32_t owner) { - LDKCResult_COption_HTLCDestinationZDecodeErrorZ* owner_conv = (LDKCResult_COption_HTLCDestinationZDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_COption_HTLCDestinationZDecodeErrorZ_get_err"))) TS_CResult_COption_HTLCDestinationZDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_COption_HTLCDestinationZDecodeErrorZ* owner_conv = (LDKCResult_COption_HTLCDestinationZDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_COption_HTLCDestinationZDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_LDKNetworkUpdate_ty_from_ptr"))) TS_LDKNetworkUpdate_ty_from_ptr(uint32_t ptr) { - LDKNetworkUpdate *obj = (LDKNetworkUpdate*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKNetworkUpdate_ty_from_ptr"))) TS_LDKNetworkUpdate_ty_from_ptr(uint64_t ptr) { + LDKNetworkUpdate *obj = (LDKNetworkUpdate*)untag_ptr(ptr); switch(obj->tag) { case LDKNetworkUpdate_ChannelUpdateMessage: return 0; case LDKNetworkUpdate_ChannelFailure: return 1; @@ -1517,58 +1370,56 @@ uint32_t __attribute__((export_name("TS_LDKNetworkUpdate_ty_from_ptr"))) TS_LDKN default: abort(); } } -uint32_t __attribute__((export_name("TS_LDKNetworkUpdate_ChannelUpdateMessage_get_msg"))) TS_LDKNetworkUpdate_ChannelUpdateMessage_get_msg(uint32_t ptr) { - LDKNetworkUpdate *obj = (LDKNetworkUpdate*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKNetworkUpdate_ChannelUpdateMessage_get_msg"))) TS_LDKNetworkUpdate_ChannelUpdateMessage_get_msg(uint64_t ptr) { + LDKNetworkUpdate *obj = (LDKNetworkUpdate*)untag_ptr(ptr); assert(obj->tag == LDKNetworkUpdate_ChannelUpdateMessage); LDKChannelUpdate msg_var = obj->channel_update_message.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); return msg_ref; } -int64_t __attribute__((export_name("TS_LDKNetworkUpdate_ChannelFailure_get_short_channel_id"))) TS_LDKNetworkUpdate_ChannelFailure_get_short_channel_id(uint32_t ptr) { - LDKNetworkUpdate *obj = (LDKNetworkUpdate*)(ptr & ~1); +int64_t __attribute__((export_name("TS_LDKNetworkUpdate_ChannelFailure_get_short_channel_id"))) TS_LDKNetworkUpdate_ChannelFailure_get_short_channel_id(uint64_t ptr) { + LDKNetworkUpdate *obj = (LDKNetworkUpdate*)untag_ptr(ptr); assert(obj->tag == LDKNetworkUpdate_ChannelFailure); int64_t short_channel_id_conv = obj->channel_failure.short_channel_id; return short_channel_id_conv; } -jboolean __attribute__((export_name("TS_LDKNetworkUpdate_ChannelFailure_get_is_permanent"))) TS_LDKNetworkUpdate_ChannelFailure_get_is_permanent(uint32_t ptr) { - LDKNetworkUpdate *obj = (LDKNetworkUpdate*)(ptr & ~1); +jboolean __attribute__((export_name("TS_LDKNetworkUpdate_ChannelFailure_get_is_permanent"))) TS_LDKNetworkUpdate_ChannelFailure_get_is_permanent(uint64_t ptr) { + LDKNetworkUpdate *obj = (LDKNetworkUpdate*)untag_ptr(ptr); assert(obj->tag == LDKNetworkUpdate_ChannelFailure); jboolean is_permanent_conv = obj->channel_failure.is_permanent; return is_permanent_conv; } -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); +int8_tArray __attribute__((export_name("TS_LDKNetworkUpdate_NodeFailure_get_node_id"))) TS_LDKNetworkUpdate_NodeFailure_get_node_id(uint64_t ptr) { + LDKNetworkUpdate *obj = (LDKNetworkUpdate*)untag_ptr(ptr); assert(obj->tag == LDKNetworkUpdate_NodeFailure); 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; } -jboolean __attribute__((export_name("TS_LDKNetworkUpdate_NodeFailure_get_is_permanent"))) TS_LDKNetworkUpdate_NodeFailure_get_is_permanent(uint32_t ptr) { - LDKNetworkUpdate *obj = (LDKNetworkUpdate*)(ptr & ~1); +jboolean __attribute__((export_name("TS_LDKNetworkUpdate_NodeFailure_get_is_permanent"))) TS_LDKNetworkUpdate_NodeFailure_get_is_permanent(uint64_t ptr) { + LDKNetworkUpdate *obj = (LDKNetworkUpdate*)untag_ptr(ptr); assert(obj->tag == LDKNetworkUpdate_NodeFailure); jboolean is_permanent_conv = obj->node_failure.is_permanent; return is_permanent_conv; } -uint32_t __attribute__((export_name("TS_LDKCOption_NetworkUpdateZ_ty_from_ptr"))) TS_LDKCOption_NetworkUpdateZ_ty_from_ptr(uint32_t ptr) { - LDKCOption_NetworkUpdateZ *obj = (LDKCOption_NetworkUpdateZ*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKCOption_NetworkUpdateZ_ty_from_ptr"))) TS_LDKCOption_NetworkUpdateZ_ty_from_ptr(uint64_t ptr) { + LDKCOption_NetworkUpdateZ *obj = (LDKCOption_NetworkUpdateZ*)untag_ptr(ptr); switch(obj->tag) { case LDKCOption_NetworkUpdateZ_Some: return 0; case LDKCOption_NetworkUpdateZ_None: return 1; default: abort(); } } -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); +uint64_t __attribute__((export_name("TS_LDKCOption_NetworkUpdateZ_Some_get_some"))) TS_LDKCOption_NetworkUpdateZ_Some_get_some(uint64_t ptr) { + LDKCOption_NetworkUpdateZ *obj = (LDKCOption_NetworkUpdateZ*)untag_ptr(ptr); assert(obj->tag == LDKCOption_NetworkUpdateZ_Some); - uint32_t some_ref = ((uintptr_t)&obj->some) | 1; + uint64_t some_ref = tag_ptr(&obj->some, false); return some_ref; } -uint32_t __attribute__((export_name("TS_LDKSpendableOutputDescriptor_ty_from_ptr"))) TS_LDKSpendableOutputDescriptor_ty_from_ptr(uint32_t ptr) { - LDKSpendableOutputDescriptor *obj = (LDKSpendableOutputDescriptor*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKSpendableOutputDescriptor_ty_from_ptr"))) TS_LDKSpendableOutputDescriptor_ty_from_ptr(uint64_t ptr) { + LDKSpendableOutputDescriptor *obj = (LDKSpendableOutputDescriptor*)untag_ptr(ptr); switch(obj->tag) { case LDKSpendableOutputDescriptor_StaticOutput: return 0; case LDKSpendableOutputDescriptor_DelayedPaymentOutput: return 1; @@ -1576,43 +1427,37 @@ uint32_t __attribute__((export_name("TS_LDKSpendableOutputDescriptor_ty_from_ptr default: abort(); } } -uint32_t __attribute__((export_name("TS_LDKSpendableOutputDescriptor_StaticOutput_get_outpoint"))) TS_LDKSpendableOutputDescriptor_StaticOutput_get_outpoint(uint32_t ptr) { - LDKSpendableOutputDescriptor *obj = (LDKSpendableOutputDescriptor*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKSpendableOutputDescriptor_StaticOutput_get_outpoint"))) TS_LDKSpendableOutputDescriptor_StaticOutput_get_outpoint(uint64_t ptr) { + LDKSpendableOutputDescriptor *obj = (LDKSpendableOutputDescriptor*)untag_ptr(ptr); assert(obj->tag == LDKSpendableOutputDescriptor_StaticOutput); LDKOutPoint outpoint_var = obj->static_output.outpoint; - uint32_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. + uint64_t outpoint_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(outpoint_var); - outpoint_ref = (uintptr_t)outpoint_var.inner & ~1; + outpoint_ref = tag_ptr(outpoint_var.inner, false); 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); +uint64_t __attribute__((export_name("TS_LDKSpendableOutputDescriptor_StaticOutput_get_output"))) TS_LDKSpendableOutputDescriptor_StaticOutput_get_output(uint64_t ptr) { + LDKSpendableOutputDescriptor *obj = (LDKSpendableOutputDescriptor*)untag_ptr(ptr); assert(obj->tag == LDKSpendableOutputDescriptor_StaticOutput); - uint32_t output_ref = ((uintptr_t)&obj->static_output.output) | 1; - return (uint32_t)output_ref; + LDKTxOut* output_ref = &obj->static_output.output; + return tag_ptr(output_ref, false); } -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); +uint64_t __attribute__((export_name("TS_LDKSpendableOutputDescriptor_DelayedPaymentOutput_get_delayed_payment_output"))) TS_LDKSpendableOutputDescriptor_DelayedPaymentOutput_get_delayed_payment_output(uint64_t ptr) { + LDKSpendableOutputDescriptor *obj = (LDKSpendableOutputDescriptor*)untag_ptr(ptr); assert(obj->tag == LDKSpendableOutputDescriptor_DelayedPaymentOutput); LDKDelayedPaymentOutputDescriptor delayed_payment_output_var = obj->delayed_payment_output; - uint32_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. + uint64_t delayed_payment_output_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(delayed_payment_output_var); - delayed_payment_output_ref = (uintptr_t)delayed_payment_output_var.inner & ~1; + delayed_payment_output_ref = tag_ptr(delayed_payment_output_var.inner, false); 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); +uint64_t __attribute__((export_name("TS_LDKSpendableOutputDescriptor_StaticPaymentOutput_get_static_payment_output"))) TS_LDKSpendableOutputDescriptor_StaticPaymentOutput_get_static_payment_output(uint64_t ptr) { + LDKSpendableOutputDescriptor *obj = (LDKSpendableOutputDescriptor*)untag_ptr(ptr); assert(obj->tag == LDKSpendableOutputDescriptor_StaticPaymentOutput); LDKStaticPaymentOutputDescriptor static_payment_output_var = obj->static_payment_output; - uint32_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. + uint64_t static_payment_output_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(static_payment_output_var); - static_payment_output_ref = (uintptr_t)static_payment_output_var.inner & ~1; + static_payment_output_ref = tag_ptr(static_payment_output_var.inner, false); return static_payment_output_ref; } static inline LDKCVec_SpendableOutputDescriptorZ CVec_SpendableOutputDescriptorZ_clone(const LDKCVec_SpendableOutputDescriptorZ *orig) { @@ -1622,8 +1467,8 @@ static inline LDKCVec_SpendableOutputDescriptorZ CVec_SpendableOutputDescriptorZ } return ret; } -uint32_t __attribute__((export_name("TS_LDKEvent_ty_from_ptr"))) TS_LDKEvent_ty_from_ptr(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKEvent_ty_from_ptr"))) TS_LDKEvent_ty_from_ptr(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); switch(obj->tag) { case LDKEvent_FundingGenerationReady: return 0; case LDKEvent_PaymentReceived: return 1; @@ -1644,447 +1489,433 @@ uint32_t __attribute__((export_name("TS_LDKEvent_ty_from_ptr"))) TS_LDKEvent_ty_ default: abort(); } } -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); +int8_tArray __attribute__((export_name("TS_LDKEvent_FundingGenerationReady_get_temporary_channel_id"))) TS_LDKEvent_FundingGenerationReady_get_temporary_channel_id(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_FundingGenerationReady); 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; } -int8_tArray __attribute__((export_name("TS_LDKEvent_FundingGenerationReady_get_counterparty_node_id"))) TS_LDKEvent_FundingGenerationReady_get_counterparty_node_id(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKEvent_FundingGenerationReady_get_counterparty_node_id"))) TS_LDKEvent_FundingGenerationReady_get_counterparty_node_id(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_FundingGenerationReady); int8_tArray counterparty_node_id_arr = init_int8_tArray(33, __LINE__); memcpy(counterparty_node_id_arr->elems, obj->funding_generation_ready.counterparty_node_id.compressed_form, 33); return counterparty_node_id_arr; } -int64_t __attribute__((export_name("TS_LDKEvent_FundingGenerationReady_get_channel_value_satoshis"))) TS_LDKEvent_FundingGenerationReady_get_channel_value_satoshis(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int64_t __attribute__((export_name("TS_LDKEvent_FundingGenerationReady_get_channel_value_satoshis"))) TS_LDKEvent_FundingGenerationReady_get_channel_value_satoshis(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_FundingGenerationReady); int64_t channel_value_satoshis_conv = obj->funding_generation_ready.channel_value_satoshis; return channel_value_satoshis_conv; } -int8_tArray __attribute__((export_name("TS_LDKEvent_FundingGenerationReady_get_output_script"))) TS_LDKEvent_FundingGenerationReady_get_output_script(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKEvent_FundingGenerationReady_get_output_script"))) TS_LDKEvent_FundingGenerationReady_get_output_script(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); 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, __LINE__); memcpy(output_script_arr->elems, output_script_var.data, output_script_var.datalen); return output_script_arr; } -int64_t __attribute__((export_name("TS_LDKEvent_FundingGenerationReady_get_user_channel_id"))) TS_LDKEvent_FundingGenerationReady_get_user_channel_id(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int64_t __attribute__((export_name("TS_LDKEvent_FundingGenerationReady_get_user_channel_id"))) TS_LDKEvent_FundingGenerationReady_get_user_channel_id(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_FundingGenerationReady); int64_t user_channel_id_conv = obj->funding_generation_ready.user_channel_id; return user_channel_id_conv; } -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); +int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentReceived_get_payment_hash"))) TS_LDKEvent_PaymentReceived_get_payment_hash(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentReceived); 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; } -int64_t __attribute__((export_name("TS_LDKEvent_PaymentReceived_get_amount_msat"))) TS_LDKEvent_PaymentReceived_get_amount_msat(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int64_t __attribute__((export_name("TS_LDKEvent_PaymentReceived_get_amount_msat"))) TS_LDKEvent_PaymentReceived_get_amount_msat(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentReceived); int64_t amount_msat_conv = obj->payment_received.amount_msat; return amount_msat_conv; } -uint32_t __attribute__((export_name("TS_LDKEvent_PaymentReceived_get_purpose"))) TS_LDKEvent_PaymentReceived_get_purpose(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKEvent_PaymentReceived_get_purpose"))) TS_LDKEvent_PaymentReceived_get_purpose(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentReceived); - uint32_t purpose_ref = ((uintptr_t)&obj->payment_received.purpose) | 1; + uint64_t purpose_ref = tag_ptr(&obj->payment_received.purpose, false); return purpose_ref; } -int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentClaimed_get_payment_hash"))) TS_LDKEvent_PaymentClaimed_get_payment_hash(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentClaimed_get_payment_hash"))) TS_LDKEvent_PaymentClaimed_get_payment_hash(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentClaimed); int8_tArray payment_hash_arr = init_int8_tArray(32, __LINE__); memcpy(payment_hash_arr->elems, obj->payment_claimed.payment_hash.data, 32); return payment_hash_arr; } -int64_t __attribute__((export_name("TS_LDKEvent_PaymentClaimed_get_amount_msat"))) TS_LDKEvent_PaymentClaimed_get_amount_msat(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int64_t __attribute__((export_name("TS_LDKEvent_PaymentClaimed_get_amount_msat"))) TS_LDKEvent_PaymentClaimed_get_amount_msat(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentClaimed); int64_t amount_msat_conv = obj->payment_claimed.amount_msat; return amount_msat_conv; } -uint32_t __attribute__((export_name("TS_LDKEvent_PaymentClaimed_get_purpose"))) TS_LDKEvent_PaymentClaimed_get_purpose(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKEvent_PaymentClaimed_get_purpose"))) TS_LDKEvent_PaymentClaimed_get_purpose(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentClaimed); - uint32_t purpose_ref = ((uintptr_t)&obj->payment_claimed.purpose) | 1; + uint64_t purpose_ref = tag_ptr(&obj->payment_claimed.purpose, false); 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); +int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentSent_get_payment_id"))) TS_LDKEvent_PaymentSent_get_payment_id(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentSent); 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); +int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentSent_get_payment_preimage"))) TS_LDKEvent_PaymentSent_get_payment_preimage(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentSent); 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); +int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentSent_get_payment_hash"))) TS_LDKEvent_PaymentSent_get_payment_hash(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentSent); 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); +uint64_t __attribute__((export_name("TS_LDKEvent_PaymentSent_get_fee_paid_msat"))) TS_LDKEvent_PaymentSent_get_fee_paid_msat(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentSent); - uint32_t fee_paid_msat_ref = ((uintptr_t)&obj->payment_sent.fee_paid_msat) | 1; + uint64_t fee_paid_msat_ref = tag_ptr(&obj->payment_sent.fee_paid_msat, false); return fee_paid_msat_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); +int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentFailed_get_payment_id"))) TS_LDKEvent_PaymentFailed_get_payment_id(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentFailed); 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); +int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentFailed_get_payment_hash"))) TS_LDKEvent_PaymentFailed_get_payment_hash(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentFailed); 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; } -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); +int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentPathSuccessful_get_payment_id"))) TS_LDKEvent_PaymentPathSuccessful_get_payment_id(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentPathSuccessful); 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); +int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentPathSuccessful_get_payment_hash"))) TS_LDKEvent_PaymentPathSuccessful_get_payment_hash(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentPathSuccessful); 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; } -uint32_tArray __attribute__((export_name("TS_LDKEvent_PaymentPathSuccessful_get_path"))) TS_LDKEvent_PaymentPathSuccessful_get_path(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +uint64_tArray __attribute__((export_name("TS_LDKEvent_PaymentPathSuccessful_get_path"))) TS_LDKEvent_PaymentPathSuccessful_get_path(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); 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, __LINE__); - uint32_t *path_arr_ptr = (uint32_t*)(((uint8_t*)path_arr) + 8); + uint64_tArray path_arr = NULL; + path_arr = init_uint64_tArray(path_var.datalen, __LINE__); + uint64_t *path_arr_ptr = (uint64_t*)(((uint8_t*)path_arr) + 8); for (size_t k = 0; k < path_var.datalen; k++) { LDKRouteHop path_conv_10_var = path_var.data[k]; - uint32_t path_conv_10_ref = 0; - CHECK((((uintptr_t)path_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&path_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t path_conv_10_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_var); - path_conv_10_ref = (uintptr_t)path_conv_10_var.inner & ~1; + path_conv_10_ref = tag_ptr(path_conv_10_var.inner, false); path_arr_ptr[k] = path_conv_10_ref; } return path_arr; } -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); +int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_payment_id"))) TS_LDKEvent_PaymentPathFailed_get_payment_id(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentPathFailed); 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); +int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_payment_hash"))) TS_LDKEvent_PaymentPathFailed_get_payment_hash(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentPathFailed); 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; } -jboolean __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_rejected_by_dest"))) TS_LDKEvent_PaymentPathFailed_get_rejected_by_dest(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +jboolean __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_rejected_by_dest"))) TS_LDKEvent_PaymentPathFailed_get_rejected_by_dest(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentPathFailed); jboolean rejected_by_dest_conv = obj->payment_path_failed.rejected_by_dest; return rejected_by_dest_conv; } -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); +uint64_t __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_network_update"))) TS_LDKEvent_PaymentPathFailed_get_network_update(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentPathFailed); - uint32_t network_update_ref = ((uintptr_t)&obj->payment_path_failed.network_update) | 1; + uint64_t network_update_ref = tag_ptr(&obj->payment_path_failed.network_update, false); 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) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +jboolean __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_all_paths_failed"))) TS_LDKEvent_PaymentPathFailed_get_all_paths_failed(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentPathFailed); jboolean all_paths_failed_conv = obj->payment_path_failed.all_paths_failed; return all_paths_failed_conv; } -uint32_tArray __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_path"))) TS_LDKEvent_PaymentPathFailed_get_path(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +uint64_tArray __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_path"))) TS_LDKEvent_PaymentPathFailed_get_path(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); 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, __LINE__); - uint32_t *path_arr_ptr = (uint32_t*)(((uint8_t*)path_arr) + 8); + uint64_tArray path_arr = NULL; + path_arr = init_uint64_tArray(path_var.datalen, __LINE__); + uint64_t *path_arr_ptr = (uint64_t*)(((uint8_t*)path_arr) + 8); for (size_t k = 0; k < path_var.datalen; k++) { LDKRouteHop path_conv_10_var = path_var.data[k]; - uint32_t path_conv_10_ref = 0; - CHECK((((uintptr_t)path_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&path_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t path_conv_10_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_var); - path_conv_10_ref = (uintptr_t)path_conv_10_var.inner & ~1; + path_conv_10_ref = tag_ptr(path_conv_10_var.inner, false); path_arr_ptr[k] = path_conv_10_ref; } return path_arr; } -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); +uint64_t __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_short_channel_id"))) TS_LDKEvent_PaymentPathFailed_get_short_channel_id(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentPathFailed); - uint32_t short_channel_id_ref = ((uintptr_t)&obj->payment_path_failed.short_channel_id) | 1; + uint64_t short_channel_id_ref = tag_ptr(&obj->payment_path_failed.short_channel_id, false); 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); +uint64_t __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_retry"))) TS_LDKEvent_PaymentPathFailed_get_retry(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentPathFailed); LDKRouteParameters retry_var = obj->payment_path_failed.retry; - uint32_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. + uint64_t retry_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(retry_var); - retry_ref = (uintptr_t)retry_var.inner & ~1; - } + retry_ref = tag_ptr(retry_var.inner, false); return retry_ref; } -int8_tArray __attribute__((export_name("TS_LDKEvent_ProbeSuccessful_get_payment_id"))) TS_LDKEvent_ProbeSuccessful_get_payment_id(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKEvent_ProbeSuccessful_get_payment_id"))) TS_LDKEvent_ProbeSuccessful_get_payment_id(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_ProbeSuccessful); int8_tArray payment_id_arr = init_int8_tArray(32, __LINE__); memcpy(payment_id_arr->elems, obj->probe_successful.payment_id.data, 32); return payment_id_arr; } -int8_tArray __attribute__((export_name("TS_LDKEvent_ProbeSuccessful_get_payment_hash"))) TS_LDKEvent_ProbeSuccessful_get_payment_hash(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKEvent_ProbeSuccessful_get_payment_hash"))) TS_LDKEvent_ProbeSuccessful_get_payment_hash(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_ProbeSuccessful); int8_tArray payment_hash_arr = init_int8_tArray(32, __LINE__); memcpy(payment_hash_arr->elems, obj->probe_successful.payment_hash.data, 32); return payment_hash_arr; } -uint32_tArray __attribute__((export_name("TS_LDKEvent_ProbeSuccessful_get_path"))) TS_LDKEvent_ProbeSuccessful_get_path(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +uint64_tArray __attribute__((export_name("TS_LDKEvent_ProbeSuccessful_get_path"))) TS_LDKEvent_ProbeSuccessful_get_path(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_ProbeSuccessful); LDKCVec_RouteHopZ path_var = obj->probe_successful.path; - uint32_tArray path_arr = NULL; - path_arr = init_uint32_tArray(path_var.datalen, __LINE__); - uint32_t *path_arr_ptr = (uint32_t*)(((uint8_t*)path_arr) + 8); + uint64_tArray path_arr = NULL; + path_arr = init_uint64_tArray(path_var.datalen, __LINE__); + uint64_t *path_arr_ptr = (uint64_t*)(((uint8_t*)path_arr) + 8); for (size_t k = 0; k < path_var.datalen; k++) { LDKRouteHop path_conv_10_var = path_var.data[k]; - uint32_t path_conv_10_ref = 0; - CHECK((((uintptr_t)path_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&path_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t path_conv_10_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_var); - path_conv_10_ref = (uintptr_t)path_conv_10_var.inner & ~1; + path_conv_10_ref = tag_ptr(path_conv_10_var.inner, false); path_arr_ptr[k] = path_conv_10_ref; } return path_arr; } -int8_tArray __attribute__((export_name("TS_LDKEvent_ProbeFailed_get_payment_id"))) TS_LDKEvent_ProbeFailed_get_payment_id(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKEvent_ProbeFailed_get_payment_id"))) TS_LDKEvent_ProbeFailed_get_payment_id(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_ProbeFailed); int8_tArray payment_id_arr = init_int8_tArray(32, __LINE__); memcpy(payment_id_arr->elems, obj->probe_failed.payment_id.data, 32); return payment_id_arr; } -int8_tArray __attribute__((export_name("TS_LDKEvent_ProbeFailed_get_payment_hash"))) TS_LDKEvent_ProbeFailed_get_payment_hash(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKEvent_ProbeFailed_get_payment_hash"))) TS_LDKEvent_ProbeFailed_get_payment_hash(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_ProbeFailed); int8_tArray payment_hash_arr = init_int8_tArray(32, __LINE__); memcpy(payment_hash_arr->elems, obj->probe_failed.payment_hash.data, 32); return payment_hash_arr; } -uint32_tArray __attribute__((export_name("TS_LDKEvent_ProbeFailed_get_path"))) TS_LDKEvent_ProbeFailed_get_path(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +uint64_tArray __attribute__((export_name("TS_LDKEvent_ProbeFailed_get_path"))) TS_LDKEvent_ProbeFailed_get_path(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_ProbeFailed); LDKCVec_RouteHopZ path_var = obj->probe_failed.path; - uint32_tArray path_arr = NULL; - path_arr = init_uint32_tArray(path_var.datalen, __LINE__); - uint32_t *path_arr_ptr = (uint32_t*)(((uint8_t*)path_arr) + 8); + uint64_tArray path_arr = NULL; + path_arr = init_uint64_tArray(path_var.datalen, __LINE__); + uint64_t *path_arr_ptr = (uint64_t*)(((uint8_t*)path_arr) + 8); for (size_t k = 0; k < path_var.datalen; k++) { LDKRouteHop path_conv_10_var = path_var.data[k]; - uint32_t path_conv_10_ref = 0; - CHECK((((uintptr_t)path_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&path_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t path_conv_10_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_var); - path_conv_10_ref = (uintptr_t)path_conv_10_var.inner & ~1; + path_conv_10_ref = tag_ptr(path_conv_10_var.inner, false); path_arr_ptr[k] = path_conv_10_ref; } return path_arr; } -uint32_t __attribute__((export_name("TS_LDKEvent_ProbeFailed_get_short_channel_id"))) TS_LDKEvent_ProbeFailed_get_short_channel_id(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKEvent_ProbeFailed_get_short_channel_id"))) TS_LDKEvent_ProbeFailed_get_short_channel_id(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_ProbeFailed); - uint32_t short_channel_id_ref = ((uintptr_t)&obj->probe_failed.short_channel_id) | 1; + uint64_t short_channel_id_ref = tag_ptr(&obj->probe_failed.short_channel_id, false); return short_channel_id_ref; } -int64_t __attribute__((export_name("TS_LDKEvent_PendingHTLCsForwardable_get_time_forwardable"))) TS_LDKEvent_PendingHTLCsForwardable_get_time_forwardable(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int64_t __attribute__((export_name("TS_LDKEvent_PendingHTLCsForwardable_get_time_forwardable"))) TS_LDKEvent_PendingHTLCsForwardable_get_time_forwardable(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PendingHTLCsForwardable); int64_t time_forwardable_conv = obj->pending_htl_cs_forwardable.time_forwardable; return time_forwardable_conv; } -uint32_tArray __attribute__((export_name("TS_LDKEvent_SpendableOutputs_get_outputs"))) TS_LDKEvent_SpendableOutputs_get_outputs(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +uint64_tArray __attribute__((export_name("TS_LDKEvent_SpendableOutputs_get_outputs"))) TS_LDKEvent_SpendableOutputs_get_outputs(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); 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, __LINE__); - uint32_t *outputs_arr_ptr = (uint32_t*)(((uint8_t*)outputs_arr) + 8); + uint64_tArray outputs_arr = NULL; + outputs_arr = init_uint64_tArray(outputs_var.datalen, __LINE__); + uint64_t *outputs_arr_ptr = (uint64_t*)(((uint8_t*)outputs_arr) + 8); for (size_t b = 0; b < outputs_var.datalen; b++) { - uint32_t outputs_conv_27_ref = ((uintptr_t)&outputs_var.data[b]) | 1; + uint64_t outputs_conv_27_ref = tag_ptr(&outputs_var.data[b], false); outputs_arr_ptr[b] = outputs_conv_27_ref; } return outputs_arr; } -int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentForwarded_get_prev_channel_id"))) TS_LDKEvent_PaymentForwarded_get_prev_channel_id(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentForwarded_get_prev_channel_id"))) TS_LDKEvent_PaymentForwarded_get_prev_channel_id(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentForwarded); int8_tArray prev_channel_id_arr = init_int8_tArray(32, __LINE__); memcpy(prev_channel_id_arr->elems, obj->payment_forwarded.prev_channel_id.data, 32); return prev_channel_id_arr; } -int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentForwarded_get_next_channel_id"))) TS_LDKEvent_PaymentForwarded_get_next_channel_id(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentForwarded_get_next_channel_id"))) TS_LDKEvent_PaymentForwarded_get_next_channel_id(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentForwarded); int8_tArray next_channel_id_arr = init_int8_tArray(32, __LINE__); memcpy(next_channel_id_arr->elems, obj->payment_forwarded.next_channel_id.data, 32); return next_channel_id_arr; } -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); +uint64_t __attribute__((export_name("TS_LDKEvent_PaymentForwarded_get_fee_earned_msat"))) TS_LDKEvent_PaymentForwarded_get_fee_earned_msat(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentForwarded); - uint32_t fee_earned_msat_ref = ((uintptr_t)&obj->payment_forwarded.fee_earned_msat) | 1; + uint64_t fee_earned_msat_ref = tag_ptr(&obj->payment_forwarded.fee_earned_msat, false); 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) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +jboolean __attribute__((export_name("TS_LDKEvent_PaymentForwarded_get_claim_from_onchain_tx"))) TS_LDKEvent_PaymentForwarded_get_claim_from_onchain_tx(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentForwarded); jboolean claim_from_onchain_tx_conv = obj->payment_forwarded.claim_from_onchain_tx; return claim_from_onchain_tx_conv; } -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); +int8_tArray __attribute__((export_name("TS_LDKEvent_ChannelClosed_get_channel_id"))) TS_LDKEvent_ChannelClosed_get_channel_id(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_ChannelClosed); 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; } -int64_t __attribute__((export_name("TS_LDKEvent_ChannelClosed_get_user_channel_id"))) TS_LDKEvent_ChannelClosed_get_user_channel_id(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int64_t __attribute__((export_name("TS_LDKEvent_ChannelClosed_get_user_channel_id"))) TS_LDKEvent_ChannelClosed_get_user_channel_id(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_ChannelClosed); int64_t user_channel_id_conv = obj->channel_closed.user_channel_id; return user_channel_id_conv; } -uint32_t __attribute__((export_name("TS_LDKEvent_ChannelClosed_get_reason"))) TS_LDKEvent_ChannelClosed_get_reason(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKEvent_ChannelClosed_get_reason"))) TS_LDKEvent_ChannelClosed_get_reason(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_ChannelClosed); - uint32_t reason_ref = ((uintptr_t)&obj->channel_closed.reason) | 1; + uint64_t reason_ref = tag_ptr(&obj->channel_closed.reason, false); 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); +int8_tArray __attribute__((export_name("TS_LDKEvent_DiscardFunding_get_channel_id"))) TS_LDKEvent_DiscardFunding_get_channel_id(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_DiscardFunding); 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; } -int8_tArray __attribute__((export_name("TS_LDKEvent_DiscardFunding_get_transaction"))) TS_LDKEvent_DiscardFunding_get_transaction(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKEvent_DiscardFunding_get_transaction"))) TS_LDKEvent_DiscardFunding_get_transaction(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_DiscardFunding); LDKTransaction transaction_var = obj->discard_funding.transaction; 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_OpenChannelRequest_get_temporary_channel_id"))) TS_LDKEvent_OpenChannelRequest_get_temporary_channel_id(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKEvent_OpenChannelRequest_get_temporary_channel_id"))) TS_LDKEvent_OpenChannelRequest_get_temporary_channel_id(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_OpenChannelRequest); int8_tArray temporary_channel_id_arr = init_int8_tArray(32, __LINE__); memcpy(temporary_channel_id_arr->elems, obj->open_channel_request.temporary_channel_id.data, 32); return temporary_channel_id_arr; } -int8_tArray __attribute__((export_name("TS_LDKEvent_OpenChannelRequest_get_counterparty_node_id"))) TS_LDKEvent_OpenChannelRequest_get_counterparty_node_id(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKEvent_OpenChannelRequest_get_counterparty_node_id"))) TS_LDKEvent_OpenChannelRequest_get_counterparty_node_id(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_OpenChannelRequest); int8_tArray counterparty_node_id_arr = init_int8_tArray(33, __LINE__); memcpy(counterparty_node_id_arr->elems, obj->open_channel_request.counterparty_node_id.compressed_form, 33); return counterparty_node_id_arr; } -int64_t __attribute__((export_name("TS_LDKEvent_OpenChannelRequest_get_funding_satoshis"))) TS_LDKEvent_OpenChannelRequest_get_funding_satoshis(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int64_t __attribute__((export_name("TS_LDKEvent_OpenChannelRequest_get_funding_satoshis"))) TS_LDKEvent_OpenChannelRequest_get_funding_satoshis(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_OpenChannelRequest); int64_t funding_satoshis_conv = obj->open_channel_request.funding_satoshis; return funding_satoshis_conv; } -int64_t __attribute__((export_name("TS_LDKEvent_OpenChannelRequest_get_push_msat"))) TS_LDKEvent_OpenChannelRequest_get_push_msat(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int64_t __attribute__((export_name("TS_LDKEvent_OpenChannelRequest_get_push_msat"))) TS_LDKEvent_OpenChannelRequest_get_push_msat(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_OpenChannelRequest); int64_t push_msat_conv = obj->open_channel_request.push_msat; return push_msat_conv; } -uint32_t __attribute__((export_name("TS_LDKEvent_OpenChannelRequest_get_channel_type"))) TS_LDKEvent_OpenChannelRequest_get_channel_type(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKEvent_OpenChannelRequest_get_channel_type"))) TS_LDKEvent_OpenChannelRequest_get_channel_type(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_OpenChannelRequest); LDKChannelTypeFeatures channel_type_var = obj->open_channel_request.channel_type; - uint32_t channel_type_ref = 0; - CHECK((((uintptr_t)channel_type_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&channel_type_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t channel_type_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_type_var); - channel_type_ref = (uintptr_t)channel_type_var.inner & ~1; + channel_type_ref = tag_ptr(channel_type_var.inner, false); return channel_type_ref; } -int8_tArray __attribute__((export_name("TS_LDKEvent_HTLCHandlingFailed_get_prev_channel_id"))) TS_LDKEvent_HTLCHandlingFailed_get_prev_channel_id(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKEvent_HTLCHandlingFailed_get_prev_channel_id"))) TS_LDKEvent_HTLCHandlingFailed_get_prev_channel_id(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_HTLCHandlingFailed); int8_tArray prev_channel_id_arr = init_int8_tArray(32, __LINE__); memcpy(prev_channel_id_arr->elems, obj->htlc_handling_failed.prev_channel_id.data, 32); return prev_channel_id_arr; } -uint32_t __attribute__((export_name("TS_LDKEvent_HTLCHandlingFailed_get_failed_next_destination"))) TS_LDKEvent_HTLCHandlingFailed_get_failed_next_destination(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKEvent_HTLCHandlingFailed_get_failed_next_destination"))) TS_LDKEvent_HTLCHandlingFailed_get_failed_next_destination(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_HTLCHandlingFailed); - uint32_t failed_next_destination_ref = ((uintptr_t)&obj->htlc_handling_failed.failed_next_destination) | 1; + uint64_t failed_next_destination_ref = tag_ptr(&obj->htlc_handling_failed.failed_next_destination, false); return failed_next_destination_ref; } -uint32_t __attribute__((export_name("TS_LDKCOption_EventZ_ty_from_ptr"))) TS_LDKCOption_EventZ_ty_from_ptr(uint32_t ptr) { - LDKCOption_EventZ *obj = (LDKCOption_EventZ*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKCOption_EventZ_ty_from_ptr"))) TS_LDKCOption_EventZ_ty_from_ptr(uint64_t ptr) { + LDKCOption_EventZ *obj = (LDKCOption_EventZ*)untag_ptr(ptr); switch(obj->tag) { case LDKCOption_EventZ_Some: return 0; case LDKCOption_EventZ_None: return 1; default: abort(); } } -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); +uint64_t __attribute__((export_name("TS_LDKCOption_EventZ_Some_get_some"))) TS_LDKCOption_EventZ_Some_get_some(uint64_t ptr) { + LDKCOption_EventZ *obj = (LDKCOption_EventZ*)untag_ptr(ptr); assert(obj->tag == LDKCOption_EventZ_Some); - uint32_t some_ref = ((uintptr_t)&obj->some) | 1; + uint64_t some_ref = tag_ptr(&obj->some, false); return some_ref; } static inline struct LDKCOption_EventZ CResult_COption_EventZDecodeErrorZ_get_ok(LDKCResult_COption_EventZDecodeErrorZ *NONNULL_PTR owner){ CHECK(owner->result_ok); return COption_EventZ_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_get_ok"))) TS_CResult_COption_EventZDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_COption_EventZDecodeErrorZ* owner_conv = (LDKCResult_COption_EventZDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_get_ok"))) TS_CResult_COption_EventZDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_COption_EventZDecodeErrorZ* owner_conv = (LDKCResult_COption_EventZDecodeErrorZ*)untag_ptr(owner); LDKCOption_EventZ *ret_copy = MALLOC(sizeof(LDKCOption_EventZ), "LDKCOption_EventZ"); *ret_copy = CResult_COption_EventZDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } @@ -2092,22 +1923,17 @@ static inline struct LDKDecodeError CResult_COption_EventZDecodeErrorZ_get_err(L CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_get_err"))) TS_CResult_COption_EventZDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_COption_EventZDecodeErrorZ* owner_conv = (LDKCResult_COption_EventZDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_COption_EventZDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_LDKErrorAction_ty_from_ptr"))) TS_LDKErrorAction_ty_from_ptr(uint32_t ptr) { - LDKErrorAction *obj = (LDKErrorAction*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKErrorAction_ty_from_ptr"))) TS_LDKErrorAction_ty_from_ptr(uint64_t ptr) { + LDKErrorAction *obj = (LDKErrorAction*)untag_ptr(ptr); switch(obj->tag) { case LDKErrorAction_DisconnectPeer: return 0; case LDKErrorAction_IgnoreError: return 1; @@ -2118,55 +1944,47 @@ uint32_t __attribute__((export_name("TS_LDKErrorAction_ty_from_ptr"))) TS_LDKErr default: abort(); } } -uint32_t __attribute__((export_name("TS_LDKErrorAction_DisconnectPeer_get_msg"))) TS_LDKErrorAction_DisconnectPeer_get_msg(uint32_t ptr) { - LDKErrorAction *obj = (LDKErrorAction*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKErrorAction_DisconnectPeer_get_msg"))) TS_LDKErrorAction_DisconnectPeer_get_msg(uint64_t ptr) { + LDKErrorAction *obj = (LDKErrorAction*)untag_ptr(ptr); assert(obj->tag == LDKErrorAction_DisconnectPeer); LDKErrorMessage msg_var = obj->disconnect_peer.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; - } + msg_ref = tag_ptr(msg_var.inner, false); return msg_ref; } -uint32_t __attribute__((export_name("TS_LDKErrorAction_IgnoreAndLog_get_ignore_and_log"))) TS_LDKErrorAction_IgnoreAndLog_get_ignore_and_log(uint32_t ptr) { - LDKErrorAction *obj = (LDKErrorAction*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKErrorAction_IgnoreAndLog_get_ignore_and_log"))) TS_LDKErrorAction_IgnoreAndLog_get_ignore_and_log(uint64_t ptr) { + LDKErrorAction *obj = (LDKErrorAction*)untag_ptr(ptr); assert(obj->tag == LDKErrorAction_IgnoreAndLog); uint32_t ignore_and_log_conv = LDKLevel_to_js(obj->ignore_and_log); return ignore_and_log_conv; } -uint32_t __attribute__((export_name("TS_LDKErrorAction_SendErrorMessage_get_msg"))) TS_LDKErrorAction_SendErrorMessage_get_msg(uint32_t ptr) { - LDKErrorAction *obj = (LDKErrorAction*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKErrorAction_SendErrorMessage_get_msg"))) TS_LDKErrorAction_SendErrorMessage_get_msg(uint64_t ptr) { + LDKErrorAction *obj = (LDKErrorAction*)untag_ptr(ptr); assert(obj->tag == LDKErrorAction_SendErrorMessage); LDKErrorMessage msg_var = obj->send_error_message.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); return msg_ref; } -uint32_t __attribute__((export_name("TS_LDKErrorAction_SendWarningMessage_get_msg"))) TS_LDKErrorAction_SendWarningMessage_get_msg(uint32_t ptr) { - LDKErrorAction *obj = (LDKErrorAction*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKErrorAction_SendWarningMessage_get_msg"))) TS_LDKErrorAction_SendWarningMessage_get_msg(uint64_t ptr) { + LDKErrorAction *obj = (LDKErrorAction*)untag_ptr(ptr); assert(obj->tag == LDKErrorAction_SendWarningMessage); LDKWarningMessage msg_var = obj->send_warning_message.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); return msg_ref; } -uint32_t __attribute__((export_name("TS_LDKErrorAction_SendWarningMessage_get_log_level"))) TS_LDKErrorAction_SendWarningMessage_get_log_level(uint32_t ptr) { - LDKErrorAction *obj = (LDKErrorAction*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKErrorAction_SendWarningMessage_get_log_level"))) TS_LDKErrorAction_SendWarningMessage_get_log_level(uint64_t ptr) { + LDKErrorAction *obj = (LDKErrorAction*)untag_ptr(ptr); assert(obj->tag == LDKErrorAction_SendWarningMessage); uint32_t log_level_conv = LDKLevel_to_js(obj->send_warning_message.log_level); return log_level_conv; } -uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_ty_from_ptr"))) TS_LDKMessageSendEvent_ty_from_ptr(uint32_t ptr) { - LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_ty_from_ptr"))) TS_LDKMessageSendEvent_ty_from_ptr(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); switch(obj->tag) { case LDKMessageSendEvent_SendAcceptChannel: return 0; case LDKMessageSendEvent_SendOpenChannel: return 1; @@ -2191,349 +2009,309 @@ uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_ty_from_ptr"))) TS_L default: abort(); } } -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); +int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendAcceptChannel_get_node_id"))) TS_LDKMessageSendEvent_SendAcceptChannel_get_node_id(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendAcceptChannel); 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; } -uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendAcceptChannel_get_msg"))) TS_LDKMessageSendEvent_SendAcceptChannel_get_msg(uint32_t ptr) { - LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_SendAcceptChannel_get_msg"))) TS_LDKMessageSendEvent_SendAcceptChannel_get_msg(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendAcceptChannel); LDKAcceptChannel msg_var = obj->send_accept_channel.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); 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); +int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendOpenChannel_get_node_id"))) TS_LDKMessageSendEvent_SendOpenChannel_get_node_id(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendOpenChannel); 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; } -uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendOpenChannel_get_msg"))) TS_LDKMessageSendEvent_SendOpenChannel_get_msg(uint32_t ptr) { - LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_SendOpenChannel_get_msg"))) TS_LDKMessageSendEvent_SendOpenChannel_get_msg(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendOpenChannel); LDKOpenChannel msg_var = obj->send_open_channel.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); 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); +int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendFundingCreated_get_node_id"))) TS_LDKMessageSendEvent_SendFundingCreated_get_node_id(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendFundingCreated); 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; } -uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendFundingCreated_get_msg"))) TS_LDKMessageSendEvent_SendFundingCreated_get_msg(uint32_t ptr) { - LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_SendFundingCreated_get_msg"))) TS_LDKMessageSendEvent_SendFundingCreated_get_msg(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendFundingCreated); LDKFundingCreated msg_var = obj->send_funding_created.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); 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); +int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendFundingSigned_get_node_id"))) TS_LDKMessageSendEvent_SendFundingSigned_get_node_id(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendFundingSigned); 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; } -uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendFundingSigned_get_msg"))) TS_LDKMessageSendEvent_SendFundingSigned_get_msg(uint32_t ptr) { - LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_SendFundingSigned_get_msg"))) TS_LDKMessageSendEvent_SendFundingSigned_get_msg(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendFundingSigned); LDKFundingSigned msg_var = obj->send_funding_signed.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); return msg_ref; } -int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendChannelReady_get_node_id"))) TS_LDKMessageSendEvent_SendChannelReady_get_node_id(uint32_t ptr) { - LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendChannelReady_get_node_id"))) TS_LDKMessageSendEvent_SendChannelReady_get_node_id(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendChannelReady); int8_tArray node_id_arr = init_int8_tArray(33, __LINE__); memcpy(node_id_arr->elems, obj->send_channel_ready.node_id.compressed_form, 33); return node_id_arr; } -uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendChannelReady_get_msg"))) TS_LDKMessageSendEvent_SendChannelReady_get_msg(uint32_t ptr) { - LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_SendChannelReady_get_msg"))) TS_LDKMessageSendEvent_SendChannelReady_get_msg(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendChannelReady); LDKChannelReady msg_var = obj->send_channel_ready.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); 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); +int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendAnnouncementSignatures_get_node_id"))) TS_LDKMessageSendEvent_SendAnnouncementSignatures_get_node_id(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendAnnouncementSignatures); 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; } -uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendAnnouncementSignatures_get_msg"))) TS_LDKMessageSendEvent_SendAnnouncementSignatures_get_msg(uint32_t ptr) { - LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_SendAnnouncementSignatures_get_msg"))) TS_LDKMessageSendEvent_SendAnnouncementSignatures_get_msg(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendAnnouncementSignatures); LDKAnnouncementSignatures msg_var = obj->send_announcement_signatures.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); 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); +int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_UpdateHTLCs_get_node_id"))) TS_LDKMessageSendEvent_UpdateHTLCs_get_node_id(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_UpdateHTLCs); 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; } -uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_UpdateHTLCs_get_updates"))) TS_LDKMessageSendEvent_UpdateHTLCs_get_updates(uint32_t ptr) { - LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_UpdateHTLCs_get_updates"))) TS_LDKMessageSendEvent_UpdateHTLCs_get_updates(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_UpdateHTLCs); LDKCommitmentUpdate updates_var = obj->update_htl_cs.updates; - uint32_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. + uint64_t updates_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(updates_var); - updates_ref = (uintptr_t)updates_var.inner & ~1; + updates_ref = tag_ptr(updates_var.inner, false); 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); +int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendRevokeAndACK_get_node_id"))) TS_LDKMessageSendEvent_SendRevokeAndACK_get_node_id(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendRevokeAndACK); 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; } -uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendRevokeAndACK_get_msg"))) TS_LDKMessageSendEvent_SendRevokeAndACK_get_msg(uint32_t ptr) { - LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_SendRevokeAndACK_get_msg"))) TS_LDKMessageSendEvent_SendRevokeAndACK_get_msg(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendRevokeAndACK); LDKRevokeAndACK msg_var = obj->send_revoke_and_ack.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); 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); +int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendClosingSigned_get_node_id"))) TS_LDKMessageSendEvent_SendClosingSigned_get_node_id(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendClosingSigned); 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; } -uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendClosingSigned_get_msg"))) TS_LDKMessageSendEvent_SendClosingSigned_get_msg(uint32_t ptr) { - LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_SendClosingSigned_get_msg"))) TS_LDKMessageSendEvent_SendClosingSigned_get_msg(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendClosingSigned); LDKClosingSigned msg_var = obj->send_closing_signed.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); 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); +int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendShutdown_get_node_id"))) TS_LDKMessageSendEvent_SendShutdown_get_node_id(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendShutdown); 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; } -uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendShutdown_get_msg"))) TS_LDKMessageSendEvent_SendShutdown_get_msg(uint32_t ptr) { - LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_SendShutdown_get_msg"))) TS_LDKMessageSendEvent_SendShutdown_get_msg(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendShutdown); LDKShutdown msg_var = obj->send_shutdown.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); 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); +int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendChannelReestablish_get_node_id"))) TS_LDKMessageSendEvent_SendChannelReestablish_get_node_id(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendChannelReestablish); 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; } -uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendChannelReestablish_get_msg"))) TS_LDKMessageSendEvent_SendChannelReestablish_get_msg(uint32_t ptr) { - LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_SendChannelReestablish_get_msg"))) TS_LDKMessageSendEvent_SendChannelReestablish_get_msg(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendChannelReestablish); LDKChannelReestablish msg_var = obj->send_channel_reestablish.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); 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); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_BroadcastChannelAnnouncement_get_msg"))) TS_LDKMessageSendEvent_BroadcastChannelAnnouncement_get_msg(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_BroadcastChannelAnnouncement); LDKChannelAnnouncement msg_var = obj->broadcast_channel_announcement.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); 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); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_BroadcastChannelAnnouncement_get_update_msg"))) TS_LDKMessageSendEvent_BroadcastChannelAnnouncement_get_update_msg(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_BroadcastChannelAnnouncement); LDKChannelUpdate update_msg_var = obj->broadcast_channel_announcement.update_msg; - uint32_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. + uint64_t update_msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(update_msg_var); - update_msg_ref = (uintptr_t)update_msg_var.inner & ~1; + update_msg_ref = tag_ptr(update_msg_var.inner, false); 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); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_BroadcastNodeAnnouncement_get_msg"))) TS_LDKMessageSendEvent_BroadcastNodeAnnouncement_get_msg(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_BroadcastNodeAnnouncement); LDKNodeAnnouncement msg_var = obj->broadcast_node_announcement.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); 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); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_BroadcastChannelUpdate_get_msg"))) TS_LDKMessageSendEvent_BroadcastChannelUpdate_get_msg(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_BroadcastChannelUpdate); LDKChannelUpdate msg_var = obj->broadcast_channel_update.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); 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); +int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendChannelUpdate_get_node_id"))) TS_LDKMessageSendEvent_SendChannelUpdate_get_node_id(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendChannelUpdate); 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; } -uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendChannelUpdate_get_msg"))) TS_LDKMessageSendEvent_SendChannelUpdate_get_msg(uint32_t ptr) { - LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_SendChannelUpdate_get_msg"))) TS_LDKMessageSendEvent_SendChannelUpdate_get_msg(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendChannelUpdate); LDKChannelUpdate msg_var = obj->send_channel_update.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); 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); +int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_HandleError_get_node_id"))) TS_LDKMessageSendEvent_HandleError_get_node_id(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_HandleError); 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); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_HandleError_get_action"))) TS_LDKMessageSendEvent_HandleError_get_action(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_HandleError); - uint32_t action_ref = ((uintptr_t)&obj->handle_error.action) | 1; + uint64_t action_ref = tag_ptr(&obj->handle_error.action, false); 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); +int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendChannelRangeQuery_get_node_id"))) TS_LDKMessageSendEvent_SendChannelRangeQuery_get_node_id(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendChannelRangeQuery); 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; } -uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendChannelRangeQuery_get_msg"))) TS_LDKMessageSendEvent_SendChannelRangeQuery_get_msg(uint32_t ptr) { - LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_SendChannelRangeQuery_get_msg"))) TS_LDKMessageSendEvent_SendChannelRangeQuery_get_msg(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendChannelRangeQuery); LDKQueryChannelRange msg_var = obj->send_channel_range_query.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); 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); +int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendShortIdsQuery_get_node_id"))) TS_LDKMessageSendEvent_SendShortIdsQuery_get_node_id(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendShortIdsQuery); 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; } -uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendShortIdsQuery_get_msg"))) TS_LDKMessageSendEvent_SendShortIdsQuery_get_msg(uint32_t ptr) { - LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_SendShortIdsQuery_get_msg"))) TS_LDKMessageSendEvent_SendShortIdsQuery_get_msg(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendShortIdsQuery); LDKQueryShortChannelIds msg_var = obj->send_short_ids_query.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); 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); +int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendReplyChannelRange_get_node_id"))) TS_LDKMessageSendEvent_SendReplyChannelRange_get_node_id(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendReplyChannelRange); 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; } -uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendReplyChannelRange_get_msg"))) TS_LDKMessageSendEvent_SendReplyChannelRange_get_msg(uint32_t ptr) { - LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_SendReplyChannelRange_get_msg"))) TS_LDKMessageSendEvent_SendReplyChannelRange_get_msg(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendReplyChannelRange); LDKReplyChannelRange msg_var = obj->send_reply_channel_range.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); return msg_ref; } -int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendGossipTimestampFilter_get_node_id"))) TS_LDKMessageSendEvent_SendGossipTimestampFilter_get_node_id(uint32_t ptr) { - LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendGossipTimestampFilter_get_node_id"))) TS_LDKMessageSendEvent_SendGossipTimestampFilter_get_node_id(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendGossipTimestampFilter); int8_tArray node_id_arr = init_int8_tArray(33, __LINE__); memcpy(node_id_arr->elems, obj->send_gossip_timestamp_filter.node_id.compressed_form, 33); return node_id_arr; } -uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendGossipTimestampFilter_get_msg"))) TS_LDKMessageSendEvent_SendGossipTimestampFilter_get_msg(uint32_t ptr) { - LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_SendGossipTimestampFilter_get_msg"))) TS_LDKMessageSendEvent_SendGossipTimestampFilter_get_msg(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendGossipTimestampFilter); LDKGossipTimestampFilter msg_var = obj->send_gossip_timestamp_filter.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); return msg_ref; } static inline LDKCVec_MessageSendEventZ CVec_MessageSendEventZ_clone(const LDKCVec_MessageSendEventZ *orig) { @@ -2547,19 +2325,19 @@ static inline struct LDKTxOut CResult_TxOutAccessErrorZ_get_ok(LDKCResult_TxOutA CHECK(owner->result_ok); return TxOut_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_get_ok"))) TS_CResult_TxOutAccessErrorZ_get_ok(uint32_t owner) { - LDKCResult_TxOutAccessErrorZ* owner_conv = (LDKCResult_TxOutAccessErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_get_ok"))) TS_CResult_TxOutAccessErrorZ_get_ok(uint64_t owner) { + LDKCResult_TxOutAccessErrorZ* owner_conv = (LDKCResult_TxOutAccessErrorZ*)untag_ptr(owner); LDKTxOut* ret_ref = MALLOC(sizeof(LDKTxOut), "LDKTxOut"); *ret_ref = CResult_TxOutAccessErrorZ_get_ok(owner_conv); - return (uint32_t)ret_ref; + return tag_ptr(ret_ref, true); } static inline enum LDKAccessError CResult_TxOutAccessErrorZ_get_err(LDKCResult_TxOutAccessErrorZ *NONNULL_PTR owner){ CHECK(!owner->result_ok); return AccessError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_get_err"))) TS_CResult_TxOutAccessErrorZ_get_err(uint32_t owner) { - LDKCResult_TxOutAccessErrorZ* owner_conv = (LDKCResult_TxOutAccessErrorZ*)(owner & ~1); +uint32_t __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_get_err"))) TS_CResult_TxOutAccessErrorZ_get_err(uint64_t owner) { + LDKCResult_TxOutAccessErrorZ* owner_conv = (LDKCResult_TxOutAccessErrorZ*)untag_ptr(owner); uint32_t ret_conv = LDKAccessError_to_js(CResult_TxOutAccessErrorZ_get_err(owner_conv)); return ret_conv; } @@ -2567,8 +2345,8 @@ uint32_t __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_get_err"))) T static inline uintptr_t C2Tuple_usizeTransactionZ_get_a(LDKC2Tuple_usizeTransactionZ *NONNULL_PTR owner){ return owner->a; } -uint32_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); +uint32_t __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_get_a"))) TS_C2Tuple_usizeTransactionZ_get_a(uint64_t owner) { + LDKC2Tuple_usizeTransactionZ* owner_conv = (LDKC2Tuple_usizeTransactionZ*)untag_ptr(owner); uint32_t ret_conv = C2Tuple_usizeTransactionZ_get_a(owner_conv); return ret_conv; } @@ -2576,8 +2354,8 @@ uint32_t __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_get_a"))) TS_ static inline struct LDKTransaction C2Tuple_usizeTransactionZ_get_b(LDKC2Tuple_usizeTransactionZ *NONNULL_PTR owner){ return owner->b; } -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); +int8_tArray __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_get_b"))) TS_C2Tuple_usizeTransactionZ_get_b(uint64_t owner) { + LDKC2Tuple_usizeTransactionZ* owner_conv = (LDKC2Tuple_usizeTransactionZ*)untag_ptr(owner); LDKTransaction ret_var = C2Tuple_usizeTransactionZ_get_b(owner_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -2602,8 +2380,8 @@ static inline void CResult_NoneChannelMonitorUpdateErrZ_get_ok(LDKCResult_NoneCh CHECK(owner->result_ok); return *owner->contents.result; } -void __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_get_ok"))) TS_CResult_NoneChannelMonitorUpdateErrZ_get_ok(uint32_t owner) { - LDKCResult_NoneChannelMonitorUpdateErrZ* owner_conv = (LDKCResult_NoneChannelMonitorUpdateErrZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_get_ok"))) TS_CResult_NoneChannelMonitorUpdateErrZ_get_ok(uint64_t owner) { + LDKCResult_NoneChannelMonitorUpdateErrZ* owner_conv = (LDKCResult_NoneChannelMonitorUpdateErrZ*)untag_ptr(owner); CResult_NoneChannelMonitorUpdateErrZ_get_ok(owner_conv); } @@ -2611,14 +2389,14 @@ static inline enum LDKChannelMonitorUpdateErr CResult_NoneChannelMonitorUpdateEr CHECK(!owner->result_ok); return ChannelMonitorUpdateErr_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_get_err"))) TS_CResult_NoneChannelMonitorUpdateErrZ_get_err(uint32_t owner) { - LDKCResult_NoneChannelMonitorUpdateErrZ* owner_conv = (LDKCResult_NoneChannelMonitorUpdateErrZ*)(owner & ~1); +uint32_t __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_get_err"))) TS_CResult_NoneChannelMonitorUpdateErrZ_get_err(uint64_t owner) { + LDKCResult_NoneChannelMonitorUpdateErrZ* owner_conv = (LDKCResult_NoneChannelMonitorUpdateErrZ*)untag_ptr(owner); uint32_t ret_conv = LDKChannelMonitorUpdateErr_to_js(CResult_NoneChannelMonitorUpdateErrZ_get_err(owner_conv)); return ret_conv; } -uint32_t __attribute__((export_name("TS_LDKMonitorEvent_ty_from_ptr"))) TS_LDKMonitorEvent_ty_from_ptr(uint32_t ptr) { - LDKMonitorEvent *obj = (LDKMonitorEvent*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKMonitorEvent_ty_from_ptr"))) TS_LDKMonitorEvent_ty_from_ptr(uint64_t ptr) { + LDKMonitorEvent *obj = (LDKMonitorEvent*)untag_ptr(ptr); switch(obj->tag) { case LDKMonitorEvent_HTLCEvent: return 0; case LDKMonitorEvent_CommitmentTxConfirmed: return 1; @@ -2627,54 +2405,46 @@ uint32_t __attribute__((export_name("TS_LDKMonitorEvent_ty_from_ptr"))) TS_LDKMo default: abort(); } } -uint32_t __attribute__((export_name("TS_LDKMonitorEvent_HTLCEvent_get_htlc_event"))) TS_LDKMonitorEvent_HTLCEvent_get_htlc_event(uint32_t ptr) { - LDKMonitorEvent *obj = (LDKMonitorEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKMonitorEvent_HTLCEvent_get_htlc_event"))) TS_LDKMonitorEvent_HTLCEvent_get_htlc_event(uint64_t ptr) { + LDKMonitorEvent *obj = (LDKMonitorEvent*)untag_ptr(ptr); assert(obj->tag == LDKMonitorEvent_HTLCEvent); LDKHTLCUpdate htlc_event_var = obj->htlc_event; - uint32_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. + uint64_t htlc_event_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(htlc_event_var); - htlc_event_ref = (uintptr_t)htlc_event_var.inner & ~1; + htlc_event_ref = tag_ptr(htlc_event_var.inner, false); 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); +uint64_t __attribute__((export_name("TS_LDKMonitorEvent_CommitmentTxConfirmed_get_commitment_tx_confirmed"))) TS_LDKMonitorEvent_CommitmentTxConfirmed_get_commitment_tx_confirmed(uint64_t ptr) { + LDKMonitorEvent *obj = (LDKMonitorEvent*)untag_ptr(ptr); assert(obj->tag == LDKMonitorEvent_CommitmentTxConfirmed); LDKOutPoint commitment_tx_confirmed_var = obj->commitment_tx_confirmed; - uint32_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. + uint64_t commitment_tx_confirmed_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(commitment_tx_confirmed_var); - commitment_tx_confirmed_ref = (uintptr_t)commitment_tx_confirmed_var.inner & ~1; + commitment_tx_confirmed_ref = tag_ptr(commitment_tx_confirmed_var.inner, false); 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); +uint64_t __attribute__((export_name("TS_LDKMonitorEvent_UpdateCompleted_get_funding_txo"))) TS_LDKMonitorEvent_UpdateCompleted_get_funding_txo(uint64_t ptr) { + LDKMonitorEvent *obj = (LDKMonitorEvent*)untag_ptr(ptr); assert(obj->tag == LDKMonitorEvent_UpdateCompleted); LDKOutPoint funding_txo_var = obj->update_completed.funding_txo; - uint32_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. + uint64_t funding_txo_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_txo_var); - funding_txo_ref = (uintptr_t)funding_txo_var.inner & ~1; + funding_txo_ref = tag_ptr(funding_txo_var.inner, false); 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) { - LDKMonitorEvent *obj = (LDKMonitorEvent*)(ptr & ~1); +int64_t __attribute__((export_name("TS_LDKMonitorEvent_UpdateCompleted_get_monitor_update_id"))) TS_LDKMonitorEvent_UpdateCompleted_get_monitor_update_id(uint64_t ptr) { + LDKMonitorEvent *obj = (LDKMonitorEvent*)untag_ptr(ptr); assert(obj->tag == LDKMonitorEvent_UpdateCompleted); int64_t monitor_update_id_conv = obj->update_completed.monitor_update_id; return monitor_update_id_conv; } -uint32_t __attribute__((export_name("TS_LDKMonitorEvent_UpdateFailed_get_update_failed"))) TS_LDKMonitorEvent_UpdateFailed_get_update_failed(uint32_t ptr) { - LDKMonitorEvent *obj = (LDKMonitorEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKMonitorEvent_UpdateFailed_get_update_failed"))) TS_LDKMonitorEvent_UpdateFailed_get_update_failed(uint64_t ptr) { + LDKMonitorEvent *obj = (LDKMonitorEvent*)untag_ptr(ptr); assert(obj->tag == LDKMonitorEvent_UpdateFailed); LDKOutPoint update_failed_var = obj->update_failed; - uint32_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. + uint64_t update_failed_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(update_failed_var); - update_failed_ref = (uintptr_t)update_failed_var.inner & ~1; + update_failed_ref = tag_ptr(update_failed_var.inner, false); return update_failed_ref; } static inline LDKCVec_MonitorEventZ CVec_MonitorEventZ_clone(const LDKCVec_MonitorEventZ *orig) { @@ -2687,33 +2457,28 @@ static inline LDKCVec_MonitorEventZ CVec_MonitorEventZ_clone(const LDKCVec_Monit static inline struct LDKOutPoint C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_a(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ *NONNULL_PTR owner){ return OutPoint_clone(&owner->a); } -uint32_t __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_a"))) TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_a(uint32_t owner) { - LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ* owner_conv = (LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_a"))) TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_a(uint64_t owner) { + LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ* owner_conv = (LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ*)untag_ptr(owner); LDKOutPoint ret_var = C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_a(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } static inline struct LDKCVec_MonitorEventZ C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_b(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ *NONNULL_PTR owner){ return CVec_MonitorEventZ_clone(&owner->b); } -uint32_tArray __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_b"))) TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_b(uint32_t owner) { - LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ* owner_conv = (LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ*)(owner & ~1); +uint64_tArray __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_b"))) TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_b(uint64_t owner) { + LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ* owner_conv = (LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ*)untag_ptr(owner); LDKCVec_MonitorEventZ ret_var = C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_b(owner_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t o = 0; o < ret_var.datalen; o++) { LDKMonitorEvent *ret_conv_14_copy = MALLOC(sizeof(LDKMonitorEvent), "LDKMonitorEvent"); *ret_conv_14_copy = ret_var.data[o]; - uint32_t ret_conv_14_ref = (uintptr_t)ret_conv_14_copy; + uint64_t ret_conv_14_ref = tag_ptr(ret_conv_14_copy, true); ret_arr_ptr[o] = ret_conv_14_ref; } @@ -2724,8 +2489,8 @@ uint32_tArray __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZ static inline struct LDKPublicKey C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_c(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ *NONNULL_PTR owner){ return owner->c; } -int8_tArray __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_c"))) TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_c(uint32_t owner) { - LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ* owner_conv = (LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ*)(owner & ~1); +int8_tArray __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_c"))) TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_c(uint64_t owner) { + LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ* owner_conv = (LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ*)untag_ptr(owner); int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_c(owner_conv).compressed_form, 33); return ret_arr; @@ -2738,37 +2503,32 @@ static inline LDKCVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ CVec_C3Tuple } return ret; } -uint32_t __attribute__((export_name("TS_LDKCOption_C2Tuple_usizeTransactionZZ_ty_from_ptr"))) TS_LDKCOption_C2Tuple_usizeTransactionZZ_ty_from_ptr(uint32_t ptr) { - LDKCOption_C2Tuple_usizeTransactionZZ *obj = (LDKCOption_C2Tuple_usizeTransactionZZ*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKCOption_C2Tuple_usizeTransactionZZ_ty_from_ptr"))) TS_LDKCOption_C2Tuple_usizeTransactionZZ_ty_from_ptr(uint64_t ptr) { + LDKCOption_C2Tuple_usizeTransactionZZ *obj = (LDKCOption_C2Tuple_usizeTransactionZZ*)untag_ptr(ptr); switch(obj->tag) { case LDKCOption_C2Tuple_usizeTransactionZZ_Some: return 0; case LDKCOption_C2Tuple_usizeTransactionZZ_None: return 1; default: abort(); } } -uint32_t __attribute__((export_name("TS_LDKCOption_C2Tuple_usizeTransactionZZ_Some_get_some"))) TS_LDKCOption_C2Tuple_usizeTransactionZZ_Some_get_some(uint32_t ptr) { - LDKCOption_C2Tuple_usizeTransactionZZ *obj = (LDKCOption_C2Tuple_usizeTransactionZZ*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKCOption_C2Tuple_usizeTransactionZZ_Some_get_some"))) TS_LDKCOption_C2Tuple_usizeTransactionZZ_Some_get_some(uint64_t ptr) { + LDKCOption_C2Tuple_usizeTransactionZZ *obj = (LDKCOption_C2Tuple_usizeTransactionZZ*)untag_ptr(ptr); assert(obj->tag == LDKCOption_C2Tuple_usizeTransactionZZ_Some); LDKC2Tuple_usizeTransactionZ* some_conv = MALLOC(sizeof(LDKC2Tuple_usizeTransactionZ), "LDKC2Tuple_usizeTransactionZ"); *some_conv = obj->some; *some_conv = C2Tuple_usizeTransactionZ_clone(some_conv); - return ((uint32_t)some_conv); + return tag_ptr(some_conv, true); } static inline struct LDKFixedPenaltyScorer CResult_FixedPenaltyScorerDecodeErrorZ_get_ok(LDKCResult_FixedPenaltyScorerDecodeErrorZ *NONNULL_PTR owner){ CHECK(owner->result_ok); return FixedPenaltyScorer_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_get_ok"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_FixedPenaltyScorerDecodeErrorZ* owner_conv = (LDKCResult_FixedPenaltyScorerDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_get_ok"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_FixedPenaltyScorerDecodeErrorZ* owner_conv = (LDKCResult_FixedPenaltyScorerDecodeErrorZ*)untag_ptr(owner); LDKFixedPenaltyScorer ret_var = CResult_FixedPenaltyScorerDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -2776,25 +2536,20 @@ static inline struct LDKDecodeError CResult_FixedPenaltyScorerDecodeErrorZ_get_e CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_get_err"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_get_err(uint32_t owner) { - LDKCResult_FixedPenaltyScorerDecodeErrorZ* owner_conv = (LDKCResult_FixedPenaltyScorerDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_get_err"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_FixedPenaltyScorerDecodeErrorZ* owner_conv = (LDKCResult_FixedPenaltyScorerDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_FixedPenaltyScorerDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } static inline uint64_t C2Tuple_u64u64Z_get_a(LDKC2Tuple_u64u64Z *NONNULL_PTR owner){ return owner->a; } -int64_t __attribute__((export_name("TS_C2Tuple_u64u64Z_get_a"))) TS_C2Tuple_u64u64Z_get_a(uint32_t owner) { - LDKC2Tuple_u64u64Z* owner_conv = (LDKC2Tuple_u64u64Z*)(owner & ~1); +int64_t __attribute__((export_name("TS_C2Tuple_u64u64Z_get_a"))) TS_C2Tuple_u64u64Z_get_a(uint64_t owner) { + LDKC2Tuple_u64u64Z* owner_conv = (LDKC2Tuple_u64u64Z*)untag_ptr(owner); int64_t ret_conv = C2Tuple_u64u64Z_get_a(owner_conv); return ret_conv; } @@ -2802,27 +2557,27 @@ int64_t __attribute__((export_name("TS_C2Tuple_u64u64Z_get_a"))) TS_C2Tuple_u64 static inline uint64_t C2Tuple_u64u64Z_get_b(LDKC2Tuple_u64u64Z *NONNULL_PTR owner){ return owner->b; } -int64_t __attribute__((export_name("TS_C2Tuple_u64u64Z_get_b"))) TS_C2Tuple_u64u64Z_get_b(uint32_t owner) { - LDKC2Tuple_u64u64Z* owner_conv = (LDKC2Tuple_u64u64Z*)(owner & ~1); +int64_t __attribute__((export_name("TS_C2Tuple_u64u64Z_get_b"))) TS_C2Tuple_u64u64Z_get_b(uint64_t owner) { + LDKC2Tuple_u64u64Z* owner_conv = (LDKC2Tuple_u64u64Z*)untag_ptr(owner); int64_t ret_conv = C2Tuple_u64u64Z_get_b(owner_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_LDKCOption_C2Tuple_u64u64ZZ_ty_from_ptr"))) TS_LDKCOption_C2Tuple_u64u64ZZ_ty_from_ptr(uint32_t ptr) { - LDKCOption_C2Tuple_u64u64ZZ *obj = (LDKCOption_C2Tuple_u64u64ZZ*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKCOption_C2Tuple_u64u64ZZ_ty_from_ptr"))) TS_LDKCOption_C2Tuple_u64u64ZZ_ty_from_ptr(uint64_t ptr) { + LDKCOption_C2Tuple_u64u64ZZ *obj = (LDKCOption_C2Tuple_u64u64ZZ*)untag_ptr(ptr); switch(obj->tag) { case LDKCOption_C2Tuple_u64u64ZZ_Some: return 0; case LDKCOption_C2Tuple_u64u64ZZ_None: return 1; default: abort(); } } -uint32_t __attribute__((export_name("TS_LDKCOption_C2Tuple_u64u64ZZ_Some_get_some"))) TS_LDKCOption_C2Tuple_u64u64ZZ_Some_get_some(uint32_t ptr) { - LDKCOption_C2Tuple_u64u64ZZ *obj = (LDKCOption_C2Tuple_u64u64ZZ*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKCOption_C2Tuple_u64u64ZZ_Some_get_some"))) TS_LDKCOption_C2Tuple_u64u64ZZ_Some_get_some(uint64_t ptr) { + LDKCOption_C2Tuple_u64u64ZZ *obj = (LDKCOption_C2Tuple_u64u64ZZ*)untag_ptr(ptr); assert(obj->tag == LDKCOption_C2Tuple_u64u64ZZ_Some); LDKC2Tuple_u64u64Z* some_conv = MALLOC(sizeof(LDKC2Tuple_u64u64Z), "LDKC2Tuple_u64u64Z"); *some_conv = obj->some; *some_conv = C2Tuple_u64u64Z_clone(some_conv); - return ((uint32_t)some_conv); + return tag_ptr(some_conv, true); } static inline LDKCVec_NodeIdZ CVec_NodeIdZ_clone(const LDKCVec_NodeIdZ *orig) { LDKCVec_NodeIdZ ret = { .data = MALLOC(sizeof(LDKNodeId) * orig->datalen, "LDKCVec_NodeIdZ clone bytes"), .datalen = orig->datalen }; @@ -2844,16 +2599,11 @@ 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; - uint32_t record_ref = 0; + uint64_t record_ref = 0; record_var = Record_clone(&record_var); - 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 = (uintptr_t)record_var.inner; - if (record_var.is_owned) { - record_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 0, (uint32_t)record_ref, 0, 0, 0, 0, 0); + record_ref = tag_ptr(record_var.inner, record_var.is_owned); + js_invoke_function_buuuuu(j_calls->instance_ptr, 0, record_ref, 0, 0, 0, 0, 0); } static void LDKLogger_JCalls_cloned(LDKLogger* new_obj) { LDKLogger_JCalls *j_calls = (LDKLogger_JCalls*) new_obj->this_arg; @@ -2871,23 +2621,21 @@ static inline LDKLogger LDKLogger_init (JSValue o) { }; return ret; } -long __attribute__((export_name("TS_LDKLogger_new"))) TS_LDKLogger_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKLogger_new"))) TS_LDKLogger_new(JSValue o) { LDKLogger *res_ptr = MALLOC(sizeof(LDKLogger), "LDKLogger"); *res_ptr = LDKLogger_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } static inline struct LDKProbabilisticScorer *CResult_ProbabilisticScorerDecodeErrorZ_get_ok(LDKCResult_ProbabilisticScorerDecodeErrorZ *NONNULL_PTR owner){ CHECK(owner->result_ok); return &*owner->contents.result; } -uint32_t __attribute__((export_name("TS_CResult_ProbabilisticScorerDecodeErrorZ_get_ok"))) TS_CResult_ProbabilisticScorerDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_ProbabilisticScorerDecodeErrorZ* owner_conv = (LDKCResult_ProbabilisticScorerDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_ProbabilisticScorerDecodeErrorZ_get_ok"))) TS_CResult_ProbabilisticScorerDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ProbabilisticScorerDecodeErrorZ* owner_conv = (LDKCResult_ProbabilisticScorerDecodeErrorZ*)untag_ptr(owner); LDKProbabilisticScorer ret_var = *CResult_ProbabilisticScorerDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner & ~1; + ret_ref = tag_ptr(ret_var.inner, false); return ret_ref; } @@ -2895,17 +2643,12 @@ static inline struct LDKDecodeError CResult_ProbabilisticScorerDecodeErrorZ_get_ CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_ProbabilisticScorerDecodeErrorZ_get_err"))) TS_CResult_ProbabilisticScorerDecodeErrorZ_get_err(uint32_t owner) { - LDKCResult_ProbabilisticScorerDecodeErrorZ* owner_conv = (LDKCResult_ProbabilisticScorerDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_ProbabilisticScorerDecodeErrorZ_get_err"))) TS_CResult_ProbabilisticScorerDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ProbabilisticScorerDecodeErrorZ* owner_conv = (LDKCResult_ProbabilisticScorerDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ProbabilisticScorerDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -2913,17 +2656,12 @@ static inline struct LDKInitFeatures CResult_InitFeaturesDecodeErrorZ_get_ok(LDK CHECK(owner->result_ok); return InitFeatures_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_get_ok"))) TS_CResult_InitFeaturesDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_InitFeaturesDecodeErrorZ* owner_conv = (LDKCResult_InitFeaturesDecodeErrorZ*)untag_ptr(owner); LDKInitFeatures ret_var = CResult_InitFeaturesDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -2931,17 +2669,12 @@ static inline struct LDKDecodeError CResult_InitFeaturesDecodeErrorZ_get_err(LDK CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_get_err"))) TS_CResult_InitFeaturesDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_InitFeaturesDecodeErrorZ* owner_conv = (LDKCResult_InitFeaturesDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_InitFeaturesDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -2949,17 +2682,12 @@ static inline struct LDKChannelFeatures CResult_ChannelFeaturesDecodeErrorZ_get_ CHECK(owner->result_ok); return ChannelFeatures_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_get_ok"))) TS_CResult_ChannelFeaturesDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ChannelFeaturesDecodeErrorZ* owner_conv = (LDKCResult_ChannelFeaturesDecodeErrorZ*)untag_ptr(owner); LDKChannelFeatures ret_var = CResult_ChannelFeaturesDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -2967,17 +2695,12 @@ static inline struct LDKDecodeError CResult_ChannelFeaturesDecodeErrorZ_get_err( CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_get_err"))) TS_CResult_ChannelFeaturesDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ChannelFeaturesDecodeErrorZ* owner_conv = (LDKCResult_ChannelFeaturesDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ChannelFeaturesDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -2985,17 +2708,12 @@ static inline struct LDKNodeFeatures CResult_NodeFeaturesDecodeErrorZ_get_ok(LDK CHECK(owner->result_ok); return NodeFeatures_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_get_ok"))) TS_CResult_NodeFeaturesDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_NodeFeaturesDecodeErrorZ* owner_conv = (LDKCResult_NodeFeaturesDecodeErrorZ*)untag_ptr(owner); LDKNodeFeatures ret_var = CResult_NodeFeaturesDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3003,17 +2721,12 @@ static inline struct LDKDecodeError CResult_NodeFeaturesDecodeErrorZ_get_err(LDK CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_get_err"))) TS_CResult_NodeFeaturesDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_NodeFeaturesDecodeErrorZ* owner_conv = (LDKCResult_NodeFeaturesDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_NodeFeaturesDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3021,17 +2734,12 @@ static inline struct LDKInvoiceFeatures CResult_InvoiceFeaturesDecodeErrorZ_get_ CHECK(owner->result_ok); return InvoiceFeatures_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_get_ok"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_InvoiceFeaturesDecodeErrorZ* owner_conv = (LDKCResult_InvoiceFeaturesDecodeErrorZ*)untag_ptr(owner); LDKInvoiceFeatures ret_var = CResult_InvoiceFeaturesDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3039,17 +2747,12 @@ static inline struct LDKDecodeError CResult_InvoiceFeaturesDecodeErrorZ_get_err( CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_get_err"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_InvoiceFeaturesDecodeErrorZ* owner_conv = (LDKCResult_InvoiceFeaturesDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_InvoiceFeaturesDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3057,17 +2760,12 @@ static inline struct LDKChannelTypeFeatures CResult_ChannelTypeFeaturesDecodeErr CHECK(owner->result_ok); return ChannelTypeFeatures_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_get_ok"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ChannelTypeFeaturesDecodeErrorZ* owner_conv = (LDKCResult_ChannelTypeFeaturesDecodeErrorZ*)untag_ptr(owner); LDKChannelTypeFeatures ret_var = CResult_ChannelTypeFeaturesDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3075,17 +2773,12 @@ static inline struct LDKDecodeError CResult_ChannelTypeFeaturesDecodeErrorZ_get_ CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_get_err"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ChannelTypeFeaturesDecodeErrorZ* owner_conv = (LDKCResult_ChannelTypeFeaturesDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ChannelTypeFeaturesDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3093,17 +2786,12 @@ static inline struct LDKNodeId CResult_NodeIdDecodeErrorZ_get_ok(LDKCResult_Node CHECK(owner->result_ok); return NodeId_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_get_ok"))) TS_CResult_NodeIdDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_NodeIdDecodeErrorZ* owner_conv = (LDKCResult_NodeIdDecodeErrorZ*)untag_ptr(owner); LDKNodeId ret_var = CResult_NodeIdDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3111,17 +2799,12 @@ static inline struct LDKDecodeError CResult_NodeIdDecodeErrorZ_get_err(LDKCResul CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_get_err"))) TS_CResult_NodeIdDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_NodeIdDecodeErrorZ* owner_conv = (LDKCResult_NodeIdDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_NodeIdDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3129,11 +2812,11 @@ static inline struct LDKCOption_NetworkUpdateZ CResult_COption_NetworkUpdateZDec CHECK(owner->result_ok); return COption_NetworkUpdateZ_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_get_ok"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_COption_NetworkUpdateZDecodeErrorZ* owner_conv = (LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_get_ok"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_COption_NetworkUpdateZDecodeErrorZ* owner_conv = (LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)untag_ptr(owner); LDKCOption_NetworkUpdateZ *ret_copy = MALLOC(sizeof(LDKCOption_NetworkUpdateZ), "LDKCOption_NetworkUpdateZ"); *ret_copy = CResult_COption_NetworkUpdateZDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } @@ -3141,17 +2824,12 @@ static inline struct LDKDecodeError CResult_COption_NetworkUpdateZDecodeErrorZ_g CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_get_err"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_COption_NetworkUpdateZDecodeErrorZ* owner_conv = (LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_COption_NetworkUpdateZDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3170,11 +2848,11 @@ LDKCResult_TxOutAccessErrorZ get_utxo_LDKAccess_jcall(const void* this_arg, cons int8_tArray genesis_hash_arr = init_int8_tArray(32, __LINE__); memcpy(genesis_hash_arr->elems, *genesis_hash, 32); int64_t short_channel_id_conv = short_channel_id; - uint32_t ret = js_invoke_function_ubuuuu(j_calls->instance_ptr, 1, (uint32_t)genesis_hash_arr, (uint32_t)short_channel_id_conv, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + uint32_t ret = js_invoke_function_ubuuuu(j_calls->instance_ptr, 1, (uint32_t)genesis_hash_arr, short_channel_id_conv, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_TxOutAccessErrorZ ret_conv = *(LDKCResult_TxOutAccessErrorZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } static void LDKAccess_JCalls_cloned(LDKAccess* new_obj) { @@ -3193,14 +2871,14 @@ static inline LDKAccess LDKAccess_init (JSValue o) { }; return ret; } -long __attribute__((export_name("TS_LDKAccess_new"))) TS_LDKAccess_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKAccess_new"))) TS_LDKAccess_new(JSValue o) { LDKAccess *res_ptr = MALLOC(sizeof(LDKAccess), "LDKAccess"); *res_ptr = LDKAccess_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_Access_get_utxo"))) TS_Access_get_utxo(uint64_t this_arg, int8_tArray genesis_hash, int64_t short_channel_id) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); @@ -3208,19 +2886,19 @@ uint32_t __attribute__((export_name("TS_Access_get_utxo"))) TS_Access_get_utxo( 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_LDKCOption_AccessZ_ty_from_ptr"))) TS_LDKCOption_AccessZ_ty_from_ptr(uint32_t ptr) { - LDKCOption_AccessZ *obj = (LDKCOption_AccessZ*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKCOption_AccessZ_ty_from_ptr"))) TS_LDKCOption_AccessZ_ty_from_ptr(uint64_t ptr) { + LDKCOption_AccessZ *obj = (LDKCOption_AccessZ*)untag_ptr(ptr); switch(obj->tag) { case LDKCOption_AccessZ_Some: return 0; case LDKCOption_AccessZ_None: return 1; default: abort(); } } -uint32_t __attribute__((export_name("TS_LDKCOption_AccessZ_Some_get_some"))) TS_LDKCOption_AccessZ_Some_get_some(uint32_t ptr) { - LDKCOption_AccessZ *obj = (LDKCOption_AccessZ*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKCOption_AccessZ_Some_get_some"))) TS_LDKCOption_AccessZ_Some_get_some(uint64_t ptr) { + LDKCOption_AccessZ *obj = (LDKCOption_AccessZ*)untag_ptr(ptr); assert(obj->tag == LDKCOption_AccessZ_Some); LDKAccess* some_ret = MALLOC(sizeof(LDKAccess), "LDKAccess"); *some_ret = obj->some; @@ -3229,14 +2907,14 @@ uint32_t __attribute__((export_name("TS_LDKCOption_AccessZ_Some_get_some"))) TS_ // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKAccess_JCalls_cloned(&(*some_ret)); } - return (uint32_t)some_ret; + return tag_ptr(some_ret, true); } static inline bool CResult_boolLightningErrorZ_get_ok(LDKCResult_boolLightningErrorZ *NONNULL_PTR owner){ CHECK(owner->result_ok); return *owner->contents.result; } -jboolean __attribute__((export_name("TS_CResult_boolLightningErrorZ_get_ok"))) TS_CResult_boolLightningErrorZ_get_ok(uint32_t owner) { - LDKCResult_boolLightningErrorZ* owner_conv = (LDKCResult_boolLightningErrorZ*)(owner & ~1); +jboolean __attribute__((export_name("TS_CResult_boolLightningErrorZ_get_ok"))) TS_CResult_boolLightningErrorZ_get_ok(uint64_t owner) { + LDKCResult_boolLightningErrorZ* owner_conv = (LDKCResult_boolLightningErrorZ*)untag_ptr(owner); jboolean ret_conv = CResult_boolLightningErrorZ_get_ok(owner_conv); return ret_conv; } @@ -3245,68 +2923,48 @@ static inline struct LDKLightningError CResult_boolLightningErrorZ_get_err(LDKCR CHECK(!owner->result_ok); return LightningError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_boolLightningErrorZ_get_err"))) TS_CResult_boolLightningErrorZ_get_err(uint64_t owner) { + LDKCResult_boolLightningErrorZ* owner_conv = (LDKCResult_boolLightningErrorZ*)untag_ptr(owner); LDKLightningError ret_var = CResult_boolLightningErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } static inline struct LDKChannelAnnouncement C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_a(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ *NONNULL_PTR owner){ return ChannelAnnouncement_clone(&owner->a); } -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); +uint64_t __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_a"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_a(uint64_t owner) { + LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* owner_conv = (LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)untag_ptr(owner); LDKChannelAnnouncement ret_var = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_a(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } static inline struct LDKChannelUpdate C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_b(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ *NONNULL_PTR owner){ return ChannelUpdate_clone(&owner->b); } -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); +uint64_t __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_b"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_b(uint64_t owner) { + LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* owner_conv = (LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)untag_ptr(owner); LDKChannelUpdate ret_var = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_b(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } static inline struct LDKChannelUpdate C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_c(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ *NONNULL_PTR owner){ return ChannelUpdate_clone(&owner->c); } -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); +uint64_t __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_c"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_c(uint64_t owner) { + LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* owner_conv = (LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)untag_ptr(owner); LDKChannelUpdate ret_var = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_c(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3328,8 +2986,8 @@ static inline void CResult_NoneLightningErrorZ_get_ok(LDKCResult_NoneLightningEr CHECK(owner->result_ok); return *owner->contents.result; } -void __attribute__((export_name("TS_CResult_NoneLightningErrorZ_get_ok"))) TS_CResult_NoneLightningErrorZ_get_ok(uint32_t owner) { - LDKCResult_NoneLightningErrorZ* owner_conv = (LDKCResult_NoneLightningErrorZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_NoneLightningErrorZ_get_ok"))) TS_CResult_NoneLightningErrorZ_get_ok(uint64_t owner) { + LDKCResult_NoneLightningErrorZ* owner_conv = (LDKCResult_NoneLightningErrorZ*)untag_ptr(owner); CResult_NoneLightningErrorZ_get_ok(owner_conv); } @@ -3337,17 +2995,12 @@ static inline struct LDKLightningError CResult_NoneLightningErrorZ_get_err(LDKCR CHECK(!owner->result_ok); return LightningError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_NoneLightningErrorZ_get_err"))) TS_CResult_NoneLightningErrorZ_get_err(uint64_t owner) { + LDKCResult_NoneLightningErrorZ* owner_conv = (LDKCResult_NoneLightningErrorZ*)untag_ptr(owner); LDKLightningError ret_var = CResult_NoneLightningErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3355,17 +3008,12 @@ static inline struct LDKChannelUpdateInfo CResult_ChannelUpdateInfoDecodeErrorZ_ CHECK(owner->result_ok); return ChannelUpdateInfo_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_get_ok"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_ChannelUpdateInfoDecodeErrorZ* owner_conv = (LDKCResult_ChannelUpdateInfoDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_get_ok"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ChannelUpdateInfoDecodeErrorZ* owner_conv = (LDKCResult_ChannelUpdateInfoDecodeErrorZ*)untag_ptr(owner); LDKChannelUpdateInfo ret_var = CResult_ChannelUpdateInfoDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3373,17 +3021,12 @@ static inline struct LDKDecodeError CResult_ChannelUpdateInfoDecodeErrorZ_get_er CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_get_err"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_get_err(uint32_t owner) { - LDKCResult_ChannelUpdateInfoDecodeErrorZ* owner_conv = (LDKCResult_ChannelUpdateInfoDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_get_err"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ChannelUpdateInfoDecodeErrorZ* owner_conv = (LDKCResult_ChannelUpdateInfoDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ChannelUpdateInfoDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3391,17 +3034,12 @@ static inline struct LDKChannelInfo CResult_ChannelInfoDecodeErrorZ_get_ok(LDKCR CHECK(owner->result_ok); return ChannelInfo_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_get_ok"))) TS_CResult_ChannelInfoDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ChannelInfoDecodeErrorZ* owner_conv = (LDKCResult_ChannelInfoDecodeErrorZ*)untag_ptr(owner); LDKChannelInfo ret_var = CResult_ChannelInfoDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3409,17 +3047,12 @@ static inline struct LDKDecodeError CResult_ChannelInfoDecodeErrorZ_get_err(LDKC CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_get_err"))) TS_CResult_ChannelInfoDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ChannelInfoDecodeErrorZ* owner_conv = (LDKCResult_ChannelInfoDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ChannelInfoDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3427,17 +3060,12 @@ static inline struct LDKRoutingFees CResult_RoutingFeesDecodeErrorZ_get_ok(LDKCR CHECK(owner->result_ok); return RoutingFees_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_get_ok"))) TS_CResult_RoutingFeesDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_RoutingFeesDecodeErrorZ* owner_conv = (LDKCResult_RoutingFeesDecodeErrorZ*)untag_ptr(owner); LDKRoutingFees ret_var = CResult_RoutingFeesDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3445,22 +3073,17 @@ static inline struct LDKDecodeError CResult_RoutingFeesDecodeErrorZ_get_err(LDKC CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_get_err"))) TS_CResult_RoutingFeesDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_RoutingFeesDecodeErrorZ* owner_conv = (LDKCResult_RoutingFeesDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_RoutingFeesDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_LDKNetAddress_ty_from_ptr"))) TS_LDKNetAddress_ty_from_ptr(uint32_t ptr) { - LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKNetAddress_ty_from_ptr"))) TS_LDKNetAddress_ty_from_ptr(uint64_t ptr) { + LDKNetAddress *obj = (LDKNetAddress*)untag_ptr(ptr); switch(obj->tag) { case LDKNetAddress_IPv4: return 0; case LDKNetAddress_IPv6: return 1; @@ -3470,77 +3093,75 @@ uint32_t __attribute__((export_name("TS_LDKNetAddress_ty_from_ptr"))) TS_LDKNetA default: abort(); } } -int8_tArray __attribute__((export_name("TS_LDKNetAddress_IPv4_get_addr"))) TS_LDKNetAddress_IPv4_get_addr(uint32_t ptr) { - LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKNetAddress_IPv4_get_addr"))) TS_LDKNetAddress_IPv4_get_addr(uint64_t ptr) { + LDKNetAddress *obj = (LDKNetAddress*)untag_ptr(ptr); assert(obj->tag == LDKNetAddress_IPv4); int8_tArray addr_arr = init_int8_tArray(4, __LINE__); memcpy(addr_arr->elems, obj->i_pv4.addr.data, 4); return addr_arr; } -int16_t __attribute__((export_name("TS_LDKNetAddress_IPv4_get_port"))) TS_LDKNetAddress_IPv4_get_port(uint32_t ptr) { - LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1); +int16_t __attribute__((export_name("TS_LDKNetAddress_IPv4_get_port"))) TS_LDKNetAddress_IPv4_get_port(uint64_t ptr) { + LDKNetAddress *obj = (LDKNetAddress*)untag_ptr(ptr); assert(obj->tag == LDKNetAddress_IPv4); int16_t port_conv = obj->i_pv4.port; return port_conv; } -int8_tArray __attribute__((export_name("TS_LDKNetAddress_IPv6_get_addr"))) TS_LDKNetAddress_IPv6_get_addr(uint32_t ptr) { - LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKNetAddress_IPv6_get_addr"))) TS_LDKNetAddress_IPv6_get_addr(uint64_t ptr) { + LDKNetAddress *obj = (LDKNetAddress*)untag_ptr(ptr); assert(obj->tag == LDKNetAddress_IPv6); int8_tArray addr_arr = init_int8_tArray(16, __LINE__); memcpy(addr_arr->elems, obj->i_pv6.addr.data, 16); return addr_arr; } -int16_t __attribute__((export_name("TS_LDKNetAddress_IPv6_get_port"))) TS_LDKNetAddress_IPv6_get_port(uint32_t ptr) { - LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1); +int16_t __attribute__((export_name("TS_LDKNetAddress_IPv6_get_port"))) TS_LDKNetAddress_IPv6_get_port(uint64_t ptr) { + LDKNetAddress *obj = (LDKNetAddress*)untag_ptr(ptr); assert(obj->tag == LDKNetAddress_IPv6); int16_t port_conv = obj->i_pv6.port; return port_conv; } -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); +int8_tArray __attribute__((export_name("TS_LDKNetAddress_OnionV2_get_onion_v2"))) TS_LDKNetAddress_OnionV2_get_onion_v2(uint64_t ptr) { + LDKNetAddress *obj = (LDKNetAddress*)untag_ptr(ptr); assert(obj->tag == LDKNetAddress_OnionV2); 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); +int8_tArray __attribute__((export_name("TS_LDKNetAddress_OnionV3_get_ed25519_pubkey"))) TS_LDKNetAddress_OnionV3_get_ed25519_pubkey(uint64_t ptr) { + LDKNetAddress *obj = (LDKNetAddress*)untag_ptr(ptr); assert(obj->tag == LDKNetAddress_OnionV3); 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; } -int16_t __attribute__((export_name("TS_LDKNetAddress_OnionV3_get_checksum"))) TS_LDKNetAddress_OnionV3_get_checksum(uint32_t ptr) { - LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1); +int16_t __attribute__((export_name("TS_LDKNetAddress_OnionV3_get_checksum"))) TS_LDKNetAddress_OnionV3_get_checksum(uint64_t ptr) { + LDKNetAddress *obj = (LDKNetAddress*)untag_ptr(ptr); assert(obj->tag == LDKNetAddress_OnionV3); int16_t checksum_conv = obj->onion_v3.checksum; return checksum_conv; } -int8_t __attribute__((export_name("TS_LDKNetAddress_OnionV3_get_version"))) TS_LDKNetAddress_OnionV3_get_version(uint32_t ptr) { - LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1); +int8_t __attribute__((export_name("TS_LDKNetAddress_OnionV3_get_version"))) TS_LDKNetAddress_OnionV3_get_version(uint64_t ptr) { + LDKNetAddress *obj = (LDKNetAddress*)untag_ptr(ptr); assert(obj->tag == LDKNetAddress_OnionV3); int8_t version_conv = obj->onion_v3.version; return version_conv; } -int16_t __attribute__((export_name("TS_LDKNetAddress_OnionV3_get_port"))) TS_LDKNetAddress_OnionV3_get_port(uint32_t ptr) { - LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1); +int16_t __attribute__((export_name("TS_LDKNetAddress_OnionV3_get_port"))) TS_LDKNetAddress_OnionV3_get_port(uint64_t ptr) { + LDKNetAddress *obj = (LDKNetAddress*)untag_ptr(ptr); assert(obj->tag == LDKNetAddress_OnionV3); int16_t port_conv = obj->onion_v3.port; return port_conv; } -uint32_t __attribute__((export_name("TS_LDKNetAddress_Hostname_get_hostname"))) TS_LDKNetAddress_Hostname_get_hostname(uint32_t ptr) { - LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKNetAddress_Hostname_get_hostname"))) TS_LDKNetAddress_Hostname_get_hostname(uint64_t ptr) { + LDKNetAddress *obj = (LDKNetAddress*)untag_ptr(ptr); assert(obj->tag == LDKNetAddress_Hostname); LDKHostname hostname_var = obj->hostname.hostname; - uint32_t hostname_ref = 0; - CHECK((((uintptr_t)hostname_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&hostname_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t hostname_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(hostname_var); - hostname_ref = (uintptr_t)hostname_var.inner & ~1; + hostname_ref = tag_ptr(hostname_var.inner, false); return hostname_ref; } -int16_t __attribute__((export_name("TS_LDKNetAddress_Hostname_get_port"))) TS_LDKNetAddress_Hostname_get_port(uint32_t ptr) { - LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1); +int16_t __attribute__((export_name("TS_LDKNetAddress_Hostname_get_port"))) TS_LDKNetAddress_Hostname_get_port(uint64_t ptr) { + LDKNetAddress *obj = (LDKNetAddress*)untag_ptr(ptr); assert(obj->tag == LDKNetAddress_Hostname); int16_t port_conv = obj->hostname.port; return port_conv; @@ -3556,17 +3177,12 @@ static inline struct LDKNodeAnnouncementInfo CResult_NodeAnnouncementInfoDecodeE CHECK(owner->result_ok); return NodeAnnouncementInfo_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_get_ok"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_NodeAnnouncementInfoDecodeErrorZ* owner_conv = (LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)untag_ptr(owner); LDKNodeAnnouncementInfo ret_var = CResult_NodeAnnouncementInfoDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3574,17 +3190,12 @@ static inline struct LDKDecodeError CResult_NodeAnnouncementInfoDecodeErrorZ_get CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_get_err"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_NodeAnnouncementInfoDecodeErrorZ* owner_conv = (LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_NodeAnnouncementInfoDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3592,17 +3203,12 @@ static inline struct LDKNodeAlias CResult_NodeAliasDecodeErrorZ_get_ok(LDKCResul CHECK(owner->result_ok); return NodeAlias_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_get_ok"))) TS_CResult_NodeAliasDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_NodeAliasDecodeErrorZ* owner_conv = (LDKCResult_NodeAliasDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_get_ok"))) TS_CResult_NodeAliasDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_NodeAliasDecodeErrorZ* owner_conv = (LDKCResult_NodeAliasDecodeErrorZ*)untag_ptr(owner); LDKNodeAlias ret_var = CResult_NodeAliasDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3610,17 +3216,12 @@ static inline struct LDKDecodeError CResult_NodeAliasDecodeErrorZ_get_err(LDKCRe CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_get_err"))) TS_CResult_NodeAliasDecodeErrorZ_get_err(uint32_t owner) { - LDKCResult_NodeAliasDecodeErrorZ* owner_conv = (LDKCResult_NodeAliasDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_get_err"))) TS_CResult_NodeAliasDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_NodeAliasDecodeErrorZ* owner_conv = (LDKCResult_NodeAliasDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_NodeAliasDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3628,17 +3229,12 @@ static inline struct LDKNodeInfo CResult_NodeInfoDecodeErrorZ_get_ok(LDKCResult_ CHECK(owner->result_ok); return NodeInfo_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_get_ok"))) TS_CResult_NodeInfoDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_NodeInfoDecodeErrorZ* owner_conv = (LDKCResult_NodeInfoDecodeErrorZ*)untag_ptr(owner); LDKNodeInfo ret_var = CResult_NodeInfoDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3646,17 +3242,12 @@ static inline struct LDKDecodeError CResult_NodeInfoDecodeErrorZ_get_err(LDKCRes CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_get_err"))) TS_CResult_NodeInfoDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_NodeInfoDecodeErrorZ* owner_conv = (LDKCResult_NodeInfoDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_NodeInfoDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3664,14 +3255,12 @@ static inline struct LDKNetworkGraph *CResult_NetworkGraphDecodeErrorZ_get_ok(LD CHECK(owner->result_ok); return &*owner->contents.result; } -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); +uint64_t __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_get_ok"))) TS_CResult_NetworkGraphDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_NetworkGraphDecodeErrorZ* owner_conv = (LDKCResult_NetworkGraphDecodeErrorZ*)untag_ptr(owner); LDKNetworkGraph ret_var = *CResult_NetworkGraphDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner & ~1; + ret_ref = tag_ptr(ret_var.inner, false); return ret_ref; } @@ -3679,37 +3268,32 @@ static inline struct LDKDecodeError CResult_NetworkGraphDecodeErrorZ_get_err(LDK CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_get_err"))) TS_CResult_NetworkGraphDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_NetworkGraphDecodeErrorZ* owner_conv = (LDKCResult_NetworkGraphDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_NetworkGraphDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_LDKCOption_CVec_NetAddressZZ_ty_from_ptr"))) TS_LDKCOption_CVec_NetAddressZZ_ty_from_ptr(uint32_t ptr) { - LDKCOption_CVec_NetAddressZZ *obj = (LDKCOption_CVec_NetAddressZZ*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKCOption_CVec_NetAddressZZ_ty_from_ptr"))) TS_LDKCOption_CVec_NetAddressZZ_ty_from_ptr(uint64_t ptr) { + LDKCOption_CVec_NetAddressZZ *obj = (LDKCOption_CVec_NetAddressZZ*)untag_ptr(ptr); switch(obj->tag) { case LDKCOption_CVec_NetAddressZZ_Some: return 0; case LDKCOption_CVec_NetAddressZZ_None: return 1; default: abort(); } } -uint32_tArray __attribute__((export_name("TS_LDKCOption_CVec_NetAddressZZ_Some_get_some"))) TS_LDKCOption_CVec_NetAddressZZ_Some_get_some(uint32_t ptr) { - LDKCOption_CVec_NetAddressZZ *obj = (LDKCOption_CVec_NetAddressZZ*)(ptr & ~1); +uint64_tArray __attribute__((export_name("TS_LDKCOption_CVec_NetAddressZZ_Some_get_some"))) TS_LDKCOption_CVec_NetAddressZZ_Some_get_some(uint64_t ptr) { + LDKCOption_CVec_NetAddressZZ *obj = (LDKCOption_CVec_NetAddressZZ*)untag_ptr(ptr); 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, __LINE__); - uint32_t *some_arr_ptr = (uint32_t*)(((uint8_t*)some_arr) + 8); + uint64_tArray some_arr = NULL; + some_arr = init_uint64_tArray(some_var.datalen, __LINE__); + uint64_t *some_arr_ptr = (uint64_t*)(((uint8_t*)some_arr) + 8); for (size_t m = 0; m < some_var.datalen; m++) { - uint32_t some_conv_12_ref = ((uintptr_t)&some_var.data[m]) | 1; + uint64_t some_conv_12_ref = tag_ptr(&some_var.data[m], false); some_arr_ptr[m] = some_conv_12_ref; } @@ -3719,17 +3303,12 @@ static inline struct LDKDelayedPaymentOutputDescriptor CResult_DelayedPaymentOut CHECK(owner->result_ok); return DelayedPaymentOutputDescriptor_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_ok"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* owner_conv = (LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ*)untag_ptr(owner); LDKDelayedPaymentOutputDescriptor ret_var = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3737,17 +3316,12 @@ static inline struct LDKDecodeError CResult_DelayedPaymentOutputDescriptorDecode CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_err"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* owner_conv = (LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3755,17 +3329,12 @@ static inline struct LDKStaticPaymentOutputDescriptor CResult_StaticPaymentOutpu CHECK(owner->result_ok); return StaticPaymentOutputDescriptor_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_ok"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* owner_conv = (LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ*)untag_ptr(owner); LDKStaticPaymentOutputDescriptor ret_var = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3773,17 +3342,12 @@ static inline struct LDKDecodeError CResult_StaticPaymentOutputDescriptorDecodeE CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_err"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* owner_conv = (LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3791,11 +3355,11 @@ static inline struct LDKSpendableOutputDescriptor CResult_SpendableOutputDescrip CHECK(owner->result_ok); return SpendableOutputDescriptor_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_get_ok"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_SpendableOutputDescriptorDecodeErrorZ* owner_conv = (LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_get_ok"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_SpendableOutputDescriptorDecodeErrorZ* owner_conv = (LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)untag_ptr(owner); LDKSpendableOutputDescriptor *ret_copy = MALLOC(sizeof(LDKSpendableOutputDescriptor), "LDKSpendableOutputDescriptor"); *ret_copy = CResult_SpendableOutputDescriptorDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } @@ -3803,17 +3367,12 @@ static inline struct LDKDecodeError CResult_SpendableOutputDescriptorDecodeError CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_get_err"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_SpendableOutputDescriptorDecodeErrorZ* owner_conv = (LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_SpendableOutputDescriptorDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3827,8 +3386,8 @@ static inline LDKCVec_PaymentPreimageZ CVec_PaymentPreimageZ_clone(const LDKCVec static inline struct LDKSignature C2Tuple_SignatureCVec_SignatureZZ_get_a(LDKC2Tuple_SignatureCVec_SignatureZZ *NONNULL_PTR owner){ return owner->a; } -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 __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_get_a"))) TS_C2Tuple_SignatureCVec_SignatureZZ_get_a(uint64_t owner) { + LDKC2Tuple_SignatureCVec_SignatureZZ* owner_conv = (LDKC2Tuple_SignatureCVec_SignatureZZ*)untag_ptr(owner); 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; @@ -3837,8 +3396,8 @@ int8_tArray __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_ge static inline struct LDKCVec_SignatureZ C2Tuple_SignatureCVec_SignatureZZ_get_b(LDKC2Tuple_SignatureCVec_SignatureZZ *NONNULL_PTR owner){ return owner->b; } -ptrArray __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_get_b"))) TS_C2Tuple_SignatureCVec_SignatureZZ_get_b(uint32_t owner) { - LDKC2Tuple_SignatureCVec_SignatureZZ* owner_conv = (LDKC2Tuple_SignatureCVec_SignatureZZ*)(owner & ~1); +ptrArray __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_get_b"))) TS_C2Tuple_SignatureCVec_SignatureZZ_get_b(uint64_t owner) { + LDKC2Tuple_SignatureCVec_SignatureZZ* owner_conv = (LDKC2Tuple_SignatureCVec_SignatureZZ*)untag_ptr(owner); LDKCVec_SignatureZ ret_var = C2Tuple_SignatureCVec_SignatureZZ_get_b(owner_conv); ptrArray ret_arr = NULL; ret_arr = init_ptrArray(ret_var.datalen, __LINE__); @@ -3856,19 +3415,19 @@ static inline struct LDKC2Tuple_SignatureCVec_SignatureZZ CResult_C2Tuple_Signat CHECK(owner->result_ok); return C2Tuple_SignatureCVec_SignatureZZ_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_ok"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_ok(uint32_t owner) { - LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* owner_conv = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_ok"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_ok(uint64_t owner) { + LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* owner_conv = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)untag_ptr(owner); LDKC2Tuple_SignatureCVec_SignatureZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_SignatureCVec_SignatureZZ), "LDKC2Tuple_SignatureCVec_SignatureZZ"); *ret_conv = CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_ok(owner_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } static inline void CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_err(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ *NONNULL_PTR owner){ CHECK(!owner->result_ok); return *owner->contents.err; } -void __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_err"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_err(uint32_t owner) { - LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* owner_conv = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_err"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_err(uint64_t owner) { + LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* owner_conv = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)untag_ptr(owner); CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_err(owner_conv); } @@ -3876,8 +3435,8 @@ static inline struct LDKSignature CResult_SignatureNoneZ_get_ok(LDKCResult_Signa CHECK(owner->result_ok); return *owner->contents.result; } -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 __attribute__((export_name("TS_CResult_SignatureNoneZ_get_ok"))) TS_CResult_SignatureNoneZ_get_ok(uint64_t owner) { + LDKCResult_SignatureNoneZ* owner_conv = (LDKCResult_SignatureNoneZ*)untag_ptr(owner); 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; @@ -3887,16 +3446,16 @@ static inline void CResult_SignatureNoneZ_get_err(LDKCResult_SignatureNoneZ *NON CHECK(!owner->result_ok); return *owner->contents.err; } -void __attribute__((export_name("TS_CResult_SignatureNoneZ_get_err"))) TS_CResult_SignatureNoneZ_get_err(uint32_t owner) { - LDKCResult_SignatureNoneZ* owner_conv = (LDKCResult_SignatureNoneZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_SignatureNoneZ_get_err"))) TS_CResult_SignatureNoneZ_get_err(uint64_t owner) { + LDKCResult_SignatureNoneZ* owner_conv = (LDKCResult_SignatureNoneZ*)untag_ptr(owner); CResult_SignatureNoneZ_get_err(owner_conv); } static inline struct LDKSignature C2Tuple_SignatureSignatureZ_get_a(LDKC2Tuple_SignatureSignatureZ *NONNULL_PTR owner){ return owner->a; } -int8_tArray __attribute__((export_name("TS_C2Tuple_SignatureSignatureZ_get_a"))) TS_C2Tuple_SignatureSignatureZ_get_a(uint32_t owner) { - LDKC2Tuple_SignatureSignatureZ* owner_conv = (LDKC2Tuple_SignatureSignatureZ*)(owner & ~1); +int8_tArray __attribute__((export_name("TS_C2Tuple_SignatureSignatureZ_get_a"))) TS_C2Tuple_SignatureSignatureZ_get_a(uint64_t owner) { + LDKC2Tuple_SignatureSignatureZ* owner_conv = (LDKC2Tuple_SignatureSignatureZ*)untag_ptr(owner); int8_tArray ret_arr = init_int8_tArray(64, __LINE__); memcpy(ret_arr->elems, C2Tuple_SignatureSignatureZ_get_a(owner_conv).compact_form, 64); return ret_arr; @@ -3905,8 +3464,8 @@ int8_tArray __attribute__((export_name("TS_C2Tuple_SignatureSignatureZ_get_a")) static inline struct LDKSignature C2Tuple_SignatureSignatureZ_get_b(LDKC2Tuple_SignatureSignatureZ *NONNULL_PTR owner){ return owner->b; } -int8_tArray __attribute__((export_name("TS_C2Tuple_SignatureSignatureZ_get_b"))) TS_C2Tuple_SignatureSignatureZ_get_b(uint32_t owner) { - LDKC2Tuple_SignatureSignatureZ* owner_conv = (LDKC2Tuple_SignatureSignatureZ*)(owner & ~1); +int8_tArray __attribute__((export_name("TS_C2Tuple_SignatureSignatureZ_get_b"))) TS_C2Tuple_SignatureSignatureZ_get_b(uint64_t owner) { + LDKC2Tuple_SignatureSignatureZ* owner_conv = (LDKC2Tuple_SignatureSignatureZ*)untag_ptr(owner); int8_tArray ret_arr = init_int8_tArray(64, __LINE__); memcpy(ret_arr->elems, C2Tuple_SignatureSignatureZ_get_b(owner_conv).compact_form, 64); return ret_arr; @@ -3916,19 +3475,19 @@ static inline struct LDKC2Tuple_SignatureSignatureZ CResult_C2Tuple_SignatureSig CHECK(owner->result_ok); return C2Tuple_SignatureSignatureZ_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_get_ok"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_get_ok(uint32_t owner) { - LDKCResult_C2Tuple_SignatureSignatureZNoneZ* owner_conv = (LDKCResult_C2Tuple_SignatureSignatureZNoneZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_get_ok"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_get_ok(uint64_t owner) { + LDKCResult_C2Tuple_SignatureSignatureZNoneZ* owner_conv = (LDKCResult_C2Tuple_SignatureSignatureZNoneZ*)untag_ptr(owner); LDKC2Tuple_SignatureSignatureZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_SignatureSignatureZ), "LDKC2Tuple_SignatureSignatureZ"); *ret_conv = CResult_C2Tuple_SignatureSignatureZNoneZ_get_ok(owner_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } static inline void CResult_C2Tuple_SignatureSignatureZNoneZ_get_err(LDKCResult_C2Tuple_SignatureSignatureZNoneZ *NONNULL_PTR owner){ CHECK(!owner->result_ok); return *owner->contents.err; } -void __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_get_err"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_get_err(uint32_t owner) { - LDKCResult_C2Tuple_SignatureSignatureZNoneZ* owner_conv = (LDKCResult_C2Tuple_SignatureSignatureZNoneZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_get_err"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_get_err(uint64_t owner) { + LDKCResult_C2Tuple_SignatureSignatureZNoneZ* owner_conv = (LDKCResult_C2Tuple_SignatureSignatureZNoneZ*)untag_ptr(owner); CResult_C2Tuple_SignatureSignatureZNoneZ_get_err(owner_conv); } @@ -3936,8 +3495,8 @@ static inline struct LDKSecretKey CResult_SecretKeyNoneZ_get_ok(LDKCResult_Secre CHECK(owner->result_ok); return *owner->contents.result; } -int8_tArray __attribute__((export_name("TS_CResult_SecretKeyNoneZ_get_ok"))) TS_CResult_SecretKeyNoneZ_get_ok(uint32_t owner) { - LDKCResult_SecretKeyNoneZ* owner_conv = (LDKCResult_SecretKeyNoneZ*)(owner & ~1); +int8_tArray __attribute__((export_name("TS_CResult_SecretKeyNoneZ_get_ok"))) TS_CResult_SecretKeyNoneZ_get_ok(uint64_t owner) { + LDKCResult_SecretKeyNoneZ* owner_conv = (LDKCResult_SecretKeyNoneZ*)untag_ptr(owner); int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, CResult_SecretKeyNoneZ_get_ok(owner_conv).bytes, 32); return ret_arr; @@ -3947,8 +3506,8 @@ static inline void CResult_SecretKeyNoneZ_get_err(LDKCResult_SecretKeyNoneZ *NON CHECK(!owner->result_ok); return *owner->contents.err; } -void __attribute__((export_name("TS_CResult_SecretKeyNoneZ_get_err"))) TS_CResult_SecretKeyNoneZ_get_err(uint32_t owner) { - LDKCResult_SecretKeyNoneZ* owner_conv = (LDKCResult_SecretKeyNoneZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_SecretKeyNoneZ_get_err"))) TS_CResult_SecretKeyNoneZ_get_err(uint64_t owner) { + LDKCResult_SecretKeyNoneZ* owner_conv = (LDKCResult_SecretKeyNoneZ*)untag_ptr(owner); CResult_SecretKeyNoneZ_get_err(owner_conv); } @@ -3965,7 +3524,7 @@ static void LDKBaseSign_JCalls_free(void* this_arg) { LDKPublicKey get_per_commitment_point_LDKBaseSign_jcall(const void* this_arg, uint64_t idx) { LDKBaseSign_JCalls *j_calls = (LDKBaseSign_JCalls*) this_arg; int64_t idx_conv = idx; - int8_tArray ret = (int8_tArray)js_invoke_function_buuuuu(j_calls->instance_ptr, 2, (uint32_t)idx_conv, 0, 0, 0, 0, 0); + int8_tArray ret = (int8_tArray)js_invoke_function_buuuuu(j_calls->instance_ptr, 2, idx_conv, 0, 0, 0, 0, 0); LDKPublicKey ret_ref; CHECK(ret->arr_len == 33); memcpy(ret_ref.compressed_form, ret->elems, 33); FREE(ret); @@ -3974,7 +3533,7 @@ LDKPublicKey get_per_commitment_point_LDKBaseSign_jcall(const void* this_arg, ui LDKThirtyTwoBytes release_commitment_secret_LDKBaseSign_jcall(const void* this_arg, uint64_t idx) { LDKBaseSign_JCalls *j_calls = (LDKBaseSign_JCalls*) this_arg; int64_t idx_conv = idx; - int8_tArray ret = (int8_tArray)js_invoke_function_buuuuu(j_calls->instance_ptr, 3, (uint32_t)idx_conv, 0, 0, 0, 0, 0); + int8_tArray ret = (int8_tArray)js_invoke_function_buuuuu(j_calls->instance_ptr, 3, idx_conv, 0, 0, 0, 0, 0); LDKThirtyTwoBytes ret_ref; CHECK(ret->arr_len == 32); memcpy(ret_ref.data, ret->elems, 32); FREE(ret); @@ -3983,15 +3542,10 @@ LDKThirtyTwoBytes release_commitment_secret_LDKBaseSign_jcall(const void* this_a LDKCResult_NoneNoneZ validate_holder_commitment_LDKBaseSign_jcall(const void* this_arg, const LDKHolderCommitmentTransaction * holder_tx, LDKCVec_PaymentPreimageZ preimages) { LDKBaseSign_JCalls *j_calls = (LDKBaseSign_JCalls*) this_arg; LDKHolderCommitmentTransaction holder_tx_var = *holder_tx; - uint32_t holder_tx_ref = 0; + uint64_t holder_tx_ref = 0; holder_tx_var = HolderCommitmentTransaction_clone(&holder_tx_var); - 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 = (uintptr_t)holder_tx_var.inner; - if (holder_tx_var.is_owned) { - holder_tx_ref |= 1; - } + holder_tx_ref = tag_ptr(holder_tx_var.inner, holder_tx_var.is_owned); LDKCVec_PaymentPreimageZ preimages_var = preimages; ptrArray preimages_arr = NULL; preimages_arr = init_ptrArray(preimages_var.datalen, __LINE__); @@ -4003,11 +3557,11 @@ LDKCResult_NoneNoneZ validate_holder_commitment_LDKBaseSign_jcall(const void* th } FREE(preimages_var.data); - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 4, (uint32_t)holder_tx_ref, (uint32_t)preimages_arr, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + uint32_t ret = js_invoke_function_buuuuu(j_calls->instance_ptr, 4, holder_tx_ref, (uint32_t)preimages_arr, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_NoneNoneZ ret_conv = *(LDKCResult_NoneNoneZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } LDKThirtyTwoBytes channel_keys_id_LDKBaseSign_jcall(const void* this_arg) { @@ -4021,15 +3575,10 @@ LDKThirtyTwoBytes channel_keys_id_LDKBaseSign_jcall(const void* this_arg) { LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_counterparty_commitment_LDKBaseSign_jcall(const void* this_arg, const LDKCommitmentTransaction * commitment_tx, LDKCVec_PaymentPreimageZ preimages) { LDKBaseSign_JCalls *j_calls = (LDKBaseSign_JCalls*) this_arg; LDKCommitmentTransaction commitment_tx_var = *commitment_tx; - uint32_t commitment_tx_ref = 0; + uint64_t commitment_tx_ref = 0; commitment_tx_var = CommitmentTransaction_clone(&commitment_tx_var); - 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 = (uintptr_t)commitment_tx_var.inner; - if (commitment_tx_var.is_owned) { - commitment_tx_ref |= 1; - } + commitment_tx_ref = tag_ptr(commitment_tx_var.inner, commitment_tx_var.is_owned); LDKCVec_PaymentPreimageZ preimages_var = preimages; ptrArray preimages_arr = NULL; preimages_arr = init_ptrArray(preimages_var.datalen, __LINE__); @@ -4041,11 +3590,11 @@ LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_counterparty_commitment_L } FREE(preimages_var.data); - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 6, (uint32_t)commitment_tx_ref, (uint32_t)preimages_arr, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + uint32_t ret = js_invoke_function_buuuuu(j_calls->instance_ptr, 6, commitment_tx_ref, (uint32_t)preimages_arr, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ ret_conv = *(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } LDKCResult_NoneNoneZ validate_counterparty_revocation_LDKBaseSign_jcall(const void* this_arg, uint64_t idx, const uint8_t (* secret)[32]) { @@ -4053,30 +3602,25 @@ LDKCResult_NoneNoneZ validate_counterparty_revocation_LDKBaseSign_jcall(const vo int64_t idx_conv = idx; int8_tArray secret_arr = init_int8_tArray(32, __LINE__); memcpy(secret_arr->elems, *secret, 32); - uint32_t ret = js_invoke_function_buuuuu(j_calls->instance_ptr, 7, (uint32_t)idx_conv, (uint32_t)secret_arr, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + uint32_t ret = js_invoke_function_buuuuu(j_calls->instance_ptr, 7, idx_conv, (uint32_t)secret_arr, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_NoneNoneZ ret_conv = *(LDKCResult_NoneNoneZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } 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; - uint32_t commitment_tx_ref = 0; + uint64_t commitment_tx_ref = 0; commitment_tx_var = HolderCommitmentTransaction_clone(&commitment_tx_var); - 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 = (uintptr_t)commitment_tx_var.inner; - if (commitment_tx_var.is_owned) { - commitment_tx_ref |= 1; - } - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 8, (uint32_t)commitment_tx_ref, 0, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + commitment_tx_ref = tag_ptr(commitment_tx_var.inner, commitment_tx_var.is_owned); + uint32_t ret = js_invoke_function_buuuuu(j_calls->instance_ptr, 8, commitment_tx_ref, 0, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ ret_conv = *(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } 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]) { @@ -4089,11 +3633,11 @@ LDKCResult_SignatureNoneZ sign_justice_revoked_output_LDKBaseSign_jcall(const vo int64_t amount_conv = amount; int8_tArray per_commitment_key_arr = init_int8_tArray(32, __LINE__); memcpy(per_commitment_key_arr->elems, *per_commitment_key, 32); - uint32_t ret = js_invoke_function_uubuuu(j_calls->instance_ptr, 9, (uint32_t)justice_tx_arr, (uint32_t)input_conv, (uint32_t)amount_conv, (uint32_t)per_commitment_key_arr, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + uint32_t ret = js_invoke_function_uubuuu(j_calls->instance_ptr, 9, (uint32_t)justice_tx_arr, input_conv, amount_conv, (uint32_t)per_commitment_key_arr, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_SignatureNoneZ ret_conv = *(LDKCResult_SignatureNoneZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } 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) { @@ -4107,20 +3651,15 @@ LDKCResult_SignatureNoneZ sign_justice_revoked_htlc_LDKBaseSign_jcall(const void 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; - uint32_t htlc_ref = 0; + uint64_t htlc_ref = 0; htlc_var = HTLCOutputInCommitment_clone(&htlc_var); - 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 = (uintptr_t)htlc_var.inner; - if (htlc_var.is_owned) { - htlc_ref |= 1; - } - uint32_t ret = js_invoke_function_uubuuu(j_calls->instance_ptr, 10, (uint32_t)justice_tx_arr, (uint32_t)input_conv, (uint32_t)amount_conv, (uint32_t)per_commitment_key_arr, (uint32_t)htlc_ref, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + htlc_ref = tag_ptr(htlc_var.inner, htlc_var.is_owned); + uint32_t ret = js_invoke_function_uububu(j_calls->instance_ptr, 10, (uint32_t)justice_tx_arr, input_conv, amount_conv, (uint32_t)per_commitment_key_arr, htlc_ref, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_SignatureNoneZ ret_conv = *(LDKCResult_SignatureNoneZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } 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) { @@ -4134,86 +3673,66 @@ LDKCResult_SignatureNoneZ sign_counterparty_htlc_transaction_LDKBaseSign_jcall(c 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; - uint32_t htlc_ref = 0; + uint64_t htlc_ref = 0; htlc_var = HTLCOutputInCommitment_clone(&htlc_var); - 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 = (uintptr_t)htlc_var.inner; - if (htlc_var.is_owned) { - htlc_ref |= 1; - } - uint32_t ret = js_invoke_function_uubuuu(j_calls->instance_ptr, 11, (uint32_t)htlc_tx_arr, (uint32_t)input_conv, (uint32_t)amount_conv, (uint32_t)per_commitment_point_arr, (uint32_t)htlc_ref, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + htlc_ref = tag_ptr(htlc_var.inner, htlc_var.is_owned); + uint32_t ret = js_invoke_function_uububu(j_calls->instance_ptr, 11, (uint32_t)htlc_tx_arr, input_conv, amount_conv, (uint32_t)per_commitment_point_arr, htlc_ref, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_SignatureNoneZ ret_conv = *(LDKCResult_SignatureNoneZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } 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; - uint32_t closing_tx_ref = 0; + uint64_t closing_tx_ref = 0; closing_tx_var = ClosingTransaction_clone(&closing_tx_var); - 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 = (uintptr_t)closing_tx_var.inner; - if (closing_tx_var.is_owned) { - closing_tx_ref |= 1; - } - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 12, (uint32_t)closing_tx_ref, 0, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + closing_tx_ref = tag_ptr(closing_tx_var.inner, closing_tx_var.is_owned); + uint32_t ret = js_invoke_function_buuuuu(j_calls->instance_ptr, 12, closing_tx_ref, 0, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_SignatureNoneZ ret_conv = *(LDKCResult_SignatureNoneZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } LDKCResult_C2Tuple_SignatureSignatureZNoneZ sign_channel_announcement_LDKBaseSign_jcall(const void* this_arg, const LDKUnsignedChannelAnnouncement * msg) { LDKBaseSign_JCalls *j_calls = (LDKBaseSign_JCalls*) this_arg; LDKUnsignedChannelAnnouncement msg_var = *msg; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = UnsignedChannelAnnouncement_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 13, (uint32_t)msg_ref, 0, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + uint32_t ret = js_invoke_function_buuuuu(j_calls->instance_ptr, 13, msg_ref, 0, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_C2Tuple_SignatureSignatureZNoneZ ret_conv = *(LDKCResult_C2Tuple_SignatureSignatureZNoneZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } 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; - uint32_t channel_parameters_ref = 0; + uint64_t channel_parameters_ref = 0; channel_parameters_var = ChannelTransactionParameters_clone(&channel_parameters_var); - 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 = (uintptr_t)channel_parameters_var.inner; - if (channel_parameters_var.is_owned) { - channel_parameters_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 14, (uint32_t)channel_parameters_ref, 0, 0, 0, 0, 0); + channel_parameters_ref = tag_ptr(channel_parameters_var.inner, channel_parameters_var.is_owned); + js_invoke_function_buuuuu(j_calls->instance_ptr, 14, channel_parameters_ref, 0, 0, 0, 0, 0); } static void LDKBaseSign_JCalls_cloned(LDKBaseSign* new_obj) { LDKBaseSign_JCalls *j_calls = (LDKBaseSign_JCalls*) new_obj->this_arg; atomic_fetch_add_explicit(&j_calls->refcnt, 1, memory_order_release); } -static inline LDKBaseSign LDKBaseSign_init (JSValue o, uint32_t pubkeys) { +static inline LDKBaseSign LDKBaseSign_init (JSValue o, uint64_t pubkeys) { LDKBaseSign_JCalls *calls = MALLOC(sizeof(LDKBaseSign_JCalls), "LDKBaseSign_JCalls"); atomic_init(&calls->refcnt, 1); calls->instance_ptr = o; LDKChannelPublicKeys pubkeys_conv; - pubkeys_conv.inner = (void*)(pubkeys & (~1)); - pubkeys_conv.is_owned = (pubkeys & 1) || (pubkeys == 0); + pubkeys_conv.inner = untag_ptr(pubkeys); + pubkeys_conv.is_owned = ptr_is_owned(pubkeys); CHECK_INNER_FIELD_ACCESS_OR_NULL(pubkeys_conv); LDKBaseSign ret = { @@ -4237,37 +3756,38 @@ static inline LDKBaseSign LDKBaseSign_init (JSValue o, uint32_t pubkeys) { }; return ret; } -long __attribute__((export_name("TS_LDKBaseSign_new"))) TS_LDKBaseSign_new(JSValue o, uint32_t pubkeys) { +uint64_t __attribute__((export_name("TS_LDKBaseSign_new"))) TS_LDKBaseSign_new(JSValue o, uint64_t pubkeys) { LDKBaseSign *res_ptr = MALLOC(sizeof(LDKBaseSign), "LDKBaseSign"); *res_ptr = LDKBaseSign_init(o, pubkeys); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +int8_tArray __attribute__((export_name("TS_BaseSign_get_per_commitment_point"))) TS_BaseSign_get_per_commitment_point(uint64_t this_arg, int64_t idx) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKBaseSign* this_arg_conv = (LDKBaseSign*)this_arg_ptr; 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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +int8_tArray __attribute__((export_name("TS_BaseSign_release_commitment_secret"))) TS_BaseSign_release_commitment_secret(uint64_t this_arg, int64_t idx) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKBaseSign* this_arg_conv = (LDKBaseSign*)this_arg_ptr; 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, ptrArray preimages) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_BaseSign_validate_holder_commitment"))) TS_BaseSign_validate_holder_commitment(uint64_t this_arg, uint64_t holder_tx, ptrArray preimages) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKBaseSign* this_arg_conv = (LDKBaseSign*)this_arg_ptr; LDKHolderCommitmentTransaction holder_tx_conv; - holder_tx_conv.inner = (void*)(holder_tx & (~1)); - holder_tx_conv.is_owned = false; + holder_tx_conv.inner = untag_ptr(holder_tx); + holder_tx_conv.is_owned = ptr_is_owned(holder_tx); CHECK_INNER_FIELD_ACCESS_OR_NULL(holder_tx_conv); + holder_tx_conv.is_owned = false; LDKCVec_PaymentPreimageZ preimages_constr; preimages_constr.datalen = preimages->arr_len; if (preimages_constr.datalen > 0) @@ -4285,26 +3805,27 @@ uint32_t __attribute__((export_name("TS_BaseSign_validate_holder_commitment"))) FREE(preimages); LDKCResult_NoneNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneNoneZ), "LDKCResult_NoneNoneZ"); *ret_conv = (this_arg_conv->validate_holder_commitment)(this_arg_conv->this_arg, &holder_tx_conv, preimages_constr); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_BaseSign_channel_keys_id"))) TS_BaseSign_channel_keys_id(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +int8_tArray __attribute__((export_name("TS_BaseSign_channel_keys_id"))) TS_BaseSign_channel_keys_id(uint64_t this_arg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKBaseSign* this_arg_conv = (LDKBaseSign*)this_arg_ptr; 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, ptrArray preimages) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_BaseSign_sign_counterparty_commitment"))) TS_BaseSign_sign_counterparty_commitment(uint64_t this_arg, uint64_t commitment_tx, ptrArray preimages) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKBaseSign* this_arg_conv = (LDKBaseSign*)this_arg_ptr; LDKCommitmentTransaction commitment_tx_conv; - commitment_tx_conv.inner = (void*)(commitment_tx & (~1)); - commitment_tx_conv.is_owned = false; + commitment_tx_conv.inner = untag_ptr(commitment_tx); + commitment_tx_conv.is_owned = ptr_is_owned(commitment_tx); CHECK_INNER_FIELD_ACCESS_OR_NULL(commitment_tx_conv); + commitment_tx_conv.is_owned = false; LDKCVec_PaymentPreimageZ preimages_constr; preimages_constr.datalen = preimages->arr_len; if (preimages_constr.datalen > 0) @@ -4322,12 +3843,12 @@ uint32_t __attribute__((export_name("TS_BaseSign_sign_counterparty_commitment") FREE(preimages); LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ), "LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ"); *ret_conv = (this_arg_conv->sign_counterparty_commitment)(this_arg_conv->this_arg, &commitment_tx_conv, preimages_constr); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_BaseSign_validate_counterparty_revocation"))) TS_BaseSign_validate_counterparty_revocation(uint64_t this_arg, int64_t idx, int8_tArray secret) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKBaseSign* this_arg_conv = (LDKBaseSign*)this_arg_ptr; unsigned char secret_arr[32]; CHECK(secret->arr_len == 32); @@ -4335,25 +3856,26 @@ uint32_t __attribute__((export_name("TS_BaseSign_validate_counterparty_revocati 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_BaseSign_sign_holder_commitment_and_htlcs"))) TS_BaseSign_sign_holder_commitment_and_htlcs(uint64_t this_arg, uint64_t commitment_tx) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKBaseSign* this_arg_conv = (LDKBaseSign*)this_arg_ptr; LDKHolderCommitmentTransaction commitment_tx_conv; - commitment_tx_conv.inner = (void*)(commitment_tx & (~1)); - commitment_tx_conv.is_owned = false; + commitment_tx_conv.inner = untag_ptr(commitment_tx); + commitment_tx_conv.is_owned = ptr_is_owned(commitment_tx); CHECK_INNER_FIELD_ACCESS_OR_NULL(commitment_tx_conv); + commitment_tx_conv.is_owned = false; 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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, uint32_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); } +uint64_t __attribute__((export_name("TS_BaseSign_sign_justice_revoked_output"))) TS_BaseSign_sign_justice_revoked_output(uint64_t this_arg, int8_tArray justice_tx, uint32_t input, int64_t amount, int8_tArray per_commitment_key) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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; @@ -4366,12 +3888,12 @@ uint32_t __attribute__((export_name("TS_BaseSign_sign_justice_revoked_output")) 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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, uint32_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); } +uint64_t __attribute__((export_name("TS_BaseSign_sign_justice_revoked_htlc"))) TS_BaseSign_sign_justice_revoked_htlc(uint64_t this_arg, int8_tArray justice_tx, uint32_t input, int64_t amount, int8_tArray per_commitment_key, uint64_t htlc) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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; @@ -4383,17 +3905,18 @@ uint32_t __attribute__((export_name("TS_BaseSign_sign_justice_revoked_htlc"))) 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)); - htlc_conv.is_owned = false; + htlc_conv.inner = untag_ptr(htlc); + htlc_conv.is_owned = ptr_is_owned(htlc); CHECK_INNER_FIELD_ACCESS_OR_NULL(htlc_conv); + htlc_conv.is_owned = false; 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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, uint32_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); } +uint64_t __attribute__((export_name("TS_BaseSign_sign_counterparty_htlc_transaction"))) TS_BaseSign_sign_counterparty_htlc_transaction(uint64_t this_arg, int8_tArray htlc_tx, uint32_t input, int64_t amount, int8_tArray per_commitment_point, uint64_t htlc) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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; @@ -4404,48 +3927,52 @@ uint32_t __attribute__((export_name("TS_BaseSign_sign_counterparty_htlc_transac CHECK(per_commitment_point->arr_len == 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; + htlc_conv.inner = untag_ptr(htlc); + htlc_conv.is_owned = ptr_is_owned(htlc); CHECK_INNER_FIELD_ACCESS_OR_NULL(htlc_conv); + htlc_conv.is_owned = false; 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_BaseSign_sign_closing_transaction"))) TS_BaseSign_sign_closing_transaction(uint64_t this_arg, uint64_t closing_tx) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKBaseSign* this_arg_conv = (LDKBaseSign*)this_arg_ptr; LDKClosingTransaction closing_tx_conv; - closing_tx_conv.inner = (void*)(closing_tx & (~1)); - closing_tx_conv.is_owned = false; + closing_tx_conv.inner = untag_ptr(closing_tx); + closing_tx_conv.is_owned = ptr_is_owned(closing_tx); CHECK_INNER_FIELD_ACCESS_OR_NULL(closing_tx_conv); + closing_tx_conv.is_owned = false; 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_BaseSign_sign_channel_announcement"))) TS_BaseSign_sign_channel_announcement(uint64_t this_arg, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKBaseSign* this_arg_conv = (LDKBaseSign*)this_arg_ptr; LDKUnsignedChannelAnnouncement msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; LDKCResult_C2Tuple_SignatureSignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureSignatureZNoneZ), "LDKCResult_C2Tuple_SignatureSignatureZNoneZ"); *ret_conv = (this_arg_conv->sign_channel_announcement)(this_arg_conv->this_arg, &msg_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_BaseSign_ready_channel"))) TS_BaseSign_ready_channel(uint64_t this_arg, uint64_t channel_parameters) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKBaseSign* this_arg_conv = (LDKBaseSign*)this_arg_ptr; LDKChannelTransactionParameters channel_parameters_conv; - channel_parameters_conv.inner = (void*)(channel_parameters & (~1)); - channel_parameters_conv.is_owned = false; + channel_parameters_conv.inner = untag_ptr(channel_parameters); + channel_parameters_conv.is_owned = ptr_is_owned(channel_parameters); CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_parameters_conv); + channel_parameters_conv.is_owned = false; (this_arg_conv->ready_channel)(this_arg_conv->this_arg, &channel_parameters_conv); } @@ -4454,19 +3981,14 @@ LDKChannelPublicKeys LDKBaseSign_set_get_pubkeys(LDKBaseSign* this_arg) { this_arg->set_pubkeys(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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_BaseSign_get_pubkeys"))) TS_BaseSign_get_pubkeys(uint64_t this_arg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKBaseSign* this_arg_conv = (LDKBaseSign*)this_arg_ptr; LDKChannelPublicKeys ret_var = LDKBaseSign_set_get_pubkeys(this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -4495,14 +4017,14 @@ static void LDKSign_JCalls_cloned(LDKSign* new_obj) { atomic_fetch_add_explicit(&j_calls->refcnt, 1, memory_order_release); atomic_fetch_add_explicit(&j_calls->BaseSign->refcnt, 1, memory_order_release); } -static inline LDKSign LDKSign_init (JSValue o, JSValue BaseSign, uint32_t pubkeys) { +static inline LDKSign LDKSign_init (JSValue o, JSValue BaseSign, uint64_t pubkeys) { LDKSign_JCalls *calls = MALLOC(sizeof(LDKSign_JCalls), "LDKSign_JCalls"); atomic_init(&calls->refcnt, 1); calls->instance_ptr = o; LDKChannelPublicKeys pubkeys_conv; - pubkeys_conv.inner = (void*)(pubkeys & (~1)); - pubkeys_conv.is_owned = (pubkeys & 1) || (pubkeys == 0); + pubkeys_conv.inner = untag_ptr(pubkeys); + pubkeys_conv.is_owned = ptr_is_owned(pubkeys); CHECK_INNER_FIELD_ACCESS_OR_NULL(pubkeys_conv); LDKSign ret = { @@ -4515,14 +4037,14 @@ static inline LDKSign LDKSign_init (JSValue o, JSValue BaseSign, uint32_t pubkey calls->BaseSign = ret.BaseSign.this_arg; return ret; } -long __attribute__((export_name("TS_LDKSign_new"))) TS_LDKSign_new(JSValue o, JSValue BaseSign, uint32_t pubkeys) { +uint64_t __attribute__((export_name("TS_LDKSign_new"))) TS_LDKSign_new(JSValue o, JSValue BaseSign, uint64_t pubkeys) { LDKSign *res_ptr = MALLOC(sizeof(LDKSign), "LDKSign"); *res_ptr = LDKSign_init(o, BaseSign, pubkeys); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -int8_tArray __attribute__((export_name("TS_Sign_write"))) TS_Sign_write(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +int8_tArray __attribute__((export_name("TS_Sign_write"))) TS_Sign_write(uint64_t this_arg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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, __LINE__); @@ -4535,28 +4057,23 @@ static inline struct LDKSign CResult_SignDecodeErrorZ_get_ok(LDKCResult_SignDeco CHECK(owner->result_ok); return Sign_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_SignDecodeErrorZ_get_ok"))) TS_CResult_SignDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_SignDecodeErrorZ* owner_conv = (LDKCResult_SignDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_SignDecodeErrorZ_get_ok"))) TS_CResult_SignDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_SignDecodeErrorZ* owner_conv = (LDKCResult_SignDecodeErrorZ*)untag_ptr(owner); LDKSign* ret_ret = MALLOC(sizeof(LDKSign), "LDKSign"); *ret_ret = CResult_SignDecodeErrorZ_get_ok(owner_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } static inline struct LDKDecodeError CResult_SignDecodeErrorZ_get_err(LDKCResult_SignDecodeErrorZ *NONNULL_PTR owner){ CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_SignDecodeErrorZ_get_err"))) TS_CResult_SignDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_SignDecodeErrorZ* owner_conv = (LDKCResult_SignDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_SignDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -4564,8 +4081,8 @@ static inline struct LDKRecoverableSignature CResult_RecoverableSignatureNoneZ_g CHECK(owner->result_ok); return *owner->contents.result; } -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 __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_get_ok"))) TS_CResult_RecoverableSignatureNoneZ_get_ok(uint64_t owner) { + LDKCResult_RecoverableSignatureNoneZ* owner_conv = (LDKCResult_RecoverableSignatureNoneZ*)untag_ptr(owner); 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; @@ -4575,8 +4092,8 @@ static inline void CResult_RecoverableSignatureNoneZ_get_err(LDKCResult_Recovera CHECK(!owner->result_ok); return *owner->contents.err; } -void __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_get_err"))) TS_CResult_RecoverableSignatureNoneZ_get_err(uint32_t owner) { - LDKCResult_RecoverableSignatureNoneZ* owner_conv = (LDKCResult_RecoverableSignatureNoneZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_get_err"))) TS_CResult_RecoverableSignatureNoneZ_get_err(uint64_t owner) { + LDKCResult_RecoverableSignatureNoneZ* owner_conv = (LDKCResult_RecoverableSignatureNoneZ*)untag_ptr(owner); CResult_RecoverableSignatureNoneZ_get_err(owner_conv); } @@ -4591,8 +4108,8 @@ static inline struct LDKCVec_CVec_u8ZZ CResult_CVec_CVec_u8ZZNoneZ_get_ok(LDKCRe CHECK(owner->result_ok); return CVec_CVec_u8ZZ_clone(&*owner->contents.result); } -ptrArray __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_get_ok"))) TS_CResult_CVec_CVec_u8ZZNoneZ_get_ok(uint32_t owner) { - LDKCResult_CVec_CVec_u8ZZNoneZ* owner_conv = (LDKCResult_CVec_CVec_u8ZZNoneZ*)(owner & ~1); +ptrArray __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_get_ok"))) TS_CResult_CVec_CVec_u8ZZNoneZ_get_ok(uint64_t owner) { + LDKCResult_CVec_CVec_u8ZZNoneZ* owner_conv = (LDKCResult_CVec_CVec_u8ZZNoneZ*)untag_ptr(owner); LDKCVec_CVec_u8ZZ ret_var = CResult_CVec_CVec_u8ZZNoneZ_get_ok(owner_conv); ptrArray ret_arr = NULL; ret_arr = init_ptrArray(ret_var.datalen, __LINE__); @@ -4613,8 +4130,8 @@ static inline void CResult_CVec_CVec_u8ZZNoneZ_get_err(LDKCResult_CVec_CVec_u8ZZ CHECK(!owner->result_ok); return *owner->contents.err; } -void __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_get_err"))) TS_CResult_CVec_CVec_u8ZZNoneZ_get_err(uint32_t owner) { - LDKCResult_CVec_CVec_u8ZZNoneZ* owner_conv = (LDKCResult_CVec_CVec_u8ZZNoneZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_get_err"))) TS_CResult_CVec_CVec_u8ZZNoneZ_get_err(uint64_t owner) { + LDKCResult_CVec_CVec_u8ZZNoneZ* owner_conv = (LDKCResult_CVec_CVec_u8ZZNoneZ*)untag_ptr(owner); CResult_CVec_CVec_u8ZZNoneZ_get_err(owner_conv); } @@ -4622,17 +4139,12 @@ static inline struct LDKInMemorySigner CResult_InMemorySignerDecodeErrorZ_get_ok CHECK(owner->result_ok); return InMemorySigner_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_get_ok"))) TS_CResult_InMemorySignerDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_InMemorySignerDecodeErrorZ* owner_conv = (LDKCResult_InMemorySignerDecodeErrorZ*)untag_ptr(owner); LDKInMemorySigner ret_var = CResult_InMemorySignerDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -4640,17 +4152,12 @@ static inline struct LDKDecodeError CResult_InMemorySignerDecodeErrorZ_get_err(L CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_get_err"))) TS_CResult_InMemorySignerDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_InMemorySignerDecodeErrorZ* owner_conv = (LDKCResult_InMemorySignerDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_InMemorySignerDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -4665,8 +4172,8 @@ static inline struct LDKTransaction CResult_TransactionNoneZ_get_ok(LDKCResult_T CHECK(owner->result_ok); return *owner->contents.result; } -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); +int8_tArray __attribute__((export_name("TS_CResult_TransactionNoneZ_get_ok"))) TS_CResult_TransactionNoneZ_get_ok(uint64_t owner) { + LDKCResult_TransactionNoneZ* owner_conv = (LDKCResult_TransactionNoneZ*)untag_ptr(owner); LDKTransaction ret_var = CResult_TransactionNoneZ_get_ok(owner_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -4677,27 +4184,27 @@ static inline void CResult_TransactionNoneZ_get_err(LDKCResult_TransactionNoneZ CHECK(!owner->result_ok); return *owner->contents.err; } -void __attribute__((export_name("TS_CResult_TransactionNoneZ_get_err"))) TS_CResult_TransactionNoneZ_get_err(uint32_t owner) { - LDKCResult_TransactionNoneZ* owner_conv = (LDKCResult_TransactionNoneZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_TransactionNoneZ_get_err"))) TS_CResult_TransactionNoneZ_get_err(uint64_t owner) { + LDKCResult_TransactionNoneZ* owner_conv = (LDKCResult_TransactionNoneZ*)untag_ptr(owner); CResult_TransactionNoneZ_get_err(owner_conv); } -uint32_t __attribute__((export_name("TS_LDKCOption_u16Z_ty_from_ptr"))) TS_LDKCOption_u16Z_ty_from_ptr(uint32_t ptr) { - LDKCOption_u16Z *obj = (LDKCOption_u16Z*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKCOption_u16Z_ty_from_ptr"))) TS_LDKCOption_u16Z_ty_from_ptr(uint64_t ptr) { + LDKCOption_u16Z *obj = (LDKCOption_u16Z*)untag_ptr(ptr); switch(obj->tag) { case LDKCOption_u16Z_Some: return 0; case LDKCOption_u16Z_None: return 1; default: abort(); } } -int16_t __attribute__((export_name("TS_LDKCOption_u16Z_Some_get_some"))) TS_LDKCOption_u16Z_Some_get_some(uint32_t ptr) { - LDKCOption_u16Z *obj = (LDKCOption_u16Z*)(ptr & ~1); +int16_t __attribute__((export_name("TS_LDKCOption_u16Z_Some_get_some"))) TS_LDKCOption_u16Z_Some_get_some(uint64_t ptr) { + LDKCOption_u16Z *obj = (LDKCOption_u16Z*)untag_ptr(ptr); assert(obj->tag == LDKCOption_u16Z_Some); int16_t some_conv = obj->some; return some_conv; } -uint32_t __attribute__((export_name("TS_LDKAPIError_ty_from_ptr"))) TS_LDKAPIError_ty_from_ptr(uint32_t ptr) { - LDKAPIError *obj = (LDKAPIError*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKAPIError_ty_from_ptr"))) TS_LDKAPIError_ty_from_ptr(uint64_t ptr) { + LDKAPIError *obj = (LDKAPIError*)untag_ptr(ptr); switch(obj->tag) { case LDKAPIError_APIMisuseError: return 0; case LDKAPIError_FeeRateTooHigh: return 1; @@ -4708,57 +4215,55 @@ uint32_t __attribute__((export_name("TS_LDKAPIError_ty_from_ptr"))) TS_LDKAPIErr default: abort(); } } -jstring __attribute__((export_name("TS_LDKAPIError_APIMisuseError_get_err"))) TS_LDKAPIError_APIMisuseError_get_err(uint32_t ptr) { - LDKAPIError *obj = (LDKAPIError*)(ptr & ~1); +jstring __attribute__((export_name("TS_LDKAPIError_APIMisuseError_get_err"))) TS_LDKAPIError_APIMisuseError_get_err(uint64_t ptr) { + LDKAPIError *obj = (LDKAPIError*)untag_ptr(ptr); assert(obj->tag == LDKAPIError_APIMisuseError); LDKStr err_str = obj->api_misuse_error.err; jstring err_conv = str_ref_to_ts(err_str.chars, err_str.len); return err_conv; } -jstring __attribute__((export_name("TS_LDKAPIError_FeeRateTooHigh_get_err"))) TS_LDKAPIError_FeeRateTooHigh_get_err(uint32_t ptr) { - LDKAPIError *obj = (LDKAPIError*)(ptr & ~1); +jstring __attribute__((export_name("TS_LDKAPIError_FeeRateTooHigh_get_err"))) TS_LDKAPIError_FeeRateTooHigh_get_err(uint64_t ptr) { + LDKAPIError *obj = (LDKAPIError*)untag_ptr(ptr); assert(obj->tag == LDKAPIError_FeeRateTooHigh); LDKStr err_str = obj->fee_rate_too_high.err; jstring err_conv = str_ref_to_ts(err_str.chars, err_str.len); return err_conv; } -int32_t __attribute__((export_name("TS_LDKAPIError_FeeRateTooHigh_get_feerate"))) TS_LDKAPIError_FeeRateTooHigh_get_feerate(uint32_t ptr) { - LDKAPIError *obj = (LDKAPIError*)(ptr & ~1); +int32_t __attribute__((export_name("TS_LDKAPIError_FeeRateTooHigh_get_feerate"))) TS_LDKAPIError_FeeRateTooHigh_get_feerate(uint64_t ptr) { + LDKAPIError *obj = (LDKAPIError*)untag_ptr(ptr); assert(obj->tag == LDKAPIError_FeeRateTooHigh); int32_t feerate_conv = obj->fee_rate_too_high.feerate; return feerate_conv; } -jstring __attribute__((export_name("TS_LDKAPIError_RouteError_get_err"))) TS_LDKAPIError_RouteError_get_err(uint32_t ptr) { - LDKAPIError *obj = (LDKAPIError*)(ptr & ~1); +jstring __attribute__((export_name("TS_LDKAPIError_RouteError_get_err"))) TS_LDKAPIError_RouteError_get_err(uint64_t ptr) { + LDKAPIError *obj = (LDKAPIError*)untag_ptr(ptr); assert(obj->tag == LDKAPIError_RouteError); LDKStr err_str = obj->route_error.err; jstring err_conv = str_ref_to_ts(err_str.chars, err_str.len); return err_conv; } -jstring __attribute__((export_name("TS_LDKAPIError_ChannelUnavailable_get_err"))) TS_LDKAPIError_ChannelUnavailable_get_err(uint32_t ptr) { - LDKAPIError *obj = (LDKAPIError*)(ptr & ~1); +jstring __attribute__((export_name("TS_LDKAPIError_ChannelUnavailable_get_err"))) TS_LDKAPIError_ChannelUnavailable_get_err(uint64_t ptr) { + LDKAPIError *obj = (LDKAPIError*)untag_ptr(ptr); assert(obj->tag == LDKAPIError_ChannelUnavailable); LDKStr err_str = obj->channel_unavailable.err; jstring err_conv = str_ref_to_ts(err_str.chars, err_str.len); return err_conv; } -uint32_t __attribute__((export_name("TS_LDKAPIError_IncompatibleShutdownScript_get_script"))) TS_LDKAPIError_IncompatibleShutdownScript_get_script(uint32_t ptr) { - LDKAPIError *obj = (LDKAPIError*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKAPIError_IncompatibleShutdownScript_get_script"))) TS_LDKAPIError_IncompatibleShutdownScript_get_script(uint64_t ptr) { + LDKAPIError *obj = (LDKAPIError*)untag_ptr(ptr); assert(obj->tag == LDKAPIError_IncompatibleShutdownScript); LDKShutdownScript script_var = obj->incompatible_shutdown_script.script; - uint32_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. + uint64_t script_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(script_var); - script_ref = (uintptr_t)script_var.inner & ~1; + script_ref = tag_ptr(script_var.inner, false); return script_ref; } static inline void CResult_NoneAPIErrorZ_get_ok(LDKCResult_NoneAPIErrorZ *NONNULL_PTR owner){ CHECK(owner->result_ok); return *owner->contents.result; } -void __attribute__((export_name("TS_CResult_NoneAPIErrorZ_get_ok"))) TS_CResult_NoneAPIErrorZ_get_ok(uint32_t owner) { - LDKCResult_NoneAPIErrorZ* owner_conv = (LDKCResult_NoneAPIErrorZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_NoneAPIErrorZ_get_ok"))) TS_CResult_NoneAPIErrorZ_get_ok(uint64_t owner) { + LDKCResult_NoneAPIErrorZ* owner_conv = (LDKCResult_NoneAPIErrorZ*)untag_ptr(owner); CResult_NoneAPIErrorZ_get_ok(owner_conv); } @@ -4766,11 +4271,11 @@ static inline struct LDKAPIError CResult_NoneAPIErrorZ_get_err(LDKCResult_NoneAP CHECK(!owner->result_ok); return APIError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_NoneAPIErrorZ_get_err"))) TS_CResult_NoneAPIErrorZ_get_err(uint32_t owner) { - LDKCResult_NoneAPIErrorZ* owner_conv = (LDKCResult_NoneAPIErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_NoneAPIErrorZ_get_err"))) TS_CResult_NoneAPIErrorZ_get_err(uint64_t owner) { + LDKCResult_NoneAPIErrorZ* owner_conv = (LDKCResult_NoneAPIErrorZ*)untag_ptr(owner); LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError"); *ret_copy = CResult_NoneAPIErrorZ_get_err(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } @@ -4792,8 +4297,8 @@ static inline struct LDKThirtyTwoBytes CResult__u832APIErrorZ_get_ok(LDKCResult_ CHECK(owner->result_ok); return ThirtyTwoBytes_clone(&*owner->contents.result); } -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 __attribute__((export_name("TS_CResult__u832APIErrorZ_get_ok"))) TS_CResult__u832APIErrorZ_get_ok(uint64_t owner) { + LDKCResult__u832APIErrorZ* owner_conv = (LDKCResult__u832APIErrorZ*)untag_ptr(owner); int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, CResult__u832APIErrorZ_get_ok(owner_conv).data, 32); return ret_arr; @@ -4803,16 +4308,16 @@ static inline struct LDKAPIError CResult__u832APIErrorZ_get_err(LDKCResult__u832 CHECK(!owner->result_ok); return APIError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult__u832APIErrorZ_get_err"))) TS_CResult__u832APIErrorZ_get_err(uint32_t owner) { - LDKCResult__u832APIErrorZ* owner_conv = (LDKCResult__u832APIErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult__u832APIErrorZ_get_err"))) TS_CResult__u832APIErrorZ_get_err(uint64_t owner) { + LDKCResult__u832APIErrorZ* owner_conv = (LDKCResult__u832APIErrorZ*)untag_ptr(owner); LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError"); *ret_copy = CResult__u832APIErrorZ_get_err(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_LDKPaymentSendFailure_ty_from_ptr"))) TS_LDKPaymentSendFailure_ty_from_ptr(uint32_t ptr) { - LDKPaymentSendFailure *obj = (LDKPaymentSendFailure*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKPaymentSendFailure_ty_from_ptr"))) TS_LDKPaymentSendFailure_ty_from_ptr(uint64_t ptr) { + LDKPaymentSendFailure *obj = (LDKPaymentSendFailure*)untag_ptr(ptr); switch(obj->tag) { case LDKPaymentSendFailure_ParameterError: return 0; case LDKPaymentSendFailure_PathParameterError: return 1; @@ -4821,73 +4326,69 @@ uint32_t __attribute__((export_name("TS_LDKPaymentSendFailure_ty_from_ptr"))) TS default: abort(); } } -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); +uint64_t __attribute__((export_name("TS_LDKPaymentSendFailure_ParameterError_get_parameter_error"))) TS_LDKPaymentSendFailure_ParameterError_get_parameter_error(uint64_t ptr) { + LDKPaymentSendFailure *obj = (LDKPaymentSendFailure*)untag_ptr(ptr); assert(obj->tag == LDKPaymentSendFailure_ParameterError); - uint32_t parameter_error_ref = ((uintptr_t)&obj->parameter_error) | 1; + uint64_t parameter_error_ref = tag_ptr(&obj->parameter_error, false); 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) { - LDKPaymentSendFailure *obj = (LDKPaymentSendFailure*)(ptr & ~1); +uint64_tArray __attribute__((export_name("TS_LDKPaymentSendFailure_PathParameterError_get_path_parameter_error"))) TS_LDKPaymentSendFailure_PathParameterError_get_path_parameter_error(uint64_t ptr) { + LDKPaymentSendFailure *obj = (LDKPaymentSendFailure*)untag_ptr(ptr); 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, __LINE__); - uint32_t *path_parameter_error_arr_ptr = (uint32_t*)(((uint8_t*)path_parameter_error_arr) + 8); + uint64_tArray path_parameter_error_arr = NULL; + path_parameter_error_arr = init_uint64_tArray(path_parameter_error_var.datalen, __LINE__); + uint64_t *path_parameter_error_arr_ptr = (uint64_t*)(((uint8_t*)path_parameter_error_arr) + 8); for (size_t w = 0; w < path_parameter_error_var.datalen; w++) { LDKCResult_NoneAPIErrorZ* path_parameter_error_conv_22_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); *path_parameter_error_conv_22_conv = path_parameter_error_var.data[w]; *path_parameter_error_conv_22_conv = CResult_NoneAPIErrorZ_clone(path_parameter_error_conv_22_conv); - path_parameter_error_arr_ptr[w] = (uint32_t)path_parameter_error_conv_22_conv; + path_parameter_error_arr_ptr[w] = tag_ptr(path_parameter_error_conv_22_conv, true); } return path_parameter_error_arr; } -uint32_tArray __attribute__((export_name("TS_LDKPaymentSendFailure_AllFailedRetrySafe_get_all_failed_retry_safe"))) TS_LDKPaymentSendFailure_AllFailedRetrySafe_get_all_failed_retry_safe(uint32_t ptr) { - LDKPaymentSendFailure *obj = (LDKPaymentSendFailure*)(ptr & ~1); +uint64_tArray __attribute__((export_name("TS_LDKPaymentSendFailure_AllFailedRetrySafe_get_all_failed_retry_safe"))) TS_LDKPaymentSendFailure_AllFailedRetrySafe_get_all_failed_retry_safe(uint64_t ptr) { + LDKPaymentSendFailure *obj = (LDKPaymentSendFailure*)untag_ptr(ptr); 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, __LINE__); - uint32_t *all_failed_retry_safe_arr_ptr = (uint32_t*)(((uint8_t*)all_failed_retry_safe_arr) + 8); + uint64_tArray all_failed_retry_safe_arr = NULL; + all_failed_retry_safe_arr = init_uint64_tArray(all_failed_retry_safe_var.datalen, __LINE__); + uint64_t *all_failed_retry_safe_arr_ptr = (uint64_t*)(((uint8_t*)all_failed_retry_safe_arr) + 8); for (size_t k = 0; k < all_failed_retry_safe_var.datalen; k++) { - uint32_t all_failed_retry_safe_conv_10_ref = ((uintptr_t)&all_failed_retry_safe_var.data[k]) | 1; + uint64_t all_failed_retry_safe_conv_10_ref = tag_ptr(&all_failed_retry_safe_var.data[k], false); all_failed_retry_safe_arr_ptr[k] = all_failed_retry_safe_conv_10_ref; } return all_failed_retry_safe_arr; } -uint32_tArray __attribute__((export_name("TS_LDKPaymentSendFailure_PartialFailure_get_results"))) TS_LDKPaymentSendFailure_PartialFailure_get_results(uint32_t ptr) { - LDKPaymentSendFailure *obj = (LDKPaymentSendFailure*)(ptr & ~1); +uint64_tArray __attribute__((export_name("TS_LDKPaymentSendFailure_PartialFailure_get_results"))) TS_LDKPaymentSendFailure_PartialFailure_get_results(uint64_t ptr) { + LDKPaymentSendFailure *obj = (LDKPaymentSendFailure*)untag_ptr(ptr); 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, __LINE__); - uint32_t *results_arr_ptr = (uint32_t*)(((uint8_t*)results_arr) + 8); + uint64_tArray results_arr = NULL; + results_arr = init_uint64_tArray(results_var.datalen, __LINE__); + uint64_t *results_arr_ptr = (uint64_t*)(((uint8_t*)results_arr) + 8); for (size_t w = 0; w < results_var.datalen; w++) { LDKCResult_NoneAPIErrorZ* results_conv_22_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); *results_conv_22_conv = results_var.data[w]; *results_conv_22_conv = CResult_NoneAPIErrorZ_clone(results_conv_22_conv); - results_arr_ptr[w] = (uint32_t)results_conv_22_conv; + results_arr_ptr[w] = tag_ptr(results_conv_22_conv, true); } return results_arr; } -uint32_t __attribute__((export_name("TS_LDKPaymentSendFailure_PartialFailure_get_failed_paths_retry"))) TS_LDKPaymentSendFailure_PartialFailure_get_failed_paths_retry(uint32_t ptr) { - LDKPaymentSendFailure *obj = (LDKPaymentSendFailure*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKPaymentSendFailure_PartialFailure_get_failed_paths_retry"))) TS_LDKPaymentSendFailure_PartialFailure_get_failed_paths_retry(uint64_t ptr) { + LDKPaymentSendFailure *obj = (LDKPaymentSendFailure*)untag_ptr(ptr); assert(obj->tag == LDKPaymentSendFailure_PartialFailure); LDKRouteParameters failed_paths_retry_var = obj->partial_failure.failed_paths_retry; - uint32_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. + uint64_t failed_paths_retry_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(failed_paths_retry_var); - failed_paths_retry_ref = (uintptr_t)failed_paths_retry_var.inner & ~1; - } + failed_paths_retry_ref = tag_ptr(failed_paths_retry_var.inner, false); 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); +int8_tArray __attribute__((export_name("TS_LDKPaymentSendFailure_PartialFailure_get_payment_id"))) TS_LDKPaymentSendFailure_PartialFailure_get_payment_id(uint64_t ptr) { + LDKPaymentSendFailure *obj = (LDKPaymentSendFailure*)untag_ptr(ptr); assert(obj->tag == LDKPaymentSendFailure_PartialFailure); int8_tArray payment_id_arr = init_int8_tArray(32, __LINE__); memcpy(payment_id_arr->elems, obj->partial_failure.payment_id.data, 32); @@ -4897,8 +4398,8 @@ static inline struct LDKThirtyTwoBytes CResult_PaymentIdPaymentSendFailureZ_get_ CHECK(owner->result_ok); return ThirtyTwoBytes_clone(&*owner->contents.result); } -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 __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_get_ok"))) TS_CResult_PaymentIdPaymentSendFailureZ_get_ok(uint64_t owner) { + LDKCResult_PaymentIdPaymentSendFailureZ* owner_conv = (LDKCResult_PaymentIdPaymentSendFailureZ*)untag_ptr(owner); int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, CResult_PaymentIdPaymentSendFailureZ_get_ok(owner_conv).data, 32); return ret_arr; @@ -4908,11 +4409,11 @@ static inline struct LDKPaymentSendFailure CResult_PaymentIdPaymentSendFailureZ_ CHECK(!owner->result_ok); return PaymentSendFailure_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_get_err"))) TS_CResult_PaymentIdPaymentSendFailureZ_get_err(uint32_t owner) { - LDKCResult_PaymentIdPaymentSendFailureZ* owner_conv = (LDKCResult_PaymentIdPaymentSendFailureZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_get_err"))) TS_CResult_PaymentIdPaymentSendFailureZ_get_err(uint64_t owner) { + LDKCResult_PaymentIdPaymentSendFailureZ* owner_conv = (LDKCResult_PaymentIdPaymentSendFailureZ*)untag_ptr(owner); LDKPaymentSendFailure *ret_copy = MALLOC(sizeof(LDKPaymentSendFailure), "LDKPaymentSendFailure"); *ret_copy = CResult_PaymentIdPaymentSendFailureZ_get_err(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } @@ -4920,8 +4421,8 @@ static inline void CResult_NonePaymentSendFailureZ_get_ok(LDKCResult_NonePayment CHECK(owner->result_ok); return *owner->contents.result; } -void __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_get_ok"))) TS_CResult_NonePaymentSendFailureZ_get_ok(uint32_t owner) { - LDKCResult_NonePaymentSendFailureZ* owner_conv = (LDKCResult_NonePaymentSendFailureZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_get_ok"))) TS_CResult_NonePaymentSendFailureZ_get_ok(uint64_t owner) { + LDKCResult_NonePaymentSendFailureZ* owner_conv = (LDKCResult_NonePaymentSendFailureZ*)untag_ptr(owner); CResult_NonePaymentSendFailureZ_get_ok(owner_conv); } @@ -4929,19 +4430,19 @@ static inline struct LDKPaymentSendFailure CResult_NonePaymentSendFailureZ_get_e CHECK(!owner->result_ok); return PaymentSendFailure_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_get_err"))) TS_CResult_NonePaymentSendFailureZ_get_err(uint32_t owner) { - LDKCResult_NonePaymentSendFailureZ* owner_conv = (LDKCResult_NonePaymentSendFailureZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_get_err"))) TS_CResult_NonePaymentSendFailureZ_get_err(uint64_t owner) { + LDKCResult_NonePaymentSendFailureZ* owner_conv = (LDKCResult_NonePaymentSendFailureZ*)untag_ptr(owner); LDKPaymentSendFailure *ret_copy = MALLOC(sizeof(LDKPaymentSendFailure), "LDKPaymentSendFailure"); *ret_copy = CResult_NonePaymentSendFailureZ_get_err(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } static inline struct LDKThirtyTwoBytes C2Tuple_PaymentHashPaymentIdZ_get_a(LDKC2Tuple_PaymentHashPaymentIdZ *NONNULL_PTR owner){ return ThirtyTwoBytes_clone(&owner->a); } -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 __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentIdZ_get_a"))) TS_C2Tuple_PaymentHashPaymentIdZ_get_a(uint64_t owner) { + LDKC2Tuple_PaymentHashPaymentIdZ* owner_conv = (LDKC2Tuple_PaymentHashPaymentIdZ*)untag_ptr(owner); int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, C2Tuple_PaymentHashPaymentIdZ_get_a(owner_conv).data, 32); return ret_arr; @@ -4950,8 +4451,8 @@ int8_tArray __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentIdZ_get_a" static inline struct LDKThirtyTwoBytes C2Tuple_PaymentHashPaymentIdZ_get_b(LDKC2Tuple_PaymentHashPaymentIdZ *NONNULL_PTR owner){ return ThirtyTwoBytes_clone(&owner->b); } -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 __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentIdZ_get_b"))) TS_C2Tuple_PaymentHashPaymentIdZ_get_b(uint64_t owner) { + LDKC2Tuple_PaymentHashPaymentIdZ* owner_conv = (LDKC2Tuple_PaymentHashPaymentIdZ*)untag_ptr(owner); int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, C2Tuple_PaymentHashPaymentIdZ_get_b(owner_conv).data, 32); return ret_arr; @@ -4961,22 +4462,22 @@ static inline struct LDKC2Tuple_PaymentHashPaymentIdZ CResult_C2Tuple_PaymentHas CHECK(owner->result_ok); return C2Tuple_PaymentHashPaymentIdZ_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_ok(uint32_t owner) { - LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* owner_conv = (LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_ok(uint64_t owner) { + LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* owner_conv = (LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ*)untag_ptr(owner); LDKC2Tuple_PaymentHashPaymentIdZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PaymentHashPaymentIdZ), "LDKC2Tuple_PaymentHashPaymentIdZ"); *ret_conv = CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_ok(owner_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } static inline struct LDKPaymentSendFailure CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_err(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ *NONNULL_PTR owner){ CHECK(!owner->result_ok); return PaymentSendFailure_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_err"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_err(uint32_t owner) { - LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* owner_conv = (LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_err"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_err(uint64_t owner) { + LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* owner_conv = (LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ*)untag_ptr(owner); LDKPaymentSendFailure *ret_copy = MALLOC(sizeof(LDKPaymentSendFailure), "LDKPaymentSendFailure"); *ret_copy = CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_err(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } @@ -4990,8 +4491,8 @@ static inline LDKCVec_ThirtyTwoBytesZ CVec_ThirtyTwoBytesZ_clone(const LDKCVec_T static inline struct LDKThirtyTwoBytes C2Tuple_PaymentHashPaymentSecretZ_get_a(LDKC2Tuple_PaymentHashPaymentSecretZ *NONNULL_PTR owner){ return ThirtyTwoBytes_clone(&owner->a); } -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 __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentSecretZ_get_a"))) TS_C2Tuple_PaymentHashPaymentSecretZ_get_a(uint64_t owner) { + LDKC2Tuple_PaymentHashPaymentSecretZ* owner_conv = (LDKC2Tuple_PaymentHashPaymentSecretZ*)untag_ptr(owner); int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, C2Tuple_PaymentHashPaymentSecretZ_get_a(owner_conv).data, 32); return ret_arr; @@ -5000,8 +4501,8 @@ int8_tArray __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentSecretZ_ge static inline struct LDKThirtyTwoBytes C2Tuple_PaymentHashPaymentSecretZ_get_b(LDKC2Tuple_PaymentHashPaymentSecretZ *NONNULL_PTR owner){ return ThirtyTwoBytes_clone(&owner->b); } -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 __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentSecretZ_get_b"))) TS_C2Tuple_PaymentHashPaymentSecretZ_get_b(uint64_t owner) { + LDKC2Tuple_PaymentHashPaymentSecretZ* owner_conv = (LDKC2Tuple_PaymentHashPaymentSecretZ*)untag_ptr(owner); int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, C2Tuple_PaymentHashPaymentSecretZ_get_b(owner_conv).data, 32); return ret_arr; @@ -5011,19 +4512,19 @@ static inline struct LDKC2Tuple_PaymentHashPaymentSecretZ CResult_C2Tuple_Paymen CHECK(owner->result_ok); return C2Tuple_PaymentHashPaymentSecretZ_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_ok(uint32_t owner) { - LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* owner_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_ok(uint64_t owner) { + LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* owner_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ*)untag_ptr(owner); LDKC2Tuple_PaymentHashPaymentSecretZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PaymentHashPaymentSecretZ), "LDKC2Tuple_PaymentHashPaymentSecretZ"); *ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_ok(owner_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } static inline void CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_err(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ *NONNULL_PTR owner){ CHECK(!owner->result_ok); return *owner->contents.err; } -void __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_err"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_err(uint32_t owner) { - LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* owner_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_err"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_err(uint64_t owner) { + LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* owner_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ*)untag_ptr(owner); CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_err(owner_conv); } @@ -5031,22 +4532,22 @@ static inline struct LDKC2Tuple_PaymentHashPaymentSecretZ CResult_C2Tuple_Paymen CHECK(owner->result_ok); return C2Tuple_PaymentHashPaymentSecretZ_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_ok(uint32_t owner) { - LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* owner_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_ok(uint64_t owner) { + LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* owner_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)untag_ptr(owner); LDKC2Tuple_PaymentHashPaymentSecretZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PaymentHashPaymentSecretZ), "LDKC2Tuple_PaymentHashPaymentSecretZ"); *ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_ok(owner_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } static inline struct LDKAPIError CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_err(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ *NONNULL_PTR owner){ CHECK(!owner->result_ok); return APIError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_err"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_err(uint32_t owner) { - LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* owner_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_err"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_err(uint64_t owner) { + LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* owner_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)untag_ptr(owner); LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError"); *ret_copy = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_err(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } @@ -5054,8 +4555,8 @@ static inline struct LDKThirtyTwoBytes CResult_PaymentSecretNoneZ_get_ok(LDKCRes CHECK(owner->result_ok); return ThirtyTwoBytes_clone(&*owner->contents.result); } -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 __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_get_ok"))) TS_CResult_PaymentSecretNoneZ_get_ok(uint64_t owner) { + LDKCResult_PaymentSecretNoneZ* owner_conv = (LDKCResult_PaymentSecretNoneZ*)untag_ptr(owner); int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, CResult_PaymentSecretNoneZ_get_ok(owner_conv).data, 32); return ret_arr; @@ -5065,8 +4566,8 @@ static inline void CResult_PaymentSecretNoneZ_get_err(LDKCResult_PaymentSecretNo CHECK(!owner->result_ok); return *owner->contents.err; } -void __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_get_err"))) TS_CResult_PaymentSecretNoneZ_get_err(uint32_t owner) { - LDKCResult_PaymentSecretNoneZ* owner_conv = (LDKCResult_PaymentSecretNoneZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_get_err"))) TS_CResult_PaymentSecretNoneZ_get_err(uint64_t owner) { + LDKCResult_PaymentSecretNoneZ* owner_conv = (LDKCResult_PaymentSecretNoneZ*)untag_ptr(owner); CResult_PaymentSecretNoneZ_get_err(owner_conv); } @@ -5074,8 +4575,8 @@ static inline struct LDKThirtyTwoBytes CResult_PaymentSecretAPIErrorZ_get_ok(LDK CHECK(owner->result_ok); return ThirtyTwoBytes_clone(&*owner->contents.result); } -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 __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_get_ok"))) TS_CResult_PaymentSecretAPIErrorZ_get_ok(uint64_t owner) { + LDKCResult_PaymentSecretAPIErrorZ* owner_conv = (LDKCResult_PaymentSecretAPIErrorZ*)untag_ptr(owner); int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, CResult_PaymentSecretAPIErrorZ_get_ok(owner_conv).data, 32); return ret_arr; @@ -5085,11 +4586,11 @@ static inline struct LDKAPIError CResult_PaymentSecretAPIErrorZ_get_err(LDKCResu CHECK(!owner->result_ok); return APIError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_get_err"))) TS_CResult_PaymentSecretAPIErrorZ_get_err(uint32_t owner) { - LDKCResult_PaymentSecretAPIErrorZ* owner_conv = (LDKCResult_PaymentSecretAPIErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_get_err"))) TS_CResult_PaymentSecretAPIErrorZ_get_err(uint64_t owner) { + LDKCResult_PaymentSecretAPIErrorZ* owner_conv = (LDKCResult_PaymentSecretAPIErrorZ*)untag_ptr(owner); LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError"); *ret_copy = CResult_PaymentSecretAPIErrorZ_get_err(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } @@ -5097,8 +4598,8 @@ static inline struct LDKThirtyTwoBytes CResult_PaymentPreimageAPIErrorZ_get_ok(L CHECK(owner->result_ok); return ThirtyTwoBytes_clone(&*owner->contents.result); } -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 __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_get_ok"))) TS_CResult_PaymentPreimageAPIErrorZ_get_ok(uint64_t owner) { + LDKCResult_PaymentPreimageAPIErrorZ* owner_conv = (LDKCResult_PaymentPreimageAPIErrorZ*)untag_ptr(owner); int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, CResult_PaymentPreimageAPIErrorZ_get_ok(owner_conv).data, 32); return ret_arr; @@ -5108,11 +4609,11 @@ static inline struct LDKAPIError CResult_PaymentPreimageAPIErrorZ_get_err(LDKCRe CHECK(!owner->result_ok); return APIError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_get_err"))) TS_CResult_PaymentPreimageAPIErrorZ_get_err(uint32_t owner) { - LDKCResult_PaymentPreimageAPIErrorZ* owner_conv = (LDKCResult_PaymentPreimageAPIErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_get_err"))) TS_CResult_PaymentPreimageAPIErrorZ_get_err(uint64_t owner) { + LDKCResult_PaymentPreimageAPIErrorZ* owner_conv = (LDKCResult_PaymentPreimageAPIErrorZ*)untag_ptr(owner); LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError"); *ret_copy = CResult_PaymentPreimageAPIErrorZ_get_err(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } @@ -5120,17 +4621,12 @@ static inline struct LDKCounterpartyForwardingInfo CResult_CounterpartyForwardin CHECK(owner->result_ok); return CounterpartyForwardingInfo_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_get_ok"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* owner_conv = (LDKCResult_CounterpartyForwardingInfoDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_get_ok"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* owner_conv = (LDKCResult_CounterpartyForwardingInfoDecodeErrorZ*)untag_ptr(owner); LDKCounterpartyForwardingInfo ret_var = CResult_CounterpartyForwardingInfoDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -5138,17 +4634,12 @@ static inline struct LDKDecodeError CResult_CounterpartyForwardingInfoDecodeErro CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_get_err"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_get_err(uint32_t owner) { - LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* owner_conv = (LDKCResult_CounterpartyForwardingInfoDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_get_err"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* owner_conv = (LDKCResult_CounterpartyForwardingInfoDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_CounterpartyForwardingInfoDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -5156,17 +4647,12 @@ static inline struct LDKChannelCounterparty CResult_ChannelCounterpartyDecodeErr CHECK(owner->result_ok); return ChannelCounterparty_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_get_ok"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_ChannelCounterpartyDecodeErrorZ* owner_conv = (LDKCResult_ChannelCounterpartyDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_get_ok"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ChannelCounterpartyDecodeErrorZ* owner_conv = (LDKCResult_ChannelCounterpartyDecodeErrorZ*)untag_ptr(owner); LDKChannelCounterparty ret_var = CResult_ChannelCounterpartyDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -5174,17 +4660,12 @@ static inline struct LDKDecodeError CResult_ChannelCounterpartyDecodeErrorZ_get_ CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_get_err"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_get_err(uint32_t owner) { - LDKCResult_ChannelCounterpartyDecodeErrorZ* owner_conv = (LDKCResult_ChannelCounterpartyDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_get_err"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ChannelCounterpartyDecodeErrorZ* owner_conv = (LDKCResult_ChannelCounterpartyDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ChannelCounterpartyDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -5192,17 +4673,12 @@ static inline struct LDKChannelDetails CResult_ChannelDetailsDecodeErrorZ_get_ok CHECK(owner->result_ok); return ChannelDetails_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_get_ok"))) TS_CResult_ChannelDetailsDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_ChannelDetailsDecodeErrorZ* owner_conv = (LDKCResult_ChannelDetailsDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_get_ok"))) TS_CResult_ChannelDetailsDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ChannelDetailsDecodeErrorZ* owner_conv = (LDKCResult_ChannelDetailsDecodeErrorZ*)untag_ptr(owner); LDKChannelDetails ret_var = CResult_ChannelDetailsDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -5210,17 +4686,12 @@ static inline struct LDKDecodeError CResult_ChannelDetailsDecodeErrorZ_get_err(L CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_get_err"))) TS_CResult_ChannelDetailsDecodeErrorZ_get_err(uint32_t owner) { - LDKCResult_ChannelDetailsDecodeErrorZ* owner_conv = (LDKCResult_ChannelDetailsDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_get_err"))) TS_CResult_ChannelDetailsDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ChannelDetailsDecodeErrorZ* owner_conv = (LDKCResult_ChannelDetailsDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ChannelDetailsDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -5228,17 +4699,12 @@ static inline struct LDKPhantomRouteHints CResult_PhantomRouteHintsDecodeErrorZ_ CHECK(owner->result_ok); return PhantomRouteHints_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_get_ok"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_PhantomRouteHintsDecodeErrorZ* owner_conv = (LDKCResult_PhantomRouteHintsDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_get_ok"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_PhantomRouteHintsDecodeErrorZ* owner_conv = (LDKCResult_PhantomRouteHintsDecodeErrorZ*)untag_ptr(owner); LDKPhantomRouteHints ret_var = CResult_PhantomRouteHintsDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -5246,17 +4712,12 @@ static inline struct LDKDecodeError CResult_PhantomRouteHintsDecodeErrorZ_get_er CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_get_err"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_get_err(uint32_t owner) { - LDKCResult_PhantomRouteHintsDecodeErrorZ* owner_conv = (LDKCResult_PhantomRouteHintsDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_get_err"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_PhantomRouteHintsDecodeErrorZ* owner_conv = (LDKCResult_PhantomRouteHintsDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_PhantomRouteHintsDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -5280,73 +4741,53 @@ 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; - uint32_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. + uint64_t funding_txo_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_txo_var); - funding_txo_ref = (uintptr_t)funding_txo_var.inner; - if (funding_txo_var.is_owned) { - funding_txo_ref |= 1; - } + funding_txo_ref = tag_ptr(funding_txo_var.inner, funding_txo_var.is_owned); LDKChannelMonitor monitor_var = monitor; - uint32_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. + uint64_t monitor_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(monitor_var); - monitor_ref = (uintptr_t)monitor_var.inner; - if (monitor_var.is_owned) { - monitor_ref |= 1; - } - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 16, (uint32_t)funding_txo_ref, (uint32_t)monitor_ref, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + monitor_ref = tag_ptr(monitor_var.inner, monitor_var.is_owned); + uint32_t ret = js_invoke_function_bbuuuu(j_calls->instance_ptr, 16, funding_txo_ref, monitor_ref, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_NoneChannelMonitorUpdateErrZ ret_conv = *(LDKCResult_NoneChannelMonitorUpdateErrZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } 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; - uint32_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. + uint64_t funding_txo_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_txo_var); - funding_txo_ref = (uintptr_t)funding_txo_var.inner; - if (funding_txo_var.is_owned) { - funding_txo_ref |= 1; - } + funding_txo_ref = tag_ptr(funding_txo_var.inner, funding_txo_var.is_owned); LDKChannelMonitorUpdate update_var = update; - uint32_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. + uint64_t update_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(update_var); - update_ref = (uintptr_t)update_var.inner; - if (update_var.is_owned) { - update_ref |= 1; - } - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 17, (uint32_t)funding_txo_ref, (uint32_t)update_ref, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + update_ref = tag_ptr(update_var.inner, update_var.is_owned); + uint32_t ret = js_invoke_function_bbuuuu(j_calls->instance_ptr, 17, funding_txo_ref, update_ref, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_NoneChannelMonitorUpdateErrZ ret_conv = *(LDKCResult_NoneChannelMonitorUpdateErrZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } LDKCVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ release_pending_monitor_events_LDKWatch_jcall(const void* this_arg) { LDKWatch_JCalls *j_calls = (LDKWatch_JCalls*) this_arg; - uint32_tArray ret = (uint32_tArray)js_invoke_function_uuuuuu(j_calls->instance_ptr, 18, 0, 0, 0, 0, 0, 0); + uint64_tArray ret = (uint64_tArray)js_invoke_function_uuuuuu(j_calls->instance_ptr, 18, 0, 0, 0, 0, 0, 0); LDKCVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ ret_constr; ret_constr.datalen = ret->arr_len; if (ret_constr.datalen > 0) ret_constr.data = MALLOC(ret_constr.datalen * sizeof(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ), "LDKCVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ Elements"); else ret_constr.data = NULL; - uint32_t* ret_vals = ret->elems; + uint64_t* ret_vals = ret->elems; for (size_t x = 0; x < ret_constr.datalen; x++) { - uint32_t ret_conv_49 = ret_vals[x]; - void* ret_conv_49_ptr = (void*)(((uintptr_t)ret_conv_49) & ~1); + uint64_t ret_conv_49 = ret_vals[x]; + void* ret_conv_49_ptr = untag_ptr(ret_conv_49); CHECK_ACCESS(ret_conv_49_ptr); LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ ret_conv_49_conv = *(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ*)(ret_conv_49_ptr); - FREE((void*)ret_conv_49); + FREE(untag_ptr(ret_conv_49)); ret_constr.data[x] = ret_conv_49_conv; } FREE(ret); @@ -5370,61 +4811,61 @@ static inline LDKWatch LDKWatch_init (JSValue o) { }; return ret; } -long __attribute__((export_name("TS_LDKWatch_new"))) TS_LDKWatch_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKWatch_new"))) TS_LDKWatch_new(JSValue o) { LDKWatch *res_ptr = MALLOC(sizeof(LDKWatch), "LDKWatch"); *res_ptr = LDKWatch_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_Watch_watch_channel"))) TS_Watch_watch_channel(uint64_t this_arg, uint64_t funding_txo, uint64_t monitor) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKWatch* this_arg_conv = (LDKWatch*)this_arg_ptr; LDKOutPoint funding_txo_conv; - funding_txo_conv.inner = (void*)(funding_txo & (~1)); - funding_txo_conv.is_owned = (funding_txo & 1) || (funding_txo == 0); + funding_txo_conv.inner = untag_ptr(funding_txo); + funding_txo_conv.is_owned = ptr_is_owned(funding_txo); CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_txo_conv); funding_txo_conv = OutPoint_clone(&funding_txo_conv); LDKChannelMonitor monitor_conv; - monitor_conv.inner = (void*)(monitor & (~1)); - monitor_conv.is_owned = (monitor & 1) || (monitor == 0); + monitor_conv.inner = untag_ptr(monitor); + monitor_conv.is_owned = ptr_is_owned(monitor); CHECK_INNER_FIELD_ACCESS_OR_NULL(monitor_conv); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_Watch_update_channel"))) TS_Watch_update_channel(uint64_t this_arg, uint64_t funding_txo, uint64_t update) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKWatch* this_arg_conv = (LDKWatch*)this_arg_ptr; LDKOutPoint funding_txo_conv; - funding_txo_conv.inner = (void*)(funding_txo & (~1)); - funding_txo_conv.is_owned = (funding_txo & 1) || (funding_txo == 0); + funding_txo_conv.inner = untag_ptr(funding_txo); + funding_txo_conv.is_owned = ptr_is_owned(funding_txo); CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_txo_conv); funding_txo_conv = OutPoint_clone(&funding_txo_conv); LDKChannelMonitorUpdate update_conv; - update_conv.inner = (void*)(update & (~1)); - update_conv.is_owned = (update & 1) || (update == 0); + update_conv.inner = untag_ptr(update); + update_conv.is_owned = ptr_is_owned(update); CHECK_INNER_FIELD_ACCESS_OR_NULL(update_conv); update_conv = ChannelMonitorUpdate_clone(&update_conv); LDKCResult_NoneChannelMonitorUpdateErrZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneChannelMonitorUpdateErrZ), "LDKCResult_NoneChannelMonitorUpdateErrZ"); *ret_conv = (this_arg_conv->update_channel)(this_arg_conv->this_arg, funding_txo_conv, update_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_tArray __attribute__((export_name("TS_Watch_release_pending_monitor_events"))) TS_Watch_release_pending_monitor_events(uint64_t this_arg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKWatch* this_arg_conv = (LDKWatch*)this_arg_ptr; LDKCVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ ret_var = (this_arg_conv->release_pending_monitor_events)(this_arg_conv->this_arg); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t x = 0; x < ret_var.datalen; x++) { LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ* ret_conv_49_conv = MALLOC(sizeof(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ), "LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ"); *ret_conv_49_conv = ret_var.data[x]; - ret_arr_ptr[x] = ((uint32_t)ret_conv_49_conv); + ret_arr_ptr[x] = tag_ptr(ret_conv_49_conv, true); } FREE(ret_var.data); @@ -5465,14 +4906,14 @@ static inline LDKBroadcasterInterface LDKBroadcasterInterface_init (JSValue o) { }; return ret; } -long __attribute__((export_name("TS_LDKBroadcasterInterface_new"))) TS_LDKBroadcasterInterface_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKBroadcasterInterface_new"))) TS_LDKBroadcasterInterface_new(JSValue o) { LDKBroadcasterInterface *res_ptr = MALLOC(sizeof(LDKBroadcasterInterface), "LDKBroadcasterInterface"); *res_ptr = LDKBroadcasterInterface_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -void __attribute__((export_name("TS_BroadcasterInterface_broadcast_transaction"))) TS_BroadcasterInterface_broadcast_transaction(uint32_t this_arg, int8_tArray tx) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_BroadcasterInterface_broadcast_transaction"))) TS_BroadcasterInterface_broadcast_transaction(uint64_t this_arg, int8_tArray tx) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKBroadcasterInterface* this_arg_conv = (LDKBroadcasterInterface*)this_arg_ptr; LDKTransaction tx_ref; tx_ref.datalen = tx->arr_len; @@ -5495,11 +4936,11 @@ static void LDKKeysInterface_JCalls_free(void* this_arg) { LDKCResult_SecretKeyNoneZ get_node_secret_LDKKeysInterface_jcall(const void* this_arg, LDKRecipient recipient) { LDKKeysInterface_JCalls *j_calls = (LDKKeysInterface_JCalls*) this_arg; uint32_t recipient_conv = LDKRecipient_to_js(recipient); - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 20, (uint32_t)recipient_conv, 0, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 20, recipient_conv, 0, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_SecretKeyNoneZ ret_conv = *(LDKCResult_SecretKeyNoneZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } LDKCVec_u8Z get_destination_script_LDKKeysInterface_jcall(const void* this_arg) { @@ -5515,8 +4956,8 @@ LDKShutdownScript get_shutdown_scriptpubkey_LDKKeysInterface_jcall(const void* t LDKKeysInterface_JCalls *j_calls = (LDKKeysInterface_JCalls*) this_arg; uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 22, 0, 0, 0, 0, 0, 0); LDKShutdownScript ret_conv; - ret_conv.inner = (void*)(ret & (~1)); - ret_conv.is_owned = (ret & 1) || (ret == 0); + ret_conv.inner = untag_ptr(ret); + ret_conv.is_owned = ptr_is_owned(ret); CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv); return ret_conv; } @@ -5524,11 +4965,11 @@ LDKSign get_channel_signer_LDKKeysInterface_jcall(const void* this_arg, bool inb LDKKeysInterface_JCalls *j_calls = (LDKKeysInterface_JCalls*) this_arg; jboolean inbound_conv = inbound; int64_t channel_value_satoshis_conv = channel_value_satoshis; - uint32_t ret = js_invoke_function_ubuuuu(j_calls->instance_ptr, 23, (uint32_t)inbound_conv, (uint32_t)channel_value_satoshis_conv, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + uint32_t ret = js_invoke_function_ubuuuu(j_calls->instance_ptr, 23, inbound_conv, channel_value_satoshis_conv, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKSign ret_conv = *(LDKSign*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } LDKThirtyTwoBytes get_secure_random_bytes_LDKKeysInterface_jcall(const void* this_arg) { @@ -5545,10 +4986,10 @@ LDKCResult_SignDecodeErrorZ read_chan_signer_LDKKeysInterface_jcall(const void* 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_uuuuuu(j_calls->instance_ptr, 25, (uint32_t)reader_arr, 0, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_SignDecodeErrorZ ret_conv = *(LDKCResult_SignDecodeErrorZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } LDKCResult_RecoverableSignatureNoneZ sign_invoice_LDKKeysInterface_jcall(const void* this_arg, LDKu8slice hrp_bytes, LDKCVec_u5Z invoice_data, LDKRecipient receipient) { @@ -5567,11 +5008,11 @@ LDKCResult_RecoverableSignatureNoneZ sign_invoice_LDKKeysInterface_jcall(const v FREE(invoice_data_var.data); uint32_t receipient_conv = LDKRecipient_to_js(receipient); - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 26, (uint32_t)hrp_bytes_arr, (uint32_t)invoice_data_arr, (uint32_t)receipient_conv, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 26, (uint32_t)hrp_bytes_arr, (uint32_t)invoice_data_arr, receipient_conv, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_RecoverableSignatureNoneZ ret_conv = *(LDKCResult_RecoverableSignatureNoneZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } LDKThirtyTwoBytes get_inbound_payment_key_material_LDKKeysInterface_jcall(const void* this_arg) { @@ -5605,24 +5046,24 @@ static inline LDKKeysInterface LDKKeysInterface_init (JSValue o) { }; return ret; } -long __attribute__((export_name("TS_LDKKeysInterface_new"))) TS_LDKKeysInterface_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKKeysInterface_new"))) TS_LDKKeysInterface_new(JSValue o) { LDKKeysInterface *res_ptr = MALLOC(sizeof(LDKKeysInterface), "LDKKeysInterface"); *res_ptr = LDKKeysInterface_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -uint32_t __attribute__((export_name("TS_KeysInterface_get_node_secret"))) TS_KeysInterface_get_node_secret(uint32_t this_arg, uint32_t recipient) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_KeysInterface_get_node_secret"))) TS_KeysInterface_get_node_secret(uint64_t this_arg, uint32_t recipient) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKKeysInterface* this_arg_conv = (LDKKeysInterface*)this_arg_ptr; LDKRecipient recipient_conv = LDKRecipient_from_js(recipient); LDKCResult_SecretKeyNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SecretKeyNoneZ), "LDKCResult_SecretKeyNoneZ"); *ret_conv = (this_arg_conv->get_node_secret)(this_arg_conv->this_arg, recipient_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_KeysInterface_get_destination_script"))) TS_KeysInterface_get_destination_script(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +int8_tArray __attribute__((export_name("TS_KeysInterface_get_destination_script"))) TS_KeysInterface_get_destination_script(uint64_t this_arg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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, __LINE__); @@ -5631,43 +5072,38 @@ int8_tArray __attribute__((export_name("TS_KeysInterface_get_destination_script 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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_KeysInterface_get_shutdown_scriptpubkey"))) TS_KeysInterface_get_shutdown_scriptpubkey(uint64_t this_arg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_KeysInterface_get_channel_signer"))) TS_KeysInterface_get_channel_signer(uint64_t this_arg, jboolean inbound, int64_t channel_value_satoshis) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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 (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +int8_tArray __attribute__((export_name("TS_KeysInterface_get_secure_random_bytes"))) TS_KeysInterface_get_secure_random_bytes(uint64_t this_arg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKKeysInterface* this_arg_conv = (LDKKeysInterface*)this_arg_ptr; 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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_KeysInterface_read_chan_signer"))) TS_KeysInterface_read_chan_signer(uint64_t this_arg, int8_tArray reader) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKKeysInterface* this_arg_conv = (LDKKeysInterface*)this_arg_ptr; LDKu8slice reader_ref; reader_ref.datalen = reader->arr_len; @@ -5675,12 +5111,12 @@ uint32_t __attribute__((export_name("TS_KeysInterface_read_chan_signer"))) TS_K LDKCResult_SignDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SignDecodeErrorZ), "LDKCResult_SignDecodeErrorZ"); *ret_conv = (this_arg_conv->read_chan_signer)(this_arg_conv->this_arg, reader_ref); FREE(reader); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_KeysInterface_sign_invoice"))) TS_KeysInterface_sign_invoice(uint32_t this_arg, int8_tArray hrp_bytes, ptrArray invoice_data, uint32_t receipient) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_KeysInterface_sign_invoice"))) TS_KeysInterface_sign_invoice(uint64_t this_arg, int8_tArray hrp_bytes, ptrArray invoice_data, uint32_t receipient) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKKeysInterface* this_arg_conv = (LDKKeysInterface*)this_arg_ptr; LDKu8slice hrp_bytes_ref; hrp_bytes_ref.datalen = hrp_bytes->arr_len; @@ -5702,12 +5138,12 @@ uint32_t __attribute__((export_name("TS_KeysInterface_sign_invoice"))) TS_KeysI LDKCResult_RecoverableSignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_RecoverableSignatureNoneZ), "LDKCResult_RecoverableSignatureNoneZ"); *ret_conv = (this_arg_conv->sign_invoice)(this_arg_conv->this_arg, hrp_bytes_ref, invoice_data_constr, receipient_conv); FREE(hrp_bytes); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +int8_tArray __attribute__((export_name("TS_KeysInterface_get_inbound_payment_key_material"))) TS_KeysInterface_get_inbound_payment_key_material(uint64_t this_arg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKKeysInterface* this_arg_conv = (LDKKeysInterface*)this_arg_ptr; 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); @@ -5727,7 +5163,7 @@ static void LDKFeeEstimator_JCalls_free(void* this_arg) { uint32_t get_est_sat_per_1000_weight_LDKFeeEstimator_jcall(const void* this_arg, LDKConfirmationTarget confirmation_target) { LDKFeeEstimator_JCalls *j_calls = (LDKFeeEstimator_JCalls*) this_arg; uint32_t confirmation_target_conv = LDKConfirmationTarget_to_js(confirmation_target); - return js_invoke_function_uuuuuu(j_calls->instance_ptr, 28, (uint32_t)confirmation_target_conv, 0, 0, 0, 0, 0); + return js_invoke_function_uuuuuu(j_calls->instance_ptr, 28, confirmation_target_conv, 0, 0, 0, 0, 0); } static void LDKFeeEstimator_JCalls_cloned(LDKFeeEstimator* new_obj) { LDKFeeEstimator_JCalls *j_calls = (LDKFeeEstimator_JCalls*) new_obj->this_arg; @@ -5745,14 +5181,14 @@ static inline LDKFeeEstimator LDKFeeEstimator_init (JSValue o) { }; return ret; } -long __attribute__((export_name("TS_LDKFeeEstimator_new"))) TS_LDKFeeEstimator_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKFeeEstimator_new"))) TS_LDKFeeEstimator_new(JSValue o) { LDKFeeEstimator *res_ptr = MALLOC(sizeof(LDKFeeEstimator), "LDKFeeEstimator"); *res_ptr = LDKFeeEstimator_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +int32_t __attribute__((export_name("TS_FeeEstimator_get_est_sat_per_1000_weight"))) TS_FeeEstimator_get_est_sat_per_1000_weight(uint64_t this_arg, uint32_t confirmation_target) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKFeeEstimator* this_arg_conv = (LDKFeeEstimator*)this_arg_ptr; LDKConfirmationTarget confirmation_target_conv = LDKConfirmationTarget_from_js(confirmation_target); int32_t ret_conv = (this_arg_conv->get_est_sat_per_1000_weight)(this_arg_conv->this_arg, confirmation_target_conv); @@ -5762,8 +5198,8 @@ int32_t __attribute__((export_name("TS_FeeEstimator_get_est_sat_per_1000_weight static inline struct LDKThirtyTwoBytes C2Tuple_BlockHashChannelManagerZ_get_a(LDKC2Tuple_BlockHashChannelManagerZ *NONNULL_PTR owner){ return ThirtyTwoBytes_clone(&owner->a); } -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 __attribute__((export_name("TS_C2Tuple_BlockHashChannelManagerZ_get_a"))) TS_C2Tuple_BlockHashChannelManagerZ_get_a(uint64_t owner) { + LDKC2Tuple_BlockHashChannelManagerZ* owner_conv = (LDKC2Tuple_BlockHashChannelManagerZ*)untag_ptr(owner); int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, C2Tuple_BlockHashChannelManagerZ_get_a(owner_conv).data, 32); return ret_arr; @@ -5772,14 +5208,12 @@ int8_tArray __attribute__((export_name("TS_C2Tuple_BlockHashChannelManagerZ_get static inline struct LDKChannelManager *C2Tuple_BlockHashChannelManagerZ_get_b(LDKC2Tuple_BlockHashChannelManagerZ *NONNULL_PTR owner){ return &owner->b; } -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); +uint64_t __attribute__((export_name("TS_C2Tuple_BlockHashChannelManagerZ_get_b"))) TS_C2Tuple_BlockHashChannelManagerZ_get_b(uint64_t owner) { + LDKC2Tuple_BlockHashChannelManagerZ* owner_conv = (LDKC2Tuple_BlockHashChannelManagerZ*)untag_ptr(owner); LDKChannelManager ret_var = *C2Tuple_BlockHashChannelManagerZ_get_b(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner & ~1; + ret_ref = tag_ptr(ret_var.inner, false); return ret_ref; } @@ -5787,9 +5221,9 @@ static inline struct LDKC2Tuple_BlockHashChannelManagerZ *CResult_C2Tuple_BlockH CHECK(owner->result_ok); return &*owner->contents.result; } -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); - uint32_t ret_ret = (uintptr_t)CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_ok(owner_conv) | 1; +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_ok"))) TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ* owner_conv = (LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ*)untag_ptr(owner); + uint64_t ret_ret = tag_ptr(CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_ok(owner_conv), false); return ret_ret; } @@ -5797,17 +5231,12 @@ static inline struct LDKDecodeError CResult_C2Tuple_BlockHashChannelManagerZDeco CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_err"))) TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ* owner_conv = (LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -5815,17 +5244,12 @@ static inline struct LDKChannelConfig CResult_ChannelConfigDecodeErrorZ_get_ok(L CHECK(owner->result_ok); return ChannelConfig_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_get_ok"))) TS_CResult_ChannelConfigDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ChannelConfigDecodeErrorZ* owner_conv = (LDKCResult_ChannelConfigDecodeErrorZ*)untag_ptr(owner); LDKChannelConfig ret_var = CResult_ChannelConfigDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -5833,17 +5257,12 @@ static inline struct LDKDecodeError CResult_ChannelConfigDecodeErrorZ_get_err(LD CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_get_err"))) TS_CResult_ChannelConfigDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ChannelConfigDecodeErrorZ* owner_conv = (LDKCResult_ChannelConfigDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ChannelConfigDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -5851,17 +5270,12 @@ static inline struct LDKOutPoint CResult_OutPointDecodeErrorZ_get_ok(LDKCResult_ CHECK(owner->result_ok); return OutPoint_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_get_ok"))) TS_CResult_OutPointDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_OutPointDecodeErrorZ* owner_conv = (LDKCResult_OutPointDecodeErrorZ*)untag_ptr(owner); LDKOutPoint ret_var = CResult_OutPointDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -5869,17 +5283,12 @@ static inline struct LDKDecodeError CResult_OutPointDecodeErrorZ_get_err(LDKCRes CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_get_err"))) TS_CResult_OutPointDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_OutPointDecodeErrorZ* owner_conv = (LDKCResult_OutPointDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_OutPointDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -5931,22 +5340,22 @@ static inline LDKType LDKType_init (JSValue o) { }; return ret; } -long __attribute__((export_name("TS_LDKType_new"))) TS_LDKType_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKType_new"))) TS_LDKType_new(JSValue o) { LDKType *res_ptr = MALLOC(sizeof(LDKType), "LDKType"); *res_ptr = LDKType_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -int16_t __attribute__((export_name("TS_Type_type_id"))) TS_Type_type_id(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +int16_t __attribute__((export_name("TS_Type_type_id"))) TS_Type_type_id(uint64_t this_arg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKType* this_arg_conv = (LDKType*)this_arg_ptr; int16_t ret_conv = (this_arg_conv->type_id)(this_arg_conv->this_arg); return ret_conv; } -jstring __attribute__((export_name("TS_Type_debug_str"))) TS_Type_debug_str(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +jstring __attribute__((export_name("TS_Type_debug_str"))) TS_Type_debug_str(uint64_t this_arg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); jstring ret_conv = str_ref_to_ts(ret_str.chars, ret_str.len); @@ -5954,9 +5363,9 @@ jstring __attribute__((export_name("TS_Type_debug_str"))) TS_Type_debug_str(uin return ret_conv; } -int8_tArray __attribute__((export_name("TS_Type_write"))) TS_Type_write(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +int8_tArray __attribute__((export_name("TS_Type_write"))) TS_Type_write(uint64_t this_arg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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, __LINE__); @@ -5965,30 +5374,30 @@ int8_tArray __attribute__((export_name("TS_Type_write"))) TS_Type_write(uint32_ return ret_arr; } -uint32_t __attribute__((export_name("TS_LDKCOption_TypeZ_ty_from_ptr"))) TS_LDKCOption_TypeZ_ty_from_ptr(uint32_t ptr) { - LDKCOption_TypeZ *obj = (LDKCOption_TypeZ*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKCOption_TypeZ_ty_from_ptr"))) TS_LDKCOption_TypeZ_ty_from_ptr(uint64_t ptr) { + LDKCOption_TypeZ *obj = (LDKCOption_TypeZ*)untag_ptr(ptr); switch(obj->tag) { case LDKCOption_TypeZ_Some: return 0; case LDKCOption_TypeZ_None: return 1; default: abort(); } } -uint32_t __attribute__((export_name("TS_LDKCOption_TypeZ_Some_get_some"))) TS_LDKCOption_TypeZ_Some_get_some(uint32_t ptr) { - LDKCOption_TypeZ *obj = (LDKCOption_TypeZ*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKCOption_TypeZ_Some_get_some"))) TS_LDKCOption_TypeZ_Some_get_some(uint64_t ptr) { + LDKCOption_TypeZ *obj = (LDKCOption_TypeZ*)untag_ptr(ptr); assert(obj->tag == LDKCOption_TypeZ_Some); LDKType* some_ret = MALLOC(sizeof(LDKType), "LDKType"); *some_ret = Type_clone(&obj->some); - return (uint32_t)some_ret; + return tag_ptr(some_ret, true); } static inline struct LDKCOption_TypeZ CResult_COption_TypeZDecodeErrorZ_get_ok(LDKCResult_COption_TypeZDecodeErrorZ *NONNULL_PTR owner){ CHECK(owner->result_ok); return COption_TypeZ_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_get_ok"))) TS_CResult_COption_TypeZDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_COption_TypeZDecodeErrorZ* owner_conv = (LDKCResult_COption_TypeZDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_get_ok"))) TS_CResult_COption_TypeZDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_COption_TypeZDecodeErrorZ* owner_conv = (LDKCResult_COption_TypeZDecodeErrorZ*)untag_ptr(owner); LDKCOption_TypeZ *ret_copy = MALLOC(sizeof(LDKCOption_TypeZ), "LDKCOption_TypeZ"); *ret_copy = CResult_COption_TypeZDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } @@ -5996,22 +5405,17 @@ static inline struct LDKDecodeError CResult_COption_TypeZDecodeErrorZ_get_err(LD CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_get_err"))) TS_CResult_COption_TypeZDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_COption_TypeZDecodeErrorZ* owner_conv = (LDKCResult_COption_TypeZDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_COption_TypeZDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_LDKPaymentError_ty_from_ptr"))) TS_LDKPaymentError_ty_from_ptr(uint32_t ptr) { - LDKPaymentError *obj = (LDKPaymentError*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKPaymentError_ty_from_ptr"))) TS_LDKPaymentError_ty_from_ptr(uint64_t ptr) { + LDKPaymentError *obj = (LDKPaymentError*)untag_ptr(ptr); switch(obj->tag) { case LDKPaymentError_Invoice: return 0; case LDKPaymentError_Routing: return 1; @@ -6019,36 +5423,34 @@ uint32_t __attribute__((export_name("TS_LDKPaymentError_ty_from_ptr"))) TS_LDKPa default: abort(); } } -jstring __attribute__((export_name("TS_LDKPaymentError_Invoice_get_invoice"))) TS_LDKPaymentError_Invoice_get_invoice(uint32_t ptr) { - LDKPaymentError *obj = (LDKPaymentError*)(ptr & ~1); +jstring __attribute__((export_name("TS_LDKPaymentError_Invoice_get_invoice"))) TS_LDKPaymentError_Invoice_get_invoice(uint64_t ptr) { + LDKPaymentError *obj = (LDKPaymentError*)untag_ptr(ptr); assert(obj->tag == LDKPaymentError_Invoice); LDKStr invoice_str = obj->invoice; jstring invoice_conv = str_ref_to_ts(invoice_str.chars, invoice_str.len); return invoice_conv; } -uint32_t __attribute__((export_name("TS_LDKPaymentError_Routing_get_routing"))) TS_LDKPaymentError_Routing_get_routing(uint32_t ptr) { - LDKPaymentError *obj = (LDKPaymentError*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKPaymentError_Routing_get_routing"))) TS_LDKPaymentError_Routing_get_routing(uint64_t ptr) { + LDKPaymentError *obj = (LDKPaymentError*)untag_ptr(ptr); assert(obj->tag == LDKPaymentError_Routing); LDKLightningError routing_var = obj->routing; - uint32_t routing_ref = 0; - CHECK((((uintptr_t)routing_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&routing_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t routing_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(routing_var); - routing_ref = (uintptr_t)routing_var.inner & ~1; + routing_ref = tag_ptr(routing_var.inner, false); return routing_ref; } -uint32_t __attribute__((export_name("TS_LDKPaymentError_Sending_get_sending"))) TS_LDKPaymentError_Sending_get_sending(uint32_t ptr) { - LDKPaymentError *obj = (LDKPaymentError*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKPaymentError_Sending_get_sending"))) TS_LDKPaymentError_Sending_get_sending(uint64_t ptr) { + LDKPaymentError *obj = (LDKPaymentError*)untag_ptr(ptr); assert(obj->tag == LDKPaymentError_Sending); - uint32_t sending_ref = ((uintptr_t)&obj->sending) | 1; + uint64_t sending_ref = tag_ptr(&obj->sending, false); return sending_ref; } static inline struct LDKThirtyTwoBytes CResult_PaymentIdPaymentErrorZ_get_ok(LDKCResult_PaymentIdPaymentErrorZ *NONNULL_PTR owner){ CHECK(owner->result_ok); return ThirtyTwoBytes_clone(&*owner->contents.result); } -int8_tArray __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_get_ok"))) TS_CResult_PaymentIdPaymentErrorZ_get_ok(uint32_t owner) { - LDKCResult_PaymentIdPaymentErrorZ* owner_conv = (LDKCResult_PaymentIdPaymentErrorZ*)(owner & ~1); +int8_tArray __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_get_ok"))) TS_CResult_PaymentIdPaymentErrorZ_get_ok(uint64_t owner) { + LDKCResult_PaymentIdPaymentErrorZ* owner_conv = (LDKCResult_PaymentIdPaymentErrorZ*)untag_ptr(owner); int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, CResult_PaymentIdPaymentErrorZ_get_ok(owner_conv).data, 32); return ret_arr; @@ -6058,16 +5460,16 @@ static inline struct LDKPaymentError CResult_PaymentIdPaymentErrorZ_get_err(LDKC CHECK(!owner->result_ok); return PaymentError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_get_err"))) TS_CResult_PaymentIdPaymentErrorZ_get_err(uint32_t owner) { - LDKCResult_PaymentIdPaymentErrorZ* owner_conv = (LDKCResult_PaymentIdPaymentErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_get_err"))) TS_CResult_PaymentIdPaymentErrorZ_get_err(uint64_t owner) { + LDKCResult_PaymentIdPaymentErrorZ* owner_conv = (LDKCResult_PaymentIdPaymentErrorZ*)untag_ptr(owner); LDKPaymentError *ret_copy = MALLOC(sizeof(LDKPaymentError), "LDKPaymentError"); *ret_copy = CResult_PaymentIdPaymentErrorZ_get_err(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_LDKParseError_ty_from_ptr"))) TS_LDKParseError_ty_from_ptr(uint32_t ptr) { - LDKParseError *obj = (LDKParseError*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKParseError_ty_from_ptr"))) TS_LDKParseError_ty_from_ptr(uint64_t ptr) { + LDKParseError *obj = (LDKParseError*)untag_ptr(ptr); switch(obj->tag) { case LDKParseError_Bech32Error: return 0; case LDKParseError_ParseAmountError: return 1; @@ -6090,32 +5492,32 @@ uint32_t __attribute__((export_name("TS_LDKParseError_ty_from_ptr"))) TS_LDKPars default: abort(); } } -uint32_t __attribute__((export_name("TS_LDKParseError_Bech32Error_get_bech32_error"))) TS_LDKParseError_Bech32Error_get_bech32_error(uint32_t ptr) { - LDKParseError *obj = (LDKParseError*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKParseError_Bech32Error_get_bech32_error"))) TS_LDKParseError_Bech32Error_get_bech32_error(uint64_t ptr) { + LDKParseError *obj = (LDKParseError*)untag_ptr(ptr); assert(obj->tag == LDKParseError_Bech32Error); - uint32_t bech32_error_ref = ((uintptr_t)&obj->bech32_error) | 1; + uint64_t bech32_error_ref = tag_ptr(&obj->bech32_error, false); return bech32_error_ref; } -int32_t __attribute__((export_name("TS_LDKParseError_ParseAmountError_get_parse_amount_error"))) TS_LDKParseError_ParseAmountError_get_parse_amount_error(uint32_t ptr) { - LDKParseError *obj = (LDKParseError*)(ptr & ~1); +int32_t __attribute__((export_name("TS_LDKParseError_ParseAmountError_get_parse_amount_error"))) TS_LDKParseError_ParseAmountError_get_parse_amount_error(uint64_t ptr) { + LDKParseError *obj = (LDKParseError*)untag_ptr(ptr); assert(obj->tag == LDKParseError_ParseAmountError); /*obj->parse_amount_error*/ return 0; } -uint32_t __attribute__((export_name("TS_LDKParseError_MalformedSignature_get_malformed_signature"))) TS_LDKParseError_MalformedSignature_get_malformed_signature(uint32_t ptr) { - LDKParseError *obj = (LDKParseError*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKParseError_MalformedSignature_get_malformed_signature"))) TS_LDKParseError_MalformedSignature_get_malformed_signature(uint64_t ptr) { + LDKParseError *obj = (LDKParseError*)untag_ptr(ptr); assert(obj->tag == LDKParseError_MalformedSignature); uint32_t malformed_signature_conv = LDKSecp256k1Error_to_js(obj->malformed_signature); return malformed_signature_conv; } -int32_t __attribute__((export_name("TS_LDKParseError_DescriptionDecodeError_get_description_decode_error"))) TS_LDKParseError_DescriptionDecodeError_get_description_decode_error(uint32_t ptr) { - LDKParseError *obj = (LDKParseError*)(ptr & ~1); +int32_t __attribute__((export_name("TS_LDKParseError_DescriptionDecodeError_get_description_decode_error"))) TS_LDKParseError_DescriptionDecodeError_get_description_decode_error(uint64_t ptr) { + LDKParseError *obj = (LDKParseError*)untag_ptr(ptr); assert(obj->tag == LDKParseError_DescriptionDecodeError); /*obj->description_decode_error*/ return 0; } -jstring __attribute__((export_name("TS_LDKParseError_InvalidSliceLength_get_invalid_slice_length"))) TS_LDKParseError_InvalidSliceLength_get_invalid_slice_length(uint32_t ptr) { - LDKParseError *obj = (LDKParseError*)(ptr & ~1); +jstring __attribute__((export_name("TS_LDKParseError_InvalidSliceLength_get_invalid_slice_length"))) TS_LDKParseError_InvalidSliceLength_get_invalid_slice_length(uint64_t ptr) { + LDKParseError *obj = (LDKParseError*)untag_ptr(ptr); assert(obj->tag == LDKParseError_InvalidSliceLength); LDKStr invalid_slice_length_str = obj->invalid_slice_length; jstring invalid_slice_length_conv = str_ref_to_ts(invalid_slice_length_str.chars, invalid_slice_length_str.len); @@ -6125,8 +5527,8 @@ static inline enum LDKSiPrefix CResult_SiPrefixParseErrorZ_get_ok(LDKCResult_SiP CHECK(owner->result_ok); return SiPrefix_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_SiPrefixParseErrorZ_get_ok"))) TS_CResult_SiPrefixParseErrorZ_get_ok(uint32_t owner) { - LDKCResult_SiPrefixParseErrorZ* owner_conv = (LDKCResult_SiPrefixParseErrorZ*)(owner & ~1); +uint32_t __attribute__((export_name("TS_CResult_SiPrefixParseErrorZ_get_ok"))) TS_CResult_SiPrefixParseErrorZ_get_ok(uint64_t owner) { + LDKCResult_SiPrefixParseErrorZ* owner_conv = (LDKCResult_SiPrefixParseErrorZ*)untag_ptr(owner); uint32_t ret_conv = LDKSiPrefix_to_js(CResult_SiPrefixParseErrorZ_get_ok(owner_conv)); return ret_conv; } @@ -6135,30 +5537,30 @@ static inline struct LDKParseError CResult_SiPrefixParseErrorZ_get_err(LDKCResul CHECK(!owner->result_ok); return ParseError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_SiPrefixParseErrorZ_get_err"))) TS_CResult_SiPrefixParseErrorZ_get_err(uint32_t owner) { - LDKCResult_SiPrefixParseErrorZ* owner_conv = (LDKCResult_SiPrefixParseErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_SiPrefixParseErrorZ_get_err"))) TS_CResult_SiPrefixParseErrorZ_get_err(uint64_t owner) { + LDKCResult_SiPrefixParseErrorZ* owner_conv = (LDKCResult_SiPrefixParseErrorZ*)untag_ptr(owner); LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = CResult_SiPrefixParseErrorZ_get_err(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_LDKParseOrSemanticError_ty_from_ptr"))) TS_LDKParseOrSemanticError_ty_from_ptr(uint32_t ptr) { - LDKParseOrSemanticError *obj = (LDKParseOrSemanticError*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKParseOrSemanticError_ty_from_ptr"))) TS_LDKParseOrSemanticError_ty_from_ptr(uint64_t ptr) { + LDKParseOrSemanticError *obj = (LDKParseOrSemanticError*)untag_ptr(ptr); switch(obj->tag) { case LDKParseOrSemanticError_ParseError: return 0; case LDKParseOrSemanticError_SemanticError: return 1; default: abort(); } } -uint32_t __attribute__((export_name("TS_LDKParseOrSemanticError_ParseError_get_parse_error"))) TS_LDKParseOrSemanticError_ParseError_get_parse_error(uint32_t ptr) { - LDKParseOrSemanticError *obj = (LDKParseOrSemanticError*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKParseOrSemanticError_ParseError_get_parse_error"))) TS_LDKParseOrSemanticError_ParseError_get_parse_error(uint64_t ptr) { + LDKParseOrSemanticError *obj = (LDKParseOrSemanticError*)untag_ptr(ptr); assert(obj->tag == LDKParseOrSemanticError_ParseError); - uint32_t parse_error_ref = ((uintptr_t)&obj->parse_error) | 1; + uint64_t parse_error_ref = tag_ptr(&obj->parse_error, false); return parse_error_ref; } -uint32_t __attribute__((export_name("TS_LDKParseOrSemanticError_SemanticError_get_semantic_error"))) TS_LDKParseOrSemanticError_SemanticError_get_semantic_error(uint32_t ptr) { - LDKParseOrSemanticError *obj = (LDKParseOrSemanticError*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKParseOrSemanticError_SemanticError_get_semantic_error"))) TS_LDKParseOrSemanticError_SemanticError_get_semantic_error(uint64_t ptr) { + LDKParseOrSemanticError *obj = (LDKParseOrSemanticError*)untag_ptr(ptr); assert(obj->tag == LDKParseOrSemanticError_SemanticError); uint32_t semantic_error_conv = LDKSemanticError_to_js(obj->semantic_error); return semantic_error_conv; @@ -6167,17 +5569,12 @@ static inline struct LDKInvoice CResult_InvoiceParseOrSemanticErrorZ_get_ok(LDKC CHECK(owner->result_ok); return Invoice_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_InvoiceParseOrSemanticErrorZ_get_ok"))) TS_CResult_InvoiceParseOrSemanticErrorZ_get_ok(uint32_t owner) { - LDKCResult_InvoiceParseOrSemanticErrorZ* owner_conv = (LDKCResult_InvoiceParseOrSemanticErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_InvoiceParseOrSemanticErrorZ_get_ok"))) TS_CResult_InvoiceParseOrSemanticErrorZ_get_ok(uint64_t owner) { + LDKCResult_InvoiceParseOrSemanticErrorZ* owner_conv = (LDKCResult_InvoiceParseOrSemanticErrorZ*)untag_ptr(owner); LDKInvoice ret_var = CResult_InvoiceParseOrSemanticErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -6185,11 +5582,11 @@ static inline struct LDKParseOrSemanticError CResult_InvoiceParseOrSemanticError CHECK(!owner->result_ok); return ParseOrSemanticError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_InvoiceParseOrSemanticErrorZ_get_err"))) TS_CResult_InvoiceParseOrSemanticErrorZ_get_err(uint32_t owner) { - LDKCResult_InvoiceParseOrSemanticErrorZ* owner_conv = (LDKCResult_InvoiceParseOrSemanticErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_InvoiceParseOrSemanticErrorZ_get_err"))) TS_CResult_InvoiceParseOrSemanticErrorZ_get_err(uint64_t owner) { + LDKCResult_InvoiceParseOrSemanticErrorZ* owner_conv = (LDKCResult_InvoiceParseOrSemanticErrorZ*)untag_ptr(owner); LDKParseOrSemanticError *ret_copy = MALLOC(sizeof(LDKParseOrSemanticError), "LDKParseOrSemanticError"); *ret_copy = CResult_InvoiceParseOrSemanticErrorZ_get_err(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } @@ -6197,17 +5594,12 @@ static inline struct LDKSignedRawInvoice CResult_SignedRawInvoiceParseErrorZ_get CHECK(owner->result_ok); return SignedRawInvoice_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_SignedRawInvoiceParseErrorZ_get_ok"))) TS_CResult_SignedRawInvoiceParseErrorZ_get_ok(uint32_t owner) { - LDKCResult_SignedRawInvoiceParseErrorZ* owner_conv = (LDKCResult_SignedRawInvoiceParseErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_SignedRawInvoiceParseErrorZ_get_ok"))) TS_CResult_SignedRawInvoiceParseErrorZ_get_ok(uint64_t owner) { + LDKCResult_SignedRawInvoiceParseErrorZ* owner_conv = (LDKCResult_SignedRawInvoiceParseErrorZ*)untag_ptr(owner); LDKSignedRawInvoice ret_var = CResult_SignedRawInvoiceParseErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -6215,36 +5607,31 @@ static inline struct LDKParseError CResult_SignedRawInvoiceParseErrorZ_get_err(L CHECK(!owner->result_ok); return ParseError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_SignedRawInvoiceParseErrorZ_get_err"))) TS_CResult_SignedRawInvoiceParseErrorZ_get_err(uint32_t owner) { - LDKCResult_SignedRawInvoiceParseErrorZ* owner_conv = (LDKCResult_SignedRawInvoiceParseErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_SignedRawInvoiceParseErrorZ_get_err"))) TS_CResult_SignedRawInvoiceParseErrorZ_get_err(uint64_t owner) { + LDKCResult_SignedRawInvoiceParseErrorZ* owner_conv = (LDKCResult_SignedRawInvoiceParseErrorZ*)untag_ptr(owner); LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = CResult_SignedRawInvoiceParseErrorZ_get_err(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } static inline struct LDKRawInvoice C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_a(LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ *NONNULL_PTR owner){ return RawInvoice_clone(&owner->a); } -uint32_t __attribute__((export_name("TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_a"))) TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_a(uint32_t owner) { - LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* owner_conv = (LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_a"))) TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_a(uint64_t owner) { + LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* owner_conv = (LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ*)untag_ptr(owner); LDKRawInvoice ret_var = C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_a(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } static inline struct LDKThirtyTwoBytes C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_b(LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ *NONNULL_PTR owner){ return ThirtyTwoBytes_clone(&owner->b); } -int8_tArray __attribute__((export_name("TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_b"))) TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_b(uint32_t owner) { - LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* owner_conv = (LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ*)(owner & ~1); +int8_tArray __attribute__((export_name("TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_b"))) TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_b(uint64_t owner) { + LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* owner_conv = (LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ*)untag_ptr(owner); int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_b(owner_conv).data, 32); return ret_arr; @@ -6253,17 +5640,12 @@ int8_tArray __attribute__((export_name("TS_C3Tuple_RawInvoice_u832InvoiceSignat static inline struct LDKInvoiceSignature C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_c(LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ *NONNULL_PTR owner){ return InvoiceSignature_clone(&owner->c); } -uint32_t __attribute__((export_name("TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_c"))) TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_c(uint32_t owner) { - LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* owner_conv = (LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_c"))) TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_c(uint64_t owner) { + LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* owner_conv = (LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ*)untag_ptr(owner); LDKInvoiceSignature ret_var = C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_c(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -6271,17 +5653,12 @@ static inline struct LDKPayeePubKey CResult_PayeePubKeyErrorZ_get_ok(LDKCResult_ CHECK(owner->result_ok); return PayeePubKey_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_get_ok"))) TS_CResult_PayeePubKeyErrorZ_get_ok(uint32_t owner) { - LDKCResult_PayeePubKeyErrorZ* owner_conv = (LDKCResult_PayeePubKeyErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_get_ok"))) TS_CResult_PayeePubKeyErrorZ_get_ok(uint64_t owner) { + LDKCResult_PayeePubKeyErrorZ* owner_conv = (LDKCResult_PayeePubKeyErrorZ*)untag_ptr(owner); LDKPayeePubKey ret_var = CResult_PayeePubKeyErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -6289,8 +5666,8 @@ static inline enum LDKSecp256k1Error CResult_PayeePubKeyErrorZ_get_err(LDKCResul CHECK(!owner->result_ok); return *owner->contents.err; } -uint32_t __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_get_err"))) TS_CResult_PayeePubKeyErrorZ_get_err(uint32_t owner) { - LDKCResult_PayeePubKeyErrorZ* owner_conv = (LDKCResult_PayeePubKeyErrorZ*)(owner & ~1); +uint32_t __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_get_err"))) TS_CResult_PayeePubKeyErrorZ_get_err(uint64_t owner) { + LDKCResult_PayeePubKeyErrorZ* owner_conv = (LDKCResult_PayeePubKeyErrorZ*)untag_ptr(owner); uint32_t ret_conv = LDKSecp256k1Error_to_js(CResult_PayeePubKeyErrorZ_get_err(owner_conv)); return ret_conv; } @@ -6306,17 +5683,12 @@ static inline struct LDKPositiveTimestamp CResult_PositiveTimestampCreationError CHECK(owner->result_ok); return PositiveTimestamp_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_get_ok"))) TS_CResult_PositiveTimestampCreationErrorZ_get_ok(uint32_t owner) { - LDKCResult_PositiveTimestampCreationErrorZ* owner_conv = (LDKCResult_PositiveTimestampCreationErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_get_ok"))) TS_CResult_PositiveTimestampCreationErrorZ_get_ok(uint64_t owner) { + LDKCResult_PositiveTimestampCreationErrorZ* owner_conv = (LDKCResult_PositiveTimestampCreationErrorZ*)untag_ptr(owner); LDKPositiveTimestamp ret_var = CResult_PositiveTimestampCreationErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -6324,8 +5696,8 @@ static inline enum LDKCreationError CResult_PositiveTimestampCreationErrorZ_get_ CHECK(!owner->result_ok); return CreationError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_get_err"))) TS_CResult_PositiveTimestampCreationErrorZ_get_err(uint32_t owner) { - LDKCResult_PositiveTimestampCreationErrorZ* owner_conv = (LDKCResult_PositiveTimestampCreationErrorZ*)(owner & ~1); +uint32_t __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_get_err"))) TS_CResult_PositiveTimestampCreationErrorZ_get_err(uint64_t owner) { + LDKCResult_PositiveTimestampCreationErrorZ* owner_conv = (LDKCResult_PositiveTimestampCreationErrorZ*)untag_ptr(owner); uint32_t ret_conv = LDKCreationError_to_js(CResult_PositiveTimestampCreationErrorZ_get_err(owner_conv)); return ret_conv; } @@ -6334,8 +5706,8 @@ static inline void CResult_NoneSemanticErrorZ_get_ok(LDKCResult_NoneSemanticErro CHECK(owner->result_ok); return *owner->contents.result; } -void __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_get_ok"))) TS_CResult_NoneSemanticErrorZ_get_ok(uint32_t owner) { - LDKCResult_NoneSemanticErrorZ* owner_conv = (LDKCResult_NoneSemanticErrorZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_get_ok"))) TS_CResult_NoneSemanticErrorZ_get_ok(uint64_t owner) { + LDKCResult_NoneSemanticErrorZ* owner_conv = (LDKCResult_NoneSemanticErrorZ*)untag_ptr(owner); CResult_NoneSemanticErrorZ_get_ok(owner_conv); } @@ -6343,8 +5715,8 @@ static inline enum LDKSemanticError CResult_NoneSemanticErrorZ_get_err(LDKCResul CHECK(!owner->result_ok); return SemanticError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_get_err"))) TS_CResult_NoneSemanticErrorZ_get_err(uint32_t owner) { - LDKCResult_NoneSemanticErrorZ* owner_conv = (LDKCResult_NoneSemanticErrorZ*)(owner & ~1); +uint32_t __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_get_err"))) TS_CResult_NoneSemanticErrorZ_get_err(uint64_t owner) { + LDKCResult_NoneSemanticErrorZ* owner_conv = (LDKCResult_NoneSemanticErrorZ*)untag_ptr(owner); uint32_t ret_conv = LDKSemanticError_to_js(CResult_NoneSemanticErrorZ_get_err(owner_conv)); return ret_conv; } @@ -6353,17 +5725,12 @@ static inline struct LDKInvoice CResult_InvoiceSemanticErrorZ_get_ok(LDKCResult_ CHECK(owner->result_ok); return Invoice_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_get_ok"))) TS_CResult_InvoiceSemanticErrorZ_get_ok(uint32_t owner) { - LDKCResult_InvoiceSemanticErrorZ* owner_conv = (LDKCResult_InvoiceSemanticErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_get_ok"))) TS_CResult_InvoiceSemanticErrorZ_get_ok(uint64_t owner) { + LDKCResult_InvoiceSemanticErrorZ* owner_conv = (LDKCResult_InvoiceSemanticErrorZ*)untag_ptr(owner); LDKInvoice ret_var = CResult_InvoiceSemanticErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -6371,8 +5738,8 @@ static inline enum LDKSemanticError CResult_InvoiceSemanticErrorZ_get_err(LDKCRe CHECK(!owner->result_ok); return SemanticError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_get_err"))) TS_CResult_InvoiceSemanticErrorZ_get_err(uint32_t owner) { - LDKCResult_InvoiceSemanticErrorZ* owner_conv = (LDKCResult_InvoiceSemanticErrorZ*)(owner & ~1); +uint32_t __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_get_err"))) TS_CResult_InvoiceSemanticErrorZ_get_err(uint64_t owner) { + LDKCResult_InvoiceSemanticErrorZ* owner_conv = (LDKCResult_InvoiceSemanticErrorZ*)untag_ptr(owner); uint32_t ret_conv = LDKSemanticError_to_js(CResult_InvoiceSemanticErrorZ_get_err(owner_conv)); return ret_conv; } @@ -6381,17 +5748,12 @@ static inline struct LDKDescription CResult_DescriptionCreationErrorZ_get_ok(LDK CHECK(owner->result_ok); return Description_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_get_ok"))) TS_CResult_DescriptionCreationErrorZ_get_ok(uint32_t owner) { - LDKCResult_DescriptionCreationErrorZ* owner_conv = (LDKCResult_DescriptionCreationErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_get_ok"))) TS_CResult_DescriptionCreationErrorZ_get_ok(uint64_t owner) { + LDKCResult_DescriptionCreationErrorZ* owner_conv = (LDKCResult_DescriptionCreationErrorZ*)untag_ptr(owner); LDKDescription ret_var = CResult_DescriptionCreationErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -6399,8 +5761,8 @@ static inline enum LDKCreationError CResult_DescriptionCreationErrorZ_get_err(LD CHECK(!owner->result_ok); return CreationError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_get_err"))) TS_CResult_DescriptionCreationErrorZ_get_err(uint32_t owner) { - LDKCResult_DescriptionCreationErrorZ* owner_conv = (LDKCResult_DescriptionCreationErrorZ*)(owner & ~1); +uint32_t __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_get_err"))) TS_CResult_DescriptionCreationErrorZ_get_err(uint64_t owner) { + LDKCResult_DescriptionCreationErrorZ* owner_conv = (LDKCResult_DescriptionCreationErrorZ*)untag_ptr(owner); uint32_t ret_conv = LDKCreationError_to_js(CResult_DescriptionCreationErrorZ_get_err(owner_conv)); return ret_conv; } @@ -6409,17 +5771,12 @@ static inline struct LDKPrivateRoute CResult_PrivateRouteCreationErrorZ_get_ok(L CHECK(owner->result_ok); return PrivateRoute_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_get_ok"))) TS_CResult_PrivateRouteCreationErrorZ_get_ok(uint32_t owner) { - LDKCResult_PrivateRouteCreationErrorZ* owner_conv = (LDKCResult_PrivateRouteCreationErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_get_ok"))) TS_CResult_PrivateRouteCreationErrorZ_get_ok(uint64_t owner) { + LDKCResult_PrivateRouteCreationErrorZ* owner_conv = (LDKCResult_PrivateRouteCreationErrorZ*)untag_ptr(owner); LDKPrivateRoute ret_var = CResult_PrivateRouteCreationErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -6427,8 +5784,8 @@ static inline enum LDKCreationError CResult_PrivateRouteCreationErrorZ_get_err(L CHECK(!owner->result_ok); return CreationError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_get_err"))) TS_CResult_PrivateRouteCreationErrorZ_get_err(uint32_t owner) { - LDKCResult_PrivateRouteCreationErrorZ* owner_conv = (LDKCResult_PrivateRouteCreationErrorZ*)(owner & ~1); +uint32_t __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_get_err"))) TS_CResult_PrivateRouteCreationErrorZ_get_err(uint64_t owner) { + LDKCResult_PrivateRouteCreationErrorZ* owner_conv = (LDKCResult_PrivateRouteCreationErrorZ*)untag_ptr(owner); uint32_t ret_conv = LDKCreationError_to_js(CResult_PrivateRouteCreationErrorZ_get_err(owner_conv)); return ret_conv; } @@ -6437,8 +5794,8 @@ static inline struct LDKStr CResult_StringErrorZ_get_ok(LDKCResult_StringErrorZ CHECK(owner->result_ok); return *owner->contents.result; } -jstring __attribute__((export_name("TS_CResult_StringErrorZ_get_ok"))) TS_CResult_StringErrorZ_get_ok(uint32_t owner) { - LDKCResult_StringErrorZ* owner_conv = (LDKCResult_StringErrorZ*)(owner & ~1); +jstring __attribute__((export_name("TS_CResult_StringErrorZ_get_ok"))) TS_CResult_StringErrorZ_get_ok(uint64_t owner) { + LDKCResult_StringErrorZ* owner_conv = (LDKCResult_StringErrorZ*)untag_ptr(owner); LDKStr ret_str = CResult_StringErrorZ_get_ok(owner_conv); jstring ret_conv = str_ref_to_ts(ret_str.chars, ret_str.len); return ret_conv; @@ -6448,8 +5805,8 @@ static inline enum LDKSecp256k1Error CResult_StringErrorZ_get_err(LDKCResult_Str CHECK(!owner->result_ok); return *owner->contents.err; } -uint32_t __attribute__((export_name("TS_CResult_StringErrorZ_get_err"))) TS_CResult_StringErrorZ_get_err(uint32_t owner) { - LDKCResult_StringErrorZ* owner_conv = (LDKCResult_StringErrorZ*)(owner & ~1); +uint32_t __attribute__((export_name("TS_CResult_StringErrorZ_get_err"))) TS_CResult_StringErrorZ_get_err(uint64_t owner) { + LDKCResult_StringErrorZ* owner_conv = (LDKCResult_StringErrorZ*)untag_ptr(owner); uint32_t ret_conv = LDKSecp256k1Error_to_js(CResult_StringErrorZ_get_err(owner_conv)); return ret_conv; } @@ -6458,17 +5815,12 @@ static inline struct LDKChannelMonitorUpdate CResult_ChannelMonitorUpdateDecodeE CHECK(owner->result_ok); return ChannelMonitorUpdate_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_get_ok"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ChannelMonitorUpdateDecodeErrorZ* owner_conv = (LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)untag_ptr(owner); LDKChannelMonitorUpdate ret_var = CResult_ChannelMonitorUpdateDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -6476,43 +5828,38 @@ static inline struct LDKDecodeError CResult_ChannelMonitorUpdateDecodeErrorZ_get CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_get_err"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ChannelMonitorUpdateDecodeErrorZ* owner_conv = (LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ChannelMonitorUpdateDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_LDKCOption_MonitorEventZ_ty_from_ptr"))) TS_LDKCOption_MonitorEventZ_ty_from_ptr(uint32_t ptr) { - LDKCOption_MonitorEventZ *obj = (LDKCOption_MonitorEventZ*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKCOption_MonitorEventZ_ty_from_ptr"))) TS_LDKCOption_MonitorEventZ_ty_from_ptr(uint64_t ptr) { + LDKCOption_MonitorEventZ *obj = (LDKCOption_MonitorEventZ*)untag_ptr(ptr); switch(obj->tag) { case LDKCOption_MonitorEventZ_Some: return 0; case LDKCOption_MonitorEventZ_None: return 1; default: abort(); } } -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); +uint64_t __attribute__((export_name("TS_LDKCOption_MonitorEventZ_Some_get_some"))) TS_LDKCOption_MonitorEventZ_Some_get_some(uint64_t ptr) { + LDKCOption_MonitorEventZ *obj = (LDKCOption_MonitorEventZ*)untag_ptr(ptr); assert(obj->tag == LDKCOption_MonitorEventZ_Some); - uint32_t some_ref = ((uintptr_t)&obj->some) | 1; + uint64_t some_ref = tag_ptr(&obj->some, false); return some_ref; } static inline struct LDKCOption_MonitorEventZ CResult_COption_MonitorEventZDecodeErrorZ_get_ok(LDKCResult_COption_MonitorEventZDecodeErrorZ *NONNULL_PTR owner){ CHECK(owner->result_ok); return COption_MonitorEventZ_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_get_ok"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_COption_MonitorEventZDecodeErrorZ* owner_conv = (LDKCResult_COption_MonitorEventZDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_get_ok"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_COption_MonitorEventZDecodeErrorZ* owner_conv = (LDKCResult_COption_MonitorEventZDecodeErrorZ*)untag_ptr(owner); LDKCOption_MonitorEventZ *ret_copy = MALLOC(sizeof(LDKCOption_MonitorEventZ), "LDKCOption_MonitorEventZ"); *ret_copy = CResult_COption_MonitorEventZDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } @@ -6520,17 +5867,12 @@ static inline struct LDKDecodeError CResult_COption_MonitorEventZDecodeErrorZ_ge CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_get_err"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_COption_MonitorEventZDecodeErrorZ* owner_conv = (LDKCResult_COption_MonitorEventZDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_COption_MonitorEventZDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -6538,17 +5880,12 @@ static inline struct LDKHTLCUpdate CResult_HTLCUpdateDecodeErrorZ_get_ok(LDKCRes CHECK(owner->result_ok); return HTLCUpdate_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_get_ok"))) TS_CResult_HTLCUpdateDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_HTLCUpdateDecodeErrorZ* owner_conv = (LDKCResult_HTLCUpdateDecodeErrorZ*)untag_ptr(owner); LDKHTLCUpdate ret_var = CResult_HTLCUpdateDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -6556,42 +5893,32 @@ static inline struct LDKDecodeError CResult_HTLCUpdateDecodeErrorZ_get_err(LDKCR CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_get_err"))) TS_CResult_HTLCUpdateDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_HTLCUpdateDecodeErrorZ* owner_conv = (LDKCResult_HTLCUpdateDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_HTLCUpdateDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } static inline struct LDKOutPoint C2Tuple_OutPointScriptZ_get_a(LDKC2Tuple_OutPointScriptZ *NONNULL_PTR owner){ return OutPoint_clone(&owner->a); } -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); +uint64_t __attribute__((export_name("TS_C2Tuple_OutPointScriptZ_get_a"))) TS_C2Tuple_OutPointScriptZ_get_a(uint64_t owner) { + LDKC2Tuple_OutPointScriptZ* owner_conv = (LDKC2Tuple_OutPointScriptZ*)untag_ptr(owner); LDKOutPoint ret_var = C2Tuple_OutPointScriptZ_get_a(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } static inline struct LDKCVec_u8Z C2Tuple_OutPointScriptZ_get_b(LDKC2Tuple_OutPointScriptZ *NONNULL_PTR owner){ return CVec_u8Z_clone(&owner->b); } -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); +int8_tArray __attribute__((export_name("TS_C2Tuple_OutPointScriptZ_get_b"))) TS_C2Tuple_OutPointScriptZ_get_b(uint64_t owner) { + LDKC2Tuple_OutPointScriptZ* owner_conv = (LDKC2Tuple_OutPointScriptZ*)untag_ptr(owner); LDKCVec_u8Z ret_var = C2Tuple_OutPointScriptZ_get_b(owner_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -6602,8 +5929,8 @@ int8_tArray __attribute__((export_name("TS_C2Tuple_OutPointScriptZ_get_b"))) TS static inline uint32_t C2Tuple_u32ScriptZ_get_a(LDKC2Tuple_u32ScriptZ *NONNULL_PTR owner){ return owner->a; } -int32_t __attribute__((export_name("TS_C2Tuple_u32ScriptZ_get_a"))) TS_C2Tuple_u32ScriptZ_get_a(uint32_t owner) { - LDKC2Tuple_u32ScriptZ* owner_conv = (LDKC2Tuple_u32ScriptZ*)(owner & ~1); +int32_t __attribute__((export_name("TS_C2Tuple_u32ScriptZ_get_a"))) TS_C2Tuple_u32ScriptZ_get_a(uint64_t owner) { + LDKC2Tuple_u32ScriptZ* owner_conv = (LDKC2Tuple_u32ScriptZ*)untag_ptr(owner); int32_t ret_conv = C2Tuple_u32ScriptZ_get_a(owner_conv); return ret_conv; } @@ -6611,8 +5938,8 @@ int32_t __attribute__((export_name("TS_C2Tuple_u32ScriptZ_get_a"))) TS_C2Tuple_ static inline struct LDKCVec_u8Z C2Tuple_u32ScriptZ_get_b(LDKC2Tuple_u32ScriptZ *NONNULL_PTR owner){ return CVec_u8Z_clone(&owner->b); } -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); +int8_tArray __attribute__((export_name("TS_C2Tuple_u32ScriptZ_get_b"))) TS_C2Tuple_u32ScriptZ_get_b(uint64_t owner) { + LDKC2Tuple_u32ScriptZ* owner_conv = (LDKC2Tuple_u32ScriptZ*)untag_ptr(owner); LDKCVec_u8Z ret_var = C2Tuple_u32ScriptZ_get_b(owner_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -6630,8 +5957,8 @@ static inline LDKCVec_C2Tuple_u32ScriptZZ CVec_C2Tuple_u32ScriptZZ_clone(const L static inline struct LDKThirtyTwoBytes C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_get_a(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ *NONNULL_PTR owner){ return ThirtyTwoBytes_clone(&owner->a); } -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 __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_get_a"))) TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_get_a(uint64_t owner) { + LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ* owner_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ*)untag_ptr(owner); 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; @@ -6640,16 +5967,16 @@ int8_tArray __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZ static inline struct LDKCVec_C2Tuple_u32ScriptZZ C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_get_b(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ *NONNULL_PTR owner){ return CVec_C2Tuple_u32ScriptZZ_clone(&owner->b); } -uint32_tArray __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_get_b"))) TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_get_b(uint32_t owner) { - LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ* owner_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ*)(owner & ~1); +uint64_tArray __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_get_b"))) TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_get_b(uint64_t owner) { + LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ* owner_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ*)untag_ptr(owner); LDKCVec_C2Tuple_u32ScriptZZ ret_var = C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_get_b(owner_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t v = 0; v < ret_var.datalen; v++) { LDKC2Tuple_u32ScriptZ* ret_conv_21_conv = MALLOC(sizeof(LDKC2Tuple_u32ScriptZ), "LDKC2Tuple_u32ScriptZ"); *ret_conv_21_conv = ret_var.data[v]; - ret_arr_ptr[v] = ((uint32_t)ret_conv_21_conv); + ret_arr_ptr[v] = tag_ptr(ret_conv_21_conv, true); } FREE(ret_var.data); @@ -6673,8 +6000,8 @@ static inline LDKCVec_EventZ CVec_EventZ_clone(const LDKCVec_EventZ *orig) { static inline uint32_t C2Tuple_u32TxOutZ_get_a(LDKC2Tuple_u32TxOutZ *NONNULL_PTR owner){ return owner->a; } -int32_t __attribute__((export_name("TS_C2Tuple_u32TxOutZ_get_a"))) TS_C2Tuple_u32TxOutZ_get_a(uint32_t owner) { - LDKC2Tuple_u32TxOutZ* owner_conv = (LDKC2Tuple_u32TxOutZ*)(owner & ~1); +int32_t __attribute__((export_name("TS_C2Tuple_u32TxOutZ_get_a"))) TS_C2Tuple_u32TxOutZ_get_a(uint64_t owner) { + LDKC2Tuple_u32TxOutZ* owner_conv = (LDKC2Tuple_u32TxOutZ*)untag_ptr(owner); int32_t ret_conv = C2Tuple_u32TxOutZ_get_a(owner_conv); return ret_conv; } @@ -6682,11 +6009,11 @@ int32_t __attribute__((export_name("TS_C2Tuple_u32TxOutZ_get_a"))) TS_C2Tuple_u static inline struct LDKTxOut C2Tuple_u32TxOutZ_get_b(LDKC2Tuple_u32TxOutZ *NONNULL_PTR owner){ return TxOut_clone(&owner->b); } -uint32_t __attribute__((export_name("TS_C2Tuple_u32TxOutZ_get_b"))) TS_C2Tuple_u32TxOutZ_get_b(uint32_t owner) { - LDKC2Tuple_u32TxOutZ* owner_conv = (LDKC2Tuple_u32TxOutZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_C2Tuple_u32TxOutZ_get_b"))) TS_C2Tuple_u32TxOutZ_get_b(uint64_t owner) { + LDKC2Tuple_u32TxOutZ* owner_conv = (LDKC2Tuple_u32TxOutZ*)untag_ptr(owner); LDKTxOut* ret_ref = MALLOC(sizeof(LDKTxOut), "LDKTxOut"); *ret_ref = C2Tuple_u32TxOutZ_get_b(owner_conv); - return (uint32_t)ret_ref; + return tag_ptr(ret_ref, true); } static inline LDKCVec_C2Tuple_u32TxOutZZ CVec_C2Tuple_u32TxOutZZ_clone(const LDKCVec_C2Tuple_u32TxOutZZ *orig) { @@ -6699,8 +6026,8 @@ static inline LDKCVec_C2Tuple_u32TxOutZZ CVec_C2Tuple_u32TxOutZZ_clone(const LDK static inline struct LDKThirtyTwoBytes C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_a(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ *NONNULL_PTR owner){ return ThirtyTwoBytes_clone(&owner->a); } -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 __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_a"))) TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_a(uint64_t owner) { + LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* owner_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)untag_ptr(owner); 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; @@ -6709,16 +6036,16 @@ int8_tArray __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ static inline struct LDKCVec_C2Tuple_u32TxOutZZ C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_b(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ *NONNULL_PTR owner){ return CVec_C2Tuple_u32TxOutZZ_clone(&owner->b); } -uint32_tArray __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_b"))) TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_b(uint32_t owner) { - LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* owner_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)(owner & ~1); +uint64_tArray __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_b"))) TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_b(uint64_t owner) { + LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* owner_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)untag_ptr(owner); LDKCVec_C2Tuple_u32TxOutZZ ret_var = C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_b(owner_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t u = 0; u < ret_var.datalen; u++) { LDKC2Tuple_u32TxOutZ* ret_conv_20_conv = MALLOC(sizeof(LDKC2Tuple_u32TxOutZ), "LDKC2Tuple_u32TxOutZ"); *ret_conv_20_conv = ret_var.data[u]; - ret_arr_ptr[u] = ((uint32_t)ret_conv_20_conv); + ret_arr_ptr[u] = tag_ptr(ret_conv_20_conv, true); } FREE(ret_var.data); @@ -6732,8 +6059,8 @@ static inline LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ CVec_C2Tuple_TxidCVe } return ret; } -uint32_t __attribute__((export_name("TS_LDKBalance_ty_from_ptr"))) TS_LDKBalance_ty_from_ptr(uint32_t ptr) { - LDKBalance *obj = (LDKBalance*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKBalance_ty_from_ptr"))) TS_LDKBalance_ty_from_ptr(uint64_t ptr) { + LDKBalance *obj = (LDKBalance*)untag_ptr(ptr); switch(obj->tag) { case LDKBalance_ClaimableOnChannelClose: return 0; case LDKBalance_ClaimableAwaitingConfirmations: return 1; @@ -6742,44 +6069,44 @@ uint32_t __attribute__((export_name("TS_LDKBalance_ty_from_ptr"))) TS_LDKBalance default: abort(); } } -int64_t __attribute__((export_name("TS_LDKBalance_ClaimableOnChannelClose_get_claimable_amount_satoshis"))) TS_LDKBalance_ClaimableOnChannelClose_get_claimable_amount_satoshis(uint32_t ptr) { - LDKBalance *obj = (LDKBalance*)(ptr & ~1); +int64_t __attribute__((export_name("TS_LDKBalance_ClaimableOnChannelClose_get_claimable_amount_satoshis"))) TS_LDKBalance_ClaimableOnChannelClose_get_claimable_amount_satoshis(uint64_t ptr) { + LDKBalance *obj = (LDKBalance*)untag_ptr(ptr); assert(obj->tag == LDKBalance_ClaimableOnChannelClose); int64_t claimable_amount_satoshis_conv = obj->claimable_on_channel_close.claimable_amount_satoshis; return claimable_amount_satoshis_conv; } -int64_t __attribute__((export_name("TS_LDKBalance_ClaimableAwaitingConfirmations_get_claimable_amount_satoshis"))) TS_LDKBalance_ClaimableAwaitingConfirmations_get_claimable_amount_satoshis(uint32_t ptr) { - LDKBalance *obj = (LDKBalance*)(ptr & ~1); +int64_t __attribute__((export_name("TS_LDKBalance_ClaimableAwaitingConfirmations_get_claimable_amount_satoshis"))) TS_LDKBalance_ClaimableAwaitingConfirmations_get_claimable_amount_satoshis(uint64_t ptr) { + LDKBalance *obj = (LDKBalance*)untag_ptr(ptr); assert(obj->tag == LDKBalance_ClaimableAwaitingConfirmations); int64_t claimable_amount_satoshis_conv = obj->claimable_awaiting_confirmations.claimable_amount_satoshis; return claimable_amount_satoshis_conv; } -int32_t __attribute__((export_name("TS_LDKBalance_ClaimableAwaitingConfirmations_get_confirmation_height"))) TS_LDKBalance_ClaimableAwaitingConfirmations_get_confirmation_height(uint32_t ptr) { - LDKBalance *obj = (LDKBalance*)(ptr & ~1); +int32_t __attribute__((export_name("TS_LDKBalance_ClaimableAwaitingConfirmations_get_confirmation_height"))) TS_LDKBalance_ClaimableAwaitingConfirmations_get_confirmation_height(uint64_t ptr) { + LDKBalance *obj = (LDKBalance*)untag_ptr(ptr); assert(obj->tag == LDKBalance_ClaimableAwaitingConfirmations); int32_t confirmation_height_conv = obj->claimable_awaiting_confirmations.confirmation_height; return confirmation_height_conv; } -int64_t __attribute__((export_name("TS_LDKBalance_ContentiousClaimable_get_claimable_amount_satoshis"))) TS_LDKBalance_ContentiousClaimable_get_claimable_amount_satoshis(uint32_t ptr) { - LDKBalance *obj = (LDKBalance*)(ptr & ~1); +int64_t __attribute__((export_name("TS_LDKBalance_ContentiousClaimable_get_claimable_amount_satoshis"))) TS_LDKBalance_ContentiousClaimable_get_claimable_amount_satoshis(uint64_t ptr) { + LDKBalance *obj = (LDKBalance*)untag_ptr(ptr); assert(obj->tag == LDKBalance_ContentiousClaimable); int64_t claimable_amount_satoshis_conv = obj->contentious_claimable.claimable_amount_satoshis; return claimable_amount_satoshis_conv; } -int32_t __attribute__((export_name("TS_LDKBalance_ContentiousClaimable_get_timeout_height"))) TS_LDKBalance_ContentiousClaimable_get_timeout_height(uint32_t ptr) { - LDKBalance *obj = (LDKBalance*)(ptr & ~1); +int32_t __attribute__((export_name("TS_LDKBalance_ContentiousClaimable_get_timeout_height"))) TS_LDKBalance_ContentiousClaimable_get_timeout_height(uint64_t ptr) { + LDKBalance *obj = (LDKBalance*)untag_ptr(ptr); assert(obj->tag == LDKBalance_ContentiousClaimable); int32_t timeout_height_conv = obj->contentious_claimable.timeout_height; return timeout_height_conv; } -int64_t __attribute__((export_name("TS_LDKBalance_MaybeClaimableHTLCAwaitingTimeout_get_claimable_amount_satoshis"))) TS_LDKBalance_MaybeClaimableHTLCAwaitingTimeout_get_claimable_amount_satoshis(uint32_t ptr) { - LDKBalance *obj = (LDKBalance*)(ptr & ~1); +int64_t __attribute__((export_name("TS_LDKBalance_MaybeClaimableHTLCAwaitingTimeout_get_claimable_amount_satoshis"))) TS_LDKBalance_MaybeClaimableHTLCAwaitingTimeout_get_claimable_amount_satoshis(uint64_t ptr) { + LDKBalance *obj = (LDKBalance*)untag_ptr(ptr); assert(obj->tag == LDKBalance_MaybeClaimableHTLCAwaitingTimeout); int64_t claimable_amount_satoshis_conv = obj->maybe_claimable_htlc_awaiting_timeout.claimable_amount_satoshis; return claimable_amount_satoshis_conv; } -int32_t __attribute__((export_name("TS_LDKBalance_MaybeClaimableHTLCAwaitingTimeout_get_claimable_height"))) TS_LDKBalance_MaybeClaimableHTLCAwaitingTimeout_get_claimable_height(uint32_t ptr) { - LDKBalance *obj = (LDKBalance*)(ptr & ~1); +int32_t __attribute__((export_name("TS_LDKBalance_MaybeClaimableHTLCAwaitingTimeout_get_claimable_height"))) TS_LDKBalance_MaybeClaimableHTLCAwaitingTimeout_get_claimable_height(uint64_t ptr) { + LDKBalance *obj = (LDKBalance*)untag_ptr(ptr); assert(obj->tag == LDKBalance_MaybeClaimableHTLCAwaitingTimeout); int32_t claimable_height_conv = obj->maybe_claimable_htlc_awaiting_timeout.claimable_height; return claimable_height_conv; @@ -6794,8 +6121,8 @@ static inline LDKCVec_BalanceZ CVec_BalanceZ_clone(const LDKCVec_BalanceZ *orig) static inline struct LDKThirtyTwoBytes C2Tuple_BlockHashChannelMonitorZ_get_a(LDKC2Tuple_BlockHashChannelMonitorZ *NONNULL_PTR owner){ return ThirtyTwoBytes_clone(&owner->a); } -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 __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_get_a"))) TS_C2Tuple_BlockHashChannelMonitorZ_get_a(uint64_t owner) { + LDKC2Tuple_BlockHashChannelMonitorZ* owner_conv = (LDKC2Tuple_BlockHashChannelMonitorZ*)untag_ptr(owner); int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, C2Tuple_BlockHashChannelMonitorZ_get_a(owner_conv).data, 32); return ret_arr; @@ -6804,17 +6131,12 @@ int8_tArray __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_get static inline struct LDKChannelMonitor C2Tuple_BlockHashChannelMonitorZ_get_b(LDKC2Tuple_BlockHashChannelMonitorZ *NONNULL_PTR owner){ return ChannelMonitor_clone(&owner->b); } -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); +uint64_t __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_get_b"))) TS_C2Tuple_BlockHashChannelMonitorZ_get_b(uint64_t owner) { + LDKC2Tuple_BlockHashChannelMonitorZ* owner_conv = (LDKC2Tuple_BlockHashChannelMonitorZ*)untag_ptr(owner); LDKChannelMonitor ret_var = C2Tuple_BlockHashChannelMonitorZ_get_b(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -6822,36 +6144,31 @@ static inline struct LDKC2Tuple_BlockHashChannelMonitorZ CResult_C2Tuple_BlockHa CHECK(owner->result_ok); return C2Tuple_BlockHashChannelMonitorZ_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_ok"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* owner_conv = (LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_ok"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* owner_conv = (LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)untag_ptr(owner); LDKC2Tuple_BlockHashChannelMonitorZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_BlockHashChannelMonitorZ), "LDKC2Tuple_BlockHashChannelMonitorZ"); *ret_conv = CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_ok(owner_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } static inline struct LDKDecodeError CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_err(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ *NONNULL_PTR owner){ CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_err"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* owner_conv = (LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } static inline struct LDKPublicKey C2Tuple_PublicKeyTypeZ_get_a(LDKC2Tuple_PublicKeyTypeZ *NONNULL_PTR owner){ return owner->a; } -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 __attribute__((export_name("TS_C2Tuple_PublicKeyTypeZ_get_a"))) TS_C2Tuple_PublicKeyTypeZ_get_a(uint64_t owner) { + LDKC2Tuple_PublicKeyTypeZ* owner_conv = (LDKC2Tuple_PublicKeyTypeZ*)untag_ptr(owner); 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; @@ -6860,11 +6177,11 @@ int8_tArray __attribute__((export_name("TS_C2Tuple_PublicKeyTypeZ_get_a"))) TS_ static inline struct LDKType C2Tuple_PublicKeyTypeZ_get_b(LDKC2Tuple_PublicKeyTypeZ *NONNULL_PTR owner){ return Type_clone(&owner->b); } -uint32_t __attribute__((export_name("TS_C2Tuple_PublicKeyTypeZ_get_b"))) TS_C2Tuple_PublicKeyTypeZ_get_b(uint32_t owner) { - LDKC2Tuple_PublicKeyTypeZ* owner_conv = (LDKC2Tuple_PublicKeyTypeZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_C2Tuple_PublicKeyTypeZ_get_b"))) TS_C2Tuple_PublicKeyTypeZ_get_b(uint64_t owner) { + LDKC2Tuple_PublicKeyTypeZ* owner_conv = (LDKC2Tuple_PublicKeyTypeZ*)untag_ptr(owner); LDKType* ret_ret = MALLOC(sizeof(LDKType), "LDKType"); *ret_ret = C2Tuple_PublicKeyTypeZ_get_b(owner_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } static inline LDKCVec_C2Tuple_PublicKeyTypeZZ CVec_C2Tuple_PublicKeyTypeZZ_clone(const LDKCVec_C2Tuple_PublicKeyTypeZZ *orig) { @@ -6874,26 +6191,26 @@ static inline LDKCVec_C2Tuple_PublicKeyTypeZZ CVec_C2Tuple_PublicKeyTypeZZ_clone } return ret; } -uint32_t __attribute__((export_name("TS_LDKCOption_NetAddressZ_ty_from_ptr"))) TS_LDKCOption_NetAddressZ_ty_from_ptr(uint32_t ptr) { - LDKCOption_NetAddressZ *obj = (LDKCOption_NetAddressZ*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKCOption_NetAddressZ_ty_from_ptr"))) TS_LDKCOption_NetAddressZ_ty_from_ptr(uint64_t ptr) { + LDKCOption_NetAddressZ *obj = (LDKCOption_NetAddressZ*)untag_ptr(ptr); switch(obj->tag) { case LDKCOption_NetAddressZ_Some: return 0; case LDKCOption_NetAddressZ_None: return 1; default: abort(); } } -uint32_t __attribute__((export_name("TS_LDKCOption_NetAddressZ_Some_get_some"))) TS_LDKCOption_NetAddressZ_Some_get_some(uint32_t ptr) { - LDKCOption_NetAddressZ *obj = (LDKCOption_NetAddressZ*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKCOption_NetAddressZ_Some_get_some"))) TS_LDKCOption_NetAddressZ_Some_get_some(uint64_t ptr) { + LDKCOption_NetAddressZ *obj = (LDKCOption_NetAddressZ*)untag_ptr(ptr); assert(obj->tag == LDKCOption_NetAddressZ_Some); - uint32_t some_ref = ((uintptr_t)&obj->some) | 1; + uint64_t some_ref = tag_ptr(&obj->some, false); return some_ref; } static inline struct LDKCVec_u8Z CResult_CVec_u8ZPeerHandleErrorZ_get_ok(LDKCResult_CVec_u8ZPeerHandleErrorZ *NONNULL_PTR owner){ CHECK(owner->result_ok); return CVec_u8Z_clone(&*owner->contents.result); } -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); +int8_tArray __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_get_ok"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_get_ok(uint64_t owner) { + LDKCResult_CVec_u8ZPeerHandleErrorZ* owner_conv = (LDKCResult_CVec_u8ZPeerHandleErrorZ*)untag_ptr(owner); LDKCVec_u8Z ret_var = CResult_CVec_u8ZPeerHandleErrorZ_get_ok(owner_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -6905,17 +6222,12 @@ static inline struct LDKPeerHandleError CResult_CVec_u8ZPeerHandleErrorZ_get_err CHECK(!owner->result_ok); return PeerHandleError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_get_err"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_get_err(uint64_t owner) { + LDKCResult_CVec_u8ZPeerHandleErrorZ* owner_conv = (LDKCResult_CVec_u8ZPeerHandleErrorZ*)untag_ptr(owner); LDKPeerHandleError ret_var = CResult_CVec_u8ZPeerHandleErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -6923,8 +6235,8 @@ static inline void CResult_NonePeerHandleErrorZ_get_ok(LDKCResult_NonePeerHandle CHECK(owner->result_ok); return *owner->contents.result; } -void __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_get_ok"))) TS_CResult_NonePeerHandleErrorZ_get_ok(uint32_t owner) { - LDKCResult_NonePeerHandleErrorZ* owner_conv = (LDKCResult_NonePeerHandleErrorZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_get_ok"))) TS_CResult_NonePeerHandleErrorZ_get_ok(uint64_t owner) { + LDKCResult_NonePeerHandleErrorZ* owner_conv = (LDKCResult_NonePeerHandleErrorZ*)untag_ptr(owner); CResult_NonePeerHandleErrorZ_get_ok(owner_conv); } @@ -6932,17 +6244,12 @@ static inline struct LDKPeerHandleError CResult_NonePeerHandleErrorZ_get_err(LDK CHECK(!owner->result_ok); return PeerHandleError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_get_err"))) TS_CResult_NonePeerHandleErrorZ_get_err(uint64_t owner) { + LDKCResult_NonePeerHandleErrorZ* owner_conv = (LDKCResult_NonePeerHandleErrorZ*)untag_ptr(owner); LDKPeerHandleError ret_var = CResult_NonePeerHandleErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -6950,8 +6257,8 @@ static inline bool CResult_boolPeerHandleErrorZ_get_ok(LDKCResult_boolPeerHandle CHECK(owner->result_ok); return *owner->contents.result; } -jboolean __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_get_ok"))) TS_CResult_boolPeerHandleErrorZ_get_ok(uint32_t owner) { - LDKCResult_boolPeerHandleErrorZ* owner_conv = (LDKCResult_boolPeerHandleErrorZ*)(owner & ~1); +jboolean __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_get_ok"))) TS_CResult_boolPeerHandleErrorZ_get_ok(uint64_t owner) { + LDKCResult_boolPeerHandleErrorZ* owner_conv = (LDKCResult_boolPeerHandleErrorZ*)untag_ptr(owner); jboolean ret_conv = CResult_boolPeerHandleErrorZ_get_ok(owner_conv); return ret_conv; } @@ -6960,17 +6267,12 @@ static inline struct LDKPeerHandleError CResult_boolPeerHandleErrorZ_get_err(LDK CHECK(!owner->result_ok); return PeerHandleError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_get_err"))) TS_CResult_boolPeerHandleErrorZ_get_err(uint64_t owner) { + LDKCResult_boolPeerHandleErrorZ* owner_conv = (LDKCResult_boolPeerHandleErrorZ*)untag_ptr(owner); LDKPeerHandleError ret_var = CResult_boolPeerHandleErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -6978,8 +6280,8 @@ static inline void CResult_NoneErrorZ_get_ok(LDKCResult_NoneErrorZ *NONNULL_PTR CHECK(owner->result_ok); return *owner->contents.result; } -void __attribute__((export_name("TS_CResult_NoneErrorZ_get_ok"))) TS_CResult_NoneErrorZ_get_ok(uint32_t owner) { - LDKCResult_NoneErrorZ* owner_conv = (LDKCResult_NoneErrorZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_NoneErrorZ_get_ok"))) TS_CResult_NoneErrorZ_get_ok(uint64_t owner) { + LDKCResult_NoneErrorZ* owner_conv = (LDKCResult_NoneErrorZ*)untag_ptr(owner); CResult_NoneErrorZ_get_ok(owner_conv); } @@ -6987,8 +6289,8 @@ static inline enum LDKIOError CResult_NoneErrorZ_get_err(LDKCResult_NoneErrorZ * CHECK(!owner->result_ok); return *owner->contents.err; } -uint32_t __attribute__((export_name("TS_CResult_NoneErrorZ_get_err"))) TS_CResult_NoneErrorZ_get_err(uint32_t owner) { - LDKCResult_NoneErrorZ* owner_conv = (LDKCResult_NoneErrorZ*)(owner & ~1); +uint32_t __attribute__((export_name("TS_CResult_NoneErrorZ_get_err"))) TS_CResult_NoneErrorZ_get_err(uint64_t owner) { + LDKCResult_NoneErrorZ* owner_conv = (LDKCResult_NoneErrorZ*)untag_ptr(owner); uint32_t ret_conv = LDKIOError_to_js(CResult_NoneErrorZ_get_err(owner_conv)); return ret_conv; } @@ -6997,11 +6299,11 @@ static inline struct LDKNetAddress CResult_NetAddressDecodeErrorZ_get_ok(LDKCRes CHECK(owner->result_ok); return NetAddress_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_get_ok"))) TS_CResult_NetAddressDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_NetAddressDecodeErrorZ* owner_conv = (LDKCResult_NetAddressDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_get_ok"))) TS_CResult_NetAddressDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_NetAddressDecodeErrorZ* owner_conv = (LDKCResult_NetAddressDecodeErrorZ*)untag_ptr(owner); LDKNetAddress *ret_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress"); *ret_copy = CResult_NetAddressDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } @@ -7009,17 +6311,12 @@ static inline struct LDKDecodeError CResult_NetAddressDecodeErrorZ_get_err(LDKCR CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_get_err"))) TS_CResult_NetAddressDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_NetAddressDecodeErrorZ* owner_conv = (LDKCResult_NetAddressDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_NetAddressDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7055,17 +6352,12 @@ static inline struct LDKAcceptChannel CResult_AcceptChannelDecodeErrorZ_get_ok(L CHECK(owner->result_ok); return AcceptChannel_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_get_ok"))) TS_CResult_AcceptChannelDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_AcceptChannelDecodeErrorZ* owner_conv = (LDKCResult_AcceptChannelDecodeErrorZ*)untag_ptr(owner); LDKAcceptChannel ret_var = CResult_AcceptChannelDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7073,17 +6365,12 @@ static inline struct LDKDecodeError CResult_AcceptChannelDecodeErrorZ_get_err(LD CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_get_err"))) TS_CResult_AcceptChannelDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_AcceptChannelDecodeErrorZ* owner_conv = (LDKCResult_AcceptChannelDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_AcceptChannelDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7091,17 +6378,12 @@ static inline struct LDKAnnouncementSignatures CResult_AnnouncementSignaturesDec CHECK(owner->result_ok); return AnnouncementSignatures_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_get_ok"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_AnnouncementSignaturesDecodeErrorZ* owner_conv = (LDKCResult_AnnouncementSignaturesDecodeErrorZ*)untag_ptr(owner); LDKAnnouncementSignatures ret_var = CResult_AnnouncementSignaturesDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7109,17 +6391,12 @@ static inline struct LDKDecodeError CResult_AnnouncementSignaturesDecodeErrorZ_g CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_get_err"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_AnnouncementSignaturesDecodeErrorZ* owner_conv = (LDKCResult_AnnouncementSignaturesDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_AnnouncementSignaturesDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7127,17 +6404,12 @@ static inline struct LDKChannelReestablish CResult_ChannelReestablishDecodeError CHECK(owner->result_ok); return ChannelReestablish_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_get_ok"))) TS_CResult_ChannelReestablishDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ChannelReestablishDecodeErrorZ* owner_conv = (LDKCResult_ChannelReestablishDecodeErrorZ*)untag_ptr(owner); LDKChannelReestablish ret_var = CResult_ChannelReestablishDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7145,17 +6417,12 @@ static inline struct LDKDecodeError CResult_ChannelReestablishDecodeErrorZ_get_e CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_get_err"))) TS_CResult_ChannelReestablishDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ChannelReestablishDecodeErrorZ* owner_conv = (LDKCResult_ChannelReestablishDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ChannelReestablishDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7163,17 +6430,12 @@ static inline struct LDKClosingSigned CResult_ClosingSignedDecodeErrorZ_get_ok(L CHECK(owner->result_ok); return ClosingSigned_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_get_ok"))) TS_CResult_ClosingSignedDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ClosingSignedDecodeErrorZ* owner_conv = (LDKCResult_ClosingSignedDecodeErrorZ*)untag_ptr(owner); LDKClosingSigned ret_var = CResult_ClosingSignedDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7181,17 +6443,12 @@ static inline struct LDKDecodeError CResult_ClosingSignedDecodeErrorZ_get_err(LD CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_get_err"))) TS_CResult_ClosingSignedDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ClosingSignedDecodeErrorZ* owner_conv = (LDKCResult_ClosingSignedDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ClosingSignedDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7199,17 +6456,12 @@ static inline struct LDKClosingSignedFeeRange CResult_ClosingSignedFeeRangeDecod CHECK(owner->result_ok); return ClosingSignedFeeRange_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_get_ok"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* owner_conv = (LDKCResult_ClosingSignedFeeRangeDecodeErrorZ*)untag_ptr(owner); LDKClosingSignedFeeRange ret_var = CResult_ClosingSignedFeeRangeDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7217,17 +6469,12 @@ static inline struct LDKDecodeError CResult_ClosingSignedFeeRangeDecodeErrorZ_ge CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_get_err"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* owner_conv = (LDKCResult_ClosingSignedFeeRangeDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ClosingSignedFeeRangeDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7235,17 +6482,12 @@ static inline struct LDKCommitmentSigned CResult_CommitmentSignedDecodeErrorZ_ge CHECK(owner->result_ok); return CommitmentSigned_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_get_ok"))) TS_CResult_CommitmentSignedDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_CommitmentSignedDecodeErrorZ* owner_conv = (LDKCResult_CommitmentSignedDecodeErrorZ*)untag_ptr(owner); LDKCommitmentSigned ret_var = CResult_CommitmentSignedDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7253,17 +6495,12 @@ static inline struct LDKDecodeError CResult_CommitmentSignedDecodeErrorZ_get_err CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_get_err"))) TS_CResult_CommitmentSignedDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_CommitmentSignedDecodeErrorZ* owner_conv = (LDKCResult_CommitmentSignedDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_CommitmentSignedDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7271,17 +6508,12 @@ static inline struct LDKFundingCreated CResult_FundingCreatedDecodeErrorZ_get_ok CHECK(owner->result_ok); return FundingCreated_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_get_ok"))) TS_CResult_FundingCreatedDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_FundingCreatedDecodeErrorZ* owner_conv = (LDKCResult_FundingCreatedDecodeErrorZ*)untag_ptr(owner); LDKFundingCreated ret_var = CResult_FundingCreatedDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7289,17 +6521,12 @@ static inline struct LDKDecodeError CResult_FundingCreatedDecodeErrorZ_get_err(L CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_get_err"))) TS_CResult_FundingCreatedDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_FundingCreatedDecodeErrorZ* owner_conv = (LDKCResult_FundingCreatedDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_FundingCreatedDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7307,17 +6534,12 @@ static inline struct LDKFundingSigned CResult_FundingSignedDecodeErrorZ_get_ok(L CHECK(owner->result_ok); return FundingSigned_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_get_ok"))) TS_CResult_FundingSignedDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_FundingSignedDecodeErrorZ* owner_conv = (LDKCResult_FundingSignedDecodeErrorZ*)untag_ptr(owner); LDKFundingSigned ret_var = CResult_FundingSignedDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7325,17 +6547,12 @@ static inline struct LDKDecodeError CResult_FundingSignedDecodeErrorZ_get_err(LD CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_get_err"))) TS_CResult_FundingSignedDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_FundingSignedDecodeErrorZ* owner_conv = (LDKCResult_FundingSignedDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_FundingSignedDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7343,17 +6560,12 @@ static inline struct LDKChannelReady CResult_ChannelReadyDecodeErrorZ_get_ok(LDK CHECK(owner->result_ok); return ChannelReady_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_ChannelReadyDecodeErrorZ_get_ok"))) TS_CResult_ChannelReadyDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_ChannelReadyDecodeErrorZ* owner_conv = (LDKCResult_ChannelReadyDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelReadyDecodeErrorZ_get_ok"))) TS_CResult_ChannelReadyDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ChannelReadyDecodeErrorZ* owner_conv = (LDKCResult_ChannelReadyDecodeErrorZ*)untag_ptr(owner); LDKChannelReady ret_var = CResult_ChannelReadyDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7361,17 +6573,12 @@ static inline struct LDKDecodeError CResult_ChannelReadyDecodeErrorZ_get_err(LDK CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_ChannelReadyDecodeErrorZ_get_err"))) TS_CResult_ChannelReadyDecodeErrorZ_get_err(uint32_t owner) { - LDKCResult_ChannelReadyDecodeErrorZ* owner_conv = (LDKCResult_ChannelReadyDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelReadyDecodeErrorZ_get_err"))) TS_CResult_ChannelReadyDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ChannelReadyDecodeErrorZ* owner_conv = (LDKCResult_ChannelReadyDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ChannelReadyDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7379,17 +6586,12 @@ static inline struct LDKInit CResult_InitDecodeErrorZ_get_ok(LDKCResult_InitDeco CHECK(owner->result_ok); return Init_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_InitDecodeErrorZ_get_ok"))) TS_CResult_InitDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_InitDecodeErrorZ* owner_conv = (LDKCResult_InitDecodeErrorZ*)untag_ptr(owner); LDKInit ret_var = CResult_InitDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7397,17 +6599,12 @@ static inline struct LDKDecodeError CResult_InitDecodeErrorZ_get_err(LDKCResult_ CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_InitDecodeErrorZ_get_err"))) TS_CResult_InitDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_InitDecodeErrorZ* owner_conv = (LDKCResult_InitDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_InitDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7415,17 +6612,12 @@ static inline struct LDKOpenChannel CResult_OpenChannelDecodeErrorZ_get_ok(LDKCR CHECK(owner->result_ok); return OpenChannel_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_get_ok"))) TS_CResult_OpenChannelDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_OpenChannelDecodeErrorZ* owner_conv = (LDKCResult_OpenChannelDecodeErrorZ*)untag_ptr(owner); LDKOpenChannel ret_var = CResult_OpenChannelDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7433,17 +6625,12 @@ static inline struct LDKDecodeError CResult_OpenChannelDecodeErrorZ_get_err(LDKC CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_get_err"))) TS_CResult_OpenChannelDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_OpenChannelDecodeErrorZ* owner_conv = (LDKCResult_OpenChannelDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_OpenChannelDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7451,17 +6638,12 @@ static inline struct LDKRevokeAndACK CResult_RevokeAndACKDecodeErrorZ_get_ok(LDK CHECK(owner->result_ok); return RevokeAndACK_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_get_ok"))) TS_CResult_RevokeAndACKDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_RevokeAndACKDecodeErrorZ* owner_conv = (LDKCResult_RevokeAndACKDecodeErrorZ*)untag_ptr(owner); LDKRevokeAndACK ret_var = CResult_RevokeAndACKDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7469,17 +6651,12 @@ static inline struct LDKDecodeError CResult_RevokeAndACKDecodeErrorZ_get_err(LDK CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_get_err"))) TS_CResult_RevokeAndACKDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_RevokeAndACKDecodeErrorZ* owner_conv = (LDKCResult_RevokeAndACKDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_RevokeAndACKDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7487,17 +6664,12 @@ static inline struct LDKShutdown CResult_ShutdownDecodeErrorZ_get_ok(LDKCResult_ CHECK(owner->result_ok); return Shutdown_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_get_ok"))) TS_CResult_ShutdownDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ShutdownDecodeErrorZ* owner_conv = (LDKCResult_ShutdownDecodeErrorZ*)untag_ptr(owner); LDKShutdown ret_var = CResult_ShutdownDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7505,17 +6677,12 @@ static inline struct LDKDecodeError CResult_ShutdownDecodeErrorZ_get_err(LDKCRes CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_get_err"))) TS_CResult_ShutdownDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ShutdownDecodeErrorZ* owner_conv = (LDKCResult_ShutdownDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ShutdownDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7523,17 +6690,12 @@ static inline struct LDKUpdateFailHTLC CResult_UpdateFailHTLCDecodeErrorZ_get_ok CHECK(owner->result_ok); return UpdateFailHTLC_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_get_ok"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_UpdateFailHTLCDecodeErrorZ* owner_conv = (LDKCResult_UpdateFailHTLCDecodeErrorZ*)untag_ptr(owner); LDKUpdateFailHTLC ret_var = CResult_UpdateFailHTLCDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7541,17 +6703,12 @@ static inline struct LDKDecodeError CResult_UpdateFailHTLCDecodeErrorZ_get_err(L CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_get_err"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_UpdateFailHTLCDecodeErrorZ* owner_conv = (LDKCResult_UpdateFailHTLCDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_UpdateFailHTLCDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7559,17 +6716,12 @@ static inline struct LDKUpdateFailMalformedHTLC CResult_UpdateFailMalformedHTLCD CHECK(owner->result_ok); return UpdateFailMalformedHTLC_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_get_ok"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* owner_conv = (LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ*)untag_ptr(owner); LDKUpdateFailMalformedHTLC ret_var = CResult_UpdateFailMalformedHTLCDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7577,17 +6729,12 @@ static inline struct LDKDecodeError CResult_UpdateFailMalformedHTLCDecodeErrorZ_ CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_get_err"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* owner_conv = (LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_UpdateFailMalformedHTLCDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7595,17 +6742,12 @@ static inline struct LDKUpdateFee CResult_UpdateFeeDecodeErrorZ_get_ok(LDKCResul CHECK(owner->result_ok); return UpdateFee_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_get_ok"))) TS_CResult_UpdateFeeDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_UpdateFeeDecodeErrorZ* owner_conv = (LDKCResult_UpdateFeeDecodeErrorZ*)untag_ptr(owner); LDKUpdateFee ret_var = CResult_UpdateFeeDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7613,17 +6755,12 @@ static inline struct LDKDecodeError CResult_UpdateFeeDecodeErrorZ_get_err(LDKCRe CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_get_err"))) TS_CResult_UpdateFeeDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_UpdateFeeDecodeErrorZ* owner_conv = (LDKCResult_UpdateFeeDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_UpdateFeeDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7631,17 +6768,12 @@ static inline struct LDKUpdateFulfillHTLC CResult_UpdateFulfillHTLCDecodeErrorZ_ CHECK(owner->result_ok); return UpdateFulfillHTLC_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_get_ok"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_UpdateFulfillHTLCDecodeErrorZ* owner_conv = (LDKCResult_UpdateFulfillHTLCDecodeErrorZ*)untag_ptr(owner); LDKUpdateFulfillHTLC ret_var = CResult_UpdateFulfillHTLCDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7649,17 +6781,12 @@ static inline struct LDKDecodeError CResult_UpdateFulfillHTLCDecodeErrorZ_get_er CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_get_err"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_UpdateFulfillHTLCDecodeErrorZ* owner_conv = (LDKCResult_UpdateFulfillHTLCDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_UpdateFulfillHTLCDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7667,17 +6794,12 @@ static inline struct LDKUpdateAddHTLC CResult_UpdateAddHTLCDecodeErrorZ_get_ok(L CHECK(owner->result_ok); return UpdateAddHTLC_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_get_ok"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_UpdateAddHTLCDecodeErrorZ* owner_conv = (LDKCResult_UpdateAddHTLCDecodeErrorZ*)untag_ptr(owner); LDKUpdateAddHTLC ret_var = CResult_UpdateAddHTLCDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7685,17 +6807,12 @@ static inline struct LDKDecodeError CResult_UpdateAddHTLCDecodeErrorZ_get_err(LD CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_get_err"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_UpdateAddHTLCDecodeErrorZ* owner_conv = (LDKCResult_UpdateAddHTLCDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_UpdateAddHTLCDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7703,17 +6820,12 @@ static inline struct LDKPing CResult_PingDecodeErrorZ_get_ok(LDKCResult_PingDeco CHECK(owner->result_ok); return Ping_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_PingDecodeErrorZ_get_ok"))) TS_CResult_PingDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_PingDecodeErrorZ* owner_conv = (LDKCResult_PingDecodeErrorZ*)untag_ptr(owner); LDKPing ret_var = CResult_PingDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7721,17 +6833,12 @@ static inline struct LDKDecodeError CResult_PingDecodeErrorZ_get_err(LDKCResult_ CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_PingDecodeErrorZ_get_err"))) TS_CResult_PingDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_PingDecodeErrorZ* owner_conv = (LDKCResult_PingDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_PingDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7739,17 +6846,12 @@ static inline struct LDKPong CResult_PongDecodeErrorZ_get_ok(LDKCResult_PongDeco CHECK(owner->result_ok); return Pong_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_PongDecodeErrorZ_get_ok"))) TS_CResult_PongDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_PongDecodeErrorZ* owner_conv = (LDKCResult_PongDecodeErrorZ*)untag_ptr(owner); LDKPong ret_var = CResult_PongDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7757,17 +6859,12 @@ static inline struct LDKDecodeError CResult_PongDecodeErrorZ_get_err(LDKCResult_ CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_PongDecodeErrorZ_get_err"))) TS_CResult_PongDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_PongDecodeErrorZ* owner_conv = (LDKCResult_PongDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_PongDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7775,17 +6872,12 @@ static inline struct LDKUnsignedChannelAnnouncement CResult_UnsignedChannelAnnou CHECK(owner->result_ok); return UnsignedChannelAnnouncement_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_get_ok"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* owner_conv = (LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ*)untag_ptr(owner); LDKUnsignedChannelAnnouncement ret_var = CResult_UnsignedChannelAnnouncementDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7793,17 +6885,12 @@ static inline struct LDKDecodeError CResult_UnsignedChannelAnnouncementDecodeErr CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_get_err"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* owner_conv = (LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_UnsignedChannelAnnouncementDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7811,17 +6898,12 @@ static inline struct LDKChannelAnnouncement CResult_ChannelAnnouncementDecodeErr CHECK(owner->result_ok); return ChannelAnnouncement_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_get_ok"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ChannelAnnouncementDecodeErrorZ* owner_conv = (LDKCResult_ChannelAnnouncementDecodeErrorZ*)untag_ptr(owner); LDKChannelAnnouncement ret_var = CResult_ChannelAnnouncementDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7829,17 +6911,12 @@ static inline struct LDKDecodeError CResult_ChannelAnnouncementDecodeErrorZ_get_ CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_get_err"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ChannelAnnouncementDecodeErrorZ* owner_conv = (LDKCResult_ChannelAnnouncementDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ChannelAnnouncementDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7847,17 +6924,12 @@ static inline struct LDKUnsignedChannelUpdate CResult_UnsignedChannelUpdateDecod CHECK(owner->result_ok); return UnsignedChannelUpdate_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_get_ok"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_UnsignedChannelUpdateDecodeErrorZ* owner_conv = (LDKCResult_UnsignedChannelUpdateDecodeErrorZ*)untag_ptr(owner); LDKUnsignedChannelUpdate ret_var = CResult_UnsignedChannelUpdateDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7865,17 +6937,12 @@ static inline struct LDKDecodeError CResult_UnsignedChannelUpdateDecodeErrorZ_ge CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_get_err"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_UnsignedChannelUpdateDecodeErrorZ* owner_conv = (LDKCResult_UnsignedChannelUpdateDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_UnsignedChannelUpdateDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7883,17 +6950,12 @@ static inline struct LDKChannelUpdate CResult_ChannelUpdateDecodeErrorZ_get_ok(L CHECK(owner->result_ok); return ChannelUpdate_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_get_ok"))) TS_CResult_ChannelUpdateDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ChannelUpdateDecodeErrorZ* owner_conv = (LDKCResult_ChannelUpdateDecodeErrorZ*)untag_ptr(owner); LDKChannelUpdate ret_var = CResult_ChannelUpdateDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7901,17 +6963,12 @@ static inline struct LDKDecodeError CResult_ChannelUpdateDecodeErrorZ_get_err(LD CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_get_err"))) TS_CResult_ChannelUpdateDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ChannelUpdateDecodeErrorZ* owner_conv = (LDKCResult_ChannelUpdateDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ChannelUpdateDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7919,17 +6976,12 @@ static inline struct LDKErrorMessage CResult_ErrorMessageDecodeErrorZ_get_ok(LDK CHECK(owner->result_ok); return ErrorMessage_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_get_ok"))) TS_CResult_ErrorMessageDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ErrorMessageDecodeErrorZ* owner_conv = (LDKCResult_ErrorMessageDecodeErrorZ*)untag_ptr(owner); LDKErrorMessage ret_var = CResult_ErrorMessageDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7937,17 +6989,12 @@ static inline struct LDKDecodeError CResult_ErrorMessageDecodeErrorZ_get_err(LDK CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_get_err"))) TS_CResult_ErrorMessageDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ErrorMessageDecodeErrorZ* owner_conv = (LDKCResult_ErrorMessageDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ErrorMessageDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7955,17 +7002,12 @@ static inline struct LDKWarningMessage CResult_WarningMessageDecodeErrorZ_get_ok CHECK(owner->result_ok); return WarningMessage_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_get_ok"))) TS_CResult_WarningMessageDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_WarningMessageDecodeErrorZ* owner_conv = (LDKCResult_WarningMessageDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_get_ok"))) TS_CResult_WarningMessageDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_WarningMessageDecodeErrorZ* owner_conv = (LDKCResult_WarningMessageDecodeErrorZ*)untag_ptr(owner); LDKWarningMessage ret_var = CResult_WarningMessageDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7973,17 +7015,12 @@ static inline struct LDKDecodeError CResult_WarningMessageDecodeErrorZ_get_err(L CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_get_err"))) TS_CResult_WarningMessageDecodeErrorZ_get_err(uint32_t owner) { - LDKCResult_WarningMessageDecodeErrorZ* owner_conv = (LDKCResult_WarningMessageDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_get_err"))) TS_CResult_WarningMessageDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_WarningMessageDecodeErrorZ* owner_conv = (LDKCResult_WarningMessageDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_WarningMessageDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7991,17 +7028,12 @@ static inline struct LDKUnsignedNodeAnnouncement CResult_UnsignedNodeAnnouncemen CHECK(owner->result_ok); return UnsignedNodeAnnouncement_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_get_ok"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* owner_conv = (LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ*)untag_ptr(owner); LDKUnsignedNodeAnnouncement ret_var = CResult_UnsignedNodeAnnouncementDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -8009,17 +7041,12 @@ static inline struct LDKDecodeError CResult_UnsignedNodeAnnouncementDecodeErrorZ CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_get_err"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* owner_conv = (LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_UnsignedNodeAnnouncementDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -8027,17 +7054,12 @@ static inline struct LDKNodeAnnouncement CResult_NodeAnnouncementDecodeErrorZ_ge CHECK(owner->result_ok); return NodeAnnouncement_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_get_ok"))) TS_CResult_NodeAnnouncementDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_NodeAnnouncementDecodeErrorZ* owner_conv = (LDKCResult_NodeAnnouncementDecodeErrorZ*)untag_ptr(owner); LDKNodeAnnouncement ret_var = CResult_NodeAnnouncementDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -8045,17 +7067,12 @@ static inline struct LDKDecodeError CResult_NodeAnnouncementDecodeErrorZ_get_err CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_get_err"))) TS_CResult_NodeAnnouncementDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_NodeAnnouncementDecodeErrorZ* owner_conv = (LDKCResult_NodeAnnouncementDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_NodeAnnouncementDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -8063,17 +7080,12 @@ static inline struct LDKQueryShortChannelIds CResult_QueryShortChannelIdsDecodeE CHECK(owner->result_ok); return QueryShortChannelIds_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_get_ok"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_QueryShortChannelIdsDecodeErrorZ* owner_conv = (LDKCResult_QueryShortChannelIdsDecodeErrorZ*)untag_ptr(owner); LDKQueryShortChannelIds ret_var = CResult_QueryShortChannelIdsDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -8081,17 +7093,12 @@ static inline struct LDKDecodeError CResult_QueryShortChannelIdsDecodeErrorZ_get CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_get_err"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_QueryShortChannelIdsDecodeErrorZ* owner_conv = (LDKCResult_QueryShortChannelIdsDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_QueryShortChannelIdsDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -8099,17 +7106,12 @@ static inline struct LDKReplyShortChannelIdsEnd CResult_ReplyShortChannelIdsEndD CHECK(owner->result_ok); return ReplyShortChannelIdsEnd_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_get_ok"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* owner_conv = (LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ*)untag_ptr(owner); LDKReplyShortChannelIdsEnd ret_var = CResult_ReplyShortChannelIdsEndDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -8117,17 +7119,12 @@ static inline struct LDKDecodeError CResult_ReplyShortChannelIdsEndDecodeErrorZ_ CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_get_err"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* owner_conv = (LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ReplyShortChannelIdsEndDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -8135,17 +7132,12 @@ static inline struct LDKQueryChannelRange CResult_QueryChannelRangeDecodeErrorZ_ CHECK(owner->result_ok); return QueryChannelRange_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_get_ok"))) TS_CResult_QueryChannelRangeDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_QueryChannelRangeDecodeErrorZ* owner_conv = (LDKCResult_QueryChannelRangeDecodeErrorZ*)untag_ptr(owner); LDKQueryChannelRange ret_var = CResult_QueryChannelRangeDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -8153,17 +7145,12 @@ static inline struct LDKDecodeError CResult_QueryChannelRangeDecodeErrorZ_get_er CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_get_err"))) TS_CResult_QueryChannelRangeDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_QueryChannelRangeDecodeErrorZ* owner_conv = (LDKCResult_QueryChannelRangeDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_QueryChannelRangeDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -8171,17 +7158,12 @@ static inline struct LDKReplyChannelRange CResult_ReplyChannelRangeDecodeErrorZ_ CHECK(owner->result_ok); return ReplyChannelRange_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_get_ok"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ReplyChannelRangeDecodeErrorZ* owner_conv = (LDKCResult_ReplyChannelRangeDecodeErrorZ*)untag_ptr(owner); LDKReplyChannelRange ret_var = CResult_ReplyChannelRangeDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -8189,17 +7171,12 @@ static inline struct LDKDecodeError CResult_ReplyChannelRangeDecodeErrorZ_get_er CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_get_err"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ReplyChannelRangeDecodeErrorZ* owner_conv = (LDKCResult_ReplyChannelRangeDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ReplyChannelRangeDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -8207,17 +7184,12 @@ static inline struct LDKGossipTimestampFilter CResult_GossipTimestampFilterDecod CHECK(owner->result_ok); return GossipTimestampFilter_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_get_ok"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_GossipTimestampFilterDecodeErrorZ* owner_conv = (LDKCResult_GossipTimestampFilterDecodeErrorZ*)untag_ptr(owner); LDKGossipTimestampFilter ret_var = CResult_GossipTimestampFilterDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -8225,30 +7197,25 @@ static inline struct LDKDecodeError CResult_GossipTimestampFilterDecodeErrorZ_ge CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_get_err"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_GossipTimestampFilterDecodeErrorZ* owner_conv = (LDKCResult_GossipTimestampFilterDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_GossipTimestampFilterDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_LDKSignOrCreationError_ty_from_ptr"))) TS_LDKSignOrCreationError_ty_from_ptr(uint32_t ptr) { - LDKSignOrCreationError *obj = (LDKSignOrCreationError*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKSignOrCreationError_ty_from_ptr"))) TS_LDKSignOrCreationError_ty_from_ptr(uint64_t ptr) { + LDKSignOrCreationError *obj = (LDKSignOrCreationError*)untag_ptr(ptr); switch(obj->tag) { case LDKSignOrCreationError_SignError: return 0; case LDKSignOrCreationError_CreationError: return 1; default: abort(); } } -uint32_t __attribute__((export_name("TS_LDKSignOrCreationError_CreationError_get_creation_error"))) TS_LDKSignOrCreationError_CreationError_get_creation_error(uint32_t ptr) { - LDKSignOrCreationError *obj = (LDKSignOrCreationError*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKSignOrCreationError_CreationError_get_creation_error"))) TS_LDKSignOrCreationError_CreationError_get_creation_error(uint64_t ptr) { + LDKSignOrCreationError *obj = (LDKSignOrCreationError*)untag_ptr(ptr); assert(obj->tag == LDKSignOrCreationError_CreationError); uint32_t creation_error_conv = LDKCreationError_to_js(obj->creation_error); return creation_error_conv; @@ -8257,17 +7224,12 @@ static inline struct LDKInvoice CResult_InvoiceSignOrCreationErrorZ_get_ok(LDKCR CHECK(owner->result_ok); return Invoice_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_get_ok"))) TS_CResult_InvoiceSignOrCreationErrorZ_get_ok(uint32_t owner) { - LDKCResult_InvoiceSignOrCreationErrorZ* owner_conv = (LDKCResult_InvoiceSignOrCreationErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_get_ok"))) TS_CResult_InvoiceSignOrCreationErrorZ_get_ok(uint64_t owner) { + LDKCResult_InvoiceSignOrCreationErrorZ* owner_conv = (LDKCResult_InvoiceSignOrCreationErrorZ*)untag_ptr(owner); LDKInvoice ret_var = CResult_InvoiceSignOrCreationErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -8275,11 +7237,11 @@ static inline struct LDKSignOrCreationError CResult_InvoiceSignOrCreationErrorZ_ CHECK(!owner->result_ok); return SignOrCreationError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_get_err"))) TS_CResult_InvoiceSignOrCreationErrorZ_get_err(uint32_t owner) { - LDKCResult_InvoiceSignOrCreationErrorZ* owner_conv = (LDKCResult_InvoiceSignOrCreationErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_get_err"))) TS_CResult_InvoiceSignOrCreationErrorZ_get_err(uint64_t owner) { + LDKCResult_InvoiceSignOrCreationErrorZ* owner_conv = (LDKCResult_InvoiceSignOrCreationErrorZ*)untag_ptr(owner); LDKSignOrCreationError *ret_copy = MALLOC(sizeof(LDKSignOrCreationError), "LDKSignOrCreationError"); *ret_copy = CResult_InvoiceSignOrCreationErrorZ_get_err(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } @@ -8305,19 +7267,14 @@ void register_tx_LDKFilter_jcall(const void* this_arg, const uint8_t (* txid)[32 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; - uint32_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. + uint64_t output_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(output_var); - output_ref = (uintptr_t)output_var.inner; - if (output_var.is_owned) { - output_ref |= 1; - } - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 33, (uint32_t)output_ref, 0, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + output_ref = tag_ptr(output_var.inner, output_var.is_owned); + uint32_t ret = js_invoke_function_buuuuu(j_calls->instance_ptr, 33, output_ref, 0, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCOption_C2Tuple_usizeTransactionZZ ret_conv = *(LDKCOption_C2Tuple_usizeTransactionZZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } static void LDKFilter_JCalls_cloned(LDKFilter* new_obj) { @@ -8337,14 +7294,14 @@ static inline LDKFilter LDKFilter_init (JSValue o) { }; return ret; } -long __attribute__((export_name("TS_LDKFilter_new"))) TS_LDKFilter_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKFilter_new"))) TS_LDKFilter_new(JSValue o) { LDKFilter *res_ptr = MALLOC(sizeof(LDKFilter), "LDKFilter"); *res_ptr = LDKFilter_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_Filter_register_tx"))) TS_Filter_register_tx(uint64_t this_arg, int8_tArray txid, int8_tArray script_pubkey) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKFilter* this_arg_conv = (LDKFilter*)this_arg_ptr; unsigned char txid_arr[32]; CHECK(txid->arr_len == 32); @@ -8357,31 +7314,31 @@ void __attribute__((export_name("TS_Filter_register_tx"))) TS_Filter_register_t FREE(script_pubkey); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_Filter_register_output"))) TS_Filter_register_output(uint64_t this_arg, uint64_t output) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKFilter* this_arg_conv = (LDKFilter*)this_arg_ptr; LDKWatchedOutput output_conv; - output_conv.inner = (void*)(output & (~1)); - output_conv.is_owned = (output & 1) || (output == 0); + output_conv.inner = untag_ptr(output); + output_conv.is_owned = ptr_is_owned(output); CHECK_INNER_FIELD_ACCESS_OR_NULL(output_conv); 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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_LDKCOption_FilterZ_ty_from_ptr"))) TS_LDKCOption_FilterZ_ty_from_ptr(uint32_t ptr) { - LDKCOption_FilterZ *obj = (LDKCOption_FilterZ*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKCOption_FilterZ_ty_from_ptr"))) TS_LDKCOption_FilterZ_ty_from_ptr(uint64_t ptr) { + LDKCOption_FilterZ *obj = (LDKCOption_FilterZ*)untag_ptr(ptr); switch(obj->tag) { case LDKCOption_FilterZ_Some: return 0; case LDKCOption_FilterZ_None: return 1; default: abort(); } } -uint32_t __attribute__((export_name("TS_LDKCOption_FilterZ_Some_get_some"))) TS_LDKCOption_FilterZ_Some_get_some(uint32_t ptr) { - LDKCOption_FilterZ *obj = (LDKCOption_FilterZ*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKCOption_FilterZ_Some_get_some"))) TS_LDKCOption_FilterZ_Some_get_some(uint64_t ptr) { + LDKCOption_FilterZ *obj = (LDKCOption_FilterZ*)untag_ptr(ptr); assert(obj->tag == LDKCOption_FilterZ_Some); LDKFilter* some_ret = MALLOC(sizeof(LDKFilter), "LDKFilter"); *some_ret = obj->some; @@ -8390,20 +7347,18 @@ uint32_t __attribute__((export_name("TS_LDKCOption_FilterZ_Some_get_some"))) TS_ // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKFilter_JCalls_cloned(&(*some_ret)); } - return (uint32_t)some_ret; + return tag_ptr(some_ret, true); } static inline struct LDKLockedChannelMonitor *CResult_LockedChannelMonitorNoneZ_get_ok(LDKCResult_LockedChannelMonitorNoneZ *NONNULL_PTR owner){ CHECK(owner->result_ok); return &*owner->contents.result; } -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); +uint64_t __attribute__((export_name("TS_CResult_LockedChannelMonitorNoneZ_get_ok"))) TS_CResult_LockedChannelMonitorNoneZ_get_ok(uint64_t owner) { + LDKCResult_LockedChannelMonitorNoneZ* owner_conv = (LDKCResult_LockedChannelMonitorNoneZ*)untag_ptr(owner); LDKLockedChannelMonitor ret_var = *CResult_LockedChannelMonitorNoneZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner & ~1; + ret_ref = tag_ptr(ret_var.inner, false); return ret_ref; } @@ -8411,8 +7366,8 @@ static inline void CResult_LockedChannelMonitorNoneZ_get_err(LDKCResult_LockedCh CHECK(!owner->result_ok); return *owner->contents.err; } -void __attribute__((export_name("TS_CResult_LockedChannelMonitorNoneZ_get_err"))) TS_CResult_LockedChannelMonitorNoneZ_get_err(uint32_t owner) { - LDKCResult_LockedChannelMonitorNoneZ* owner_conv = (LDKCResult_LockedChannelMonitorNoneZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_LockedChannelMonitorNoneZ_get_err"))) TS_CResult_LockedChannelMonitorNoneZ_get_err(uint64_t owner) { + LDKCResult_LockedChannelMonitorNoneZ* owner_conv = (LDKCResult_LockedChannelMonitorNoneZ*)untag_ptr(owner); CResult_LockedChannelMonitorNoneZ_get_err(owner_conv); } @@ -8435,20 +7390,20 @@ static void LDKMessageSendEventsProvider_JCalls_free(void* this_arg) { } LDKCVec_MessageSendEventZ get_and_clear_pending_msg_events_LDKMessageSendEventsProvider_jcall(const void* this_arg) { LDKMessageSendEventsProvider_JCalls *j_calls = (LDKMessageSendEventsProvider_JCalls*) this_arg; - uint32_tArray ret = (uint32_tArray)js_invoke_function_uuuuuu(j_calls->instance_ptr, 34, 0, 0, 0, 0, 0, 0); + uint64_tArray ret = (uint64_tArray)js_invoke_function_uuuuuu(j_calls->instance_ptr, 34, 0, 0, 0, 0, 0, 0); LDKCVec_MessageSendEventZ ret_constr; ret_constr.datalen = ret->arr_len; if (ret_constr.datalen > 0) ret_constr.data = MALLOC(ret_constr.datalen * sizeof(LDKMessageSendEvent), "LDKCVec_MessageSendEventZ Elements"); else ret_constr.data = NULL; - uint32_t* ret_vals = ret->elems; + uint64_t* ret_vals = ret->elems; for (size_t s = 0; s < ret_constr.datalen; s++) { - uint32_t ret_conv_18 = ret_vals[s]; - void* ret_conv_18_ptr = (void*)(((uintptr_t)ret_conv_18) & ~1); + uint64_t ret_conv_18 = ret_vals[s]; + void* ret_conv_18_ptr = untag_ptr(ret_conv_18); CHECK_ACCESS(ret_conv_18_ptr); LDKMessageSendEvent ret_conv_18_conv = *(LDKMessageSendEvent*)(ret_conv_18_ptr); - FREE((void*)ret_conv_18); + FREE(untag_ptr(ret_conv_18)); ret_constr.data[s] = ret_conv_18_conv; } FREE(ret); @@ -8470,23 +7425,23 @@ static inline LDKMessageSendEventsProvider LDKMessageSendEventsProvider_init (JS }; return ret; } -long __attribute__((export_name("TS_LDKMessageSendEventsProvider_new"))) TS_LDKMessageSendEventsProvider_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKMessageSendEventsProvider_new"))) TS_LDKMessageSendEventsProvider_new(JSValue o) { LDKMessageSendEventsProvider *res_ptr = MALLOC(sizeof(LDKMessageSendEventsProvider), "LDKMessageSendEventsProvider"); *res_ptr = LDKMessageSendEventsProvider_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_tArray __attribute__((export_name("TS_MessageSendEventsProvider_get_and_clear_pending_msg_events"))) TS_MessageSendEventsProvider_get_and_clear_pending_msg_events(uint64_t this_arg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t s = 0; s < ret_var.datalen; s++) { LDKMessageSendEvent *ret_conv_18_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_conv_18_copy = ret_var.data[s]; - uint32_t ret_conv_18_ref = (uintptr_t)ret_conv_18_copy; + uint64_t ret_conv_18_ref = tag_ptr(ret_conv_18_copy, true); ret_arr_ptr[s] = ret_conv_18_ref; } @@ -8508,7 +7463,8 @@ 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_uuuuuu(j_calls->instance_ptr, 35, (uint32_t)(uint32_t)ret_event, 0, 0, 0, 0, 0); + uint64_t ref_event = tag_ptr(ret_event, true); + js_invoke_function_buuuuu(j_calls->instance_ptr, 35, ref_event, 0, 0, 0, 0, 0); } static void LDKEventHandler_JCalls_cloned(LDKEventHandler* new_obj) { LDKEventHandler_JCalls *j_calls = (LDKEventHandler_JCalls*) new_obj->this_arg; @@ -8526,16 +7482,16 @@ static inline LDKEventHandler LDKEventHandler_init (JSValue o) { }; return ret; } -long __attribute__((export_name("TS_LDKEventHandler_new"))) TS_LDKEventHandler_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKEventHandler_new"))) TS_LDKEventHandler_new(JSValue o) { LDKEventHandler *res_ptr = MALLOC(sizeof(LDKEventHandler), "LDKEventHandler"); *res_ptr = LDKEventHandler_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -void __attribute__((export_name("TS_EventHandler_handle_event"))) TS_EventHandler_handle_event(uint32_t this_arg, uint32_t event) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_EventHandler_handle_event"))) TS_EventHandler_handle_event(uint64_t this_arg, uint64_t event) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKEventHandler* this_arg_conv = (LDKEventHandler*)this_arg_ptr; - LDKEvent* event_conv = (LDKEvent*)event; + LDKEvent* event_conv = (LDKEvent*)untag_ptr(event); (this_arg_conv->handle_event)(this_arg_conv->this_arg, event_conv); } @@ -8553,7 +7509,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_uuuuuu(j_calls->instance_ptr, 36, (uint32_t)(uint32_t)handler_ret, 0, 0, 0, 0, 0); + js_invoke_function_buuuuu(j_calls->instance_ptr, 36, tag_ptr(handler_ret, true), 0, 0, 0, 0, 0); } static void LDKEventsProvider_JCalls_cloned(LDKEventsProvider* new_obj) { LDKEventsProvider_JCalls *j_calls = (LDKEventsProvider_JCalls*) new_obj->this_arg; @@ -8571,16 +7527,16 @@ static inline LDKEventsProvider LDKEventsProvider_init (JSValue o) { }; return ret; } -long __attribute__((export_name("TS_LDKEventsProvider_new"))) TS_LDKEventsProvider_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKEventsProvider_new"))) TS_LDKEventsProvider_new(JSValue o) { LDKEventsProvider *res_ptr = MALLOC(sizeof(LDKEventsProvider), "LDKEventsProvider"); *res_ptr = LDKEventsProvider_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_EventsProvider_process_pending_events"))) TS_EventsProvider_process_pending_events(uint64_t this_arg, uint64_t handler) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKEventsProvider* this_arg_conv = (LDKEventsProvider*)this_arg_ptr; - void* handler_ptr = (void*)(((uintptr_t)handler) & ~1); + void* handler_ptr = untag_ptr(handler); CHECK_ACCESS(handler_ptr); LDKEventHandler handler_conv = *(LDKEventHandler*)(handler_ptr); if (handler_conv.free == LDKEventHandler_JCalls_free) { @@ -8604,75 +7560,50 @@ uint64_t channel_penalty_msat_LDKScore_jcall(const void* this_arg, uint64_t shor LDKScore_JCalls *j_calls = (LDKScore_JCalls*) this_arg; int64_t short_channel_id_conv = short_channel_id; LDKNodeId source_var = *source; - uint32_t source_ref = 0; + uint64_t source_ref = 0; source_var = NodeId_clone(&source_var); - 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 = (uintptr_t)source_var.inner; - if (source_var.is_owned) { - source_ref |= 1; - } + source_ref = tag_ptr(source_var.inner, source_var.is_owned); LDKNodeId target_var = *target; - uint32_t target_ref = 0; + uint64_t target_ref = 0; target_var = NodeId_clone(&target_var); - 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 = (uintptr_t)target_var.inner; - if (target_var.is_owned) { - target_ref |= 1; - } + target_ref = tag_ptr(target_var.inner, target_var.is_owned); LDKChannelUsage usage_var = usage; - uint32_t usage_ref = 0; - CHECK((((uintptr_t)usage_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&usage_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t usage_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(usage_var); - usage_ref = (uintptr_t)usage_var.inner; - if (usage_var.is_owned) { - usage_ref |= 1; - } - return js_invoke_function_buuuuu(j_calls->instance_ptr, 37, (uint32_t)short_channel_id_conv, (uint32_t)source_ref, (uint32_t)target_ref, (uint32_t)usage_ref, 0, 0); + usage_ref = tag_ptr(usage_var.inner, usage_var.is_owned); + return js_invoke_function_bbbbuu(j_calls->instance_ptr, 37, short_channel_id_conv, source_ref, target_ref, usage_ref, 0, 0); } void payment_path_failed_LDKScore_jcall(void* this_arg, LDKCVec_RouteHopZ path, uint64_t short_channel_id) { LDKScore_JCalls *j_calls = (LDKScore_JCalls*) this_arg; LDKCVec_RouteHopZ path_var = path; - uint32_tArray path_arr = NULL; - path_arr = init_uint32_tArray(path_var.datalen, __LINE__); - uint32_t *path_arr_ptr = (uint32_t*)(((uint8_t*)path_arr) + 8); + uint64_tArray path_arr = NULL; + path_arr = init_uint64_tArray(path_var.datalen, __LINE__); + uint64_t *path_arr_ptr = (uint64_t*)(((uint8_t*)path_arr) + 8); for (size_t k = 0; k < path_var.datalen; k++) { LDKRouteHop path_conv_10_var = path_var.data[k]; - uint32_t path_conv_10_ref = 0; - CHECK((((uintptr_t)path_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&path_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t path_conv_10_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_var); - path_conv_10_ref = (uintptr_t)path_conv_10_var.inner; - if (path_conv_10_var.is_owned) { - path_conv_10_ref |= 1; - } + path_conv_10_ref = tag_ptr(path_conv_10_var.inner, path_conv_10_var.is_owned); path_arr_ptr[k] = path_conv_10_ref; } FREE(path_var.data); int64_t short_channel_id_conv = short_channel_id; - js_invoke_function_ubuuuu(j_calls->instance_ptr, 38, (uint32_t)path_arr, (uint32_t)short_channel_id_conv, 0, 0, 0, 0); + js_invoke_function_ubuuuu(j_calls->instance_ptr, 38, (uint32_t)path_arr, short_channel_id_conv, 0, 0, 0, 0); } void payment_path_successful_LDKScore_jcall(void* this_arg, LDKCVec_RouteHopZ path) { LDKScore_JCalls *j_calls = (LDKScore_JCalls*) this_arg; LDKCVec_RouteHopZ path_var = path; - uint32_tArray path_arr = NULL; - path_arr = init_uint32_tArray(path_var.datalen, __LINE__); - uint32_t *path_arr_ptr = (uint32_t*)(((uint8_t*)path_arr) + 8); + uint64_tArray path_arr = NULL; + path_arr = init_uint64_tArray(path_var.datalen, __LINE__); + uint64_t *path_arr_ptr = (uint64_t*)(((uint8_t*)path_arr) + 8); for (size_t k = 0; k < path_var.datalen; k++) { LDKRouteHop path_conv_10_var = path_var.data[k]; - uint32_t path_conv_10_ref = 0; - CHECK((((uintptr_t)path_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&path_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t path_conv_10_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_var); - path_conv_10_ref = (uintptr_t)path_conv_10_var.inner; - if (path_conv_10_var.is_owned) { - path_conv_10_ref |= 1; - } + path_conv_10_ref = tag_ptr(path_conv_10_var.inner, path_conv_10_var.is_owned); path_arr_ptr[k] = path_conv_10_ref; } @@ -8682,42 +7613,32 @@ void payment_path_successful_LDKScore_jcall(void* this_arg, LDKCVec_RouteHopZ pa void probe_failed_LDKScore_jcall(void* this_arg, LDKCVec_RouteHopZ path, uint64_t short_channel_id) { LDKScore_JCalls *j_calls = (LDKScore_JCalls*) this_arg; LDKCVec_RouteHopZ path_var = path; - uint32_tArray path_arr = NULL; - path_arr = init_uint32_tArray(path_var.datalen, __LINE__); - uint32_t *path_arr_ptr = (uint32_t*)(((uint8_t*)path_arr) + 8); + uint64_tArray path_arr = NULL; + path_arr = init_uint64_tArray(path_var.datalen, __LINE__); + uint64_t *path_arr_ptr = (uint64_t*)(((uint8_t*)path_arr) + 8); for (size_t k = 0; k < path_var.datalen; k++) { LDKRouteHop path_conv_10_var = path_var.data[k]; - uint32_t path_conv_10_ref = 0; - CHECK((((uintptr_t)path_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&path_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t path_conv_10_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_var); - path_conv_10_ref = (uintptr_t)path_conv_10_var.inner; - if (path_conv_10_var.is_owned) { - path_conv_10_ref |= 1; - } + path_conv_10_ref = tag_ptr(path_conv_10_var.inner, path_conv_10_var.is_owned); path_arr_ptr[k] = path_conv_10_ref; } FREE(path_var.data); int64_t short_channel_id_conv = short_channel_id; - js_invoke_function_ubuuuu(j_calls->instance_ptr, 40, (uint32_t)path_arr, (uint32_t)short_channel_id_conv, 0, 0, 0, 0); + js_invoke_function_ubuuuu(j_calls->instance_ptr, 40, (uint32_t)path_arr, short_channel_id_conv, 0, 0, 0, 0); } void probe_successful_LDKScore_jcall(void* this_arg, LDKCVec_RouteHopZ path) { LDKScore_JCalls *j_calls = (LDKScore_JCalls*) this_arg; LDKCVec_RouteHopZ path_var = path; - uint32_tArray path_arr = NULL; - path_arr = init_uint32_tArray(path_var.datalen, __LINE__); - uint32_t *path_arr_ptr = (uint32_t*)(((uint8_t*)path_arr) + 8); + uint64_tArray path_arr = NULL; + path_arr = init_uint64_tArray(path_var.datalen, __LINE__); + uint64_t *path_arr_ptr = (uint64_t*)(((uint8_t*)path_arr) + 8); for (size_t k = 0; k < path_var.datalen; k++) { LDKRouteHop path_conv_10_var = path_var.data[k]; - uint32_t path_conv_10_ref = 0; - CHECK((((uintptr_t)path_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&path_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t path_conv_10_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_var); - path_conv_10_ref = (uintptr_t)path_conv_10_var.inner; - if (path_conv_10_var.is_owned) { - path_conv_10_ref |= 1; - } + path_conv_10_ref = tag_ptr(path_conv_10_var.inner, path_conv_10_var.is_owned); path_arr_ptr[k] = path_conv_10_ref; } @@ -8754,35 +7675,37 @@ static inline LDKScore LDKScore_init (JSValue o) { }; return ret; } -long __attribute__((export_name("TS_LDKScore_new"))) TS_LDKScore_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKScore_new"))) TS_LDKScore_new(JSValue o) { LDKScore *res_ptr = MALLOC(sizeof(LDKScore), "LDKScore"); *res_ptr = LDKScore_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -int64_t __attribute__((export_name("TS_Score_channel_penalty_msat"))) TS_Score_channel_penalty_msat(uint32_t this_arg, int64_t short_channel_id, uint32_t source, uint32_t target, uint32_t usage) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +int64_t __attribute__((export_name("TS_Score_channel_penalty_msat"))) TS_Score_channel_penalty_msat(uint64_t this_arg, int64_t short_channel_id, uint64_t source, uint64_t target, uint64_t usage) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKScore* this_arg_conv = (LDKScore*)this_arg_ptr; LDKNodeId source_conv; - source_conv.inner = (void*)(source & (~1)); - source_conv.is_owned = false; + source_conv.inner = untag_ptr(source); + source_conv.is_owned = ptr_is_owned(source); CHECK_INNER_FIELD_ACCESS_OR_NULL(source_conv); + source_conv.is_owned = false; LDKNodeId target_conv; - target_conv.inner = (void*)(target & (~1)); - target_conv.is_owned = false; + target_conv.inner = untag_ptr(target); + target_conv.is_owned = ptr_is_owned(target); CHECK_INNER_FIELD_ACCESS_OR_NULL(target_conv); + target_conv.is_owned = false; LDKChannelUsage usage_conv; - usage_conv.inner = (void*)(usage & (~1)); - usage_conv.is_owned = (usage & 1) || (usage == 0); + usage_conv.inner = untag_ptr(usage); + usage_conv.is_owned = ptr_is_owned(usage); CHECK_INNER_FIELD_ACCESS_OR_NULL(usage_conv); usage_conv = ChannelUsage_clone(&usage_conv); int64_t ret_conv = (this_arg_conv->channel_penalty_msat)(this_arg_conv->this_arg, short_channel_id, &source_conv, &target_conv, usage_conv); return ret_conv; } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_Score_payment_path_failed"))) TS_Score_payment_path_failed(uint64_t this_arg, uint64_tArray path, int64_t short_channel_id) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKScore* this_arg_conv = (LDKScore*)this_arg_ptr; LDKCVec_RouteHopZ path_constr; path_constr.datalen = path->arr_len; @@ -8790,12 +7713,12 @@ 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; + uint64_t* path_vals = path->elems; for (size_t k = 0; k < path_constr.datalen; k++) { - uint32_t path_conv_10 = path_vals[k]; + uint64_t path_conv_10 = path_vals[k]; LDKRouteHop path_conv_10_conv; - path_conv_10_conv.inner = (void*)(path_conv_10 & (~1)); - path_conv_10_conv.is_owned = (path_conv_10 & 1) || (path_conv_10 == 0); + path_conv_10_conv.inner = untag_ptr(path_conv_10); + path_conv_10_conv.is_owned = ptr_is_owned(path_conv_10); CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_conv); path_conv_10_conv = RouteHop_clone(&path_conv_10_conv); path_constr.data[k] = path_conv_10_conv; @@ -8804,9 +7727,9 @@ void __attribute__((export_name("TS_Score_payment_path_failed"))) TS_Score_paym (this_arg_conv->payment_path_failed)(this_arg_conv->this_arg, path_constr, short_channel_id); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_Score_payment_path_successful"))) TS_Score_payment_path_successful(uint64_t this_arg, uint64_tArray path) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKScore* this_arg_conv = (LDKScore*)this_arg_ptr; LDKCVec_RouteHopZ path_constr; path_constr.datalen = path->arr_len; @@ -8814,12 +7737,12 @@ 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; + uint64_t* path_vals = path->elems; for (size_t k = 0; k < path_constr.datalen; k++) { - uint32_t path_conv_10 = path_vals[k]; + uint64_t path_conv_10 = path_vals[k]; LDKRouteHop path_conv_10_conv; - path_conv_10_conv.inner = (void*)(path_conv_10 & (~1)); - path_conv_10_conv.is_owned = (path_conv_10 & 1) || (path_conv_10 == 0); + path_conv_10_conv.inner = untag_ptr(path_conv_10); + path_conv_10_conv.is_owned = ptr_is_owned(path_conv_10); CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_conv); path_conv_10_conv = RouteHop_clone(&path_conv_10_conv); path_constr.data[k] = path_conv_10_conv; @@ -8828,9 +7751,9 @@ void __attribute__((export_name("TS_Score_payment_path_successful"))) TS_Score_ (this_arg_conv->payment_path_successful)(this_arg_conv->this_arg, path_constr); } -void __attribute__((export_name("TS_Score_probe_failed"))) TS_Score_probe_failed(uint32_t this_arg, uint32_tArray path, int64_t short_channel_id) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_Score_probe_failed"))) TS_Score_probe_failed(uint64_t this_arg, uint64_tArray path, int64_t short_channel_id) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKScore* this_arg_conv = (LDKScore*)this_arg_ptr; LDKCVec_RouteHopZ path_constr; path_constr.datalen = path->arr_len; @@ -8838,12 +7761,12 @@ void __attribute__((export_name("TS_Score_probe_failed"))) TS_Score_probe_faile path_constr.data = MALLOC(path_constr.datalen * sizeof(LDKRouteHop), "LDKCVec_RouteHopZ Elements"); else path_constr.data = NULL; - uint32_t* path_vals = path->elems; + uint64_t* path_vals = path->elems; for (size_t k = 0; k < path_constr.datalen; k++) { - uint32_t path_conv_10 = path_vals[k]; + uint64_t path_conv_10 = path_vals[k]; LDKRouteHop path_conv_10_conv; - path_conv_10_conv.inner = (void*)(path_conv_10 & (~1)); - path_conv_10_conv.is_owned = (path_conv_10 & 1) || (path_conv_10 == 0); + path_conv_10_conv.inner = untag_ptr(path_conv_10); + path_conv_10_conv.is_owned = ptr_is_owned(path_conv_10); CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_conv); path_conv_10_conv = RouteHop_clone(&path_conv_10_conv); path_constr.data[k] = path_conv_10_conv; @@ -8852,9 +7775,9 @@ void __attribute__((export_name("TS_Score_probe_failed"))) TS_Score_probe_faile (this_arg_conv->probe_failed)(this_arg_conv->this_arg, path_constr, short_channel_id); } -void __attribute__((export_name("TS_Score_probe_successful"))) TS_Score_probe_successful(uint32_t this_arg, uint32_tArray path) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_Score_probe_successful"))) TS_Score_probe_successful(uint64_t this_arg, uint64_tArray path) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKScore* this_arg_conv = (LDKScore*)this_arg_ptr; LDKCVec_RouteHopZ path_constr; path_constr.datalen = path->arr_len; @@ -8862,12 +7785,12 @@ void __attribute__((export_name("TS_Score_probe_successful"))) TS_Score_probe_s path_constr.data = MALLOC(path_constr.datalen * sizeof(LDKRouteHop), "LDKCVec_RouteHopZ Elements"); else path_constr.data = NULL; - uint32_t* path_vals = path->elems; + uint64_t* path_vals = path->elems; for (size_t k = 0; k < path_constr.datalen; k++) { - uint32_t path_conv_10 = path_vals[k]; + uint64_t path_conv_10 = path_vals[k]; LDKRouteHop path_conv_10_conv; - path_conv_10_conv.inner = (void*)(path_conv_10 & (~1)); - path_conv_10_conv.is_owned = (path_conv_10 & 1) || (path_conv_10 == 0); + path_conv_10_conv.inner = untag_ptr(path_conv_10); + path_conv_10_conv.is_owned = ptr_is_owned(path_conv_10); CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_conv); path_conv_10_conv = RouteHop_clone(&path_conv_10_conv); path_constr.data[k] = path_conv_10_conv; @@ -8876,9 +7799,9 @@ void __attribute__((export_name("TS_Score_probe_successful"))) TS_Score_probe_s (this_arg_conv->probe_successful)(this_arg_conv->this_arg, path_constr); } -int8_tArray __attribute__((export_name("TS_Score_write"))) TS_Score_write(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +int8_tArray __attribute__((export_name("TS_Score_write"))) TS_Score_write(uint64_t this_arg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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, __LINE__); @@ -8900,58 +7823,43 @@ static void LDKPersister_JCalls_free(void* this_arg) { LDKCResult_NoneErrorZ persist_manager_LDKPersister_jcall(const void* this_arg, const LDKChannelManager * channel_manager) { LDKPersister_JCalls *j_calls = (LDKPersister_JCalls*) this_arg; LDKChannelManager channel_manager_var = *channel_manager; - uint32_t channel_manager_ref = 0; + uint64_t channel_manager_ref = 0; // WARNING: we may need a move here but no clone is available for LDKChannelManager - CHECK((((uintptr_t)channel_manager_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&channel_manager_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_manager_var); - channel_manager_ref = (uintptr_t)channel_manager_var.inner; - if (channel_manager_var.is_owned) { - channel_manager_ref |= 1; - } - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 43, (uint32_t)channel_manager_ref, 0, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + channel_manager_ref = tag_ptr(channel_manager_var.inner, channel_manager_var.is_owned); + uint32_t ret = js_invoke_function_buuuuu(j_calls->instance_ptr, 43, channel_manager_ref, 0, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_NoneErrorZ ret_conv = *(LDKCResult_NoneErrorZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } LDKCResult_NoneErrorZ persist_graph_LDKPersister_jcall(const void* this_arg, const LDKNetworkGraph * network_graph) { LDKPersister_JCalls *j_calls = (LDKPersister_JCalls*) this_arg; LDKNetworkGraph network_graph_var = *network_graph; - uint32_t network_graph_ref = 0; + uint64_t network_graph_ref = 0; // WARNING: we may need a move here but no clone is available for LDKNetworkGraph - CHECK((((uintptr_t)network_graph_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&network_graph_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(network_graph_var); - network_graph_ref = (uintptr_t)network_graph_var.inner; - if (network_graph_var.is_owned) { - network_graph_ref |= 1; - } - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 44, (uint32_t)network_graph_ref, 0, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + network_graph_ref = tag_ptr(network_graph_var.inner, network_graph_var.is_owned); + uint32_t ret = js_invoke_function_buuuuu(j_calls->instance_ptr, 44, network_graph_ref, 0, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_NoneErrorZ ret_conv = *(LDKCResult_NoneErrorZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } LDKCResult_NoneErrorZ persist_scorer_LDKPersister_jcall(const void* this_arg, const LDKMultiThreadedLockableScore * scorer) { LDKPersister_JCalls *j_calls = (LDKPersister_JCalls*) this_arg; LDKMultiThreadedLockableScore scorer_var = *scorer; - uint32_t scorer_ref = 0; + uint64_t scorer_ref = 0; // WARNING: we may need a move here but no clone is available for LDKMultiThreadedLockableScore - CHECK((((uintptr_t)scorer_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&scorer_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(scorer_var); - scorer_ref = (uintptr_t)scorer_var.inner; - if (scorer_var.is_owned) { - scorer_ref |= 1; - } - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 45, (uint32_t)scorer_ref, 0, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + scorer_ref = tag_ptr(scorer_var.inner, scorer_var.is_owned); + uint32_t ret = js_invoke_function_buuuuu(j_calls->instance_ptr, 45, scorer_ref, 0, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_NoneErrorZ ret_conv = *(LDKCResult_NoneErrorZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } static void LDKPersister_JCalls_cloned(LDKPersister* new_obj) { @@ -8972,48 +7880,51 @@ static inline LDKPersister LDKPersister_init (JSValue o) { }; return ret; } -long __attribute__((export_name("TS_LDKPersister_new"))) TS_LDKPersister_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKPersister_new"))) TS_LDKPersister_new(JSValue o) { LDKPersister *res_ptr = MALLOC(sizeof(LDKPersister), "LDKPersister"); *res_ptr = LDKPersister_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -uint32_t __attribute__((export_name("TS_Persister_persist_manager"))) TS_Persister_persist_manager(uint32_t this_arg, uint32_t channel_manager) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_Persister_persist_manager"))) TS_Persister_persist_manager(uint64_t this_arg, uint64_t channel_manager) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKPersister* this_arg_conv = (LDKPersister*)this_arg_ptr; LDKChannelManager channel_manager_conv; - channel_manager_conv.inner = (void*)(channel_manager & (~1)); - channel_manager_conv.is_owned = false; + channel_manager_conv.inner = untag_ptr(channel_manager); + channel_manager_conv.is_owned = ptr_is_owned(channel_manager); CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_manager_conv); + channel_manager_conv.is_owned = false; LDKCResult_NoneErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneErrorZ), "LDKCResult_NoneErrorZ"); *ret_conv = (this_arg_conv->persist_manager)(this_arg_conv->this_arg, &channel_manager_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_Persister_persist_graph"))) TS_Persister_persist_graph(uint32_t this_arg, uint32_t network_graph) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_Persister_persist_graph"))) TS_Persister_persist_graph(uint64_t this_arg, uint64_t network_graph) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKPersister* this_arg_conv = (LDKPersister*)this_arg_ptr; LDKNetworkGraph network_graph_conv; - network_graph_conv.inner = (void*)(network_graph & (~1)); - network_graph_conv.is_owned = false; + network_graph_conv.inner = untag_ptr(network_graph); + network_graph_conv.is_owned = ptr_is_owned(network_graph); CHECK_INNER_FIELD_ACCESS_OR_NULL(network_graph_conv); + network_graph_conv.is_owned = false; LDKCResult_NoneErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneErrorZ), "LDKCResult_NoneErrorZ"); *ret_conv = (this_arg_conv->persist_graph)(this_arg_conv->this_arg, &network_graph_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_Persister_persist_scorer"))) TS_Persister_persist_scorer(uint32_t this_arg, uint32_t scorer) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_Persister_persist_scorer"))) TS_Persister_persist_scorer(uint64_t this_arg, uint64_t scorer) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKPersister* this_arg_conv = (LDKPersister*)this_arg_ptr; LDKMultiThreadedLockableScore scorer_conv; - scorer_conv.inner = (void*)(scorer & (~1)); - scorer_conv.is_owned = false; + scorer_conv.inner = untag_ptr(scorer); + scorer_conv.is_owned = ptr_is_owned(scorer); CHECK_INNER_FIELD_ACCESS_OR_NULL(scorer_conv); + scorer_conv.is_owned = false; LDKCResult_NoneErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneErrorZ), "LDKCResult_NoneErrorZ"); *ret_conv = (this_arg_conv->persist_scorer)(this_arg_conv->this_arg, &scorer_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } typedef struct LDKListen_JCalls { @@ -9031,18 +7942,18 @@ void filtered_block_connected_LDKListen_jcall(const void* this_arg, const uint8_ 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, __LINE__); - uint32_t *txdata_arr_ptr = (uint32_t*)(((uint8_t*)txdata_arr) + 8); + uint64_tArray txdata_arr = NULL; + txdata_arr = init_uint64_tArray(txdata_var.datalen, __LINE__); + uint64_t *txdata_arr_ptr = (uint64_t*)(((uint8_t*)txdata_arr) + 8); for (size_t c = 0; c < txdata_var.datalen; c++) { LDKC2Tuple_usizeTransactionZ* txdata_conv_28_conv = MALLOC(sizeof(LDKC2Tuple_usizeTransactionZ), "LDKC2Tuple_usizeTransactionZ"); *txdata_conv_28_conv = txdata_var.data[c]; - txdata_arr_ptr[c] = ((uint32_t)txdata_conv_28_conv); + txdata_arr_ptr[c] = tag_ptr(txdata_conv_28_conv, true); } FREE(txdata_var.data); int32_t height_conv = height; - js_invoke_function_uuuuuu(j_calls->instance_ptr, 46, (uint32_t)header_arr, (uint32_t)txdata_arr, (uint32_t)height_conv, 0, 0, 0); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 46, (uint32_t)header_arr, (uint32_t)txdata_arr, height_conv, 0, 0, 0); } void block_connected_LDKListen_jcall(const void* this_arg, LDKu8slice block, uint32_t height) { LDKListen_JCalls *j_calls = (LDKListen_JCalls*) this_arg; @@ -9050,14 +7961,14 @@ void block_connected_LDKListen_jcall(const void* this_arg, LDKu8slice block, uin int8_tArray block_arr = init_int8_tArray(block_var.datalen, __LINE__); memcpy(block_arr->elems, block_var.data, block_var.datalen); int32_t height_conv = height; - js_invoke_function_uuuuuu(j_calls->instance_ptr, 47, (uint32_t)block_arr, (uint32_t)height_conv, 0, 0, 0, 0); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 47, (uint32_t)block_arr, height_conv, 0, 0, 0, 0); } void block_disconnected_LDKListen_jcall(const void* this_arg, const uint8_t (* header)[80], uint32_t height) { LDKListen_JCalls *j_calls = (LDKListen_JCalls*) this_arg; int8_tArray header_arr = init_int8_tArray(80, __LINE__); memcpy(header_arr->elems, *header, 80); int32_t height_conv = height; - js_invoke_function_uuuuuu(j_calls->instance_ptr, 48, (uint32_t)header_arr, (uint32_t)height_conv, 0, 0, 0, 0); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 48, (uint32_t)header_arr, height_conv, 0, 0, 0, 0); } static void LDKListen_JCalls_cloned(LDKListen* new_obj) { LDKListen_JCalls *j_calls = (LDKListen_JCalls*) new_obj->this_arg; @@ -9077,14 +7988,14 @@ static inline LDKListen LDKListen_init (JSValue o) { }; return ret; } -long __attribute__((export_name("TS_LDKListen_new"))) TS_LDKListen_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKListen_new"))) TS_LDKListen_new(JSValue o) { LDKListen *res_ptr = MALLOC(sizeof(LDKListen), "LDKListen"); *res_ptr = LDKListen_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -void __attribute__((export_name("TS_Listen_filtered_block_connected"))) TS_Listen_filtered_block_connected(uint32_t this_arg, int8_tArray header, uint32_tArray txdata, int32_t height) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_Listen_filtered_block_connected"))) TS_Listen_filtered_block_connected(uint64_t this_arg, int8_tArray header, uint64_tArray txdata, int32_t height) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKListen* this_arg_conv = (LDKListen*)this_arg_ptr; unsigned char header_arr[80]; CHECK(header->arr_len == 80); @@ -9096,22 +8007,22 @@ void __attribute__((export_name("TS_Listen_filtered_block_connected"))) TS_List txdata_constr.data = MALLOC(txdata_constr.datalen * sizeof(LDKC2Tuple_usizeTransactionZ), "LDKCVec_C2Tuple_usizeTransactionZZ Elements"); else txdata_constr.data = NULL; - uint32_t* txdata_vals = txdata->elems; + uint64_t* txdata_vals = txdata->elems; for (size_t c = 0; c < txdata_constr.datalen; c++) { - uint32_t txdata_conv_28 = txdata_vals[c]; - void* txdata_conv_28_ptr = (void*)(((uintptr_t)txdata_conv_28) & ~1); + uint64_t txdata_conv_28 = txdata_vals[c]; + void* txdata_conv_28_ptr = untag_ptr(txdata_conv_28); 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*)(((uintptr_t)txdata_conv_28) & ~1)); + txdata_conv_28_conv = C2Tuple_usizeTransactionZ_clone((LDKC2Tuple_usizeTransactionZ*)untag_ptr(txdata_conv_28)); txdata_constr.data[c] = txdata_conv_28_conv; } FREE(txdata); (this_arg_conv->filtered_block_connected)(this_arg_conv->this_arg, header_ref, txdata_constr, height); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_Listen_block_connected"))) TS_Listen_block_connected(uint64_t this_arg, int8_tArray block, int32_t height) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKListen* this_arg_conv = (LDKListen*)this_arg_ptr; LDKu8slice block_ref; block_ref.datalen = block->arr_len; @@ -9120,9 +8031,9 @@ void __attribute__((export_name("TS_Listen_block_connected"))) TS_Listen_block_ FREE(block); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_Listen_block_disconnected"))) TS_Listen_block_disconnected(uint64_t this_arg, int8_tArray header, int32_t height) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKListen* this_arg_conv = (LDKListen*)this_arg_ptr; unsigned char header_arr[80]; CHECK(header->arr_len == 80); @@ -9146,18 +8057,18 @@ void transactions_confirmed_LDKConfirm_jcall(const void* this_arg, const uint8_t 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, __LINE__); - uint32_t *txdata_arr_ptr = (uint32_t*)(((uint8_t*)txdata_arr) + 8); + uint64_tArray txdata_arr = NULL; + txdata_arr = init_uint64_tArray(txdata_var.datalen, __LINE__); + uint64_t *txdata_arr_ptr = (uint64_t*)(((uint8_t*)txdata_arr) + 8); for (size_t c = 0; c < txdata_var.datalen; c++) { LDKC2Tuple_usizeTransactionZ* txdata_conv_28_conv = MALLOC(sizeof(LDKC2Tuple_usizeTransactionZ), "LDKC2Tuple_usizeTransactionZ"); *txdata_conv_28_conv = txdata_var.data[c]; - txdata_arr_ptr[c] = ((uint32_t)txdata_conv_28_conv); + txdata_arr_ptr[c] = tag_ptr(txdata_conv_28_conv, true); } FREE(txdata_var.data); int32_t height_conv = height; - js_invoke_function_uuuuuu(j_calls->instance_ptr, 49, (uint32_t)header_arr, (uint32_t)txdata_arr, (uint32_t)height_conv, 0, 0, 0); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 49, (uint32_t)header_arr, (uint32_t)txdata_arr, height_conv, 0, 0, 0); } void transaction_unconfirmed_LDKConfirm_jcall(const void* this_arg, const uint8_t (* txid)[32]) { LDKConfirm_JCalls *j_calls = (LDKConfirm_JCalls*) this_arg; @@ -9170,7 +8081,7 @@ void best_block_updated_LDKConfirm_jcall(const void* this_arg, const uint8_t (* int8_tArray header_arr = init_int8_tArray(80, __LINE__); memcpy(header_arr->elems, *header, 80); int32_t height_conv = height; - js_invoke_function_uuuuuu(j_calls->instance_ptr, 51, (uint32_t)header_arr, (uint32_t)height_conv, 0, 0, 0, 0); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 51, (uint32_t)header_arr, height_conv, 0, 0, 0, 0); } LDKCVec_TxidZ get_relevant_txids_LDKConfirm_jcall(const void* this_arg) { LDKConfirm_JCalls *j_calls = (LDKConfirm_JCalls*) this_arg; @@ -9211,14 +8122,14 @@ static inline LDKConfirm LDKConfirm_init (JSValue o) { }; return ret; } -long __attribute__((export_name("TS_LDKConfirm_new"))) TS_LDKConfirm_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKConfirm_new"))) TS_LDKConfirm_new(JSValue o) { LDKConfirm *res_ptr = MALLOC(sizeof(LDKConfirm), "LDKConfirm"); *res_ptr = LDKConfirm_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_Confirm_transactions_confirmed"))) TS_Confirm_transactions_confirmed(uint64_t this_arg, int8_tArray header, uint64_tArray txdata, int32_t height) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKConfirm* this_arg_conv = (LDKConfirm*)this_arg_ptr; unsigned char header_arr[80]; CHECK(header->arr_len == 80); @@ -9230,22 +8141,22 @@ 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; + uint64_t* txdata_vals = txdata->elems; for (size_t c = 0; c < txdata_constr.datalen; c++) { - uint32_t txdata_conv_28 = txdata_vals[c]; - void* txdata_conv_28_ptr = (void*)(((uintptr_t)txdata_conv_28) & ~1); + uint64_t txdata_conv_28 = txdata_vals[c]; + void* txdata_conv_28_ptr = untag_ptr(txdata_conv_28); 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*)(((uintptr_t)txdata_conv_28) & ~1)); + txdata_conv_28_conv = C2Tuple_usizeTransactionZ_clone((LDKC2Tuple_usizeTransactionZ*)untag_ptr(txdata_conv_28)); txdata_constr.data[c] = txdata_conv_28_conv; } FREE(txdata); (this_arg_conv->transactions_confirmed)(this_arg_conv->this_arg, header_ref, txdata_constr, height); } -void __attribute__((export_name("TS_Confirm_transaction_unconfirmed"))) TS_Confirm_transaction_unconfirmed(uint32_t this_arg, int8_tArray txid) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_Confirm_transaction_unconfirmed"))) TS_Confirm_transaction_unconfirmed(uint64_t this_arg, int8_tArray txid) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKConfirm* this_arg_conv = (LDKConfirm*)this_arg_ptr; unsigned char txid_arr[32]; CHECK(txid->arr_len == 32); @@ -9254,9 +8165,9 @@ void __attribute__((export_name("TS_Confirm_transaction_unconfirmed"))) TS_Conf (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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_Confirm_best_block_updated"))) TS_Confirm_best_block_updated(uint64_t this_arg, int8_tArray header, int32_t height) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKConfirm* this_arg_conv = (LDKConfirm*)this_arg_ptr; unsigned char header_arr[80]; CHECK(header->arr_len == 80); @@ -9265,9 +8176,9 @@ void __attribute__((export_name("TS_Confirm_best_block_updated"))) TS_Confirm_b (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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +ptrArray __attribute__((export_name("TS_Confirm_get_relevant_txids"))) TS_Confirm_get_relevant_txids(uint64_t this_arg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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; @@ -9296,87 +8207,50 @@ 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; - uint32_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. + uint64_t channel_id_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_id_var); - channel_id_ref = (uintptr_t)channel_id_var.inner; - if (channel_id_var.is_owned) { - channel_id_ref |= 1; - } + channel_id_ref = tag_ptr(channel_id_var.inner, channel_id_var.is_owned); LDKChannelMonitor data_var = *data; - uint32_t data_ref = 0; + uint64_t data_ref = 0; data_var = ChannelMonitor_clone(&data_var); - 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 = (uintptr_t)data_var.inner; - if (data_var.is_owned) { - data_ref |= 1; - } + data_ref = tag_ptr(data_var.inner, data_var.is_owned); LDKMonitorUpdateId update_id_var = update_id; - uint32_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. + uint64_t update_id_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(update_id_var); - 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_uuuuuu(j_calls->instance_ptr, 53, (uint32_t)channel_id_ref, (uint32_t)data_ref, (uint32_t)update_id_ref, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + update_id_ref = tag_ptr(update_id_var.inner, update_id_var.is_owned); + uint32_t ret = js_invoke_function_bbbuuu(j_calls->instance_ptr, 53, channel_id_ref, data_ref, update_id_ref, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_NoneChannelMonitorUpdateErrZ ret_conv = *(LDKCResult_NoneChannelMonitorUpdateErrZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } 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; - uint32_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. + uint64_t channel_id_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_id_var); - channel_id_ref = (uintptr_t)channel_id_var.inner; - if (channel_id_var.is_owned) { - channel_id_ref |= 1; - } + channel_id_ref = tag_ptr(channel_id_var.inner, channel_id_var.is_owned); LDKChannelMonitorUpdate update_var = *update; - uint32_t update_ref = 0; - if ((uintptr_t)update_var.inner > 4096) { - update_var = ChannelMonitorUpdate_clone(&update_var); - 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. + uint64_t update_ref = 0; + update_var = ChannelMonitorUpdate_clone(&update_var); CHECK_INNER_FIELD_ACCESS_OR_NULL(update_var); - update_ref = (uintptr_t)update_var.inner; - if (update_var.is_owned) { - update_ref |= 1; - } - } + update_ref = tag_ptr(update_var.inner, update_var.is_owned); LDKChannelMonitor data_var = *data; - uint32_t data_ref = 0; + uint64_t data_ref = 0; data_var = ChannelMonitor_clone(&data_var); - 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 = (uintptr_t)data_var.inner; - if (data_var.is_owned) { - data_ref |= 1; - } + data_ref = tag_ptr(data_var.inner, data_var.is_owned); LDKMonitorUpdateId update_id_var = update_id; - uint32_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. + uint64_t update_id_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(update_id_var); - 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_uuuuuu(j_calls->instance_ptr, 54, (uint32_t)channel_id_ref, (uint32_t)update_ref, (uint32_t)data_ref, (uint32_t)update_id_ref, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + update_id_ref = tag_ptr(update_id_var.inner, update_id_var.is_owned); + uint32_t ret = js_invoke_function_bbbbuu(j_calls->instance_ptr, 54, channel_id_ref, update_ref, data_ref, update_id_ref, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_NoneChannelMonitorUpdateErrZ ret_conv = *(LDKCResult_NoneChannelMonitorUpdateErrZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } static void LDKPersist_JCalls_cloned(LDKPersist* new_obj) { @@ -9396,59 +8270,62 @@ static inline LDKPersist LDKPersist_init (JSValue o) { }; return ret; } -long __attribute__((export_name("TS_LDKPersist_new"))) TS_LDKPersist_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKPersist_new"))) TS_LDKPersist_new(JSValue o) { LDKPersist *res_ptr = MALLOC(sizeof(LDKPersist), "LDKPersist"); *res_ptr = LDKPersist_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_Persist_persist_new_channel"))) TS_Persist_persist_new_channel(uint64_t this_arg, uint64_t channel_id, uint64_t data, uint64_t update_id) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKPersist* this_arg_conv = (LDKPersist*)this_arg_ptr; LDKOutPoint channel_id_conv; - channel_id_conv.inner = (void*)(channel_id & (~1)); - channel_id_conv.is_owned = (channel_id & 1) || (channel_id == 0); + channel_id_conv.inner = untag_ptr(channel_id); + channel_id_conv.is_owned = ptr_is_owned(channel_id); CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_id_conv); channel_id_conv = OutPoint_clone(&channel_id_conv); LDKChannelMonitor data_conv; - data_conv.inner = (void*)(data & (~1)); - data_conv.is_owned = false; + data_conv.inner = untag_ptr(data); + data_conv.is_owned = ptr_is_owned(data); CHECK_INNER_FIELD_ACCESS_OR_NULL(data_conv); + data_conv.is_owned = false; LDKMonitorUpdateId update_id_conv; - update_id_conv.inner = (void*)(update_id & (~1)); - update_id_conv.is_owned = (update_id & 1) || (update_id == 0); + update_id_conv.inner = untag_ptr(update_id); + update_id_conv.is_owned = ptr_is_owned(update_id); CHECK_INNER_FIELD_ACCESS_OR_NULL(update_id_conv); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_Persist_update_persisted_channel"))) TS_Persist_update_persisted_channel(uint64_t this_arg, uint64_t channel_id, uint64_t update, uint64_t data, uint64_t update_id) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKPersist* this_arg_conv = (LDKPersist*)this_arg_ptr; LDKOutPoint channel_id_conv; - channel_id_conv.inner = (void*)(channel_id & (~1)); - channel_id_conv.is_owned = (channel_id & 1) || (channel_id == 0); + channel_id_conv.inner = untag_ptr(channel_id); + channel_id_conv.is_owned = ptr_is_owned(channel_id); CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_id_conv); channel_id_conv = OutPoint_clone(&channel_id_conv); LDKChannelMonitorUpdate update_conv; - update_conv.inner = (void*)(update & (~1)); - update_conv.is_owned = false; + update_conv.inner = untag_ptr(update); + update_conv.is_owned = ptr_is_owned(update); CHECK_INNER_FIELD_ACCESS_OR_NULL(update_conv); + update_conv.is_owned = false; LDKChannelMonitor data_conv; - data_conv.inner = (void*)(data & (~1)); - data_conv.is_owned = false; + data_conv.inner = untag_ptr(data); + data_conv.is_owned = ptr_is_owned(data); CHECK_INNER_FIELD_ACCESS_OR_NULL(data_conv); + data_conv.is_owned = false; LDKMonitorUpdateId update_id_conv; - update_id_conv.inner = (void*)(update_id & (~1)); - update_id_conv.is_owned = (update_id & 1) || (update_id == 0); + update_id_conv.inner = untag_ptr(update_id); + update_id_conv.is_owned = ptr_is_owned(update_id); CHECK_INNER_FIELD_ACCESS_OR_NULL(update_id_conv); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } typedef struct LDKChannelMessageHandler_JCalls { @@ -9467,339 +8344,229 @@ void handle_open_channel_LDKChannelMessageHandler_jcall(const void* this_arg, LD 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; - uint32_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. + uint64_t their_features_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(their_features_var); - their_features_ref = (uintptr_t)their_features_var.inner; - if (their_features_var.is_owned) { - their_features_ref |= 1; - } + their_features_ref = tag_ptr(their_features_var.inner, their_features_var.is_owned); LDKOpenChannel msg_var = *msg; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = OpenChannel_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 55, (uint32_t)their_node_id_arr, (uint32_t)their_features_ref, (uint32_t)msg_ref, 0, 0, 0); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + js_invoke_function_ubbuuu(j_calls->instance_ptr, 55, (uint32_t)their_node_id_arr, their_features_ref, msg_ref, 0, 0, 0); } void handle_accept_channel_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, LDKInitFeatures their_features, const LDKAcceptChannel * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; 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; - uint32_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. + uint64_t their_features_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(their_features_var); - their_features_ref = (uintptr_t)their_features_var.inner; - if (their_features_var.is_owned) { - their_features_ref |= 1; - } + their_features_ref = tag_ptr(their_features_var.inner, their_features_var.is_owned); LDKAcceptChannel msg_var = *msg; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = AcceptChannel_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 56, (uint32_t)their_node_id_arr, (uint32_t)their_features_ref, (uint32_t)msg_ref, 0, 0, 0); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + js_invoke_function_ubbuuu(j_calls->instance_ptr, 56, (uint32_t)their_node_id_arr, their_features_ref, msg_ref, 0, 0, 0); } void handle_funding_created_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKFundingCreated * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; 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; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = FundingCreated_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 57, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + js_invoke_function_ubuuuu(j_calls->instance_ptr, 57, (uint32_t)their_node_id_arr, msg_ref, 0, 0, 0, 0); } void handle_funding_signed_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKFundingSigned * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; 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; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = FundingSigned_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 58, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + js_invoke_function_ubuuuu(j_calls->instance_ptr, 58, (uint32_t)their_node_id_arr, msg_ref, 0, 0, 0, 0); } void handle_channel_ready_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKChannelReady * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__); memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33); LDKChannelReady msg_var = *msg; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = ChannelReady_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 59, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + js_invoke_function_ubuuuu(j_calls->instance_ptr, 59, (uint32_t)their_node_id_arr, msg_ref, 0, 0, 0, 0); } void handle_shutdown_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKInitFeatures * their_features, const LDKShutdown * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; 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; - uint32_t their_features_ref = 0; + uint64_t their_features_ref = 0; their_features_var = InitFeatures_clone(&their_features_var); - 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 = (uintptr_t)their_features_var.inner; - if (their_features_var.is_owned) { - their_features_ref |= 1; - } + their_features_ref = tag_ptr(their_features_var.inner, their_features_var.is_owned); LDKShutdown msg_var = *msg; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = Shutdown_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 60, (uint32_t)their_node_id_arr, (uint32_t)their_features_ref, (uint32_t)msg_ref, 0, 0, 0); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + js_invoke_function_ubbuuu(j_calls->instance_ptr, 60, (uint32_t)their_node_id_arr, their_features_ref, msg_ref, 0, 0, 0); } void handle_closing_signed_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKClosingSigned * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; 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; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = ClosingSigned_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 61, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + js_invoke_function_ubuuuu(j_calls->instance_ptr, 61, (uint32_t)their_node_id_arr, msg_ref, 0, 0, 0, 0); } void handle_update_add_htlc_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKUpdateAddHTLC * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; 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; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = UpdateAddHTLC_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 62, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + js_invoke_function_ubuuuu(j_calls->instance_ptr, 62, (uint32_t)their_node_id_arr, msg_ref, 0, 0, 0, 0); } void handle_update_fulfill_htlc_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKUpdateFulfillHTLC * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; 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; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = UpdateFulfillHTLC_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 63, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + js_invoke_function_ubuuuu(j_calls->instance_ptr, 63, (uint32_t)their_node_id_arr, msg_ref, 0, 0, 0, 0); } void handle_update_fail_htlc_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKUpdateFailHTLC * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; 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; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = UpdateFailHTLC_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 64, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + js_invoke_function_ubuuuu(j_calls->instance_ptr, 64, (uint32_t)their_node_id_arr, msg_ref, 0, 0, 0, 0); } void handle_update_fail_malformed_htlc_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKUpdateFailMalformedHTLC * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; 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; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = UpdateFailMalformedHTLC_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 65, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + js_invoke_function_ubuuuu(j_calls->instance_ptr, 65, (uint32_t)their_node_id_arr, msg_ref, 0, 0, 0, 0); } void handle_commitment_signed_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKCommitmentSigned * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; 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; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = CommitmentSigned_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 66, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + js_invoke_function_ubuuuu(j_calls->instance_ptr, 66, (uint32_t)their_node_id_arr, msg_ref, 0, 0, 0, 0); } void handle_revoke_and_ack_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKRevokeAndACK * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; 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; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = RevokeAndACK_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 67, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + js_invoke_function_ubuuuu(j_calls->instance_ptr, 67, (uint32_t)their_node_id_arr, msg_ref, 0, 0, 0, 0); } void handle_update_fee_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKUpdateFee * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; 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; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = UpdateFee_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 68, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + js_invoke_function_ubuuuu(j_calls->instance_ptr, 68, (uint32_t)their_node_id_arr, msg_ref, 0, 0, 0, 0); } void handle_announcement_signatures_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKAnnouncementSignatures * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; 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; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = AnnouncementSignatures_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 69, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + js_invoke_function_ubuuuu(j_calls->instance_ptr, 69, (uint32_t)their_node_id_arr, msg_ref, 0, 0, 0, 0); } void peer_disconnected_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, bool no_connection_possible) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__); memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33); jboolean no_connection_possible_conv = no_connection_possible; - js_invoke_function_uuuuuu(j_calls->instance_ptr, 70, (uint32_t)their_node_id_arr, (uint32_t)no_connection_possible_conv, 0, 0, 0, 0); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 70, (uint32_t)their_node_id_arr, no_connection_possible_conv, 0, 0, 0, 0); } void peer_connected_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKInit * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; 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; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = Init_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 71, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + js_invoke_function_ubuuuu(j_calls->instance_ptr, 71, (uint32_t)their_node_id_arr, msg_ref, 0, 0, 0, 0); } void handle_channel_reestablish_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKChannelReestablish * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; 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; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = ChannelReestablish_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 72, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + js_invoke_function_ubuuuu(j_calls->instance_ptr, 72, (uint32_t)their_node_id_arr, msg_ref, 0, 0, 0, 0); } void handle_channel_update_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKChannelUpdate * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; 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; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = ChannelUpdate_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 73, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + js_invoke_function_ubuuuu(j_calls->instance_ptr, 73, (uint32_t)their_node_id_arr, msg_ref, 0, 0, 0, 0); } void handle_error_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKErrorMessage * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; 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; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = ErrorMessage_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 74, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + js_invoke_function_ubuuuu(j_calls->instance_ptr, 74, (uint32_t)their_node_id_arr, msg_ref, 0, 0, 0, 0); } static void LDKChannelMessageHandler_JCalls_cloned(LDKChannelMessageHandler* new_obj) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) new_obj->this_arg; @@ -9839,238 +8606,254 @@ static inline LDKChannelMessageHandler LDKChannelMessageHandler_init (JSValue o, calls->MessageSendEventsProvider = ret.MessageSendEventsProvider.this_arg; return ret; } -long __attribute__((export_name("TS_LDKChannelMessageHandler_new"))) TS_LDKChannelMessageHandler_new(JSValue o, JSValue MessageSendEventsProvider) { +uint64_t __attribute__((export_name("TS_LDKChannelMessageHandler_new"))) TS_LDKChannelMessageHandler_new(JSValue o, JSValue MessageSendEventsProvider) { LDKChannelMessageHandler *res_ptr = MALLOC(sizeof(LDKChannelMessageHandler), "LDKChannelMessageHandler"); *res_ptr = LDKChannelMessageHandler_init(o, MessageSendEventsProvider); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_ChannelMessageHandler_handle_open_channel"))) TS_ChannelMessageHandler_handle_open_channel(uint64_t this_arg, int8_tArray their_node_id, uint64_t their_features, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); 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); + their_features_conv.inner = untag_ptr(their_features); + their_features_conv.is_owned = ptr_is_owned(their_features); CHECK_INNER_FIELD_ACCESS_OR_NULL(their_features_conv); their_features_conv = InitFeatures_clone(&their_features_conv); LDKOpenChannel msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; (this_arg_conv->handle_open_channel)(this_arg_conv->this_arg, their_node_id_ref, their_features_conv, &msg_conv); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_ChannelMessageHandler_handle_accept_channel"))) TS_ChannelMessageHandler_handle_accept_channel(uint64_t this_arg, int8_tArray their_node_id, uint64_t their_features, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); 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); + their_features_conv.inner = untag_ptr(their_features); + their_features_conv.is_owned = ptr_is_owned(their_features); CHECK_INNER_FIELD_ACCESS_OR_NULL(their_features_conv); their_features_conv = InitFeatures_clone(&their_features_conv); LDKAcceptChannel msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; (this_arg_conv->handle_accept_channel)(this_arg_conv->this_arg, their_node_id_ref, their_features_conv, &msg_conv); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_ChannelMessageHandler_handle_funding_created"))) TS_ChannelMessageHandler_handle_funding_created(uint64_t this_arg, int8_tArray their_node_id, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKFundingCreated msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; (this_arg_conv->handle_funding_created)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_ChannelMessageHandler_handle_funding_signed"))) TS_ChannelMessageHandler_handle_funding_signed(uint64_t this_arg, int8_tArray their_node_id, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKFundingSigned msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; (this_arg_conv->handle_funding_signed)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv); } -void __attribute__((export_name("TS_ChannelMessageHandler_handle_channel_ready"))) TS_ChannelMessageHandler_handle_channel_ready(uint32_t this_arg, int8_tArray their_node_id, uint32_t msg) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_ChannelMessageHandler_handle_channel_ready"))) TS_ChannelMessageHandler_handle_channel_ready(uint64_t this_arg, int8_tArray their_node_id, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKChannelReady msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; (this_arg_conv->handle_channel_ready)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_ChannelMessageHandler_handle_shutdown"))) TS_ChannelMessageHandler_handle_shutdown(uint64_t this_arg, int8_tArray their_node_id, uint64_t their_features, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKInitFeatures their_features_conv; - their_features_conv.inner = (void*)(their_features & (~1)); - their_features_conv.is_owned = false; + their_features_conv.inner = untag_ptr(their_features); + their_features_conv.is_owned = ptr_is_owned(their_features); CHECK_INNER_FIELD_ACCESS_OR_NULL(their_features_conv); + their_features_conv.is_owned = false; LDKShutdown msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; (this_arg_conv->handle_shutdown)(this_arg_conv->this_arg, their_node_id_ref, &their_features_conv, &msg_conv); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_ChannelMessageHandler_handle_closing_signed"))) TS_ChannelMessageHandler_handle_closing_signed(uint64_t this_arg, int8_tArray their_node_id, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKClosingSigned msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; (this_arg_conv->handle_closing_signed)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_ChannelMessageHandler_handle_update_add_htlc"))) TS_ChannelMessageHandler_handle_update_add_htlc(uint64_t this_arg, int8_tArray their_node_id, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKUpdateAddHTLC msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; (this_arg_conv->handle_update_add_htlc)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_ChannelMessageHandler_handle_update_fulfill_htlc"))) TS_ChannelMessageHandler_handle_update_fulfill_htlc(uint64_t this_arg, int8_tArray their_node_id, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKUpdateFulfillHTLC msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; (this_arg_conv->handle_update_fulfill_htlc)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_ChannelMessageHandler_handle_update_fail_htlc"))) TS_ChannelMessageHandler_handle_update_fail_htlc(uint64_t this_arg, int8_tArray their_node_id, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKUpdateFailHTLC msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; (this_arg_conv->handle_update_fail_htlc)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_ChannelMessageHandler_handle_update_fail_malformed_htlc"))) TS_ChannelMessageHandler_handle_update_fail_malformed_htlc(uint64_t this_arg, int8_tArray their_node_id, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKUpdateFailMalformedHTLC msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; (this_arg_conv->handle_update_fail_malformed_htlc)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_ChannelMessageHandler_handle_commitment_signed"))) TS_ChannelMessageHandler_handle_commitment_signed(uint64_t this_arg, int8_tArray their_node_id, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKCommitmentSigned msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; (this_arg_conv->handle_commitment_signed)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_ChannelMessageHandler_handle_revoke_and_ack"))) TS_ChannelMessageHandler_handle_revoke_and_ack(uint64_t this_arg, int8_tArray their_node_id, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKRevokeAndACK msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; (this_arg_conv->handle_revoke_and_ack)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_ChannelMessageHandler_handle_update_fee"))) TS_ChannelMessageHandler_handle_update_fee(uint64_t this_arg, int8_tArray their_node_id, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKUpdateFee msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; (this_arg_conv->handle_update_fee)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_ChannelMessageHandler_handle_announcement_signatures"))) TS_ChannelMessageHandler_handle_announcement_signatures(uint64_t this_arg, int8_tArray their_node_id, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKAnnouncementSignatures msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; (this_arg_conv->handle_announcement_signatures)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_ChannelMessageHandler_peer_disconnected"))) TS_ChannelMessageHandler_peer_disconnected(uint64_t this_arg, int8_tArray their_node_id, jboolean no_connection_possible) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); @@ -10078,59 +8861,63 @@ void __attribute__((export_name("TS_ChannelMessageHandler_peer_disconnected"))) (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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_ChannelMessageHandler_peer_connected"))) TS_ChannelMessageHandler_peer_connected(uint64_t this_arg, int8_tArray their_node_id, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKInit msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; (this_arg_conv->peer_connected)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_ChannelMessageHandler_handle_channel_reestablish"))) TS_ChannelMessageHandler_handle_channel_reestablish(uint64_t this_arg, int8_tArray their_node_id, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKChannelReestablish msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; (this_arg_conv->handle_channel_reestablish)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_ChannelMessageHandler_handle_channel_update"))) TS_ChannelMessageHandler_handle_channel_update(uint64_t this_arg, int8_tArray their_node_id, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKChannelUpdate msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; (this_arg_conv->handle_channel_update)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_ChannelMessageHandler_handle_error"))) TS_ChannelMessageHandler_handle_error(uint64_t this_arg, int8_tArray their_node_id, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKErrorMessage msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; (this_arg_conv->handle_error)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv); } @@ -10148,78 +8935,63 @@ 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; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = NodeAnnouncement_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 75, (uint32_t)msg_ref, 0, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + uint32_t ret = js_invoke_function_buuuuu(j_calls->instance_ptr, 75, msg_ref, 0, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_boolLightningErrorZ ret_conv = *(LDKCResult_boolLightningErrorZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } 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; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = ChannelAnnouncement_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 76, (uint32_t)msg_ref, 0, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + uint32_t ret = js_invoke_function_buuuuu(j_calls->instance_ptr, 76, msg_ref, 0, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_boolLightningErrorZ ret_conv = *(LDKCResult_boolLightningErrorZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } 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; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = ChannelUpdate_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 77, (uint32_t)msg_ref, 0, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + uint32_t ret = js_invoke_function_buuuuu(j_calls->instance_ptr, 77, msg_ref, 0, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_boolLightningErrorZ ret_conv = *(LDKCResult_boolLightningErrorZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ get_next_channel_announcements_LDKRoutingMessageHandler_jcall(const void* this_arg, uint64_t starting_point, uint8_t batch_amount) { LDKRoutingMessageHandler_JCalls *j_calls = (LDKRoutingMessageHandler_JCalls*) this_arg; int64_t starting_point_conv = starting_point; int8_t batch_amount_conv = batch_amount; - uint32_tArray ret = (uint32_tArray)js_invoke_function_buuuuu(j_calls->instance_ptr, 78, (uint32_t)starting_point_conv, (uint32_t)batch_amount_conv, 0, 0, 0, 0); + uint64_tArray ret = (uint64_tArray)js_invoke_function_buuuuu(j_calls->instance_ptr, 78, starting_point_conv, batch_amount_conv, 0, 0, 0, 0); LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ ret_constr; ret_constr.datalen = ret->arr_len; if (ret_constr.datalen > 0) ret_constr.data = MALLOC(ret_constr.datalen * sizeof(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ), "LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ Elements"); else ret_constr.data = NULL; - uint32_t* ret_vals = ret->elems; + uint64_t* ret_vals = ret->elems; for (size_t h = 0; h < ret_constr.datalen; h++) { - uint32_t ret_conv_59 = ret_vals[h]; - void* ret_conv_59_ptr = (void*)(((uintptr_t)ret_conv_59) & ~1); + uint64_t ret_conv_59 = ret_vals[h]; + void* ret_conv_59_ptr = untag_ptr(ret_conv_59); CHECK_ACCESS(ret_conv_59_ptr); LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ ret_conv_59_conv = *(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(ret_conv_59_ptr); - FREE((void*)ret_conv_59); + FREE(untag_ptr(ret_conv_59)); ret_constr.data[h] = ret_conv_59_conv; } FREE(ret); @@ -10230,19 +9002,19 @@ LDKCVec_NodeAnnouncementZ get_next_node_announcements_LDKRoutingMessageHandler_j int8_tArray starting_point_arr = init_int8_tArray(33, __LINE__); memcpy(starting_point_arr->elems, starting_point.compressed_form, 33); int8_t batch_amount_conv = batch_amount; - uint32_tArray ret = (uint32_tArray)js_invoke_function_uuuuuu(j_calls->instance_ptr, 79, (uint32_t)starting_point_arr, (uint32_t)batch_amount_conv, 0, 0, 0, 0); + uint64_tArray ret = (uint64_tArray)js_invoke_function_uuuuuu(j_calls->instance_ptr, 79, (uint32_t)starting_point_arr, batch_amount_conv, 0, 0, 0, 0); LDKCVec_NodeAnnouncementZ ret_constr; ret_constr.datalen = ret->arr_len; if (ret_constr.datalen > 0) ret_constr.data = MALLOC(ret_constr.datalen * sizeof(LDKNodeAnnouncement), "LDKCVec_NodeAnnouncementZ Elements"); else ret_constr.data = NULL; - uint32_t* ret_vals = ret->elems; + uint64_t* ret_vals = ret->elems; for (size_t s = 0; s < ret_constr.datalen; s++) { - uint32_t ret_conv_18 = ret_vals[s]; + uint64_t ret_conv_18 = ret_vals[s]; LDKNodeAnnouncement ret_conv_18_conv; - ret_conv_18_conv.inner = (void*)(ret_conv_18 & (~1)); - ret_conv_18_conv.is_owned = (ret_conv_18 & 1) || (ret_conv_18 == 0); + ret_conv_18_conv.inner = untag_ptr(ret_conv_18); + ret_conv_18_conv.is_owned = ptr_is_owned(ret_conv_18); CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_18_conv); ret_constr.data[s] = ret_conv_18_conv; } @@ -10254,35 +9026,25 @@ void peer_connected_LDKRoutingMessageHandler_jcall(const void* this_arg, LDKPubl 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; - uint32_t init_ref = 0; + uint64_t init_ref = 0; init_var = Init_clone(&init_var); - 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 = (uintptr_t)init_var.inner; - if (init_var.is_owned) { - init_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 80, (uint32_t)their_node_id_arr, (uint32_t)init_ref, 0, 0, 0, 0); + init_ref = tag_ptr(init_var.inner, init_var.is_owned); + js_invoke_function_ubuuuu(j_calls->instance_ptr, 80, (uint32_t)their_node_id_arr, init_ref, 0, 0, 0, 0); } LDKCResult_NoneLightningErrorZ handle_reply_channel_range_LDKRoutingMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, LDKReplyChannelRange msg) { LDKRoutingMessageHandler_JCalls *j_calls = (LDKRoutingMessageHandler_JCalls*) this_arg; 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; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 81, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + uint32_t ret = js_invoke_function_ubuuuu(j_calls->instance_ptr, 81, (uint32_t)their_node_id_arr, msg_ref, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_NoneLightningErrorZ ret_conv = *(LDKCResult_NoneLightningErrorZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } LDKCResult_NoneLightningErrorZ handle_reply_short_channel_ids_end_LDKRoutingMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, LDKReplyShortChannelIdsEnd msg) { @@ -10290,19 +9052,14 @@ LDKCResult_NoneLightningErrorZ handle_reply_short_channel_ids_end_LDKRoutingMess 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; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 82, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + uint32_t ret = js_invoke_function_ubuuuu(j_calls->instance_ptr, 82, (uint32_t)their_node_id_arr, msg_ref, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_NoneLightningErrorZ ret_conv = *(LDKCResult_NoneLightningErrorZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } LDKCResult_NoneLightningErrorZ handle_query_channel_range_LDKRoutingMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, LDKQueryChannelRange msg) { @@ -10310,19 +9067,14 @@ LDKCResult_NoneLightningErrorZ handle_query_channel_range_LDKRoutingMessageHandl 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; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 83, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + uint32_t ret = js_invoke_function_ubuuuu(j_calls->instance_ptr, 83, (uint32_t)their_node_id_arr, msg_ref, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_NoneLightningErrorZ ret_conv = *(LDKCResult_NoneLightningErrorZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } LDKCResult_NoneLightningErrorZ handle_query_short_channel_ids_LDKRoutingMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, LDKQueryShortChannelIds msg) { @@ -10330,19 +9082,14 @@ LDKCResult_NoneLightningErrorZ handle_query_short_channel_ids_LDKRoutingMessageH 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; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 84, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + uint32_t ret = js_invoke_function_ubuuuu(j_calls->instance_ptr, 84, (uint32_t)their_node_id_arr, msg_ref, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_NoneLightningErrorZ ret_conv = *(LDKCResult_NoneLightningErrorZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } static void LDKRoutingMessageHandler_JCalls_cloned(LDKRoutingMessageHandler* new_obj) { @@ -10373,89 +9120,87 @@ static inline LDKRoutingMessageHandler LDKRoutingMessageHandler_init (JSValue o, calls->MessageSendEventsProvider = ret.MessageSendEventsProvider.this_arg; return ret; } -long __attribute__((export_name("TS_LDKRoutingMessageHandler_new"))) TS_LDKRoutingMessageHandler_new(JSValue o, JSValue MessageSendEventsProvider) { +uint64_t __attribute__((export_name("TS_LDKRoutingMessageHandler_new"))) TS_LDKRoutingMessageHandler_new(JSValue o, JSValue MessageSendEventsProvider) { LDKRoutingMessageHandler *res_ptr = MALLOC(sizeof(LDKRoutingMessageHandler), "LDKRoutingMessageHandler"); *res_ptr = LDKRoutingMessageHandler_init(o, MessageSendEventsProvider); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_RoutingMessageHandler_handle_node_announcement"))) TS_RoutingMessageHandler_handle_node_announcement(uint64_t this_arg, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKRoutingMessageHandler* this_arg_conv = (LDKRoutingMessageHandler*)this_arg_ptr; LDKNodeAnnouncement msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_RoutingMessageHandler_handle_channel_announcement"))) TS_RoutingMessageHandler_handle_channel_announcement(uint64_t this_arg, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKRoutingMessageHandler* this_arg_conv = (LDKRoutingMessageHandler*)this_arg_ptr; LDKChannelAnnouncement msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_RoutingMessageHandler_handle_channel_update"))) TS_RoutingMessageHandler_handle_channel_update(uint64_t this_arg, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKRoutingMessageHandler* this_arg_conv = (LDKRoutingMessageHandler*)this_arg_ptr; LDKChannelUpdate msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_tArray __attribute__((export_name("TS_RoutingMessageHandler_get_next_channel_announcements"))) TS_RoutingMessageHandler_get_next_channel_announcements(uint64_t this_arg, int64_t starting_point, int8_t batch_amount) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t h = 0; h < ret_var.datalen; h++) { LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* ret_conv_59_conv = MALLOC(sizeof(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ), "LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ"); *ret_conv_59_conv = ret_var.data[h]; - ret_arr_ptr[h] = ((uint32_t)ret_conv_59_conv); + ret_arr_ptr[h] = tag_ptr(ret_conv_59_conv, true); } FREE(ret_var.data); return ret_arr; } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_tArray __attribute__((export_name("TS_RoutingMessageHandler_get_next_node_announcements"))) TS_RoutingMessageHandler_get_next_node_announcements(uint64_t this_arg, int8_tArray starting_point, int8_t batch_amount) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); 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, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t s = 0; s < ret_var.datalen; s++) { LDKNodeAnnouncement ret_conv_18_var = ret_var.data[s]; - uint32_t ret_conv_18_ref = 0; - 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. + uint64_t ret_conv_18_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_18_var); - ret_conv_18_ref = (uintptr_t)ret_conv_18_var.inner; - if (ret_conv_18_var.is_owned) { - ret_conv_18_ref |= 1; - } + ret_conv_18_ref = tag_ptr(ret_conv_18_var.inner, ret_conv_18_var.is_owned); ret_arr_ptr[s] = ret_conv_18_ref; } @@ -10463,86 +9208,87 @@ uint32_tArray __attribute__((export_name("TS_RoutingMessageHandler_get_next_nod return ret_arr; } -void __attribute__((export_name("TS_RoutingMessageHandler_peer_connected"))) TS_RoutingMessageHandler_peer_connected(uint32_t this_arg, int8_tArray their_node_id, uint32_t init) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_RoutingMessageHandler_peer_connected"))) TS_RoutingMessageHandler_peer_connected(uint64_t this_arg, int8_tArray their_node_id, uint64_t init) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKInit init_conv; - init_conv.inner = (void*)(init & (~1)); - init_conv.is_owned = false; + init_conv.inner = untag_ptr(init); + init_conv.is_owned = ptr_is_owned(init); CHECK_INNER_FIELD_ACCESS_OR_NULL(init_conv); + init_conv.is_owned = false; (this_arg_conv->peer_connected)(this_arg_conv->this_arg, their_node_id_ref, &init_conv); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_RoutingMessageHandler_handle_reply_channel_range"))) TS_RoutingMessageHandler_handle_reply_channel_range(uint64_t this_arg, int8_tArray their_node_id, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKReplyChannelRange msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = (msg & 1) || (msg == 0); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = ReplyChannelRange_clone(&msg_conv); LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = (this_arg_conv->handle_reply_channel_range)(this_arg_conv->this_arg, their_node_id_ref, msg_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_RoutingMessageHandler_handle_reply_short_channel_ids_end"))) TS_RoutingMessageHandler_handle_reply_short_channel_ids_end(uint64_t this_arg, int8_tArray their_node_id, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKReplyShortChannelIdsEnd msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = (msg & 1) || (msg == 0); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = ReplyShortChannelIdsEnd_clone(&msg_conv); LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = (this_arg_conv->handle_reply_short_channel_ids_end)(this_arg_conv->this_arg, their_node_id_ref, msg_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_RoutingMessageHandler_handle_query_channel_range"))) TS_RoutingMessageHandler_handle_query_channel_range(uint64_t this_arg, int8_tArray their_node_id, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKQueryChannelRange msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = (msg & 1) || (msg == 0); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = QueryChannelRange_clone(&msg_conv); LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = (this_arg_conv->handle_query_channel_range)(this_arg_conv->this_arg, their_node_id_ref, msg_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_RoutingMessageHandler_handle_query_short_channel_ids"))) TS_RoutingMessageHandler_handle_query_short_channel_ids(uint64_t this_arg, int8_tArray their_node_id, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKQueryShortChannelIds msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = (msg & 1) || (msg == 0); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = QueryShortChannelIds_clone(&msg_conv); LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = (this_arg_conv->handle_query_short_channel_ids)(this_arg_conv->this_arg, their_node_id_ref, msg_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } typedef struct LDKCustomMessageReader_JCalls { @@ -10561,11 +9307,11 @@ LDKCResult_COption_TypeZDecodeErrorZ read_LDKCustomMessageReader_jcall(const voi LDKu8slice buffer_var = buffer; int8_tArray buffer_arr = init_int8_tArray(buffer_var.datalen, __LINE__); memcpy(buffer_arr->elems, buffer_var.data, buffer_var.datalen); - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 85, (uint32_t)message_type_conv, (uint32_t)buffer_arr, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 85, message_type_conv, (uint32_t)buffer_arr, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_COption_TypeZDecodeErrorZ ret_conv = *(LDKCResult_COption_TypeZDecodeErrorZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } static void LDKCustomMessageReader_JCalls_cloned(LDKCustomMessageReader* new_obj) { @@ -10584,14 +9330,14 @@ static inline LDKCustomMessageReader LDKCustomMessageReader_init (JSValue o) { }; return ret; } -long __attribute__((export_name("TS_LDKCustomMessageReader_new"))) TS_LDKCustomMessageReader_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKCustomMessageReader_new"))) TS_LDKCustomMessageReader_new(JSValue o) { LDKCustomMessageReader *res_ptr = MALLOC(sizeof(LDKCustomMessageReader), "LDKCustomMessageReader"); *res_ptr = LDKCustomMessageReader_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_CustomMessageReader_read"))) TS_CustomMessageReader_read(uint64_t this_arg, int16_t message_type, int8_tArray buffer) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKCustomMessageReader* this_arg_conv = (LDKCustomMessageReader*)this_arg_ptr; LDKu8slice buffer_ref; buffer_ref.datalen = buffer->arr_len; @@ -10599,7 +9345,7 @@ uint32_t __attribute__((export_name("TS_CustomMessageReader_read"))) TS_CustomM LDKCResult_COption_TypeZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_TypeZDecodeErrorZ), "LDKCResult_COption_TypeZDecodeErrorZ"); *ret_conv = (this_arg_conv->read)(this_arg_conv->this_arg, message_type, buffer_ref); FREE(buffer); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } typedef struct LDKCustomMessageHandler_JCalls { @@ -10619,29 +9365,29 @@ LDKCResult_NoneLightningErrorZ handle_custom_message_LDKCustomMessageHandler_jca *msg_ret = msg; int8_tArray sender_node_id_arr = init_int8_tArray(33, __LINE__); memcpy(sender_node_id_arr->elems, sender_node_id.compressed_form, 33); - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 86, (uint32_t)(uint32_t)msg_ret, (uint32_t)sender_node_id_arr, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + uint32_t ret = js_invoke_function_buuuuu(j_calls->instance_ptr, 86, tag_ptr(msg_ret, true), (uint32_t)sender_node_id_arr, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_NoneLightningErrorZ ret_conv = *(LDKCResult_NoneLightningErrorZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } LDKCVec_C2Tuple_PublicKeyTypeZZ get_and_clear_pending_msg_LDKCustomMessageHandler_jcall(const void* this_arg) { LDKCustomMessageHandler_JCalls *j_calls = (LDKCustomMessageHandler_JCalls*) this_arg; - uint32_tArray ret = (uint32_tArray)js_invoke_function_uuuuuu(j_calls->instance_ptr, 87, 0, 0, 0, 0, 0, 0); + uint64_tArray ret = (uint64_tArray)js_invoke_function_uuuuuu(j_calls->instance_ptr, 87, 0, 0, 0, 0, 0, 0); LDKCVec_C2Tuple_PublicKeyTypeZZ ret_constr; ret_constr.datalen = ret->arr_len; if (ret_constr.datalen > 0) ret_constr.data = MALLOC(ret_constr.datalen * sizeof(LDKC2Tuple_PublicKeyTypeZ), "LDKCVec_C2Tuple_PublicKeyTypeZZ Elements"); else ret_constr.data = NULL; - uint32_t* ret_vals = ret->elems; + uint64_t* ret_vals = ret->elems; for (size_t z = 0; z < ret_constr.datalen; z++) { - uint32_t ret_conv_25 = ret_vals[z]; - void* ret_conv_25_ptr = (void*)(((uintptr_t)ret_conv_25) & ~1); + uint64_t ret_conv_25 = ret_vals[z]; + void* ret_conv_25_ptr = untag_ptr(ret_conv_25); CHECK_ACCESS(ret_conv_25_ptr); LDKC2Tuple_PublicKeyTypeZ ret_conv_25_conv = *(LDKC2Tuple_PublicKeyTypeZ*)(ret_conv_25_ptr); - FREE((void*)ret_conv_25); + FREE(untag_ptr(ret_conv_25)); ret_constr.data[z] = ret_conv_25_conv; } FREE(ret); @@ -10667,16 +9413,16 @@ static inline LDKCustomMessageHandler LDKCustomMessageHandler_init (JSValue o, J calls->CustomMessageReader = ret.CustomMessageReader.this_arg; return ret; } -long __attribute__((export_name("TS_LDKCustomMessageHandler_new"))) TS_LDKCustomMessageHandler_new(JSValue o, JSValue CustomMessageReader) { +uint64_t __attribute__((export_name("TS_LDKCustomMessageHandler_new"))) TS_LDKCustomMessageHandler_new(JSValue o, JSValue CustomMessageReader) { LDKCustomMessageHandler *res_ptr = MALLOC(sizeof(LDKCustomMessageHandler), "LDKCustomMessageHandler"); *res_ptr = LDKCustomMessageHandler_init(o, CustomMessageReader); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_CustomMessageHandler_handle_custom_message"))) TS_CustomMessageHandler_handle_custom_message(uint64_t this_arg, uint64_t msg, int8_tArray sender_node_id) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKCustomMessageHandler* this_arg_conv = (LDKCustomMessageHandler*)this_arg_ptr; - void* msg_ptr = (void*)(((uintptr_t)msg) & ~1); + void* msg_ptr = untag_ptr(msg); CHECK_ACCESS(msg_ptr); LDKType msg_conv = *(LDKType*)(msg_ptr); if (msg_conv.free == LDKType_JCalls_free) { @@ -10688,21 +9434,21 @@ uint32_t __attribute__((export_name("TS_CustomMessageHandler_handle_custom_mess 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_tArray __attribute__((export_name("TS_CustomMessageHandler_get_and_clear_pending_msg"))) TS_CustomMessageHandler_get_and_clear_pending_msg(uint64_t this_arg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t z = 0; z < ret_var.datalen; z++) { LDKC2Tuple_PublicKeyTypeZ* ret_conv_25_conv = MALLOC(sizeof(LDKC2Tuple_PublicKeyTypeZ), "LDKC2Tuple_PublicKeyTypeZ"); *ret_conv_25_conv = ret_var.data[z]; - ret_arr_ptr[z] = ((uint32_t)ret_conv_25_conv); + ret_arr_ptr[z] = tag_ptr(ret_conv_25_conv, true); } FREE(ret_var.data); @@ -10725,7 +9471,7 @@ uintptr_t send_data_LDKSocketDescriptor_jcall(void* this_arg, LDKu8slice data, b int8_tArray data_arr = init_int8_tArray(data_var.datalen, __LINE__); memcpy(data_arr->elems, data_var.data, data_var.datalen); jboolean resume_read_conv = resume_read; - return js_invoke_function_uuuuuu(j_calls->instance_ptr, 88, (uint32_t)data_arr, (uint32_t)resume_read_conv, 0, 0, 0, 0); + return js_invoke_function_uuuuuu(j_calls->instance_ptr, 88, (uint32_t)data_arr, resume_read_conv, 0, 0, 0, 0); } void disconnect_socket_LDKSocketDescriptor_jcall(void* this_arg) { LDKSocketDescriptor_JCalls *j_calls = (LDKSocketDescriptor_JCalls*) this_arg; @@ -10735,7 +9481,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_uuuuuu(j_calls->instance_ptr, 90, (uint32_t)(uint32_t)other_arg_clone, 0, 0, 0, 0, 0); + return js_invoke_function_buuuuu(j_calls->instance_ptr, 90, tag_ptr(other_arg_clone, true), 0, 0, 0, 0, 0); } uint64_t hash_LDKSocketDescriptor_jcall(const void* this_arg) { LDKSocketDescriptor_JCalls *j_calls = (LDKSocketDescriptor_JCalls*) this_arg; @@ -10761,14 +9507,14 @@ static inline LDKSocketDescriptor LDKSocketDescriptor_init (JSValue o) { }; return ret; } -long __attribute__((export_name("TS_LDKSocketDescriptor_new"))) TS_LDKSocketDescriptor_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKSocketDescriptor_new"))) TS_LDKSocketDescriptor_new(JSValue o) { LDKSocketDescriptor *res_ptr = MALLOC(sizeof(LDKSocketDescriptor), "LDKSocketDescriptor"); *res_ptr = LDKSocketDescriptor_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -uint32_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); } +uint32_t __attribute__((export_name("TS_SocketDescriptor_send_data"))) TS_SocketDescriptor_send_data(uint64_t this_arg, int8_tArray data, jboolean resume_read) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKSocketDescriptor* this_arg_conv = (LDKSocketDescriptor*)this_arg_ptr; LDKu8slice data_ref; data_ref.datalen = data->arr_len; @@ -10778,23 +9524,23 @@ uint32_t __attribute__((export_name("TS_SocketDescriptor_send_data"))) TS_Socke return ret_conv; } -void __attribute__((export_name("TS_SocketDescriptor_disconnect_socket"))) TS_SocketDescriptor_disconnect_socket(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_SocketDescriptor_disconnect_socket"))) TS_SocketDescriptor_disconnect_socket(uint64_t this_arg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +int64_t __attribute__((export_name("TS_SocketDescriptor_hash"))) TS_SocketDescriptor_hash(uint64_t this_arg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKSocketDescriptor* this_arg_conv = (LDKSocketDescriptor*)this_arg_ptr; int64_t ret_conv = (this_arg_conv->hash)(this_arg_conv->this_arg); return ret_conv; } -uint32_t __attribute__((export_name("TS_LDKEffectiveCapacity_ty_from_ptr"))) TS_LDKEffectiveCapacity_ty_from_ptr(uint32_t ptr) { - LDKEffectiveCapacity *obj = (LDKEffectiveCapacity*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKEffectiveCapacity_ty_from_ptr"))) TS_LDKEffectiveCapacity_ty_from_ptr(uint64_t ptr) { + LDKEffectiveCapacity *obj = (LDKEffectiveCapacity*)untag_ptr(ptr); switch(obj->tag) { case LDKEffectiveCapacity_ExactLiquidity: return 0; case LDKEffectiveCapacity_MaximumHTLC: return 1; @@ -10804,28 +9550,28 @@ uint32_t __attribute__((export_name("TS_LDKEffectiveCapacity_ty_from_ptr"))) TS_ default: abort(); } } -int64_t __attribute__((export_name("TS_LDKEffectiveCapacity_ExactLiquidity_get_liquidity_msat"))) TS_LDKEffectiveCapacity_ExactLiquidity_get_liquidity_msat(uint32_t ptr) { - LDKEffectiveCapacity *obj = (LDKEffectiveCapacity*)(ptr & ~1); +int64_t __attribute__((export_name("TS_LDKEffectiveCapacity_ExactLiquidity_get_liquidity_msat"))) TS_LDKEffectiveCapacity_ExactLiquidity_get_liquidity_msat(uint64_t ptr) { + LDKEffectiveCapacity *obj = (LDKEffectiveCapacity*)untag_ptr(ptr); assert(obj->tag == LDKEffectiveCapacity_ExactLiquidity); int64_t liquidity_msat_conv = obj->exact_liquidity.liquidity_msat; return liquidity_msat_conv; } -int64_t __attribute__((export_name("TS_LDKEffectiveCapacity_MaximumHTLC_get_amount_msat"))) TS_LDKEffectiveCapacity_MaximumHTLC_get_amount_msat(uint32_t ptr) { - LDKEffectiveCapacity *obj = (LDKEffectiveCapacity*)(ptr & ~1); +int64_t __attribute__((export_name("TS_LDKEffectiveCapacity_MaximumHTLC_get_amount_msat"))) TS_LDKEffectiveCapacity_MaximumHTLC_get_amount_msat(uint64_t ptr) { + LDKEffectiveCapacity *obj = (LDKEffectiveCapacity*)untag_ptr(ptr); assert(obj->tag == LDKEffectiveCapacity_MaximumHTLC); int64_t amount_msat_conv = obj->maximum_htlc.amount_msat; return amount_msat_conv; } -int64_t __attribute__((export_name("TS_LDKEffectiveCapacity_Total_get_capacity_msat"))) TS_LDKEffectiveCapacity_Total_get_capacity_msat(uint32_t ptr) { - LDKEffectiveCapacity *obj = (LDKEffectiveCapacity*)(ptr & ~1); +int64_t __attribute__((export_name("TS_LDKEffectiveCapacity_Total_get_capacity_msat"))) TS_LDKEffectiveCapacity_Total_get_capacity_msat(uint64_t ptr) { + LDKEffectiveCapacity *obj = (LDKEffectiveCapacity*)untag_ptr(ptr); assert(obj->tag == LDKEffectiveCapacity_Total); int64_t capacity_msat_conv = obj->total.capacity_msat; return capacity_msat_conv; } -uint32_t __attribute__((export_name("TS_LDKEffectiveCapacity_Total_get_htlc_maximum_msat"))) TS_LDKEffectiveCapacity_Total_get_htlc_maximum_msat(uint32_t ptr) { - LDKEffectiveCapacity *obj = (LDKEffectiveCapacity*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKEffectiveCapacity_Total_get_htlc_maximum_msat"))) TS_LDKEffectiveCapacity_Total_get_htlc_maximum_msat(uint64_t ptr) { + LDKEffectiveCapacity *obj = (LDKEffectiveCapacity*)untag_ptr(ptr); assert(obj->tag == LDKEffectiveCapacity_Total); - uint32_t htlc_maximum_msat_ref = ((uintptr_t)&obj->total.htlc_maximum_msat) | 1; + uint64_t htlc_maximum_msat_ref = tag_ptr(&obj->total.htlc_maximum_msat, false); return htlc_maximum_msat_ref; } typedef struct LDKLockableScore_JCalls { @@ -10841,7 +9587,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_uuuuuu(j_calls->instance_ptr, 92, 0, 0, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKScore ret_conv = *(LDKScore*)(ret_ptr); if (ret_conv.free == LDKScore_JCalls_free) { @@ -10867,22 +9613,22 @@ static inline LDKLockableScore LDKLockableScore_init (JSValue o) { }; return ret; } -long __attribute__((export_name("TS_LDKLockableScore_new"))) TS_LDKLockableScore_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKLockableScore_new"))) TS_LDKLockableScore_new(JSValue o) { LDKLockableScore *res_ptr = MALLOC(sizeof(LDKLockableScore), "LDKLockableScore"); *res_ptr = LDKLockableScore_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -uint32_t __attribute__((export_name("TS_LockableScore_lock"))) TS_LockableScore_lock(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_LockableScore_lock"))) TS_LockableScore_lock(uint64_t this_arg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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 (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_t __attribute__((export_name("TS_LDKFallback_ty_from_ptr"))) TS_LDKFallback_ty_from_ptr(uint32_t ptr) { - LDKFallback *obj = (LDKFallback*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKFallback_ty_from_ptr"))) TS_LDKFallback_ty_from_ptr(uint64_t ptr) { + LDKFallback *obj = (LDKFallback*)untag_ptr(ptr); switch(obj->tag) { case LDKFallback_SegWitProgram: return 0; case LDKFallback_PubKeyHash: return 1; @@ -10890,29 +9636,29 @@ uint32_t __attribute__((export_name("TS_LDKFallback_ty_from_ptr"))) TS_LDKFallba default: abort(); } } -int8_t __attribute__((export_name("TS_LDKFallback_SegWitProgram_get_version"))) TS_LDKFallback_SegWitProgram_get_version(uint32_t ptr) { - LDKFallback *obj = (LDKFallback*)(ptr & ~1); +int8_t __attribute__((export_name("TS_LDKFallback_SegWitProgram_get_version"))) TS_LDKFallback_SegWitProgram_get_version(uint64_t ptr) { + LDKFallback *obj = (LDKFallback*)untag_ptr(ptr); assert(obj->tag == LDKFallback_SegWitProgram); uint8_t version_val = obj->seg_wit_program.version._0; return version_val; } -int8_tArray __attribute__((export_name("TS_LDKFallback_SegWitProgram_get_program"))) TS_LDKFallback_SegWitProgram_get_program(uint32_t ptr) { - LDKFallback *obj = (LDKFallback*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKFallback_SegWitProgram_get_program"))) TS_LDKFallback_SegWitProgram_get_program(uint64_t ptr) { + LDKFallback *obj = (LDKFallback*)untag_ptr(ptr); assert(obj->tag == LDKFallback_SegWitProgram); LDKCVec_u8Z program_var = obj->seg_wit_program.program; int8_tArray program_arr = init_int8_tArray(program_var.datalen, __LINE__); memcpy(program_arr->elems, program_var.data, program_var.datalen); return program_arr; } -int8_tArray __attribute__((export_name("TS_LDKFallback_PubKeyHash_get_pub_key_hash"))) TS_LDKFallback_PubKeyHash_get_pub_key_hash(uint32_t ptr) { - LDKFallback *obj = (LDKFallback*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKFallback_PubKeyHash_get_pub_key_hash"))) TS_LDKFallback_PubKeyHash_get_pub_key_hash(uint64_t ptr) { + LDKFallback *obj = (LDKFallback*)untag_ptr(ptr); assert(obj->tag == LDKFallback_PubKeyHash); int8_tArray pub_key_hash_arr = init_int8_tArray(20, __LINE__); memcpy(pub_key_hash_arr->elems, obj->pub_key_hash.data, 20); return pub_key_hash_arr; } -int8_tArray __attribute__((export_name("TS_LDKFallback_ScriptHash_get_script_hash"))) TS_LDKFallback_ScriptHash_get_script_hash(uint32_t ptr) { - LDKFallback *obj = (LDKFallback*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKFallback_ScriptHash_get_script_hash"))) TS_LDKFallback_ScriptHash_get_script_hash(uint64_t ptr) { + LDKFallback *obj = (LDKFallback*)untag_ptr(ptr); assert(obj->tag == LDKFallback_ScriptHash); int8_tArray script_hash_arr = init_int8_tArray(20, __LINE__); memcpy(script_hash_arr->elems, obj->script_hash.data, 20); @@ -10938,19 +9684,19 @@ LDKPublicKey node_id_LDKPayer_jcall(const void* this_arg) { } LDKCVec_ChannelDetailsZ first_hops_LDKPayer_jcall(const void* this_arg) { LDKPayer_JCalls *j_calls = (LDKPayer_JCalls*) this_arg; - uint32_tArray ret = (uint32_tArray)js_invoke_function_uuuuuu(j_calls->instance_ptr, 94, 0, 0, 0, 0, 0, 0); + uint64_tArray ret = (uint64_tArray)js_invoke_function_uuuuuu(j_calls->instance_ptr, 94, 0, 0, 0, 0, 0, 0); LDKCVec_ChannelDetailsZ ret_constr; ret_constr.datalen = ret->arr_len; if (ret_constr.datalen > 0) ret_constr.data = MALLOC(ret_constr.datalen * sizeof(LDKChannelDetails), "LDKCVec_ChannelDetailsZ Elements"); else ret_constr.data = NULL; - uint32_t* ret_vals = ret->elems; + uint64_t* ret_vals = ret->elems; for (size_t q = 0; q < ret_constr.datalen; q++) { - uint32_t ret_conv_16 = ret_vals[q]; + uint64_t ret_conv_16 = ret_vals[q]; LDKChannelDetails ret_conv_16_conv; - ret_conv_16_conv.inner = (void*)(ret_conv_16 & (~1)); - ret_conv_16_conv.is_owned = (ret_conv_16 & 1) || (ret_conv_16 == 0); + ret_conv_16_conv.inner = untag_ptr(ret_conv_16); + ret_conv_16_conv.is_owned = ptr_is_owned(ret_conv_16); CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_16_conv); ret_constr.data[q] = ret_conv_16_conv; } @@ -10960,66 +9706,51 @@ LDKCVec_ChannelDetailsZ first_hops_LDKPayer_jcall(const void* this_arg) { LDKCResult_PaymentIdPaymentSendFailureZ send_payment_LDKPayer_jcall(const void* this_arg, const LDKRoute * route, LDKThirtyTwoBytes payment_hash, LDKThirtyTwoBytes payment_secret) { LDKPayer_JCalls *j_calls = (LDKPayer_JCalls*) this_arg; LDKRoute route_var = *route; - uint32_t route_ref = 0; + uint64_t route_ref = 0; route_var = Route_clone(&route_var); - CHECK((((uintptr_t)route_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&route_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(route_var); - route_ref = (uintptr_t)route_var.inner; - if (route_var.is_owned) { - route_ref |= 1; - } + route_ref = tag_ptr(route_var.inner, route_var.is_owned); int8_tArray payment_hash_arr = init_int8_tArray(32, __LINE__); memcpy(payment_hash_arr->elems, payment_hash.data, 32); int8_tArray payment_secret_arr = init_int8_tArray(32, __LINE__); memcpy(payment_secret_arr->elems, payment_secret.data, 32); - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 95, (uint32_t)route_ref, (uint32_t)payment_hash_arr, (uint32_t)payment_secret_arr, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + uint32_t ret = js_invoke_function_buuuuu(j_calls->instance_ptr, 95, route_ref, (uint32_t)payment_hash_arr, (uint32_t)payment_secret_arr, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_PaymentIdPaymentSendFailureZ ret_conv = *(LDKCResult_PaymentIdPaymentSendFailureZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } LDKCResult_PaymentIdPaymentSendFailureZ send_spontaneous_payment_LDKPayer_jcall(const void* this_arg, const LDKRoute * route, LDKThirtyTwoBytes payment_preimage) { LDKPayer_JCalls *j_calls = (LDKPayer_JCalls*) this_arg; LDKRoute route_var = *route; - uint32_t route_ref = 0; + uint64_t route_ref = 0; route_var = Route_clone(&route_var); - CHECK((((uintptr_t)route_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&route_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(route_var); - route_ref = (uintptr_t)route_var.inner; - if (route_var.is_owned) { - route_ref |= 1; - } + route_ref = tag_ptr(route_var.inner, route_var.is_owned); int8_tArray payment_preimage_arr = init_int8_tArray(32, __LINE__); memcpy(payment_preimage_arr->elems, payment_preimage.data, 32); - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 96, (uint32_t)route_ref, (uint32_t)payment_preimage_arr, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + uint32_t ret = js_invoke_function_buuuuu(j_calls->instance_ptr, 96, route_ref, (uint32_t)payment_preimage_arr, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_PaymentIdPaymentSendFailureZ ret_conv = *(LDKCResult_PaymentIdPaymentSendFailureZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } LDKCResult_NonePaymentSendFailureZ retry_payment_LDKPayer_jcall(const void* this_arg, const LDKRoute * route, LDKThirtyTwoBytes payment_id) { LDKPayer_JCalls *j_calls = (LDKPayer_JCalls*) this_arg; LDKRoute route_var = *route; - uint32_t route_ref = 0; + uint64_t route_ref = 0; route_var = Route_clone(&route_var); - CHECK((((uintptr_t)route_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&route_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(route_var); - route_ref = (uintptr_t)route_var.inner; - if (route_var.is_owned) { - route_ref |= 1; - } + route_ref = tag_ptr(route_var.inner, route_var.is_owned); int8_tArray payment_id_arr = init_int8_tArray(32, __LINE__); memcpy(payment_id_arr->elems, payment_id.data, 32); - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 97, (uint32_t)route_ref, (uint32_t)payment_id_arr, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + uint32_t ret = js_invoke_function_buuuuu(j_calls->instance_ptr, 97, route_ref, (uint32_t)payment_id_arr, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_NonePaymentSendFailureZ ret_conv = *(LDKCResult_NonePaymentSendFailureZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } void abandon_payment_LDKPayer_jcall(const void* this_arg, LDKThirtyTwoBytes payment_id) { @@ -11049,38 +9780,33 @@ static inline LDKPayer LDKPayer_init (JSValue o) { }; return ret; } -long __attribute__((export_name("TS_LDKPayer_new"))) TS_LDKPayer_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKPayer_new"))) TS_LDKPayer_new(JSValue o) { LDKPayer *res_ptr = MALLOC(sizeof(LDKPayer), "LDKPayer"); *res_ptr = LDKPayer_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -int8_tArray __attribute__((export_name("TS_Payer_node_id"))) TS_Payer_node_id(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +int8_tArray __attribute__((export_name("TS_Payer_node_id"))) TS_Payer_node_id(uint64_t this_arg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKPayer* this_arg_conv = (LDKPayer*)this_arg_ptr; int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, (this_arg_conv->node_id)(this_arg_conv->this_arg).compressed_form, 33); return ret_arr; } -uint32_tArray __attribute__((export_name("TS_Payer_first_hops"))) TS_Payer_first_hops(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_tArray __attribute__((export_name("TS_Payer_first_hops"))) TS_Payer_first_hops(uint64_t this_arg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKPayer* this_arg_conv = (LDKPayer*)this_arg_ptr; LDKCVec_ChannelDetailsZ ret_var = (this_arg_conv->first_hops)(this_arg_conv->this_arg); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t q = 0; q < ret_var.datalen; q++) { LDKChannelDetails ret_conv_16_var = ret_var.data[q]; - uint32_t ret_conv_16_ref = 0; - 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. + uint64_t ret_conv_16_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_16_var); - ret_conv_16_ref = (uintptr_t)ret_conv_16_var.inner; - if (ret_conv_16_var.is_owned) { - ret_conv_16_ref |= 1; - } + ret_conv_16_ref = tag_ptr(ret_conv_16_var.inner, ret_conv_16_var.is_owned); ret_arr_ptr[q] = ret_conv_16_ref; } @@ -11088,14 +9814,15 @@ uint32_tArray __attribute__((export_name("TS_Payer_first_hops"))) TS_Payer_firs return ret_arr; } -uint32_t __attribute__((export_name("TS_Payer_send_payment"))) TS_Payer_send_payment(uint32_t this_arg, uint32_t route, int8_tArray payment_hash, int8_tArray payment_secret) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_Payer_send_payment"))) TS_Payer_send_payment(uint64_t this_arg, uint64_t route, int8_tArray payment_hash, int8_tArray payment_secret) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKPayer* this_arg_conv = (LDKPayer*)this_arg_ptr; LDKRoute route_conv; - route_conv.inner = (void*)(route & (~1)); - route_conv.is_owned = false; + route_conv.inner = untag_ptr(route); + route_conv.is_owned = ptr_is_owned(route); CHECK_INNER_FIELD_ACCESS_OR_NULL(route_conv); + route_conv.is_owned = false; LDKThirtyTwoBytes payment_hash_ref; CHECK(payment_hash->arr_len == 32); memcpy(payment_hash_ref.data, payment_hash->elems, 32); FREE(payment_hash); @@ -11104,44 +9831,46 @@ uint32_t __attribute__((export_name("TS_Payer_send_payment"))) TS_Payer_send_pa memcpy(payment_secret_ref.data, payment_secret->elems, 32); FREE(payment_secret); LDKCResult_PaymentIdPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentSendFailureZ), "LDKCResult_PaymentIdPaymentSendFailureZ"); *ret_conv = (this_arg_conv->send_payment)(this_arg_conv->this_arg, &route_conv, payment_hash_ref, payment_secret_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_Payer_send_spontaneous_payment"))) TS_Payer_send_spontaneous_payment(uint32_t this_arg, uint32_t route, int8_tArray payment_preimage) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_Payer_send_spontaneous_payment"))) TS_Payer_send_spontaneous_payment(uint64_t this_arg, uint64_t route, int8_tArray payment_preimage) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKPayer* this_arg_conv = (LDKPayer*)this_arg_ptr; LDKRoute route_conv; - route_conv.inner = (void*)(route & (~1)); - route_conv.is_owned = false; + route_conv.inner = untag_ptr(route); + route_conv.is_owned = ptr_is_owned(route); CHECK_INNER_FIELD_ACCESS_OR_NULL(route_conv); + route_conv.is_owned = false; LDKThirtyTwoBytes payment_preimage_ref; CHECK(payment_preimage->arr_len == 32); memcpy(payment_preimage_ref.data, payment_preimage->elems, 32); FREE(payment_preimage); LDKCResult_PaymentIdPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentSendFailureZ), "LDKCResult_PaymentIdPaymentSendFailureZ"); *ret_conv = (this_arg_conv->send_spontaneous_payment)(this_arg_conv->this_arg, &route_conv, payment_preimage_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_Payer_retry_payment"))) TS_Payer_retry_payment(uint32_t this_arg, uint32_t route, int8_tArray payment_id) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_Payer_retry_payment"))) TS_Payer_retry_payment(uint64_t this_arg, uint64_t route, int8_tArray payment_id) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKPayer* this_arg_conv = (LDKPayer*)this_arg_ptr; LDKRoute route_conv; - route_conv.inner = (void*)(route & (~1)); - route_conv.is_owned = false; + route_conv.inner = untag_ptr(route); + route_conv.is_owned = ptr_is_owned(route); CHECK_INNER_FIELD_ACCESS_OR_NULL(route_conv); + route_conv.is_owned = false; LDKThirtyTwoBytes payment_id_ref; CHECK(payment_id->arr_len == 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 = (this_arg_conv->retry_payment)(this_arg_conv->this_arg, &route_conv, payment_id_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_Payer_abandon_payment"))) TS_Payer_abandon_payment(uint32_t this_arg, int8_tArray payment_id) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_Payer_abandon_payment"))) TS_Payer_abandon_payment(uint64_t this_arg, int8_tArray payment_id) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKPayer* this_arg_conv = (LDKPayer*)this_arg_ptr; LDKThirtyTwoBytes payment_id_ref; CHECK(payment_id->arr_len == 32); @@ -11164,44 +9893,34 @@ LDKCResult_RouteLightningErrorZ find_route_LDKRouter_jcall(const void* this_arg, int8_tArray payer_arr = init_int8_tArray(33, __LINE__); memcpy(payer_arr->elems, payer.compressed_form, 33); LDKRouteParameters route_params_var = *route_params; - uint32_t route_params_ref = 0; + uint64_t route_params_ref = 0; route_params_var = RouteParameters_clone(&route_params_var); - CHECK((((uintptr_t)route_params_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&route_params_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(route_params_var); - route_params_ref = (uintptr_t)route_params_var.inner; - if (route_params_var.is_owned) { - route_params_ref |= 1; - } + route_params_ref = tag_ptr(route_params_var.inner, route_params_var.is_owned); int8_tArray payment_hash_arr = init_int8_tArray(32, __LINE__); memcpy(payment_hash_arr->elems, *payment_hash, 32); LDKCVec_ChannelDetailsZ *first_hops_var_ptr = first_hops; - uint32_tArray first_hops_arr = NULL; + uint64_tArray first_hops_arr = NULL; if (first_hops != NULL) { LDKCVec_ChannelDetailsZ first_hops_var = *first_hops_var_ptr; - first_hops_arr = init_uint32_tArray(first_hops_var.datalen, __LINE__); - uint32_t *first_hops_arr_ptr = (uint32_t*)(((uint8_t*)first_hops_arr) + 8); + first_hops_arr = init_uint64_tArray(first_hops_var.datalen, __LINE__); + uint64_t *first_hops_arr_ptr = (uint64_t*)(((uint8_t*)first_hops_arr) + 8); for (size_t q = 0; q < first_hops_var.datalen; q++) { LDKChannelDetails first_hops_conv_16_var = first_hops_var.data[q]; - uint32_t first_hops_conv_16_ref = 0; - CHECK((((uintptr_t)first_hops_conv_16_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&first_hops_conv_16_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t first_hops_conv_16_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(first_hops_conv_16_var); - first_hops_conv_16_ref = (uintptr_t)first_hops_conv_16_var.inner; - if (first_hops_conv_16_var.is_owned) { - first_hops_conv_16_ref |= 1; - } + first_hops_conv_16_ref = tag_ptr(first_hops_conv_16_var.inner, first_hops_conv_16_var.is_owned); first_hops_arr_ptr[q] = first_hops_conv_16_ref; } } // WARNING: This object doesn't live past this scope, needs clone! - uint32_t ret_scorer = ((uintptr_t)scorer) | 1; - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 99, (uint32_t)payer_arr, (uint32_t)route_params_ref, (uint32_t)payment_hash_arr, (uint32_t)first_hops_arr, (uint32_t)ret_scorer, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + uint64_t ret_scorer = tag_ptr(scorer, false); + uint32_t ret = js_invoke_function_ubuubu(j_calls->instance_ptr, 99, (uint32_t)payer_arr, route_params_ref, (uint32_t)payment_hash_arr, (uint32_t)first_hops_arr, ret_scorer, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_RouteLightningErrorZ ret_conv = *(LDKCResult_RouteLightningErrorZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } static void LDKRouter_JCalls_cloned(LDKRouter* new_obj) { @@ -11220,22 +9939,23 @@ static inline LDKRouter LDKRouter_init (JSValue o) { }; return ret; } -long __attribute__((export_name("TS_LDKRouter_new"))) TS_LDKRouter_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKRouter_new"))) TS_LDKRouter_new(JSValue o) { LDKRouter *res_ptr = MALLOC(sizeof(LDKRouter), "LDKRouter"); *res_ptr = LDKRouter_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -uint32_t __attribute__((export_name("TS_Router_find_route"))) TS_Router_find_route(uint32_t this_arg, int8_tArray payer, uint32_t route_params, int8_tArray payment_hash, uint32_tArray first_hops, uint32_t scorer) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_Router_find_route"))) TS_Router_find_route(uint64_t this_arg, int8_tArray payer, uint64_t route_params, int8_tArray payment_hash, uint64_tArray first_hops, uint64_t scorer) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKRouter* this_arg_conv = (LDKRouter*)this_arg_ptr; LDKPublicKey payer_ref; CHECK(payer->arr_len == 33); memcpy(payer_ref.compressed_form, payer->elems, 33); FREE(payer); LDKRouteParameters route_params_conv; - route_params_conv.inner = (void*)(route_params & (~1)); - route_params_conv.is_owned = false; + route_params_conv.inner = untag_ptr(route_params); + route_params_conv.is_owned = ptr_is_owned(route_params); CHECK_INNER_FIELD_ACCESS_OR_NULL(route_params_conv); + route_params_conv.is_owned = false; unsigned char payment_hash_arr[32]; CHECK(payment_hash->arr_len == 32); memcpy(payment_hash_arr, payment_hash->elems, 32); FREE(payment_hash); @@ -11248,36 +9968,37 @@ uint32_t __attribute__((export_name("TS_Router_find_route"))) TS_Router_find_ro first_hops_constr.data = MALLOC(first_hops_constr.datalen * sizeof(LDKChannelDetails), "LDKCVec_ChannelDetailsZ Elements"); else first_hops_constr.data = NULL; - uint32_t* first_hops_vals = first_hops->elems; + uint64_t* first_hops_vals = first_hops->elems; for (size_t q = 0; q < first_hops_constr.datalen; q++) { - uint32_t first_hops_conv_16 = first_hops_vals[q]; + uint64_t first_hops_conv_16 = first_hops_vals[q]; LDKChannelDetails first_hops_conv_16_conv; - first_hops_conv_16_conv.inner = (void*)(first_hops_conv_16 & (~1)); - first_hops_conv_16_conv.is_owned = (first_hops_conv_16 & 1) || (first_hops_conv_16 == 0); + first_hops_conv_16_conv.inner = untag_ptr(first_hops_conv_16); + first_hops_conv_16_conv.is_owned = ptr_is_owned(first_hops_conv_16); CHECK_INNER_FIELD_ACCESS_OR_NULL(first_hops_conv_16_conv); + first_hops_conv_16_conv.is_owned = false; first_hops_constr.data[q] = first_hops_conv_16_conv; } FREE(first_hops); first_hops_ptr = &first_hops_constr; } - void* scorer_ptr = (void*)(((uintptr_t)scorer) & ~1); - if (!(scorer & 1)) { CHECK_ACCESS(scorer_ptr); } + void* scorer_ptr = untag_ptr(scorer); + if (ptr_is_owned(scorer)) { CHECK_ACCESS(scorer_ptr); } LDKScore* scorer_conv = (LDKScore*)scorer_ptr; LDKCResult_RouteLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteLightningErrorZ), "LDKCResult_RouteLightningErrorZ"); *ret_conv = (this_arg_conv->find_route)(this_arg_conv->this_arg, payer_ref, &route_params_conv, payment_hash_ref, first_hops_ptr, scorer_conv); if (first_hops_ptr != NULL) { FREE(first_hops_constr.data); } - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_LDKRetry_ty_from_ptr"))) TS_LDKRetry_ty_from_ptr(uint32_t ptr) { - LDKRetry *obj = (LDKRetry*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKRetry_ty_from_ptr"))) TS_LDKRetry_ty_from_ptr(uint64_t ptr) { + LDKRetry *obj = (LDKRetry*)untag_ptr(ptr); switch(obj->tag) { case LDKRetry_Attempts: return 0; default: abort(); } } -uint32_t __attribute__((export_name("TS_LDKRetry_Attempts_get_attempts"))) TS_LDKRetry_Attempts_get_attempts(uint32_t ptr) { - LDKRetry *obj = (LDKRetry*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKRetry_Attempts_get_attempts"))) TS_LDKRetry_Attempts_get_attempts(uint64_t ptr) { + LDKRetry *obj = (LDKRetry*)untag_ptr(ptr); assert(obj->tag == LDKRetry_Attempts); uint32_t attempts_conv = obj->attempts; return attempts_conv; @@ -11296,32 +10017,32 @@ jstring __attribute__((export_name("TS__ldk_c_bindings_get_compiled_version"))) return ret_conv; } -static inline uintptr_t Bech32Error_clone_ptr(LDKBech32Error *NONNULL_PTR arg) { +static inline uint64_t Bech32Error_clone_ptr(LDKBech32Error *NONNULL_PTR arg) { LDKBech32Error *ret_copy = MALLOC(sizeof(LDKBech32Error), "LDKBech32Error"); *ret_copy = Bech32Error_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Bech32Error_clone_ptr"))) TS_Bech32Error_clone_ptr(uint32_t arg) { - LDKBech32Error* arg_conv = (LDKBech32Error*)arg; - uint32_t ret_conv = Bech32Error_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_Bech32Error_clone_ptr"))) TS_Bech32Error_clone_ptr(uint64_t arg) { + LDKBech32Error* arg_conv = (LDKBech32Error*)untag_ptr(arg); + int64_t ret_conv = Bech32Error_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_Bech32Error_clone"))) TS_Bech32Error_clone(uint32_t orig) { - LDKBech32Error* orig_conv = (LDKBech32Error*)orig; +uint64_t __attribute__((export_name("TS_Bech32Error_clone"))) TS_Bech32Error_clone(uint64_t orig) { + LDKBech32Error* orig_conv = (LDKBech32Error*)untag_ptr(orig); LDKBech32Error *ret_copy = MALLOC(sizeof(LDKBech32Error), "LDKBech32Error"); *ret_copy = Bech32Error_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_Bech32Error_free"))) TS_Bech32Error_free(uint32_t o) { - if ((o & 1) != 0) return; - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +void __attribute__((export_name("TS_Bech32Error_free"))) TS_Bech32Error_free(uint64_t o) { + if (!ptr_is_owned(o)) return; + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKBech32Error o_conv = *(LDKBech32Error*)(o_ptr); - FREE((void*)o); + FREE(untag_ptr(o)); Bech32Error_free(o_conv); } @@ -11334,41 +10055,41 @@ void __attribute__((export_name("TS_Transaction_free"))) TS_Transaction_free(in Transaction_free(_res_ref); } -uint32_t __attribute__((export_name("TS_TxOut_new"))) TS_TxOut_new(int8_tArray script_pubkey, int64_t value) { +uint64_t __attribute__((export_name("TS_TxOut_new"))) TS_TxOut_new(int8_tArray script_pubkey, int64_t value) { 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); FREE(script_pubkey); LDKTxOut* ret_ref = MALLOC(sizeof(LDKTxOut), "LDKTxOut"); *ret_ref = TxOut_new(script_pubkey_ref, value); - return (uint32_t)ret_ref; + return tag_ptr(ret_ref, true); } -void __attribute__((export_name("TS_TxOut_free"))) TS_TxOut_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_TxOut_free"))) TS_TxOut_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKTxOut _res_conv = *(LDKTxOut*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); TxOut_free(_res_conv); } -static inline uintptr_t TxOut_clone_ptr(LDKTxOut *NONNULL_PTR arg) { +static inline uint64_t TxOut_clone_ptr(LDKTxOut *NONNULL_PTR arg) { LDKTxOut* ret_ref = MALLOC(sizeof(LDKTxOut), "LDKTxOut"); *ret_ref = TxOut_clone(arg); - return (uint32_t)ret_ref; + return tag_ptr(ret_ref, true); } -uint32_t __attribute__((export_name("TS_TxOut_clone_ptr"))) TS_TxOut_clone_ptr(uint32_t arg) { - LDKTxOut* arg_conv = (LDKTxOut*)(arg & ~1); - uint32_t ret_conv = TxOut_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_TxOut_clone_ptr"))) TS_TxOut_clone_ptr(uint64_t arg) { + LDKTxOut* arg_conv = (LDKTxOut*)untag_ptr(arg); + int64_t ret_conv = TxOut_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_TxOut_clone"))) TS_TxOut_clone(uint32_t orig) { - LDKTxOut* orig_conv = (LDKTxOut*)(orig & ~1); +uint64_t __attribute__((export_name("TS_TxOut_clone"))) TS_TxOut_clone(uint64_t orig) { + LDKTxOut* orig_conv = (LDKTxOut*)untag_ptr(orig); LDKTxOut* ret_ref = MALLOC(sizeof(LDKTxOut), "LDKTxOut"); *ret_ref = TxOut_clone(orig_conv); - return (uint32_t)ret_ref; + return tag_ptr(ret_ref, true); } void __attribute__((export_name("TS_Str_free"))) TS_Str_free(jstring _res) { @@ -11376,461 +10097,461 @@ void __attribute__((export_name("TS_Str_free"))) TS_Str_free(jstring _res) { Str_free(dummy); } -uint32_t __attribute__((export_name("TS_CResult_NoneNoneZ_ok"))) TS_CResult_NoneNoneZ_ok() { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NoneNoneZ_err"))) TS_CResult_NoneNoneZ_err() { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_NoneNoneZ_is_ok"))) TS_CResult_NoneNoneZ_is_ok(uint32_t o) { - LDKCResult_NoneNoneZ* o_conv = (LDKCResult_NoneNoneZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_NoneNoneZ_is_ok"))) TS_CResult_NoneNoneZ_is_ok(uint64_t o) { + LDKCResult_NoneNoneZ* o_conv = (LDKCResult_NoneNoneZ*)untag_ptr(o); jboolean ret_conv = CResult_NoneNoneZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_NoneNoneZ_free"))) TS_CResult_NoneNoneZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_NoneNoneZ_free"))) TS_CResult_NoneNoneZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_NoneNoneZ _res_conv = *(LDKCResult_NoneNoneZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_NoneNoneZ_free(_res_conv); } -static inline uintptr_t CResult_NoneNoneZ_clone_ptr(LDKCResult_NoneNoneZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_NoneNoneZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_NoneNoneZ_clone_ptr"))) TS_CResult_NoneNoneZ_clone_ptr(uint64_t arg) { + LDKCResult_NoneNoneZ* arg_conv = (LDKCResult_NoneNoneZ*)untag_ptr(arg); + int64_t ret_conv = CResult_NoneNoneZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_NoneNoneZ_clone"))) TS_CResult_NoneNoneZ_clone(uint32_t orig) { - LDKCResult_NoneNoneZ* orig_conv = (LDKCResult_NoneNoneZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_NoneNoneZ_clone"))) TS_CResult_NoneNoneZ_clone(uint64_t orig) { + LDKCResult_NoneNoneZ* orig_conv = (LDKCResult_NoneNoneZ*)untag_ptr(orig); LDKCResult_NoneNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneNoneZ), "LDKCResult_NoneNoneZ"); *ret_conv = CResult_NoneNoneZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_ok"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_ok"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_ok(uint64_t o) { LDKCounterpartyCommitmentSecrets o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = CounterpartyCommitmentSecrets_clone(&o_conv); LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ), "LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ"); *ret_conv = CResult_CounterpartyCommitmentSecretsDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_err"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_err"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ), "LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ"); *ret_conv = CResult_CounterpartyCommitmentSecretsDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_is_ok"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* o_conv = (LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_is_ok"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* o_conv = (LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_CounterpartyCommitmentSecretsDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_free"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_free"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ _res_conv = *(LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_CounterpartyCommitmentSecretsDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone_ptr(LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone_ptr(LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ), "LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ"); *ret_conv = CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone_ptr"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* arg_conv = (LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone_ptr"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* arg_conv = (LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* orig_conv = (LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* orig_conv = (LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ*)untag_ptr(orig); LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ), "LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ"); *ret_conv = CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_SecretKeyErrorZ_ok"))) TS_CResult_SecretKeyErrorZ_ok(int8_tArray o) { +uint64_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); FREE(o); LDKCResult_SecretKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SecretKeyErrorZ), "LDKCResult_SecretKeyErrorZ"); *ret_conv = CResult_SecretKeyErrorZ_ok(o_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_SecretKeyErrorZ_err"))) TS_CResult_SecretKeyErrorZ_err(uint32_t e) { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_SecretKeyErrorZ_is_ok"))) TS_CResult_SecretKeyErrorZ_is_ok(uint32_t o) { - LDKCResult_SecretKeyErrorZ* o_conv = (LDKCResult_SecretKeyErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_SecretKeyErrorZ_is_ok"))) TS_CResult_SecretKeyErrorZ_is_ok(uint64_t o) { + LDKCResult_SecretKeyErrorZ* o_conv = (LDKCResult_SecretKeyErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_SecretKeyErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_SecretKeyErrorZ_free"))) TS_CResult_SecretKeyErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_SecretKeyErrorZ_free"))) TS_CResult_SecretKeyErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_SecretKeyErrorZ _res_conv = *(LDKCResult_SecretKeyErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_SecretKeyErrorZ_free(_res_conv); } -static inline uintptr_t CResult_SecretKeyErrorZ_clone_ptr(LDKCResult_SecretKeyErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_SecretKeyErrorZ_clone_ptr(LDKCResult_SecretKeyErrorZ *NONNULL_PTR arg) { LDKCResult_SecretKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SecretKeyErrorZ), "LDKCResult_SecretKeyErrorZ"); *ret_conv = CResult_SecretKeyErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_SecretKeyErrorZ_clone_ptr"))) TS_CResult_SecretKeyErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_SecretKeyErrorZ* arg_conv = (LDKCResult_SecretKeyErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_SecretKeyErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_SecretKeyErrorZ_clone_ptr"))) TS_CResult_SecretKeyErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_SecretKeyErrorZ* arg_conv = (LDKCResult_SecretKeyErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_SecretKeyErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_SecretKeyErrorZ_clone"))) TS_CResult_SecretKeyErrorZ_clone(uint32_t orig) { - LDKCResult_SecretKeyErrorZ* orig_conv = (LDKCResult_SecretKeyErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_SecretKeyErrorZ_clone"))) TS_CResult_SecretKeyErrorZ_clone(uint64_t orig) { + LDKCResult_SecretKeyErrorZ* orig_conv = (LDKCResult_SecretKeyErrorZ*)untag_ptr(orig); LDKCResult_SecretKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SecretKeyErrorZ), "LDKCResult_SecretKeyErrorZ"); *ret_conv = CResult_SecretKeyErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PublicKeyErrorZ_ok"))) TS_CResult_PublicKeyErrorZ_ok(int8_tArray o) { +uint64_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); FREE(o); LDKCResult_PublicKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PublicKeyErrorZ), "LDKCResult_PublicKeyErrorZ"); *ret_conv = CResult_PublicKeyErrorZ_ok(o_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PublicKeyErrorZ_err"))) TS_CResult_PublicKeyErrorZ_err(uint32_t e) { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_PublicKeyErrorZ_is_ok"))) TS_CResult_PublicKeyErrorZ_is_ok(uint32_t o) { - LDKCResult_PublicKeyErrorZ* o_conv = (LDKCResult_PublicKeyErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_PublicKeyErrorZ_is_ok"))) TS_CResult_PublicKeyErrorZ_is_ok(uint64_t o) { + LDKCResult_PublicKeyErrorZ* o_conv = (LDKCResult_PublicKeyErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_PublicKeyErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_PublicKeyErrorZ_free"))) TS_CResult_PublicKeyErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_PublicKeyErrorZ_free"))) TS_CResult_PublicKeyErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_PublicKeyErrorZ _res_conv = *(LDKCResult_PublicKeyErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_PublicKeyErrorZ_free(_res_conv); } -static inline uintptr_t CResult_PublicKeyErrorZ_clone_ptr(LDKCResult_PublicKeyErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_PublicKeyErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_PublicKeyErrorZ_clone_ptr"))) TS_CResult_PublicKeyErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_PublicKeyErrorZ* arg_conv = (LDKCResult_PublicKeyErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_PublicKeyErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_PublicKeyErrorZ_clone"))) TS_CResult_PublicKeyErrorZ_clone(uint32_t orig) { - LDKCResult_PublicKeyErrorZ* orig_conv = (LDKCResult_PublicKeyErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_PublicKeyErrorZ_clone"))) TS_CResult_PublicKeyErrorZ_clone(uint64_t orig) { + LDKCResult_PublicKeyErrorZ* orig_conv = (LDKCResult_PublicKeyErrorZ*)untag_ptr(orig); LDKCResult_PublicKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PublicKeyErrorZ), "LDKCResult_PublicKeyErrorZ"); *ret_conv = CResult_PublicKeyErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_ok"))) TS_CResult_TxCreationKeysDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_ok"))) TS_CResult_TxCreationKeysDecodeErrorZ_ok(uint64_t o) { LDKTxCreationKeys o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = TxCreationKeys_clone(&o_conv); LDKCResult_TxCreationKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysDecodeErrorZ), "LDKCResult_TxCreationKeysDecodeErrorZ"); *ret_conv = CResult_TxCreationKeysDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_err"))) TS_CResult_TxCreationKeysDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_err"))) TS_CResult_TxCreationKeysDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_TxCreationKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysDecodeErrorZ), "LDKCResult_TxCreationKeysDecodeErrorZ"); *ret_conv = CResult_TxCreationKeysDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_is_ok"))) TS_CResult_TxCreationKeysDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_TxCreationKeysDecodeErrorZ* o_conv = (LDKCResult_TxCreationKeysDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_is_ok"))) TS_CResult_TxCreationKeysDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_TxCreationKeysDecodeErrorZ* o_conv = (LDKCResult_TxCreationKeysDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_TxCreationKeysDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_free"))) TS_CResult_TxCreationKeysDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_free"))) TS_CResult_TxCreationKeysDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_TxCreationKeysDecodeErrorZ _res_conv = *(LDKCResult_TxCreationKeysDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_TxCreationKeysDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_TxCreationKeysDecodeErrorZ_clone_ptr(LDKCResult_TxCreationKeysDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_TxCreationKeysDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_clone_ptr"))) TS_CResult_TxCreationKeysDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_TxCreationKeysDecodeErrorZ* arg_conv = (LDKCResult_TxCreationKeysDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_TxCreationKeysDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_clone"))) TS_CResult_TxCreationKeysDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_TxCreationKeysDecodeErrorZ* orig_conv = (LDKCResult_TxCreationKeysDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_clone"))) TS_CResult_TxCreationKeysDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_TxCreationKeysDecodeErrorZ* orig_conv = (LDKCResult_TxCreationKeysDecodeErrorZ*)untag_ptr(orig); LDKCResult_TxCreationKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysDecodeErrorZ), "LDKCResult_TxCreationKeysDecodeErrorZ"); *ret_conv = CResult_TxCreationKeysDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_ok"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_ok"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_ok(uint64_t o) { LDKChannelPublicKeys o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ChannelPublicKeys_clone(&o_conv); LDKCResult_ChannelPublicKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelPublicKeysDecodeErrorZ), "LDKCResult_ChannelPublicKeysDecodeErrorZ"); *ret_conv = CResult_ChannelPublicKeysDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_err"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_err"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ChannelPublicKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelPublicKeysDecodeErrorZ), "LDKCResult_ChannelPublicKeysDecodeErrorZ"); *ret_conv = CResult_ChannelPublicKeysDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_is_ok"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ChannelPublicKeysDecodeErrorZ* o_conv = (LDKCResult_ChannelPublicKeysDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_is_ok"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ChannelPublicKeysDecodeErrorZ* o_conv = (LDKCResult_ChannelPublicKeysDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ChannelPublicKeysDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_free"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_free"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ChannelPublicKeysDecodeErrorZ _res_conv = *(LDKCResult_ChannelPublicKeysDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ChannelPublicKeysDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ChannelPublicKeysDecodeErrorZ_clone_ptr(LDKCResult_ChannelPublicKeysDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_ChannelPublicKeysDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ChannelPublicKeysDecodeErrorZ* arg_conv = (LDKCResult_ChannelPublicKeysDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ChannelPublicKeysDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_clone"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ChannelPublicKeysDecodeErrorZ* orig_conv = (LDKCResult_ChannelPublicKeysDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_clone"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ChannelPublicKeysDecodeErrorZ* orig_conv = (LDKCResult_ChannelPublicKeysDecodeErrorZ*)untag_ptr(orig); LDKCResult_ChannelPublicKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelPublicKeysDecodeErrorZ), "LDKCResult_ChannelPublicKeysDecodeErrorZ"); *ret_conv = CResult_ChannelPublicKeysDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_ok"))) TS_CResult_TxCreationKeysErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_ok"))) TS_CResult_TxCreationKeysErrorZ_ok(uint64_t o) { LDKTxCreationKeys o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = TxCreationKeys_clone(&o_conv); LDKCResult_TxCreationKeysErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysErrorZ), "LDKCResult_TxCreationKeysErrorZ"); *ret_conv = CResult_TxCreationKeysErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_err"))) TS_CResult_TxCreationKeysErrorZ_err(uint32_t e) { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_is_ok"))) TS_CResult_TxCreationKeysErrorZ_is_ok(uint32_t o) { - LDKCResult_TxCreationKeysErrorZ* o_conv = (LDKCResult_TxCreationKeysErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_is_ok"))) TS_CResult_TxCreationKeysErrorZ_is_ok(uint64_t o) { + LDKCResult_TxCreationKeysErrorZ* o_conv = (LDKCResult_TxCreationKeysErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_TxCreationKeysErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_free"))) TS_CResult_TxCreationKeysErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_free"))) TS_CResult_TxCreationKeysErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_TxCreationKeysErrorZ _res_conv = *(LDKCResult_TxCreationKeysErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_TxCreationKeysErrorZ_free(_res_conv); } -static inline uintptr_t CResult_TxCreationKeysErrorZ_clone_ptr(LDKCResult_TxCreationKeysErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_TxCreationKeysErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_clone_ptr"))) TS_CResult_TxCreationKeysErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_TxCreationKeysErrorZ* arg_conv = (LDKCResult_TxCreationKeysErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_TxCreationKeysErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_clone"))) TS_CResult_TxCreationKeysErrorZ_clone(uint32_t orig) { - LDKCResult_TxCreationKeysErrorZ* orig_conv = (LDKCResult_TxCreationKeysErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_clone"))) TS_CResult_TxCreationKeysErrorZ_clone(uint64_t orig) { + LDKCResult_TxCreationKeysErrorZ* orig_conv = (LDKCResult_TxCreationKeysErrorZ*)untag_ptr(orig); LDKCResult_TxCreationKeysErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysErrorZ), "LDKCResult_TxCreationKeysErrorZ"); *ret_conv = CResult_TxCreationKeysErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_COption_u32Z_some"))) TS_COption_u32Z_some(int32_t o) { +uint64_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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_u32Z_none"))) TS_COption_u32Z_none() { +uint64_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(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_COption_u32Z_free"))) TS_COption_u32Z_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCOption_u32Z _res_conv = *(LDKCOption_u32Z*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); COption_u32Z_free(_res_conv); } -static inline uintptr_t COption_u32Z_clone_ptr(LDKCOption_u32Z *NONNULL_PTR arg) { +static inline uint64_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); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_u32Z_clone_ptr"))) TS_COption_u32Z_clone_ptr(uint32_t arg) { - LDKCOption_u32Z* arg_conv = (LDKCOption_u32Z*)arg; - uint32_t ret_conv = COption_u32Z_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_COption_u32Z_clone_ptr"))) TS_COption_u32Z_clone_ptr(uint64_t arg) { + LDKCOption_u32Z* arg_conv = (LDKCOption_u32Z*)untag_ptr(arg); + int64_t ret_conv = COption_u32Z_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_COption_u32Z_clone"))) TS_COption_u32Z_clone(uint32_t orig) { - LDKCOption_u32Z* orig_conv = (LDKCOption_u32Z*)orig; +uint64_t __attribute__((export_name("TS_COption_u32Z_clone"))) TS_COption_u32Z_clone(uint64_t orig) { + LDKCOption_u32Z* orig_conv = (LDKCOption_u32Z*)untag_ptr(orig); LDKCOption_u32Z *ret_copy = MALLOC(sizeof(LDKCOption_u32Z), "LDKCOption_u32Z"); *ret_copy = COption_u32Z_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_ok"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_ok"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_ok(uint64_t o) { LDKHTLCOutputInCommitment o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = HTLCOutputInCommitment_clone(&o_conv); LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCOutputInCommitmentDecodeErrorZ), "LDKCResult_HTLCOutputInCommitmentDecodeErrorZ"); *ret_conv = CResult_HTLCOutputInCommitmentDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_err"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_err"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCOutputInCommitmentDecodeErrorZ), "LDKCResult_HTLCOutputInCommitmentDecodeErrorZ"); *ret_conv = CResult_HTLCOutputInCommitmentDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_is_ok"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* o_conv = (LDKCResult_HTLCOutputInCommitmentDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_is_ok"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* o_conv = (LDKCResult_HTLCOutputInCommitmentDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_HTLCOutputInCommitmentDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_free"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_free"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_HTLCOutputInCommitmentDecodeErrorZ _res_conv = *(LDKCResult_HTLCOutputInCommitmentDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_HTLCOutputInCommitmentDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_HTLCOutputInCommitmentDecodeErrorZ_clone_ptr(LDKCResult_HTLCOutputInCommitmentDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_HTLCOutputInCommitmentDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_clone_ptr"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* arg_conv = (LDKCResult_HTLCOutputInCommitmentDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_HTLCOutputInCommitmentDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_clone"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* orig_conv = (LDKCResult_HTLCOutputInCommitmentDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_clone"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* orig_conv = (LDKCResult_HTLCOutputInCommitmentDecodeErrorZ*)untag_ptr(orig); LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCOutputInCommitmentDecodeErrorZ), "LDKCResult_HTLCOutputInCommitmentDecodeErrorZ"); *ret_conv = CResult_HTLCOutputInCommitmentDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } uint32_t __attribute__((export_name("TS_COption_NoneZ_some"))) TS_COption_NoneZ_some() { @@ -11848,114 +10569,114 @@ void __attribute__((export_name("TS_COption_NoneZ_free"))) TS_COption_NoneZ_fre COption_NoneZ_free(_res_conv); } -uint32_t __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_ok"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_ok"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_ok(uint64_t o) { LDKCounterpartyChannelTransactionParameters o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = CounterpartyChannelTransactionParameters_clone(&o_conv); LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ), "LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ"); *ret_conv = CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_err"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_err"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ), "LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ"); *ret_conv = CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_is_ok"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* o_conv = (LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_is_ok"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* o_conv = (LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_free"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_free"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ _res_conv = *(LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone_ptr(LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone_ptr"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* arg_conv = (LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* orig_conv = (LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* orig_conv = (LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ*)untag_ptr(orig); LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ), "LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ"); *ret_conv = CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_ok"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_ok"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_ok(uint64_t o) { LDKChannelTransactionParameters o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ChannelTransactionParameters_clone(&o_conv); LDKCResult_ChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTransactionParametersDecodeErrorZ), "LDKCResult_ChannelTransactionParametersDecodeErrorZ"); *ret_conv = CResult_ChannelTransactionParametersDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_err"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_err"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTransactionParametersDecodeErrorZ), "LDKCResult_ChannelTransactionParametersDecodeErrorZ"); *ret_conv = CResult_ChannelTransactionParametersDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_is_ok"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ChannelTransactionParametersDecodeErrorZ* o_conv = (LDKCResult_ChannelTransactionParametersDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_is_ok"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ChannelTransactionParametersDecodeErrorZ* o_conv = (LDKCResult_ChannelTransactionParametersDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ChannelTransactionParametersDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_free"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_free"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ChannelTransactionParametersDecodeErrorZ _res_conv = *(LDKCResult_ChannelTransactionParametersDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ChannelTransactionParametersDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ChannelTransactionParametersDecodeErrorZ_clone_ptr(LDKCResult_ChannelTransactionParametersDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_ChannelTransactionParametersDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ChannelTransactionParametersDecodeErrorZ* arg_conv = (LDKCResult_ChannelTransactionParametersDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ChannelTransactionParametersDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_clone"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ChannelTransactionParametersDecodeErrorZ* orig_conv = (LDKCResult_ChannelTransactionParametersDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_clone"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ChannelTransactionParametersDecodeErrorZ* orig_conv = (LDKCResult_ChannelTransactionParametersDecodeErrorZ*)untag_ptr(orig); LDKCResult_ChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTransactionParametersDecodeErrorZ), "LDKCResult_ChannelTransactionParametersDecodeErrorZ"); *ret_conv = CResult_ChannelTransactionParametersDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } void __attribute__((export_name("TS_CVec_SignatureZ_free"))) TS_CVec_SignatureZ_free(ptrArray _res) { @@ -11977,236 +10698,238 @@ void __attribute__((export_name("TS_CVec_SignatureZ_free"))) TS_CVec_SignatureZ CVec_SignatureZ_free(_res_constr); } -uint32_t __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_ok"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_ok"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_ok(uint64_t o) { LDKHolderCommitmentTransaction o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = HolderCommitmentTransaction_clone(&o_conv); LDKCResult_HolderCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HolderCommitmentTransactionDecodeErrorZ), "LDKCResult_HolderCommitmentTransactionDecodeErrorZ"); *ret_conv = CResult_HolderCommitmentTransactionDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_err"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_err"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_HolderCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HolderCommitmentTransactionDecodeErrorZ), "LDKCResult_HolderCommitmentTransactionDecodeErrorZ"); *ret_conv = CResult_HolderCommitmentTransactionDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_is_ok"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_HolderCommitmentTransactionDecodeErrorZ* o_conv = (LDKCResult_HolderCommitmentTransactionDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_is_ok"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_HolderCommitmentTransactionDecodeErrorZ* o_conv = (LDKCResult_HolderCommitmentTransactionDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_HolderCommitmentTransactionDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_free"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_free"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_HolderCommitmentTransactionDecodeErrorZ _res_conv = *(LDKCResult_HolderCommitmentTransactionDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_HolderCommitmentTransactionDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_HolderCommitmentTransactionDecodeErrorZ_clone_ptr(LDKCResult_HolderCommitmentTransactionDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_HolderCommitmentTransactionDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_clone_ptr"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_HolderCommitmentTransactionDecodeErrorZ* arg_conv = (LDKCResult_HolderCommitmentTransactionDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_HolderCommitmentTransactionDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_clone"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_HolderCommitmentTransactionDecodeErrorZ* orig_conv = (LDKCResult_HolderCommitmentTransactionDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_clone"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_HolderCommitmentTransactionDecodeErrorZ* orig_conv = (LDKCResult_HolderCommitmentTransactionDecodeErrorZ*)untag_ptr(orig); LDKCResult_HolderCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HolderCommitmentTransactionDecodeErrorZ), "LDKCResult_HolderCommitmentTransactionDecodeErrorZ"); *ret_conv = CResult_HolderCommitmentTransactionDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_ok"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_ok"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_ok(uint64_t o) { LDKBuiltCommitmentTransaction o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = BuiltCommitmentTransaction_clone(&o_conv); LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_BuiltCommitmentTransactionDecodeErrorZ), "LDKCResult_BuiltCommitmentTransactionDecodeErrorZ"); *ret_conv = CResult_BuiltCommitmentTransactionDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_err"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_err"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_BuiltCommitmentTransactionDecodeErrorZ), "LDKCResult_BuiltCommitmentTransactionDecodeErrorZ"); *ret_conv = CResult_BuiltCommitmentTransactionDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_is_ok"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* o_conv = (LDKCResult_BuiltCommitmentTransactionDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_is_ok"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* o_conv = (LDKCResult_BuiltCommitmentTransactionDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_BuiltCommitmentTransactionDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_free"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_free"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_BuiltCommitmentTransactionDecodeErrorZ _res_conv = *(LDKCResult_BuiltCommitmentTransactionDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_BuiltCommitmentTransactionDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_BuiltCommitmentTransactionDecodeErrorZ_clone_ptr(LDKCResult_BuiltCommitmentTransactionDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_BuiltCommitmentTransactionDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_clone_ptr"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* arg_conv = (LDKCResult_BuiltCommitmentTransactionDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_BuiltCommitmentTransactionDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_clone"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* orig_conv = (LDKCResult_BuiltCommitmentTransactionDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_clone"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* orig_conv = (LDKCResult_BuiltCommitmentTransactionDecodeErrorZ*)untag_ptr(orig); LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_BuiltCommitmentTransactionDecodeErrorZ), "LDKCResult_BuiltCommitmentTransactionDecodeErrorZ"); *ret_conv = CResult_BuiltCommitmentTransactionDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_TrustedClosingTransactionNoneZ_ok"))) TS_CResult_TrustedClosingTransactionNoneZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_TrustedClosingTransactionNoneZ_ok"))) TS_CResult_TrustedClosingTransactionNoneZ_ok(uint64_t o) { LDKTrustedClosingTransaction o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); // 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_TrustedClosingTransactionNoneZ_err"))) TS_CResult_TrustedClosingTransactionNoneZ_err() { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_TrustedClosingTransactionNoneZ_is_ok"))) TS_CResult_TrustedClosingTransactionNoneZ_is_ok(uint32_t o) { - LDKCResult_TrustedClosingTransactionNoneZ* o_conv = (LDKCResult_TrustedClosingTransactionNoneZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_TrustedClosingTransactionNoneZ_is_ok"))) TS_CResult_TrustedClosingTransactionNoneZ_is_ok(uint64_t o) { + LDKCResult_TrustedClosingTransactionNoneZ* o_conv = (LDKCResult_TrustedClosingTransactionNoneZ*)untag_ptr(o); jboolean ret_conv = CResult_TrustedClosingTransactionNoneZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_TrustedClosingTransactionNoneZ_free"))) TS_CResult_TrustedClosingTransactionNoneZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_TrustedClosingTransactionNoneZ_free"))) TS_CResult_TrustedClosingTransactionNoneZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_TrustedClosingTransactionNoneZ _res_conv = *(LDKCResult_TrustedClosingTransactionNoneZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_TrustedClosingTransactionNoneZ_free(_res_conv); } -uint32_t __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_ok"))) TS_CResult_CommitmentTransactionDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_ok"))) TS_CResult_CommitmentTransactionDecodeErrorZ_ok(uint64_t o) { LDKCommitmentTransaction o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = CommitmentTransaction_clone(&o_conv); LDKCResult_CommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentTransactionDecodeErrorZ), "LDKCResult_CommitmentTransactionDecodeErrorZ"); *ret_conv = CResult_CommitmentTransactionDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_err"))) TS_CResult_CommitmentTransactionDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_err"))) TS_CResult_CommitmentTransactionDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_CommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentTransactionDecodeErrorZ), "LDKCResult_CommitmentTransactionDecodeErrorZ"); *ret_conv = CResult_CommitmentTransactionDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_is_ok"))) TS_CResult_CommitmentTransactionDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_CommitmentTransactionDecodeErrorZ* o_conv = (LDKCResult_CommitmentTransactionDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_is_ok"))) TS_CResult_CommitmentTransactionDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_CommitmentTransactionDecodeErrorZ* o_conv = (LDKCResult_CommitmentTransactionDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_CommitmentTransactionDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_free"))) TS_CResult_CommitmentTransactionDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_free"))) TS_CResult_CommitmentTransactionDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_CommitmentTransactionDecodeErrorZ _res_conv = *(LDKCResult_CommitmentTransactionDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_CommitmentTransactionDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_CommitmentTransactionDecodeErrorZ_clone_ptr(LDKCResult_CommitmentTransactionDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_CommitmentTransactionDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_clone_ptr"))) TS_CResult_CommitmentTransactionDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_CommitmentTransactionDecodeErrorZ* arg_conv = (LDKCResult_CommitmentTransactionDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_CommitmentTransactionDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_clone"))) TS_CResult_CommitmentTransactionDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_CommitmentTransactionDecodeErrorZ* orig_conv = (LDKCResult_CommitmentTransactionDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_clone"))) TS_CResult_CommitmentTransactionDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_CommitmentTransactionDecodeErrorZ* orig_conv = (LDKCResult_CommitmentTransactionDecodeErrorZ*)untag_ptr(orig); LDKCResult_CommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentTransactionDecodeErrorZ), "LDKCResult_CommitmentTransactionDecodeErrorZ"); *ret_conv = CResult_CommitmentTransactionDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_TrustedCommitmentTransactionNoneZ_ok"))) TS_CResult_TrustedCommitmentTransactionNoneZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_TrustedCommitmentTransactionNoneZ_ok"))) TS_CResult_TrustedCommitmentTransactionNoneZ_ok(uint64_t o) { LDKTrustedCommitmentTransaction o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); // 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_TrustedCommitmentTransactionNoneZ_err"))) TS_CResult_TrustedCommitmentTransactionNoneZ_err() { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_TrustedCommitmentTransactionNoneZ_is_ok"))) TS_CResult_TrustedCommitmentTransactionNoneZ_is_ok(uint32_t o) { - LDKCResult_TrustedCommitmentTransactionNoneZ* o_conv = (LDKCResult_TrustedCommitmentTransactionNoneZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_TrustedCommitmentTransactionNoneZ_is_ok"))) TS_CResult_TrustedCommitmentTransactionNoneZ_is_ok(uint64_t o) { + LDKCResult_TrustedCommitmentTransactionNoneZ* o_conv = (LDKCResult_TrustedCommitmentTransactionNoneZ*)untag_ptr(o); jboolean ret_conv = CResult_TrustedCommitmentTransactionNoneZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_TrustedCommitmentTransactionNoneZ_free"))) TS_CResult_TrustedCommitmentTransactionNoneZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_TrustedCommitmentTransactionNoneZ_free"))) TS_CResult_TrustedCommitmentTransactionNoneZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_TrustedCommitmentTransactionNoneZ _res_conv = *(LDKCResult_TrustedCommitmentTransactionNoneZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_TrustedCommitmentTransactionNoneZ_free(_res_conv); } -uint32_t __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_ok"))) TS_CResult_CVec_SignatureZNoneZ_ok(ptrArray o) { +uint64_t __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_ok"))) TS_CResult_CVec_SignatureZNoneZ_ok(ptrArray o) { LDKCVec_SignatureZ o_constr; o_constr.datalen = o->arr_len; if (o_constr.datalen > 0) @@ -12224,226 +10947,226 @@ uint32_t __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_ok"))) TS_ FREE(o); LDKCResult_CVec_SignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_SignatureZNoneZ), "LDKCResult_CVec_SignatureZNoneZ"); *ret_conv = CResult_CVec_SignatureZNoneZ_ok(o_constr); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_err"))) TS_CResult_CVec_SignatureZNoneZ_err() { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_is_ok"))) TS_CResult_CVec_SignatureZNoneZ_is_ok(uint32_t o) { - LDKCResult_CVec_SignatureZNoneZ* o_conv = (LDKCResult_CVec_SignatureZNoneZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_is_ok"))) TS_CResult_CVec_SignatureZNoneZ_is_ok(uint64_t o) { + LDKCResult_CVec_SignatureZNoneZ* o_conv = (LDKCResult_CVec_SignatureZNoneZ*)untag_ptr(o); jboolean ret_conv = CResult_CVec_SignatureZNoneZ_is_ok(o_conv); return ret_conv; } -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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_free"))) TS_CResult_CVec_SignatureZNoneZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_CVec_SignatureZNoneZ _res_conv = *(LDKCResult_CVec_SignatureZNoneZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_CVec_SignatureZNoneZ_free(_res_conv); } -static inline uintptr_t CResult_CVec_SignatureZNoneZ_clone_ptr(LDKCResult_CVec_SignatureZNoneZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_CVec_SignatureZNoneZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_clone_ptr"))) TS_CResult_CVec_SignatureZNoneZ_clone_ptr(uint64_t arg) { + LDKCResult_CVec_SignatureZNoneZ* arg_conv = (LDKCResult_CVec_SignatureZNoneZ*)untag_ptr(arg); + int64_t ret_conv = CResult_CVec_SignatureZNoneZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_clone"))) TS_CResult_CVec_SignatureZNoneZ_clone(uint32_t orig) { - LDKCResult_CVec_SignatureZNoneZ* orig_conv = (LDKCResult_CVec_SignatureZNoneZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_clone"))) TS_CResult_CVec_SignatureZNoneZ_clone(uint64_t orig) { + LDKCResult_CVec_SignatureZNoneZ* orig_conv = (LDKCResult_CVec_SignatureZNoneZ*)untag_ptr(orig); LDKCResult_CVec_SignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_SignatureZNoneZ), "LDKCResult_CVec_SignatureZNoneZ"); *ret_conv = CResult_CVec_SignatureZNoneZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_ok"))) TS_CResult_ShutdownScriptDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_ok"))) TS_CResult_ShutdownScriptDecodeErrorZ_ok(uint64_t o) { LDKShutdownScript o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ShutdownScript_clone(&o_conv); LDKCResult_ShutdownScriptDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptDecodeErrorZ), "LDKCResult_ShutdownScriptDecodeErrorZ"); *ret_conv = CResult_ShutdownScriptDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_err"))) TS_CResult_ShutdownScriptDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_err"))) TS_CResult_ShutdownScriptDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ShutdownScriptDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptDecodeErrorZ), "LDKCResult_ShutdownScriptDecodeErrorZ"); *ret_conv = CResult_ShutdownScriptDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_is_ok"))) TS_CResult_ShutdownScriptDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ShutdownScriptDecodeErrorZ* o_conv = (LDKCResult_ShutdownScriptDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_is_ok"))) TS_CResult_ShutdownScriptDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ShutdownScriptDecodeErrorZ* o_conv = (LDKCResult_ShutdownScriptDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ShutdownScriptDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_free"))) TS_CResult_ShutdownScriptDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_free"))) TS_CResult_ShutdownScriptDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ShutdownScriptDecodeErrorZ _res_conv = *(LDKCResult_ShutdownScriptDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ShutdownScriptDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ShutdownScriptDecodeErrorZ_clone_ptr(LDKCResult_ShutdownScriptDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_ShutdownScriptDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_clone_ptr"))) TS_CResult_ShutdownScriptDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ShutdownScriptDecodeErrorZ* arg_conv = (LDKCResult_ShutdownScriptDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ShutdownScriptDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_clone"))) TS_CResult_ShutdownScriptDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ShutdownScriptDecodeErrorZ* orig_conv = (LDKCResult_ShutdownScriptDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_clone"))) TS_CResult_ShutdownScriptDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ShutdownScriptDecodeErrorZ* orig_conv = (LDKCResult_ShutdownScriptDecodeErrorZ*)untag_ptr(orig); LDKCResult_ShutdownScriptDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptDecodeErrorZ), "LDKCResult_ShutdownScriptDecodeErrorZ"); *ret_conv = CResult_ShutdownScriptDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_ok"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_ok"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_ok(uint64_t o) { LDKShutdownScript o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ShutdownScript_clone(&o_conv); LDKCResult_ShutdownScriptInvalidShutdownScriptZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptInvalidShutdownScriptZ), "LDKCResult_ShutdownScriptInvalidShutdownScriptZ"); *ret_conv = CResult_ShutdownScriptInvalidShutdownScriptZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_err"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_err"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_err(uint64_t e) { LDKInvalidShutdownScript e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = InvalidShutdownScript_clone(&e_conv); LDKCResult_ShutdownScriptInvalidShutdownScriptZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptInvalidShutdownScriptZ), "LDKCResult_ShutdownScriptInvalidShutdownScriptZ"); *ret_conv = CResult_ShutdownScriptInvalidShutdownScriptZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_is_ok"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_is_ok(uint32_t o) { - LDKCResult_ShutdownScriptInvalidShutdownScriptZ* o_conv = (LDKCResult_ShutdownScriptInvalidShutdownScriptZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_is_ok"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_is_ok(uint64_t o) { + LDKCResult_ShutdownScriptInvalidShutdownScriptZ* o_conv = (LDKCResult_ShutdownScriptInvalidShutdownScriptZ*)untag_ptr(o); jboolean ret_conv = CResult_ShutdownScriptInvalidShutdownScriptZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_free"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_free"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ShutdownScriptInvalidShutdownScriptZ _res_conv = *(LDKCResult_ShutdownScriptInvalidShutdownScriptZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ShutdownScriptInvalidShutdownScriptZ_free(_res_conv); } -static inline uintptr_t CResult_ShutdownScriptInvalidShutdownScriptZ_clone_ptr(LDKCResult_ShutdownScriptInvalidShutdownScriptZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_ShutdownScriptInvalidShutdownScriptZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_clone_ptr"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_clone_ptr(uint64_t arg) { + LDKCResult_ShutdownScriptInvalidShutdownScriptZ* arg_conv = (LDKCResult_ShutdownScriptInvalidShutdownScriptZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ShutdownScriptInvalidShutdownScriptZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_clone"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_clone(uint32_t orig) { - LDKCResult_ShutdownScriptInvalidShutdownScriptZ* orig_conv = (LDKCResult_ShutdownScriptInvalidShutdownScriptZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_clone"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_clone(uint64_t orig) { + LDKCResult_ShutdownScriptInvalidShutdownScriptZ* orig_conv = (LDKCResult_ShutdownScriptInvalidShutdownScriptZ*)untag_ptr(orig); LDKCResult_ShutdownScriptInvalidShutdownScriptZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptInvalidShutdownScriptZ), "LDKCResult_ShutdownScriptInvalidShutdownScriptZ"); *ret_conv = CResult_ShutdownScriptInvalidShutdownScriptZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_ok"))) TS_CResult_RouteHopDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_ok"))) TS_CResult_RouteHopDecodeErrorZ_ok(uint64_t o) { LDKRouteHop o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = RouteHop_clone(&o_conv); LDKCResult_RouteHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHopDecodeErrorZ), "LDKCResult_RouteHopDecodeErrorZ"); *ret_conv = CResult_RouteHopDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_err"))) TS_CResult_RouteHopDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_err"))) TS_CResult_RouteHopDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_RouteHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHopDecodeErrorZ), "LDKCResult_RouteHopDecodeErrorZ"); *ret_conv = CResult_RouteHopDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_is_ok"))) TS_CResult_RouteHopDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_RouteHopDecodeErrorZ* o_conv = (LDKCResult_RouteHopDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_is_ok"))) TS_CResult_RouteHopDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_RouteHopDecodeErrorZ* o_conv = (LDKCResult_RouteHopDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_RouteHopDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_free"))) TS_CResult_RouteHopDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_free"))) TS_CResult_RouteHopDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_RouteHopDecodeErrorZ _res_conv = *(LDKCResult_RouteHopDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_RouteHopDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_RouteHopDecodeErrorZ_clone_ptr(LDKCResult_RouteHopDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_RouteHopDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_clone_ptr"))) TS_CResult_RouteHopDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_RouteHopDecodeErrorZ* arg_conv = (LDKCResult_RouteHopDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_RouteHopDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_clone"))) TS_CResult_RouteHopDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_RouteHopDecodeErrorZ* orig_conv = (LDKCResult_RouteHopDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_clone"))) TS_CResult_RouteHopDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_RouteHopDecodeErrorZ* orig_conv = (LDKCResult_RouteHopDecodeErrorZ*)untag_ptr(orig); LDKCResult_RouteHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHopDecodeErrorZ), "LDKCResult_RouteHopDecodeErrorZ"); *ret_conv = CResult_RouteHopDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_CVec_RouteHopZ_free"))) TS_CVec_RouteHopZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_RouteHopZ_free"))) TS_CVec_RouteHopZ_free(uint64_tArray _res) { LDKCVec_RouteHopZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKRouteHop), "LDKCVec_RouteHopZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t k = 0; k < _res_constr.datalen; k++) { - uint32_t _res_conv_10 = _res_vals[k]; + uint64_t _res_conv_10 = _res_vals[k]; LDKRouteHop _res_conv_10_conv; - _res_conv_10_conv.inner = (void*)(_res_conv_10 & (~1)); - _res_conv_10_conv.is_owned = (_res_conv_10 & 1) || (_res_conv_10 == 0); + _res_conv_10_conv.inner = untag_ptr(_res_conv_10); + _res_conv_10_conv.is_owned = ptr_is_owned(_res_conv_10); CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_10_conv); _res_constr.data[k] = _res_conv_10_conv; } @@ -12458,21 +11181,21 @@ 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; + uint64_tArray* _res_vals = (void*) _res->elems; for (size_t m = 0; m < _res_constr.datalen; m++) { - uint32_tArray _res_conv_12 = _res_vals[m]; + uint64_tArray _res_conv_12 = _res_vals[m]; LDKCVec_RouteHopZ _res_conv_12_constr; _res_conv_12_constr.datalen = _res_conv_12->arr_len; if (_res_conv_12_constr.datalen > 0) _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; + uint64_t* _res_conv_12_vals = _res_conv_12->elems; for (size_t k = 0; k < _res_conv_12_constr.datalen; k++) { - uint32_t _res_conv_12_conv_10 = _res_conv_12_vals[k]; + uint64_t _res_conv_12_conv_10 = _res_conv_12_vals[k]; LDKRouteHop _res_conv_12_conv_10_conv; - _res_conv_12_conv_10_conv.inner = (void*)(_res_conv_12_conv_10 & (~1)); - _res_conv_12_conv_10_conv.is_owned = (_res_conv_12_conv_10 & 1) || (_res_conv_12_conv_10 == 0); + _res_conv_12_conv_10_conv.inner = untag_ptr(_res_conv_12_conv_10); + _res_conv_12_conv_10_conv.is_owned = ptr_is_owned(_res_conv_12_conv_10); CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_12_conv_10_conv); _res_conv_12_constr.data[k] = _res_conv_12_conv_10_conv; } @@ -12483,129 +11206,129 @@ void __attribute__((export_name("TS_CVec_CVec_RouteHopZZ_free"))) TS_CVec_CVec_ CVec_CVec_RouteHopZZ_free(_res_constr); } -uint32_t __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_ok"))) TS_CResult_RouteDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_ok"))) TS_CResult_RouteDecodeErrorZ_ok(uint64_t o) { LDKRoute o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = Route_clone(&o_conv); LDKCResult_RouteDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteDecodeErrorZ), "LDKCResult_RouteDecodeErrorZ"); *ret_conv = CResult_RouteDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_err"))) TS_CResult_RouteDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_err"))) TS_CResult_RouteDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_RouteDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteDecodeErrorZ), "LDKCResult_RouteDecodeErrorZ"); *ret_conv = CResult_RouteDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_is_ok"))) TS_CResult_RouteDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_RouteDecodeErrorZ* o_conv = (LDKCResult_RouteDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_is_ok"))) TS_CResult_RouteDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_RouteDecodeErrorZ* o_conv = (LDKCResult_RouteDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_RouteDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_free"))) TS_CResult_RouteDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_free"))) TS_CResult_RouteDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_RouteDecodeErrorZ _res_conv = *(LDKCResult_RouteDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_RouteDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_RouteDecodeErrorZ_clone_ptr(LDKCResult_RouteDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_RouteDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_clone_ptr"))) TS_CResult_RouteDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_RouteDecodeErrorZ* arg_conv = (LDKCResult_RouteDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_RouteDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_clone"))) TS_CResult_RouteDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_RouteDecodeErrorZ* orig_conv = (LDKCResult_RouteDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_clone"))) TS_CResult_RouteDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_RouteDecodeErrorZ* orig_conv = (LDKCResult_RouteDecodeErrorZ*)untag_ptr(orig); LDKCResult_RouteDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteDecodeErrorZ), "LDKCResult_RouteDecodeErrorZ"); *ret_conv = CResult_RouteDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_ok"))) TS_CResult_RouteParametersDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_ok"))) TS_CResult_RouteParametersDecodeErrorZ_ok(uint64_t o) { LDKRouteParameters o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = RouteParameters_clone(&o_conv); LDKCResult_RouteParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteParametersDecodeErrorZ), "LDKCResult_RouteParametersDecodeErrorZ"); *ret_conv = CResult_RouteParametersDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_err"))) TS_CResult_RouteParametersDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_err"))) TS_CResult_RouteParametersDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_RouteParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteParametersDecodeErrorZ), "LDKCResult_RouteParametersDecodeErrorZ"); *ret_conv = CResult_RouteParametersDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_is_ok"))) TS_CResult_RouteParametersDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_RouteParametersDecodeErrorZ* o_conv = (LDKCResult_RouteParametersDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_is_ok"))) TS_CResult_RouteParametersDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_RouteParametersDecodeErrorZ* o_conv = (LDKCResult_RouteParametersDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_RouteParametersDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_free"))) TS_CResult_RouteParametersDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_free"))) TS_CResult_RouteParametersDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_RouteParametersDecodeErrorZ _res_conv = *(LDKCResult_RouteParametersDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_RouteParametersDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_RouteParametersDecodeErrorZ_clone_ptr(LDKCResult_RouteParametersDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_RouteParametersDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_clone_ptr"))) TS_CResult_RouteParametersDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_RouteParametersDecodeErrorZ* arg_conv = (LDKCResult_RouteParametersDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_RouteParametersDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_clone"))) TS_CResult_RouteParametersDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_RouteParametersDecodeErrorZ* orig_conv = (LDKCResult_RouteParametersDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_clone"))) TS_CResult_RouteParametersDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_RouteParametersDecodeErrorZ* orig_conv = (LDKCResult_RouteParametersDecodeErrorZ*)untag_ptr(orig); LDKCResult_RouteParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteParametersDecodeErrorZ), "LDKCResult_RouteParametersDecodeErrorZ"); *ret_conv = CResult_RouteParametersDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_CVec_RouteHintZ_free"))) TS_CVec_RouteHintZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_RouteHintZ_free"))) TS_CVec_RouteHintZ_free(uint64_tArray _res) { LDKCVec_RouteHintZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKRouteHint), "LDKCVec_RouteHintZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t l = 0; l < _res_constr.datalen; l++) { - uint32_t _res_conv_11 = _res_vals[l]; + uint64_t _res_conv_11 = _res_vals[l]; LDKRouteHint _res_conv_11_conv; - _res_conv_11_conv.inner = (void*)(_res_conv_11 & (~1)); - _res_conv_11_conv.is_owned = (_res_conv_11 & 1) || (_res_conv_11 == 0); + _res_conv_11_conv.inner = untag_ptr(_res_conv_11); + _res_conv_11_conv.is_owned = ptr_is_owned(_res_conv_11); CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_11_conv); _res_constr.data[l] = _res_conv_11_conv; } @@ -12613,46 +11336,46 @@ void __attribute__((export_name("TS_CVec_RouteHintZ_free"))) TS_CVec_RouteHintZ CVec_RouteHintZ_free(_res_constr); } -uint32_t __attribute__((export_name("TS_COption_u64Z_some"))) TS_COption_u64Z_some(int64_t o) { +uint64_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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_u64Z_none"))) TS_COption_u64Z_none() { +uint64_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(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_COption_u64Z_free"))) TS_COption_u64Z_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCOption_u64Z _res_conv = *(LDKCOption_u64Z*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); COption_u64Z_free(_res_conv); } -static inline uintptr_t COption_u64Z_clone_ptr(LDKCOption_u64Z *NONNULL_PTR arg) { +static inline uint64_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); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_u64Z_clone_ptr"))) TS_COption_u64Z_clone_ptr(uint32_t arg) { - LDKCOption_u64Z* arg_conv = (LDKCOption_u64Z*)arg; - uint32_t ret_conv = COption_u64Z_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_COption_u64Z_clone_ptr"))) TS_COption_u64Z_clone_ptr(uint64_t arg) { + LDKCOption_u64Z* arg_conv = (LDKCOption_u64Z*)untag_ptr(arg); + int64_t ret_conv = COption_u64Z_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_COption_u64Z_clone"))) TS_COption_u64Z_clone(uint32_t orig) { - LDKCOption_u64Z* orig_conv = (LDKCOption_u64Z*)orig; +uint64_t __attribute__((export_name("TS_COption_u64Z_clone"))) TS_COption_u64Z_clone(uint64_t orig) { + LDKCOption_u64Z* orig_conv = (LDKCOption_u64Z*)untag_ptr(orig); LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = COption_u64Z_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } @@ -12672,74 +11395,74 @@ void __attribute__((export_name("TS_CVec_u64Z_free"))) TS_CVec_u64Z_free(int64_ CVec_u64Z_free(_res_constr); } -uint32_t __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_ok"))) TS_CResult_PaymentParametersDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_ok"))) TS_CResult_PaymentParametersDecodeErrorZ_ok(uint64_t o) { LDKPaymentParameters o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = PaymentParameters_clone(&o_conv); LDKCResult_PaymentParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentParametersDecodeErrorZ), "LDKCResult_PaymentParametersDecodeErrorZ"); *ret_conv = CResult_PaymentParametersDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_err"))) TS_CResult_PaymentParametersDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_err"))) TS_CResult_PaymentParametersDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_PaymentParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentParametersDecodeErrorZ), "LDKCResult_PaymentParametersDecodeErrorZ"); *ret_conv = CResult_PaymentParametersDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_is_ok"))) TS_CResult_PaymentParametersDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_PaymentParametersDecodeErrorZ* o_conv = (LDKCResult_PaymentParametersDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_is_ok"))) TS_CResult_PaymentParametersDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_PaymentParametersDecodeErrorZ* o_conv = (LDKCResult_PaymentParametersDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_PaymentParametersDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_free"))) TS_CResult_PaymentParametersDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_free"))) TS_CResult_PaymentParametersDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_PaymentParametersDecodeErrorZ _res_conv = *(LDKCResult_PaymentParametersDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_PaymentParametersDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_PaymentParametersDecodeErrorZ_clone_ptr(LDKCResult_PaymentParametersDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_PaymentParametersDecodeErrorZ_clone_ptr(LDKCResult_PaymentParametersDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_PaymentParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentParametersDecodeErrorZ), "LDKCResult_PaymentParametersDecodeErrorZ"); *ret_conv = CResult_PaymentParametersDecodeErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_clone_ptr"))) TS_CResult_PaymentParametersDecodeErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_PaymentParametersDecodeErrorZ* arg_conv = (LDKCResult_PaymentParametersDecodeErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_PaymentParametersDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_clone_ptr"))) TS_CResult_PaymentParametersDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_PaymentParametersDecodeErrorZ* arg_conv = (LDKCResult_PaymentParametersDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_PaymentParametersDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_clone"))) TS_CResult_PaymentParametersDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_PaymentParametersDecodeErrorZ* orig_conv = (LDKCResult_PaymentParametersDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_clone"))) TS_CResult_PaymentParametersDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_PaymentParametersDecodeErrorZ* orig_conv = (LDKCResult_PaymentParametersDecodeErrorZ*)untag_ptr(orig); LDKCResult_PaymentParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentParametersDecodeErrorZ), "LDKCResult_PaymentParametersDecodeErrorZ"); *ret_conv = CResult_PaymentParametersDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_CVec_RouteHintHopZ_free"))) TS_CVec_RouteHintHopZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_RouteHintHopZ_free"))) TS_CVec_RouteHintHopZ_free(uint64_tArray _res) { LDKCVec_RouteHintHopZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKRouteHintHop), "LDKCVec_RouteHintHopZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t o = 0; o < _res_constr.datalen; o++) { - uint32_t _res_conv_14 = _res_vals[o]; + uint64_t _res_conv_14 = _res_vals[o]; LDKRouteHintHop _res_conv_14_conv; - _res_conv_14_conv.inner = (void*)(_res_conv_14 & (~1)); - _res_conv_14_conv.is_owned = (_res_conv_14 & 1) || (_res_conv_14 == 0); + _res_conv_14_conv.inner = untag_ptr(_res_conv_14); + _res_conv_14_conv.is_owned = ptr_is_owned(_res_conv_14); CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_14_conv); _res_constr.data[o] = _res_conv_14_conv; } @@ -12747,129 +11470,129 @@ void __attribute__((export_name("TS_CVec_RouteHintHopZ_free"))) TS_CVec_RouteHi CVec_RouteHintHopZ_free(_res_constr); } -uint32_t __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_ok"))) TS_CResult_RouteHintDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_ok"))) TS_CResult_RouteHintDecodeErrorZ_ok(uint64_t o) { LDKRouteHint o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = RouteHint_clone(&o_conv); LDKCResult_RouteHintDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintDecodeErrorZ), "LDKCResult_RouteHintDecodeErrorZ"); *ret_conv = CResult_RouteHintDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_err"))) TS_CResult_RouteHintDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_err"))) TS_CResult_RouteHintDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_RouteHintDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintDecodeErrorZ), "LDKCResult_RouteHintDecodeErrorZ"); *ret_conv = CResult_RouteHintDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_is_ok"))) TS_CResult_RouteHintDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_RouteHintDecodeErrorZ* o_conv = (LDKCResult_RouteHintDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_is_ok"))) TS_CResult_RouteHintDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_RouteHintDecodeErrorZ* o_conv = (LDKCResult_RouteHintDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_RouteHintDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_free"))) TS_CResult_RouteHintDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_free"))) TS_CResult_RouteHintDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_RouteHintDecodeErrorZ _res_conv = *(LDKCResult_RouteHintDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_RouteHintDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_RouteHintDecodeErrorZ_clone_ptr(LDKCResult_RouteHintDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_RouteHintDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_clone_ptr"))) TS_CResult_RouteHintDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_RouteHintDecodeErrorZ* arg_conv = (LDKCResult_RouteHintDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_RouteHintDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_clone"))) TS_CResult_RouteHintDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_RouteHintDecodeErrorZ* orig_conv = (LDKCResult_RouteHintDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_clone"))) TS_CResult_RouteHintDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_RouteHintDecodeErrorZ* orig_conv = (LDKCResult_RouteHintDecodeErrorZ*)untag_ptr(orig); LDKCResult_RouteHintDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintDecodeErrorZ), "LDKCResult_RouteHintDecodeErrorZ"); *ret_conv = CResult_RouteHintDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_ok"))) TS_CResult_RouteHintHopDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_ok"))) TS_CResult_RouteHintHopDecodeErrorZ_ok(uint64_t o) { LDKRouteHintHop o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = RouteHintHop_clone(&o_conv); LDKCResult_RouteHintHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintHopDecodeErrorZ), "LDKCResult_RouteHintHopDecodeErrorZ"); *ret_conv = CResult_RouteHintHopDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_err"))) TS_CResult_RouteHintHopDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_err"))) TS_CResult_RouteHintHopDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_RouteHintHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintHopDecodeErrorZ), "LDKCResult_RouteHintHopDecodeErrorZ"); *ret_conv = CResult_RouteHintHopDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_is_ok"))) TS_CResult_RouteHintHopDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_RouteHintHopDecodeErrorZ* o_conv = (LDKCResult_RouteHintHopDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_is_ok"))) TS_CResult_RouteHintHopDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_RouteHintHopDecodeErrorZ* o_conv = (LDKCResult_RouteHintHopDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_RouteHintHopDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_free"))) TS_CResult_RouteHintHopDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_free"))) TS_CResult_RouteHintHopDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_RouteHintHopDecodeErrorZ _res_conv = *(LDKCResult_RouteHintHopDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_RouteHintHopDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_RouteHintHopDecodeErrorZ_clone_ptr(LDKCResult_RouteHintHopDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_RouteHintHopDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_clone_ptr"))) TS_CResult_RouteHintHopDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_RouteHintHopDecodeErrorZ* arg_conv = (LDKCResult_RouteHintHopDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_RouteHintHopDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_clone"))) TS_CResult_RouteHintHopDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_RouteHintHopDecodeErrorZ* orig_conv = (LDKCResult_RouteHintHopDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_clone"))) TS_CResult_RouteHintHopDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_RouteHintHopDecodeErrorZ* orig_conv = (LDKCResult_RouteHintHopDecodeErrorZ*)untag_ptr(orig); LDKCResult_RouteHintHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintHopDecodeErrorZ), "LDKCResult_RouteHintHopDecodeErrorZ"); *ret_conv = CResult_RouteHintHopDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_CVec_ChannelDetailsZ_free"))) TS_CVec_ChannelDetailsZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_ChannelDetailsZ_free"))) TS_CVec_ChannelDetailsZ_free(uint64_tArray _res) { LDKCVec_ChannelDetailsZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKChannelDetails), "LDKCVec_ChannelDetailsZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t q = 0; q < _res_constr.datalen; q++) { - uint32_t _res_conv_16 = _res_vals[q]; + uint64_t _res_conv_16 = _res_vals[q]; LDKChannelDetails _res_conv_16_conv; - _res_conv_16_conv.inner = (void*)(_res_conv_16 & (~1)); - _res_conv_16_conv.is_owned = (_res_conv_16 & 1) || (_res_conv_16 == 0); + _res_conv_16_conv.inner = untag_ptr(_res_conv_16); + _res_conv_16_conv.is_owned = ptr_is_owned(_res_conv_16); CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_16_conv); _res_constr.data[q] = _res_conv_16_conv; } @@ -12877,59 +11600,59 @@ void __attribute__((export_name("TS_CVec_ChannelDetailsZ_free"))) TS_CVec_Chann CVec_ChannelDetailsZ_free(_res_constr); } -uint32_t __attribute__((export_name("TS_CResult_RouteLightningErrorZ_ok"))) TS_CResult_RouteLightningErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_RouteLightningErrorZ_ok"))) TS_CResult_RouteLightningErrorZ_ok(uint64_t o) { LDKRoute o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = Route_clone(&o_conv); LDKCResult_RouteLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteLightningErrorZ), "LDKCResult_RouteLightningErrorZ"); *ret_conv = CResult_RouteLightningErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_RouteLightningErrorZ_err"))) TS_CResult_RouteLightningErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_RouteLightningErrorZ_err"))) TS_CResult_RouteLightningErrorZ_err(uint64_t e) { LDKLightningError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = LightningError_clone(&e_conv); LDKCResult_RouteLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteLightningErrorZ), "LDKCResult_RouteLightningErrorZ"); *ret_conv = CResult_RouteLightningErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_RouteLightningErrorZ_is_ok"))) TS_CResult_RouteLightningErrorZ_is_ok(uint32_t o) { - LDKCResult_RouteLightningErrorZ* o_conv = (LDKCResult_RouteLightningErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_RouteLightningErrorZ_is_ok"))) TS_CResult_RouteLightningErrorZ_is_ok(uint64_t o) { + LDKCResult_RouteLightningErrorZ* o_conv = (LDKCResult_RouteLightningErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_RouteLightningErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_RouteLightningErrorZ_free"))) TS_CResult_RouteLightningErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_RouteLightningErrorZ_free"))) TS_CResult_RouteLightningErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_RouteLightningErrorZ _res_conv = *(LDKCResult_RouteLightningErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_RouteLightningErrorZ_free(_res_conv); } -static inline uintptr_t CResult_RouteLightningErrorZ_clone_ptr(LDKCResult_RouteLightningErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_RouteLightningErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_RouteLightningErrorZ_clone_ptr"))) TS_CResult_RouteLightningErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_RouteLightningErrorZ* arg_conv = (LDKCResult_RouteLightningErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_RouteLightningErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_RouteLightningErrorZ_clone"))) TS_CResult_RouteLightningErrorZ_clone(uint32_t orig) { - LDKCResult_RouteLightningErrorZ* orig_conv = (LDKCResult_RouteLightningErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_RouteLightningErrorZ_clone"))) TS_CResult_RouteLightningErrorZ_clone(uint64_t orig) { + LDKCResult_RouteLightningErrorZ* orig_conv = (LDKCResult_RouteLightningErrorZ*)untag_ptr(orig); LDKCResult_RouteLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteLightningErrorZ), "LDKCResult_RouteLightningErrorZ"); *ret_conv = CResult_RouteLightningErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } void __attribute__((export_name("TS_CVec_PublicKeyZ_free"))) TS_CVec_PublicKeyZ_free(ptrArray _res) { @@ -12951,519 +11674,519 @@ void __attribute__((export_name("TS_CVec_PublicKeyZ_free"))) TS_CVec_PublicKeyZ CVec_PublicKeyZ_free(_res_constr); } -uint32_t __attribute__((export_name("TS_CResult_PaymentPurposeDecodeErrorZ_ok"))) TS_CResult_PaymentPurposeDecodeErrorZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_CResult_PaymentPurposeDecodeErrorZ_ok"))) TS_CResult_PaymentPurposeDecodeErrorZ_ok(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKPaymentPurpose o_conv = *(LDKPaymentPurpose*)(o_ptr); - o_conv = PaymentPurpose_clone((LDKPaymentPurpose*)(((uintptr_t)o) & ~1)); + o_conv = PaymentPurpose_clone((LDKPaymentPurpose*)untag_ptr(o)); LDKCResult_PaymentPurposeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentPurposeDecodeErrorZ), "LDKCResult_PaymentPurposeDecodeErrorZ"); *ret_conv = CResult_PaymentPurposeDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PaymentPurposeDecodeErrorZ_err"))) TS_CResult_PaymentPurposeDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_PaymentPurposeDecodeErrorZ_err"))) TS_CResult_PaymentPurposeDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_PaymentPurposeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentPurposeDecodeErrorZ), "LDKCResult_PaymentPurposeDecodeErrorZ"); *ret_conv = CResult_PaymentPurposeDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_PaymentPurposeDecodeErrorZ_is_ok"))) TS_CResult_PaymentPurposeDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_PaymentPurposeDecodeErrorZ* o_conv = (LDKCResult_PaymentPurposeDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_PaymentPurposeDecodeErrorZ_is_ok"))) TS_CResult_PaymentPurposeDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_PaymentPurposeDecodeErrorZ* o_conv = (LDKCResult_PaymentPurposeDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_PaymentPurposeDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_PaymentPurposeDecodeErrorZ_free"))) TS_CResult_PaymentPurposeDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_PaymentPurposeDecodeErrorZ_free"))) TS_CResult_PaymentPurposeDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_PaymentPurposeDecodeErrorZ _res_conv = *(LDKCResult_PaymentPurposeDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_PaymentPurposeDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_PaymentPurposeDecodeErrorZ_clone_ptr(LDKCResult_PaymentPurposeDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_PaymentPurposeDecodeErrorZ_clone_ptr(LDKCResult_PaymentPurposeDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_PaymentPurposeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentPurposeDecodeErrorZ), "LDKCResult_PaymentPurposeDecodeErrorZ"); *ret_conv = CResult_PaymentPurposeDecodeErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PaymentPurposeDecodeErrorZ_clone_ptr"))) TS_CResult_PaymentPurposeDecodeErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_PaymentPurposeDecodeErrorZ* arg_conv = (LDKCResult_PaymentPurposeDecodeErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_PaymentPurposeDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_PaymentPurposeDecodeErrorZ_clone_ptr"))) TS_CResult_PaymentPurposeDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_PaymentPurposeDecodeErrorZ* arg_conv = (LDKCResult_PaymentPurposeDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_PaymentPurposeDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_PaymentPurposeDecodeErrorZ_clone"))) TS_CResult_PaymentPurposeDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_PaymentPurposeDecodeErrorZ* orig_conv = (LDKCResult_PaymentPurposeDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_PaymentPurposeDecodeErrorZ_clone"))) TS_CResult_PaymentPurposeDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_PaymentPurposeDecodeErrorZ* orig_conv = (LDKCResult_PaymentPurposeDecodeErrorZ*)untag_ptr(orig); LDKCResult_PaymentPurposeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentPurposeDecodeErrorZ), "LDKCResult_PaymentPurposeDecodeErrorZ"); *ret_conv = CResult_PaymentPurposeDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_COption_ClosureReasonZ_some"))) TS_COption_ClosureReasonZ_some(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_COption_ClosureReasonZ_some"))) TS_COption_ClosureReasonZ_some(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKClosureReason o_conv = *(LDKClosureReason*)(o_ptr); - o_conv = ClosureReason_clone((LDKClosureReason*)(((uintptr_t)o) & ~1)); + o_conv = ClosureReason_clone((LDKClosureReason*)untag_ptr(o)); LDKCOption_ClosureReasonZ *ret_copy = MALLOC(sizeof(LDKCOption_ClosureReasonZ), "LDKCOption_ClosureReasonZ"); *ret_copy = COption_ClosureReasonZ_some(o_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_ClosureReasonZ_none"))) TS_COption_ClosureReasonZ_none() { +uint64_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(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_COption_ClosureReasonZ_free"))) TS_COption_ClosureReasonZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCOption_ClosureReasonZ _res_conv = *(LDKCOption_ClosureReasonZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); COption_ClosureReasonZ_free(_res_conv); } -static inline uintptr_t COption_ClosureReasonZ_clone_ptr(LDKCOption_ClosureReasonZ *NONNULL_PTR arg) { +static inline uint64_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); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_ClosureReasonZ_clone_ptr"))) TS_COption_ClosureReasonZ_clone_ptr(uint32_t arg) { - LDKCOption_ClosureReasonZ* arg_conv = (LDKCOption_ClosureReasonZ*)arg; - uint32_t ret_conv = COption_ClosureReasonZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_COption_ClosureReasonZ_clone_ptr"))) TS_COption_ClosureReasonZ_clone_ptr(uint64_t arg) { + LDKCOption_ClosureReasonZ* arg_conv = (LDKCOption_ClosureReasonZ*)untag_ptr(arg); + int64_t ret_conv = COption_ClosureReasonZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_COption_ClosureReasonZ_clone"))) TS_COption_ClosureReasonZ_clone(uint32_t orig) { - LDKCOption_ClosureReasonZ* orig_conv = (LDKCOption_ClosureReasonZ*)orig; +uint64_t __attribute__((export_name("TS_COption_ClosureReasonZ_clone"))) TS_COption_ClosureReasonZ_clone(uint64_t orig) { + LDKCOption_ClosureReasonZ* orig_conv = (LDKCOption_ClosureReasonZ*)untag_ptr(orig); LDKCOption_ClosureReasonZ *ret_copy = MALLOC(sizeof(LDKCOption_ClosureReasonZ), "LDKCOption_ClosureReasonZ"); *ret_copy = COption_ClosureReasonZ_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErrorZ_ok"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_ok(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKCOption_ClosureReasonZ o_conv = *(LDKCOption_ClosureReasonZ*)(o_ptr); - o_conv = COption_ClosureReasonZ_clone((LDKCOption_ClosureReasonZ*)(((uintptr_t)o) & ~1)); + o_conv = COption_ClosureReasonZ_clone((LDKCOption_ClosureReasonZ*)untag_ptr(o)); LDKCResult_COption_ClosureReasonZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_ClosureReasonZDecodeErrorZ), "LDKCResult_COption_ClosureReasonZDecodeErrorZ"); *ret_conv = CResult_COption_ClosureReasonZDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErrorZ_err"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErrorZ_err"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErrorZ_is_ok"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_COption_ClosureReasonZDecodeErrorZ* o_conv = (LDKCResult_COption_ClosureReasonZDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErrorZ_is_ok"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_COption_ClosureReasonZDecodeErrorZ* o_conv = (LDKCResult_COption_ClosureReasonZDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_COption_ClosureReasonZDecodeErrorZ_is_ok(o_conv); return ret_conv; } -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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErrorZ_free"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_COption_ClosureReasonZDecodeErrorZ _res_conv = *(LDKCResult_COption_ClosureReasonZDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_COption_ClosureReasonZDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_COption_ClosureReasonZDecodeErrorZ_clone_ptr(LDKCResult_COption_ClosureReasonZDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_COption_ClosureReasonZDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErrorZ_clone_ptr"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_COption_ClosureReasonZDecodeErrorZ* arg_conv = (LDKCResult_COption_ClosureReasonZDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_COption_ClosureReasonZDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErrorZ_clone"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_COption_ClosureReasonZDecodeErrorZ* orig_conv = (LDKCResult_COption_ClosureReasonZDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErrorZ_clone"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_COption_ClosureReasonZDecodeErrorZ* orig_conv = (LDKCResult_COption_ClosureReasonZDecodeErrorZ*)untag_ptr(orig); LDKCResult_COption_ClosureReasonZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_ClosureReasonZDecodeErrorZ), "LDKCResult_COption_ClosureReasonZDecodeErrorZ"); *ret_conv = CResult_COption_ClosureReasonZDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_COption_HTLCDestinationZ_some"))) TS_COption_HTLCDestinationZ_some(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_COption_HTLCDestinationZ_some"))) TS_COption_HTLCDestinationZ_some(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKHTLCDestination o_conv = *(LDKHTLCDestination*)(o_ptr); - o_conv = HTLCDestination_clone((LDKHTLCDestination*)(((uintptr_t)o) & ~1)); + o_conv = HTLCDestination_clone((LDKHTLCDestination*)untag_ptr(o)); LDKCOption_HTLCDestinationZ *ret_copy = MALLOC(sizeof(LDKCOption_HTLCDestinationZ), "LDKCOption_HTLCDestinationZ"); *ret_copy = COption_HTLCDestinationZ_some(o_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_HTLCDestinationZ_none"))) TS_COption_HTLCDestinationZ_none() { +uint64_t __attribute__((export_name("TS_COption_HTLCDestinationZ_none"))) TS_COption_HTLCDestinationZ_none() { LDKCOption_HTLCDestinationZ *ret_copy = MALLOC(sizeof(LDKCOption_HTLCDestinationZ), "LDKCOption_HTLCDestinationZ"); *ret_copy = COption_HTLCDestinationZ_none(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_COption_HTLCDestinationZ_free"))) TS_COption_HTLCDestinationZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_COption_HTLCDestinationZ_free"))) TS_COption_HTLCDestinationZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCOption_HTLCDestinationZ _res_conv = *(LDKCOption_HTLCDestinationZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); COption_HTLCDestinationZ_free(_res_conv); } -static inline uintptr_t COption_HTLCDestinationZ_clone_ptr(LDKCOption_HTLCDestinationZ *NONNULL_PTR arg) { +static inline uint64_t COption_HTLCDestinationZ_clone_ptr(LDKCOption_HTLCDestinationZ *NONNULL_PTR arg) { LDKCOption_HTLCDestinationZ *ret_copy = MALLOC(sizeof(LDKCOption_HTLCDestinationZ), "LDKCOption_HTLCDestinationZ"); *ret_copy = COption_HTLCDestinationZ_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_HTLCDestinationZ_clone_ptr"))) TS_COption_HTLCDestinationZ_clone_ptr(uint32_t arg) { - LDKCOption_HTLCDestinationZ* arg_conv = (LDKCOption_HTLCDestinationZ*)arg; - uint32_t ret_conv = COption_HTLCDestinationZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_COption_HTLCDestinationZ_clone_ptr"))) TS_COption_HTLCDestinationZ_clone_ptr(uint64_t arg) { + LDKCOption_HTLCDestinationZ* arg_conv = (LDKCOption_HTLCDestinationZ*)untag_ptr(arg); + int64_t ret_conv = COption_HTLCDestinationZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_COption_HTLCDestinationZ_clone"))) TS_COption_HTLCDestinationZ_clone(uint32_t orig) { - LDKCOption_HTLCDestinationZ* orig_conv = (LDKCOption_HTLCDestinationZ*)orig; +uint64_t __attribute__((export_name("TS_COption_HTLCDestinationZ_clone"))) TS_COption_HTLCDestinationZ_clone(uint64_t orig) { + LDKCOption_HTLCDestinationZ* orig_conv = (LDKCOption_HTLCDestinationZ*)untag_ptr(orig); LDKCOption_HTLCDestinationZ *ret_copy = MALLOC(sizeof(LDKCOption_HTLCDestinationZ), "LDKCOption_HTLCDestinationZ"); *ret_copy = COption_HTLCDestinationZ_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_CResult_COption_HTLCDestinationZDecodeErrorZ_ok"))) TS_CResult_COption_HTLCDestinationZDecodeErrorZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_CResult_COption_HTLCDestinationZDecodeErrorZ_ok"))) TS_CResult_COption_HTLCDestinationZDecodeErrorZ_ok(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKCOption_HTLCDestinationZ o_conv = *(LDKCOption_HTLCDestinationZ*)(o_ptr); - o_conv = COption_HTLCDestinationZ_clone((LDKCOption_HTLCDestinationZ*)(((uintptr_t)o) & ~1)); + o_conv = COption_HTLCDestinationZ_clone((LDKCOption_HTLCDestinationZ*)untag_ptr(o)); LDKCResult_COption_HTLCDestinationZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_HTLCDestinationZDecodeErrorZ), "LDKCResult_COption_HTLCDestinationZDecodeErrorZ"); *ret_conv = CResult_COption_HTLCDestinationZDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_COption_HTLCDestinationZDecodeErrorZ_err"))) TS_CResult_COption_HTLCDestinationZDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_COption_HTLCDestinationZDecodeErrorZ_err"))) TS_CResult_COption_HTLCDestinationZDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_COption_HTLCDestinationZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_HTLCDestinationZDecodeErrorZ), "LDKCResult_COption_HTLCDestinationZDecodeErrorZ"); *ret_conv = CResult_COption_HTLCDestinationZDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_COption_HTLCDestinationZDecodeErrorZ_is_ok"))) TS_CResult_COption_HTLCDestinationZDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_COption_HTLCDestinationZDecodeErrorZ* o_conv = (LDKCResult_COption_HTLCDestinationZDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_COption_HTLCDestinationZDecodeErrorZ_is_ok"))) TS_CResult_COption_HTLCDestinationZDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_COption_HTLCDestinationZDecodeErrorZ* o_conv = (LDKCResult_COption_HTLCDestinationZDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_COption_HTLCDestinationZDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_COption_HTLCDestinationZDecodeErrorZ_free"))) TS_CResult_COption_HTLCDestinationZDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_COption_HTLCDestinationZDecodeErrorZ_free"))) TS_CResult_COption_HTLCDestinationZDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_COption_HTLCDestinationZDecodeErrorZ _res_conv = *(LDKCResult_COption_HTLCDestinationZDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_COption_HTLCDestinationZDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_COption_HTLCDestinationZDecodeErrorZ_clone_ptr(LDKCResult_COption_HTLCDestinationZDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_COption_HTLCDestinationZDecodeErrorZ_clone_ptr(LDKCResult_COption_HTLCDestinationZDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_COption_HTLCDestinationZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_HTLCDestinationZDecodeErrorZ), "LDKCResult_COption_HTLCDestinationZDecodeErrorZ"); *ret_conv = CResult_COption_HTLCDestinationZDecodeErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_COption_HTLCDestinationZDecodeErrorZ_clone_ptr"))) TS_CResult_COption_HTLCDestinationZDecodeErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_COption_HTLCDestinationZDecodeErrorZ* arg_conv = (LDKCResult_COption_HTLCDestinationZDecodeErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_COption_HTLCDestinationZDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_COption_HTLCDestinationZDecodeErrorZ_clone_ptr"))) TS_CResult_COption_HTLCDestinationZDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_COption_HTLCDestinationZDecodeErrorZ* arg_conv = (LDKCResult_COption_HTLCDestinationZDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_COption_HTLCDestinationZDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_COption_HTLCDestinationZDecodeErrorZ_clone"))) TS_CResult_COption_HTLCDestinationZDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_COption_HTLCDestinationZDecodeErrorZ* orig_conv = (LDKCResult_COption_HTLCDestinationZDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_COption_HTLCDestinationZDecodeErrorZ_clone"))) TS_CResult_COption_HTLCDestinationZDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_COption_HTLCDestinationZDecodeErrorZ* orig_conv = (LDKCResult_COption_HTLCDestinationZDecodeErrorZ*)untag_ptr(orig); LDKCResult_COption_HTLCDestinationZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_HTLCDestinationZDecodeErrorZ), "LDKCResult_COption_HTLCDestinationZDecodeErrorZ"); *ret_conv = CResult_COption_HTLCDestinationZDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_COption_NetworkUpdateZ_some"))) TS_COption_NetworkUpdateZ_some(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_COption_NetworkUpdateZ_some"))) TS_COption_NetworkUpdateZ_some(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKNetworkUpdate o_conv = *(LDKNetworkUpdate*)(o_ptr); - o_conv = NetworkUpdate_clone((LDKNetworkUpdate*)(((uintptr_t)o) & ~1)); + o_conv = NetworkUpdate_clone((LDKNetworkUpdate*)untag_ptr(o)); LDKCOption_NetworkUpdateZ *ret_copy = MALLOC(sizeof(LDKCOption_NetworkUpdateZ), "LDKCOption_NetworkUpdateZ"); *ret_copy = COption_NetworkUpdateZ_some(o_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_NetworkUpdateZ_none"))) TS_COption_NetworkUpdateZ_none() { +uint64_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(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_COption_NetworkUpdateZ_free"))) TS_COption_NetworkUpdateZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCOption_NetworkUpdateZ _res_conv = *(LDKCOption_NetworkUpdateZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); COption_NetworkUpdateZ_free(_res_conv); } -static inline uintptr_t COption_NetworkUpdateZ_clone_ptr(LDKCOption_NetworkUpdateZ *NONNULL_PTR arg) { +static inline uint64_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); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_NetworkUpdateZ_clone_ptr"))) TS_COption_NetworkUpdateZ_clone_ptr(uint32_t arg) { - LDKCOption_NetworkUpdateZ* arg_conv = (LDKCOption_NetworkUpdateZ*)arg; - uint32_t ret_conv = COption_NetworkUpdateZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_COption_NetworkUpdateZ_clone_ptr"))) TS_COption_NetworkUpdateZ_clone_ptr(uint64_t arg) { + LDKCOption_NetworkUpdateZ* arg_conv = (LDKCOption_NetworkUpdateZ*)untag_ptr(arg); + int64_t ret_conv = COption_NetworkUpdateZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_COption_NetworkUpdateZ_clone"))) TS_COption_NetworkUpdateZ_clone(uint32_t orig) { - LDKCOption_NetworkUpdateZ* orig_conv = (LDKCOption_NetworkUpdateZ*)orig; +uint64_t __attribute__((export_name("TS_COption_NetworkUpdateZ_clone"))) TS_COption_NetworkUpdateZ_clone(uint64_t orig) { + LDKCOption_NetworkUpdateZ* orig_conv = (LDKCOption_NetworkUpdateZ*)untag_ptr(orig); LDKCOption_NetworkUpdateZ *ret_copy = MALLOC(sizeof(LDKCOption_NetworkUpdateZ), "LDKCOption_NetworkUpdateZ"); *ret_copy = COption_NetworkUpdateZ_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_CVec_SpendableOutputDescriptorZ_free"))) TS_CVec_SpendableOutputDescriptorZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_SpendableOutputDescriptorZ_free"))) TS_CVec_SpendableOutputDescriptorZ_free(uint64_tArray _res) { LDKCVec_SpendableOutputDescriptorZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKSpendableOutputDescriptor), "LDKCVec_SpendableOutputDescriptorZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t b = 0; b < _res_constr.datalen; b++) { - uint32_t _res_conv_27 = _res_vals[b]; - void* _res_conv_27_ptr = (void*)(((uintptr_t)_res_conv_27) & ~1); + uint64_t _res_conv_27 = _res_vals[b]; + void* _res_conv_27_ptr = untag_ptr(_res_conv_27); CHECK_ACCESS(_res_conv_27_ptr); LDKSpendableOutputDescriptor _res_conv_27_conv = *(LDKSpendableOutputDescriptor*)(_res_conv_27_ptr); - FREE((void*)_res_conv_27); + FREE(untag_ptr(_res_conv_27)); _res_constr.data[b] = _res_conv_27_conv; } FREE(_res); CVec_SpendableOutputDescriptorZ_free(_res_constr); } -uint32_t __attribute__((export_name("TS_COption_EventZ_some"))) TS_COption_EventZ_some(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_COption_EventZ_some"))) TS_COption_EventZ_some(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKEvent o_conv = *(LDKEvent*)(o_ptr); - o_conv = Event_clone((LDKEvent*)(((uintptr_t)o) & ~1)); + o_conv = Event_clone((LDKEvent*)untag_ptr(o)); LDKCOption_EventZ *ret_copy = MALLOC(sizeof(LDKCOption_EventZ), "LDKCOption_EventZ"); *ret_copy = COption_EventZ_some(o_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_EventZ_none"))) TS_COption_EventZ_none() { +uint64_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(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_COption_EventZ_free"))) TS_COption_EventZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCOption_EventZ _res_conv = *(LDKCOption_EventZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); COption_EventZ_free(_res_conv); } -static inline uintptr_t COption_EventZ_clone_ptr(LDKCOption_EventZ *NONNULL_PTR arg) { +static inline uint64_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); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_EventZ_clone_ptr"))) TS_COption_EventZ_clone_ptr(uint32_t arg) { - LDKCOption_EventZ* arg_conv = (LDKCOption_EventZ*)arg; - uint32_t ret_conv = COption_EventZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_COption_EventZ_clone_ptr"))) TS_COption_EventZ_clone_ptr(uint64_t arg) { + LDKCOption_EventZ* arg_conv = (LDKCOption_EventZ*)untag_ptr(arg); + int64_t ret_conv = COption_EventZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_COption_EventZ_clone"))) TS_COption_EventZ_clone(uint32_t orig) { - LDKCOption_EventZ* orig_conv = (LDKCOption_EventZ*)orig; +uint64_t __attribute__((export_name("TS_COption_EventZ_clone"))) TS_COption_EventZ_clone(uint64_t orig) { + LDKCOption_EventZ* orig_conv = (LDKCOption_EventZ*)untag_ptr(orig); LDKCOption_EventZ *ret_copy = MALLOC(sizeof(LDKCOption_EventZ), "LDKCOption_EventZ"); *ret_copy = COption_EventZ_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_ok"))) TS_CResult_COption_EventZDecodeErrorZ_ok(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKCOption_EventZ o_conv = *(LDKCOption_EventZ*)(o_ptr); - o_conv = COption_EventZ_clone((LDKCOption_EventZ*)(((uintptr_t)o) & ~1)); + o_conv = COption_EventZ_clone((LDKCOption_EventZ*)untag_ptr(o)); LDKCResult_COption_EventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_EventZDecodeErrorZ), "LDKCResult_COption_EventZDecodeErrorZ"); *ret_conv = CResult_COption_EventZDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_err"))) TS_CResult_COption_EventZDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_err"))) TS_CResult_COption_EventZDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_is_ok"))) TS_CResult_COption_EventZDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_COption_EventZDecodeErrorZ* o_conv = (LDKCResult_COption_EventZDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_is_ok"))) TS_CResult_COption_EventZDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_COption_EventZDecodeErrorZ* o_conv = (LDKCResult_COption_EventZDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_COption_EventZDecodeErrorZ_is_ok(o_conv); return ret_conv; } -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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_free"))) TS_CResult_COption_EventZDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_COption_EventZDecodeErrorZ _res_conv = *(LDKCResult_COption_EventZDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_COption_EventZDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_COption_EventZDecodeErrorZ_clone_ptr(LDKCResult_COption_EventZDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_COption_EventZDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_clone_ptr"))) TS_CResult_COption_EventZDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_COption_EventZDecodeErrorZ* arg_conv = (LDKCResult_COption_EventZDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_COption_EventZDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_clone"))) TS_CResult_COption_EventZDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_COption_EventZDecodeErrorZ* orig_conv = (LDKCResult_COption_EventZDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_clone"))) TS_CResult_COption_EventZDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_COption_EventZDecodeErrorZ* orig_conv = (LDKCResult_COption_EventZDecodeErrorZ*)untag_ptr(orig); LDKCResult_COption_EventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_EventZDecodeErrorZ), "LDKCResult_COption_EventZDecodeErrorZ"); *ret_conv = CResult_COption_EventZDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_CVec_MessageSendEventZ_free"))) TS_CVec_MessageSendEventZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_MessageSendEventZ_free"))) TS_CVec_MessageSendEventZ_free(uint64_tArray _res) { LDKCVec_MessageSendEventZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKMessageSendEvent), "LDKCVec_MessageSendEventZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t s = 0; s < _res_constr.datalen; s++) { - uint32_t _res_conv_18 = _res_vals[s]; - void* _res_conv_18_ptr = (void*)(((uintptr_t)_res_conv_18) & ~1); + uint64_t _res_conv_18 = _res_vals[s]; + void* _res_conv_18_ptr = untag_ptr(_res_conv_18); CHECK_ACCESS(_res_conv_18_ptr); LDKMessageSendEvent _res_conv_18_conv = *(LDKMessageSendEvent*)(_res_conv_18_ptr); - FREE((void*)_res_conv_18); + FREE(untag_ptr(_res_conv_18)); _res_constr.data[s] = _res_conv_18_conv; } FREE(_res); CVec_MessageSendEventZ_free(_res_constr); } -uint32_t __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_ok"))) TS_CResult_TxOutAccessErrorZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_ok"))) TS_CResult_TxOutAccessErrorZ_ok(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKTxOut o_conv = *(LDKTxOut*)(o_ptr); - o_conv = TxOut_clone((LDKTxOut*)(((uintptr_t)o) & ~1)); + o_conv = TxOut_clone((LDKTxOut*)untag_ptr(o)); LDKCResult_TxOutAccessErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxOutAccessErrorZ), "LDKCResult_TxOutAccessErrorZ"); *ret_conv = CResult_TxOutAccessErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_err"))) TS_CResult_TxOutAccessErrorZ_err(uint32_t e) { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_is_ok"))) TS_CResult_TxOutAccessErrorZ_is_ok(uint32_t o) { - LDKCResult_TxOutAccessErrorZ* o_conv = (LDKCResult_TxOutAccessErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_is_ok"))) TS_CResult_TxOutAccessErrorZ_is_ok(uint64_t o) { + LDKCResult_TxOutAccessErrorZ* o_conv = (LDKCResult_TxOutAccessErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_TxOutAccessErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_free"))) TS_CResult_TxOutAccessErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_free"))) TS_CResult_TxOutAccessErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_TxOutAccessErrorZ _res_conv = *(LDKCResult_TxOutAccessErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_TxOutAccessErrorZ_free(_res_conv); } -static inline uintptr_t CResult_TxOutAccessErrorZ_clone_ptr(LDKCResult_TxOutAccessErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_TxOutAccessErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_clone_ptr"))) TS_CResult_TxOutAccessErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_TxOutAccessErrorZ* arg_conv = (LDKCResult_TxOutAccessErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_TxOutAccessErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_clone"))) TS_CResult_TxOutAccessErrorZ_clone(uint32_t orig) { - LDKCResult_TxOutAccessErrorZ* orig_conv = (LDKCResult_TxOutAccessErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_clone"))) TS_CResult_TxOutAccessErrorZ_clone(uint64_t orig) { + LDKCResult_TxOutAccessErrorZ* orig_conv = (LDKCResult_TxOutAccessErrorZ*)untag_ptr(orig); LDKCResult_TxOutAccessErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxOutAccessErrorZ), "LDKCResult_TxOutAccessErrorZ"); *ret_conv = CResult_TxOutAccessErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -static inline uintptr_t C2Tuple_usizeTransactionZ_clone_ptr(LDKC2Tuple_usizeTransactionZ *NONNULL_PTR arg) { +static inline uint64_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 ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = C2Tuple_usizeTransactionZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_clone_ptr"))) TS_C2Tuple_usizeTransactionZ_clone_ptr(uint64_t arg) { + LDKC2Tuple_usizeTransactionZ* arg_conv = (LDKC2Tuple_usizeTransactionZ*)untag_ptr(arg); + int64_t ret_conv = C2Tuple_usizeTransactionZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_clone"))) TS_C2Tuple_usizeTransactionZ_clone(uint32_t orig) { - LDKC2Tuple_usizeTransactionZ* orig_conv = (LDKC2Tuple_usizeTransactionZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_clone"))) TS_C2Tuple_usizeTransactionZ_clone(uint64_t orig) { + LDKC2Tuple_usizeTransactionZ* orig_conv = (LDKC2Tuple_usizeTransactionZ*)untag_ptr(orig); LDKC2Tuple_usizeTransactionZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_usizeTransactionZ), "LDKC2Tuple_usizeTransactionZ"); *ret_conv = C2Tuple_usizeTransactionZ_clone(orig_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_new"))) TS_C2Tuple_usizeTransactionZ_new(uint32_t a, int8_tArray b) { +uint64_t __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_new"))) TS_C2Tuple_usizeTransactionZ_new(uint32_t a, int8_tArray b) { LDKTransaction b_ref; b_ref.datalen = b->arr_len; b_ref.data = MALLOC(b_ref.datalen, "LDKTransaction Bytes"); @@ -13471,32 +12194,32 @@ uint32_t __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_new"))) TS_C2 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 ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_free"))) TS_C2Tuple_usizeTransactionZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_free"))) TS_C2Tuple_usizeTransactionZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKC2Tuple_usizeTransactionZ _res_conv = *(LDKC2Tuple_usizeTransactionZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); C2Tuple_usizeTransactionZ_free(_res_conv); } -void __attribute__((export_name("TS_CVec_C2Tuple_usizeTransactionZZ_free"))) TS_CVec_C2Tuple_usizeTransactionZZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_C2Tuple_usizeTransactionZZ_free"))) TS_CVec_C2Tuple_usizeTransactionZZ_free(uint64_tArray _res) { LDKCVec_C2Tuple_usizeTransactionZZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _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; + uint64_t* _res_vals = _res->elems; for (size_t c = 0; c < _res_constr.datalen; c++) { - uint32_t _res_conv_28 = _res_vals[c]; - void* _res_conv_28_ptr = (void*)(((uintptr_t)_res_conv_28) & ~1); + uint64_t _res_conv_28 = _res_vals[c]; + void* _res_conv_28_ptr = untag_ptr(_res_conv_28); CHECK_ACCESS(_res_conv_28_ptr); LDKC2Tuple_usizeTransactionZ _res_conv_28_conv = *(LDKC2Tuple_usizeTransactionZ*)(_res_conv_28_ptr); - FREE((void*)_res_conv_28); + FREE(untag_ptr(_res_conv_28)); _res_constr.data[c] = _res_conv_28_conv; } FREE(_res); @@ -13522,94 +12245,94 @@ void __attribute__((export_name("TS_CVec_TxidZ_free"))) TS_CVec_TxidZ_free(ptrA CVec_TxidZ_free(_res_constr); } -uint32_t __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_ok"))) TS_CResult_NoneChannelMonitorUpdateErrZ_ok() { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_err"))) TS_CResult_NoneChannelMonitorUpdateErrZ_err(uint32_t e) { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_is_ok"))) TS_CResult_NoneChannelMonitorUpdateErrZ_is_ok(uint32_t o) { - LDKCResult_NoneChannelMonitorUpdateErrZ* o_conv = (LDKCResult_NoneChannelMonitorUpdateErrZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_is_ok"))) TS_CResult_NoneChannelMonitorUpdateErrZ_is_ok(uint64_t o) { + LDKCResult_NoneChannelMonitorUpdateErrZ* o_conv = (LDKCResult_NoneChannelMonitorUpdateErrZ*)untag_ptr(o); jboolean ret_conv = CResult_NoneChannelMonitorUpdateErrZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_free"))) TS_CResult_NoneChannelMonitorUpdateErrZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_free"))) TS_CResult_NoneChannelMonitorUpdateErrZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_NoneChannelMonitorUpdateErrZ _res_conv = *(LDKCResult_NoneChannelMonitorUpdateErrZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_NoneChannelMonitorUpdateErrZ_free(_res_conv); } -static inline uintptr_t CResult_NoneChannelMonitorUpdateErrZ_clone_ptr(LDKCResult_NoneChannelMonitorUpdateErrZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_NoneChannelMonitorUpdateErrZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_clone_ptr"))) TS_CResult_NoneChannelMonitorUpdateErrZ_clone_ptr(uint64_t arg) { + LDKCResult_NoneChannelMonitorUpdateErrZ* arg_conv = (LDKCResult_NoneChannelMonitorUpdateErrZ*)untag_ptr(arg); + int64_t ret_conv = CResult_NoneChannelMonitorUpdateErrZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_clone"))) TS_CResult_NoneChannelMonitorUpdateErrZ_clone(uint32_t orig) { - LDKCResult_NoneChannelMonitorUpdateErrZ* orig_conv = (LDKCResult_NoneChannelMonitorUpdateErrZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_clone"))) TS_CResult_NoneChannelMonitorUpdateErrZ_clone(uint64_t orig) { + LDKCResult_NoneChannelMonitorUpdateErrZ* orig_conv = (LDKCResult_NoneChannelMonitorUpdateErrZ*)untag_ptr(orig); LDKCResult_NoneChannelMonitorUpdateErrZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneChannelMonitorUpdateErrZ), "LDKCResult_NoneChannelMonitorUpdateErrZ"); *ret_conv = CResult_NoneChannelMonitorUpdateErrZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_CVec_MonitorEventZ_free"))) TS_CVec_MonitorEventZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_MonitorEventZ_free"))) TS_CVec_MonitorEventZ_free(uint64_tArray _res) { LDKCVec_MonitorEventZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKMonitorEvent), "LDKCVec_MonitorEventZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t o = 0; o < _res_constr.datalen; o++) { - uint32_t _res_conv_14 = _res_vals[o]; - void* _res_conv_14_ptr = (void*)(((uintptr_t)_res_conv_14) & ~1); + uint64_t _res_conv_14 = _res_vals[o]; + void* _res_conv_14_ptr = untag_ptr(_res_conv_14); CHECK_ACCESS(_res_conv_14_ptr); LDKMonitorEvent _res_conv_14_conv = *(LDKMonitorEvent*)(_res_conv_14_ptr); - FREE((void*)_res_conv_14); + FREE(untag_ptr(_res_conv_14)); _res_constr.data[o] = _res_conv_14_conv; } FREE(_res); CVec_MonitorEventZ_free(_res_constr); } -static inline uintptr_t C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone_ptr(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ *NONNULL_PTR arg) { +static inline uint64_t C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone_ptr(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ *NONNULL_PTR arg) { LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ* ret_conv = MALLOC(sizeof(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ), "LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ"); *ret_conv = C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone(arg); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone_ptr"))) TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone_ptr(uint32_t arg) { - LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ* arg_conv = (LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ*)(arg & ~1); - uint32_t ret_conv = C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone_ptr"))) TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone_ptr(uint64_t arg) { + LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ* arg_conv = (LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ*)untag_ptr(arg); + int64_t ret_conv = C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone"))) TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone(uint32_t orig) { - LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ* orig_conv = (LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone"))) TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone(uint64_t orig) { + LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ* orig_conv = (LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ*)untag_ptr(orig); LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ* ret_conv = MALLOC(sizeof(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ), "LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ"); *ret_conv = C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone(orig_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_new"))) TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_new(uint32_t a, uint32_tArray b, int8_tArray c) { +uint64_t __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_new"))) TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_new(uint64_t a, uint64_tArray b, int8_tArray c) { LDKOutPoint a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = (a & 1) || (a == 0); + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); a_conv = OutPoint_clone(&a_conv); LDKCVec_MonitorEventZ b_constr; @@ -13618,13 +12341,13 @@ uint32_t __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZPubli b_constr.data = MALLOC(b_constr.datalen * sizeof(LDKMonitorEvent), "LDKCVec_MonitorEventZ Elements"); else b_constr.data = NULL; - uint32_t* b_vals = b->elems; + uint64_t* b_vals = b->elems; for (size_t o = 0; o < b_constr.datalen; o++) { - uint32_t b_conv_14 = b_vals[o]; - void* b_conv_14_ptr = (void*)(((uintptr_t)b_conv_14) & ~1); + uint64_t b_conv_14 = b_vals[o]; + void* b_conv_14_ptr = untag_ptr(b_conv_14); CHECK_ACCESS(b_conv_14_ptr); LDKMonitorEvent b_conv_14_conv = *(LDKMonitorEvent*)(b_conv_14_ptr); - b_conv_14_conv = MonitorEvent_clone((LDKMonitorEvent*)(((uintptr_t)b_conv_14) & ~1)); + b_conv_14_conv = MonitorEvent_clone((LDKMonitorEvent*)untag_ptr(b_conv_14)); b_constr.data[o] = b_conv_14_conv; } FREE(b); @@ -13633,233 +12356,233 @@ uint32_t __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZPubli memcpy(c_ref.compressed_form, c->elems, 33); FREE(c); LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ* ret_conv = MALLOC(sizeof(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ), "LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ"); *ret_conv = C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_new(a_conv, b_constr, c_ref); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_free"))) TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_free"))) TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ _res_conv = *(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_free(_res_conv); } -void __attribute__((export_name("TS_CVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ_free"))) TS_CVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ_free"))) TS_CVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ_free(uint64_tArray _res) { LDKCVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ), "LDKCVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t x = 0; x < _res_constr.datalen; x++) { - uint32_t _res_conv_49 = _res_vals[x]; - void* _res_conv_49_ptr = (void*)(((uintptr_t)_res_conv_49) & ~1); + uint64_t _res_conv_49 = _res_vals[x]; + void* _res_conv_49_ptr = untag_ptr(_res_conv_49); CHECK_ACCESS(_res_conv_49_ptr); LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ _res_conv_49_conv = *(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ*)(_res_conv_49_ptr); - FREE((void*)_res_conv_49); + FREE(untag_ptr(_res_conv_49)); _res_constr.data[x] = _res_conv_49_conv; } FREE(_res); CVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ_free(_res_constr); } -uint32_t __attribute__((export_name("TS_COption_C2Tuple_usizeTransactionZZ_some"))) TS_COption_C2Tuple_usizeTransactionZZ_some(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_COption_C2Tuple_usizeTransactionZZ_some"))) TS_COption_C2Tuple_usizeTransactionZZ_some(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKC2Tuple_usizeTransactionZ o_conv = *(LDKC2Tuple_usizeTransactionZ*)(o_ptr); - o_conv = C2Tuple_usizeTransactionZ_clone((LDKC2Tuple_usizeTransactionZ*)(((uintptr_t)o) & ~1)); + o_conv = C2Tuple_usizeTransactionZ_clone((LDKC2Tuple_usizeTransactionZ*)untag_ptr(o)); LDKCOption_C2Tuple_usizeTransactionZZ *ret_copy = MALLOC(sizeof(LDKCOption_C2Tuple_usizeTransactionZZ), "LDKCOption_C2Tuple_usizeTransactionZZ"); *ret_copy = COption_C2Tuple_usizeTransactionZZ_some(o_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_C2Tuple_usizeTransactionZZ_none"))) TS_COption_C2Tuple_usizeTransactionZZ_none() { +uint64_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(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_COption_C2Tuple_usizeTransactionZZ_free"))) TS_COption_C2Tuple_usizeTransactionZZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCOption_C2Tuple_usizeTransactionZZ _res_conv = *(LDKCOption_C2Tuple_usizeTransactionZZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); COption_C2Tuple_usizeTransactionZZ_free(_res_conv); } -static inline uintptr_t COption_C2Tuple_usizeTransactionZZ_clone_ptr(LDKCOption_C2Tuple_usizeTransactionZZ *NONNULL_PTR arg) { +static inline uint64_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); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_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; - uint32_t ret_conv = COption_C2Tuple_usizeTransactionZZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_COption_C2Tuple_usizeTransactionZZ_clone_ptr"))) TS_COption_C2Tuple_usizeTransactionZZ_clone_ptr(uint64_t arg) { + LDKCOption_C2Tuple_usizeTransactionZZ* arg_conv = (LDKCOption_C2Tuple_usizeTransactionZZ*)untag_ptr(arg); + int64_t ret_conv = COption_C2Tuple_usizeTransactionZZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_COption_C2Tuple_usizeTransactionZZ_clone"))) TS_COption_C2Tuple_usizeTransactionZZ_clone(uint32_t orig) { - LDKCOption_C2Tuple_usizeTransactionZZ* orig_conv = (LDKCOption_C2Tuple_usizeTransactionZZ*)orig; +uint64_t __attribute__((export_name("TS_COption_C2Tuple_usizeTransactionZZ_clone"))) TS_COption_C2Tuple_usizeTransactionZZ_clone(uint64_t orig) { + LDKCOption_C2Tuple_usizeTransactionZZ* orig_conv = (LDKCOption_C2Tuple_usizeTransactionZZ*)untag_ptr(orig); LDKCOption_C2Tuple_usizeTransactionZZ *ret_copy = MALLOC(sizeof(LDKCOption_C2Tuple_usizeTransactionZZ), "LDKCOption_C2Tuple_usizeTransactionZZ"); *ret_copy = COption_C2Tuple_usizeTransactionZZ_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_ok"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_ok"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_ok(uint64_t o) { LDKFixedPenaltyScorer o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = FixedPenaltyScorer_clone(&o_conv); LDKCResult_FixedPenaltyScorerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FixedPenaltyScorerDecodeErrorZ), "LDKCResult_FixedPenaltyScorerDecodeErrorZ"); *ret_conv = CResult_FixedPenaltyScorerDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_err"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_err"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_FixedPenaltyScorerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FixedPenaltyScorerDecodeErrorZ), "LDKCResult_FixedPenaltyScorerDecodeErrorZ"); *ret_conv = CResult_FixedPenaltyScorerDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_is_ok"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_FixedPenaltyScorerDecodeErrorZ* o_conv = (LDKCResult_FixedPenaltyScorerDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_is_ok"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_FixedPenaltyScorerDecodeErrorZ* o_conv = (LDKCResult_FixedPenaltyScorerDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_FixedPenaltyScorerDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_free"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_free"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_FixedPenaltyScorerDecodeErrorZ _res_conv = *(LDKCResult_FixedPenaltyScorerDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_FixedPenaltyScorerDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_FixedPenaltyScorerDecodeErrorZ_clone_ptr(LDKCResult_FixedPenaltyScorerDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_FixedPenaltyScorerDecodeErrorZ_clone_ptr(LDKCResult_FixedPenaltyScorerDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_FixedPenaltyScorerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FixedPenaltyScorerDecodeErrorZ), "LDKCResult_FixedPenaltyScorerDecodeErrorZ"); *ret_conv = CResult_FixedPenaltyScorerDecodeErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_clone_ptr"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_FixedPenaltyScorerDecodeErrorZ* arg_conv = (LDKCResult_FixedPenaltyScorerDecodeErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_FixedPenaltyScorerDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_clone_ptr"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_FixedPenaltyScorerDecodeErrorZ* arg_conv = (LDKCResult_FixedPenaltyScorerDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_FixedPenaltyScorerDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_clone"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_FixedPenaltyScorerDecodeErrorZ* orig_conv = (LDKCResult_FixedPenaltyScorerDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_clone"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_FixedPenaltyScorerDecodeErrorZ* orig_conv = (LDKCResult_FixedPenaltyScorerDecodeErrorZ*)untag_ptr(orig); LDKCResult_FixedPenaltyScorerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FixedPenaltyScorerDecodeErrorZ), "LDKCResult_FixedPenaltyScorerDecodeErrorZ"); *ret_conv = CResult_FixedPenaltyScorerDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -static inline uintptr_t C2Tuple_u64u64Z_clone_ptr(LDKC2Tuple_u64u64Z *NONNULL_PTR arg) { +static inline uint64_t C2Tuple_u64u64Z_clone_ptr(LDKC2Tuple_u64u64Z *NONNULL_PTR arg) { LDKC2Tuple_u64u64Z* ret_conv = MALLOC(sizeof(LDKC2Tuple_u64u64Z), "LDKC2Tuple_u64u64Z"); *ret_conv = C2Tuple_u64u64Z_clone(arg); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C2Tuple_u64u64Z_clone_ptr"))) TS_C2Tuple_u64u64Z_clone_ptr(uint32_t arg) { - LDKC2Tuple_u64u64Z* arg_conv = (LDKC2Tuple_u64u64Z*)(arg & ~1); - uint32_t ret_conv = C2Tuple_u64u64Z_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_C2Tuple_u64u64Z_clone_ptr"))) TS_C2Tuple_u64u64Z_clone_ptr(uint64_t arg) { + LDKC2Tuple_u64u64Z* arg_conv = (LDKC2Tuple_u64u64Z*)untag_ptr(arg); + int64_t ret_conv = C2Tuple_u64u64Z_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_C2Tuple_u64u64Z_clone"))) TS_C2Tuple_u64u64Z_clone(uint32_t orig) { - LDKC2Tuple_u64u64Z* orig_conv = (LDKC2Tuple_u64u64Z*)(orig & ~1); +uint64_t __attribute__((export_name("TS_C2Tuple_u64u64Z_clone"))) TS_C2Tuple_u64u64Z_clone(uint64_t orig) { + LDKC2Tuple_u64u64Z* orig_conv = (LDKC2Tuple_u64u64Z*)untag_ptr(orig); LDKC2Tuple_u64u64Z* ret_conv = MALLOC(sizeof(LDKC2Tuple_u64u64Z), "LDKC2Tuple_u64u64Z"); *ret_conv = C2Tuple_u64u64Z_clone(orig_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C2Tuple_u64u64Z_new"))) TS_C2Tuple_u64u64Z_new(int64_t a, int64_t b) { +uint64_t __attribute__((export_name("TS_C2Tuple_u64u64Z_new"))) TS_C2Tuple_u64u64Z_new(int64_t a, int64_t b) { LDKC2Tuple_u64u64Z* ret_conv = MALLOC(sizeof(LDKC2Tuple_u64u64Z), "LDKC2Tuple_u64u64Z"); *ret_conv = C2Tuple_u64u64Z_new(a, b); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_C2Tuple_u64u64Z_free"))) TS_C2Tuple_u64u64Z_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_C2Tuple_u64u64Z_free"))) TS_C2Tuple_u64u64Z_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKC2Tuple_u64u64Z _res_conv = *(LDKC2Tuple_u64u64Z*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); C2Tuple_u64u64Z_free(_res_conv); } -uint32_t __attribute__((export_name("TS_COption_C2Tuple_u64u64ZZ_some"))) TS_COption_C2Tuple_u64u64ZZ_some(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_COption_C2Tuple_u64u64ZZ_some"))) TS_COption_C2Tuple_u64u64ZZ_some(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKC2Tuple_u64u64Z o_conv = *(LDKC2Tuple_u64u64Z*)(o_ptr); - o_conv = C2Tuple_u64u64Z_clone((LDKC2Tuple_u64u64Z*)(((uintptr_t)o) & ~1)); + o_conv = C2Tuple_u64u64Z_clone((LDKC2Tuple_u64u64Z*)untag_ptr(o)); LDKCOption_C2Tuple_u64u64ZZ *ret_copy = MALLOC(sizeof(LDKCOption_C2Tuple_u64u64ZZ), "LDKCOption_C2Tuple_u64u64ZZ"); *ret_copy = COption_C2Tuple_u64u64ZZ_some(o_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_C2Tuple_u64u64ZZ_none"))) TS_COption_C2Tuple_u64u64ZZ_none() { +uint64_t __attribute__((export_name("TS_COption_C2Tuple_u64u64ZZ_none"))) TS_COption_C2Tuple_u64u64ZZ_none() { LDKCOption_C2Tuple_u64u64ZZ *ret_copy = MALLOC(sizeof(LDKCOption_C2Tuple_u64u64ZZ), "LDKCOption_C2Tuple_u64u64ZZ"); *ret_copy = COption_C2Tuple_u64u64ZZ_none(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_COption_C2Tuple_u64u64ZZ_free"))) TS_COption_C2Tuple_u64u64ZZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_COption_C2Tuple_u64u64ZZ_free"))) TS_COption_C2Tuple_u64u64ZZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCOption_C2Tuple_u64u64ZZ _res_conv = *(LDKCOption_C2Tuple_u64u64ZZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); COption_C2Tuple_u64u64ZZ_free(_res_conv); } -static inline uintptr_t COption_C2Tuple_u64u64ZZ_clone_ptr(LDKCOption_C2Tuple_u64u64ZZ *NONNULL_PTR arg) { +static inline uint64_t COption_C2Tuple_u64u64ZZ_clone_ptr(LDKCOption_C2Tuple_u64u64ZZ *NONNULL_PTR arg) { LDKCOption_C2Tuple_u64u64ZZ *ret_copy = MALLOC(sizeof(LDKCOption_C2Tuple_u64u64ZZ), "LDKCOption_C2Tuple_u64u64ZZ"); *ret_copy = COption_C2Tuple_u64u64ZZ_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_C2Tuple_u64u64ZZ_clone_ptr"))) TS_COption_C2Tuple_u64u64ZZ_clone_ptr(uint32_t arg) { - LDKCOption_C2Tuple_u64u64ZZ* arg_conv = (LDKCOption_C2Tuple_u64u64ZZ*)arg; - uint32_t ret_conv = COption_C2Tuple_u64u64ZZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_COption_C2Tuple_u64u64ZZ_clone_ptr"))) TS_COption_C2Tuple_u64u64ZZ_clone_ptr(uint64_t arg) { + LDKCOption_C2Tuple_u64u64ZZ* arg_conv = (LDKCOption_C2Tuple_u64u64ZZ*)untag_ptr(arg); + int64_t ret_conv = COption_C2Tuple_u64u64ZZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_COption_C2Tuple_u64u64ZZ_clone"))) TS_COption_C2Tuple_u64u64ZZ_clone(uint32_t orig) { - LDKCOption_C2Tuple_u64u64ZZ* orig_conv = (LDKCOption_C2Tuple_u64u64ZZ*)orig; +uint64_t __attribute__((export_name("TS_COption_C2Tuple_u64u64ZZ_clone"))) TS_COption_C2Tuple_u64u64ZZ_clone(uint64_t orig) { + LDKCOption_C2Tuple_u64u64ZZ* orig_conv = (LDKCOption_C2Tuple_u64u64ZZ*)untag_ptr(orig); LDKCOption_C2Tuple_u64u64ZZ *ret_copy = MALLOC(sizeof(LDKCOption_C2Tuple_u64u64ZZ), "LDKCOption_C2Tuple_u64u64ZZ"); *ret_copy = COption_C2Tuple_u64u64ZZ_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_CVec_NodeIdZ_free"))) TS_CVec_NodeIdZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_NodeIdZ_free"))) TS_CVec_NodeIdZ_free(uint64_tArray _res) { LDKCVec_NodeIdZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKNodeId), "LDKCVec_NodeIdZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t i = 0; i < _res_constr.datalen; i++) { - uint32_t _res_conv_8 = _res_vals[i]; + uint64_t _res_conv_8 = _res_vals[i]; LDKNodeId _res_conv_8_conv; - _res_conv_8_conv.inner = (void*)(_res_conv_8 & (~1)); - _res_conv_8_conv.is_owned = (_res_conv_8 & 1) || (_res_conv_8 == 0); + _res_conv_8_conv.inner = untag_ptr(_res_conv_8); + _res_conv_8_conv.is_owned = ptr_is_owned(_res_conv_8); CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_8_conv); _res_constr.data[i] = _res_conv_8_conv; } @@ -13867,429 +12590,430 @@ void __attribute__((export_name("TS_CVec_NodeIdZ_free"))) TS_CVec_NodeIdZ_free( CVec_NodeIdZ_free(_res_constr); } -uint32_t __attribute__((export_name("TS_CResult_ProbabilisticScorerDecodeErrorZ_ok"))) TS_CResult_ProbabilisticScorerDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ProbabilisticScorerDecodeErrorZ_ok"))) TS_CResult_ProbabilisticScorerDecodeErrorZ_ok(uint64_t o) { LDKProbabilisticScorer o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); // WARNING: we need a move here but no clone is available for LDKProbabilisticScorer + LDKCResult_ProbabilisticScorerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ProbabilisticScorerDecodeErrorZ), "LDKCResult_ProbabilisticScorerDecodeErrorZ"); *ret_conv = CResult_ProbabilisticScorerDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ProbabilisticScorerDecodeErrorZ_err"))) TS_CResult_ProbabilisticScorerDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ProbabilisticScorerDecodeErrorZ_err"))) TS_CResult_ProbabilisticScorerDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ProbabilisticScorerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ProbabilisticScorerDecodeErrorZ), "LDKCResult_ProbabilisticScorerDecodeErrorZ"); *ret_conv = CResult_ProbabilisticScorerDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ProbabilisticScorerDecodeErrorZ_is_ok"))) TS_CResult_ProbabilisticScorerDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ProbabilisticScorerDecodeErrorZ* o_conv = (LDKCResult_ProbabilisticScorerDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ProbabilisticScorerDecodeErrorZ_is_ok"))) TS_CResult_ProbabilisticScorerDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ProbabilisticScorerDecodeErrorZ* o_conv = (LDKCResult_ProbabilisticScorerDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ProbabilisticScorerDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ProbabilisticScorerDecodeErrorZ_free"))) TS_CResult_ProbabilisticScorerDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ProbabilisticScorerDecodeErrorZ_free"))) TS_CResult_ProbabilisticScorerDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ProbabilisticScorerDecodeErrorZ _res_conv = *(LDKCResult_ProbabilisticScorerDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ProbabilisticScorerDecodeErrorZ_free(_res_conv); } -uint32_t __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_ok"))) TS_CResult_InitFeaturesDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_ok"))) TS_CResult_InitFeaturesDecodeErrorZ_ok(uint64_t o) { LDKInitFeatures o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = InitFeatures_clone(&o_conv); LDKCResult_InitFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitFeaturesDecodeErrorZ), "LDKCResult_InitFeaturesDecodeErrorZ"); *ret_conv = CResult_InitFeaturesDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_err"))) TS_CResult_InitFeaturesDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_err"))) TS_CResult_InitFeaturesDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_InitFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitFeaturesDecodeErrorZ), "LDKCResult_InitFeaturesDecodeErrorZ"); *ret_conv = CResult_InitFeaturesDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_is_ok"))) TS_CResult_InitFeaturesDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_InitFeaturesDecodeErrorZ* o_conv = (LDKCResult_InitFeaturesDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_is_ok"))) TS_CResult_InitFeaturesDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_InitFeaturesDecodeErrorZ* o_conv = (LDKCResult_InitFeaturesDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_InitFeaturesDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_free"))) TS_CResult_InitFeaturesDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_free"))) TS_CResult_InitFeaturesDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_InitFeaturesDecodeErrorZ _res_conv = *(LDKCResult_InitFeaturesDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_InitFeaturesDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_InitFeaturesDecodeErrorZ_clone_ptr(LDKCResult_InitFeaturesDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_InitFeaturesDecodeErrorZ_clone_ptr(LDKCResult_InitFeaturesDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_InitFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitFeaturesDecodeErrorZ), "LDKCResult_InitFeaturesDecodeErrorZ"); *ret_conv = CResult_InitFeaturesDecodeErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_clone_ptr"))) TS_CResult_InitFeaturesDecodeErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_InitFeaturesDecodeErrorZ* arg_conv = (LDKCResult_InitFeaturesDecodeErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_InitFeaturesDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_clone_ptr"))) TS_CResult_InitFeaturesDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_InitFeaturesDecodeErrorZ* arg_conv = (LDKCResult_InitFeaturesDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_InitFeaturesDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_clone"))) TS_CResult_InitFeaturesDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_InitFeaturesDecodeErrorZ* orig_conv = (LDKCResult_InitFeaturesDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_clone"))) TS_CResult_InitFeaturesDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_InitFeaturesDecodeErrorZ* orig_conv = (LDKCResult_InitFeaturesDecodeErrorZ*)untag_ptr(orig); LDKCResult_InitFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitFeaturesDecodeErrorZ), "LDKCResult_InitFeaturesDecodeErrorZ"); *ret_conv = CResult_InitFeaturesDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_ok"))) TS_CResult_ChannelFeaturesDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_ok"))) TS_CResult_ChannelFeaturesDecodeErrorZ_ok(uint64_t o) { LDKChannelFeatures o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ChannelFeatures_clone(&o_conv); LDKCResult_ChannelFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelFeaturesDecodeErrorZ), "LDKCResult_ChannelFeaturesDecodeErrorZ"); *ret_conv = CResult_ChannelFeaturesDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_err"))) TS_CResult_ChannelFeaturesDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_err"))) TS_CResult_ChannelFeaturesDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ChannelFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelFeaturesDecodeErrorZ), "LDKCResult_ChannelFeaturesDecodeErrorZ"); *ret_conv = CResult_ChannelFeaturesDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_is_ok"))) TS_CResult_ChannelFeaturesDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ChannelFeaturesDecodeErrorZ* o_conv = (LDKCResult_ChannelFeaturesDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_is_ok"))) TS_CResult_ChannelFeaturesDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ChannelFeaturesDecodeErrorZ* o_conv = (LDKCResult_ChannelFeaturesDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ChannelFeaturesDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_free"))) TS_CResult_ChannelFeaturesDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_free"))) TS_CResult_ChannelFeaturesDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ChannelFeaturesDecodeErrorZ _res_conv = *(LDKCResult_ChannelFeaturesDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ChannelFeaturesDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ChannelFeaturesDecodeErrorZ_clone_ptr(LDKCResult_ChannelFeaturesDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_ChannelFeaturesDecodeErrorZ_clone_ptr(LDKCResult_ChannelFeaturesDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_ChannelFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelFeaturesDecodeErrorZ), "LDKCResult_ChannelFeaturesDecodeErrorZ"); *ret_conv = CResult_ChannelFeaturesDecodeErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelFeaturesDecodeErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_ChannelFeaturesDecodeErrorZ* arg_conv = (LDKCResult_ChannelFeaturesDecodeErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_ChannelFeaturesDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelFeaturesDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ChannelFeaturesDecodeErrorZ* arg_conv = (LDKCResult_ChannelFeaturesDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ChannelFeaturesDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_clone"))) TS_CResult_ChannelFeaturesDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ChannelFeaturesDecodeErrorZ* orig_conv = (LDKCResult_ChannelFeaturesDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_clone"))) TS_CResult_ChannelFeaturesDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ChannelFeaturesDecodeErrorZ* orig_conv = (LDKCResult_ChannelFeaturesDecodeErrorZ*)untag_ptr(orig); LDKCResult_ChannelFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelFeaturesDecodeErrorZ), "LDKCResult_ChannelFeaturesDecodeErrorZ"); *ret_conv = CResult_ChannelFeaturesDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_ok"))) TS_CResult_NodeFeaturesDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_ok"))) TS_CResult_NodeFeaturesDecodeErrorZ_ok(uint64_t o) { LDKNodeFeatures o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = NodeFeatures_clone(&o_conv); LDKCResult_NodeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeFeaturesDecodeErrorZ), "LDKCResult_NodeFeaturesDecodeErrorZ"); *ret_conv = CResult_NodeFeaturesDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_err"))) TS_CResult_NodeFeaturesDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_err"))) TS_CResult_NodeFeaturesDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_NodeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeFeaturesDecodeErrorZ), "LDKCResult_NodeFeaturesDecodeErrorZ"); *ret_conv = CResult_NodeFeaturesDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_is_ok"))) TS_CResult_NodeFeaturesDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_NodeFeaturesDecodeErrorZ* o_conv = (LDKCResult_NodeFeaturesDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_is_ok"))) TS_CResult_NodeFeaturesDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_NodeFeaturesDecodeErrorZ* o_conv = (LDKCResult_NodeFeaturesDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_NodeFeaturesDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_free"))) TS_CResult_NodeFeaturesDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_free"))) TS_CResult_NodeFeaturesDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_NodeFeaturesDecodeErrorZ _res_conv = *(LDKCResult_NodeFeaturesDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_NodeFeaturesDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_NodeFeaturesDecodeErrorZ_clone_ptr(LDKCResult_NodeFeaturesDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_NodeFeaturesDecodeErrorZ_clone_ptr(LDKCResult_NodeFeaturesDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_NodeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeFeaturesDecodeErrorZ), "LDKCResult_NodeFeaturesDecodeErrorZ"); *ret_conv = CResult_NodeFeaturesDecodeErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_clone_ptr"))) TS_CResult_NodeFeaturesDecodeErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_NodeFeaturesDecodeErrorZ* arg_conv = (LDKCResult_NodeFeaturesDecodeErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_NodeFeaturesDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_clone_ptr"))) TS_CResult_NodeFeaturesDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_NodeFeaturesDecodeErrorZ* arg_conv = (LDKCResult_NodeFeaturesDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_NodeFeaturesDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_clone"))) TS_CResult_NodeFeaturesDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_NodeFeaturesDecodeErrorZ* orig_conv = (LDKCResult_NodeFeaturesDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_clone"))) TS_CResult_NodeFeaturesDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_NodeFeaturesDecodeErrorZ* orig_conv = (LDKCResult_NodeFeaturesDecodeErrorZ*)untag_ptr(orig); LDKCResult_NodeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeFeaturesDecodeErrorZ), "LDKCResult_NodeFeaturesDecodeErrorZ"); *ret_conv = CResult_NodeFeaturesDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_ok"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_ok"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_ok(uint64_t o) { LDKInvoiceFeatures o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = InvoiceFeatures_clone(&o_conv); LDKCResult_InvoiceFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceFeaturesDecodeErrorZ), "LDKCResult_InvoiceFeaturesDecodeErrorZ"); *ret_conv = CResult_InvoiceFeaturesDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_err"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_err"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_InvoiceFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceFeaturesDecodeErrorZ), "LDKCResult_InvoiceFeaturesDecodeErrorZ"); *ret_conv = CResult_InvoiceFeaturesDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_is_ok"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_InvoiceFeaturesDecodeErrorZ* o_conv = (LDKCResult_InvoiceFeaturesDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_is_ok"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_InvoiceFeaturesDecodeErrorZ* o_conv = (LDKCResult_InvoiceFeaturesDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_InvoiceFeaturesDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_free"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_free"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_InvoiceFeaturesDecodeErrorZ _res_conv = *(LDKCResult_InvoiceFeaturesDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_InvoiceFeaturesDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_InvoiceFeaturesDecodeErrorZ_clone_ptr(LDKCResult_InvoiceFeaturesDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_InvoiceFeaturesDecodeErrorZ_clone_ptr(LDKCResult_InvoiceFeaturesDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_InvoiceFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceFeaturesDecodeErrorZ), "LDKCResult_InvoiceFeaturesDecodeErrorZ"); *ret_conv = CResult_InvoiceFeaturesDecodeErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_clone_ptr"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_InvoiceFeaturesDecodeErrorZ* arg_conv = (LDKCResult_InvoiceFeaturesDecodeErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_InvoiceFeaturesDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_clone_ptr"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_InvoiceFeaturesDecodeErrorZ* arg_conv = (LDKCResult_InvoiceFeaturesDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_InvoiceFeaturesDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_clone"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_InvoiceFeaturesDecodeErrorZ* orig_conv = (LDKCResult_InvoiceFeaturesDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_clone"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_InvoiceFeaturesDecodeErrorZ* orig_conv = (LDKCResult_InvoiceFeaturesDecodeErrorZ*)untag_ptr(orig); LDKCResult_InvoiceFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceFeaturesDecodeErrorZ), "LDKCResult_InvoiceFeaturesDecodeErrorZ"); *ret_conv = CResult_InvoiceFeaturesDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_ok"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_ok"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_ok(uint64_t o) { LDKChannelTypeFeatures o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ChannelTypeFeatures_clone(&o_conv); LDKCResult_ChannelTypeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTypeFeaturesDecodeErrorZ), "LDKCResult_ChannelTypeFeaturesDecodeErrorZ"); *ret_conv = CResult_ChannelTypeFeaturesDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_err"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_err"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ChannelTypeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTypeFeaturesDecodeErrorZ), "LDKCResult_ChannelTypeFeaturesDecodeErrorZ"); *ret_conv = CResult_ChannelTypeFeaturesDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_is_ok"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ChannelTypeFeaturesDecodeErrorZ* o_conv = (LDKCResult_ChannelTypeFeaturesDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_is_ok"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ChannelTypeFeaturesDecodeErrorZ* o_conv = (LDKCResult_ChannelTypeFeaturesDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ChannelTypeFeaturesDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_free"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_free"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ChannelTypeFeaturesDecodeErrorZ _res_conv = *(LDKCResult_ChannelTypeFeaturesDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ChannelTypeFeaturesDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ChannelTypeFeaturesDecodeErrorZ_clone_ptr(LDKCResult_ChannelTypeFeaturesDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_ChannelTypeFeaturesDecodeErrorZ_clone_ptr(LDKCResult_ChannelTypeFeaturesDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_ChannelTypeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTypeFeaturesDecodeErrorZ), "LDKCResult_ChannelTypeFeaturesDecodeErrorZ"); *ret_conv = CResult_ChannelTypeFeaturesDecodeErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_ChannelTypeFeaturesDecodeErrorZ* arg_conv = (LDKCResult_ChannelTypeFeaturesDecodeErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_ChannelTypeFeaturesDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ChannelTypeFeaturesDecodeErrorZ* arg_conv = (LDKCResult_ChannelTypeFeaturesDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ChannelTypeFeaturesDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_clone"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ChannelTypeFeaturesDecodeErrorZ* orig_conv = (LDKCResult_ChannelTypeFeaturesDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_clone"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ChannelTypeFeaturesDecodeErrorZ* orig_conv = (LDKCResult_ChannelTypeFeaturesDecodeErrorZ*)untag_ptr(orig); LDKCResult_ChannelTypeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTypeFeaturesDecodeErrorZ), "LDKCResult_ChannelTypeFeaturesDecodeErrorZ"); *ret_conv = CResult_ChannelTypeFeaturesDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_ok"))) TS_CResult_NodeIdDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_ok"))) TS_CResult_NodeIdDecodeErrorZ_ok(uint64_t o) { LDKNodeId o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = NodeId_clone(&o_conv); LDKCResult_NodeIdDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeIdDecodeErrorZ), "LDKCResult_NodeIdDecodeErrorZ"); *ret_conv = CResult_NodeIdDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_err"))) TS_CResult_NodeIdDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_err"))) TS_CResult_NodeIdDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_NodeIdDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeIdDecodeErrorZ), "LDKCResult_NodeIdDecodeErrorZ"); *ret_conv = CResult_NodeIdDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_is_ok"))) TS_CResult_NodeIdDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_NodeIdDecodeErrorZ* o_conv = (LDKCResult_NodeIdDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_is_ok"))) TS_CResult_NodeIdDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_NodeIdDecodeErrorZ* o_conv = (LDKCResult_NodeIdDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_NodeIdDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_free"))) TS_CResult_NodeIdDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_free"))) TS_CResult_NodeIdDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_NodeIdDecodeErrorZ _res_conv = *(LDKCResult_NodeIdDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_NodeIdDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_NodeIdDecodeErrorZ_clone_ptr(LDKCResult_NodeIdDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_NodeIdDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_clone_ptr"))) TS_CResult_NodeIdDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_NodeIdDecodeErrorZ* arg_conv = (LDKCResult_NodeIdDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_NodeIdDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_clone"))) TS_CResult_NodeIdDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_NodeIdDecodeErrorZ* orig_conv = (LDKCResult_NodeIdDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_clone"))) TS_CResult_NodeIdDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_NodeIdDecodeErrorZ* orig_conv = (LDKCResult_NodeIdDecodeErrorZ*)untag_ptr(orig); LDKCResult_NodeIdDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeIdDecodeErrorZ), "LDKCResult_NodeIdDecodeErrorZ"); *ret_conv = CResult_NodeIdDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_ok"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_ok"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_ok(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKCOption_NetworkUpdateZ o_conv = *(LDKCOption_NetworkUpdateZ*)(o_ptr); - o_conv = COption_NetworkUpdateZ_clone((LDKCOption_NetworkUpdateZ*)(((uintptr_t)o) & ~1)); + o_conv = COption_NetworkUpdateZ_clone((LDKCOption_NetworkUpdateZ*)untag_ptr(o)); LDKCResult_COption_NetworkUpdateZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_NetworkUpdateZDecodeErrorZ), "LDKCResult_COption_NetworkUpdateZDecodeErrorZ"); *ret_conv = CResult_COption_NetworkUpdateZDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_err"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_err"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_is_ok"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_COption_NetworkUpdateZDecodeErrorZ* o_conv = (LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_is_ok"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_COption_NetworkUpdateZDecodeErrorZ* o_conv = (LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_COption_NetworkUpdateZDecodeErrorZ_is_ok(o_conv); return ret_conv; } -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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_free"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_COption_NetworkUpdateZDecodeErrorZ _res_conv = *(LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_COption_NetworkUpdateZDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_COption_NetworkUpdateZDecodeErrorZ_clone_ptr(LDKCResult_COption_NetworkUpdateZDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_COption_NetworkUpdateZDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_clone_ptr"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_COption_NetworkUpdateZDecodeErrorZ* arg_conv = (LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_COption_NetworkUpdateZDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_clone"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_COption_NetworkUpdateZDecodeErrorZ* orig_conv = (LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_clone"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_COption_NetworkUpdateZDecodeErrorZ* orig_conv = (LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)untag_ptr(orig); LDKCResult_COption_NetworkUpdateZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_NetworkUpdateZDecodeErrorZ), "LDKCResult_COption_NetworkUpdateZDecodeErrorZ"); *ret_conv = CResult_COption_NetworkUpdateZDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_COption_AccessZ_some"))) TS_COption_AccessZ_some(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_COption_AccessZ_some"))) TS_COption_AccessZ_some(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKAccess o_conv = *(LDKAccess*)(o_ptr); if (o_conv.free == LDKAccess_JCalls_free) { @@ -14298,157 +13022,157 @@ uint32_t __attribute__((export_name("TS_COption_AccessZ_some"))) TS_COption_Acc } LDKCOption_AccessZ *ret_copy = MALLOC(sizeof(LDKCOption_AccessZ), "LDKCOption_AccessZ"); *ret_copy = COption_AccessZ_some(o_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_AccessZ_none"))) TS_COption_AccessZ_none() { +uint64_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(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_COption_AccessZ_free"))) TS_COption_AccessZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCOption_AccessZ _res_conv = *(LDKCOption_AccessZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); COption_AccessZ_free(_res_conv); } -uint32_t __attribute__((export_name("TS_CResult_boolLightningErrorZ_ok"))) TS_CResult_boolLightningErrorZ_ok(jboolean o) { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_boolLightningErrorZ_err"))) TS_CResult_boolLightningErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_boolLightningErrorZ_err"))) TS_CResult_boolLightningErrorZ_err(uint64_t e) { LDKLightningError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = LightningError_clone(&e_conv); LDKCResult_boolLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolLightningErrorZ), "LDKCResult_boolLightningErrorZ"); *ret_conv = CResult_boolLightningErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_boolLightningErrorZ_is_ok"))) TS_CResult_boolLightningErrorZ_is_ok(uint32_t o) { - LDKCResult_boolLightningErrorZ* o_conv = (LDKCResult_boolLightningErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_boolLightningErrorZ_is_ok"))) TS_CResult_boolLightningErrorZ_is_ok(uint64_t o) { + LDKCResult_boolLightningErrorZ* o_conv = (LDKCResult_boolLightningErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_boolLightningErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_boolLightningErrorZ_free"))) TS_CResult_boolLightningErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_boolLightningErrorZ_free"))) TS_CResult_boolLightningErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_boolLightningErrorZ _res_conv = *(LDKCResult_boolLightningErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_boolLightningErrorZ_free(_res_conv); } -static inline uintptr_t CResult_boolLightningErrorZ_clone_ptr(LDKCResult_boolLightningErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_boolLightningErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_boolLightningErrorZ_clone_ptr"))) TS_CResult_boolLightningErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_boolLightningErrorZ* arg_conv = (LDKCResult_boolLightningErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_boolLightningErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_boolLightningErrorZ_clone"))) TS_CResult_boolLightningErrorZ_clone(uint32_t orig) { - LDKCResult_boolLightningErrorZ* orig_conv = (LDKCResult_boolLightningErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_boolLightningErrorZ_clone"))) TS_CResult_boolLightningErrorZ_clone(uint64_t orig) { + LDKCResult_boolLightningErrorZ* orig_conv = (LDKCResult_boolLightningErrorZ*)untag_ptr(orig); LDKCResult_boolLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolLightningErrorZ), "LDKCResult_boolLightningErrorZ"); *ret_conv = CResult_boolLightningErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -static inline uintptr_t C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone_ptr(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ *NONNULL_PTR arg) { +static inline uint64_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 ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone_ptr"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone_ptr(uint64_t arg) { + LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* arg_conv = (LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)untag_ptr(arg); + int64_t ret_conv = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone(uint32_t orig) { - LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* orig_conv = (LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone(uint64_t orig) { + LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* orig_conv = (LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)untag_ptr(orig); LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* ret_conv = MALLOC(sizeof(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ), "LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ"); *ret_conv = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone(orig_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_new"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_new(uint32_t a, uint32_t b, uint32_t c) { +uint64_t __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_new"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_new(uint64_t a, uint64_t b, uint64_t c) { LDKChannelAnnouncement a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = (a & 1) || (a == 0); + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); a_conv = ChannelAnnouncement_clone(&a_conv); LDKChannelUpdate b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = (b & 1) || (b == 0); + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); b_conv = ChannelUpdate_clone(&b_conv); LDKChannelUpdate c_conv; - c_conv.inner = (void*)(c & (~1)); - c_conv.is_owned = (c & 1) || (c == 0); + c_conv.inner = untag_ptr(c); + c_conv.is_owned = ptr_is_owned(c); CHECK_INNER_FIELD_ACCESS_OR_NULL(c_conv); 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 ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_free"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_free"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ _res_conv = *(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_free(_res_conv); } -void __attribute__((export_name("TS_CVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ_free"))) TS_CVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ_free"))) TS_CVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ_free(uint64_tArray _res) { LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _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; + uint64_t* _res_vals = _res->elems; for (size_t h = 0; h < _res_constr.datalen; h++) { - uint32_t _res_conv_59 = _res_vals[h]; - void* _res_conv_59_ptr = (void*)(((uintptr_t)_res_conv_59) & ~1); + uint64_t _res_conv_59 = _res_vals[h]; + void* _res_conv_59_ptr = untag_ptr(_res_conv_59); CHECK_ACCESS(_res_conv_59_ptr); LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ _res_conv_59_conv = *(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(_res_conv_59_ptr); - FREE((void*)_res_conv_59); + FREE(untag_ptr(_res_conv_59)); _res_constr.data[h] = _res_conv_59_conv; } FREE(_res); CVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ_free(_res_constr); } -void __attribute__((export_name("TS_CVec_NodeAnnouncementZ_free"))) TS_CVec_NodeAnnouncementZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_NodeAnnouncementZ_free"))) TS_CVec_NodeAnnouncementZ_free(uint64_tArray _res) { LDKCVec_NodeAnnouncementZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKNodeAnnouncement), "LDKCVec_NodeAnnouncementZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t s = 0; s < _res_constr.datalen; s++) { - uint32_t _res_conv_18 = _res_vals[s]; + uint64_t _res_conv_18 = _res_vals[s]; LDKNodeAnnouncement _res_conv_18_conv; - _res_conv_18_conv.inner = (void*)(_res_conv_18 & (~1)); - _res_conv_18_conv.is_owned = (_res_conv_18 & 1) || (_res_conv_18 == 0); + _res_conv_18_conv.inner = untag_ptr(_res_conv_18); + _res_conv_18_conv.is_owned = ptr_is_owned(_res_conv_18); CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_18_conv); _res_constr.data[s] = _res_conv_18_conv; } @@ -14456,664 +13180,665 @@ void __attribute__((export_name("TS_CVec_NodeAnnouncementZ_free"))) TS_CVec_Nod CVec_NodeAnnouncementZ_free(_res_constr); } -uint32_t __attribute__((export_name("TS_CResult_NoneLightningErrorZ_ok"))) TS_CResult_NoneLightningErrorZ_ok() { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NoneLightningErrorZ_err"))) TS_CResult_NoneLightningErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_NoneLightningErrorZ_err"))) TS_CResult_NoneLightningErrorZ_err(uint64_t e) { LDKLightningError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = LightningError_clone(&e_conv); LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = CResult_NoneLightningErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_NoneLightningErrorZ_is_ok"))) TS_CResult_NoneLightningErrorZ_is_ok(uint32_t o) { - LDKCResult_NoneLightningErrorZ* o_conv = (LDKCResult_NoneLightningErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_NoneLightningErrorZ_is_ok"))) TS_CResult_NoneLightningErrorZ_is_ok(uint64_t o) { + LDKCResult_NoneLightningErrorZ* o_conv = (LDKCResult_NoneLightningErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_NoneLightningErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_NoneLightningErrorZ_free"))) TS_CResult_NoneLightningErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_NoneLightningErrorZ_free"))) TS_CResult_NoneLightningErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_NoneLightningErrorZ _res_conv = *(LDKCResult_NoneLightningErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_NoneLightningErrorZ_free(_res_conv); } -static inline uintptr_t CResult_NoneLightningErrorZ_clone_ptr(LDKCResult_NoneLightningErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_NoneLightningErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_NoneLightningErrorZ_clone_ptr"))) TS_CResult_NoneLightningErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_NoneLightningErrorZ* arg_conv = (LDKCResult_NoneLightningErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_NoneLightningErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_NoneLightningErrorZ_clone"))) TS_CResult_NoneLightningErrorZ_clone(uint32_t orig) { - LDKCResult_NoneLightningErrorZ* orig_conv = (LDKCResult_NoneLightningErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_NoneLightningErrorZ_clone"))) TS_CResult_NoneLightningErrorZ_clone(uint64_t orig) { + LDKCResult_NoneLightningErrorZ* orig_conv = (LDKCResult_NoneLightningErrorZ*)untag_ptr(orig); LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = CResult_NoneLightningErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_ok"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_ok"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_ok(uint64_t o) { LDKChannelUpdateInfo o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ChannelUpdateInfo_clone(&o_conv); LDKCResult_ChannelUpdateInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateInfoDecodeErrorZ), "LDKCResult_ChannelUpdateInfoDecodeErrorZ"); *ret_conv = CResult_ChannelUpdateInfoDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_err"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_err"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ChannelUpdateInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateInfoDecodeErrorZ), "LDKCResult_ChannelUpdateInfoDecodeErrorZ"); *ret_conv = CResult_ChannelUpdateInfoDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_is_ok"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ChannelUpdateInfoDecodeErrorZ* o_conv = (LDKCResult_ChannelUpdateInfoDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_is_ok"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ChannelUpdateInfoDecodeErrorZ* o_conv = (LDKCResult_ChannelUpdateInfoDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ChannelUpdateInfoDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_free"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_free"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ChannelUpdateInfoDecodeErrorZ _res_conv = *(LDKCResult_ChannelUpdateInfoDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ChannelUpdateInfoDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ChannelUpdateInfoDecodeErrorZ_clone_ptr(LDKCResult_ChannelUpdateInfoDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_ChannelUpdateInfoDecodeErrorZ_clone_ptr(LDKCResult_ChannelUpdateInfoDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_ChannelUpdateInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateInfoDecodeErrorZ), "LDKCResult_ChannelUpdateInfoDecodeErrorZ"); *ret_conv = CResult_ChannelUpdateInfoDecodeErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_ChannelUpdateInfoDecodeErrorZ* arg_conv = (LDKCResult_ChannelUpdateInfoDecodeErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_ChannelUpdateInfoDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ChannelUpdateInfoDecodeErrorZ* arg_conv = (LDKCResult_ChannelUpdateInfoDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ChannelUpdateInfoDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_clone"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ChannelUpdateInfoDecodeErrorZ* orig_conv = (LDKCResult_ChannelUpdateInfoDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_clone"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ChannelUpdateInfoDecodeErrorZ* orig_conv = (LDKCResult_ChannelUpdateInfoDecodeErrorZ*)untag_ptr(orig); LDKCResult_ChannelUpdateInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateInfoDecodeErrorZ), "LDKCResult_ChannelUpdateInfoDecodeErrorZ"); *ret_conv = CResult_ChannelUpdateInfoDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_ok"))) TS_CResult_ChannelInfoDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_ok"))) TS_CResult_ChannelInfoDecodeErrorZ_ok(uint64_t o) { LDKChannelInfo o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ChannelInfo_clone(&o_conv); LDKCResult_ChannelInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelInfoDecodeErrorZ), "LDKCResult_ChannelInfoDecodeErrorZ"); *ret_conv = CResult_ChannelInfoDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_err"))) TS_CResult_ChannelInfoDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_err"))) TS_CResult_ChannelInfoDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ChannelInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelInfoDecodeErrorZ), "LDKCResult_ChannelInfoDecodeErrorZ"); *ret_conv = CResult_ChannelInfoDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_is_ok"))) TS_CResult_ChannelInfoDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ChannelInfoDecodeErrorZ* o_conv = (LDKCResult_ChannelInfoDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_is_ok"))) TS_CResult_ChannelInfoDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ChannelInfoDecodeErrorZ* o_conv = (LDKCResult_ChannelInfoDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ChannelInfoDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_free"))) TS_CResult_ChannelInfoDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_free"))) TS_CResult_ChannelInfoDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ChannelInfoDecodeErrorZ _res_conv = *(LDKCResult_ChannelInfoDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ChannelInfoDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ChannelInfoDecodeErrorZ_clone_ptr(LDKCResult_ChannelInfoDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_ChannelInfoDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelInfoDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ChannelInfoDecodeErrorZ* arg_conv = (LDKCResult_ChannelInfoDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ChannelInfoDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_clone"))) TS_CResult_ChannelInfoDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ChannelInfoDecodeErrorZ* orig_conv = (LDKCResult_ChannelInfoDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_clone"))) TS_CResult_ChannelInfoDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ChannelInfoDecodeErrorZ* orig_conv = (LDKCResult_ChannelInfoDecodeErrorZ*)untag_ptr(orig); LDKCResult_ChannelInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelInfoDecodeErrorZ), "LDKCResult_ChannelInfoDecodeErrorZ"); *ret_conv = CResult_ChannelInfoDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_ok"))) TS_CResult_RoutingFeesDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_ok"))) TS_CResult_RoutingFeesDecodeErrorZ_ok(uint64_t o) { LDKRoutingFees o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = RoutingFees_clone(&o_conv); LDKCResult_RoutingFeesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RoutingFeesDecodeErrorZ), "LDKCResult_RoutingFeesDecodeErrorZ"); *ret_conv = CResult_RoutingFeesDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_err"))) TS_CResult_RoutingFeesDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_err"))) TS_CResult_RoutingFeesDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_RoutingFeesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RoutingFeesDecodeErrorZ), "LDKCResult_RoutingFeesDecodeErrorZ"); *ret_conv = CResult_RoutingFeesDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_is_ok"))) TS_CResult_RoutingFeesDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_RoutingFeesDecodeErrorZ* o_conv = (LDKCResult_RoutingFeesDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_is_ok"))) TS_CResult_RoutingFeesDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_RoutingFeesDecodeErrorZ* o_conv = (LDKCResult_RoutingFeesDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_RoutingFeesDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_free"))) TS_CResult_RoutingFeesDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_free"))) TS_CResult_RoutingFeesDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_RoutingFeesDecodeErrorZ _res_conv = *(LDKCResult_RoutingFeesDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_RoutingFeesDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_RoutingFeesDecodeErrorZ_clone_ptr(LDKCResult_RoutingFeesDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_RoutingFeesDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_clone_ptr"))) TS_CResult_RoutingFeesDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_RoutingFeesDecodeErrorZ* arg_conv = (LDKCResult_RoutingFeesDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_RoutingFeesDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_clone"))) TS_CResult_RoutingFeesDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_RoutingFeesDecodeErrorZ* orig_conv = (LDKCResult_RoutingFeesDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_clone"))) TS_CResult_RoutingFeesDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_RoutingFeesDecodeErrorZ* orig_conv = (LDKCResult_RoutingFeesDecodeErrorZ*)untag_ptr(orig); LDKCResult_RoutingFeesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RoutingFeesDecodeErrorZ), "LDKCResult_RoutingFeesDecodeErrorZ"); *ret_conv = CResult_RoutingFeesDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_CVec_NetAddressZ_free"))) TS_CVec_NetAddressZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_NetAddressZ_free"))) TS_CVec_NetAddressZ_free(uint64_tArray _res) { LDKCVec_NetAddressZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKNetAddress), "LDKCVec_NetAddressZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t m = 0; m < _res_constr.datalen; m++) { - uint32_t _res_conv_12 = _res_vals[m]; - void* _res_conv_12_ptr = (void*)(((uintptr_t)_res_conv_12) & ~1); + uint64_t _res_conv_12 = _res_vals[m]; + void* _res_conv_12_ptr = untag_ptr(_res_conv_12); CHECK_ACCESS(_res_conv_12_ptr); LDKNetAddress _res_conv_12_conv = *(LDKNetAddress*)(_res_conv_12_ptr); - FREE((void*)_res_conv_12); + FREE(untag_ptr(_res_conv_12)); _res_constr.data[m] = _res_conv_12_conv; } FREE(_res); CVec_NetAddressZ_free(_res_constr); } -uint32_t __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_ok"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_ok"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_ok(uint64_t o) { LDKNodeAnnouncementInfo o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = NodeAnnouncementInfo_clone(&o_conv); LDKCResult_NodeAnnouncementInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementInfoDecodeErrorZ), "LDKCResult_NodeAnnouncementInfoDecodeErrorZ"); *ret_conv = CResult_NodeAnnouncementInfoDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_err"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_err"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_NodeAnnouncementInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementInfoDecodeErrorZ), "LDKCResult_NodeAnnouncementInfoDecodeErrorZ"); *ret_conv = CResult_NodeAnnouncementInfoDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_is_ok"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_NodeAnnouncementInfoDecodeErrorZ* o_conv = (LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_is_ok"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_NodeAnnouncementInfoDecodeErrorZ* o_conv = (LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_NodeAnnouncementInfoDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_free"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_free"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_NodeAnnouncementInfoDecodeErrorZ _res_conv = *(LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_NodeAnnouncementInfoDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_NodeAnnouncementInfoDecodeErrorZ_clone_ptr(LDKCResult_NodeAnnouncementInfoDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_NodeAnnouncementInfoDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_clone_ptr"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_NodeAnnouncementInfoDecodeErrorZ* arg_conv = (LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_NodeAnnouncementInfoDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_clone"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_NodeAnnouncementInfoDecodeErrorZ* orig_conv = (LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_clone"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_NodeAnnouncementInfoDecodeErrorZ* orig_conv = (LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)untag_ptr(orig); LDKCResult_NodeAnnouncementInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementInfoDecodeErrorZ), "LDKCResult_NodeAnnouncementInfoDecodeErrorZ"); *ret_conv = CResult_NodeAnnouncementInfoDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_ok"))) TS_CResult_NodeAliasDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_ok"))) TS_CResult_NodeAliasDecodeErrorZ_ok(uint64_t o) { LDKNodeAlias o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = NodeAlias_clone(&o_conv); LDKCResult_NodeAliasDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAliasDecodeErrorZ), "LDKCResult_NodeAliasDecodeErrorZ"); *ret_conv = CResult_NodeAliasDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_err"))) TS_CResult_NodeAliasDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_err"))) TS_CResult_NodeAliasDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_NodeAliasDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAliasDecodeErrorZ), "LDKCResult_NodeAliasDecodeErrorZ"); *ret_conv = CResult_NodeAliasDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_is_ok"))) TS_CResult_NodeAliasDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_NodeAliasDecodeErrorZ* o_conv = (LDKCResult_NodeAliasDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_is_ok"))) TS_CResult_NodeAliasDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_NodeAliasDecodeErrorZ* o_conv = (LDKCResult_NodeAliasDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_NodeAliasDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_free"))) TS_CResult_NodeAliasDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_free"))) TS_CResult_NodeAliasDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_NodeAliasDecodeErrorZ _res_conv = *(LDKCResult_NodeAliasDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_NodeAliasDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_NodeAliasDecodeErrorZ_clone_ptr(LDKCResult_NodeAliasDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_NodeAliasDecodeErrorZ_clone_ptr(LDKCResult_NodeAliasDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_NodeAliasDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAliasDecodeErrorZ), "LDKCResult_NodeAliasDecodeErrorZ"); *ret_conv = CResult_NodeAliasDecodeErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_clone_ptr"))) TS_CResult_NodeAliasDecodeErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_NodeAliasDecodeErrorZ* arg_conv = (LDKCResult_NodeAliasDecodeErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_NodeAliasDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_clone_ptr"))) TS_CResult_NodeAliasDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_NodeAliasDecodeErrorZ* arg_conv = (LDKCResult_NodeAliasDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_NodeAliasDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_clone"))) TS_CResult_NodeAliasDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_NodeAliasDecodeErrorZ* orig_conv = (LDKCResult_NodeAliasDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_clone"))) TS_CResult_NodeAliasDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_NodeAliasDecodeErrorZ* orig_conv = (LDKCResult_NodeAliasDecodeErrorZ*)untag_ptr(orig); LDKCResult_NodeAliasDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAliasDecodeErrorZ), "LDKCResult_NodeAliasDecodeErrorZ"); *ret_conv = CResult_NodeAliasDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_ok"))) TS_CResult_NodeInfoDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_ok"))) TS_CResult_NodeInfoDecodeErrorZ_ok(uint64_t o) { LDKNodeInfo o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = NodeInfo_clone(&o_conv); LDKCResult_NodeInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeInfoDecodeErrorZ), "LDKCResult_NodeInfoDecodeErrorZ"); *ret_conv = CResult_NodeInfoDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_err"))) TS_CResult_NodeInfoDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_err"))) TS_CResult_NodeInfoDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_NodeInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeInfoDecodeErrorZ), "LDKCResult_NodeInfoDecodeErrorZ"); *ret_conv = CResult_NodeInfoDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_is_ok"))) TS_CResult_NodeInfoDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_NodeInfoDecodeErrorZ* o_conv = (LDKCResult_NodeInfoDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_is_ok"))) TS_CResult_NodeInfoDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_NodeInfoDecodeErrorZ* o_conv = (LDKCResult_NodeInfoDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_NodeInfoDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_free"))) TS_CResult_NodeInfoDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_free"))) TS_CResult_NodeInfoDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_NodeInfoDecodeErrorZ _res_conv = *(LDKCResult_NodeInfoDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_NodeInfoDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_NodeInfoDecodeErrorZ_clone_ptr(LDKCResult_NodeInfoDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_NodeInfoDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_clone_ptr"))) TS_CResult_NodeInfoDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_NodeInfoDecodeErrorZ* arg_conv = (LDKCResult_NodeInfoDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_NodeInfoDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_clone"))) TS_CResult_NodeInfoDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_NodeInfoDecodeErrorZ* orig_conv = (LDKCResult_NodeInfoDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_clone"))) TS_CResult_NodeInfoDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_NodeInfoDecodeErrorZ* orig_conv = (LDKCResult_NodeInfoDecodeErrorZ*)untag_ptr(orig); LDKCResult_NodeInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeInfoDecodeErrorZ), "LDKCResult_NodeInfoDecodeErrorZ"); *ret_conv = CResult_NodeInfoDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_ok"))) TS_CResult_NetworkGraphDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_ok"))) TS_CResult_NetworkGraphDecodeErrorZ_ok(uint64_t o) { LDKNetworkGraph o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); // WARNING: we need a move here but no clone is available for LDKNetworkGraph + LDKCResult_NetworkGraphDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetworkGraphDecodeErrorZ), "LDKCResult_NetworkGraphDecodeErrorZ"); *ret_conv = CResult_NetworkGraphDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_err"))) TS_CResult_NetworkGraphDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_err"))) TS_CResult_NetworkGraphDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_NetworkGraphDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetworkGraphDecodeErrorZ), "LDKCResult_NetworkGraphDecodeErrorZ"); *ret_conv = CResult_NetworkGraphDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_is_ok"))) TS_CResult_NetworkGraphDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_NetworkGraphDecodeErrorZ* o_conv = (LDKCResult_NetworkGraphDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_is_ok"))) TS_CResult_NetworkGraphDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_NetworkGraphDecodeErrorZ* o_conv = (LDKCResult_NetworkGraphDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_NetworkGraphDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_free"))) TS_CResult_NetworkGraphDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_free"))) TS_CResult_NetworkGraphDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_NetworkGraphDecodeErrorZ _res_conv = *(LDKCResult_NetworkGraphDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_NetworkGraphDecodeErrorZ_free(_res_conv); } -uint32_t __attribute__((export_name("TS_COption_CVec_NetAddressZZ_some"))) TS_COption_CVec_NetAddressZZ_some(uint32_tArray o) { +uint64_t __attribute__((export_name("TS_COption_CVec_NetAddressZZ_some"))) TS_COption_CVec_NetAddressZZ_some(uint64_tArray o) { LDKCVec_NetAddressZ o_constr; o_constr.datalen = o->arr_len; if (o_constr.datalen > 0) o_constr.data = MALLOC(o_constr.datalen * sizeof(LDKNetAddress), "LDKCVec_NetAddressZ Elements"); else o_constr.data = NULL; - uint32_t* o_vals = o->elems; + uint64_t* o_vals = o->elems; for (size_t m = 0; m < o_constr.datalen; m++) { - uint32_t o_conv_12 = o_vals[m]; - void* o_conv_12_ptr = (void*)(((uintptr_t)o_conv_12) & ~1); + uint64_t o_conv_12 = o_vals[m]; + void* o_conv_12_ptr = untag_ptr(o_conv_12); CHECK_ACCESS(o_conv_12_ptr); LDKNetAddress o_conv_12_conv = *(LDKNetAddress*)(o_conv_12_ptr); - o_conv_12_conv = NetAddress_clone((LDKNetAddress*)(((uintptr_t)o_conv_12) & ~1)); + o_conv_12_conv = NetAddress_clone((LDKNetAddress*)untag_ptr(o_conv_12)); o_constr.data[m] = o_conv_12_conv; } FREE(o); LDKCOption_CVec_NetAddressZZ *ret_copy = MALLOC(sizeof(LDKCOption_CVec_NetAddressZZ), "LDKCOption_CVec_NetAddressZZ"); *ret_copy = COption_CVec_NetAddressZZ_some(o_constr); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_CVec_NetAddressZZ_none"))) TS_COption_CVec_NetAddressZZ_none() { +uint64_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(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_COption_CVec_NetAddressZZ_free"))) TS_COption_CVec_NetAddressZZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCOption_CVec_NetAddressZZ _res_conv = *(LDKCOption_CVec_NetAddressZZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); COption_CVec_NetAddressZZ_free(_res_conv); } -static inline uintptr_t COption_CVec_NetAddressZZ_clone_ptr(LDKCOption_CVec_NetAddressZZ *NONNULL_PTR arg) { +static inline uint64_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); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_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; - uint32_t ret_conv = COption_CVec_NetAddressZZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_COption_CVec_NetAddressZZ_clone_ptr"))) TS_COption_CVec_NetAddressZZ_clone_ptr(uint64_t arg) { + LDKCOption_CVec_NetAddressZZ* arg_conv = (LDKCOption_CVec_NetAddressZZ*)untag_ptr(arg); + int64_t ret_conv = COption_CVec_NetAddressZZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_COption_CVec_NetAddressZZ_clone"))) TS_COption_CVec_NetAddressZZ_clone(uint32_t orig) { - LDKCOption_CVec_NetAddressZZ* orig_conv = (LDKCOption_CVec_NetAddressZZ*)orig; +uint64_t __attribute__((export_name("TS_COption_CVec_NetAddressZZ_clone"))) TS_COption_CVec_NetAddressZZ_clone(uint64_t orig) { + LDKCOption_CVec_NetAddressZZ* orig_conv = (LDKCOption_CVec_NetAddressZZ*)untag_ptr(orig); LDKCOption_CVec_NetAddressZZ *ret_copy = MALLOC(sizeof(LDKCOption_CVec_NetAddressZZ), "LDKCOption_CVec_NetAddressZZ"); *ret_copy = COption_CVec_NetAddressZZ_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_ok"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_ok"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_ok(uint64_t o) { LDKDelayedPaymentOutputDescriptor o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = DelayedPaymentOutputDescriptor_clone(&o_conv); LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ"); *ret_conv = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_err"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_err"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ"); *ret_conv = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_is_ok"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* o_conv = (LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_is_ok"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* o_conv = (LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_free"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_free"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ _res_conv = *(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone_ptr(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone_ptr"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* arg_conv = (LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* orig_conv = (LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* orig_conv = (LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ*)untag_ptr(orig); LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ"); *ret_conv = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_ok"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_ok"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_ok(uint64_t o) { LDKStaticPaymentOutputDescriptor o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = StaticPaymentOutputDescriptor_clone(&o_conv); LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ"); *ret_conv = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_err"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_err"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ"); *ret_conv = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_is_ok"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* o_conv = (LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_is_ok"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* o_conv = (LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_free"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_free"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ _res_conv = *(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_StaticPaymentOutputDescriptorDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone_ptr(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone_ptr"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* arg_conv = (LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* orig_conv = (LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* orig_conv = (LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ*)untag_ptr(orig); LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ"); *ret_conv = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_ok"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_ok"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_ok(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKSpendableOutputDescriptor o_conv = *(LDKSpendableOutputDescriptor*)(o_ptr); - o_conv = SpendableOutputDescriptor_clone((LDKSpendableOutputDescriptor*)(((uintptr_t)o) & ~1)); + o_conv = SpendableOutputDescriptor_clone((LDKSpendableOutputDescriptor*)untag_ptr(o)); LDKCResult_SpendableOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SpendableOutputDescriptorDecodeErrorZ), "LDKCResult_SpendableOutputDescriptorDecodeErrorZ"); *ret_conv = CResult_SpendableOutputDescriptorDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_err"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_err"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_SpendableOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SpendableOutputDescriptorDecodeErrorZ), "LDKCResult_SpendableOutputDescriptorDecodeErrorZ"); *ret_conv = CResult_SpendableOutputDescriptorDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_is_ok"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_SpendableOutputDescriptorDecodeErrorZ* o_conv = (LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_is_ok"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_SpendableOutputDescriptorDecodeErrorZ* o_conv = (LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_SpendableOutputDescriptorDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_free"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_free"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_SpendableOutputDescriptorDecodeErrorZ _res_conv = *(LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_SpendableOutputDescriptorDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_SpendableOutputDescriptorDecodeErrorZ_clone_ptr(LDKCResult_SpendableOutputDescriptorDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_SpendableOutputDescriptorDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_clone_ptr"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_SpendableOutputDescriptorDecodeErrorZ* arg_conv = (LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_SpendableOutputDescriptorDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_clone"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_SpendableOutputDescriptorDecodeErrorZ* orig_conv = (LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_clone"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_SpendableOutputDescriptorDecodeErrorZ* orig_conv = (LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)untag_ptr(orig); LDKCResult_SpendableOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SpendableOutputDescriptorDecodeErrorZ), "LDKCResult_SpendableOutputDescriptorDecodeErrorZ"); *ret_conv = CResult_SpendableOutputDescriptorDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } void __attribute__((export_name("TS_CVec_PaymentPreimageZ_free"))) TS_CVec_PaymentPreimageZ_free(ptrArray _res) { @@ -15135,25 +13860,25 @@ void __attribute__((export_name("TS_CVec_PaymentPreimageZ_free"))) TS_CVec_Paym CVec_PaymentPreimageZ_free(_res_constr); } -static inline uintptr_t C2Tuple_SignatureCVec_SignatureZZ_clone_ptr(LDKC2Tuple_SignatureCVec_SignatureZZ *NONNULL_PTR arg) { +static inline uint64_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 ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = C2Tuple_SignatureCVec_SignatureZZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_clone_ptr"))) TS_C2Tuple_SignatureCVec_SignatureZZ_clone_ptr(uint64_t arg) { + LDKC2Tuple_SignatureCVec_SignatureZZ* arg_conv = (LDKC2Tuple_SignatureCVec_SignatureZZ*)untag_ptr(arg); + int64_t ret_conv = C2Tuple_SignatureCVec_SignatureZZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_clone"))) TS_C2Tuple_SignatureCVec_SignatureZZ_clone(uint32_t orig) { - LDKC2Tuple_SignatureCVec_SignatureZZ* orig_conv = (LDKC2Tuple_SignatureCVec_SignatureZZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_clone"))) TS_C2Tuple_SignatureCVec_SignatureZZ_clone(uint64_t orig) { + LDKC2Tuple_SignatureCVec_SignatureZZ* orig_conv = (LDKC2Tuple_SignatureCVec_SignatureZZ*)untag_ptr(orig); LDKC2Tuple_SignatureCVec_SignatureZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_SignatureCVec_SignatureZZ), "LDKC2Tuple_SignatureCVec_SignatureZZ"); *ret_conv = C2Tuple_SignatureCVec_SignatureZZ_clone(orig_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_new"))) TS_C2Tuple_SignatureCVec_SignatureZZ_new(int8_tArray a, ptrArray b) { +uint64_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); FREE(a); @@ -15174,134 +13899,134 @@ uint32_t __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_new") FREE(b); LDKC2Tuple_SignatureCVec_SignatureZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_SignatureCVec_SignatureZZ), "LDKC2Tuple_SignatureCVec_SignatureZZ"); *ret_conv = C2Tuple_SignatureCVec_SignatureZZ_new(a_ref, b_constr); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_free"))) TS_C2Tuple_SignatureCVec_SignatureZZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKC2Tuple_SignatureCVec_SignatureZZ _res_conv = *(LDKC2Tuple_SignatureCVec_SignatureZZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); C2Tuple_SignatureCVec_SignatureZZ_free(_res_conv); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_ok"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_ok"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_ok(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKC2Tuple_SignatureCVec_SignatureZZ o_conv = *(LDKC2Tuple_SignatureCVec_SignatureZZ*)(o_ptr); - o_conv = C2Tuple_SignatureCVec_SignatureZZ_clone((LDKC2Tuple_SignatureCVec_SignatureZZ*)(((uintptr_t)o) & ~1)); + o_conv = C2Tuple_SignatureCVec_SignatureZZ_clone((LDKC2Tuple_SignatureCVec_SignatureZZ*)untag_ptr(o)); LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ), "LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ"); *ret_conv = CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_err"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_err() { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_is_ok"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_is_ok(uint32_t o) { - LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* o_conv = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_is_ok"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_is_ok(uint64_t o) { + LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* o_conv = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)untag_ptr(o); jboolean ret_conv = CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_is_ok(o_conv); return ret_conv; } -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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_free"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ _res_conv = *(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_free(_res_conv); } -static inline uintptr_t CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone_ptr(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone_ptr"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone_ptr(uint64_t arg) { + LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* arg_conv = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)untag_ptr(arg); + int64_t ret_conv = CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone(uint32_t orig) { - LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* orig_conv = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone(uint64_t orig) { + LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* orig_conv = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)untag_ptr(orig); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_SignatureNoneZ_ok"))) TS_CResult_SignatureNoneZ_ok(int8_tArray o) { +uint64_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); FREE(o); LDKCResult_SignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SignatureNoneZ), "LDKCResult_SignatureNoneZ"); *ret_conv = CResult_SignatureNoneZ_ok(o_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_SignatureNoneZ_err"))) TS_CResult_SignatureNoneZ_err() { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_SignatureNoneZ_is_ok"))) TS_CResult_SignatureNoneZ_is_ok(uint32_t o) { - LDKCResult_SignatureNoneZ* o_conv = (LDKCResult_SignatureNoneZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_SignatureNoneZ_is_ok"))) TS_CResult_SignatureNoneZ_is_ok(uint64_t o) { + LDKCResult_SignatureNoneZ* o_conv = (LDKCResult_SignatureNoneZ*)untag_ptr(o); jboolean ret_conv = CResult_SignatureNoneZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_SignatureNoneZ_free"))) TS_CResult_SignatureNoneZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_SignatureNoneZ_free"))) TS_CResult_SignatureNoneZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_SignatureNoneZ _res_conv = *(LDKCResult_SignatureNoneZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_SignatureNoneZ_free(_res_conv); } -static inline uintptr_t CResult_SignatureNoneZ_clone_ptr(LDKCResult_SignatureNoneZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_SignatureNoneZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_SignatureNoneZ_clone_ptr"))) TS_CResult_SignatureNoneZ_clone_ptr(uint64_t arg) { + LDKCResult_SignatureNoneZ* arg_conv = (LDKCResult_SignatureNoneZ*)untag_ptr(arg); + int64_t ret_conv = CResult_SignatureNoneZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_SignatureNoneZ_clone"))) TS_CResult_SignatureNoneZ_clone(uint32_t orig) { - LDKCResult_SignatureNoneZ* orig_conv = (LDKCResult_SignatureNoneZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_SignatureNoneZ_clone"))) TS_CResult_SignatureNoneZ_clone(uint64_t orig) { + LDKCResult_SignatureNoneZ* orig_conv = (LDKCResult_SignatureNoneZ*)untag_ptr(orig); LDKCResult_SignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SignatureNoneZ), "LDKCResult_SignatureNoneZ"); *ret_conv = CResult_SignatureNoneZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -static inline uintptr_t C2Tuple_SignatureSignatureZ_clone_ptr(LDKC2Tuple_SignatureSignatureZ *NONNULL_PTR arg) { +static inline uint64_t C2Tuple_SignatureSignatureZ_clone_ptr(LDKC2Tuple_SignatureSignatureZ *NONNULL_PTR arg) { LDKC2Tuple_SignatureSignatureZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_SignatureSignatureZ), "LDKC2Tuple_SignatureSignatureZ"); *ret_conv = C2Tuple_SignatureSignatureZ_clone(arg); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C2Tuple_SignatureSignatureZ_clone_ptr"))) TS_C2Tuple_SignatureSignatureZ_clone_ptr(uint32_t arg) { - LDKC2Tuple_SignatureSignatureZ* arg_conv = (LDKC2Tuple_SignatureSignatureZ*)(arg & ~1); - uint32_t ret_conv = C2Tuple_SignatureSignatureZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_C2Tuple_SignatureSignatureZ_clone_ptr"))) TS_C2Tuple_SignatureSignatureZ_clone_ptr(uint64_t arg) { + LDKC2Tuple_SignatureSignatureZ* arg_conv = (LDKC2Tuple_SignatureSignatureZ*)untag_ptr(arg); + int64_t ret_conv = C2Tuple_SignatureSignatureZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_C2Tuple_SignatureSignatureZ_clone"))) TS_C2Tuple_SignatureSignatureZ_clone(uint32_t orig) { - LDKC2Tuple_SignatureSignatureZ* orig_conv = (LDKC2Tuple_SignatureSignatureZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_C2Tuple_SignatureSignatureZ_clone"))) TS_C2Tuple_SignatureSignatureZ_clone(uint64_t orig) { + LDKC2Tuple_SignatureSignatureZ* orig_conv = (LDKC2Tuple_SignatureSignatureZ*)untag_ptr(orig); LDKC2Tuple_SignatureSignatureZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_SignatureSignatureZ), "LDKC2Tuple_SignatureSignatureZ"); *ret_conv = C2Tuple_SignatureSignatureZ_clone(orig_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C2Tuple_SignatureSignatureZ_new"))) TS_C2Tuple_SignatureSignatureZ_new(int8_tArray a, int8_tArray b) { +uint64_t __attribute__((export_name("TS_C2Tuple_SignatureSignatureZ_new"))) TS_C2Tuple_SignatureSignatureZ_new(int8_tArray a, int8_tArray b) { LDKSignature a_ref; CHECK(a->arr_len == 64); memcpy(a_ref.compact_form, a->elems, 64); FREE(a); @@ -15310,117 +14035,117 @@ uint32_t __attribute__((export_name("TS_C2Tuple_SignatureSignatureZ_new"))) TS_ memcpy(b_ref.compact_form, b->elems, 64); FREE(b); LDKC2Tuple_SignatureSignatureZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_SignatureSignatureZ), "LDKC2Tuple_SignatureSignatureZ"); *ret_conv = C2Tuple_SignatureSignatureZ_new(a_ref, b_ref); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_C2Tuple_SignatureSignatureZ_free"))) TS_C2Tuple_SignatureSignatureZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_C2Tuple_SignatureSignatureZ_free"))) TS_C2Tuple_SignatureSignatureZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKC2Tuple_SignatureSignatureZ _res_conv = *(LDKC2Tuple_SignatureSignatureZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); C2Tuple_SignatureSignatureZ_free(_res_conv); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_ok"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_ok"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_ok(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKC2Tuple_SignatureSignatureZ o_conv = *(LDKC2Tuple_SignatureSignatureZ*)(o_ptr); - o_conv = C2Tuple_SignatureSignatureZ_clone((LDKC2Tuple_SignatureSignatureZ*)(((uintptr_t)o) & ~1)); + o_conv = C2Tuple_SignatureSignatureZ_clone((LDKC2Tuple_SignatureSignatureZ*)untag_ptr(o)); LDKCResult_C2Tuple_SignatureSignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureSignatureZNoneZ), "LDKCResult_C2Tuple_SignatureSignatureZNoneZ"); *ret_conv = CResult_C2Tuple_SignatureSignatureZNoneZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_err"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_err() { +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_err"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_err() { LDKCResult_C2Tuple_SignatureSignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureSignatureZNoneZ), "LDKCResult_C2Tuple_SignatureSignatureZNoneZ"); *ret_conv = CResult_C2Tuple_SignatureSignatureZNoneZ_err(); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_is_ok"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_is_ok(uint32_t o) { - LDKCResult_C2Tuple_SignatureSignatureZNoneZ* o_conv = (LDKCResult_C2Tuple_SignatureSignatureZNoneZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_is_ok"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_is_ok(uint64_t o) { + LDKCResult_C2Tuple_SignatureSignatureZNoneZ* o_conv = (LDKCResult_C2Tuple_SignatureSignatureZNoneZ*)untag_ptr(o); jboolean ret_conv = CResult_C2Tuple_SignatureSignatureZNoneZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_free"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_free"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_C2Tuple_SignatureSignatureZNoneZ _res_conv = *(LDKCResult_C2Tuple_SignatureSignatureZNoneZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_C2Tuple_SignatureSignatureZNoneZ_free(_res_conv); } -static inline uintptr_t CResult_C2Tuple_SignatureSignatureZNoneZ_clone_ptr(LDKCResult_C2Tuple_SignatureSignatureZNoneZ *NONNULL_PTR arg) { +static inline uint64_t CResult_C2Tuple_SignatureSignatureZNoneZ_clone_ptr(LDKCResult_C2Tuple_SignatureSignatureZNoneZ *NONNULL_PTR arg) { LDKCResult_C2Tuple_SignatureSignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureSignatureZNoneZ), "LDKCResult_C2Tuple_SignatureSignatureZNoneZ"); *ret_conv = CResult_C2Tuple_SignatureSignatureZNoneZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_clone_ptr"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_clone_ptr(uint32_t arg) { - LDKCResult_C2Tuple_SignatureSignatureZNoneZ* arg_conv = (LDKCResult_C2Tuple_SignatureSignatureZNoneZ*)(arg & ~1); - uint32_t ret_conv = CResult_C2Tuple_SignatureSignatureZNoneZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_clone_ptr"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_clone_ptr(uint64_t arg) { + LDKCResult_C2Tuple_SignatureSignatureZNoneZ* arg_conv = (LDKCResult_C2Tuple_SignatureSignatureZNoneZ*)untag_ptr(arg); + int64_t ret_conv = CResult_C2Tuple_SignatureSignatureZNoneZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_clone"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_clone(uint32_t orig) { - LDKCResult_C2Tuple_SignatureSignatureZNoneZ* orig_conv = (LDKCResult_C2Tuple_SignatureSignatureZNoneZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_clone"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_clone(uint64_t orig) { + LDKCResult_C2Tuple_SignatureSignatureZNoneZ* orig_conv = (LDKCResult_C2Tuple_SignatureSignatureZNoneZ*)untag_ptr(orig); LDKCResult_C2Tuple_SignatureSignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureSignatureZNoneZ), "LDKCResult_C2Tuple_SignatureSignatureZNoneZ"); *ret_conv = CResult_C2Tuple_SignatureSignatureZNoneZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_SecretKeyNoneZ_ok"))) TS_CResult_SecretKeyNoneZ_ok(int8_tArray o) { +uint64_t __attribute__((export_name("TS_CResult_SecretKeyNoneZ_ok"))) TS_CResult_SecretKeyNoneZ_ok(int8_tArray o) { LDKSecretKey o_ref; CHECK(o->arr_len == 32); memcpy(o_ref.bytes, o->elems, 32); FREE(o); LDKCResult_SecretKeyNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SecretKeyNoneZ), "LDKCResult_SecretKeyNoneZ"); *ret_conv = CResult_SecretKeyNoneZ_ok(o_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_SecretKeyNoneZ_err"))) TS_CResult_SecretKeyNoneZ_err() { +uint64_t __attribute__((export_name("TS_CResult_SecretKeyNoneZ_err"))) TS_CResult_SecretKeyNoneZ_err() { LDKCResult_SecretKeyNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SecretKeyNoneZ), "LDKCResult_SecretKeyNoneZ"); *ret_conv = CResult_SecretKeyNoneZ_err(); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_SecretKeyNoneZ_is_ok"))) TS_CResult_SecretKeyNoneZ_is_ok(uint32_t o) { - LDKCResult_SecretKeyNoneZ* o_conv = (LDKCResult_SecretKeyNoneZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_SecretKeyNoneZ_is_ok"))) TS_CResult_SecretKeyNoneZ_is_ok(uint64_t o) { + LDKCResult_SecretKeyNoneZ* o_conv = (LDKCResult_SecretKeyNoneZ*)untag_ptr(o); jboolean ret_conv = CResult_SecretKeyNoneZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_SecretKeyNoneZ_free"))) TS_CResult_SecretKeyNoneZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_SecretKeyNoneZ_free"))) TS_CResult_SecretKeyNoneZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_SecretKeyNoneZ _res_conv = *(LDKCResult_SecretKeyNoneZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_SecretKeyNoneZ_free(_res_conv); } -static inline uintptr_t CResult_SecretKeyNoneZ_clone_ptr(LDKCResult_SecretKeyNoneZ *NONNULL_PTR arg) { +static inline uint64_t CResult_SecretKeyNoneZ_clone_ptr(LDKCResult_SecretKeyNoneZ *NONNULL_PTR arg) { LDKCResult_SecretKeyNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SecretKeyNoneZ), "LDKCResult_SecretKeyNoneZ"); *ret_conv = CResult_SecretKeyNoneZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_SecretKeyNoneZ_clone_ptr"))) TS_CResult_SecretKeyNoneZ_clone_ptr(uint32_t arg) { - LDKCResult_SecretKeyNoneZ* arg_conv = (LDKCResult_SecretKeyNoneZ*)(arg & ~1); - uint32_t ret_conv = CResult_SecretKeyNoneZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_SecretKeyNoneZ_clone_ptr"))) TS_CResult_SecretKeyNoneZ_clone_ptr(uint64_t arg) { + LDKCResult_SecretKeyNoneZ* arg_conv = (LDKCResult_SecretKeyNoneZ*)untag_ptr(arg); + int64_t ret_conv = CResult_SecretKeyNoneZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_SecretKeyNoneZ_clone"))) TS_CResult_SecretKeyNoneZ_clone(uint32_t orig) { - LDKCResult_SecretKeyNoneZ* orig_conv = (LDKCResult_SecretKeyNoneZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_SecretKeyNoneZ_clone"))) TS_CResult_SecretKeyNoneZ_clone(uint64_t orig) { + LDKCResult_SecretKeyNoneZ* orig_conv = (LDKCResult_SecretKeyNoneZ*)untag_ptr(orig); LDKCResult_SecretKeyNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SecretKeyNoneZ), "LDKCResult_SecretKeyNoneZ"); *ret_conv = CResult_SecretKeyNoneZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_SignDecodeErrorZ_ok"))) TS_CResult_SignDecodeErrorZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_CResult_SignDecodeErrorZ_ok"))) TS_CResult_SignDecodeErrorZ_ok(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKSign o_conv = *(LDKSign*)(o_ptr); if (o_conv.free == LDKSign_JCalls_free) { @@ -15429,51 +14154,51 @@ uint32_t __attribute__((export_name("TS_CResult_SignDecodeErrorZ_ok"))) TS_CRes } LDKCResult_SignDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SignDecodeErrorZ), "LDKCResult_SignDecodeErrorZ"); *ret_conv = CResult_SignDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_SignDecodeErrorZ_err"))) TS_CResult_SignDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_SignDecodeErrorZ_err"))) TS_CResult_SignDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_SignDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SignDecodeErrorZ), "LDKCResult_SignDecodeErrorZ"); *ret_conv = CResult_SignDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_SignDecodeErrorZ_is_ok"))) TS_CResult_SignDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_SignDecodeErrorZ* o_conv = (LDKCResult_SignDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_SignDecodeErrorZ_is_ok"))) TS_CResult_SignDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_SignDecodeErrorZ* o_conv = (LDKCResult_SignDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_SignDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_SignDecodeErrorZ_free"))) TS_CResult_SignDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_SignDecodeErrorZ_free"))) TS_CResult_SignDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_SignDecodeErrorZ _res_conv = *(LDKCResult_SignDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_SignDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_SignDecodeErrorZ_clone_ptr(LDKCResult_SignDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_SignDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_SignDecodeErrorZ_clone_ptr"))) TS_CResult_SignDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_SignDecodeErrorZ* arg_conv = (LDKCResult_SignDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_SignDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_SignDecodeErrorZ_clone"))) TS_CResult_SignDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_SignDecodeErrorZ* orig_conv = (LDKCResult_SignDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_SignDecodeErrorZ_clone"))) TS_CResult_SignDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_SignDecodeErrorZ* orig_conv = (LDKCResult_SignDecodeErrorZ*)untag_ptr(orig); LDKCResult_SignDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SignDecodeErrorZ), "LDKCResult_SignDecodeErrorZ"); *ret_conv = CResult_SignDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } void __attribute__((export_name("TS_CVec_u5Z_free"))) TS_CVec_u5Z_free(ptrArray _res) { @@ -15493,52 +14218,52 @@ void __attribute__((export_name("TS_CVec_u5Z_free"))) TS_CVec_u5Z_free(ptrArray CVec_u5Z_free(_res_constr); } -uint32_t __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_ok"))) TS_CResult_RecoverableSignatureNoneZ_ok(int8_tArray o) { +uint64_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); FREE(o); LDKCResult_RecoverableSignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_RecoverableSignatureNoneZ), "LDKCResult_RecoverableSignatureNoneZ"); *ret_conv = CResult_RecoverableSignatureNoneZ_ok(o_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_err"))) TS_CResult_RecoverableSignatureNoneZ_err() { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_is_ok"))) TS_CResult_RecoverableSignatureNoneZ_is_ok(uint32_t o) { - LDKCResult_RecoverableSignatureNoneZ* o_conv = (LDKCResult_RecoverableSignatureNoneZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_is_ok"))) TS_CResult_RecoverableSignatureNoneZ_is_ok(uint64_t o) { + LDKCResult_RecoverableSignatureNoneZ* o_conv = (LDKCResult_RecoverableSignatureNoneZ*)untag_ptr(o); jboolean ret_conv = CResult_RecoverableSignatureNoneZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_free"))) TS_CResult_RecoverableSignatureNoneZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_free"))) TS_CResult_RecoverableSignatureNoneZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_RecoverableSignatureNoneZ _res_conv = *(LDKCResult_RecoverableSignatureNoneZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_RecoverableSignatureNoneZ_free(_res_conv); } -static inline uintptr_t CResult_RecoverableSignatureNoneZ_clone_ptr(LDKCResult_RecoverableSignatureNoneZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_RecoverableSignatureNoneZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_clone_ptr"))) TS_CResult_RecoverableSignatureNoneZ_clone_ptr(uint64_t arg) { + LDKCResult_RecoverableSignatureNoneZ* arg_conv = (LDKCResult_RecoverableSignatureNoneZ*)untag_ptr(arg); + int64_t ret_conv = CResult_RecoverableSignatureNoneZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_clone"))) TS_CResult_RecoverableSignatureNoneZ_clone(uint32_t orig) { - LDKCResult_RecoverableSignatureNoneZ* orig_conv = (LDKCResult_RecoverableSignatureNoneZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_clone"))) TS_CResult_RecoverableSignatureNoneZ_clone(uint64_t orig) { + LDKCResult_RecoverableSignatureNoneZ* orig_conv = (LDKCResult_RecoverableSignatureNoneZ*)untag_ptr(orig); LDKCResult_RecoverableSignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_RecoverableSignatureNoneZ), "LDKCResult_RecoverableSignatureNoneZ"); *ret_conv = CResult_RecoverableSignatureNoneZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } void __attribute__((export_name("TS_CVec_u8Z_free"))) TS_CVec_u8Z_free(int8_tArray _res) { @@ -15569,7 +14294,7 @@ void __attribute__((export_name("TS_CVec_CVec_u8ZZ_free"))) TS_CVec_CVec_u8ZZ_f CVec_CVec_u8ZZ_free(_res_constr); } -uint32_t __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_ok"))) TS_CResult_CVec_CVec_u8ZZNoneZ_ok(ptrArray o) { +uint64_t __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_ok"))) TS_CResult_CVec_CVec_u8ZZNoneZ_ok(ptrArray o) { LDKCVec_CVec_u8ZZ o_constr; o_constr.datalen = o->arr_len; if (o_constr.datalen > 0) @@ -15588,124 +14313,124 @@ uint32_t __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_ok"))) TS_C FREE(o); LDKCResult_CVec_CVec_u8ZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_CVec_u8ZZNoneZ), "LDKCResult_CVec_CVec_u8ZZNoneZ"); *ret_conv = CResult_CVec_CVec_u8ZZNoneZ_ok(o_constr); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_err"))) TS_CResult_CVec_CVec_u8ZZNoneZ_err() { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_is_ok"))) TS_CResult_CVec_CVec_u8ZZNoneZ_is_ok(uint32_t o) { - LDKCResult_CVec_CVec_u8ZZNoneZ* o_conv = (LDKCResult_CVec_CVec_u8ZZNoneZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_is_ok"))) TS_CResult_CVec_CVec_u8ZZNoneZ_is_ok(uint64_t o) { + LDKCResult_CVec_CVec_u8ZZNoneZ* o_conv = (LDKCResult_CVec_CVec_u8ZZNoneZ*)untag_ptr(o); jboolean ret_conv = CResult_CVec_CVec_u8ZZNoneZ_is_ok(o_conv); return ret_conv; } -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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_free"))) TS_CResult_CVec_CVec_u8ZZNoneZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_CVec_CVec_u8ZZNoneZ _res_conv = *(LDKCResult_CVec_CVec_u8ZZNoneZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_CVec_CVec_u8ZZNoneZ_free(_res_conv); } -static inline uintptr_t CResult_CVec_CVec_u8ZZNoneZ_clone_ptr(LDKCResult_CVec_CVec_u8ZZNoneZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_CVec_CVec_u8ZZNoneZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_clone_ptr"))) TS_CResult_CVec_CVec_u8ZZNoneZ_clone_ptr(uint64_t arg) { + LDKCResult_CVec_CVec_u8ZZNoneZ* arg_conv = (LDKCResult_CVec_CVec_u8ZZNoneZ*)untag_ptr(arg); + int64_t ret_conv = CResult_CVec_CVec_u8ZZNoneZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_clone"))) TS_CResult_CVec_CVec_u8ZZNoneZ_clone(uint32_t orig) { - LDKCResult_CVec_CVec_u8ZZNoneZ* orig_conv = (LDKCResult_CVec_CVec_u8ZZNoneZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_clone"))) TS_CResult_CVec_CVec_u8ZZNoneZ_clone(uint64_t orig) { + LDKCResult_CVec_CVec_u8ZZNoneZ* orig_conv = (LDKCResult_CVec_CVec_u8ZZNoneZ*)untag_ptr(orig); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_ok"))) TS_CResult_InMemorySignerDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_ok"))) TS_CResult_InMemorySignerDecodeErrorZ_ok(uint64_t o) { LDKInMemorySigner o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = InMemorySigner_clone(&o_conv); LDKCResult_InMemorySignerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InMemorySignerDecodeErrorZ), "LDKCResult_InMemorySignerDecodeErrorZ"); *ret_conv = CResult_InMemorySignerDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_err"))) TS_CResult_InMemorySignerDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_err"))) TS_CResult_InMemorySignerDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_InMemorySignerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InMemorySignerDecodeErrorZ), "LDKCResult_InMemorySignerDecodeErrorZ"); *ret_conv = CResult_InMemorySignerDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_is_ok"))) TS_CResult_InMemorySignerDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_InMemorySignerDecodeErrorZ* o_conv = (LDKCResult_InMemorySignerDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_is_ok"))) TS_CResult_InMemorySignerDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_InMemorySignerDecodeErrorZ* o_conv = (LDKCResult_InMemorySignerDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_InMemorySignerDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_free"))) TS_CResult_InMemorySignerDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_free"))) TS_CResult_InMemorySignerDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_InMemorySignerDecodeErrorZ _res_conv = *(LDKCResult_InMemorySignerDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_InMemorySignerDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_InMemorySignerDecodeErrorZ_clone_ptr(LDKCResult_InMemorySignerDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_InMemorySignerDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_clone_ptr"))) TS_CResult_InMemorySignerDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_InMemorySignerDecodeErrorZ* arg_conv = (LDKCResult_InMemorySignerDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_InMemorySignerDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_clone"))) TS_CResult_InMemorySignerDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_InMemorySignerDecodeErrorZ* orig_conv = (LDKCResult_InMemorySignerDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_clone"))) TS_CResult_InMemorySignerDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_InMemorySignerDecodeErrorZ* orig_conv = (LDKCResult_InMemorySignerDecodeErrorZ*)untag_ptr(orig); LDKCResult_InMemorySignerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InMemorySignerDecodeErrorZ), "LDKCResult_InMemorySignerDecodeErrorZ"); *ret_conv = CResult_InMemorySignerDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_CVec_TxOutZ_free"))) TS_CVec_TxOutZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_TxOutZ_free"))) TS_CVec_TxOutZ_free(uint64_tArray _res) { LDKCVec_TxOutZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKTxOut), "LDKCVec_TxOutZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t h = 0; h < _res_constr.datalen; h++) { - uint32_t _res_conv_7 = _res_vals[h]; - void* _res_conv_7_ptr = (void*)(((uintptr_t)_res_conv_7) & ~1); + uint64_t _res_conv_7 = _res_vals[h]; + void* _res_conv_7_ptr = untag_ptr(_res_conv_7); CHECK_ACCESS(_res_conv_7_ptr); LDKTxOut _res_conv_7_conv = *(LDKTxOut*)(_res_conv_7_ptr); - FREE((void*)_res_conv_7); + FREE(untag_ptr(_res_conv_7)); _res_constr.data[h] = _res_conv_7_conv; } FREE(_res); CVec_TxOutZ_free(_res_constr); } -uint32_t __attribute__((export_name("TS_CResult_TransactionNoneZ_ok"))) TS_CResult_TransactionNoneZ_ok(int8_tArray o) { +uint64_t __attribute__((export_name("TS_CResult_TransactionNoneZ_ok"))) TS_CResult_TransactionNoneZ_ok(int8_tArray o) { LDKTransaction o_ref; o_ref.datalen = o->arr_len; o_ref.data = MALLOC(o_ref.datalen, "LDKTransaction Bytes"); @@ -15713,352 +14438,352 @@ uint32_t __attribute__((export_name("TS_CResult_TransactionNoneZ_ok"))) TS_CRes o_ref.data_is_owned = true; LDKCResult_TransactionNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_TransactionNoneZ), "LDKCResult_TransactionNoneZ"); *ret_conv = CResult_TransactionNoneZ_ok(o_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_TransactionNoneZ_err"))) TS_CResult_TransactionNoneZ_err() { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_TransactionNoneZ_is_ok"))) TS_CResult_TransactionNoneZ_is_ok(uint32_t o) { - LDKCResult_TransactionNoneZ* o_conv = (LDKCResult_TransactionNoneZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_TransactionNoneZ_is_ok"))) TS_CResult_TransactionNoneZ_is_ok(uint64_t o) { + LDKCResult_TransactionNoneZ* o_conv = (LDKCResult_TransactionNoneZ*)untag_ptr(o); jboolean ret_conv = CResult_TransactionNoneZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_TransactionNoneZ_free"))) TS_CResult_TransactionNoneZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_TransactionNoneZ_free"))) TS_CResult_TransactionNoneZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_TransactionNoneZ _res_conv = *(LDKCResult_TransactionNoneZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_TransactionNoneZ_free(_res_conv); } -static inline uintptr_t CResult_TransactionNoneZ_clone_ptr(LDKCResult_TransactionNoneZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_TransactionNoneZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_TransactionNoneZ_clone_ptr"))) TS_CResult_TransactionNoneZ_clone_ptr(uint64_t arg) { + LDKCResult_TransactionNoneZ* arg_conv = (LDKCResult_TransactionNoneZ*)untag_ptr(arg); + int64_t ret_conv = CResult_TransactionNoneZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_TransactionNoneZ_clone"))) TS_CResult_TransactionNoneZ_clone(uint32_t orig) { - LDKCResult_TransactionNoneZ* orig_conv = (LDKCResult_TransactionNoneZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_TransactionNoneZ_clone"))) TS_CResult_TransactionNoneZ_clone(uint64_t orig) { + LDKCResult_TransactionNoneZ* orig_conv = (LDKCResult_TransactionNoneZ*)untag_ptr(orig); LDKCResult_TransactionNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_TransactionNoneZ), "LDKCResult_TransactionNoneZ"); *ret_conv = CResult_TransactionNoneZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_COption_u16Z_some"))) TS_COption_u16Z_some(int16_t o) { +uint64_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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_u16Z_none"))) TS_COption_u16Z_none() { +uint64_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(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_COption_u16Z_free"))) TS_COption_u16Z_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCOption_u16Z _res_conv = *(LDKCOption_u16Z*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); COption_u16Z_free(_res_conv); } -static inline uintptr_t COption_u16Z_clone_ptr(LDKCOption_u16Z *NONNULL_PTR arg) { +static inline uint64_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); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_u16Z_clone_ptr"))) TS_COption_u16Z_clone_ptr(uint32_t arg) { - LDKCOption_u16Z* arg_conv = (LDKCOption_u16Z*)arg; - uint32_t ret_conv = COption_u16Z_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_COption_u16Z_clone_ptr"))) TS_COption_u16Z_clone_ptr(uint64_t arg) { + LDKCOption_u16Z* arg_conv = (LDKCOption_u16Z*)untag_ptr(arg); + int64_t ret_conv = COption_u16Z_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_COption_u16Z_clone"))) TS_COption_u16Z_clone(uint32_t orig) { - LDKCOption_u16Z* orig_conv = (LDKCOption_u16Z*)orig; +uint64_t __attribute__((export_name("TS_COption_u16Z_clone"))) TS_COption_u16Z_clone(uint64_t orig) { + LDKCOption_u16Z* orig_conv = (LDKCOption_u16Z*)untag_ptr(orig); LDKCOption_u16Z *ret_copy = MALLOC(sizeof(LDKCOption_u16Z), "LDKCOption_u16Z"); *ret_copy = COption_u16Z_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_CResult_NoneAPIErrorZ_ok"))) TS_CResult_NoneAPIErrorZ_ok() { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NoneAPIErrorZ_err"))) TS_CResult_NoneAPIErrorZ_err(uint32_t e) { - void* e_ptr = (void*)(((uintptr_t)e) & ~1); +uint64_t __attribute__((export_name("TS_CResult_NoneAPIErrorZ_err"))) TS_CResult_NoneAPIErrorZ_err(uint64_t e) { + void* e_ptr = untag_ptr(e); CHECK_ACCESS(e_ptr); LDKAPIError e_conv = *(LDKAPIError*)(e_ptr); - e_conv = APIError_clone((LDKAPIError*)(((uintptr_t)e) & ~1)); + e_conv = APIError_clone((LDKAPIError*)untag_ptr(e)); LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); *ret_conv = CResult_NoneAPIErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_NoneAPIErrorZ_is_ok"))) TS_CResult_NoneAPIErrorZ_is_ok(uint32_t o) { - LDKCResult_NoneAPIErrorZ* o_conv = (LDKCResult_NoneAPIErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_NoneAPIErrorZ_is_ok"))) TS_CResult_NoneAPIErrorZ_is_ok(uint64_t o) { + LDKCResult_NoneAPIErrorZ* o_conv = (LDKCResult_NoneAPIErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_NoneAPIErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_NoneAPIErrorZ_free"))) TS_CResult_NoneAPIErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_NoneAPIErrorZ_free"))) TS_CResult_NoneAPIErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_NoneAPIErrorZ _res_conv = *(LDKCResult_NoneAPIErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_NoneAPIErrorZ_free(_res_conv); } -static inline uintptr_t CResult_NoneAPIErrorZ_clone_ptr(LDKCResult_NoneAPIErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_NoneAPIErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_NoneAPIErrorZ_clone_ptr"))) TS_CResult_NoneAPIErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_NoneAPIErrorZ* arg_conv = (LDKCResult_NoneAPIErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_NoneAPIErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_NoneAPIErrorZ_clone"))) TS_CResult_NoneAPIErrorZ_clone(uint32_t orig) { - LDKCResult_NoneAPIErrorZ* orig_conv = (LDKCResult_NoneAPIErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_NoneAPIErrorZ_clone"))) TS_CResult_NoneAPIErrorZ_clone(uint64_t orig) { + LDKCResult_NoneAPIErrorZ* orig_conv = (LDKCResult_NoneAPIErrorZ*)untag_ptr(orig); LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); *ret_conv = CResult_NoneAPIErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_CVec_CResult_NoneAPIErrorZZ_free"))) TS_CVec_CResult_NoneAPIErrorZZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_CResult_NoneAPIErrorZZ_free"))) TS_CVec_CResult_NoneAPIErrorZZ_free(uint64_tArray _res) { LDKCVec_CResult_NoneAPIErrorZZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _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; + uint64_t* _res_vals = _res->elems; for (size_t w = 0; w < _res_constr.datalen; w++) { - uint32_t _res_conv_22 = _res_vals[w]; - void* _res_conv_22_ptr = (void*)(((uintptr_t)_res_conv_22) & ~1); + uint64_t _res_conv_22 = _res_vals[w]; + void* _res_conv_22_ptr = untag_ptr(_res_conv_22); CHECK_ACCESS(_res_conv_22_ptr); LDKCResult_NoneAPIErrorZ _res_conv_22_conv = *(LDKCResult_NoneAPIErrorZ*)(_res_conv_22_ptr); - FREE((void*)_res_conv_22); + FREE(untag_ptr(_res_conv_22)); _res_constr.data[w] = _res_conv_22_conv; } FREE(_res); CVec_CResult_NoneAPIErrorZZ_free(_res_constr); } -void __attribute__((export_name("TS_CVec_APIErrorZ_free"))) TS_CVec_APIErrorZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_APIErrorZ_free"))) TS_CVec_APIErrorZ_free(uint64_tArray _res) { LDKCVec_APIErrorZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKAPIError), "LDKCVec_APIErrorZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t k = 0; k < _res_constr.datalen; k++) { - uint32_t _res_conv_10 = _res_vals[k]; - void* _res_conv_10_ptr = (void*)(((uintptr_t)_res_conv_10) & ~1); + uint64_t _res_conv_10 = _res_vals[k]; + void* _res_conv_10_ptr = untag_ptr(_res_conv_10); CHECK_ACCESS(_res_conv_10_ptr); LDKAPIError _res_conv_10_conv = *(LDKAPIError*)(_res_conv_10_ptr); - FREE((void*)_res_conv_10); + FREE(untag_ptr(_res_conv_10)); _res_constr.data[k] = _res_conv_10_conv; } FREE(_res); CVec_APIErrorZ_free(_res_constr); } -uint32_t __attribute__((export_name("TS_CResult__u832APIErrorZ_ok"))) TS_CResult__u832APIErrorZ_ok(int8_tArray o) { +uint64_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); FREE(o); LDKCResult__u832APIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult__u832APIErrorZ), "LDKCResult__u832APIErrorZ"); *ret_conv = CResult__u832APIErrorZ_ok(o_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult__u832APIErrorZ_err"))) TS_CResult__u832APIErrorZ_err(uint32_t e) { - void* e_ptr = (void*)(((uintptr_t)e) & ~1); +uint64_t __attribute__((export_name("TS_CResult__u832APIErrorZ_err"))) TS_CResult__u832APIErrorZ_err(uint64_t e) { + void* e_ptr = untag_ptr(e); CHECK_ACCESS(e_ptr); LDKAPIError e_conv = *(LDKAPIError*)(e_ptr); - e_conv = APIError_clone((LDKAPIError*)(((uintptr_t)e) & ~1)); + e_conv = APIError_clone((LDKAPIError*)untag_ptr(e)); LDKCResult__u832APIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult__u832APIErrorZ), "LDKCResult__u832APIErrorZ"); *ret_conv = CResult__u832APIErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult__u832APIErrorZ_is_ok"))) TS_CResult__u832APIErrorZ_is_ok(uint32_t o) { - LDKCResult__u832APIErrorZ* o_conv = (LDKCResult__u832APIErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult__u832APIErrorZ_is_ok"))) TS_CResult__u832APIErrorZ_is_ok(uint64_t o) { + LDKCResult__u832APIErrorZ* o_conv = (LDKCResult__u832APIErrorZ*)untag_ptr(o); jboolean ret_conv = CResult__u832APIErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult__u832APIErrorZ_free"))) TS_CResult__u832APIErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult__u832APIErrorZ_free"))) TS_CResult__u832APIErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult__u832APIErrorZ _res_conv = *(LDKCResult__u832APIErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult__u832APIErrorZ_free(_res_conv); } -static inline uintptr_t CResult__u832APIErrorZ_clone_ptr(LDKCResult__u832APIErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult__u832APIErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult__u832APIErrorZ_clone_ptr"))) TS_CResult__u832APIErrorZ_clone_ptr(uint64_t arg) { + LDKCResult__u832APIErrorZ* arg_conv = (LDKCResult__u832APIErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult__u832APIErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult__u832APIErrorZ_clone"))) TS_CResult__u832APIErrorZ_clone(uint32_t orig) { - LDKCResult__u832APIErrorZ* orig_conv = (LDKCResult__u832APIErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult__u832APIErrorZ_clone"))) TS_CResult__u832APIErrorZ_clone(uint64_t orig) { + LDKCResult__u832APIErrorZ* orig_conv = (LDKCResult__u832APIErrorZ*)untag_ptr(orig); LDKCResult__u832APIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult__u832APIErrorZ), "LDKCResult__u832APIErrorZ"); *ret_conv = CResult__u832APIErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_ok"))) TS_CResult_PaymentIdPaymentSendFailureZ_ok(int8_tArray o) { +uint64_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); FREE(o); LDKCResult_PaymentIdPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentSendFailureZ), "LDKCResult_PaymentIdPaymentSendFailureZ"); *ret_conv = CResult_PaymentIdPaymentSendFailureZ_ok(o_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_err"))) TS_CResult_PaymentIdPaymentSendFailureZ_err(uint32_t e) { - void* e_ptr = (void*)(((uintptr_t)e) & ~1); +uint64_t __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_err"))) TS_CResult_PaymentIdPaymentSendFailureZ_err(uint64_t e) { + void* e_ptr = untag_ptr(e); CHECK_ACCESS(e_ptr); LDKPaymentSendFailure e_conv = *(LDKPaymentSendFailure*)(e_ptr); - e_conv = PaymentSendFailure_clone((LDKPaymentSendFailure*)(((uintptr_t)e) & ~1)); + e_conv = PaymentSendFailure_clone((LDKPaymentSendFailure*)untag_ptr(e)); LDKCResult_PaymentIdPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentSendFailureZ), "LDKCResult_PaymentIdPaymentSendFailureZ"); *ret_conv = CResult_PaymentIdPaymentSendFailureZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_is_ok"))) TS_CResult_PaymentIdPaymentSendFailureZ_is_ok(uint32_t o) { - LDKCResult_PaymentIdPaymentSendFailureZ* o_conv = (LDKCResult_PaymentIdPaymentSendFailureZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_is_ok"))) TS_CResult_PaymentIdPaymentSendFailureZ_is_ok(uint64_t o) { + LDKCResult_PaymentIdPaymentSendFailureZ* o_conv = (LDKCResult_PaymentIdPaymentSendFailureZ*)untag_ptr(o); jboolean ret_conv = CResult_PaymentIdPaymentSendFailureZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_free"))) TS_CResult_PaymentIdPaymentSendFailureZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_free"))) TS_CResult_PaymentIdPaymentSendFailureZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_PaymentIdPaymentSendFailureZ _res_conv = *(LDKCResult_PaymentIdPaymentSendFailureZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_PaymentIdPaymentSendFailureZ_free(_res_conv); } -static inline uintptr_t CResult_PaymentIdPaymentSendFailureZ_clone_ptr(LDKCResult_PaymentIdPaymentSendFailureZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_PaymentIdPaymentSendFailureZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_clone_ptr"))) TS_CResult_PaymentIdPaymentSendFailureZ_clone_ptr(uint64_t arg) { + LDKCResult_PaymentIdPaymentSendFailureZ* arg_conv = (LDKCResult_PaymentIdPaymentSendFailureZ*)untag_ptr(arg); + int64_t ret_conv = CResult_PaymentIdPaymentSendFailureZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_clone"))) TS_CResult_PaymentIdPaymentSendFailureZ_clone(uint32_t orig) { - LDKCResult_PaymentIdPaymentSendFailureZ* orig_conv = (LDKCResult_PaymentIdPaymentSendFailureZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_clone"))) TS_CResult_PaymentIdPaymentSendFailureZ_clone(uint64_t orig) { + LDKCResult_PaymentIdPaymentSendFailureZ* orig_conv = (LDKCResult_PaymentIdPaymentSendFailureZ*)untag_ptr(orig); LDKCResult_PaymentIdPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentSendFailureZ), "LDKCResult_PaymentIdPaymentSendFailureZ"); *ret_conv = CResult_PaymentIdPaymentSendFailureZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_ok"))) TS_CResult_NonePaymentSendFailureZ_ok() { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_err"))) TS_CResult_NonePaymentSendFailureZ_err(uint32_t e) { - void* e_ptr = (void*)(((uintptr_t)e) & ~1); +uint64_t __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_err"))) TS_CResult_NonePaymentSendFailureZ_err(uint64_t e) { + void* e_ptr = untag_ptr(e); CHECK_ACCESS(e_ptr); LDKPaymentSendFailure e_conv = *(LDKPaymentSendFailure*)(e_ptr); - e_conv = PaymentSendFailure_clone((LDKPaymentSendFailure*)(((uintptr_t)e) & ~1)); + e_conv = PaymentSendFailure_clone((LDKPaymentSendFailure*)untag_ptr(e)); LDKCResult_NonePaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePaymentSendFailureZ), "LDKCResult_NonePaymentSendFailureZ"); *ret_conv = CResult_NonePaymentSendFailureZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_is_ok"))) TS_CResult_NonePaymentSendFailureZ_is_ok(uint32_t o) { - LDKCResult_NonePaymentSendFailureZ* o_conv = (LDKCResult_NonePaymentSendFailureZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_is_ok"))) TS_CResult_NonePaymentSendFailureZ_is_ok(uint64_t o) { + LDKCResult_NonePaymentSendFailureZ* o_conv = (LDKCResult_NonePaymentSendFailureZ*)untag_ptr(o); jboolean ret_conv = CResult_NonePaymentSendFailureZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_free"))) TS_CResult_NonePaymentSendFailureZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_free"))) TS_CResult_NonePaymentSendFailureZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_NonePaymentSendFailureZ _res_conv = *(LDKCResult_NonePaymentSendFailureZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_NonePaymentSendFailureZ_free(_res_conv); } -static inline uintptr_t CResult_NonePaymentSendFailureZ_clone_ptr(LDKCResult_NonePaymentSendFailureZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_NonePaymentSendFailureZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_clone_ptr"))) TS_CResult_NonePaymentSendFailureZ_clone_ptr(uint64_t arg) { + LDKCResult_NonePaymentSendFailureZ* arg_conv = (LDKCResult_NonePaymentSendFailureZ*)untag_ptr(arg); + int64_t ret_conv = CResult_NonePaymentSendFailureZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_clone"))) TS_CResult_NonePaymentSendFailureZ_clone(uint32_t orig) { - LDKCResult_NonePaymentSendFailureZ* orig_conv = (LDKCResult_NonePaymentSendFailureZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_clone"))) TS_CResult_NonePaymentSendFailureZ_clone(uint64_t orig) { + LDKCResult_NonePaymentSendFailureZ* orig_conv = (LDKCResult_NonePaymentSendFailureZ*)untag_ptr(orig); LDKCResult_NonePaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePaymentSendFailureZ), "LDKCResult_NonePaymentSendFailureZ"); *ret_conv = CResult_NonePaymentSendFailureZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -static inline uintptr_t C2Tuple_PaymentHashPaymentIdZ_clone_ptr(LDKC2Tuple_PaymentHashPaymentIdZ *NONNULL_PTR arg) { +static inline uint64_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 ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = C2Tuple_PaymentHashPaymentIdZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentIdZ_clone_ptr"))) TS_C2Tuple_PaymentHashPaymentIdZ_clone_ptr(uint64_t arg) { + LDKC2Tuple_PaymentHashPaymentIdZ* arg_conv = (LDKC2Tuple_PaymentHashPaymentIdZ*)untag_ptr(arg); + int64_t ret_conv = C2Tuple_PaymentHashPaymentIdZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentIdZ_clone"))) TS_C2Tuple_PaymentHashPaymentIdZ_clone(uint32_t orig) { - LDKC2Tuple_PaymentHashPaymentIdZ* orig_conv = (LDKC2Tuple_PaymentHashPaymentIdZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentIdZ_clone"))) TS_C2Tuple_PaymentHashPaymentIdZ_clone(uint64_t orig) { + LDKC2Tuple_PaymentHashPaymentIdZ* orig_conv = (LDKC2Tuple_PaymentHashPaymentIdZ*)untag_ptr(orig); LDKC2Tuple_PaymentHashPaymentIdZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PaymentHashPaymentIdZ), "LDKC2Tuple_PaymentHashPaymentIdZ"); *ret_conv = C2Tuple_PaymentHashPaymentIdZ_clone(orig_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentIdZ_new"))) TS_C2Tuple_PaymentHashPaymentIdZ_new(int8_tArray a, int8_tArray b) { +uint64_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); FREE(a); @@ -16067,69 +14792,69 @@ uint32_t __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentIdZ_new"))) T 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 ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentIdZ_free"))) TS_C2Tuple_PaymentHashPaymentIdZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentIdZ_free"))) TS_C2Tuple_PaymentHashPaymentIdZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKC2Tuple_PaymentHashPaymentIdZ _res_conv = *(LDKC2Tuple_PaymentHashPaymentIdZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); C2Tuple_PaymentHashPaymentIdZ_free(_res_conv); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_ok(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKC2Tuple_PaymentHashPaymentIdZ o_conv = *(LDKC2Tuple_PaymentHashPaymentIdZ*)(o_ptr); - o_conv = C2Tuple_PaymentHashPaymentIdZ_clone((LDKC2Tuple_PaymentHashPaymentIdZ*)(((uintptr_t)o) & ~1)); + o_conv = C2Tuple_PaymentHashPaymentIdZ_clone((LDKC2Tuple_PaymentHashPaymentIdZ*)untag_ptr(o)); LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ), "LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ"); *ret_conv = CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_err"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_err(uint32_t e) { - void* e_ptr = (void*)(((uintptr_t)e) & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_err"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_err(uint64_t e) { + void* e_ptr = untag_ptr(e); CHECK_ACCESS(e_ptr); LDKPaymentSendFailure e_conv = *(LDKPaymentSendFailure*)(e_ptr); - e_conv = PaymentSendFailure_clone((LDKPaymentSendFailure*)(((uintptr_t)e) & ~1)); + e_conv = PaymentSendFailure_clone((LDKPaymentSendFailure*)untag_ptr(e)); LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ), "LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ"); *ret_conv = CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_is_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_is_ok(uint32_t o) { - LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* o_conv = (LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_is_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_is_ok(uint64_t o) { + LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* o_conv = (LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ*)untag_ptr(o); jboolean ret_conv = CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_is_ok(o_conv); return ret_conv; } -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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_free"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ _res_conv = *(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_free(_res_conv); } -static inline uintptr_t CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone_ptr(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone_ptr"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone_ptr(uint64_t arg) { + LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* arg_conv = (LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ*)untag_ptr(arg); + int64_t ret_conv = CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone(uint32_t orig) { - LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* orig_conv = (LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone(uint64_t orig) { + LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* orig_conv = (LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ*)untag_ptr(orig); LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ), "LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ"); *ret_conv = CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } void __attribute__((export_name("TS_CVec_ThirtyTwoBytesZ_free"))) TS_CVec_ThirtyTwoBytesZ_free(ptrArray _res) { @@ -16151,25 +14876,25 @@ void __attribute__((export_name("TS_CVec_ThirtyTwoBytesZ_free"))) TS_CVec_Thirt CVec_ThirtyTwoBytesZ_free(_res_constr); } -static inline uintptr_t C2Tuple_PaymentHashPaymentSecretZ_clone_ptr(LDKC2Tuple_PaymentHashPaymentSecretZ *NONNULL_PTR arg) { +static inline uint64_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 ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = C2Tuple_PaymentHashPaymentSecretZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentSecretZ_clone_ptr"))) TS_C2Tuple_PaymentHashPaymentSecretZ_clone_ptr(uint64_t arg) { + LDKC2Tuple_PaymentHashPaymentSecretZ* arg_conv = (LDKC2Tuple_PaymentHashPaymentSecretZ*)untag_ptr(arg); + int64_t ret_conv = C2Tuple_PaymentHashPaymentSecretZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentSecretZ_clone"))) TS_C2Tuple_PaymentHashPaymentSecretZ_clone(uint32_t orig) { - LDKC2Tuple_PaymentHashPaymentSecretZ* orig_conv = (LDKC2Tuple_PaymentHashPaymentSecretZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentSecretZ_clone"))) TS_C2Tuple_PaymentHashPaymentSecretZ_clone(uint64_t orig) { + LDKC2Tuple_PaymentHashPaymentSecretZ* orig_conv = (LDKC2Tuple_PaymentHashPaymentSecretZ*)untag_ptr(orig); LDKC2Tuple_PaymentHashPaymentSecretZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PaymentHashPaymentSecretZ), "LDKC2Tuple_PaymentHashPaymentSecretZ"); *ret_conv = C2Tuple_PaymentHashPaymentSecretZ_clone(orig_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentSecretZ_new"))) TS_C2Tuple_PaymentHashPaymentSecretZ_new(int8_tArray a, int8_tArray b) { +uint64_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); FREE(a); @@ -16178,505 +14903,505 @@ uint32_t __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentSecretZ_new") 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 ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentSecretZ_free"))) TS_C2Tuple_PaymentHashPaymentSecretZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentSecretZ_free"))) TS_C2Tuple_PaymentHashPaymentSecretZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKC2Tuple_PaymentHashPaymentSecretZ _res_conv = *(LDKC2Tuple_PaymentHashPaymentSecretZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); C2Tuple_PaymentHashPaymentSecretZ_free(_res_conv); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_ok(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKC2Tuple_PaymentHashPaymentSecretZ o_conv = *(LDKC2Tuple_PaymentHashPaymentSecretZ*)(o_ptr); - o_conv = C2Tuple_PaymentHashPaymentSecretZ_clone((LDKC2Tuple_PaymentHashPaymentSecretZ*)(((uintptr_t)o) & ~1)); + o_conv = C2Tuple_PaymentHashPaymentSecretZ_clone((LDKC2Tuple_PaymentHashPaymentSecretZ*)untag_ptr(o)); LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ"); *ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_err"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_err() { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_is_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_is_ok(uint32_t o) { - LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* o_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_is_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_is_ok(uint64_t o) { + LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* o_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ*)untag_ptr(o); jboolean ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_is_ok(o_conv); return ret_conv; } -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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_free"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ _res_conv = *(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_free(_res_conv); } -static inline uintptr_t CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone_ptr(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone_ptr"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone_ptr(uint64_t arg) { + LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* arg_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ*)untag_ptr(arg); + int64_t ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone(uint32_t orig) { - LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* orig_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone(uint64_t orig) { + LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* orig_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ*)untag_ptr(orig); LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ"); *ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_ok(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKC2Tuple_PaymentHashPaymentSecretZ o_conv = *(LDKC2Tuple_PaymentHashPaymentSecretZ*)(o_ptr); - o_conv = C2Tuple_PaymentHashPaymentSecretZ_clone((LDKC2Tuple_PaymentHashPaymentSecretZ*)(((uintptr_t)o) & ~1)); + o_conv = C2Tuple_PaymentHashPaymentSecretZ_clone((LDKC2Tuple_PaymentHashPaymentSecretZ*)untag_ptr(o)); LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ"); *ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_err"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_err(uint32_t e) { - void* e_ptr = (void*)(((uintptr_t)e) & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_err"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_err(uint64_t e) { + void* e_ptr = untag_ptr(e); CHECK_ACCESS(e_ptr); LDKAPIError e_conv = *(LDKAPIError*)(e_ptr); - e_conv = APIError_clone((LDKAPIError*)(((uintptr_t)e) & ~1)); + e_conv = APIError_clone((LDKAPIError*)untag_ptr(e)); LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ"); *ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_is_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_is_ok(uint32_t o) { - LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* o_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_is_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_is_ok(uint64_t o) { + LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* o_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_is_ok(o_conv); return ret_conv; } -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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_free"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ _res_conv = *(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_free(_res_conv); } -static inline uintptr_t CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone_ptr(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone_ptr"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* arg_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone(uint32_t orig) { - LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* orig_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone(uint64_t orig) { + LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* orig_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)untag_ptr(orig); LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ"); *ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_ok"))) TS_CResult_PaymentSecretNoneZ_ok(int8_tArray o) { +uint64_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); FREE(o); LDKCResult_PaymentSecretNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretNoneZ), "LDKCResult_PaymentSecretNoneZ"); *ret_conv = CResult_PaymentSecretNoneZ_ok(o_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_err"))) TS_CResult_PaymentSecretNoneZ_err() { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_is_ok"))) TS_CResult_PaymentSecretNoneZ_is_ok(uint32_t o) { - LDKCResult_PaymentSecretNoneZ* o_conv = (LDKCResult_PaymentSecretNoneZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_is_ok"))) TS_CResult_PaymentSecretNoneZ_is_ok(uint64_t o) { + LDKCResult_PaymentSecretNoneZ* o_conv = (LDKCResult_PaymentSecretNoneZ*)untag_ptr(o); jboolean ret_conv = CResult_PaymentSecretNoneZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_free"))) TS_CResult_PaymentSecretNoneZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_free"))) TS_CResult_PaymentSecretNoneZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_PaymentSecretNoneZ _res_conv = *(LDKCResult_PaymentSecretNoneZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_PaymentSecretNoneZ_free(_res_conv); } -static inline uintptr_t CResult_PaymentSecretNoneZ_clone_ptr(LDKCResult_PaymentSecretNoneZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_PaymentSecretNoneZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_clone_ptr"))) TS_CResult_PaymentSecretNoneZ_clone_ptr(uint64_t arg) { + LDKCResult_PaymentSecretNoneZ* arg_conv = (LDKCResult_PaymentSecretNoneZ*)untag_ptr(arg); + int64_t ret_conv = CResult_PaymentSecretNoneZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_clone"))) TS_CResult_PaymentSecretNoneZ_clone(uint32_t orig) { - LDKCResult_PaymentSecretNoneZ* orig_conv = (LDKCResult_PaymentSecretNoneZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_clone"))) TS_CResult_PaymentSecretNoneZ_clone(uint64_t orig) { + LDKCResult_PaymentSecretNoneZ* orig_conv = (LDKCResult_PaymentSecretNoneZ*)untag_ptr(orig); LDKCResult_PaymentSecretNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretNoneZ), "LDKCResult_PaymentSecretNoneZ"); *ret_conv = CResult_PaymentSecretNoneZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_ok"))) TS_CResult_PaymentSecretAPIErrorZ_ok(int8_tArray o) { +uint64_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); FREE(o); LDKCResult_PaymentSecretAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretAPIErrorZ), "LDKCResult_PaymentSecretAPIErrorZ"); *ret_conv = CResult_PaymentSecretAPIErrorZ_ok(o_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_err"))) TS_CResult_PaymentSecretAPIErrorZ_err(uint32_t e) { - void* e_ptr = (void*)(((uintptr_t)e) & ~1); +uint64_t __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_err"))) TS_CResult_PaymentSecretAPIErrorZ_err(uint64_t e) { + void* e_ptr = untag_ptr(e); CHECK_ACCESS(e_ptr); LDKAPIError e_conv = *(LDKAPIError*)(e_ptr); - e_conv = APIError_clone((LDKAPIError*)(((uintptr_t)e) & ~1)); + e_conv = APIError_clone((LDKAPIError*)untag_ptr(e)); LDKCResult_PaymentSecretAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretAPIErrorZ), "LDKCResult_PaymentSecretAPIErrorZ"); *ret_conv = CResult_PaymentSecretAPIErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_is_ok"))) TS_CResult_PaymentSecretAPIErrorZ_is_ok(uint32_t o) { - LDKCResult_PaymentSecretAPIErrorZ* o_conv = (LDKCResult_PaymentSecretAPIErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_is_ok"))) TS_CResult_PaymentSecretAPIErrorZ_is_ok(uint64_t o) { + LDKCResult_PaymentSecretAPIErrorZ* o_conv = (LDKCResult_PaymentSecretAPIErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_PaymentSecretAPIErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_free"))) TS_CResult_PaymentSecretAPIErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_free"))) TS_CResult_PaymentSecretAPIErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_PaymentSecretAPIErrorZ _res_conv = *(LDKCResult_PaymentSecretAPIErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_PaymentSecretAPIErrorZ_free(_res_conv); } -static inline uintptr_t CResult_PaymentSecretAPIErrorZ_clone_ptr(LDKCResult_PaymentSecretAPIErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_PaymentSecretAPIErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_clone_ptr"))) TS_CResult_PaymentSecretAPIErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_PaymentSecretAPIErrorZ* arg_conv = (LDKCResult_PaymentSecretAPIErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_PaymentSecretAPIErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_clone"))) TS_CResult_PaymentSecretAPIErrorZ_clone(uint32_t orig) { - LDKCResult_PaymentSecretAPIErrorZ* orig_conv = (LDKCResult_PaymentSecretAPIErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_clone"))) TS_CResult_PaymentSecretAPIErrorZ_clone(uint64_t orig) { + LDKCResult_PaymentSecretAPIErrorZ* orig_conv = (LDKCResult_PaymentSecretAPIErrorZ*)untag_ptr(orig); LDKCResult_PaymentSecretAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretAPIErrorZ), "LDKCResult_PaymentSecretAPIErrorZ"); *ret_conv = CResult_PaymentSecretAPIErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_ok"))) TS_CResult_PaymentPreimageAPIErrorZ_ok(int8_tArray o) { +uint64_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); FREE(o); LDKCResult_PaymentPreimageAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentPreimageAPIErrorZ), "LDKCResult_PaymentPreimageAPIErrorZ"); *ret_conv = CResult_PaymentPreimageAPIErrorZ_ok(o_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_err"))) TS_CResult_PaymentPreimageAPIErrorZ_err(uint32_t e) { - void* e_ptr = (void*)(((uintptr_t)e) & ~1); +uint64_t __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_err"))) TS_CResult_PaymentPreimageAPIErrorZ_err(uint64_t e) { + void* e_ptr = untag_ptr(e); CHECK_ACCESS(e_ptr); LDKAPIError e_conv = *(LDKAPIError*)(e_ptr); - e_conv = APIError_clone((LDKAPIError*)(((uintptr_t)e) & ~1)); + e_conv = APIError_clone((LDKAPIError*)untag_ptr(e)); LDKCResult_PaymentPreimageAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentPreimageAPIErrorZ), "LDKCResult_PaymentPreimageAPIErrorZ"); *ret_conv = CResult_PaymentPreimageAPIErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_is_ok"))) TS_CResult_PaymentPreimageAPIErrorZ_is_ok(uint32_t o) { - LDKCResult_PaymentPreimageAPIErrorZ* o_conv = (LDKCResult_PaymentPreimageAPIErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_is_ok"))) TS_CResult_PaymentPreimageAPIErrorZ_is_ok(uint64_t o) { + LDKCResult_PaymentPreimageAPIErrorZ* o_conv = (LDKCResult_PaymentPreimageAPIErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_PaymentPreimageAPIErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_free"))) TS_CResult_PaymentPreimageAPIErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_free"))) TS_CResult_PaymentPreimageAPIErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_PaymentPreimageAPIErrorZ _res_conv = *(LDKCResult_PaymentPreimageAPIErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_PaymentPreimageAPIErrorZ_free(_res_conv); } -static inline uintptr_t CResult_PaymentPreimageAPIErrorZ_clone_ptr(LDKCResult_PaymentPreimageAPIErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_PaymentPreimageAPIErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_clone_ptr"))) TS_CResult_PaymentPreimageAPIErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_PaymentPreimageAPIErrorZ* arg_conv = (LDKCResult_PaymentPreimageAPIErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_PaymentPreimageAPIErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_clone"))) TS_CResult_PaymentPreimageAPIErrorZ_clone(uint32_t orig) { - LDKCResult_PaymentPreimageAPIErrorZ* orig_conv = (LDKCResult_PaymentPreimageAPIErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_clone"))) TS_CResult_PaymentPreimageAPIErrorZ_clone(uint64_t orig) { + LDKCResult_PaymentPreimageAPIErrorZ* orig_conv = (LDKCResult_PaymentPreimageAPIErrorZ*)untag_ptr(orig); LDKCResult_PaymentPreimageAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentPreimageAPIErrorZ), "LDKCResult_PaymentPreimageAPIErrorZ"); *ret_conv = CResult_PaymentPreimageAPIErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_ok"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_ok"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_ok(uint64_t o) { LDKCounterpartyForwardingInfo o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = CounterpartyForwardingInfo_clone(&o_conv); LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyForwardingInfoDecodeErrorZ), "LDKCResult_CounterpartyForwardingInfoDecodeErrorZ"); *ret_conv = CResult_CounterpartyForwardingInfoDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_err"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_err"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyForwardingInfoDecodeErrorZ), "LDKCResult_CounterpartyForwardingInfoDecodeErrorZ"); *ret_conv = CResult_CounterpartyForwardingInfoDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_is_ok"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* o_conv = (LDKCResult_CounterpartyForwardingInfoDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_is_ok"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* o_conv = (LDKCResult_CounterpartyForwardingInfoDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_CounterpartyForwardingInfoDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_free"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_free"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_CounterpartyForwardingInfoDecodeErrorZ _res_conv = *(LDKCResult_CounterpartyForwardingInfoDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_CounterpartyForwardingInfoDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_CounterpartyForwardingInfoDecodeErrorZ_clone_ptr(LDKCResult_CounterpartyForwardingInfoDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_CounterpartyForwardingInfoDecodeErrorZ_clone_ptr(LDKCResult_CounterpartyForwardingInfoDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyForwardingInfoDecodeErrorZ), "LDKCResult_CounterpartyForwardingInfoDecodeErrorZ"); *ret_conv = CResult_CounterpartyForwardingInfoDecodeErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_clone_ptr"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* arg_conv = (LDKCResult_CounterpartyForwardingInfoDecodeErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_CounterpartyForwardingInfoDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_clone_ptr"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* arg_conv = (LDKCResult_CounterpartyForwardingInfoDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_CounterpartyForwardingInfoDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_clone"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* orig_conv = (LDKCResult_CounterpartyForwardingInfoDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_clone"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* orig_conv = (LDKCResult_CounterpartyForwardingInfoDecodeErrorZ*)untag_ptr(orig); LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyForwardingInfoDecodeErrorZ), "LDKCResult_CounterpartyForwardingInfoDecodeErrorZ"); *ret_conv = CResult_CounterpartyForwardingInfoDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_ok"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_ok"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_ok(uint64_t o) { LDKChannelCounterparty o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ChannelCounterparty_clone(&o_conv); LDKCResult_ChannelCounterpartyDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelCounterpartyDecodeErrorZ), "LDKCResult_ChannelCounterpartyDecodeErrorZ"); *ret_conv = CResult_ChannelCounterpartyDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_err"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_err"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ChannelCounterpartyDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelCounterpartyDecodeErrorZ), "LDKCResult_ChannelCounterpartyDecodeErrorZ"); *ret_conv = CResult_ChannelCounterpartyDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_is_ok"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ChannelCounterpartyDecodeErrorZ* o_conv = (LDKCResult_ChannelCounterpartyDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_is_ok"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ChannelCounterpartyDecodeErrorZ* o_conv = (LDKCResult_ChannelCounterpartyDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ChannelCounterpartyDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_free"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_free"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ChannelCounterpartyDecodeErrorZ _res_conv = *(LDKCResult_ChannelCounterpartyDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ChannelCounterpartyDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ChannelCounterpartyDecodeErrorZ_clone_ptr(LDKCResult_ChannelCounterpartyDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_ChannelCounterpartyDecodeErrorZ_clone_ptr(LDKCResult_ChannelCounterpartyDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_ChannelCounterpartyDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelCounterpartyDecodeErrorZ), "LDKCResult_ChannelCounterpartyDecodeErrorZ"); *ret_conv = CResult_ChannelCounterpartyDecodeErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_ChannelCounterpartyDecodeErrorZ* arg_conv = (LDKCResult_ChannelCounterpartyDecodeErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_ChannelCounterpartyDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ChannelCounterpartyDecodeErrorZ* arg_conv = (LDKCResult_ChannelCounterpartyDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ChannelCounterpartyDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_clone"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ChannelCounterpartyDecodeErrorZ* orig_conv = (LDKCResult_ChannelCounterpartyDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_clone"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ChannelCounterpartyDecodeErrorZ* orig_conv = (LDKCResult_ChannelCounterpartyDecodeErrorZ*)untag_ptr(orig); LDKCResult_ChannelCounterpartyDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelCounterpartyDecodeErrorZ), "LDKCResult_ChannelCounterpartyDecodeErrorZ"); *ret_conv = CResult_ChannelCounterpartyDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_ok"))) TS_CResult_ChannelDetailsDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_ok"))) TS_CResult_ChannelDetailsDecodeErrorZ_ok(uint64_t o) { LDKChannelDetails o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ChannelDetails_clone(&o_conv); LDKCResult_ChannelDetailsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelDetailsDecodeErrorZ), "LDKCResult_ChannelDetailsDecodeErrorZ"); *ret_conv = CResult_ChannelDetailsDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_err"))) TS_CResult_ChannelDetailsDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_err"))) TS_CResult_ChannelDetailsDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ChannelDetailsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelDetailsDecodeErrorZ), "LDKCResult_ChannelDetailsDecodeErrorZ"); *ret_conv = CResult_ChannelDetailsDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_is_ok"))) TS_CResult_ChannelDetailsDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ChannelDetailsDecodeErrorZ* o_conv = (LDKCResult_ChannelDetailsDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_is_ok"))) TS_CResult_ChannelDetailsDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ChannelDetailsDecodeErrorZ* o_conv = (LDKCResult_ChannelDetailsDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ChannelDetailsDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_free"))) TS_CResult_ChannelDetailsDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_free"))) TS_CResult_ChannelDetailsDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ChannelDetailsDecodeErrorZ _res_conv = *(LDKCResult_ChannelDetailsDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ChannelDetailsDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ChannelDetailsDecodeErrorZ_clone_ptr(LDKCResult_ChannelDetailsDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_ChannelDetailsDecodeErrorZ_clone_ptr(LDKCResult_ChannelDetailsDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_ChannelDetailsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelDetailsDecodeErrorZ), "LDKCResult_ChannelDetailsDecodeErrorZ"); *ret_conv = CResult_ChannelDetailsDecodeErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelDetailsDecodeErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_ChannelDetailsDecodeErrorZ* arg_conv = (LDKCResult_ChannelDetailsDecodeErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_ChannelDetailsDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelDetailsDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ChannelDetailsDecodeErrorZ* arg_conv = (LDKCResult_ChannelDetailsDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ChannelDetailsDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_clone"))) TS_CResult_ChannelDetailsDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ChannelDetailsDecodeErrorZ* orig_conv = (LDKCResult_ChannelDetailsDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_clone"))) TS_CResult_ChannelDetailsDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ChannelDetailsDecodeErrorZ* orig_conv = (LDKCResult_ChannelDetailsDecodeErrorZ*)untag_ptr(orig); LDKCResult_ChannelDetailsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelDetailsDecodeErrorZ), "LDKCResult_ChannelDetailsDecodeErrorZ"); *ret_conv = CResult_ChannelDetailsDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_ok"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_ok"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_ok(uint64_t o) { LDKPhantomRouteHints o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = PhantomRouteHints_clone(&o_conv); LDKCResult_PhantomRouteHintsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PhantomRouteHintsDecodeErrorZ), "LDKCResult_PhantomRouteHintsDecodeErrorZ"); *ret_conv = CResult_PhantomRouteHintsDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_err"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_err"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_PhantomRouteHintsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PhantomRouteHintsDecodeErrorZ), "LDKCResult_PhantomRouteHintsDecodeErrorZ"); *ret_conv = CResult_PhantomRouteHintsDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_is_ok"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_PhantomRouteHintsDecodeErrorZ* o_conv = (LDKCResult_PhantomRouteHintsDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_is_ok"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_PhantomRouteHintsDecodeErrorZ* o_conv = (LDKCResult_PhantomRouteHintsDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_PhantomRouteHintsDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_free"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_free"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_PhantomRouteHintsDecodeErrorZ _res_conv = *(LDKCResult_PhantomRouteHintsDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_PhantomRouteHintsDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_PhantomRouteHintsDecodeErrorZ_clone_ptr(LDKCResult_PhantomRouteHintsDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_PhantomRouteHintsDecodeErrorZ_clone_ptr(LDKCResult_PhantomRouteHintsDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_PhantomRouteHintsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PhantomRouteHintsDecodeErrorZ), "LDKCResult_PhantomRouteHintsDecodeErrorZ"); *ret_conv = CResult_PhantomRouteHintsDecodeErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_clone_ptr"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_PhantomRouteHintsDecodeErrorZ* arg_conv = (LDKCResult_PhantomRouteHintsDecodeErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_PhantomRouteHintsDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_clone_ptr"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_PhantomRouteHintsDecodeErrorZ* arg_conv = (LDKCResult_PhantomRouteHintsDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_PhantomRouteHintsDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_clone"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_PhantomRouteHintsDecodeErrorZ* orig_conv = (LDKCResult_PhantomRouteHintsDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_clone"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_PhantomRouteHintsDecodeErrorZ* orig_conv = (LDKCResult_PhantomRouteHintsDecodeErrorZ*)untag_ptr(orig); LDKCResult_PhantomRouteHintsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PhantomRouteHintsDecodeErrorZ), "LDKCResult_PhantomRouteHintsDecodeErrorZ"); *ret_conv = CResult_PhantomRouteHintsDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_CVec_ChannelMonitorZ_free"))) TS_CVec_ChannelMonitorZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_ChannelMonitorZ_free"))) TS_CVec_ChannelMonitorZ_free(uint64_tArray _res) { LDKCVec_ChannelMonitorZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKChannelMonitor), "LDKCVec_ChannelMonitorZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t q = 0; q < _res_constr.datalen; q++) { - uint32_t _res_conv_16 = _res_vals[q]; + uint64_t _res_conv_16 = _res_vals[q]; LDKChannelMonitor _res_conv_16_conv; - _res_conv_16_conv.inner = (void*)(_res_conv_16 & (~1)); - _res_conv_16_conv.is_owned = (_res_conv_16 & 1) || (_res_conv_16 == 0); + _res_conv_16_conv.inner = untag_ptr(_res_conv_16); + _res_conv_16_conv.is_owned = ptr_is_owned(_res_conv_16); CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_16_conv); _res_constr.data[q] = _res_conv_16_conv; } @@ -16684,177 +15409,178 @@ void __attribute__((export_name("TS_CVec_ChannelMonitorZ_free"))) TS_CVec_Chann CVec_ChannelMonitorZ_free(_res_constr); } -uint32_t __attribute__((export_name("TS_C2Tuple_BlockHashChannelManagerZ_new"))) TS_C2Tuple_BlockHashChannelManagerZ_new(int8_tArray a, uint32_t b) { +uint64_t __attribute__((export_name("TS_C2Tuple_BlockHashChannelManagerZ_new"))) TS_C2Tuple_BlockHashChannelManagerZ_new(int8_tArray a, uint64_t b) { LDKThirtyTwoBytes a_ref; CHECK(a->arr_len == 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); + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); // 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 ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_C2Tuple_BlockHashChannelManagerZ_free"))) TS_C2Tuple_BlockHashChannelManagerZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_C2Tuple_BlockHashChannelManagerZ_free"))) TS_C2Tuple_BlockHashChannelManagerZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKC2Tuple_BlockHashChannelManagerZ _res_conv = *(LDKC2Tuple_BlockHashChannelManagerZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); C2Tuple_BlockHashChannelManagerZ_free(_res_conv); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_ok"))) TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_ok"))) TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_ok(uint64_t o) { + void* o_ptr = untag_ptr(o); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_err"))) TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_err"))) TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_is_ok"))) TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ* o_conv = (LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_is_ok"))) TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ* o_conv = (LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_is_ok(o_conv); return ret_conv; } -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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_free"))) TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ _res_conv = *(LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_free(_res_conv); } -uint32_t __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_ok"))) TS_CResult_ChannelConfigDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_ok"))) TS_CResult_ChannelConfigDecodeErrorZ_ok(uint64_t o) { LDKChannelConfig o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ChannelConfig_clone(&o_conv); LDKCResult_ChannelConfigDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelConfigDecodeErrorZ), "LDKCResult_ChannelConfigDecodeErrorZ"); *ret_conv = CResult_ChannelConfigDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_err"))) TS_CResult_ChannelConfigDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_err"))) TS_CResult_ChannelConfigDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ChannelConfigDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelConfigDecodeErrorZ), "LDKCResult_ChannelConfigDecodeErrorZ"); *ret_conv = CResult_ChannelConfigDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_is_ok"))) TS_CResult_ChannelConfigDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ChannelConfigDecodeErrorZ* o_conv = (LDKCResult_ChannelConfigDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_is_ok"))) TS_CResult_ChannelConfigDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ChannelConfigDecodeErrorZ* o_conv = (LDKCResult_ChannelConfigDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ChannelConfigDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_free"))) TS_CResult_ChannelConfigDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_free"))) TS_CResult_ChannelConfigDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ChannelConfigDecodeErrorZ _res_conv = *(LDKCResult_ChannelConfigDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ChannelConfigDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ChannelConfigDecodeErrorZ_clone_ptr(LDKCResult_ChannelConfigDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_ChannelConfigDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelConfigDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ChannelConfigDecodeErrorZ* arg_conv = (LDKCResult_ChannelConfigDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ChannelConfigDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_clone"))) TS_CResult_ChannelConfigDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ChannelConfigDecodeErrorZ* orig_conv = (LDKCResult_ChannelConfigDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_clone"))) TS_CResult_ChannelConfigDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ChannelConfigDecodeErrorZ* orig_conv = (LDKCResult_ChannelConfigDecodeErrorZ*)untag_ptr(orig); LDKCResult_ChannelConfigDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelConfigDecodeErrorZ), "LDKCResult_ChannelConfigDecodeErrorZ"); *ret_conv = CResult_ChannelConfigDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_ok"))) TS_CResult_OutPointDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_ok"))) TS_CResult_OutPointDecodeErrorZ_ok(uint64_t o) { LDKOutPoint o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = OutPoint_clone(&o_conv); LDKCResult_OutPointDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OutPointDecodeErrorZ), "LDKCResult_OutPointDecodeErrorZ"); *ret_conv = CResult_OutPointDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_err"))) TS_CResult_OutPointDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_err"))) TS_CResult_OutPointDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_OutPointDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OutPointDecodeErrorZ), "LDKCResult_OutPointDecodeErrorZ"); *ret_conv = CResult_OutPointDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_is_ok"))) TS_CResult_OutPointDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_OutPointDecodeErrorZ* o_conv = (LDKCResult_OutPointDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_is_ok"))) TS_CResult_OutPointDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_OutPointDecodeErrorZ* o_conv = (LDKCResult_OutPointDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_OutPointDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_free"))) TS_CResult_OutPointDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_free"))) TS_CResult_OutPointDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_OutPointDecodeErrorZ _res_conv = *(LDKCResult_OutPointDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_OutPointDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_OutPointDecodeErrorZ_clone_ptr(LDKCResult_OutPointDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_OutPointDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_clone_ptr"))) TS_CResult_OutPointDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_OutPointDecodeErrorZ* arg_conv = (LDKCResult_OutPointDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_OutPointDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_clone"))) TS_CResult_OutPointDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_OutPointDecodeErrorZ* orig_conv = (LDKCResult_OutPointDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_clone"))) TS_CResult_OutPointDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_OutPointDecodeErrorZ* orig_conv = (LDKCResult_OutPointDecodeErrorZ*)untag_ptr(orig); LDKCResult_OutPointDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OutPointDecodeErrorZ), "LDKCResult_OutPointDecodeErrorZ"); *ret_conv = CResult_OutPointDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_COption_TypeZ_some"))) TS_COption_TypeZ_some(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_COption_TypeZ_some"))) TS_COption_TypeZ_some(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKType o_conv = *(LDKType*)(o_ptr); if (o_conv.free == LDKType_JCalls_free) { @@ -16863,420 +15589,420 @@ uint32_t __attribute__((export_name("TS_COption_TypeZ_some"))) TS_COption_TypeZ } LDKCOption_TypeZ *ret_copy = MALLOC(sizeof(LDKCOption_TypeZ), "LDKCOption_TypeZ"); *ret_copy = COption_TypeZ_some(o_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_TypeZ_none"))) TS_COption_TypeZ_none() { +uint64_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(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_COption_TypeZ_free"))) TS_COption_TypeZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCOption_TypeZ _res_conv = *(LDKCOption_TypeZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); COption_TypeZ_free(_res_conv); } -static inline uintptr_t COption_TypeZ_clone_ptr(LDKCOption_TypeZ *NONNULL_PTR arg) { +static inline uint64_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); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_TypeZ_clone_ptr"))) TS_COption_TypeZ_clone_ptr(uint32_t arg) { - LDKCOption_TypeZ* arg_conv = (LDKCOption_TypeZ*)arg; - uint32_t ret_conv = COption_TypeZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_COption_TypeZ_clone_ptr"))) TS_COption_TypeZ_clone_ptr(uint64_t arg) { + LDKCOption_TypeZ* arg_conv = (LDKCOption_TypeZ*)untag_ptr(arg); + int64_t ret_conv = COption_TypeZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_COption_TypeZ_clone"))) TS_COption_TypeZ_clone(uint32_t orig) { - LDKCOption_TypeZ* orig_conv = (LDKCOption_TypeZ*)orig; +uint64_t __attribute__((export_name("TS_COption_TypeZ_clone"))) TS_COption_TypeZ_clone(uint64_t orig) { + LDKCOption_TypeZ* orig_conv = (LDKCOption_TypeZ*)untag_ptr(orig); LDKCOption_TypeZ *ret_copy = MALLOC(sizeof(LDKCOption_TypeZ), "LDKCOption_TypeZ"); *ret_copy = COption_TypeZ_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_ok"))) TS_CResult_COption_TypeZDecodeErrorZ_ok(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKCOption_TypeZ o_conv = *(LDKCOption_TypeZ*)(o_ptr); - o_conv = COption_TypeZ_clone((LDKCOption_TypeZ*)(((uintptr_t)o) & ~1)); + o_conv = COption_TypeZ_clone((LDKCOption_TypeZ*)untag_ptr(o)); LDKCResult_COption_TypeZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_TypeZDecodeErrorZ), "LDKCResult_COption_TypeZDecodeErrorZ"); *ret_conv = CResult_COption_TypeZDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_err"))) TS_CResult_COption_TypeZDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_err"))) TS_CResult_COption_TypeZDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_is_ok"))) TS_CResult_COption_TypeZDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_COption_TypeZDecodeErrorZ* o_conv = (LDKCResult_COption_TypeZDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_is_ok"))) TS_CResult_COption_TypeZDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_COption_TypeZDecodeErrorZ* o_conv = (LDKCResult_COption_TypeZDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_COption_TypeZDecodeErrorZ_is_ok(o_conv); return ret_conv; } -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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_free"))) TS_CResult_COption_TypeZDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_COption_TypeZDecodeErrorZ _res_conv = *(LDKCResult_COption_TypeZDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_COption_TypeZDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_COption_TypeZDecodeErrorZ_clone_ptr(LDKCResult_COption_TypeZDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_COption_TypeZDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_clone_ptr"))) TS_CResult_COption_TypeZDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_COption_TypeZDecodeErrorZ* arg_conv = (LDKCResult_COption_TypeZDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_COption_TypeZDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_clone"))) TS_CResult_COption_TypeZDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_COption_TypeZDecodeErrorZ* orig_conv = (LDKCResult_COption_TypeZDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_clone"))) TS_CResult_COption_TypeZDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_COption_TypeZDecodeErrorZ* orig_conv = (LDKCResult_COption_TypeZDecodeErrorZ*)untag_ptr(orig); LDKCResult_COption_TypeZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_TypeZDecodeErrorZ), "LDKCResult_COption_TypeZDecodeErrorZ"); *ret_conv = CResult_COption_TypeZDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_ok"))) TS_CResult_PaymentIdPaymentErrorZ_ok(int8_tArray o) { +uint64_t __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_ok"))) TS_CResult_PaymentIdPaymentErrorZ_ok(int8_tArray o) { LDKThirtyTwoBytes o_ref; CHECK(o->arr_len == 32); memcpy(o_ref.data, o->elems, 32); FREE(o); LDKCResult_PaymentIdPaymentErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentErrorZ), "LDKCResult_PaymentIdPaymentErrorZ"); *ret_conv = CResult_PaymentIdPaymentErrorZ_ok(o_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_err"))) TS_CResult_PaymentIdPaymentErrorZ_err(uint32_t e) { - void* e_ptr = (void*)(((uintptr_t)e) & ~1); +uint64_t __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_err"))) TS_CResult_PaymentIdPaymentErrorZ_err(uint64_t e) { + void* e_ptr = untag_ptr(e); CHECK_ACCESS(e_ptr); LDKPaymentError e_conv = *(LDKPaymentError*)(e_ptr); - e_conv = PaymentError_clone((LDKPaymentError*)(((uintptr_t)e) & ~1)); + e_conv = PaymentError_clone((LDKPaymentError*)untag_ptr(e)); LDKCResult_PaymentIdPaymentErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentErrorZ), "LDKCResult_PaymentIdPaymentErrorZ"); *ret_conv = CResult_PaymentIdPaymentErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_is_ok"))) TS_CResult_PaymentIdPaymentErrorZ_is_ok(uint32_t o) { - LDKCResult_PaymentIdPaymentErrorZ* o_conv = (LDKCResult_PaymentIdPaymentErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_is_ok"))) TS_CResult_PaymentIdPaymentErrorZ_is_ok(uint64_t o) { + LDKCResult_PaymentIdPaymentErrorZ* o_conv = (LDKCResult_PaymentIdPaymentErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_PaymentIdPaymentErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_free"))) TS_CResult_PaymentIdPaymentErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_free"))) TS_CResult_PaymentIdPaymentErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_PaymentIdPaymentErrorZ _res_conv = *(LDKCResult_PaymentIdPaymentErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_PaymentIdPaymentErrorZ_free(_res_conv); } -static inline uintptr_t CResult_PaymentIdPaymentErrorZ_clone_ptr(LDKCResult_PaymentIdPaymentErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_PaymentIdPaymentErrorZ_clone_ptr(LDKCResult_PaymentIdPaymentErrorZ *NONNULL_PTR arg) { LDKCResult_PaymentIdPaymentErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentErrorZ), "LDKCResult_PaymentIdPaymentErrorZ"); *ret_conv = CResult_PaymentIdPaymentErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_clone_ptr"))) TS_CResult_PaymentIdPaymentErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_PaymentIdPaymentErrorZ* arg_conv = (LDKCResult_PaymentIdPaymentErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_PaymentIdPaymentErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_clone_ptr"))) TS_CResult_PaymentIdPaymentErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_PaymentIdPaymentErrorZ* arg_conv = (LDKCResult_PaymentIdPaymentErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_PaymentIdPaymentErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_clone"))) TS_CResult_PaymentIdPaymentErrorZ_clone(uint32_t orig) { - LDKCResult_PaymentIdPaymentErrorZ* orig_conv = (LDKCResult_PaymentIdPaymentErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_clone"))) TS_CResult_PaymentIdPaymentErrorZ_clone(uint64_t orig) { + LDKCResult_PaymentIdPaymentErrorZ* orig_conv = (LDKCResult_PaymentIdPaymentErrorZ*)untag_ptr(orig); LDKCResult_PaymentIdPaymentErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentErrorZ), "LDKCResult_PaymentIdPaymentErrorZ"); *ret_conv = CResult_PaymentIdPaymentErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_SiPrefixParseErrorZ_ok"))) TS_CResult_SiPrefixParseErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_SiPrefixParseErrorZ_ok"))) TS_CResult_SiPrefixParseErrorZ_ok(uint32_t o) { LDKSiPrefix o_conv = LDKSiPrefix_from_js(o); LDKCResult_SiPrefixParseErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SiPrefixParseErrorZ), "LDKCResult_SiPrefixParseErrorZ"); *ret_conv = CResult_SiPrefixParseErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_SiPrefixParseErrorZ_err"))) TS_CResult_SiPrefixParseErrorZ_err(uint32_t e) { - void* e_ptr = (void*)(((uintptr_t)e) & ~1); +uint64_t __attribute__((export_name("TS_CResult_SiPrefixParseErrorZ_err"))) TS_CResult_SiPrefixParseErrorZ_err(uint64_t e) { + void* e_ptr = untag_ptr(e); CHECK_ACCESS(e_ptr); LDKParseError e_conv = *(LDKParseError*)(e_ptr); - e_conv = ParseError_clone((LDKParseError*)(((uintptr_t)e) & ~1)); + e_conv = ParseError_clone((LDKParseError*)untag_ptr(e)); LDKCResult_SiPrefixParseErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SiPrefixParseErrorZ), "LDKCResult_SiPrefixParseErrorZ"); *ret_conv = CResult_SiPrefixParseErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_SiPrefixParseErrorZ_is_ok"))) TS_CResult_SiPrefixParseErrorZ_is_ok(uint32_t o) { - LDKCResult_SiPrefixParseErrorZ* o_conv = (LDKCResult_SiPrefixParseErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_SiPrefixParseErrorZ_is_ok"))) TS_CResult_SiPrefixParseErrorZ_is_ok(uint64_t o) { + LDKCResult_SiPrefixParseErrorZ* o_conv = (LDKCResult_SiPrefixParseErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_SiPrefixParseErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_SiPrefixParseErrorZ_free"))) TS_CResult_SiPrefixParseErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_SiPrefixParseErrorZ_free"))) TS_CResult_SiPrefixParseErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_SiPrefixParseErrorZ _res_conv = *(LDKCResult_SiPrefixParseErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_SiPrefixParseErrorZ_free(_res_conv); } -static inline uintptr_t CResult_SiPrefixParseErrorZ_clone_ptr(LDKCResult_SiPrefixParseErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_SiPrefixParseErrorZ_clone_ptr(LDKCResult_SiPrefixParseErrorZ *NONNULL_PTR arg) { LDKCResult_SiPrefixParseErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SiPrefixParseErrorZ), "LDKCResult_SiPrefixParseErrorZ"); *ret_conv = CResult_SiPrefixParseErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_SiPrefixParseErrorZ_clone_ptr"))) TS_CResult_SiPrefixParseErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_SiPrefixParseErrorZ* arg_conv = (LDKCResult_SiPrefixParseErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_SiPrefixParseErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_SiPrefixParseErrorZ_clone_ptr"))) TS_CResult_SiPrefixParseErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_SiPrefixParseErrorZ* arg_conv = (LDKCResult_SiPrefixParseErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_SiPrefixParseErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_SiPrefixParseErrorZ_clone"))) TS_CResult_SiPrefixParseErrorZ_clone(uint32_t orig) { - LDKCResult_SiPrefixParseErrorZ* orig_conv = (LDKCResult_SiPrefixParseErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_SiPrefixParseErrorZ_clone"))) TS_CResult_SiPrefixParseErrorZ_clone(uint64_t orig) { + LDKCResult_SiPrefixParseErrorZ* orig_conv = (LDKCResult_SiPrefixParseErrorZ*)untag_ptr(orig); LDKCResult_SiPrefixParseErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SiPrefixParseErrorZ), "LDKCResult_SiPrefixParseErrorZ"); *ret_conv = CResult_SiPrefixParseErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_InvoiceParseOrSemanticErrorZ_ok"))) TS_CResult_InvoiceParseOrSemanticErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_InvoiceParseOrSemanticErrorZ_ok"))) TS_CResult_InvoiceParseOrSemanticErrorZ_ok(uint64_t o) { LDKInvoice o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = Invoice_clone(&o_conv); LDKCResult_InvoiceParseOrSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceParseOrSemanticErrorZ), "LDKCResult_InvoiceParseOrSemanticErrorZ"); *ret_conv = CResult_InvoiceParseOrSemanticErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_InvoiceParseOrSemanticErrorZ_err"))) TS_CResult_InvoiceParseOrSemanticErrorZ_err(uint32_t e) { - void* e_ptr = (void*)(((uintptr_t)e) & ~1); +uint64_t __attribute__((export_name("TS_CResult_InvoiceParseOrSemanticErrorZ_err"))) TS_CResult_InvoiceParseOrSemanticErrorZ_err(uint64_t e) { + void* e_ptr = untag_ptr(e); CHECK_ACCESS(e_ptr); LDKParseOrSemanticError e_conv = *(LDKParseOrSemanticError*)(e_ptr); - e_conv = ParseOrSemanticError_clone((LDKParseOrSemanticError*)(((uintptr_t)e) & ~1)); + e_conv = ParseOrSemanticError_clone((LDKParseOrSemanticError*)untag_ptr(e)); LDKCResult_InvoiceParseOrSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceParseOrSemanticErrorZ), "LDKCResult_InvoiceParseOrSemanticErrorZ"); *ret_conv = CResult_InvoiceParseOrSemanticErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_InvoiceParseOrSemanticErrorZ_is_ok"))) TS_CResult_InvoiceParseOrSemanticErrorZ_is_ok(uint32_t o) { - LDKCResult_InvoiceParseOrSemanticErrorZ* o_conv = (LDKCResult_InvoiceParseOrSemanticErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_InvoiceParseOrSemanticErrorZ_is_ok"))) TS_CResult_InvoiceParseOrSemanticErrorZ_is_ok(uint64_t o) { + LDKCResult_InvoiceParseOrSemanticErrorZ* o_conv = (LDKCResult_InvoiceParseOrSemanticErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_InvoiceParseOrSemanticErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_InvoiceParseOrSemanticErrorZ_free"))) TS_CResult_InvoiceParseOrSemanticErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_InvoiceParseOrSemanticErrorZ_free"))) TS_CResult_InvoiceParseOrSemanticErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_InvoiceParseOrSemanticErrorZ _res_conv = *(LDKCResult_InvoiceParseOrSemanticErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_InvoiceParseOrSemanticErrorZ_free(_res_conv); } -static inline uintptr_t CResult_InvoiceParseOrSemanticErrorZ_clone_ptr(LDKCResult_InvoiceParseOrSemanticErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_InvoiceParseOrSemanticErrorZ_clone_ptr(LDKCResult_InvoiceParseOrSemanticErrorZ *NONNULL_PTR arg) { LDKCResult_InvoiceParseOrSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceParseOrSemanticErrorZ), "LDKCResult_InvoiceParseOrSemanticErrorZ"); *ret_conv = CResult_InvoiceParseOrSemanticErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_InvoiceParseOrSemanticErrorZ_clone_ptr"))) TS_CResult_InvoiceParseOrSemanticErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_InvoiceParseOrSemanticErrorZ* arg_conv = (LDKCResult_InvoiceParseOrSemanticErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_InvoiceParseOrSemanticErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_InvoiceParseOrSemanticErrorZ_clone_ptr"))) TS_CResult_InvoiceParseOrSemanticErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_InvoiceParseOrSemanticErrorZ* arg_conv = (LDKCResult_InvoiceParseOrSemanticErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_InvoiceParseOrSemanticErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_InvoiceParseOrSemanticErrorZ_clone"))) TS_CResult_InvoiceParseOrSemanticErrorZ_clone(uint32_t orig) { - LDKCResult_InvoiceParseOrSemanticErrorZ* orig_conv = (LDKCResult_InvoiceParseOrSemanticErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_InvoiceParseOrSemanticErrorZ_clone"))) TS_CResult_InvoiceParseOrSemanticErrorZ_clone(uint64_t orig) { + LDKCResult_InvoiceParseOrSemanticErrorZ* orig_conv = (LDKCResult_InvoiceParseOrSemanticErrorZ*)untag_ptr(orig); LDKCResult_InvoiceParseOrSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceParseOrSemanticErrorZ), "LDKCResult_InvoiceParseOrSemanticErrorZ"); *ret_conv = CResult_InvoiceParseOrSemanticErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_SignedRawInvoiceParseErrorZ_ok"))) TS_CResult_SignedRawInvoiceParseErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_SignedRawInvoiceParseErrorZ_ok"))) TS_CResult_SignedRawInvoiceParseErrorZ_ok(uint64_t o) { LDKSignedRawInvoice o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = SignedRawInvoice_clone(&o_conv); LDKCResult_SignedRawInvoiceParseErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SignedRawInvoiceParseErrorZ), "LDKCResult_SignedRawInvoiceParseErrorZ"); *ret_conv = CResult_SignedRawInvoiceParseErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_SignedRawInvoiceParseErrorZ_err"))) TS_CResult_SignedRawInvoiceParseErrorZ_err(uint32_t e) { - void* e_ptr = (void*)(((uintptr_t)e) & ~1); +uint64_t __attribute__((export_name("TS_CResult_SignedRawInvoiceParseErrorZ_err"))) TS_CResult_SignedRawInvoiceParseErrorZ_err(uint64_t e) { + void* e_ptr = untag_ptr(e); CHECK_ACCESS(e_ptr); LDKParseError e_conv = *(LDKParseError*)(e_ptr); - e_conv = ParseError_clone((LDKParseError*)(((uintptr_t)e) & ~1)); + e_conv = ParseError_clone((LDKParseError*)untag_ptr(e)); LDKCResult_SignedRawInvoiceParseErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SignedRawInvoiceParseErrorZ), "LDKCResult_SignedRawInvoiceParseErrorZ"); *ret_conv = CResult_SignedRawInvoiceParseErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_SignedRawInvoiceParseErrorZ_is_ok"))) TS_CResult_SignedRawInvoiceParseErrorZ_is_ok(uint32_t o) { - LDKCResult_SignedRawInvoiceParseErrorZ* o_conv = (LDKCResult_SignedRawInvoiceParseErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_SignedRawInvoiceParseErrorZ_is_ok"))) TS_CResult_SignedRawInvoiceParseErrorZ_is_ok(uint64_t o) { + LDKCResult_SignedRawInvoiceParseErrorZ* o_conv = (LDKCResult_SignedRawInvoiceParseErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_SignedRawInvoiceParseErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_SignedRawInvoiceParseErrorZ_free"))) TS_CResult_SignedRawInvoiceParseErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_SignedRawInvoiceParseErrorZ_free"))) TS_CResult_SignedRawInvoiceParseErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_SignedRawInvoiceParseErrorZ _res_conv = *(LDKCResult_SignedRawInvoiceParseErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_SignedRawInvoiceParseErrorZ_free(_res_conv); } -static inline uintptr_t CResult_SignedRawInvoiceParseErrorZ_clone_ptr(LDKCResult_SignedRawInvoiceParseErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_SignedRawInvoiceParseErrorZ_clone_ptr(LDKCResult_SignedRawInvoiceParseErrorZ *NONNULL_PTR arg) { LDKCResult_SignedRawInvoiceParseErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SignedRawInvoiceParseErrorZ), "LDKCResult_SignedRawInvoiceParseErrorZ"); *ret_conv = CResult_SignedRawInvoiceParseErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_SignedRawInvoiceParseErrorZ_clone_ptr"))) TS_CResult_SignedRawInvoiceParseErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_SignedRawInvoiceParseErrorZ* arg_conv = (LDKCResult_SignedRawInvoiceParseErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_SignedRawInvoiceParseErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_SignedRawInvoiceParseErrorZ_clone_ptr"))) TS_CResult_SignedRawInvoiceParseErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_SignedRawInvoiceParseErrorZ* arg_conv = (LDKCResult_SignedRawInvoiceParseErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_SignedRawInvoiceParseErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_SignedRawInvoiceParseErrorZ_clone"))) TS_CResult_SignedRawInvoiceParseErrorZ_clone(uint32_t orig) { - LDKCResult_SignedRawInvoiceParseErrorZ* orig_conv = (LDKCResult_SignedRawInvoiceParseErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_SignedRawInvoiceParseErrorZ_clone"))) TS_CResult_SignedRawInvoiceParseErrorZ_clone(uint64_t orig) { + LDKCResult_SignedRawInvoiceParseErrorZ* orig_conv = (LDKCResult_SignedRawInvoiceParseErrorZ*)untag_ptr(orig); LDKCResult_SignedRawInvoiceParseErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SignedRawInvoiceParseErrorZ), "LDKCResult_SignedRawInvoiceParseErrorZ"); *ret_conv = CResult_SignedRawInvoiceParseErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -static inline uintptr_t C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone_ptr(LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ *NONNULL_PTR arg) { +static inline uint64_t C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone_ptr(LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ *NONNULL_PTR arg) { LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* ret_conv = MALLOC(sizeof(LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ), "LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ"); *ret_conv = C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone(arg); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone_ptr"))) TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone_ptr(uint32_t arg) { - LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* arg_conv = (LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ*)(arg & ~1); - uint32_t ret_conv = C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone_ptr"))) TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone_ptr(uint64_t arg) { + LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* arg_conv = (LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ*)untag_ptr(arg); + int64_t ret_conv = C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone"))) TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone(uint32_t orig) { - LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* orig_conv = (LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone"))) TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone(uint64_t orig) { + LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* orig_conv = (LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ*)untag_ptr(orig); LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* ret_conv = MALLOC(sizeof(LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ), "LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ"); *ret_conv = C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone(orig_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_new"))) TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_new(uint32_t a, int8_tArray b, uint32_t c) { +uint64_t __attribute__((export_name("TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_new"))) TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_new(uint64_t a, int8_tArray b, uint64_t c) { LDKRawInvoice a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = (a & 1) || (a == 0); + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); a_conv = RawInvoice_clone(&a_conv); LDKThirtyTwoBytes b_ref; CHECK(b->arr_len == 32); memcpy(b_ref.data, b->elems, 32); FREE(b); LDKInvoiceSignature c_conv; - c_conv.inner = (void*)(c & (~1)); - c_conv.is_owned = (c & 1) || (c == 0); + c_conv.inner = untag_ptr(c); + c_conv.is_owned = ptr_is_owned(c); CHECK_INNER_FIELD_ACCESS_OR_NULL(c_conv); c_conv = InvoiceSignature_clone(&c_conv); LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* ret_conv = MALLOC(sizeof(LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ), "LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ"); *ret_conv = C3Tuple_RawInvoice_u832InvoiceSignatureZ_new(a_conv, b_ref, c_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_free"))) TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_free"))) TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ _res_conv = *(LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); C3Tuple_RawInvoice_u832InvoiceSignatureZ_free(_res_conv); } -uint32_t __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_ok"))) TS_CResult_PayeePubKeyErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_ok"))) TS_CResult_PayeePubKeyErrorZ_ok(uint64_t o) { LDKPayeePubKey o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = PayeePubKey_clone(&o_conv); LDKCResult_PayeePubKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PayeePubKeyErrorZ), "LDKCResult_PayeePubKeyErrorZ"); *ret_conv = CResult_PayeePubKeyErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_err"))) TS_CResult_PayeePubKeyErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_err"))) TS_CResult_PayeePubKeyErrorZ_err(uint32_t e) { LDKSecp256k1Error e_conv = LDKSecp256k1Error_from_js(e); LDKCResult_PayeePubKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PayeePubKeyErrorZ), "LDKCResult_PayeePubKeyErrorZ"); *ret_conv = CResult_PayeePubKeyErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_is_ok"))) TS_CResult_PayeePubKeyErrorZ_is_ok(uint32_t o) { - LDKCResult_PayeePubKeyErrorZ* o_conv = (LDKCResult_PayeePubKeyErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_is_ok"))) TS_CResult_PayeePubKeyErrorZ_is_ok(uint64_t o) { + LDKCResult_PayeePubKeyErrorZ* o_conv = (LDKCResult_PayeePubKeyErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_PayeePubKeyErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_free"))) TS_CResult_PayeePubKeyErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_free"))) TS_CResult_PayeePubKeyErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_PayeePubKeyErrorZ _res_conv = *(LDKCResult_PayeePubKeyErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_PayeePubKeyErrorZ_free(_res_conv); } -static inline uintptr_t CResult_PayeePubKeyErrorZ_clone_ptr(LDKCResult_PayeePubKeyErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_PayeePubKeyErrorZ_clone_ptr(LDKCResult_PayeePubKeyErrorZ *NONNULL_PTR arg) { LDKCResult_PayeePubKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PayeePubKeyErrorZ), "LDKCResult_PayeePubKeyErrorZ"); *ret_conv = CResult_PayeePubKeyErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_clone_ptr"))) TS_CResult_PayeePubKeyErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_PayeePubKeyErrorZ* arg_conv = (LDKCResult_PayeePubKeyErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_PayeePubKeyErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_clone_ptr"))) TS_CResult_PayeePubKeyErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_PayeePubKeyErrorZ* arg_conv = (LDKCResult_PayeePubKeyErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_PayeePubKeyErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_clone"))) TS_CResult_PayeePubKeyErrorZ_clone(uint32_t orig) { - LDKCResult_PayeePubKeyErrorZ* orig_conv = (LDKCResult_PayeePubKeyErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_clone"))) TS_CResult_PayeePubKeyErrorZ_clone(uint64_t orig) { + LDKCResult_PayeePubKeyErrorZ* orig_conv = (LDKCResult_PayeePubKeyErrorZ*)untag_ptr(orig); LDKCResult_PayeePubKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PayeePubKeyErrorZ), "LDKCResult_PayeePubKeyErrorZ"); *ret_conv = CResult_PayeePubKeyErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_CVec_PrivateRouteZ_free"))) TS_CVec_PrivateRouteZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_PrivateRouteZ_free"))) TS_CVec_PrivateRouteZ_free(uint64_tArray _res) { LDKCVec_PrivateRouteZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKPrivateRoute), "LDKCVec_PrivateRouteZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t o = 0; o < _res_constr.datalen; o++) { - uint32_t _res_conv_14 = _res_vals[o]; + uint64_t _res_conv_14 = _res_vals[o]; LDKPrivateRoute _res_conv_14_conv; - _res_conv_14_conv.inner = (void*)(_res_conv_14 & (~1)); - _res_conv_14_conv.is_owned = (_res_conv_14 & 1) || (_res_conv_14 == 0); + _res_conv_14_conv.inner = untag_ptr(_res_conv_14); + _res_conv_14_conv.is_owned = ptr_is_owned(_res_conv_14); CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_14_conv); _res_constr.data[o] = _res_conv_14_conv; } @@ -17284,536 +16010,536 @@ void __attribute__((export_name("TS_CVec_PrivateRouteZ_free"))) TS_CVec_Private CVec_PrivateRouteZ_free(_res_constr); } -uint32_t __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_ok"))) TS_CResult_PositiveTimestampCreationErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_ok"))) TS_CResult_PositiveTimestampCreationErrorZ_ok(uint64_t o) { LDKPositiveTimestamp o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = PositiveTimestamp_clone(&o_conv); LDKCResult_PositiveTimestampCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PositiveTimestampCreationErrorZ), "LDKCResult_PositiveTimestampCreationErrorZ"); *ret_conv = CResult_PositiveTimestampCreationErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_err"))) TS_CResult_PositiveTimestampCreationErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_err"))) TS_CResult_PositiveTimestampCreationErrorZ_err(uint32_t e) { LDKCreationError e_conv = LDKCreationError_from_js(e); LDKCResult_PositiveTimestampCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PositiveTimestampCreationErrorZ), "LDKCResult_PositiveTimestampCreationErrorZ"); *ret_conv = CResult_PositiveTimestampCreationErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_is_ok"))) TS_CResult_PositiveTimestampCreationErrorZ_is_ok(uint32_t o) { - LDKCResult_PositiveTimestampCreationErrorZ* o_conv = (LDKCResult_PositiveTimestampCreationErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_is_ok"))) TS_CResult_PositiveTimestampCreationErrorZ_is_ok(uint64_t o) { + LDKCResult_PositiveTimestampCreationErrorZ* o_conv = (LDKCResult_PositiveTimestampCreationErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_PositiveTimestampCreationErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_free"))) TS_CResult_PositiveTimestampCreationErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_free"))) TS_CResult_PositiveTimestampCreationErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_PositiveTimestampCreationErrorZ _res_conv = *(LDKCResult_PositiveTimestampCreationErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_PositiveTimestampCreationErrorZ_free(_res_conv); } -static inline uintptr_t CResult_PositiveTimestampCreationErrorZ_clone_ptr(LDKCResult_PositiveTimestampCreationErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_PositiveTimestampCreationErrorZ_clone_ptr(LDKCResult_PositiveTimestampCreationErrorZ *NONNULL_PTR arg) { LDKCResult_PositiveTimestampCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PositiveTimestampCreationErrorZ), "LDKCResult_PositiveTimestampCreationErrorZ"); *ret_conv = CResult_PositiveTimestampCreationErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_clone_ptr"))) TS_CResult_PositiveTimestampCreationErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_PositiveTimestampCreationErrorZ* arg_conv = (LDKCResult_PositiveTimestampCreationErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_PositiveTimestampCreationErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_clone_ptr"))) TS_CResult_PositiveTimestampCreationErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_PositiveTimestampCreationErrorZ* arg_conv = (LDKCResult_PositiveTimestampCreationErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_PositiveTimestampCreationErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_clone"))) TS_CResult_PositiveTimestampCreationErrorZ_clone(uint32_t orig) { - LDKCResult_PositiveTimestampCreationErrorZ* orig_conv = (LDKCResult_PositiveTimestampCreationErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_clone"))) TS_CResult_PositiveTimestampCreationErrorZ_clone(uint64_t orig) { + LDKCResult_PositiveTimestampCreationErrorZ* orig_conv = (LDKCResult_PositiveTimestampCreationErrorZ*)untag_ptr(orig); LDKCResult_PositiveTimestampCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PositiveTimestampCreationErrorZ), "LDKCResult_PositiveTimestampCreationErrorZ"); *ret_conv = CResult_PositiveTimestampCreationErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_ok"))) TS_CResult_NoneSemanticErrorZ_ok() { +uint64_t __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_ok"))) TS_CResult_NoneSemanticErrorZ_ok() { LDKCResult_NoneSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneSemanticErrorZ), "LDKCResult_NoneSemanticErrorZ"); *ret_conv = CResult_NoneSemanticErrorZ_ok(); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_err"))) TS_CResult_NoneSemanticErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_err"))) TS_CResult_NoneSemanticErrorZ_err(uint32_t e) { LDKSemanticError e_conv = LDKSemanticError_from_js(e); LDKCResult_NoneSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneSemanticErrorZ), "LDKCResult_NoneSemanticErrorZ"); *ret_conv = CResult_NoneSemanticErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_is_ok"))) TS_CResult_NoneSemanticErrorZ_is_ok(uint32_t o) { - LDKCResult_NoneSemanticErrorZ* o_conv = (LDKCResult_NoneSemanticErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_is_ok"))) TS_CResult_NoneSemanticErrorZ_is_ok(uint64_t o) { + LDKCResult_NoneSemanticErrorZ* o_conv = (LDKCResult_NoneSemanticErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_NoneSemanticErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_free"))) TS_CResult_NoneSemanticErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_free"))) TS_CResult_NoneSemanticErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_NoneSemanticErrorZ _res_conv = *(LDKCResult_NoneSemanticErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_NoneSemanticErrorZ_free(_res_conv); } -static inline uintptr_t CResult_NoneSemanticErrorZ_clone_ptr(LDKCResult_NoneSemanticErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_NoneSemanticErrorZ_clone_ptr(LDKCResult_NoneSemanticErrorZ *NONNULL_PTR arg) { LDKCResult_NoneSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneSemanticErrorZ), "LDKCResult_NoneSemanticErrorZ"); *ret_conv = CResult_NoneSemanticErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_clone_ptr"))) TS_CResult_NoneSemanticErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_NoneSemanticErrorZ* arg_conv = (LDKCResult_NoneSemanticErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_NoneSemanticErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_clone_ptr"))) TS_CResult_NoneSemanticErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_NoneSemanticErrorZ* arg_conv = (LDKCResult_NoneSemanticErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_NoneSemanticErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_clone"))) TS_CResult_NoneSemanticErrorZ_clone(uint32_t orig) { - LDKCResult_NoneSemanticErrorZ* orig_conv = (LDKCResult_NoneSemanticErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_clone"))) TS_CResult_NoneSemanticErrorZ_clone(uint64_t orig) { + LDKCResult_NoneSemanticErrorZ* orig_conv = (LDKCResult_NoneSemanticErrorZ*)untag_ptr(orig); LDKCResult_NoneSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneSemanticErrorZ), "LDKCResult_NoneSemanticErrorZ"); *ret_conv = CResult_NoneSemanticErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_ok"))) TS_CResult_InvoiceSemanticErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_ok"))) TS_CResult_InvoiceSemanticErrorZ_ok(uint64_t o) { LDKInvoice o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = Invoice_clone(&o_conv); LDKCResult_InvoiceSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceSemanticErrorZ), "LDKCResult_InvoiceSemanticErrorZ"); *ret_conv = CResult_InvoiceSemanticErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_err"))) TS_CResult_InvoiceSemanticErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_err"))) TS_CResult_InvoiceSemanticErrorZ_err(uint32_t e) { LDKSemanticError e_conv = LDKSemanticError_from_js(e); LDKCResult_InvoiceSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceSemanticErrorZ), "LDKCResult_InvoiceSemanticErrorZ"); *ret_conv = CResult_InvoiceSemanticErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_is_ok"))) TS_CResult_InvoiceSemanticErrorZ_is_ok(uint32_t o) { - LDKCResult_InvoiceSemanticErrorZ* o_conv = (LDKCResult_InvoiceSemanticErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_is_ok"))) TS_CResult_InvoiceSemanticErrorZ_is_ok(uint64_t o) { + LDKCResult_InvoiceSemanticErrorZ* o_conv = (LDKCResult_InvoiceSemanticErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_InvoiceSemanticErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_free"))) TS_CResult_InvoiceSemanticErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_free"))) TS_CResult_InvoiceSemanticErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_InvoiceSemanticErrorZ _res_conv = *(LDKCResult_InvoiceSemanticErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_InvoiceSemanticErrorZ_free(_res_conv); } -static inline uintptr_t CResult_InvoiceSemanticErrorZ_clone_ptr(LDKCResult_InvoiceSemanticErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_InvoiceSemanticErrorZ_clone_ptr(LDKCResult_InvoiceSemanticErrorZ *NONNULL_PTR arg) { LDKCResult_InvoiceSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceSemanticErrorZ), "LDKCResult_InvoiceSemanticErrorZ"); *ret_conv = CResult_InvoiceSemanticErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_clone_ptr"))) TS_CResult_InvoiceSemanticErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_InvoiceSemanticErrorZ* arg_conv = (LDKCResult_InvoiceSemanticErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_InvoiceSemanticErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_clone_ptr"))) TS_CResult_InvoiceSemanticErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_InvoiceSemanticErrorZ* arg_conv = (LDKCResult_InvoiceSemanticErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_InvoiceSemanticErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_clone"))) TS_CResult_InvoiceSemanticErrorZ_clone(uint32_t orig) { - LDKCResult_InvoiceSemanticErrorZ* orig_conv = (LDKCResult_InvoiceSemanticErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_clone"))) TS_CResult_InvoiceSemanticErrorZ_clone(uint64_t orig) { + LDKCResult_InvoiceSemanticErrorZ* orig_conv = (LDKCResult_InvoiceSemanticErrorZ*)untag_ptr(orig); LDKCResult_InvoiceSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceSemanticErrorZ), "LDKCResult_InvoiceSemanticErrorZ"); *ret_conv = CResult_InvoiceSemanticErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_ok"))) TS_CResult_DescriptionCreationErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_ok"))) TS_CResult_DescriptionCreationErrorZ_ok(uint64_t o) { LDKDescription o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = Description_clone(&o_conv); LDKCResult_DescriptionCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DescriptionCreationErrorZ), "LDKCResult_DescriptionCreationErrorZ"); *ret_conv = CResult_DescriptionCreationErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_err"))) TS_CResult_DescriptionCreationErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_err"))) TS_CResult_DescriptionCreationErrorZ_err(uint32_t e) { LDKCreationError e_conv = LDKCreationError_from_js(e); LDKCResult_DescriptionCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DescriptionCreationErrorZ), "LDKCResult_DescriptionCreationErrorZ"); *ret_conv = CResult_DescriptionCreationErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_is_ok"))) TS_CResult_DescriptionCreationErrorZ_is_ok(uint32_t o) { - LDKCResult_DescriptionCreationErrorZ* o_conv = (LDKCResult_DescriptionCreationErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_is_ok"))) TS_CResult_DescriptionCreationErrorZ_is_ok(uint64_t o) { + LDKCResult_DescriptionCreationErrorZ* o_conv = (LDKCResult_DescriptionCreationErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_DescriptionCreationErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_free"))) TS_CResult_DescriptionCreationErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_free"))) TS_CResult_DescriptionCreationErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_DescriptionCreationErrorZ _res_conv = *(LDKCResult_DescriptionCreationErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_DescriptionCreationErrorZ_free(_res_conv); } -static inline uintptr_t CResult_DescriptionCreationErrorZ_clone_ptr(LDKCResult_DescriptionCreationErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_DescriptionCreationErrorZ_clone_ptr(LDKCResult_DescriptionCreationErrorZ *NONNULL_PTR arg) { LDKCResult_DescriptionCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DescriptionCreationErrorZ), "LDKCResult_DescriptionCreationErrorZ"); *ret_conv = CResult_DescriptionCreationErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_clone_ptr"))) TS_CResult_DescriptionCreationErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_DescriptionCreationErrorZ* arg_conv = (LDKCResult_DescriptionCreationErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_DescriptionCreationErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_clone_ptr"))) TS_CResult_DescriptionCreationErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_DescriptionCreationErrorZ* arg_conv = (LDKCResult_DescriptionCreationErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_DescriptionCreationErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_clone"))) TS_CResult_DescriptionCreationErrorZ_clone(uint32_t orig) { - LDKCResult_DescriptionCreationErrorZ* orig_conv = (LDKCResult_DescriptionCreationErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_clone"))) TS_CResult_DescriptionCreationErrorZ_clone(uint64_t orig) { + LDKCResult_DescriptionCreationErrorZ* orig_conv = (LDKCResult_DescriptionCreationErrorZ*)untag_ptr(orig); LDKCResult_DescriptionCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DescriptionCreationErrorZ), "LDKCResult_DescriptionCreationErrorZ"); *ret_conv = CResult_DescriptionCreationErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_ok"))) TS_CResult_PrivateRouteCreationErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_ok"))) TS_CResult_PrivateRouteCreationErrorZ_ok(uint64_t o) { LDKPrivateRoute o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = PrivateRoute_clone(&o_conv); LDKCResult_PrivateRouteCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PrivateRouteCreationErrorZ), "LDKCResult_PrivateRouteCreationErrorZ"); *ret_conv = CResult_PrivateRouteCreationErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_err"))) TS_CResult_PrivateRouteCreationErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_err"))) TS_CResult_PrivateRouteCreationErrorZ_err(uint32_t e) { LDKCreationError e_conv = LDKCreationError_from_js(e); LDKCResult_PrivateRouteCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PrivateRouteCreationErrorZ), "LDKCResult_PrivateRouteCreationErrorZ"); *ret_conv = CResult_PrivateRouteCreationErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_is_ok"))) TS_CResult_PrivateRouteCreationErrorZ_is_ok(uint32_t o) { - LDKCResult_PrivateRouteCreationErrorZ* o_conv = (LDKCResult_PrivateRouteCreationErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_is_ok"))) TS_CResult_PrivateRouteCreationErrorZ_is_ok(uint64_t o) { + LDKCResult_PrivateRouteCreationErrorZ* o_conv = (LDKCResult_PrivateRouteCreationErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_PrivateRouteCreationErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_free"))) TS_CResult_PrivateRouteCreationErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_free"))) TS_CResult_PrivateRouteCreationErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_PrivateRouteCreationErrorZ _res_conv = *(LDKCResult_PrivateRouteCreationErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_PrivateRouteCreationErrorZ_free(_res_conv); } -static inline uintptr_t CResult_PrivateRouteCreationErrorZ_clone_ptr(LDKCResult_PrivateRouteCreationErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_PrivateRouteCreationErrorZ_clone_ptr(LDKCResult_PrivateRouteCreationErrorZ *NONNULL_PTR arg) { LDKCResult_PrivateRouteCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PrivateRouteCreationErrorZ), "LDKCResult_PrivateRouteCreationErrorZ"); *ret_conv = CResult_PrivateRouteCreationErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_clone_ptr"))) TS_CResult_PrivateRouteCreationErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_PrivateRouteCreationErrorZ* arg_conv = (LDKCResult_PrivateRouteCreationErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_PrivateRouteCreationErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_clone_ptr"))) TS_CResult_PrivateRouteCreationErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_PrivateRouteCreationErrorZ* arg_conv = (LDKCResult_PrivateRouteCreationErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_PrivateRouteCreationErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_clone"))) TS_CResult_PrivateRouteCreationErrorZ_clone(uint32_t orig) { - LDKCResult_PrivateRouteCreationErrorZ* orig_conv = (LDKCResult_PrivateRouteCreationErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_clone"))) TS_CResult_PrivateRouteCreationErrorZ_clone(uint64_t orig) { + LDKCResult_PrivateRouteCreationErrorZ* orig_conv = (LDKCResult_PrivateRouteCreationErrorZ*)untag_ptr(orig); LDKCResult_PrivateRouteCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PrivateRouteCreationErrorZ), "LDKCResult_PrivateRouteCreationErrorZ"); *ret_conv = CResult_PrivateRouteCreationErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_StringErrorZ_ok"))) TS_CResult_StringErrorZ_ok(jstring o) { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_StringErrorZ_err"))) TS_CResult_StringErrorZ_err(uint32_t e) { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_StringErrorZ_is_ok"))) TS_CResult_StringErrorZ_is_ok(uint32_t o) { - LDKCResult_StringErrorZ* o_conv = (LDKCResult_StringErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_StringErrorZ_is_ok"))) TS_CResult_StringErrorZ_is_ok(uint64_t o) { + LDKCResult_StringErrorZ* o_conv = (LDKCResult_StringErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_StringErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_StringErrorZ_free"))) TS_CResult_StringErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_StringErrorZ_free"))) TS_CResult_StringErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_StringErrorZ _res_conv = *(LDKCResult_StringErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_StringErrorZ_free(_res_conv); } -static inline uintptr_t CResult_StringErrorZ_clone_ptr(LDKCResult_StringErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_StringErrorZ_clone_ptr(LDKCResult_StringErrorZ *NONNULL_PTR arg) { LDKCResult_StringErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_StringErrorZ), "LDKCResult_StringErrorZ"); *ret_conv = CResult_StringErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_StringErrorZ_clone_ptr"))) TS_CResult_StringErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_StringErrorZ* arg_conv = (LDKCResult_StringErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_StringErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_StringErrorZ_clone_ptr"))) TS_CResult_StringErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_StringErrorZ* arg_conv = (LDKCResult_StringErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_StringErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_StringErrorZ_clone"))) TS_CResult_StringErrorZ_clone(uint32_t orig) { - LDKCResult_StringErrorZ* orig_conv = (LDKCResult_StringErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_StringErrorZ_clone"))) TS_CResult_StringErrorZ_clone(uint64_t orig) { + LDKCResult_StringErrorZ* orig_conv = (LDKCResult_StringErrorZ*)untag_ptr(orig); LDKCResult_StringErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_StringErrorZ), "LDKCResult_StringErrorZ"); *ret_conv = CResult_StringErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_ok"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_ok"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_ok(uint64_t o) { LDKChannelMonitorUpdate o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ChannelMonitorUpdate_clone(&o_conv); LDKCResult_ChannelMonitorUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelMonitorUpdateDecodeErrorZ), "LDKCResult_ChannelMonitorUpdateDecodeErrorZ"); *ret_conv = CResult_ChannelMonitorUpdateDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_err"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_err"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ChannelMonitorUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelMonitorUpdateDecodeErrorZ), "LDKCResult_ChannelMonitorUpdateDecodeErrorZ"); *ret_conv = CResult_ChannelMonitorUpdateDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_is_ok"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ChannelMonitorUpdateDecodeErrorZ* o_conv = (LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_is_ok"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ChannelMonitorUpdateDecodeErrorZ* o_conv = (LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ChannelMonitorUpdateDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_free"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_free"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ChannelMonitorUpdateDecodeErrorZ _res_conv = *(LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ChannelMonitorUpdateDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ChannelMonitorUpdateDecodeErrorZ_clone_ptr(LDKCResult_ChannelMonitorUpdateDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_ChannelMonitorUpdateDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ChannelMonitorUpdateDecodeErrorZ* arg_conv = (LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ChannelMonitorUpdateDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_clone"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ChannelMonitorUpdateDecodeErrorZ* orig_conv = (LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_clone"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ChannelMonitorUpdateDecodeErrorZ* orig_conv = (LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)untag_ptr(orig); LDKCResult_ChannelMonitorUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelMonitorUpdateDecodeErrorZ), "LDKCResult_ChannelMonitorUpdateDecodeErrorZ"); *ret_conv = CResult_ChannelMonitorUpdateDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_COption_MonitorEventZ_some"))) TS_COption_MonitorEventZ_some(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_COption_MonitorEventZ_some"))) TS_COption_MonitorEventZ_some(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKMonitorEvent o_conv = *(LDKMonitorEvent*)(o_ptr); - o_conv = MonitorEvent_clone((LDKMonitorEvent*)(((uintptr_t)o) & ~1)); + o_conv = MonitorEvent_clone((LDKMonitorEvent*)untag_ptr(o)); LDKCOption_MonitorEventZ *ret_copy = MALLOC(sizeof(LDKCOption_MonitorEventZ), "LDKCOption_MonitorEventZ"); *ret_copy = COption_MonitorEventZ_some(o_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_MonitorEventZ_none"))) TS_COption_MonitorEventZ_none() { +uint64_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(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_COption_MonitorEventZ_free"))) TS_COption_MonitorEventZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCOption_MonitorEventZ _res_conv = *(LDKCOption_MonitorEventZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); COption_MonitorEventZ_free(_res_conv); } -static inline uintptr_t COption_MonitorEventZ_clone_ptr(LDKCOption_MonitorEventZ *NONNULL_PTR arg) { +static inline uint64_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); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_MonitorEventZ_clone_ptr"))) TS_COption_MonitorEventZ_clone_ptr(uint32_t arg) { - LDKCOption_MonitorEventZ* arg_conv = (LDKCOption_MonitorEventZ*)arg; - uint32_t ret_conv = COption_MonitorEventZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_COption_MonitorEventZ_clone_ptr"))) TS_COption_MonitorEventZ_clone_ptr(uint64_t arg) { + LDKCOption_MonitorEventZ* arg_conv = (LDKCOption_MonitorEventZ*)untag_ptr(arg); + int64_t ret_conv = COption_MonitorEventZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_COption_MonitorEventZ_clone"))) TS_COption_MonitorEventZ_clone(uint32_t orig) { - LDKCOption_MonitorEventZ* orig_conv = (LDKCOption_MonitorEventZ*)orig; +uint64_t __attribute__((export_name("TS_COption_MonitorEventZ_clone"))) TS_COption_MonitorEventZ_clone(uint64_t orig) { + LDKCOption_MonitorEventZ* orig_conv = (LDKCOption_MonitorEventZ*)untag_ptr(orig); LDKCOption_MonitorEventZ *ret_copy = MALLOC(sizeof(LDKCOption_MonitorEventZ), "LDKCOption_MonitorEventZ"); *ret_copy = COption_MonitorEventZ_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_ok"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_ok(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKCOption_MonitorEventZ o_conv = *(LDKCOption_MonitorEventZ*)(o_ptr); - o_conv = COption_MonitorEventZ_clone((LDKCOption_MonitorEventZ*)(((uintptr_t)o) & ~1)); + o_conv = COption_MonitorEventZ_clone((LDKCOption_MonitorEventZ*)untag_ptr(o)); LDKCResult_COption_MonitorEventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_MonitorEventZDecodeErrorZ), "LDKCResult_COption_MonitorEventZDecodeErrorZ"); *ret_conv = CResult_COption_MonitorEventZDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_err"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_err"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_is_ok"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_COption_MonitorEventZDecodeErrorZ* o_conv = (LDKCResult_COption_MonitorEventZDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_is_ok"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_COption_MonitorEventZDecodeErrorZ* o_conv = (LDKCResult_COption_MonitorEventZDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_COption_MonitorEventZDecodeErrorZ_is_ok(o_conv); return ret_conv; } -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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_free"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_COption_MonitorEventZDecodeErrorZ _res_conv = *(LDKCResult_COption_MonitorEventZDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_COption_MonitorEventZDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_COption_MonitorEventZDecodeErrorZ_clone_ptr(LDKCResult_COption_MonitorEventZDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_COption_MonitorEventZDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_clone_ptr"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_COption_MonitorEventZDecodeErrorZ* arg_conv = (LDKCResult_COption_MonitorEventZDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_COption_MonitorEventZDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_clone"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_COption_MonitorEventZDecodeErrorZ* orig_conv = (LDKCResult_COption_MonitorEventZDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_clone"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_COption_MonitorEventZDecodeErrorZ* orig_conv = (LDKCResult_COption_MonitorEventZDecodeErrorZ*)untag_ptr(orig); LDKCResult_COption_MonitorEventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_MonitorEventZDecodeErrorZ), "LDKCResult_COption_MonitorEventZDecodeErrorZ"); *ret_conv = CResult_COption_MonitorEventZDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_ok"))) TS_CResult_HTLCUpdateDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_ok"))) TS_CResult_HTLCUpdateDecodeErrorZ_ok(uint64_t o) { LDKHTLCUpdate o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = HTLCUpdate_clone(&o_conv); LDKCResult_HTLCUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCUpdateDecodeErrorZ), "LDKCResult_HTLCUpdateDecodeErrorZ"); *ret_conv = CResult_HTLCUpdateDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_err"))) TS_CResult_HTLCUpdateDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_err"))) TS_CResult_HTLCUpdateDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_HTLCUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCUpdateDecodeErrorZ), "LDKCResult_HTLCUpdateDecodeErrorZ"); *ret_conv = CResult_HTLCUpdateDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_is_ok"))) TS_CResult_HTLCUpdateDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_HTLCUpdateDecodeErrorZ* o_conv = (LDKCResult_HTLCUpdateDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_is_ok"))) TS_CResult_HTLCUpdateDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_HTLCUpdateDecodeErrorZ* o_conv = (LDKCResult_HTLCUpdateDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_HTLCUpdateDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_free"))) TS_CResult_HTLCUpdateDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_free"))) TS_CResult_HTLCUpdateDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_HTLCUpdateDecodeErrorZ _res_conv = *(LDKCResult_HTLCUpdateDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_HTLCUpdateDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_HTLCUpdateDecodeErrorZ_clone_ptr(LDKCResult_HTLCUpdateDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_HTLCUpdateDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_clone_ptr"))) TS_CResult_HTLCUpdateDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_HTLCUpdateDecodeErrorZ* arg_conv = (LDKCResult_HTLCUpdateDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_HTLCUpdateDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_clone"))) TS_CResult_HTLCUpdateDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_HTLCUpdateDecodeErrorZ* orig_conv = (LDKCResult_HTLCUpdateDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_clone"))) TS_CResult_HTLCUpdateDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_HTLCUpdateDecodeErrorZ* orig_conv = (LDKCResult_HTLCUpdateDecodeErrorZ*)untag_ptr(orig); LDKCResult_HTLCUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCUpdateDecodeErrorZ), "LDKCResult_HTLCUpdateDecodeErrorZ"); *ret_conv = CResult_HTLCUpdateDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -static inline uintptr_t C2Tuple_OutPointScriptZ_clone_ptr(LDKC2Tuple_OutPointScriptZ *NONNULL_PTR arg) { +static inline uint64_t C2Tuple_OutPointScriptZ_clone_ptr(LDKC2Tuple_OutPointScriptZ *NONNULL_PTR arg) { LDKC2Tuple_OutPointScriptZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_OutPointScriptZ), "LDKC2Tuple_OutPointScriptZ"); *ret_conv = C2Tuple_OutPointScriptZ_clone(arg); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C2Tuple_OutPointScriptZ_clone_ptr"))) TS_C2Tuple_OutPointScriptZ_clone_ptr(uint32_t arg) { - LDKC2Tuple_OutPointScriptZ* arg_conv = (LDKC2Tuple_OutPointScriptZ*)(arg & ~1); - uint32_t ret_conv = C2Tuple_OutPointScriptZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_C2Tuple_OutPointScriptZ_clone_ptr"))) TS_C2Tuple_OutPointScriptZ_clone_ptr(uint64_t arg) { + LDKC2Tuple_OutPointScriptZ* arg_conv = (LDKC2Tuple_OutPointScriptZ*)untag_ptr(arg); + int64_t ret_conv = C2Tuple_OutPointScriptZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_C2Tuple_OutPointScriptZ_clone"))) TS_C2Tuple_OutPointScriptZ_clone(uint32_t orig) { - LDKC2Tuple_OutPointScriptZ* orig_conv = (LDKC2Tuple_OutPointScriptZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_C2Tuple_OutPointScriptZ_clone"))) TS_C2Tuple_OutPointScriptZ_clone(uint64_t orig) { + LDKC2Tuple_OutPointScriptZ* orig_conv = (LDKC2Tuple_OutPointScriptZ*)untag_ptr(orig); LDKC2Tuple_OutPointScriptZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_OutPointScriptZ), "LDKC2Tuple_OutPointScriptZ"); *ret_conv = C2Tuple_OutPointScriptZ_clone(orig_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C2Tuple_OutPointScriptZ_new"))) TS_C2Tuple_OutPointScriptZ_new(uint32_t a, int8_tArray b) { +uint64_t __attribute__((export_name("TS_C2Tuple_OutPointScriptZ_new"))) TS_C2Tuple_OutPointScriptZ_new(uint64_t a, int8_tArray b) { LDKOutPoint a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = (a & 1) || (a == 0); + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); a_conv = OutPoint_clone(&a_conv); LDKCVec_u8Z b_ref; @@ -17822,94 +16548,94 @@ uint32_t __attribute__((export_name("TS_C2Tuple_OutPointScriptZ_new"))) TS_C2Tu 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 ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_C2Tuple_OutPointScriptZ_free"))) TS_C2Tuple_OutPointScriptZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_C2Tuple_OutPointScriptZ_free"))) TS_C2Tuple_OutPointScriptZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKC2Tuple_OutPointScriptZ _res_conv = *(LDKC2Tuple_OutPointScriptZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); C2Tuple_OutPointScriptZ_free(_res_conv); } -static inline uintptr_t C2Tuple_u32ScriptZ_clone_ptr(LDKC2Tuple_u32ScriptZ *NONNULL_PTR arg) { +static inline uint64_t C2Tuple_u32ScriptZ_clone_ptr(LDKC2Tuple_u32ScriptZ *NONNULL_PTR arg) { LDKC2Tuple_u32ScriptZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_u32ScriptZ), "LDKC2Tuple_u32ScriptZ"); *ret_conv = C2Tuple_u32ScriptZ_clone(arg); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C2Tuple_u32ScriptZ_clone_ptr"))) TS_C2Tuple_u32ScriptZ_clone_ptr(uint32_t arg) { - LDKC2Tuple_u32ScriptZ* arg_conv = (LDKC2Tuple_u32ScriptZ*)(arg & ~1); - uint32_t ret_conv = C2Tuple_u32ScriptZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_C2Tuple_u32ScriptZ_clone_ptr"))) TS_C2Tuple_u32ScriptZ_clone_ptr(uint64_t arg) { + LDKC2Tuple_u32ScriptZ* arg_conv = (LDKC2Tuple_u32ScriptZ*)untag_ptr(arg); + int64_t ret_conv = C2Tuple_u32ScriptZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_C2Tuple_u32ScriptZ_clone"))) TS_C2Tuple_u32ScriptZ_clone(uint32_t orig) { - LDKC2Tuple_u32ScriptZ* orig_conv = (LDKC2Tuple_u32ScriptZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_C2Tuple_u32ScriptZ_clone"))) TS_C2Tuple_u32ScriptZ_clone(uint64_t orig) { + LDKC2Tuple_u32ScriptZ* orig_conv = (LDKC2Tuple_u32ScriptZ*)untag_ptr(orig); LDKC2Tuple_u32ScriptZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_u32ScriptZ), "LDKC2Tuple_u32ScriptZ"); *ret_conv = C2Tuple_u32ScriptZ_clone(orig_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C2Tuple_u32ScriptZ_new"))) TS_C2Tuple_u32ScriptZ_new(int32_t a, int8_tArray b) { +uint64_t __attribute__((export_name("TS_C2Tuple_u32ScriptZ_new"))) TS_C2Tuple_u32ScriptZ_new(int32_t a, int8_tArray b) { 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); FREE(b); LDKC2Tuple_u32ScriptZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_u32ScriptZ), "LDKC2Tuple_u32ScriptZ"); *ret_conv = C2Tuple_u32ScriptZ_new(a, b_ref); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_C2Tuple_u32ScriptZ_free"))) TS_C2Tuple_u32ScriptZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_C2Tuple_u32ScriptZ_free"))) TS_C2Tuple_u32ScriptZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKC2Tuple_u32ScriptZ _res_conv = *(LDKC2Tuple_u32ScriptZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); C2Tuple_u32ScriptZ_free(_res_conv); } -void __attribute__((export_name("TS_CVec_C2Tuple_u32ScriptZZ_free"))) TS_CVec_C2Tuple_u32ScriptZZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_C2Tuple_u32ScriptZZ_free"))) TS_CVec_C2Tuple_u32ScriptZZ_free(uint64_tArray _res) { LDKCVec_C2Tuple_u32ScriptZZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _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; + uint64_t* _res_vals = _res->elems; for (size_t v = 0; v < _res_constr.datalen; v++) { - uint32_t _res_conv_21 = _res_vals[v]; - void* _res_conv_21_ptr = (void*)(((uintptr_t)_res_conv_21) & ~1); + uint64_t _res_conv_21 = _res_vals[v]; + void* _res_conv_21_ptr = untag_ptr(_res_conv_21); CHECK_ACCESS(_res_conv_21_ptr); LDKC2Tuple_u32ScriptZ _res_conv_21_conv = *(LDKC2Tuple_u32ScriptZ*)(_res_conv_21_ptr); - FREE((void*)_res_conv_21); + FREE(untag_ptr(_res_conv_21)); _res_constr.data[v] = _res_conv_21_conv; } FREE(_res); CVec_C2Tuple_u32ScriptZZ_free(_res_constr); } -static inline uintptr_t C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone_ptr(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ *NONNULL_PTR arg) { +static inline uint64_t C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone_ptr(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ *NONNULL_PTR arg) { LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ"); *ret_conv = C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone(arg); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone_ptr"))) TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone_ptr(uint32_t arg) { - LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ* arg_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ*)(arg & ~1); - uint32_t ret_conv = C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone_ptr"))) TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone_ptr(uint64_t arg) { + LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ* arg_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ*)untag_ptr(arg); + int64_t ret_conv = C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone"))) TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone(uint32_t orig) { - LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ* orig_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone"))) TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone(uint64_t orig) { + LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ* orig_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ*)untag_ptr(orig); LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ"); *ret_conv = C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone(orig_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_new"))) TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_new(int8_tArray a, uint32_tArray b) { +uint64_t __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_new"))) TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_new(int8_tArray a, uint64_tArray b) { LDKThirtyTwoBytes a_ref; CHECK(a->arr_len == 32); memcpy(a_ref.data, a->elems, 32); FREE(a); @@ -17919,64 +16645,64 @@ uint32_t __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_n b_constr.data = MALLOC(b_constr.datalen * sizeof(LDKC2Tuple_u32ScriptZ), "LDKCVec_C2Tuple_u32ScriptZZ Elements"); else b_constr.data = NULL; - uint32_t* b_vals = b->elems; + uint64_t* b_vals = b->elems; for (size_t v = 0; v < b_constr.datalen; v++) { - uint32_t b_conv_21 = b_vals[v]; - void* b_conv_21_ptr = (void*)(((uintptr_t)b_conv_21) & ~1); + uint64_t b_conv_21 = b_vals[v]; + void* b_conv_21_ptr = untag_ptr(b_conv_21); CHECK_ACCESS(b_conv_21_ptr); LDKC2Tuple_u32ScriptZ b_conv_21_conv = *(LDKC2Tuple_u32ScriptZ*)(b_conv_21_ptr); - b_conv_21_conv = C2Tuple_u32ScriptZ_clone((LDKC2Tuple_u32ScriptZ*)(((uintptr_t)b_conv_21) & ~1)); + b_conv_21_conv = C2Tuple_u32ScriptZ_clone((LDKC2Tuple_u32ScriptZ*)untag_ptr(b_conv_21)); b_constr.data[v] = b_conv_21_conv; } FREE(b); LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ"); *ret_conv = C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_new(a_ref, b_constr); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_free"))) TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ _res_conv = *(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_free(_res_conv); } -void __attribute__((export_name("TS_CVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ_free"))) TS_CVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ_free"))) TS_CVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ_free(uint64_tArray _res) { LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _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; + uint64_t* _res_vals = _res->elems; for (size_t o = 0; o < _res_constr.datalen; o++) { - uint32_t _res_conv_40 = _res_vals[o]; - void* _res_conv_40_ptr = (void*)(((uintptr_t)_res_conv_40) & ~1); + uint64_t _res_conv_40 = _res_vals[o]; + void* _res_conv_40_ptr = untag_ptr(_res_conv_40); 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); + FREE(untag_ptr(_res_conv_40)); _res_constr.data[o] = _res_conv_40_conv; } FREE(_res); CVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ_free(_res_constr); } -void __attribute__((export_name("TS_CVec_EventZ_free"))) TS_CVec_EventZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_EventZ_free"))) TS_CVec_EventZ_free(uint64_tArray _res) { LDKCVec_EventZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKEvent), "LDKCVec_EventZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t h = 0; h < _res_constr.datalen; h++) { - uint32_t _res_conv_7 = _res_vals[h]; - void* _res_conv_7_ptr = (void*)(((uintptr_t)_res_conv_7) & ~1); + uint64_t _res_conv_7 = _res_vals[h]; + void* _res_conv_7_ptr = untag_ptr(_res_conv_7); CHECK_ACCESS(_res_conv_7_ptr); LDKEvent _res_conv_7_conv = *(LDKEvent*)(_res_conv_7_ptr); - FREE((void*)_res_conv_7); + FREE(untag_ptr(_res_conv_7)); _res_constr.data[h] = _res_conv_7_conv; } FREE(_res); @@ -18004,82 +16730,82 @@ void __attribute__((export_name("TS_CVec_TransactionZ_free"))) TS_CVec_Transact CVec_TransactionZ_free(_res_constr); } -static inline uintptr_t C2Tuple_u32TxOutZ_clone_ptr(LDKC2Tuple_u32TxOutZ *NONNULL_PTR arg) { +static inline uint64_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 ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = C2Tuple_u32TxOutZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_C2Tuple_u32TxOutZ_clone_ptr"))) TS_C2Tuple_u32TxOutZ_clone_ptr(uint64_t arg) { + LDKC2Tuple_u32TxOutZ* arg_conv = (LDKC2Tuple_u32TxOutZ*)untag_ptr(arg); + int64_t ret_conv = C2Tuple_u32TxOutZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_C2Tuple_u32TxOutZ_clone"))) TS_C2Tuple_u32TxOutZ_clone(uint32_t orig) { - LDKC2Tuple_u32TxOutZ* orig_conv = (LDKC2Tuple_u32TxOutZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_C2Tuple_u32TxOutZ_clone"))) TS_C2Tuple_u32TxOutZ_clone(uint64_t orig) { + LDKC2Tuple_u32TxOutZ* orig_conv = (LDKC2Tuple_u32TxOutZ*)untag_ptr(orig); LDKC2Tuple_u32TxOutZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_u32TxOutZ), "LDKC2Tuple_u32TxOutZ"); *ret_conv = C2Tuple_u32TxOutZ_clone(orig_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C2Tuple_u32TxOutZ_new"))) TS_C2Tuple_u32TxOutZ_new(int32_t a, uint32_t b) { - void* b_ptr = (void*)(((uintptr_t)b) & ~1); +uint64_t __attribute__((export_name("TS_C2Tuple_u32TxOutZ_new"))) TS_C2Tuple_u32TxOutZ_new(int32_t a, uint64_t b) { + void* b_ptr = untag_ptr(b); CHECK_ACCESS(b_ptr); LDKTxOut b_conv = *(LDKTxOut*)(b_ptr); - b_conv = TxOut_clone((LDKTxOut*)(((uintptr_t)b) & ~1)); + b_conv = TxOut_clone((LDKTxOut*)untag_ptr(b)); LDKC2Tuple_u32TxOutZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_u32TxOutZ), "LDKC2Tuple_u32TxOutZ"); *ret_conv = C2Tuple_u32TxOutZ_new(a, b_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_C2Tuple_u32TxOutZ_free"))) TS_C2Tuple_u32TxOutZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_C2Tuple_u32TxOutZ_free"))) TS_C2Tuple_u32TxOutZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKC2Tuple_u32TxOutZ _res_conv = *(LDKC2Tuple_u32TxOutZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); C2Tuple_u32TxOutZ_free(_res_conv); } -void __attribute__((export_name("TS_CVec_C2Tuple_u32TxOutZZ_free"))) TS_CVec_C2Tuple_u32TxOutZZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_C2Tuple_u32TxOutZZ_free"))) TS_CVec_C2Tuple_u32TxOutZZ_free(uint64_tArray _res) { LDKCVec_C2Tuple_u32TxOutZZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _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; + uint64_t* _res_vals = _res->elems; for (size_t u = 0; u < _res_constr.datalen; u++) { - uint32_t _res_conv_20 = _res_vals[u]; - void* _res_conv_20_ptr = (void*)(((uintptr_t)_res_conv_20) & ~1); + uint64_t _res_conv_20 = _res_vals[u]; + void* _res_conv_20_ptr = untag_ptr(_res_conv_20); CHECK_ACCESS(_res_conv_20_ptr); LDKC2Tuple_u32TxOutZ _res_conv_20_conv = *(LDKC2Tuple_u32TxOutZ*)(_res_conv_20_ptr); - FREE((void*)_res_conv_20); + FREE(untag_ptr(_res_conv_20)); _res_constr.data[u] = _res_conv_20_conv; } FREE(_res); CVec_C2Tuple_u32TxOutZZ_free(_res_constr); } -static inline uintptr_t C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone_ptr(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ *NONNULL_PTR arg) { +static inline uint64_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 ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone_ptr"))) TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone_ptr(uint64_t arg) { + LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* arg_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)untag_ptr(arg); + int64_t ret_conv = C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone"))) TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone(uint32_t orig) { - LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* orig_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone"))) TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone(uint64_t orig) { + LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* orig_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)untag_ptr(orig); 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 ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_new"))) TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_new(int8_tArray a, uint32_tArray b) { +uint64_t __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_new"))) TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_new(int8_tArray a, uint64_tArray b) { LDKThirtyTwoBytes a_ref; CHECK(a->arr_len == 32); memcpy(a_ref.data, a->elems, 32); FREE(a); @@ -18089,188 +16815,188 @@ uint32_t __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_ne b_constr.data = MALLOC(b_constr.datalen * sizeof(LDKC2Tuple_u32TxOutZ), "LDKCVec_C2Tuple_u32TxOutZZ Elements"); else b_constr.data = NULL; - uint32_t* b_vals = b->elems; + uint64_t* b_vals = b->elems; for (size_t u = 0; u < b_constr.datalen; u++) { - uint32_t b_conv_20 = b_vals[u]; - void* b_conv_20_ptr = (void*)(((uintptr_t)b_conv_20) & ~1); + uint64_t b_conv_20 = b_vals[u]; + void* b_conv_20_ptr = untag_ptr(b_conv_20); 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*)(((uintptr_t)b_conv_20) & ~1)); + b_conv_20_conv = C2Tuple_u32TxOutZ_clone((LDKC2Tuple_u32TxOutZ*)untag_ptr(b_conv_20)); b_constr.data[u] = b_conv_20_conv; } FREE(b); LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ"); *ret_conv = C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_new(a_ref, b_constr); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_free"))) TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ _res_conv = *(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_free(_res_conv); } -void __attribute__((export_name("TS_CVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ_free"))) TS_CVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ_free"))) TS_CVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ_free(uint64_tArray _res) { LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _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; + uint64_t* _res_vals = _res->elems; for (size_t n = 0; n < _res_constr.datalen; n++) { - uint32_t _res_conv_39 = _res_vals[n]; - void* _res_conv_39_ptr = (void*)(((uintptr_t)_res_conv_39) & ~1); + uint64_t _res_conv_39 = _res_vals[n]; + void* _res_conv_39_ptr = untag_ptr(_res_conv_39); 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); + FREE(untag_ptr(_res_conv_39)); _res_constr.data[n] = _res_conv_39_conv; } FREE(_res); CVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ_free(_res_constr); } -void __attribute__((export_name("TS_CVec_BalanceZ_free"))) TS_CVec_BalanceZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_BalanceZ_free"))) TS_CVec_BalanceZ_free(uint64_tArray _res) { LDKCVec_BalanceZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKBalance), "LDKCVec_BalanceZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t j = 0; j < _res_constr.datalen; j++) { - uint32_t _res_conv_9 = _res_vals[j]; - void* _res_conv_9_ptr = (void*)(((uintptr_t)_res_conv_9) & ~1); + uint64_t _res_conv_9 = _res_vals[j]; + void* _res_conv_9_ptr = untag_ptr(_res_conv_9); CHECK_ACCESS(_res_conv_9_ptr); LDKBalance _res_conv_9_conv = *(LDKBalance*)(_res_conv_9_ptr); - FREE((void*)_res_conv_9); + FREE(untag_ptr(_res_conv_9)); _res_constr.data[j] = _res_conv_9_conv; } FREE(_res); CVec_BalanceZ_free(_res_constr); } -static inline uintptr_t C2Tuple_BlockHashChannelMonitorZ_clone_ptr(LDKC2Tuple_BlockHashChannelMonitorZ *NONNULL_PTR arg) { +static inline uint64_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 ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = C2Tuple_BlockHashChannelMonitorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_clone_ptr"))) TS_C2Tuple_BlockHashChannelMonitorZ_clone_ptr(uint64_t arg) { + LDKC2Tuple_BlockHashChannelMonitorZ* arg_conv = (LDKC2Tuple_BlockHashChannelMonitorZ*)untag_ptr(arg); + int64_t ret_conv = C2Tuple_BlockHashChannelMonitorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_clone"))) TS_C2Tuple_BlockHashChannelMonitorZ_clone(uint32_t orig) { - LDKC2Tuple_BlockHashChannelMonitorZ* orig_conv = (LDKC2Tuple_BlockHashChannelMonitorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_clone"))) TS_C2Tuple_BlockHashChannelMonitorZ_clone(uint64_t orig) { + LDKC2Tuple_BlockHashChannelMonitorZ* orig_conv = (LDKC2Tuple_BlockHashChannelMonitorZ*)untag_ptr(orig); LDKC2Tuple_BlockHashChannelMonitorZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_BlockHashChannelMonitorZ), "LDKC2Tuple_BlockHashChannelMonitorZ"); *ret_conv = C2Tuple_BlockHashChannelMonitorZ_clone(orig_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_new"))) TS_C2Tuple_BlockHashChannelMonitorZ_new(int8_tArray a, uint32_t b) { +uint64_t __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_new"))) TS_C2Tuple_BlockHashChannelMonitorZ_new(int8_tArray a, uint64_t b) { LDKThirtyTwoBytes a_ref; CHECK(a->arr_len == 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); + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); 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 ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_free"))) TS_C2Tuple_BlockHashChannelMonitorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_free"))) TS_C2Tuple_BlockHashChannelMonitorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKC2Tuple_BlockHashChannelMonitorZ _res_conv = *(LDKC2Tuple_BlockHashChannelMonitorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); C2Tuple_BlockHashChannelMonitorZ_free(_res_conv); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_ok"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_ok"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_ok(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKC2Tuple_BlockHashChannelMonitorZ o_conv = *(LDKC2Tuple_BlockHashChannelMonitorZ*)(o_ptr); - o_conv = C2Tuple_BlockHashChannelMonitorZ_clone((LDKC2Tuple_BlockHashChannelMonitorZ*)(((uintptr_t)o) & ~1)); + o_conv = C2Tuple_BlockHashChannelMonitorZ_clone((LDKC2Tuple_BlockHashChannelMonitorZ*)untag_ptr(o)); LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ), "LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ"); *ret_conv = CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_err"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_err"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_is_ok"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* o_conv = (LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_is_ok"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* o_conv = (LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_is_ok(o_conv); return ret_conv; } -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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_free"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ _res_conv = *(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone_ptr(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone_ptr"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* arg_conv = (LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* orig_conv = (LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* orig_conv = (LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)untag_ptr(orig); LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ), "LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ"); *ret_conv = CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -static inline uintptr_t C2Tuple_PublicKeyTypeZ_clone_ptr(LDKC2Tuple_PublicKeyTypeZ *NONNULL_PTR arg) { +static inline uint64_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 ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = C2Tuple_PublicKeyTypeZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_C2Tuple_PublicKeyTypeZ_clone_ptr"))) TS_C2Tuple_PublicKeyTypeZ_clone_ptr(uint64_t arg) { + LDKC2Tuple_PublicKeyTypeZ* arg_conv = (LDKC2Tuple_PublicKeyTypeZ*)untag_ptr(arg); + int64_t ret_conv = C2Tuple_PublicKeyTypeZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_C2Tuple_PublicKeyTypeZ_clone"))) TS_C2Tuple_PublicKeyTypeZ_clone(uint32_t orig) { - LDKC2Tuple_PublicKeyTypeZ* orig_conv = (LDKC2Tuple_PublicKeyTypeZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_C2Tuple_PublicKeyTypeZ_clone"))) TS_C2Tuple_PublicKeyTypeZ_clone(uint64_t orig) { + LDKC2Tuple_PublicKeyTypeZ* orig_conv = (LDKC2Tuple_PublicKeyTypeZ*)untag_ptr(orig); LDKC2Tuple_PublicKeyTypeZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PublicKeyTypeZ), "LDKC2Tuple_PublicKeyTypeZ"); *ret_conv = C2Tuple_PublicKeyTypeZ_clone(orig_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C2Tuple_PublicKeyTypeZ_new"))) TS_C2Tuple_PublicKeyTypeZ_new(int8_tArray a, uint32_t b) { +uint64_t __attribute__((export_name("TS_C2Tuple_PublicKeyTypeZ_new"))) TS_C2Tuple_PublicKeyTypeZ_new(int8_tArray a, uint64_t b) { LDKPublicKey a_ref; CHECK(a->arr_len == 33); memcpy(a_ref.compressed_form, a->elems, 33); FREE(a); - void* b_ptr = (void*)(((uintptr_t)b) & ~1); + void* b_ptr = untag_ptr(b); CHECK_ACCESS(b_ptr); LDKType b_conv = *(LDKType*)(b_ptr); if (b_conv.free == LDKType_JCalls_free) { @@ -18279,352 +17005,352 @@ uint32_t __attribute__((export_name("TS_C2Tuple_PublicKeyTypeZ_new"))) TS_C2Tup } LDKC2Tuple_PublicKeyTypeZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PublicKeyTypeZ), "LDKC2Tuple_PublicKeyTypeZ"); *ret_conv = C2Tuple_PublicKeyTypeZ_new(a_ref, b_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_C2Tuple_PublicKeyTypeZ_free"))) TS_C2Tuple_PublicKeyTypeZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_C2Tuple_PublicKeyTypeZ_free"))) TS_C2Tuple_PublicKeyTypeZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKC2Tuple_PublicKeyTypeZ _res_conv = *(LDKC2Tuple_PublicKeyTypeZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); C2Tuple_PublicKeyTypeZ_free(_res_conv); } -void __attribute__((export_name("TS_CVec_C2Tuple_PublicKeyTypeZZ_free"))) TS_CVec_C2Tuple_PublicKeyTypeZZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_C2Tuple_PublicKeyTypeZZ_free"))) TS_CVec_C2Tuple_PublicKeyTypeZZ_free(uint64_tArray _res) { LDKCVec_C2Tuple_PublicKeyTypeZZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _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; + uint64_t* _res_vals = _res->elems; for (size_t z = 0; z < _res_constr.datalen; z++) { - uint32_t _res_conv_25 = _res_vals[z]; - void* _res_conv_25_ptr = (void*)(((uintptr_t)_res_conv_25) & ~1); + uint64_t _res_conv_25 = _res_vals[z]; + void* _res_conv_25_ptr = untag_ptr(_res_conv_25); CHECK_ACCESS(_res_conv_25_ptr); LDKC2Tuple_PublicKeyTypeZ _res_conv_25_conv = *(LDKC2Tuple_PublicKeyTypeZ*)(_res_conv_25_ptr); - FREE((void*)_res_conv_25); + FREE(untag_ptr(_res_conv_25)); _res_constr.data[z] = _res_conv_25_conv; } FREE(_res); CVec_C2Tuple_PublicKeyTypeZZ_free(_res_constr); } -uint32_t __attribute__((export_name("TS_COption_NetAddressZ_some"))) TS_COption_NetAddressZ_some(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_COption_NetAddressZ_some"))) TS_COption_NetAddressZ_some(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKNetAddress o_conv = *(LDKNetAddress*)(o_ptr); - o_conv = NetAddress_clone((LDKNetAddress*)(((uintptr_t)o) & ~1)); + o_conv = NetAddress_clone((LDKNetAddress*)untag_ptr(o)); LDKCOption_NetAddressZ *ret_copy = MALLOC(sizeof(LDKCOption_NetAddressZ), "LDKCOption_NetAddressZ"); *ret_copy = COption_NetAddressZ_some(o_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_NetAddressZ_none"))) TS_COption_NetAddressZ_none() { +uint64_t __attribute__((export_name("TS_COption_NetAddressZ_none"))) TS_COption_NetAddressZ_none() { LDKCOption_NetAddressZ *ret_copy = MALLOC(sizeof(LDKCOption_NetAddressZ), "LDKCOption_NetAddressZ"); *ret_copy = COption_NetAddressZ_none(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_COption_NetAddressZ_free"))) TS_COption_NetAddressZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_COption_NetAddressZ_free"))) TS_COption_NetAddressZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCOption_NetAddressZ _res_conv = *(LDKCOption_NetAddressZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); COption_NetAddressZ_free(_res_conv); } -static inline uintptr_t COption_NetAddressZ_clone_ptr(LDKCOption_NetAddressZ *NONNULL_PTR arg) { +static inline uint64_t COption_NetAddressZ_clone_ptr(LDKCOption_NetAddressZ *NONNULL_PTR arg) { LDKCOption_NetAddressZ *ret_copy = MALLOC(sizeof(LDKCOption_NetAddressZ), "LDKCOption_NetAddressZ"); *ret_copy = COption_NetAddressZ_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_NetAddressZ_clone_ptr"))) TS_COption_NetAddressZ_clone_ptr(uint32_t arg) { - LDKCOption_NetAddressZ* arg_conv = (LDKCOption_NetAddressZ*)arg; - uint32_t ret_conv = COption_NetAddressZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_COption_NetAddressZ_clone_ptr"))) TS_COption_NetAddressZ_clone_ptr(uint64_t arg) { + LDKCOption_NetAddressZ* arg_conv = (LDKCOption_NetAddressZ*)untag_ptr(arg); + int64_t ret_conv = COption_NetAddressZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_COption_NetAddressZ_clone"))) TS_COption_NetAddressZ_clone(uint32_t orig) { - LDKCOption_NetAddressZ* orig_conv = (LDKCOption_NetAddressZ*)orig; +uint64_t __attribute__((export_name("TS_COption_NetAddressZ_clone"))) TS_COption_NetAddressZ_clone(uint64_t orig) { + LDKCOption_NetAddressZ* orig_conv = (LDKCOption_NetAddressZ*)untag_ptr(orig); LDKCOption_NetAddressZ *ret_copy = MALLOC(sizeof(LDKCOption_NetAddressZ), "LDKCOption_NetAddressZ"); *ret_copy = COption_NetAddressZ_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_ok"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_ok(int8_tArray o) { +uint64_t __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_ok"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_ok(int8_tArray o) { 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); FREE(o); LDKCResult_CVec_u8ZPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_u8ZPeerHandleErrorZ), "LDKCResult_CVec_u8ZPeerHandleErrorZ"); *ret_conv = CResult_CVec_u8ZPeerHandleErrorZ_ok(o_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_err"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_err"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_err(uint64_t e) { LDKPeerHandleError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_is_ok"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_is_ok(uint32_t o) { - LDKCResult_CVec_u8ZPeerHandleErrorZ* o_conv = (LDKCResult_CVec_u8ZPeerHandleErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_is_ok"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_is_ok(uint64_t o) { + LDKCResult_CVec_u8ZPeerHandleErrorZ* o_conv = (LDKCResult_CVec_u8ZPeerHandleErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_CVec_u8ZPeerHandleErrorZ_is_ok(o_conv); return ret_conv; } -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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_free"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_CVec_u8ZPeerHandleErrorZ _res_conv = *(LDKCResult_CVec_u8ZPeerHandleErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_CVec_u8ZPeerHandleErrorZ_free(_res_conv); } -static inline uintptr_t CResult_CVec_u8ZPeerHandleErrorZ_clone_ptr(LDKCResult_CVec_u8ZPeerHandleErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_CVec_u8ZPeerHandleErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_clone_ptr"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_CVec_u8ZPeerHandleErrorZ* arg_conv = (LDKCResult_CVec_u8ZPeerHandleErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_CVec_u8ZPeerHandleErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_clone"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_clone(uint32_t orig) { - LDKCResult_CVec_u8ZPeerHandleErrorZ* orig_conv = (LDKCResult_CVec_u8ZPeerHandleErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_clone"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_clone(uint64_t orig) { + LDKCResult_CVec_u8ZPeerHandleErrorZ* orig_conv = (LDKCResult_CVec_u8ZPeerHandleErrorZ*)untag_ptr(orig); LDKCResult_CVec_u8ZPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_u8ZPeerHandleErrorZ), "LDKCResult_CVec_u8ZPeerHandleErrorZ"); *ret_conv = CResult_CVec_u8ZPeerHandleErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_ok"))) TS_CResult_NonePeerHandleErrorZ_ok() { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_err"))) TS_CResult_NonePeerHandleErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_err"))) TS_CResult_NonePeerHandleErrorZ_err(uint64_t e) { LDKPeerHandleError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = PeerHandleError_clone(&e_conv); LDKCResult_NonePeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePeerHandleErrorZ), "LDKCResult_NonePeerHandleErrorZ"); *ret_conv = CResult_NonePeerHandleErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_is_ok"))) TS_CResult_NonePeerHandleErrorZ_is_ok(uint32_t o) { - LDKCResult_NonePeerHandleErrorZ* o_conv = (LDKCResult_NonePeerHandleErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_is_ok"))) TS_CResult_NonePeerHandleErrorZ_is_ok(uint64_t o) { + LDKCResult_NonePeerHandleErrorZ* o_conv = (LDKCResult_NonePeerHandleErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_NonePeerHandleErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_free"))) TS_CResult_NonePeerHandleErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_free"))) TS_CResult_NonePeerHandleErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_NonePeerHandleErrorZ _res_conv = *(LDKCResult_NonePeerHandleErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_NonePeerHandleErrorZ_free(_res_conv); } -static inline uintptr_t CResult_NonePeerHandleErrorZ_clone_ptr(LDKCResult_NonePeerHandleErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_NonePeerHandleErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_clone_ptr"))) TS_CResult_NonePeerHandleErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_NonePeerHandleErrorZ* arg_conv = (LDKCResult_NonePeerHandleErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_NonePeerHandleErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_clone"))) TS_CResult_NonePeerHandleErrorZ_clone(uint32_t orig) { - LDKCResult_NonePeerHandleErrorZ* orig_conv = (LDKCResult_NonePeerHandleErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_clone"))) TS_CResult_NonePeerHandleErrorZ_clone(uint64_t orig) { + LDKCResult_NonePeerHandleErrorZ* orig_conv = (LDKCResult_NonePeerHandleErrorZ*)untag_ptr(orig); LDKCResult_NonePeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePeerHandleErrorZ), "LDKCResult_NonePeerHandleErrorZ"); *ret_conv = CResult_NonePeerHandleErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_ok"))) TS_CResult_boolPeerHandleErrorZ_ok(jboolean o) { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_err"))) TS_CResult_boolPeerHandleErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_err"))) TS_CResult_boolPeerHandleErrorZ_err(uint64_t e) { LDKPeerHandleError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = PeerHandleError_clone(&e_conv); LDKCResult_boolPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolPeerHandleErrorZ), "LDKCResult_boolPeerHandleErrorZ"); *ret_conv = CResult_boolPeerHandleErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_is_ok"))) TS_CResult_boolPeerHandleErrorZ_is_ok(uint32_t o) { - LDKCResult_boolPeerHandleErrorZ* o_conv = (LDKCResult_boolPeerHandleErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_is_ok"))) TS_CResult_boolPeerHandleErrorZ_is_ok(uint64_t o) { + LDKCResult_boolPeerHandleErrorZ* o_conv = (LDKCResult_boolPeerHandleErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_boolPeerHandleErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_free"))) TS_CResult_boolPeerHandleErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_free"))) TS_CResult_boolPeerHandleErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_boolPeerHandleErrorZ _res_conv = *(LDKCResult_boolPeerHandleErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_boolPeerHandleErrorZ_free(_res_conv); } -static inline uintptr_t CResult_boolPeerHandleErrorZ_clone_ptr(LDKCResult_boolPeerHandleErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_boolPeerHandleErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_clone_ptr"))) TS_CResult_boolPeerHandleErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_boolPeerHandleErrorZ* arg_conv = (LDKCResult_boolPeerHandleErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_boolPeerHandleErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_clone"))) TS_CResult_boolPeerHandleErrorZ_clone(uint32_t orig) { - LDKCResult_boolPeerHandleErrorZ* orig_conv = (LDKCResult_boolPeerHandleErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_clone"))) TS_CResult_boolPeerHandleErrorZ_clone(uint64_t orig) { + LDKCResult_boolPeerHandleErrorZ* orig_conv = (LDKCResult_boolPeerHandleErrorZ*)untag_ptr(orig); LDKCResult_boolPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolPeerHandleErrorZ), "LDKCResult_boolPeerHandleErrorZ"); *ret_conv = CResult_boolPeerHandleErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NoneErrorZ_ok"))) TS_CResult_NoneErrorZ_ok() { +uint64_t __attribute__((export_name("TS_CResult_NoneErrorZ_ok"))) TS_CResult_NoneErrorZ_ok() { LDKCResult_NoneErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneErrorZ), "LDKCResult_NoneErrorZ"); *ret_conv = CResult_NoneErrorZ_ok(); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NoneErrorZ_err"))) TS_CResult_NoneErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_NoneErrorZ_err"))) TS_CResult_NoneErrorZ_err(uint32_t e) { LDKIOError e_conv = LDKIOError_from_js(e); LDKCResult_NoneErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneErrorZ), "LDKCResult_NoneErrorZ"); *ret_conv = CResult_NoneErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_NoneErrorZ_is_ok"))) TS_CResult_NoneErrorZ_is_ok(uint32_t o) { - LDKCResult_NoneErrorZ* o_conv = (LDKCResult_NoneErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_NoneErrorZ_is_ok"))) TS_CResult_NoneErrorZ_is_ok(uint64_t o) { + LDKCResult_NoneErrorZ* o_conv = (LDKCResult_NoneErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_NoneErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_NoneErrorZ_free"))) TS_CResult_NoneErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_NoneErrorZ_free"))) TS_CResult_NoneErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_NoneErrorZ _res_conv = *(LDKCResult_NoneErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_NoneErrorZ_free(_res_conv); } -static inline uintptr_t CResult_NoneErrorZ_clone_ptr(LDKCResult_NoneErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_NoneErrorZ_clone_ptr(LDKCResult_NoneErrorZ *NONNULL_PTR arg) { LDKCResult_NoneErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneErrorZ), "LDKCResult_NoneErrorZ"); *ret_conv = CResult_NoneErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NoneErrorZ_clone_ptr"))) TS_CResult_NoneErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_NoneErrorZ* arg_conv = (LDKCResult_NoneErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_NoneErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_NoneErrorZ_clone_ptr"))) TS_CResult_NoneErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_NoneErrorZ* arg_conv = (LDKCResult_NoneErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_NoneErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_NoneErrorZ_clone"))) TS_CResult_NoneErrorZ_clone(uint32_t orig) { - LDKCResult_NoneErrorZ* orig_conv = (LDKCResult_NoneErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_NoneErrorZ_clone"))) TS_CResult_NoneErrorZ_clone(uint64_t orig) { + LDKCResult_NoneErrorZ* orig_conv = (LDKCResult_NoneErrorZ*)untag_ptr(orig); LDKCResult_NoneErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneErrorZ), "LDKCResult_NoneErrorZ"); *ret_conv = CResult_NoneErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_ok"))) TS_CResult_NetAddressDecodeErrorZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_ok"))) TS_CResult_NetAddressDecodeErrorZ_ok(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKNetAddress o_conv = *(LDKNetAddress*)(o_ptr); - o_conv = NetAddress_clone((LDKNetAddress*)(((uintptr_t)o) & ~1)); + o_conv = NetAddress_clone((LDKNetAddress*)untag_ptr(o)); LDKCResult_NetAddressDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetAddressDecodeErrorZ), "LDKCResult_NetAddressDecodeErrorZ"); *ret_conv = CResult_NetAddressDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_err"))) TS_CResult_NetAddressDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_err"))) TS_CResult_NetAddressDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_NetAddressDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetAddressDecodeErrorZ), "LDKCResult_NetAddressDecodeErrorZ"); *ret_conv = CResult_NetAddressDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_is_ok"))) TS_CResult_NetAddressDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_NetAddressDecodeErrorZ* o_conv = (LDKCResult_NetAddressDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_is_ok"))) TS_CResult_NetAddressDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_NetAddressDecodeErrorZ* o_conv = (LDKCResult_NetAddressDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_NetAddressDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_free"))) TS_CResult_NetAddressDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_free"))) TS_CResult_NetAddressDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_NetAddressDecodeErrorZ _res_conv = *(LDKCResult_NetAddressDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_NetAddressDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_NetAddressDecodeErrorZ_clone_ptr(LDKCResult_NetAddressDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_NetAddressDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_clone_ptr"))) TS_CResult_NetAddressDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_NetAddressDecodeErrorZ* arg_conv = (LDKCResult_NetAddressDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_NetAddressDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_clone"))) TS_CResult_NetAddressDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_NetAddressDecodeErrorZ* orig_conv = (LDKCResult_NetAddressDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_clone"))) TS_CResult_NetAddressDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_NetAddressDecodeErrorZ* orig_conv = (LDKCResult_NetAddressDecodeErrorZ*)untag_ptr(orig); LDKCResult_NetAddressDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetAddressDecodeErrorZ), "LDKCResult_NetAddressDecodeErrorZ"); *ret_conv = CResult_NetAddressDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_CVec_UpdateAddHTLCZ_free"))) TS_CVec_UpdateAddHTLCZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_UpdateAddHTLCZ_free"))) TS_CVec_UpdateAddHTLCZ_free(uint64_tArray _res) { LDKCVec_UpdateAddHTLCZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKUpdateAddHTLC), "LDKCVec_UpdateAddHTLCZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t p = 0; p < _res_constr.datalen; p++) { - uint32_t _res_conv_15 = _res_vals[p]; + uint64_t _res_conv_15 = _res_vals[p]; LDKUpdateAddHTLC _res_conv_15_conv; - _res_conv_15_conv.inner = (void*)(_res_conv_15 & (~1)); - _res_conv_15_conv.is_owned = (_res_conv_15 & 1) || (_res_conv_15 == 0); + _res_conv_15_conv.inner = untag_ptr(_res_conv_15); + _res_conv_15_conv.is_owned = ptr_is_owned(_res_conv_15); CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_15_conv); _res_constr.data[p] = _res_conv_15_conv; } @@ -18632,19 +17358,19 @@ void __attribute__((export_name("TS_CVec_UpdateAddHTLCZ_free"))) TS_CVec_Update CVec_UpdateAddHTLCZ_free(_res_constr); } -void __attribute__((export_name("TS_CVec_UpdateFulfillHTLCZ_free"))) TS_CVec_UpdateFulfillHTLCZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_UpdateFulfillHTLCZ_free"))) TS_CVec_UpdateFulfillHTLCZ_free(uint64_tArray _res) { LDKCVec_UpdateFulfillHTLCZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKUpdateFulfillHTLC), "LDKCVec_UpdateFulfillHTLCZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t t = 0; t < _res_constr.datalen; t++) { - uint32_t _res_conv_19 = _res_vals[t]; + uint64_t _res_conv_19 = _res_vals[t]; LDKUpdateFulfillHTLC _res_conv_19_conv; - _res_conv_19_conv.inner = (void*)(_res_conv_19 & (~1)); - _res_conv_19_conv.is_owned = (_res_conv_19 & 1) || (_res_conv_19 == 0); + _res_conv_19_conv.inner = untag_ptr(_res_conv_19); + _res_conv_19_conv.is_owned = ptr_is_owned(_res_conv_19); CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_19_conv); _res_constr.data[t] = _res_conv_19_conv; } @@ -18652,19 +17378,19 @@ void __attribute__((export_name("TS_CVec_UpdateFulfillHTLCZ_free"))) TS_CVec_Up CVec_UpdateFulfillHTLCZ_free(_res_constr); } -void __attribute__((export_name("TS_CVec_UpdateFailHTLCZ_free"))) TS_CVec_UpdateFailHTLCZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_UpdateFailHTLCZ_free"))) TS_CVec_UpdateFailHTLCZ_free(uint64_tArray _res) { LDKCVec_UpdateFailHTLCZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKUpdateFailHTLC), "LDKCVec_UpdateFailHTLCZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t q = 0; q < _res_constr.datalen; q++) { - uint32_t _res_conv_16 = _res_vals[q]; + uint64_t _res_conv_16 = _res_vals[q]; LDKUpdateFailHTLC _res_conv_16_conv; - _res_conv_16_conv.inner = (void*)(_res_conv_16 & (~1)); - _res_conv_16_conv.is_owned = (_res_conv_16 & 1) || (_res_conv_16 == 0); + _res_conv_16_conv.inner = untag_ptr(_res_conv_16); + _res_conv_16_conv.is_owned = ptr_is_owned(_res_conv_16); CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_16_conv); _res_constr.data[q] = _res_conv_16_conv; } @@ -18672,19 +17398,19 @@ void __attribute__((export_name("TS_CVec_UpdateFailHTLCZ_free"))) TS_CVec_Updat CVec_UpdateFailHTLCZ_free(_res_constr); } -void __attribute__((export_name("TS_CVec_UpdateFailMalformedHTLCZ_free"))) TS_CVec_UpdateFailMalformedHTLCZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_UpdateFailMalformedHTLCZ_free"))) TS_CVec_UpdateFailMalformedHTLCZ_free(uint64_tArray _res) { LDKCVec_UpdateFailMalformedHTLCZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKUpdateFailMalformedHTLC), "LDKCVec_UpdateFailMalformedHTLCZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t z = 0; z < _res_constr.datalen; z++) { - uint32_t _res_conv_25 = _res_vals[z]; + uint64_t _res_conv_25 = _res_vals[z]; LDKUpdateFailMalformedHTLC _res_conv_25_conv; - _res_conv_25_conv.inner = (void*)(_res_conv_25 & (~1)); - _res_conv_25_conv.is_owned = (_res_conv_25 & 1) || (_res_conv_25 == 0); + _res_conv_25_conv.inner = untag_ptr(_res_conv_25); + _res_conv_25_conv.is_owned = ptr_is_owned(_res_conv_25); CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_25_conv); _res_constr.data[z] = _res_conv_25_conv; } @@ -18692,1877 +17418,1877 @@ void __attribute__((export_name("TS_CVec_UpdateFailMalformedHTLCZ_free"))) TS_C CVec_UpdateFailMalformedHTLCZ_free(_res_constr); } -uint32_t __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_ok"))) TS_CResult_AcceptChannelDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_ok"))) TS_CResult_AcceptChannelDecodeErrorZ_ok(uint64_t o) { LDKAcceptChannel o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = AcceptChannel_clone(&o_conv); LDKCResult_AcceptChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AcceptChannelDecodeErrorZ), "LDKCResult_AcceptChannelDecodeErrorZ"); *ret_conv = CResult_AcceptChannelDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_err"))) TS_CResult_AcceptChannelDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_err"))) TS_CResult_AcceptChannelDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_AcceptChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AcceptChannelDecodeErrorZ), "LDKCResult_AcceptChannelDecodeErrorZ"); *ret_conv = CResult_AcceptChannelDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_is_ok"))) TS_CResult_AcceptChannelDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_AcceptChannelDecodeErrorZ* o_conv = (LDKCResult_AcceptChannelDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_is_ok"))) TS_CResult_AcceptChannelDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_AcceptChannelDecodeErrorZ* o_conv = (LDKCResult_AcceptChannelDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_AcceptChannelDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_free"))) TS_CResult_AcceptChannelDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_free"))) TS_CResult_AcceptChannelDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_AcceptChannelDecodeErrorZ _res_conv = *(LDKCResult_AcceptChannelDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_AcceptChannelDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_AcceptChannelDecodeErrorZ_clone_ptr(LDKCResult_AcceptChannelDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_AcceptChannelDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_clone_ptr"))) TS_CResult_AcceptChannelDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_AcceptChannelDecodeErrorZ* arg_conv = (LDKCResult_AcceptChannelDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_AcceptChannelDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_clone"))) TS_CResult_AcceptChannelDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_AcceptChannelDecodeErrorZ* orig_conv = (LDKCResult_AcceptChannelDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_clone"))) TS_CResult_AcceptChannelDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_AcceptChannelDecodeErrorZ* orig_conv = (LDKCResult_AcceptChannelDecodeErrorZ*)untag_ptr(orig); LDKCResult_AcceptChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AcceptChannelDecodeErrorZ), "LDKCResult_AcceptChannelDecodeErrorZ"); *ret_conv = CResult_AcceptChannelDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_ok"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_ok"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_ok(uint64_t o) { LDKAnnouncementSignatures o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = AnnouncementSignatures_clone(&o_conv); LDKCResult_AnnouncementSignaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AnnouncementSignaturesDecodeErrorZ), "LDKCResult_AnnouncementSignaturesDecodeErrorZ"); *ret_conv = CResult_AnnouncementSignaturesDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_err"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_err"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_AnnouncementSignaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AnnouncementSignaturesDecodeErrorZ), "LDKCResult_AnnouncementSignaturesDecodeErrorZ"); *ret_conv = CResult_AnnouncementSignaturesDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_is_ok"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_AnnouncementSignaturesDecodeErrorZ* o_conv = (LDKCResult_AnnouncementSignaturesDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_is_ok"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_AnnouncementSignaturesDecodeErrorZ* o_conv = (LDKCResult_AnnouncementSignaturesDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_AnnouncementSignaturesDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_free"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_free"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_AnnouncementSignaturesDecodeErrorZ _res_conv = *(LDKCResult_AnnouncementSignaturesDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_AnnouncementSignaturesDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_AnnouncementSignaturesDecodeErrorZ_clone_ptr(LDKCResult_AnnouncementSignaturesDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_AnnouncementSignaturesDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_clone_ptr"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_AnnouncementSignaturesDecodeErrorZ* arg_conv = (LDKCResult_AnnouncementSignaturesDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_AnnouncementSignaturesDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_clone"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_AnnouncementSignaturesDecodeErrorZ* orig_conv = (LDKCResult_AnnouncementSignaturesDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_clone"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_AnnouncementSignaturesDecodeErrorZ* orig_conv = (LDKCResult_AnnouncementSignaturesDecodeErrorZ*)untag_ptr(orig); LDKCResult_AnnouncementSignaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AnnouncementSignaturesDecodeErrorZ), "LDKCResult_AnnouncementSignaturesDecodeErrorZ"); *ret_conv = CResult_AnnouncementSignaturesDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_ok"))) TS_CResult_ChannelReestablishDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_ok"))) TS_CResult_ChannelReestablishDecodeErrorZ_ok(uint64_t o) { LDKChannelReestablish o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ChannelReestablish_clone(&o_conv); LDKCResult_ChannelReestablishDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelReestablishDecodeErrorZ), "LDKCResult_ChannelReestablishDecodeErrorZ"); *ret_conv = CResult_ChannelReestablishDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_err"))) TS_CResult_ChannelReestablishDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_err"))) TS_CResult_ChannelReestablishDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ChannelReestablishDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelReestablishDecodeErrorZ), "LDKCResult_ChannelReestablishDecodeErrorZ"); *ret_conv = CResult_ChannelReestablishDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_is_ok"))) TS_CResult_ChannelReestablishDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ChannelReestablishDecodeErrorZ* o_conv = (LDKCResult_ChannelReestablishDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_is_ok"))) TS_CResult_ChannelReestablishDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ChannelReestablishDecodeErrorZ* o_conv = (LDKCResult_ChannelReestablishDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ChannelReestablishDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_free"))) TS_CResult_ChannelReestablishDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_free"))) TS_CResult_ChannelReestablishDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ChannelReestablishDecodeErrorZ _res_conv = *(LDKCResult_ChannelReestablishDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ChannelReestablishDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ChannelReestablishDecodeErrorZ_clone_ptr(LDKCResult_ChannelReestablishDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_ChannelReestablishDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelReestablishDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ChannelReestablishDecodeErrorZ* arg_conv = (LDKCResult_ChannelReestablishDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ChannelReestablishDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_clone"))) TS_CResult_ChannelReestablishDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ChannelReestablishDecodeErrorZ* orig_conv = (LDKCResult_ChannelReestablishDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_clone"))) TS_CResult_ChannelReestablishDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ChannelReestablishDecodeErrorZ* orig_conv = (LDKCResult_ChannelReestablishDecodeErrorZ*)untag_ptr(orig); LDKCResult_ChannelReestablishDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelReestablishDecodeErrorZ), "LDKCResult_ChannelReestablishDecodeErrorZ"); *ret_conv = CResult_ChannelReestablishDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_ok"))) TS_CResult_ClosingSignedDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_ok"))) TS_CResult_ClosingSignedDecodeErrorZ_ok(uint64_t o) { LDKClosingSigned o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ClosingSigned_clone(&o_conv); LDKCResult_ClosingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedDecodeErrorZ), "LDKCResult_ClosingSignedDecodeErrorZ"); *ret_conv = CResult_ClosingSignedDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_err"))) TS_CResult_ClosingSignedDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_err"))) TS_CResult_ClosingSignedDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ClosingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedDecodeErrorZ), "LDKCResult_ClosingSignedDecodeErrorZ"); *ret_conv = CResult_ClosingSignedDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_is_ok"))) TS_CResult_ClosingSignedDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ClosingSignedDecodeErrorZ* o_conv = (LDKCResult_ClosingSignedDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_is_ok"))) TS_CResult_ClosingSignedDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ClosingSignedDecodeErrorZ* o_conv = (LDKCResult_ClosingSignedDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ClosingSignedDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_free"))) TS_CResult_ClosingSignedDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_free"))) TS_CResult_ClosingSignedDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ClosingSignedDecodeErrorZ _res_conv = *(LDKCResult_ClosingSignedDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ClosingSignedDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ClosingSignedDecodeErrorZ_clone_ptr(LDKCResult_ClosingSignedDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_ClosingSignedDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_clone_ptr"))) TS_CResult_ClosingSignedDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ClosingSignedDecodeErrorZ* arg_conv = (LDKCResult_ClosingSignedDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ClosingSignedDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_clone"))) TS_CResult_ClosingSignedDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ClosingSignedDecodeErrorZ* orig_conv = (LDKCResult_ClosingSignedDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_clone"))) TS_CResult_ClosingSignedDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ClosingSignedDecodeErrorZ* orig_conv = (LDKCResult_ClosingSignedDecodeErrorZ*)untag_ptr(orig); LDKCResult_ClosingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedDecodeErrorZ), "LDKCResult_ClosingSignedDecodeErrorZ"); *ret_conv = CResult_ClosingSignedDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_ok"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_ok"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_ok(uint64_t o) { LDKClosingSignedFeeRange o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ClosingSignedFeeRange_clone(&o_conv); LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedFeeRangeDecodeErrorZ), "LDKCResult_ClosingSignedFeeRangeDecodeErrorZ"); *ret_conv = CResult_ClosingSignedFeeRangeDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_err"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_err"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedFeeRangeDecodeErrorZ), "LDKCResult_ClosingSignedFeeRangeDecodeErrorZ"); *ret_conv = CResult_ClosingSignedFeeRangeDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_is_ok"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* o_conv = (LDKCResult_ClosingSignedFeeRangeDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_is_ok"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* o_conv = (LDKCResult_ClosingSignedFeeRangeDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ClosingSignedFeeRangeDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_free"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_free"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ClosingSignedFeeRangeDecodeErrorZ _res_conv = *(LDKCResult_ClosingSignedFeeRangeDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ClosingSignedFeeRangeDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ClosingSignedFeeRangeDecodeErrorZ_clone_ptr(LDKCResult_ClosingSignedFeeRangeDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_ClosingSignedFeeRangeDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_clone_ptr"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* arg_conv = (LDKCResult_ClosingSignedFeeRangeDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ClosingSignedFeeRangeDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_clone"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* orig_conv = (LDKCResult_ClosingSignedFeeRangeDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_clone"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* orig_conv = (LDKCResult_ClosingSignedFeeRangeDecodeErrorZ*)untag_ptr(orig); LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedFeeRangeDecodeErrorZ), "LDKCResult_ClosingSignedFeeRangeDecodeErrorZ"); *ret_conv = CResult_ClosingSignedFeeRangeDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_ok"))) TS_CResult_CommitmentSignedDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_ok"))) TS_CResult_CommitmentSignedDecodeErrorZ_ok(uint64_t o) { LDKCommitmentSigned o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = CommitmentSigned_clone(&o_conv); LDKCResult_CommitmentSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentSignedDecodeErrorZ), "LDKCResult_CommitmentSignedDecodeErrorZ"); *ret_conv = CResult_CommitmentSignedDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_err"))) TS_CResult_CommitmentSignedDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_err"))) TS_CResult_CommitmentSignedDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_CommitmentSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentSignedDecodeErrorZ), "LDKCResult_CommitmentSignedDecodeErrorZ"); *ret_conv = CResult_CommitmentSignedDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_is_ok"))) TS_CResult_CommitmentSignedDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_CommitmentSignedDecodeErrorZ* o_conv = (LDKCResult_CommitmentSignedDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_is_ok"))) TS_CResult_CommitmentSignedDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_CommitmentSignedDecodeErrorZ* o_conv = (LDKCResult_CommitmentSignedDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_CommitmentSignedDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_free"))) TS_CResult_CommitmentSignedDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_free"))) TS_CResult_CommitmentSignedDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_CommitmentSignedDecodeErrorZ _res_conv = *(LDKCResult_CommitmentSignedDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_CommitmentSignedDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_CommitmentSignedDecodeErrorZ_clone_ptr(LDKCResult_CommitmentSignedDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_CommitmentSignedDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_clone_ptr"))) TS_CResult_CommitmentSignedDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_CommitmentSignedDecodeErrorZ* arg_conv = (LDKCResult_CommitmentSignedDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_CommitmentSignedDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_clone"))) TS_CResult_CommitmentSignedDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_CommitmentSignedDecodeErrorZ* orig_conv = (LDKCResult_CommitmentSignedDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_clone"))) TS_CResult_CommitmentSignedDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_CommitmentSignedDecodeErrorZ* orig_conv = (LDKCResult_CommitmentSignedDecodeErrorZ*)untag_ptr(orig); LDKCResult_CommitmentSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentSignedDecodeErrorZ), "LDKCResult_CommitmentSignedDecodeErrorZ"); *ret_conv = CResult_CommitmentSignedDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_ok"))) TS_CResult_FundingCreatedDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_ok"))) TS_CResult_FundingCreatedDecodeErrorZ_ok(uint64_t o) { LDKFundingCreated o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = FundingCreated_clone(&o_conv); LDKCResult_FundingCreatedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingCreatedDecodeErrorZ), "LDKCResult_FundingCreatedDecodeErrorZ"); *ret_conv = CResult_FundingCreatedDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_err"))) TS_CResult_FundingCreatedDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_err"))) TS_CResult_FundingCreatedDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_FundingCreatedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingCreatedDecodeErrorZ), "LDKCResult_FundingCreatedDecodeErrorZ"); *ret_conv = CResult_FundingCreatedDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_is_ok"))) TS_CResult_FundingCreatedDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_FundingCreatedDecodeErrorZ* o_conv = (LDKCResult_FundingCreatedDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_is_ok"))) TS_CResult_FundingCreatedDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_FundingCreatedDecodeErrorZ* o_conv = (LDKCResult_FundingCreatedDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_FundingCreatedDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_free"))) TS_CResult_FundingCreatedDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_free"))) TS_CResult_FundingCreatedDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_FundingCreatedDecodeErrorZ _res_conv = *(LDKCResult_FundingCreatedDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_FundingCreatedDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_FundingCreatedDecodeErrorZ_clone_ptr(LDKCResult_FundingCreatedDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_FundingCreatedDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_clone_ptr"))) TS_CResult_FundingCreatedDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_FundingCreatedDecodeErrorZ* arg_conv = (LDKCResult_FundingCreatedDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_FundingCreatedDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_clone"))) TS_CResult_FundingCreatedDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_FundingCreatedDecodeErrorZ* orig_conv = (LDKCResult_FundingCreatedDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_clone"))) TS_CResult_FundingCreatedDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_FundingCreatedDecodeErrorZ* orig_conv = (LDKCResult_FundingCreatedDecodeErrorZ*)untag_ptr(orig); LDKCResult_FundingCreatedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingCreatedDecodeErrorZ), "LDKCResult_FundingCreatedDecodeErrorZ"); *ret_conv = CResult_FundingCreatedDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_ok"))) TS_CResult_FundingSignedDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_ok"))) TS_CResult_FundingSignedDecodeErrorZ_ok(uint64_t o) { LDKFundingSigned o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = FundingSigned_clone(&o_conv); LDKCResult_FundingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingSignedDecodeErrorZ), "LDKCResult_FundingSignedDecodeErrorZ"); *ret_conv = CResult_FundingSignedDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_err"))) TS_CResult_FundingSignedDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_err"))) TS_CResult_FundingSignedDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_FundingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingSignedDecodeErrorZ), "LDKCResult_FundingSignedDecodeErrorZ"); *ret_conv = CResult_FundingSignedDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_is_ok"))) TS_CResult_FundingSignedDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_FundingSignedDecodeErrorZ* o_conv = (LDKCResult_FundingSignedDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_is_ok"))) TS_CResult_FundingSignedDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_FundingSignedDecodeErrorZ* o_conv = (LDKCResult_FundingSignedDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_FundingSignedDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_free"))) TS_CResult_FundingSignedDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_free"))) TS_CResult_FundingSignedDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_FundingSignedDecodeErrorZ _res_conv = *(LDKCResult_FundingSignedDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_FundingSignedDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_FundingSignedDecodeErrorZ_clone_ptr(LDKCResult_FundingSignedDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_FundingSignedDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_clone_ptr"))) TS_CResult_FundingSignedDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_FundingSignedDecodeErrorZ* arg_conv = (LDKCResult_FundingSignedDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_FundingSignedDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_clone"))) TS_CResult_FundingSignedDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_FundingSignedDecodeErrorZ* orig_conv = (LDKCResult_FundingSignedDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_clone"))) TS_CResult_FundingSignedDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_FundingSignedDecodeErrorZ* orig_conv = (LDKCResult_FundingSignedDecodeErrorZ*)untag_ptr(orig); LDKCResult_FundingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingSignedDecodeErrorZ), "LDKCResult_FundingSignedDecodeErrorZ"); *ret_conv = CResult_FundingSignedDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelReadyDecodeErrorZ_ok"))) TS_CResult_ChannelReadyDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ChannelReadyDecodeErrorZ_ok"))) TS_CResult_ChannelReadyDecodeErrorZ_ok(uint64_t o) { LDKChannelReady o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ChannelReady_clone(&o_conv); LDKCResult_ChannelReadyDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelReadyDecodeErrorZ), "LDKCResult_ChannelReadyDecodeErrorZ"); *ret_conv = CResult_ChannelReadyDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelReadyDecodeErrorZ_err"))) TS_CResult_ChannelReadyDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ChannelReadyDecodeErrorZ_err"))) TS_CResult_ChannelReadyDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ChannelReadyDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelReadyDecodeErrorZ), "LDKCResult_ChannelReadyDecodeErrorZ"); *ret_conv = CResult_ChannelReadyDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ChannelReadyDecodeErrorZ_is_ok"))) TS_CResult_ChannelReadyDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ChannelReadyDecodeErrorZ* o_conv = (LDKCResult_ChannelReadyDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ChannelReadyDecodeErrorZ_is_ok"))) TS_CResult_ChannelReadyDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ChannelReadyDecodeErrorZ* o_conv = (LDKCResult_ChannelReadyDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ChannelReadyDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ChannelReadyDecodeErrorZ_free"))) TS_CResult_ChannelReadyDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ChannelReadyDecodeErrorZ_free"))) TS_CResult_ChannelReadyDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ChannelReadyDecodeErrorZ _res_conv = *(LDKCResult_ChannelReadyDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ChannelReadyDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ChannelReadyDecodeErrorZ_clone_ptr(LDKCResult_ChannelReadyDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_ChannelReadyDecodeErrorZ_clone_ptr(LDKCResult_ChannelReadyDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_ChannelReadyDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelReadyDecodeErrorZ), "LDKCResult_ChannelReadyDecodeErrorZ"); *ret_conv = CResult_ChannelReadyDecodeErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelReadyDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelReadyDecodeErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_ChannelReadyDecodeErrorZ* arg_conv = (LDKCResult_ChannelReadyDecodeErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_ChannelReadyDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ChannelReadyDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelReadyDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ChannelReadyDecodeErrorZ* arg_conv = (LDKCResult_ChannelReadyDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ChannelReadyDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ChannelReadyDecodeErrorZ_clone"))) TS_CResult_ChannelReadyDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ChannelReadyDecodeErrorZ* orig_conv = (LDKCResult_ChannelReadyDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelReadyDecodeErrorZ_clone"))) TS_CResult_ChannelReadyDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ChannelReadyDecodeErrorZ* orig_conv = (LDKCResult_ChannelReadyDecodeErrorZ*)untag_ptr(orig); LDKCResult_ChannelReadyDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelReadyDecodeErrorZ), "LDKCResult_ChannelReadyDecodeErrorZ"); *ret_conv = CResult_ChannelReadyDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_InitDecodeErrorZ_ok"))) TS_CResult_InitDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_InitDecodeErrorZ_ok"))) TS_CResult_InitDecodeErrorZ_ok(uint64_t o) { LDKInit o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = Init_clone(&o_conv); LDKCResult_InitDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitDecodeErrorZ), "LDKCResult_InitDecodeErrorZ"); *ret_conv = CResult_InitDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_InitDecodeErrorZ_err"))) TS_CResult_InitDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_InitDecodeErrorZ_err"))) TS_CResult_InitDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_InitDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitDecodeErrorZ), "LDKCResult_InitDecodeErrorZ"); *ret_conv = CResult_InitDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_InitDecodeErrorZ_is_ok"))) TS_CResult_InitDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_InitDecodeErrorZ* o_conv = (LDKCResult_InitDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_InitDecodeErrorZ_is_ok"))) TS_CResult_InitDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_InitDecodeErrorZ* o_conv = (LDKCResult_InitDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_InitDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_InitDecodeErrorZ_free"))) TS_CResult_InitDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_InitDecodeErrorZ_free"))) TS_CResult_InitDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_InitDecodeErrorZ _res_conv = *(LDKCResult_InitDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_InitDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_InitDecodeErrorZ_clone_ptr(LDKCResult_InitDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_InitDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_InitDecodeErrorZ_clone_ptr"))) TS_CResult_InitDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_InitDecodeErrorZ* arg_conv = (LDKCResult_InitDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_InitDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_InitDecodeErrorZ_clone"))) TS_CResult_InitDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_InitDecodeErrorZ* orig_conv = (LDKCResult_InitDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_InitDecodeErrorZ_clone"))) TS_CResult_InitDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_InitDecodeErrorZ* orig_conv = (LDKCResult_InitDecodeErrorZ*)untag_ptr(orig); LDKCResult_InitDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitDecodeErrorZ), "LDKCResult_InitDecodeErrorZ"); *ret_conv = CResult_InitDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_ok"))) TS_CResult_OpenChannelDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_ok"))) TS_CResult_OpenChannelDecodeErrorZ_ok(uint64_t o) { LDKOpenChannel o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = OpenChannel_clone(&o_conv); LDKCResult_OpenChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OpenChannelDecodeErrorZ), "LDKCResult_OpenChannelDecodeErrorZ"); *ret_conv = CResult_OpenChannelDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_err"))) TS_CResult_OpenChannelDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_err"))) TS_CResult_OpenChannelDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_OpenChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OpenChannelDecodeErrorZ), "LDKCResult_OpenChannelDecodeErrorZ"); *ret_conv = CResult_OpenChannelDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_is_ok"))) TS_CResult_OpenChannelDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_OpenChannelDecodeErrorZ* o_conv = (LDKCResult_OpenChannelDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_is_ok"))) TS_CResult_OpenChannelDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_OpenChannelDecodeErrorZ* o_conv = (LDKCResult_OpenChannelDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_OpenChannelDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_free"))) TS_CResult_OpenChannelDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_free"))) TS_CResult_OpenChannelDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_OpenChannelDecodeErrorZ _res_conv = *(LDKCResult_OpenChannelDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_OpenChannelDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_OpenChannelDecodeErrorZ_clone_ptr(LDKCResult_OpenChannelDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_OpenChannelDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_clone_ptr"))) TS_CResult_OpenChannelDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_OpenChannelDecodeErrorZ* arg_conv = (LDKCResult_OpenChannelDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_OpenChannelDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_clone"))) TS_CResult_OpenChannelDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_OpenChannelDecodeErrorZ* orig_conv = (LDKCResult_OpenChannelDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_clone"))) TS_CResult_OpenChannelDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_OpenChannelDecodeErrorZ* orig_conv = (LDKCResult_OpenChannelDecodeErrorZ*)untag_ptr(orig); LDKCResult_OpenChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OpenChannelDecodeErrorZ), "LDKCResult_OpenChannelDecodeErrorZ"); *ret_conv = CResult_OpenChannelDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_ok"))) TS_CResult_RevokeAndACKDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_ok"))) TS_CResult_RevokeAndACKDecodeErrorZ_ok(uint64_t o) { LDKRevokeAndACK o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = RevokeAndACK_clone(&o_conv); LDKCResult_RevokeAndACKDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RevokeAndACKDecodeErrorZ), "LDKCResult_RevokeAndACKDecodeErrorZ"); *ret_conv = CResult_RevokeAndACKDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_err"))) TS_CResult_RevokeAndACKDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_err"))) TS_CResult_RevokeAndACKDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_RevokeAndACKDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RevokeAndACKDecodeErrorZ), "LDKCResult_RevokeAndACKDecodeErrorZ"); *ret_conv = CResult_RevokeAndACKDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_is_ok"))) TS_CResult_RevokeAndACKDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_RevokeAndACKDecodeErrorZ* o_conv = (LDKCResult_RevokeAndACKDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_is_ok"))) TS_CResult_RevokeAndACKDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_RevokeAndACKDecodeErrorZ* o_conv = (LDKCResult_RevokeAndACKDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_RevokeAndACKDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_free"))) TS_CResult_RevokeAndACKDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_free"))) TS_CResult_RevokeAndACKDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_RevokeAndACKDecodeErrorZ _res_conv = *(LDKCResult_RevokeAndACKDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_RevokeAndACKDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_RevokeAndACKDecodeErrorZ_clone_ptr(LDKCResult_RevokeAndACKDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_RevokeAndACKDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_clone_ptr"))) TS_CResult_RevokeAndACKDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_RevokeAndACKDecodeErrorZ* arg_conv = (LDKCResult_RevokeAndACKDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_RevokeAndACKDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_clone"))) TS_CResult_RevokeAndACKDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_RevokeAndACKDecodeErrorZ* orig_conv = (LDKCResult_RevokeAndACKDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_clone"))) TS_CResult_RevokeAndACKDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_RevokeAndACKDecodeErrorZ* orig_conv = (LDKCResult_RevokeAndACKDecodeErrorZ*)untag_ptr(orig); LDKCResult_RevokeAndACKDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RevokeAndACKDecodeErrorZ), "LDKCResult_RevokeAndACKDecodeErrorZ"); *ret_conv = CResult_RevokeAndACKDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_ok"))) TS_CResult_ShutdownDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_ok"))) TS_CResult_ShutdownDecodeErrorZ_ok(uint64_t o) { LDKShutdown o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = Shutdown_clone(&o_conv); LDKCResult_ShutdownDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownDecodeErrorZ), "LDKCResult_ShutdownDecodeErrorZ"); *ret_conv = CResult_ShutdownDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_err"))) TS_CResult_ShutdownDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_err"))) TS_CResult_ShutdownDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ShutdownDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownDecodeErrorZ), "LDKCResult_ShutdownDecodeErrorZ"); *ret_conv = CResult_ShutdownDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_is_ok"))) TS_CResult_ShutdownDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ShutdownDecodeErrorZ* o_conv = (LDKCResult_ShutdownDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_is_ok"))) TS_CResult_ShutdownDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ShutdownDecodeErrorZ* o_conv = (LDKCResult_ShutdownDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ShutdownDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_free"))) TS_CResult_ShutdownDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_free"))) TS_CResult_ShutdownDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ShutdownDecodeErrorZ _res_conv = *(LDKCResult_ShutdownDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ShutdownDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ShutdownDecodeErrorZ_clone_ptr(LDKCResult_ShutdownDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_ShutdownDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_clone_ptr"))) TS_CResult_ShutdownDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ShutdownDecodeErrorZ* arg_conv = (LDKCResult_ShutdownDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ShutdownDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_clone"))) TS_CResult_ShutdownDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ShutdownDecodeErrorZ* orig_conv = (LDKCResult_ShutdownDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_clone"))) TS_CResult_ShutdownDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ShutdownDecodeErrorZ* orig_conv = (LDKCResult_ShutdownDecodeErrorZ*)untag_ptr(orig); LDKCResult_ShutdownDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownDecodeErrorZ), "LDKCResult_ShutdownDecodeErrorZ"); *ret_conv = CResult_ShutdownDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_ok"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_ok"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_ok(uint64_t o) { LDKUpdateFailHTLC o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = UpdateFailHTLC_clone(&o_conv); LDKCResult_UpdateFailHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailHTLCDecodeErrorZ), "LDKCResult_UpdateFailHTLCDecodeErrorZ"); *ret_conv = CResult_UpdateFailHTLCDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_err"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_err"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_UpdateFailHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailHTLCDecodeErrorZ), "LDKCResult_UpdateFailHTLCDecodeErrorZ"); *ret_conv = CResult_UpdateFailHTLCDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_is_ok"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_UpdateFailHTLCDecodeErrorZ* o_conv = (LDKCResult_UpdateFailHTLCDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_is_ok"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_UpdateFailHTLCDecodeErrorZ* o_conv = (LDKCResult_UpdateFailHTLCDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_UpdateFailHTLCDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_free"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_free"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_UpdateFailHTLCDecodeErrorZ _res_conv = *(LDKCResult_UpdateFailHTLCDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_UpdateFailHTLCDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_UpdateFailHTLCDecodeErrorZ_clone_ptr(LDKCResult_UpdateFailHTLCDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_UpdateFailHTLCDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_clone_ptr"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_UpdateFailHTLCDecodeErrorZ* arg_conv = (LDKCResult_UpdateFailHTLCDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_UpdateFailHTLCDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_clone"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_UpdateFailHTLCDecodeErrorZ* orig_conv = (LDKCResult_UpdateFailHTLCDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_clone"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_UpdateFailHTLCDecodeErrorZ* orig_conv = (LDKCResult_UpdateFailHTLCDecodeErrorZ*)untag_ptr(orig); LDKCResult_UpdateFailHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailHTLCDecodeErrorZ), "LDKCResult_UpdateFailHTLCDecodeErrorZ"); *ret_conv = CResult_UpdateFailHTLCDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_ok"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_ok"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_ok(uint64_t o) { LDKUpdateFailMalformedHTLC o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = UpdateFailMalformedHTLC_clone(&o_conv); LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ), "LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ"); *ret_conv = CResult_UpdateFailMalformedHTLCDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_err"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_err"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ), "LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ"); *ret_conv = CResult_UpdateFailMalformedHTLCDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_is_ok"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* o_conv = (LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_is_ok"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* o_conv = (LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_UpdateFailMalformedHTLCDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_free"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_free"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ _res_conv = *(LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_UpdateFailMalformedHTLCDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone_ptr(LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone_ptr"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* arg_conv = (LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* orig_conv = (LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* orig_conv = (LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ*)untag_ptr(orig); LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ), "LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ"); *ret_conv = CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_ok"))) TS_CResult_UpdateFeeDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_ok"))) TS_CResult_UpdateFeeDecodeErrorZ_ok(uint64_t o) { LDKUpdateFee o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = UpdateFee_clone(&o_conv); LDKCResult_UpdateFeeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFeeDecodeErrorZ), "LDKCResult_UpdateFeeDecodeErrorZ"); *ret_conv = CResult_UpdateFeeDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_err"))) TS_CResult_UpdateFeeDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_err"))) TS_CResult_UpdateFeeDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_UpdateFeeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFeeDecodeErrorZ), "LDKCResult_UpdateFeeDecodeErrorZ"); *ret_conv = CResult_UpdateFeeDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_is_ok"))) TS_CResult_UpdateFeeDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_UpdateFeeDecodeErrorZ* o_conv = (LDKCResult_UpdateFeeDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_is_ok"))) TS_CResult_UpdateFeeDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_UpdateFeeDecodeErrorZ* o_conv = (LDKCResult_UpdateFeeDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_UpdateFeeDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_free"))) TS_CResult_UpdateFeeDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_free"))) TS_CResult_UpdateFeeDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_UpdateFeeDecodeErrorZ _res_conv = *(LDKCResult_UpdateFeeDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_UpdateFeeDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_UpdateFeeDecodeErrorZ_clone_ptr(LDKCResult_UpdateFeeDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_UpdateFeeDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_clone_ptr"))) TS_CResult_UpdateFeeDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_UpdateFeeDecodeErrorZ* arg_conv = (LDKCResult_UpdateFeeDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_UpdateFeeDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_clone"))) TS_CResult_UpdateFeeDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_UpdateFeeDecodeErrorZ* orig_conv = (LDKCResult_UpdateFeeDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_clone"))) TS_CResult_UpdateFeeDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_UpdateFeeDecodeErrorZ* orig_conv = (LDKCResult_UpdateFeeDecodeErrorZ*)untag_ptr(orig); LDKCResult_UpdateFeeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFeeDecodeErrorZ), "LDKCResult_UpdateFeeDecodeErrorZ"); *ret_conv = CResult_UpdateFeeDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_ok"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_ok"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_ok(uint64_t o) { LDKUpdateFulfillHTLC o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = UpdateFulfillHTLC_clone(&o_conv); LDKCResult_UpdateFulfillHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFulfillHTLCDecodeErrorZ), "LDKCResult_UpdateFulfillHTLCDecodeErrorZ"); *ret_conv = CResult_UpdateFulfillHTLCDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_err"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_err"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_UpdateFulfillHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFulfillHTLCDecodeErrorZ), "LDKCResult_UpdateFulfillHTLCDecodeErrorZ"); *ret_conv = CResult_UpdateFulfillHTLCDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_is_ok"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_UpdateFulfillHTLCDecodeErrorZ* o_conv = (LDKCResult_UpdateFulfillHTLCDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_is_ok"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_UpdateFulfillHTLCDecodeErrorZ* o_conv = (LDKCResult_UpdateFulfillHTLCDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_UpdateFulfillHTLCDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_free"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_free"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_UpdateFulfillHTLCDecodeErrorZ _res_conv = *(LDKCResult_UpdateFulfillHTLCDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_UpdateFulfillHTLCDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_UpdateFulfillHTLCDecodeErrorZ_clone_ptr(LDKCResult_UpdateFulfillHTLCDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_UpdateFulfillHTLCDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_clone_ptr"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_UpdateFulfillHTLCDecodeErrorZ* arg_conv = (LDKCResult_UpdateFulfillHTLCDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_UpdateFulfillHTLCDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_clone"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_UpdateFulfillHTLCDecodeErrorZ* orig_conv = (LDKCResult_UpdateFulfillHTLCDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_clone"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_UpdateFulfillHTLCDecodeErrorZ* orig_conv = (LDKCResult_UpdateFulfillHTLCDecodeErrorZ*)untag_ptr(orig); LDKCResult_UpdateFulfillHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFulfillHTLCDecodeErrorZ), "LDKCResult_UpdateFulfillHTLCDecodeErrorZ"); *ret_conv = CResult_UpdateFulfillHTLCDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_ok"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_ok"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_ok(uint64_t o) { LDKUpdateAddHTLC o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = UpdateAddHTLC_clone(&o_conv); LDKCResult_UpdateAddHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateAddHTLCDecodeErrorZ), "LDKCResult_UpdateAddHTLCDecodeErrorZ"); *ret_conv = CResult_UpdateAddHTLCDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_err"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_err"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_UpdateAddHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateAddHTLCDecodeErrorZ), "LDKCResult_UpdateAddHTLCDecodeErrorZ"); *ret_conv = CResult_UpdateAddHTLCDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_is_ok"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_UpdateAddHTLCDecodeErrorZ* o_conv = (LDKCResult_UpdateAddHTLCDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_is_ok"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_UpdateAddHTLCDecodeErrorZ* o_conv = (LDKCResult_UpdateAddHTLCDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_UpdateAddHTLCDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_free"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_free"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_UpdateAddHTLCDecodeErrorZ _res_conv = *(LDKCResult_UpdateAddHTLCDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_UpdateAddHTLCDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_UpdateAddHTLCDecodeErrorZ_clone_ptr(LDKCResult_UpdateAddHTLCDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_UpdateAddHTLCDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_clone_ptr"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_UpdateAddHTLCDecodeErrorZ* arg_conv = (LDKCResult_UpdateAddHTLCDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_UpdateAddHTLCDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_clone"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_UpdateAddHTLCDecodeErrorZ* orig_conv = (LDKCResult_UpdateAddHTLCDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_clone"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_UpdateAddHTLCDecodeErrorZ* orig_conv = (LDKCResult_UpdateAddHTLCDecodeErrorZ*)untag_ptr(orig); LDKCResult_UpdateAddHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateAddHTLCDecodeErrorZ), "LDKCResult_UpdateAddHTLCDecodeErrorZ"); *ret_conv = CResult_UpdateAddHTLCDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PingDecodeErrorZ_ok"))) TS_CResult_PingDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_PingDecodeErrorZ_ok"))) TS_CResult_PingDecodeErrorZ_ok(uint64_t o) { LDKPing o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = Ping_clone(&o_conv); LDKCResult_PingDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PingDecodeErrorZ), "LDKCResult_PingDecodeErrorZ"); *ret_conv = CResult_PingDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PingDecodeErrorZ_err"))) TS_CResult_PingDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_PingDecodeErrorZ_err"))) TS_CResult_PingDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_PingDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PingDecodeErrorZ), "LDKCResult_PingDecodeErrorZ"); *ret_conv = CResult_PingDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_PingDecodeErrorZ_is_ok"))) TS_CResult_PingDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_PingDecodeErrorZ* o_conv = (LDKCResult_PingDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_PingDecodeErrorZ_is_ok"))) TS_CResult_PingDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_PingDecodeErrorZ* o_conv = (LDKCResult_PingDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_PingDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_PingDecodeErrorZ_free"))) TS_CResult_PingDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_PingDecodeErrorZ_free"))) TS_CResult_PingDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_PingDecodeErrorZ _res_conv = *(LDKCResult_PingDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_PingDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_PingDecodeErrorZ_clone_ptr(LDKCResult_PingDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_PingDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_PingDecodeErrorZ_clone_ptr"))) TS_CResult_PingDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_PingDecodeErrorZ* arg_conv = (LDKCResult_PingDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_PingDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_PingDecodeErrorZ_clone"))) TS_CResult_PingDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_PingDecodeErrorZ* orig_conv = (LDKCResult_PingDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_PingDecodeErrorZ_clone"))) TS_CResult_PingDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_PingDecodeErrorZ* orig_conv = (LDKCResult_PingDecodeErrorZ*)untag_ptr(orig); LDKCResult_PingDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PingDecodeErrorZ), "LDKCResult_PingDecodeErrorZ"); *ret_conv = CResult_PingDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PongDecodeErrorZ_ok"))) TS_CResult_PongDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_PongDecodeErrorZ_ok"))) TS_CResult_PongDecodeErrorZ_ok(uint64_t o) { LDKPong o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = Pong_clone(&o_conv); LDKCResult_PongDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PongDecodeErrorZ), "LDKCResult_PongDecodeErrorZ"); *ret_conv = CResult_PongDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PongDecodeErrorZ_err"))) TS_CResult_PongDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_PongDecodeErrorZ_err"))) TS_CResult_PongDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_PongDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PongDecodeErrorZ), "LDKCResult_PongDecodeErrorZ"); *ret_conv = CResult_PongDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_PongDecodeErrorZ_is_ok"))) TS_CResult_PongDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_PongDecodeErrorZ* o_conv = (LDKCResult_PongDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_PongDecodeErrorZ_is_ok"))) TS_CResult_PongDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_PongDecodeErrorZ* o_conv = (LDKCResult_PongDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_PongDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_PongDecodeErrorZ_free"))) TS_CResult_PongDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_PongDecodeErrorZ_free"))) TS_CResult_PongDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_PongDecodeErrorZ _res_conv = *(LDKCResult_PongDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_PongDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_PongDecodeErrorZ_clone_ptr(LDKCResult_PongDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_PongDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_PongDecodeErrorZ_clone_ptr"))) TS_CResult_PongDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_PongDecodeErrorZ* arg_conv = (LDKCResult_PongDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_PongDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_PongDecodeErrorZ_clone"))) TS_CResult_PongDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_PongDecodeErrorZ* orig_conv = (LDKCResult_PongDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_PongDecodeErrorZ_clone"))) TS_CResult_PongDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_PongDecodeErrorZ* orig_conv = (LDKCResult_PongDecodeErrorZ*)untag_ptr(orig); LDKCResult_PongDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PongDecodeErrorZ), "LDKCResult_PongDecodeErrorZ"); *ret_conv = CResult_PongDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_ok"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_ok"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_ok(uint64_t o) { LDKUnsignedChannelAnnouncement o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = UnsignedChannelAnnouncement_clone(&o_conv); LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ), "LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ"); *ret_conv = CResult_UnsignedChannelAnnouncementDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_err"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_err"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ), "LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ"); *ret_conv = CResult_UnsignedChannelAnnouncementDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_is_ok"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* o_conv = (LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_is_ok"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* o_conv = (LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_UnsignedChannelAnnouncementDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_free"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_free"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ _res_conv = *(LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_UnsignedChannelAnnouncementDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone_ptr(LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone_ptr"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* arg_conv = (LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* orig_conv = (LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* orig_conv = (LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ*)untag_ptr(orig); LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ), "LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ"); *ret_conv = CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_ok"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_ok"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_ok(uint64_t o) { LDKChannelAnnouncement o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ChannelAnnouncement_clone(&o_conv); LDKCResult_ChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelAnnouncementDecodeErrorZ), "LDKCResult_ChannelAnnouncementDecodeErrorZ"); *ret_conv = CResult_ChannelAnnouncementDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_err"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_err"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelAnnouncementDecodeErrorZ), "LDKCResult_ChannelAnnouncementDecodeErrorZ"); *ret_conv = CResult_ChannelAnnouncementDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_is_ok"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ChannelAnnouncementDecodeErrorZ* o_conv = (LDKCResult_ChannelAnnouncementDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_is_ok"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ChannelAnnouncementDecodeErrorZ* o_conv = (LDKCResult_ChannelAnnouncementDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ChannelAnnouncementDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_free"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_free"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ChannelAnnouncementDecodeErrorZ _res_conv = *(LDKCResult_ChannelAnnouncementDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ChannelAnnouncementDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ChannelAnnouncementDecodeErrorZ_clone_ptr(LDKCResult_ChannelAnnouncementDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_ChannelAnnouncementDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ChannelAnnouncementDecodeErrorZ* arg_conv = (LDKCResult_ChannelAnnouncementDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ChannelAnnouncementDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_clone"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ChannelAnnouncementDecodeErrorZ* orig_conv = (LDKCResult_ChannelAnnouncementDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_clone"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ChannelAnnouncementDecodeErrorZ* orig_conv = (LDKCResult_ChannelAnnouncementDecodeErrorZ*)untag_ptr(orig); LDKCResult_ChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelAnnouncementDecodeErrorZ), "LDKCResult_ChannelAnnouncementDecodeErrorZ"); *ret_conv = CResult_ChannelAnnouncementDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_ok"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_ok"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_ok(uint64_t o) { LDKUnsignedChannelUpdate o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = UnsignedChannelUpdate_clone(&o_conv); LDKCResult_UnsignedChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelUpdateDecodeErrorZ), "LDKCResult_UnsignedChannelUpdateDecodeErrorZ"); *ret_conv = CResult_UnsignedChannelUpdateDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_err"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_err"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_UnsignedChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelUpdateDecodeErrorZ), "LDKCResult_UnsignedChannelUpdateDecodeErrorZ"); *ret_conv = CResult_UnsignedChannelUpdateDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_is_ok"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_UnsignedChannelUpdateDecodeErrorZ* o_conv = (LDKCResult_UnsignedChannelUpdateDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_is_ok"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_UnsignedChannelUpdateDecodeErrorZ* o_conv = (LDKCResult_UnsignedChannelUpdateDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_UnsignedChannelUpdateDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_free"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_free"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_UnsignedChannelUpdateDecodeErrorZ _res_conv = *(LDKCResult_UnsignedChannelUpdateDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_UnsignedChannelUpdateDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_UnsignedChannelUpdateDecodeErrorZ_clone_ptr(LDKCResult_UnsignedChannelUpdateDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_UnsignedChannelUpdateDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_clone_ptr"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_UnsignedChannelUpdateDecodeErrorZ* arg_conv = (LDKCResult_UnsignedChannelUpdateDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_UnsignedChannelUpdateDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_clone"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_UnsignedChannelUpdateDecodeErrorZ* orig_conv = (LDKCResult_UnsignedChannelUpdateDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_clone"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_UnsignedChannelUpdateDecodeErrorZ* orig_conv = (LDKCResult_UnsignedChannelUpdateDecodeErrorZ*)untag_ptr(orig); LDKCResult_UnsignedChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelUpdateDecodeErrorZ), "LDKCResult_UnsignedChannelUpdateDecodeErrorZ"); *ret_conv = CResult_UnsignedChannelUpdateDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_ok"))) TS_CResult_ChannelUpdateDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_ok"))) TS_CResult_ChannelUpdateDecodeErrorZ_ok(uint64_t o) { LDKChannelUpdate o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ChannelUpdate_clone(&o_conv); LDKCResult_ChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateDecodeErrorZ), "LDKCResult_ChannelUpdateDecodeErrorZ"); *ret_conv = CResult_ChannelUpdateDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_err"))) TS_CResult_ChannelUpdateDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_err"))) TS_CResult_ChannelUpdateDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateDecodeErrorZ), "LDKCResult_ChannelUpdateDecodeErrorZ"); *ret_conv = CResult_ChannelUpdateDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_is_ok"))) TS_CResult_ChannelUpdateDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ChannelUpdateDecodeErrorZ* o_conv = (LDKCResult_ChannelUpdateDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_is_ok"))) TS_CResult_ChannelUpdateDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ChannelUpdateDecodeErrorZ* o_conv = (LDKCResult_ChannelUpdateDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ChannelUpdateDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_free"))) TS_CResult_ChannelUpdateDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_free"))) TS_CResult_ChannelUpdateDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ChannelUpdateDecodeErrorZ _res_conv = *(LDKCResult_ChannelUpdateDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ChannelUpdateDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ChannelUpdateDecodeErrorZ_clone_ptr(LDKCResult_ChannelUpdateDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_ChannelUpdateDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelUpdateDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ChannelUpdateDecodeErrorZ* arg_conv = (LDKCResult_ChannelUpdateDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ChannelUpdateDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_clone"))) TS_CResult_ChannelUpdateDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ChannelUpdateDecodeErrorZ* orig_conv = (LDKCResult_ChannelUpdateDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_clone"))) TS_CResult_ChannelUpdateDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ChannelUpdateDecodeErrorZ* orig_conv = (LDKCResult_ChannelUpdateDecodeErrorZ*)untag_ptr(orig); LDKCResult_ChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateDecodeErrorZ), "LDKCResult_ChannelUpdateDecodeErrorZ"); *ret_conv = CResult_ChannelUpdateDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_ok"))) TS_CResult_ErrorMessageDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_ok"))) TS_CResult_ErrorMessageDecodeErrorZ_ok(uint64_t o) { LDKErrorMessage o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ErrorMessage_clone(&o_conv); LDKCResult_ErrorMessageDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ErrorMessageDecodeErrorZ), "LDKCResult_ErrorMessageDecodeErrorZ"); *ret_conv = CResult_ErrorMessageDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_err"))) TS_CResult_ErrorMessageDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_err"))) TS_CResult_ErrorMessageDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ErrorMessageDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ErrorMessageDecodeErrorZ), "LDKCResult_ErrorMessageDecodeErrorZ"); *ret_conv = CResult_ErrorMessageDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_is_ok"))) TS_CResult_ErrorMessageDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ErrorMessageDecodeErrorZ* o_conv = (LDKCResult_ErrorMessageDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_is_ok"))) TS_CResult_ErrorMessageDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ErrorMessageDecodeErrorZ* o_conv = (LDKCResult_ErrorMessageDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ErrorMessageDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_free"))) TS_CResult_ErrorMessageDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_free"))) TS_CResult_ErrorMessageDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ErrorMessageDecodeErrorZ _res_conv = *(LDKCResult_ErrorMessageDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ErrorMessageDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ErrorMessageDecodeErrorZ_clone_ptr(LDKCResult_ErrorMessageDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_ErrorMessageDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_clone_ptr"))) TS_CResult_ErrorMessageDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ErrorMessageDecodeErrorZ* arg_conv = (LDKCResult_ErrorMessageDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ErrorMessageDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_clone"))) TS_CResult_ErrorMessageDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ErrorMessageDecodeErrorZ* orig_conv = (LDKCResult_ErrorMessageDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_clone"))) TS_CResult_ErrorMessageDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ErrorMessageDecodeErrorZ* orig_conv = (LDKCResult_ErrorMessageDecodeErrorZ*)untag_ptr(orig); LDKCResult_ErrorMessageDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ErrorMessageDecodeErrorZ), "LDKCResult_ErrorMessageDecodeErrorZ"); *ret_conv = CResult_ErrorMessageDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_ok"))) TS_CResult_WarningMessageDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_ok"))) TS_CResult_WarningMessageDecodeErrorZ_ok(uint64_t o) { LDKWarningMessage o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = WarningMessage_clone(&o_conv); LDKCResult_WarningMessageDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_WarningMessageDecodeErrorZ), "LDKCResult_WarningMessageDecodeErrorZ"); *ret_conv = CResult_WarningMessageDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_err"))) TS_CResult_WarningMessageDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_err"))) TS_CResult_WarningMessageDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_WarningMessageDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_WarningMessageDecodeErrorZ), "LDKCResult_WarningMessageDecodeErrorZ"); *ret_conv = CResult_WarningMessageDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_is_ok"))) TS_CResult_WarningMessageDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_WarningMessageDecodeErrorZ* o_conv = (LDKCResult_WarningMessageDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_is_ok"))) TS_CResult_WarningMessageDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_WarningMessageDecodeErrorZ* o_conv = (LDKCResult_WarningMessageDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_WarningMessageDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_free"))) TS_CResult_WarningMessageDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_free"))) TS_CResult_WarningMessageDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_WarningMessageDecodeErrorZ _res_conv = *(LDKCResult_WarningMessageDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_WarningMessageDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_WarningMessageDecodeErrorZ_clone_ptr(LDKCResult_WarningMessageDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_WarningMessageDecodeErrorZ_clone_ptr(LDKCResult_WarningMessageDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_WarningMessageDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_WarningMessageDecodeErrorZ), "LDKCResult_WarningMessageDecodeErrorZ"); *ret_conv = CResult_WarningMessageDecodeErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_clone_ptr"))) TS_CResult_WarningMessageDecodeErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_WarningMessageDecodeErrorZ* arg_conv = (LDKCResult_WarningMessageDecodeErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_WarningMessageDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_clone_ptr"))) TS_CResult_WarningMessageDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_WarningMessageDecodeErrorZ* arg_conv = (LDKCResult_WarningMessageDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_WarningMessageDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_clone"))) TS_CResult_WarningMessageDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_WarningMessageDecodeErrorZ* orig_conv = (LDKCResult_WarningMessageDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_clone"))) TS_CResult_WarningMessageDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_WarningMessageDecodeErrorZ* orig_conv = (LDKCResult_WarningMessageDecodeErrorZ*)untag_ptr(orig); LDKCResult_WarningMessageDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_WarningMessageDecodeErrorZ), "LDKCResult_WarningMessageDecodeErrorZ"); *ret_conv = CResult_WarningMessageDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_ok"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_ok"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_ok(uint64_t o) { LDKUnsignedNodeAnnouncement o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = UnsignedNodeAnnouncement_clone(&o_conv); LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ), "LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ"); *ret_conv = CResult_UnsignedNodeAnnouncementDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_err"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_err"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ), "LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ"); *ret_conv = CResult_UnsignedNodeAnnouncementDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_is_ok"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* o_conv = (LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_is_ok"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* o_conv = (LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_UnsignedNodeAnnouncementDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_free"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_free"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ _res_conv = *(LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_UnsignedNodeAnnouncementDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone_ptr(LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone_ptr"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* arg_conv = (LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* orig_conv = (LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* orig_conv = (LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ*)untag_ptr(orig); LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ), "LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ"); *ret_conv = CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_ok"))) TS_CResult_NodeAnnouncementDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_ok"))) TS_CResult_NodeAnnouncementDecodeErrorZ_ok(uint64_t o) { LDKNodeAnnouncement o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = NodeAnnouncement_clone(&o_conv); LDKCResult_NodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementDecodeErrorZ), "LDKCResult_NodeAnnouncementDecodeErrorZ"); *ret_conv = CResult_NodeAnnouncementDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_err"))) TS_CResult_NodeAnnouncementDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_err"))) TS_CResult_NodeAnnouncementDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_NodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementDecodeErrorZ), "LDKCResult_NodeAnnouncementDecodeErrorZ"); *ret_conv = CResult_NodeAnnouncementDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_is_ok"))) TS_CResult_NodeAnnouncementDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_NodeAnnouncementDecodeErrorZ* o_conv = (LDKCResult_NodeAnnouncementDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_is_ok"))) TS_CResult_NodeAnnouncementDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_NodeAnnouncementDecodeErrorZ* o_conv = (LDKCResult_NodeAnnouncementDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_NodeAnnouncementDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_free"))) TS_CResult_NodeAnnouncementDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_free"))) TS_CResult_NodeAnnouncementDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_NodeAnnouncementDecodeErrorZ _res_conv = *(LDKCResult_NodeAnnouncementDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_NodeAnnouncementDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_NodeAnnouncementDecodeErrorZ_clone_ptr(LDKCResult_NodeAnnouncementDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_NodeAnnouncementDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_clone_ptr"))) TS_CResult_NodeAnnouncementDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_NodeAnnouncementDecodeErrorZ* arg_conv = (LDKCResult_NodeAnnouncementDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_NodeAnnouncementDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_clone"))) TS_CResult_NodeAnnouncementDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_NodeAnnouncementDecodeErrorZ* orig_conv = (LDKCResult_NodeAnnouncementDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_clone"))) TS_CResult_NodeAnnouncementDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_NodeAnnouncementDecodeErrorZ* orig_conv = (LDKCResult_NodeAnnouncementDecodeErrorZ*)untag_ptr(orig); LDKCResult_NodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementDecodeErrorZ), "LDKCResult_NodeAnnouncementDecodeErrorZ"); *ret_conv = CResult_NodeAnnouncementDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_ok"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_ok"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_ok(uint64_t o) { LDKQueryShortChannelIds o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = QueryShortChannelIds_clone(&o_conv); LDKCResult_QueryShortChannelIdsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryShortChannelIdsDecodeErrorZ), "LDKCResult_QueryShortChannelIdsDecodeErrorZ"); *ret_conv = CResult_QueryShortChannelIdsDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_err"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_err"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_QueryShortChannelIdsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryShortChannelIdsDecodeErrorZ), "LDKCResult_QueryShortChannelIdsDecodeErrorZ"); *ret_conv = CResult_QueryShortChannelIdsDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_is_ok"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_QueryShortChannelIdsDecodeErrorZ* o_conv = (LDKCResult_QueryShortChannelIdsDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_is_ok"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_QueryShortChannelIdsDecodeErrorZ* o_conv = (LDKCResult_QueryShortChannelIdsDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_QueryShortChannelIdsDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_free"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_free"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_QueryShortChannelIdsDecodeErrorZ _res_conv = *(LDKCResult_QueryShortChannelIdsDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_QueryShortChannelIdsDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_QueryShortChannelIdsDecodeErrorZ_clone_ptr(LDKCResult_QueryShortChannelIdsDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_QueryShortChannelIdsDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_clone_ptr"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_QueryShortChannelIdsDecodeErrorZ* arg_conv = (LDKCResult_QueryShortChannelIdsDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_QueryShortChannelIdsDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_clone"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_QueryShortChannelIdsDecodeErrorZ* orig_conv = (LDKCResult_QueryShortChannelIdsDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_clone"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_QueryShortChannelIdsDecodeErrorZ* orig_conv = (LDKCResult_QueryShortChannelIdsDecodeErrorZ*)untag_ptr(orig); LDKCResult_QueryShortChannelIdsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryShortChannelIdsDecodeErrorZ), "LDKCResult_QueryShortChannelIdsDecodeErrorZ"); *ret_conv = CResult_QueryShortChannelIdsDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_ok"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_ok"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_ok(uint64_t o) { LDKReplyShortChannelIdsEnd o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ReplyShortChannelIdsEnd_clone(&o_conv); LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ), "LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ"); *ret_conv = CResult_ReplyShortChannelIdsEndDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_err"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_err"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ), "LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ"); *ret_conv = CResult_ReplyShortChannelIdsEndDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_is_ok"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* o_conv = (LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_is_ok"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* o_conv = (LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ReplyShortChannelIdsEndDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_free"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_free"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ _res_conv = *(LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ReplyShortChannelIdsEndDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone_ptr(LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone_ptr"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* arg_conv = (LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* orig_conv = (LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* orig_conv = (LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ*)untag_ptr(orig); LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ), "LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ"); *ret_conv = CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_ok"))) TS_CResult_QueryChannelRangeDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_ok"))) TS_CResult_QueryChannelRangeDecodeErrorZ_ok(uint64_t o) { LDKQueryChannelRange o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = QueryChannelRange_clone(&o_conv); LDKCResult_QueryChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryChannelRangeDecodeErrorZ), "LDKCResult_QueryChannelRangeDecodeErrorZ"); *ret_conv = CResult_QueryChannelRangeDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_err"))) TS_CResult_QueryChannelRangeDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_err"))) TS_CResult_QueryChannelRangeDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_QueryChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryChannelRangeDecodeErrorZ), "LDKCResult_QueryChannelRangeDecodeErrorZ"); *ret_conv = CResult_QueryChannelRangeDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_is_ok"))) TS_CResult_QueryChannelRangeDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_QueryChannelRangeDecodeErrorZ* o_conv = (LDKCResult_QueryChannelRangeDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_is_ok"))) TS_CResult_QueryChannelRangeDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_QueryChannelRangeDecodeErrorZ* o_conv = (LDKCResult_QueryChannelRangeDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_QueryChannelRangeDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_free"))) TS_CResult_QueryChannelRangeDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_free"))) TS_CResult_QueryChannelRangeDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_QueryChannelRangeDecodeErrorZ _res_conv = *(LDKCResult_QueryChannelRangeDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_QueryChannelRangeDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_QueryChannelRangeDecodeErrorZ_clone_ptr(LDKCResult_QueryChannelRangeDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_QueryChannelRangeDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_clone_ptr"))) TS_CResult_QueryChannelRangeDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_QueryChannelRangeDecodeErrorZ* arg_conv = (LDKCResult_QueryChannelRangeDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_QueryChannelRangeDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_clone"))) TS_CResult_QueryChannelRangeDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_QueryChannelRangeDecodeErrorZ* orig_conv = (LDKCResult_QueryChannelRangeDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_clone"))) TS_CResult_QueryChannelRangeDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_QueryChannelRangeDecodeErrorZ* orig_conv = (LDKCResult_QueryChannelRangeDecodeErrorZ*)untag_ptr(orig); LDKCResult_QueryChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryChannelRangeDecodeErrorZ), "LDKCResult_QueryChannelRangeDecodeErrorZ"); *ret_conv = CResult_QueryChannelRangeDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_ok"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_ok"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_ok(uint64_t o) { LDKReplyChannelRange o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ReplyChannelRange_clone(&o_conv); LDKCResult_ReplyChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyChannelRangeDecodeErrorZ), "LDKCResult_ReplyChannelRangeDecodeErrorZ"); *ret_conv = CResult_ReplyChannelRangeDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_err"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_err"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ReplyChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyChannelRangeDecodeErrorZ), "LDKCResult_ReplyChannelRangeDecodeErrorZ"); *ret_conv = CResult_ReplyChannelRangeDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_is_ok"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ReplyChannelRangeDecodeErrorZ* o_conv = (LDKCResult_ReplyChannelRangeDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_is_ok"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ReplyChannelRangeDecodeErrorZ* o_conv = (LDKCResult_ReplyChannelRangeDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ReplyChannelRangeDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_free"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_free"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ReplyChannelRangeDecodeErrorZ _res_conv = *(LDKCResult_ReplyChannelRangeDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ReplyChannelRangeDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ReplyChannelRangeDecodeErrorZ_clone_ptr(LDKCResult_ReplyChannelRangeDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_ReplyChannelRangeDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_clone_ptr"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ReplyChannelRangeDecodeErrorZ* arg_conv = (LDKCResult_ReplyChannelRangeDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ReplyChannelRangeDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_clone"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ReplyChannelRangeDecodeErrorZ* orig_conv = (LDKCResult_ReplyChannelRangeDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_clone"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ReplyChannelRangeDecodeErrorZ* orig_conv = (LDKCResult_ReplyChannelRangeDecodeErrorZ*)untag_ptr(orig); LDKCResult_ReplyChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyChannelRangeDecodeErrorZ), "LDKCResult_ReplyChannelRangeDecodeErrorZ"); *ret_conv = CResult_ReplyChannelRangeDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_ok"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_ok"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_ok(uint64_t o) { LDKGossipTimestampFilter o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = GossipTimestampFilter_clone(&o_conv); LDKCResult_GossipTimestampFilterDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_GossipTimestampFilterDecodeErrorZ), "LDKCResult_GossipTimestampFilterDecodeErrorZ"); *ret_conv = CResult_GossipTimestampFilterDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_err"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_err"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_GossipTimestampFilterDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_GossipTimestampFilterDecodeErrorZ), "LDKCResult_GossipTimestampFilterDecodeErrorZ"); *ret_conv = CResult_GossipTimestampFilterDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_is_ok"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_GossipTimestampFilterDecodeErrorZ* o_conv = (LDKCResult_GossipTimestampFilterDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_is_ok"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_GossipTimestampFilterDecodeErrorZ* o_conv = (LDKCResult_GossipTimestampFilterDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_GossipTimestampFilterDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_free"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_free"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_GossipTimestampFilterDecodeErrorZ _res_conv = *(LDKCResult_GossipTimestampFilterDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_GossipTimestampFilterDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_GossipTimestampFilterDecodeErrorZ_clone_ptr(LDKCResult_GossipTimestampFilterDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_GossipTimestampFilterDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_clone_ptr"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_GossipTimestampFilterDecodeErrorZ* arg_conv = (LDKCResult_GossipTimestampFilterDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_GossipTimestampFilterDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_clone"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_GossipTimestampFilterDecodeErrorZ* orig_conv = (LDKCResult_GossipTimestampFilterDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_clone"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_GossipTimestampFilterDecodeErrorZ* orig_conv = (LDKCResult_GossipTimestampFilterDecodeErrorZ*)untag_ptr(orig); LDKCResult_GossipTimestampFilterDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_GossipTimestampFilterDecodeErrorZ), "LDKCResult_GossipTimestampFilterDecodeErrorZ"); *ret_conv = CResult_GossipTimestampFilterDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_ok"))) TS_CResult_InvoiceSignOrCreationErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_ok"))) TS_CResult_InvoiceSignOrCreationErrorZ_ok(uint64_t o) { LDKInvoice o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = Invoice_clone(&o_conv); LDKCResult_InvoiceSignOrCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceSignOrCreationErrorZ), "LDKCResult_InvoiceSignOrCreationErrorZ"); *ret_conv = CResult_InvoiceSignOrCreationErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_err"))) TS_CResult_InvoiceSignOrCreationErrorZ_err(uint32_t e) { - void* e_ptr = (void*)(((uintptr_t)e) & ~1); +uint64_t __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_err"))) TS_CResult_InvoiceSignOrCreationErrorZ_err(uint64_t e) { + void* e_ptr = untag_ptr(e); CHECK_ACCESS(e_ptr); LDKSignOrCreationError e_conv = *(LDKSignOrCreationError*)(e_ptr); - e_conv = SignOrCreationError_clone((LDKSignOrCreationError*)(((uintptr_t)e) & ~1)); + e_conv = SignOrCreationError_clone((LDKSignOrCreationError*)untag_ptr(e)); LDKCResult_InvoiceSignOrCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceSignOrCreationErrorZ), "LDKCResult_InvoiceSignOrCreationErrorZ"); *ret_conv = CResult_InvoiceSignOrCreationErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_is_ok"))) TS_CResult_InvoiceSignOrCreationErrorZ_is_ok(uint32_t o) { - LDKCResult_InvoiceSignOrCreationErrorZ* o_conv = (LDKCResult_InvoiceSignOrCreationErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_is_ok"))) TS_CResult_InvoiceSignOrCreationErrorZ_is_ok(uint64_t o) { + LDKCResult_InvoiceSignOrCreationErrorZ* o_conv = (LDKCResult_InvoiceSignOrCreationErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_InvoiceSignOrCreationErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_free"))) TS_CResult_InvoiceSignOrCreationErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_free"))) TS_CResult_InvoiceSignOrCreationErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_InvoiceSignOrCreationErrorZ _res_conv = *(LDKCResult_InvoiceSignOrCreationErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_InvoiceSignOrCreationErrorZ_free(_res_conv); } -static inline uintptr_t CResult_InvoiceSignOrCreationErrorZ_clone_ptr(LDKCResult_InvoiceSignOrCreationErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_InvoiceSignOrCreationErrorZ_clone_ptr(LDKCResult_InvoiceSignOrCreationErrorZ *NONNULL_PTR arg) { LDKCResult_InvoiceSignOrCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceSignOrCreationErrorZ), "LDKCResult_InvoiceSignOrCreationErrorZ"); *ret_conv = CResult_InvoiceSignOrCreationErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_clone_ptr"))) TS_CResult_InvoiceSignOrCreationErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_InvoiceSignOrCreationErrorZ* arg_conv = (LDKCResult_InvoiceSignOrCreationErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_InvoiceSignOrCreationErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_clone_ptr"))) TS_CResult_InvoiceSignOrCreationErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_InvoiceSignOrCreationErrorZ* arg_conv = (LDKCResult_InvoiceSignOrCreationErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_InvoiceSignOrCreationErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_clone"))) TS_CResult_InvoiceSignOrCreationErrorZ_clone(uint32_t orig) { - LDKCResult_InvoiceSignOrCreationErrorZ* orig_conv = (LDKCResult_InvoiceSignOrCreationErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_clone"))) TS_CResult_InvoiceSignOrCreationErrorZ_clone(uint64_t orig) { + LDKCResult_InvoiceSignOrCreationErrorZ* orig_conv = (LDKCResult_InvoiceSignOrCreationErrorZ*)untag_ptr(orig); LDKCResult_InvoiceSignOrCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceSignOrCreationErrorZ), "LDKCResult_InvoiceSignOrCreationErrorZ"); *ret_conv = CResult_InvoiceSignOrCreationErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_COption_FilterZ_some"))) TS_COption_FilterZ_some(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_COption_FilterZ_some"))) TS_COption_FilterZ_some(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKFilter o_conv = *(LDKFilter*)(o_ptr); if (o_conv.free == LDKFilter_JCalls_free) { @@ -20571,71 +19297,72 @@ uint32_t __attribute__((export_name("TS_COption_FilterZ_some"))) TS_COption_Fil } LDKCOption_FilterZ *ret_copy = MALLOC(sizeof(LDKCOption_FilterZ), "LDKCOption_FilterZ"); *ret_copy = COption_FilterZ_some(o_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_FilterZ_none"))) TS_COption_FilterZ_none() { +uint64_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(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_COption_FilterZ_free"))) TS_COption_FilterZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCOption_FilterZ _res_conv = *(LDKCOption_FilterZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); COption_FilterZ_free(_res_conv); } -uint32_t __attribute__((export_name("TS_CResult_LockedChannelMonitorNoneZ_ok"))) TS_CResult_LockedChannelMonitorNoneZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_LockedChannelMonitorNoneZ_ok"))) TS_CResult_LockedChannelMonitorNoneZ_ok(uint64_t o) { LDKLockedChannelMonitor o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); // 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_LockedChannelMonitorNoneZ_err"))) TS_CResult_LockedChannelMonitorNoneZ_err() { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_LockedChannelMonitorNoneZ_is_ok"))) TS_CResult_LockedChannelMonitorNoneZ_is_ok(uint32_t o) { - LDKCResult_LockedChannelMonitorNoneZ* o_conv = (LDKCResult_LockedChannelMonitorNoneZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_LockedChannelMonitorNoneZ_is_ok"))) TS_CResult_LockedChannelMonitorNoneZ_is_ok(uint64_t o) { + LDKCResult_LockedChannelMonitorNoneZ* o_conv = (LDKCResult_LockedChannelMonitorNoneZ*)untag_ptr(o); jboolean ret_conv = CResult_LockedChannelMonitorNoneZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_LockedChannelMonitorNoneZ_free"))) TS_CResult_LockedChannelMonitorNoneZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_LockedChannelMonitorNoneZ_free"))) TS_CResult_LockedChannelMonitorNoneZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_LockedChannelMonitorNoneZ _res_conv = *(LDKCResult_LockedChannelMonitorNoneZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_LockedChannelMonitorNoneZ_free(_res_conv); } -void __attribute__((export_name("TS_CVec_OutPointZ_free"))) TS_CVec_OutPointZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_OutPointZ_free"))) TS_CVec_OutPointZ_free(uint64_tArray _res) { LDKCVec_OutPointZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKOutPoint), "LDKCVec_OutPointZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t k = 0; k < _res_constr.datalen; k++) { - uint32_t _res_conv_10 = _res_vals[k]; + uint64_t _res_conv_10 = _res_vals[k]; LDKOutPoint _res_conv_10_conv; - _res_conv_10_conv.inner = (void*)(_res_conv_10 & (~1)); - _res_conv_10_conv.is_owned = (_res_conv_10 & 1) || (_res_conv_10 == 0); + _res_conv_10_conv.inner = untag_ptr(_res_conv_10); + _res_conv_10_conv.is_owned = ptr_is_owned(_res_conv_10); CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_10_conv); _res_constr.data[k] = _res_conv_10_conv; } @@ -20643,36 +19370,36 @@ void __attribute__((export_name("TS_CVec_OutPointZ_free"))) TS_CVec_OutPointZ_f CVec_OutPointZ_free(_res_constr); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_PaymentPurpose_free"))) TS_PaymentPurpose_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKPaymentPurpose this_ptr_conv = *(LDKPaymentPurpose*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); PaymentPurpose_free(this_ptr_conv); } -static inline uintptr_t PaymentPurpose_clone_ptr(LDKPaymentPurpose *NONNULL_PTR arg) { +static inline uint64_t PaymentPurpose_clone_ptr(LDKPaymentPurpose *NONNULL_PTR arg) { LDKPaymentPurpose *ret_copy = MALLOC(sizeof(LDKPaymentPurpose), "LDKPaymentPurpose"); *ret_copy = PaymentPurpose_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_PaymentPurpose_clone_ptr"))) TS_PaymentPurpose_clone_ptr(uint32_t arg) { - LDKPaymentPurpose* arg_conv = (LDKPaymentPurpose*)arg; - uint32_t ret_conv = PaymentPurpose_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_PaymentPurpose_clone_ptr"))) TS_PaymentPurpose_clone_ptr(uint64_t arg) { + LDKPaymentPurpose* arg_conv = (LDKPaymentPurpose*)untag_ptr(arg); + int64_t ret_conv = PaymentPurpose_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_PaymentPurpose_clone"))) TS_PaymentPurpose_clone(uint32_t orig) { - LDKPaymentPurpose* orig_conv = (LDKPaymentPurpose*)orig; +uint64_t __attribute__((export_name("TS_PaymentPurpose_clone"))) TS_PaymentPurpose_clone(uint64_t orig) { + LDKPaymentPurpose* orig_conv = (LDKPaymentPurpose*)untag_ptr(orig); LDKPaymentPurpose *ret_copy = MALLOC(sizeof(LDKPaymentPurpose), "LDKPaymentPurpose"); *ret_copy = PaymentPurpose_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_PaymentPurpose_invoice_payment"))) TS_PaymentPurpose_invoice_payment(int8_tArray payment_preimage, int8_tArray payment_secret) { +uint64_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); FREE(payment_preimage); @@ -20681,22 +19408,22 @@ uint32_t __attribute__((export_name("TS_PaymentPurpose_invoice_payment"))) TS_P 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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_PaymentPurpose_spontaneous_payment"))) TS_PaymentPurpose_spontaneous_payment(int8_tArray a) { +uint64_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); FREE(a); LDKPaymentPurpose *ret_copy = MALLOC(sizeof(LDKPaymentPurpose), "LDKPaymentPurpose"); *ret_copy = PaymentPurpose_spontaneous_payment(a_ref); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -int8_tArray __attribute__((export_name("TS_PaymentPurpose_write"))) TS_PaymentPurpose_write(uint32_t obj) { - LDKPaymentPurpose* obj_conv = (LDKPaymentPurpose*)obj; +int8_tArray __attribute__((export_name("TS_PaymentPurpose_write"))) TS_PaymentPurpose_write(uint64_t obj) { + LDKPaymentPurpose* obj_conv = (LDKPaymentPurpose*)untag_ptr(obj); LDKCVec_u8Z ret_var = PaymentPurpose_write(obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -20704,105 +19431,105 @@ int8_tArray __attribute__((export_name("TS_PaymentPurpose_write"))) TS_PaymentP return ret_arr; } -uint32_t __attribute__((export_name("TS_PaymentPurpose_read"))) TS_PaymentPurpose_read(int8_tArray ser) { +uint64_t __attribute__((export_name("TS_PaymentPurpose_read"))) TS_PaymentPurpose_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; ser_ref.data = ser->elems; LDKCResult_PaymentPurposeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentPurposeDecodeErrorZ), "LDKCResult_PaymentPurposeDecodeErrorZ"); *ret_conv = PaymentPurpose_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_ClosureReason_free"))) TS_ClosureReason_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKClosureReason this_ptr_conv = *(LDKClosureReason*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); ClosureReason_free(this_ptr_conv); } -static inline uintptr_t ClosureReason_clone_ptr(LDKClosureReason *NONNULL_PTR arg) { +static inline uint64_t ClosureReason_clone_ptr(LDKClosureReason *NONNULL_PTR arg) { LDKClosureReason *ret_copy = MALLOC(sizeof(LDKClosureReason), "LDKClosureReason"); *ret_copy = ClosureReason_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ClosureReason_clone_ptr"))) TS_ClosureReason_clone_ptr(uint32_t arg) { - LDKClosureReason* arg_conv = (LDKClosureReason*)arg; - uint32_t ret_conv = ClosureReason_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_ClosureReason_clone_ptr"))) TS_ClosureReason_clone_ptr(uint64_t arg) { + LDKClosureReason* arg_conv = (LDKClosureReason*)untag_ptr(arg); + int64_t ret_conv = ClosureReason_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ClosureReason_clone"))) TS_ClosureReason_clone(uint32_t orig) { - LDKClosureReason* orig_conv = (LDKClosureReason*)orig; +uint64_t __attribute__((export_name("TS_ClosureReason_clone"))) TS_ClosureReason_clone(uint64_t orig) { + LDKClosureReason* orig_conv = (LDKClosureReason*)untag_ptr(orig); LDKClosureReason *ret_copy = MALLOC(sizeof(LDKClosureReason), "LDKClosureReason"); *ret_copy = ClosureReason_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ClosureReason_counterparty_force_closed"))) TS_ClosureReason_counterparty_force_closed(jstring peer_msg) { +uint64_t __attribute__((export_name("TS_ClosureReason_counterparty_force_closed"))) TS_ClosureReason_counterparty_force_closed(jstring peer_msg) { 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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ClosureReason_holder_force_closed"))) TS_ClosureReason_holder_force_closed() { +uint64_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(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ClosureReason_cooperative_closure"))) TS_ClosureReason_cooperative_closure() { +uint64_t __attribute__((export_name("TS_ClosureReason_cooperative_closure"))) TS_ClosureReason_cooperative_closure() { LDKClosureReason *ret_copy = MALLOC(sizeof(LDKClosureReason), "LDKClosureReason"); *ret_copy = ClosureReason_cooperative_closure(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ClosureReason_commitment_tx_confirmed"))) TS_ClosureReason_commitment_tx_confirmed() { +uint64_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(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ClosureReason_funding_timed_out"))) TS_ClosureReason_funding_timed_out() { +uint64_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(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ClosureReason_processing_error"))) TS_ClosureReason_processing_error(jstring err) { +uint64_t __attribute__((export_name("TS_ClosureReason_processing_error"))) TS_ClosureReason_processing_error(jstring err) { LDKStr err_conv = str_ref_to_owned_c(err); LDKClosureReason *ret_copy = MALLOC(sizeof(LDKClosureReason), "LDKClosureReason"); *ret_copy = ClosureReason_processing_error(err_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ClosureReason_disconnected_peer"))) TS_ClosureReason_disconnected_peer() { +uint64_t __attribute__((export_name("TS_ClosureReason_disconnected_peer"))) TS_ClosureReason_disconnected_peer() { LDKClosureReason *ret_copy = MALLOC(sizeof(LDKClosureReason), "LDKClosureReason"); *ret_copy = ClosureReason_disconnected_peer(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ClosureReason_outdated_channel_manager"))) TS_ClosureReason_outdated_channel_manager() { +uint64_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(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -int8_tArray __attribute__((export_name("TS_ClosureReason_write"))) TS_ClosureReason_write(uint32_t obj) { - LDKClosureReason* obj_conv = (LDKClosureReason*)obj; +int8_tArray __attribute__((export_name("TS_ClosureReason_write"))) TS_ClosureReason_write(uint64_t obj) { + LDKClosureReason* obj_conv = (LDKClosureReason*)untag_ptr(obj); LDKCVec_u8Z ret_var = ClosureReason_write(obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -20810,46 +19537,46 @@ int8_tArray __attribute__((export_name("TS_ClosureReason_write"))) TS_ClosureRe return ret_arr; } -uint32_t __attribute__((export_name("TS_ClosureReason_read"))) TS_ClosureReason_read(int8_tArray ser) { +uint64_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; LDKCResult_COption_ClosureReasonZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_ClosureReasonZDecodeErrorZ), "LDKCResult_COption_ClosureReasonZDecodeErrorZ"); *ret_conv = ClosureReason_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_HTLCDestination_free"))) TS_HTLCDestination_free(uint32_t this_ptr) { - if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_HTLCDestination_free"))) TS_HTLCDestination_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKHTLCDestination this_ptr_conv = *(LDKHTLCDestination*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); HTLCDestination_free(this_ptr_conv); } -static inline uintptr_t HTLCDestination_clone_ptr(LDKHTLCDestination *NONNULL_PTR arg) { +static inline uint64_t HTLCDestination_clone_ptr(LDKHTLCDestination *NONNULL_PTR arg) { LDKHTLCDestination *ret_copy = MALLOC(sizeof(LDKHTLCDestination), "LDKHTLCDestination"); *ret_copy = HTLCDestination_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_HTLCDestination_clone_ptr"))) TS_HTLCDestination_clone_ptr(uint32_t arg) { - LDKHTLCDestination* arg_conv = (LDKHTLCDestination*)arg; - uint32_t ret_conv = HTLCDestination_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_HTLCDestination_clone_ptr"))) TS_HTLCDestination_clone_ptr(uint64_t arg) { + LDKHTLCDestination* arg_conv = (LDKHTLCDestination*)untag_ptr(arg); + int64_t ret_conv = HTLCDestination_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_HTLCDestination_clone"))) TS_HTLCDestination_clone(uint32_t orig) { - LDKHTLCDestination* orig_conv = (LDKHTLCDestination*)orig; +uint64_t __attribute__((export_name("TS_HTLCDestination_clone"))) TS_HTLCDestination_clone(uint64_t orig) { + LDKHTLCDestination* orig_conv = (LDKHTLCDestination*)untag_ptr(orig); LDKHTLCDestination *ret_copy = MALLOC(sizeof(LDKHTLCDestination), "LDKHTLCDestination"); *ret_copy = HTLCDestination_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_HTLCDestination_next_hop_channel"))) TS_HTLCDestination_next_hop_channel(int8_tArray node_id, int8_tArray channel_id) { +uint64_t __attribute__((export_name("TS_HTLCDestination_next_hop_channel"))) TS_HTLCDestination_next_hop_channel(int8_tArray node_id, int8_tArray channel_id) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 33); memcpy(node_id_ref.compressed_form, node_id->elems, 33); FREE(node_id); @@ -20858,29 +19585,29 @@ uint32_t __attribute__((export_name("TS_HTLCDestination_next_hop_channel"))) TS memcpy(channel_id_ref.data, channel_id->elems, 32); FREE(channel_id); LDKHTLCDestination *ret_copy = MALLOC(sizeof(LDKHTLCDestination), "LDKHTLCDestination"); *ret_copy = HTLCDestination_next_hop_channel(node_id_ref, channel_id_ref); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_HTLCDestination_unknown_next_hop"))) TS_HTLCDestination_unknown_next_hop(int64_t requested_forward_scid) { +uint64_t __attribute__((export_name("TS_HTLCDestination_unknown_next_hop"))) TS_HTLCDestination_unknown_next_hop(int64_t requested_forward_scid) { LDKHTLCDestination *ret_copy = MALLOC(sizeof(LDKHTLCDestination), "LDKHTLCDestination"); *ret_copy = HTLCDestination_unknown_next_hop(requested_forward_scid); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_HTLCDestination_failed_payment"))) TS_HTLCDestination_failed_payment(int8_tArray payment_hash) { +uint64_t __attribute__((export_name("TS_HTLCDestination_failed_payment"))) TS_HTLCDestination_failed_payment(int8_tArray payment_hash) { LDKThirtyTwoBytes payment_hash_ref; CHECK(payment_hash->arr_len == 32); memcpy(payment_hash_ref.data, payment_hash->elems, 32); FREE(payment_hash); LDKHTLCDestination *ret_copy = MALLOC(sizeof(LDKHTLCDestination), "LDKHTLCDestination"); *ret_copy = HTLCDestination_failed_payment(payment_hash_ref); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -int8_tArray __attribute__((export_name("TS_HTLCDestination_write"))) TS_HTLCDestination_write(uint32_t obj) { - LDKHTLCDestination* obj_conv = (LDKHTLCDestination*)obj; +int8_tArray __attribute__((export_name("TS_HTLCDestination_write"))) TS_HTLCDestination_write(uint64_t obj) { + LDKHTLCDestination* obj_conv = (LDKHTLCDestination*)untag_ptr(obj); LDKCVec_u8Z ret_var = HTLCDestination_write(obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -20888,46 +19615,46 @@ int8_tArray __attribute__((export_name("TS_HTLCDestination_write"))) TS_HTLCDes return ret_arr; } -uint32_t __attribute__((export_name("TS_HTLCDestination_read"))) TS_HTLCDestination_read(int8_tArray ser) { +uint64_t __attribute__((export_name("TS_HTLCDestination_read"))) TS_HTLCDestination_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; ser_ref.data = ser->elems; LDKCResult_COption_HTLCDestinationZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_HTLCDestinationZDecodeErrorZ), "LDKCResult_COption_HTLCDestinationZDecodeErrorZ"); *ret_conv = HTLCDestination_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_Event_free"))) TS_Event_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKEvent this_ptr_conv = *(LDKEvent*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); Event_free(this_ptr_conv); } -static inline uintptr_t Event_clone_ptr(LDKEvent *NONNULL_PTR arg) { +static inline uint64_t Event_clone_ptr(LDKEvent *NONNULL_PTR arg) { LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Event_clone_ptr"))) TS_Event_clone_ptr(uint32_t arg) { - LDKEvent* arg_conv = (LDKEvent*)arg; - uint32_t ret_conv = Event_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_Event_clone_ptr"))) TS_Event_clone_ptr(uint64_t arg) { + LDKEvent* arg_conv = (LDKEvent*)untag_ptr(arg); + int64_t ret_conv = Event_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_Event_clone"))) TS_Event_clone(uint32_t orig) { - LDKEvent* orig_conv = (LDKEvent*)orig; +uint64_t __attribute__((export_name("TS_Event_clone"))) TS_Event_clone(uint64_t orig) { + LDKEvent* orig_conv = (LDKEvent*)untag_ptr(orig); LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Event_funding_generation_ready"))) TS_Event_funding_generation_ready(int8_tArray temporary_channel_id, int8_tArray counterparty_node_id, int64_t channel_value_satoshis, int8_tArray output_script, int64_t user_channel_id) { +uint64_t __attribute__((export_name("TS_Event_funding_generation_ready"))) TS_Event_funding_generation_ready(int8_tArray temporary_channel_id, int8_tArray counterparty_node_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); FREE(temporary_channel_id); @@ -20940,39 +19667,39 @@ uint32_t __attribute__((export_name("TS_Event_funding_generation_ready"))) TS_E 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, counterparty_node_id_ref, channel_value_satoshis, output_script_ref, user_channel_id); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Event_payment_received"))) TS_Event_payment_received(int8_tArray payment_hash, int64_t amount_msat, uint32_t purpose) { +uint64_t __attribute__((export_name("TS_Event_payment_received"))) TS_Event_payment_received(int8_tArray payment_hash, int64_t amount_msat, uint64_t purpose) { LDKThirtyTwoBytes payment_hash_ref; CHECK(payment_hash->arr_len == 32); memcpy(payment_hash_ref.data, payment_hash->elems, 32); FREE(payment_hash); - void* purpose_ptr = (void*)(((uintptr_t)purpose) & ~1); + void* purpose_ptr = untag_ptr(purpose); CHECK_ACCESS(purpose_ptr); LDKPaymentPurpose purpose_conv = *(LDKPaymentPurpose*)(purpose_ptr); - purpose_conv = PaymentPurpose_clone((LDKPaymentPurpose*)(((uintptr_t)purpose) & ~1)); + purpose_conv = PaymentPurpose_clone((LDKPaymentPurpose*)untag_ptr(purpose)); LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_payment_received(payment_hash_ref, amount_msat, purpose_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Event_payment_claimed"))) TS_Event_payment_claimed(int8_tArray payment_hash, int64_t amount_msat, uint32_t purpose) { +uint64_t __attribute__((export_name("TS_Event_payment_claimed"))) TS_Event_payment_claimed(int8_tArray payment_hash, int64_t amount_msat, uint64_t purpose) { LDKThirtyTwoBytes payment_hash_ref; CHECK(payment_hash->arr_len == 32); memcpy(payment_hash_ref.data, payment_hash->elems, 32); FREE(payment_hash); - void* purpose_ptr = (void*)(((uintptr_t)purpose) & ~1); + void* purpose_ptr = untag_ptr(purpose); CHECK_ACCESS(purpose_ptr); LDKPaymentPurpose purpose_conv = *(LDKPaymentPurpose*)(purpose_ptr); - purpose_conv = PaymentPurpose_clone((LDKPaymentPurpose*)(((uintptr_t)purpose) & ~1)); + purpose_conv = PaymentPurpose_clone((LDKPaymentPurpose*)untag_ptr(purpose)); LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_payment_claimed(payment_hash_ref, amount_msat, purpose_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_t __attribute__((export_name("TS_Event_payment_sent"))) TS_Event_payment_sent(int8_tArray payment_id, int8_tArray payment_preimage, int8_tArray payment_hash, uint64_t fee_paid_msat) { LDKThirtyTwoBytes payment_id_ref; CHECK(payment_id->arr_len == 32); memcpy(payment_id_ref.data, payment_id->elems, 32); FREE(payment_id); @@ -20982,17 +19709,17 @@ uint32_t __attribute__((export_name("TS_Event_payment_sent"))) TS_Event_payment LDKThirtyTwoBytes payment_hash_ref; CHECK(payment_hash->arr_len == 32); memcpy(payment_hash_ref.data, payment_hash->elems, 32); FREE(payment_hash); - void* fee_paid_msat_ptr = (void*)(((uintptr_t)fee_paid_msat) & ~1); + void* fee_paid_msat_ptr = untag_ptr(fee_paid_msat); 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*)(((uintptr_t)fee_paid_msat) & ~1)); + fee_paid_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(fee_paid_msat)); 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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Event_payment_failed"))) TS_Event_payment_failed(int8_tArray payment_id, int8_tArray payment_hash) { +uint64_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); FREE(payment_id); @@ -21001,11 +19728,11 @@ uint32_t __attribute__((export_name("TS_Event_payment_failed"))) TS_Event_payme 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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_t __attribute__((export_name("TS_Event_payment_path_successful"))) TS_Event_payment_path_successful(int8_tArray payment_id, int8_tArray payment_hash, uint64_tArray path) { LDKThirtyTwoBytes payment_id_ref; CHECK(payment_id->arr_len == 32); memcpy(payment_id_ref.data, payment_id->elems, 32); FREE(payment_id); @@ -21018,12 +19745,12 @@ uint32_t __attribute__((export_name("TS_Event_payment_path_successful"))) TS_Ev path_constr.data = MALLOC(path_constr.datalen * sizeof(LDKRouteHop), "LDKCVec_RouteHopZ Elements"); else path_constr.data = NULL; - uint32_t* path_vals = path->elems; + uint64_t* path_vals = path->elems; for (size_t k = 0; k < path_constr.datalen; k++) { - uint32_t path_conv_10 = path_vals[k]; + uint64_t path_conv_10 = path_vals[k]; LDKRouteHop path_conv_10_conv; - path_conv_10_conv.inner = (void*)(path_conv_10 & (~1)); - path_conv_10_conv.is_owned = (path_conv_10 & 1) || (path_conv_10 == 0); + path_conv_10_conv.inner = untag_ptr(path_conv_10); + path_conv_10_conv.is_owned = ptr_is_owned(path_conv_10); CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_conv); path_conv_10_conv = RouteHop_clone(&path_conv_10_conv); path_constr.data[k] = path_conv_10_conv; @@ -21031,54 +19758,54 @@ uint32_t __attribute__((export_name("TS_Event_payment_path_successful"))) TS_Ev FREE(path); LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_payment_path_successful(payment_id_ref, payment_hash_ref, path_constr); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_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, uint64_t network_update, jboolean all_paths_failed, uint64_tArray path, uint64_t short_channel_id, uint64_t retry) { LDKThirtyTwoBytes payment_id_ref; CHECK(payment_id->arr_len == 32); memcpy(payment_id_ref.data, payment_id->elems, 32); FREE(payment_id); LDKThirtyTwoBytes payment_hash_ref; CHECK(payment_hash->arr_len == 32); memcpy(payment_hash_ref.data, payment_hash->elems, 32); FREE(payment_hash); - void* network_update_ptr = (void*)(((uintptr_t)network_update) & ~1); + void* network_update_ptr = untag_ptr(network_update); CHECK_ACCESS(network_update_ptr); LDKCOption_NetworkUpdateZ network_update_conv = *(LDKCOption_NetworkUpdateZ*)(network_update_ptr); - network_update_conv = COption_NetworkUpdateZ_clone((LDKCOption_NetworkUpdateZ*)(((uintptr_t)network_update) & ~1)); + network_update_conv = COption_NetworkUpdateZ_clone((LDKCOption_NetworkUpdateZ*)untag_ptr(network_update)); 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; + uint64_t* path_vals = path->elems; for (size_t k = 0; k < path_constr.datalen; k++) { - uint32_t path_conv_10 = path_vals[k]; + uint64_t path_conv_10 = path_vals[k]; LDKRouteHop path_conv_10_conv; - path_conv_10_conv.inner = (void*)(path_conv_10 & (~1)); - path_conv_10_conv.is_owned = (path_conv_10 & 1) || (path_conv_10 == 0); + path_conv_10_conv.inner = untag_ptr(path_conv_10); + path_conv_10_conv.is_owned = ptr_is_owned(path_conv_10); CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_conv); path_conv_10_conv = RouteHop_clone(&path_conv_10_conv); path_constr.data[k] = path_conv_10_conv; } FREE(path); - void* short_channel_id_ptr = (void*)(((uintptr_t)short_channel_id) & ~1); + void* short_channel_id_ptr = untag_ptr(short_channel_id); CHECK_ACCESS(short_channel_id_ptr); LDKCOption_u64Z short_channel_id_conv = *(LDKCOption_u64Z*)(short_channel_id_ptr); - short_channel_id_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)short_channel_id) & ~1)); + short_channel_id_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(short_channel_id)); LDKRouteParameters retry_conv; - retry_conv.inner = (void*)(retry & (~1)); - retry_conv.is_owned = (retry & 1) || (retry == 0); + retry_conv.inner = untag_ptr(retry); + retry_conv.is_owned = ptr_is_owned(retry); CHECK_INNER_FIELD_ACCESS_OR_NULL(retry_conv); 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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Event_probe_successful"))) TS_Event_probe_successful(int8_tArray payment_id, int8_tArray payment_hash, uint32_tArray path) { +uint64_t __attribute__((export_name("TS_Event_probe_successful"))) TS_Event_probe_successful(int8_tArray payment_id, int8_tArray payment_hash, uint64_tArray path) { LDKThirtyTwoBytes payment_id_ref; CHECK(payment_id->arr_len == 32); memcpy(payment_id_ref.data, payment_id->elems, 32); FREE(payment_id); @@ -21091,12 +19818,12 @@ uint32_t __attribute__((export_name("TS_Event_probe_successful"))) TS_Event_pro path_constr.data = MALLOC(path_constr.datalen * sizeof(LDKRouteHop), "LDKCVec_RouteHopZ Elements"); else path_constr.data = NULL; - uint32_t* path_vals = path->elems; + uint64_t* path_vals = path->elems; for (size_t k = 0; k < path_constr.datalen; k++) { - uint32_t path_conv_10 = path_vals[k]; + uint64_t path_conv_10 = path_vals[k]; LDKRouteHop path_conv_10_conv; - path_conv_10_conv.inner = (void*)(path_conv_10 & (~1)); - path_conv_10_conv.is_owned = (path_conv_10 & 1) || (path_conv_10 == 0); + path_conv_10_conv.inner = untag_ptr(path_conv_10); + path_conv_10_conv.is_owned = ptr_is_owned(path_conv_10); CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_conv); path_conv_10_conv = RouteHop_clone(&path_conv_10_conv); path_constr.data[k] = path_conv_10_conv; @@ -21104,11 +19831,11 @@ uint32_t __attribute__((export_name("TS_Event_probe_successful"))) TS_Event_pro FREE(path); LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_probe_successful(payment_id_ref, payment_hash_ref, path_constr); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Event_probe_failed"))) TS_Event_probe_failed(int8_tArray payment_id, int8_tArray payment_hash, uint32_tArray path, uint32_t short_channel_id) { +uint64_t __attribute__((export_name("TS_Event_probe_failed"))) TS_Event_probe_failed(int8_tArray payment_id, int8_tArray payment_hash, uint64_tArray path, uint64_t short_channel_id) { LDKThirtyTwoBytes payment_id_ref; CHECK(payment_id->arr_len == 32); memcpy(payment_id_ref.data, payment_id->elems, 32); FREE(payment_id); @@ -21121,89 +19848,89 @@ uint32_t __attribute__((export_name("TS_Event_probe_failed"))) TS_Event_probe_f path_constr.data = MALLOC(path_constr.datalen * sizeof(LDKRouteHop), "LDKCVec_RouteHopZ Elements"); else path_constr.data = NULL; - uint32_t* path_vals = path->elems; + uint64_t* path_vals = path->elems; for (size_t k = 0; k < path_constr.datalen; k++) { - uint32_t path_conv_10 = path_vals[k]; + uint64_t path_conv_10 = path_vals[k]; LDKRouteHop path_conv_10_conv; - path_conv_10_conv.inner = (void*)(path_conv_10 & (~1)); - path_conv_10_conv.is_owned = (path_conv_10 & 1) || (path_conv_10 == 0); + path_conv_10_conv.inner = untag_ptr(path_conv_10); + path_conv_10_conv.is_owned = ptr_is_owned(path_conv_10); CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_conv); path_conv_10_conv = RouteHop_clone(&path_conv_10_conv); path_constr.data[k] = path_conv_10_conv; } FREE(path); - void* short_channel_id_ptr = (void*)(((uintptr_t)short_channel_id) & ~1); + void* short_channel_id_ptr = untag_ptr(short_channel_id); CHECK_ACCESS(short_channel_id_ptr); LDKCOption_u64Z short_channel_id_conv = *(LDKCOption_u64Z*)(short_channel_id_ptr); - short_channel_id_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)short_channel_id) & ~1)); + short_channel_id_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(short_channel_id)); LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_probe_failed(payment_id_ref, payment_hash_ref, path_constr, short_channel_id_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Event_pending_htlcs_forwardable"))) TS_Event_pending_htlcs_forwardable(int64_t time_forwardable) { +uint64_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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Event_spendable_outputs"))) TS_Event_spendable_outputs(uint32_tArray outputs) { +uint64_t __attribute__((export_name("TS_Event_spendable_outputs"))) TS_Event_spendable_outputs(uint64_tArray outputs) { LDKCVec_SpendableOutputDescriptorZ outputs_constr; outputs_constr.datalen = outputs->arr_len; if (outputs_constr.datalen > 0) outputs_constr.data = MALLOC(outputs_constr.datalen * sizeof(LDKSpendableOutputDescriptor), "LDKCVec_SpendableOutputDescriptorZ Elements"); else outputs_constr.data = NULL; - uint32_t* outputs_vals = outputs->elems; + uint64_t* outputs_vals = outputs->elems; for (size_t b = 0; b < outputs_constr.datalen; b++) { - uint32_t outputs_conv_27 = outputs_vals[b]; - void* outputs_conv_27_ptr = (void*)(((uintptr_t)outputs_conv_27) & ~1); + uint64_t outputs_conv_27 = outputs_vals[b]; + void* outputs_conv_27_ptr = untag_ptr(outputs_conv_27); CHECK_ACCESS(outputs_conv_27_ptr); LDKSpendableOutputDescriptor outputs_conv_27_conv = *(LDKSpendableOutputDescriptor*)(outputs_conv_27_ptr); - outputs_conv_27_conv = SpendableOutputDescriptor_clone((LDKSpendableOutputDescriptor*)(((uintptr_t)outputs_conv_27) & ~1)); + outputs_conv_27_conv = SpendableOutputDescriptor_clone((LDKSpendableOutputDescriptor*)untag_ptr(outputs_conv_27)); outputs_constr.data[b] = outputs_conv_27_conv; } FREE(outputs); LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_spendable_outputs(outputs_constr); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Event_payment_forwarded"))) TS_Event_payment_forwarded(int8_tArray prev_channel_id, int8_tArray next_channel_id, uint32_t fee_earned_msat, jboolean claim_from_onchain_tx) { +uint64_t __attribute__((export_name("TS_Event_payment_forwarded"))) TS_Event_payment_forwarded(int8_tArray prev_channel_id, int8_tArray next_channel_id, uint64_t fee_earned_msat, jboolean claim_from_onchain_tx) { LDKThirtyTwoBytes prev_channel_id_ref; CHECK(prev_channel_id->arr_len == 32); memcpy(prev_channel_id_ref.data, prev_channel_id->elems, 32); FREE(prev_channel_id); LDKThirtyTwoBytes next_channel_id_ref; CHECK(next_channel_id->arr_len == 32); memcpy(next_channel_id_ref.data, next_channel_id->elems, 32); FREE(next_channel_id); - void* fee_earned_msat_ptr = (void*)(((uintptr_t)fee_earned_msat) & ~1); + void* fee_earned_msat_ptr = untag_ptr(fee_earned_msat); 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*)(((uintptr_t)fee_earned_msat) & ~1)); + fee_earned_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(fee_earned_msat)); LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_payment_forwarded(prev_channel_id_ref, next_channel_id_ref, fee_earned_msat_conv, claim_from_onchain_tx); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_t __attribute__((export_name("TS_Event_channel_closed"))) TS_Event_channel_closed(int8_tArray channel_id, int64_t user_channel_id, uint64_t reason) { LDKThirtyTwoBytes channel_id_ref; CHECK(channel_id->arr_len == 32); memcpy(channel_id_ref.data, channel_id->elems, 32); FREE(channel_id); - void* reason_ptr = (void*)(((uintptr_t)reason) & ~1); + void* reason_ptr = untag_ptr(reason); CHECK_ACCESS(reason_ptr); LDKClosureReason reason_conv = *(LDKClosureReason*)(reason_ptr); - reason_conv = ClosureReason_clone((LDKClosureReason*)(((uintptr_t)reason) & ~1)); + reason_conv = ClosureReason_clone((LDKClosureReason*)untag_ptr(reason)); LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_channel_closed(channel_id_ref, user_channel_id, reason_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Event_discard_funding"))) TS_Event_discard_funding(int8_tArray channel_id, int8_tArray transaction) { +uint64_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); FREE(channel_id); @@ -21214,11 +19941,11 @@ uint32_t __attribute__((export_name("TS_Event_discard_funding"))) TS_Event_disc transaction_ref.data_is_owned = true; LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_discard_funding(channel_id_ref, transaction_ref); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Event_open_channel_request"))) TS_Event_open_channel_request(int8_tArray temporary_channel_id, int8_tArray counterparty_node_id, int64_t funding_satoshis, int64_t push_msat, uint32_t channel_type) { +uint64_t __attribute__((export_name("TS_Event_open_channel_request"))) TS_Event_open_channel_request(int8_tArray temporary_channel_id, int8_tArray counterparty_node_id, int64_t funding_satoshis, int64_t push_msat, uint64_t channel_type) { LDKThirtyTwoBytes temporary_channel_id_ref; CHECK(temporary_channel_id->arr_len == 32); memcpy(temporary_channel_id_ref.data, temporary_channel_id->elems, 32); FREE(temporary_channel_id); @@ -21226,32 +19953,32 @@ uint32_t __attribute__((export_name("TS_Event_open_channel_request"))) TS_Event CHECK(counterparty_node_id->arr_len == 33); memcpy(counterparty_node_id_ref.compressed_form, counterparty_node_id->elems, 33); FREE(counterparty_node_id); LDKChannelTypeFeatures channel_type_conv; - channel_type_conv.inner = (void*)(channel_type & (~1)); - channel_type_conv.is_owned = (channel_type & 1) || (channel_type == 0); + channel_type_conv.inner = untag_ptr(channel_type); + channel_type_conv.is_owned = ptr_is_owned(channel_type); CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_type_conv); channel_type_conv = ChannelTypeFeatures_clone(&channel_type_conv); LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_open_channel_request(temporary_channel_id_ref, counterparty_node_id_ref, funding_satoshis, push_msat, channel_type_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Event_htlchandling_failed"))) TS_Event_htlchandling_failed(int8_tArray prev_channel_id, uint32_t failed_next_destination) { +uint64_t __attribute__((export_name("TS_Event_htlchandling_failed"))) TS_Event_htlchandling_failed(int8_tArray prev_channel_id, uint64_t failed_next_destination) { LDKThirtyTwoBytes prev_channel_id_ref; CHECK(prev_channel_id->arr_len == 32); memcpy(prev_channel_id_ref.data, prev_channel_id->elems, 32); FREE(prev_channel_id); - void* failed_next_destination_ptr = (void*)(((uintptr_t)failed_next_destination) & ~1); + void* failed_next_destination_ptr = untag_ptr(failed_next_destination); CHECK_ACCESS(failed_next_destination_ptr); LDKHTLCDestination failed_next_destination_conv = *(LDKHTLCDestination*)(failed_next_destination_ptr); - failed_next_destination_conv = HTLCDestination_clone((LDKHTLCDestination*)(((uintptr_t)failed_next_destination) & ~1)); + failed_next_destination_conv = HTLCDestination_clone((LDKHTLCDestination*)untag_ptr(failed_next_destination)); LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_htlchandling_failed(prev_channel_id_ref, failed_next_destination_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -int8_tArray __attribute__((export_name("TS_Event_write"))) TS_Event_write(uint32_t obj) { - LDKEvent* obj_conv = (LDKEvent*)obj; +int8_tArray __attribute__((export_name("TS_Event_write"))) TS_Event_write(uint64_t obj) { + LDKEvent* obj_conv = (LDKEvent*)untag_ptr(obj); LDKCVec_u8Z ret_var = Event_write(obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -21259,541 +19986,531 @@ int8_tArray __attribute__((export_name("TS_Event_write"))) TS_Event_write(uint3 return ret_arr; } -uint32_t __attribute__((export_name("TS_Event_read"))) TS_Event_read(int8_tArray ser) { +uint64_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; LDKCResult_COption_EventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_EventZDecodeErrorZ), "LDKCResult_COption_EventZDecodeErrorZ"); *ret_conv = Event_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_MessageSendEvent_free"))) TS_MessageSendEvent_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKMessageSendEvent this_ptr_conv = *(LDKMessageSendEvent*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); MessageSendEvent_free(this_ptr_conv); } -static inline uintptr_t MessageSendEvent_clone_ptr(LDKMessageSendEvent *NONNULL_PTR arg) { +static inline uint64_t MessageSendEvent_clone_ptr(LDKMessageSendEvent *NONNULL_PTR arg) { LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_MessageSendEvent_clone_ptr"))) TS_MessageSendEvent_clone_ptr(uint32_t arg) { - LDKMessageSendEvent* arg_conv = (LDKMessageSendEvent*)arg; - uint32_t ret_conv = MessageSendEvent_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_MessageSendEvent_clone_ptr"))) TS_MessageSendEvent_clone_ptr(uint64_t arg) { + LDKMessageSendEvent* arg_conv = (LDKMessageSendEvent*)untag_ptr(arg); + int64_t ret_conv = MessageSendEvent_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_MessageSendEvent_clone"))) TS_MessageSendEvent_clone(uint32_t orig) { - LDKMessageSendEvent* orig_conv = (LDKMessageSendEvent*)orig; +uint64_t __attribute__((export_name("TS_MessageSendEvent_clone"))) TS_MessageSendEvent_clone(uint64_t orig) { + LDKMessageSendEvent* orig_conv = (LDKMessageSendEvent*)untag_ptr(orig); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_t __attribute__((export_name("TS_MessageSendEvent_send_accept_channel"))) TS_MessageSendEvent_send_accept_channel(int8_tArray node_id, uint64_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 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); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = AcceptChannel_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_send_accept_channel(node_id_ref, msg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_t __attribute__((export_name("TS_MessageSendEvent_send_open_channel"))) TS_MessageSendEvent_send_open_channel(int8_tArray node_id, uint64_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 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); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = OpenChannel_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_send_open_channel(node_id_ref, msg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_t __attribute__((export_name("TS_MessageSendEvent_send_funding_created"))) TS_MessageSendEvent_send_funding_created(int8_tArray node_id, uint64_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 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); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = FundingCreated_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_send_funding_created(node_id_ref, msg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_t __attribute__((export_name("TS_MessageSendEvent_send_funding_signed"))) TS_MessageSendEvent_send_funding_signed(int8_tArray node_id, uint64_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 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); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = FundingSigned_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_send_funding_signed(node_id_ref, msg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_MessageSendEvent_send_channel_ready"))) TS_MessageSendEvent_send_channel_ready(int8_tArray node_id, uint32_t msg) { +uint64_t __attribute__((export_name("TS_MessageSendEvent_send_channel_ready"))) TS_MessageSendEvent_send_channel_ready(int8_tArray node_id, uint64_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 33); memcpy(node_id_ref.compressed_form, node_id->elems, 33); FREE(node_id); LDKChannelReady msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = (msg & 1) || (msg == 0); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = ChannelReady_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_send_channel_ready(node_id_ref, msg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_t __attribute__((export_name("TS_MessageSendEvent_send_announcement_signatures"))) TS_MessageSendEvent_send_announcement_signatures(int8_tArray node_id, uint64_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 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); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = AnnouncementSignatures_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_send_announcement_signatures(node_id_ref, msg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_MessageSendEvent_update_htlcs"))) TS_MessageSendEvent_update_htlcs(int8_tArray node_id, uint32_t updates) { +uint64_t __attribute__((export_name("TS_MessageSendEvent_update_htlcs"))) TS_MessageSendEvent_update_htlcs(int8_tArray node_id, uint64_t updates) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 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); + updates_conv.inner = untag_ptr(updates); + updates_conv.is_owned = ptr_is_owned(updates); CHECK_INNER_FIELD_ACCESS_OR_NULL(updates_conv); updates_conv = CommitmentUpdate_clone(&updates_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_update_htlcs(node_id_ref, updates_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_t __attribute__((export_name("TS_MessageSendEvent_send_revoke_and_ack"))) TS_MessageSendEvent_send_revoke_and_ack(int8_tArray node_id, uint64_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 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); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); 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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_t __attribute__((export_name("TS_MessageSendEvent_send_closing_signed"))) TS_MessageSendEvent_send_closing_signed(int8_tArray node_id, uint64_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 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); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = ClosingSigned_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_send_closing_signed(node_id_ref, msg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_MessageSendEvent_send_shutdown"))) TS_MessageSendEvent_send_shutdown(int8_tArray node_id, uint32_t msg) { +uint64_t __attribute__((export_name("TS_MessageSendEvent_send_shutdown"))) TS_MessageSendEvent_send_shutdown(int8_tArray node_id, uint64_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 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); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = Shutdown_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_send_shutdown(node_id_ref, msg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_t __attribute__((export_name("TS_MessageSendEvent_send_channel_reestablish"))) TS_MessageSendEvent_send_channel_reestablish(int8_tArray node_id, uint64_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 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); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = ChannelReestablish_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_send_channel_reestablish(node_id_ref, msg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_MessageSendEvent_broadcast_channel_announcement"))) TS_MessageSendEvent_broadcast_channel_announcement(uint32_t msg, uint32_t update_msg) { +uint64_t __attribute__((export_name("TS_MessageSendEvent_broadcast_channel_announcement"))) TS_MessageSendEvent_broadcast_channel_announcement(uint64_t msg, uint64_t update_msg) { LDKChannelAnnouncement msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = (msg & 1) || (msg == 0); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = ChannelAnnouncement_clone(&msg_conv); LDKChannelUpdate update_msg_conv; - update_msg_conv.inner = (void*)(update_msg & (~1)); - update_msg_conv.is_owned = (update_msg & 1) || (update_msg == 0); + update_msg_conv.inner = untag_ptr(update_msg); + update_msg_conv.is_owned = ptr_is_owned(update_msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(update_msg_conv); 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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_MessageSendEvent_broadcast_node_announcement"))) TS_MessageSendEvent_broadcast_node_announcement(uint32_t msg) { +uint64_t __attribute__((export_name("TS_MessageSendEvent_broadcast_node_announcement"))) TS_MessageSendEvent_broadcast_node_announcement(uint64_t msg) { LDKNodeAnnouncement msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = (msg & 1) || (msg == 0); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = NodeAnnouncement_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_broadcast_node_announcement(msg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_MessageSendEvent_broadcast_channel_update"))) TS_MessageSendEvent_broadcast_channel_update(uint32_t msg) { +uint64_t __attribute__((export_name("TS_MessageSendEvent_broadcast_channel_update"))) TS_MessageSendEvent_broadcast_channel_update(uint64_t msg) { LDKChannelUpdate msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = (msg & 1) || (msg == 0); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = ChannelUpdate_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_broadcast_channel_update(msg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_t __attribute__((export_name("TS_MessageSendEvent_send_channel_update"))) TS_MessageSendEvent_send_channel_update(int8_tArray node_id, uint64_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 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); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = ChannelUpdate_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_send_channel_update(node_id_ref, msg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_MessageSendEvent_handle_error"))) TS_MessageSendEvent_handle_error(int8_tArray node_id, uint32_t action) { +uint64_t __attribute__((export_name("TS_MessageSendEvent_handle_error"))) TS_MessageSendEvent_handle_error(int8_tArray node_id, uint64_t action) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 33); memcpy(node_id_ref.compressed_form, node_id->elems, 33); FREE(node_id); - void* action_ptr = (void*)(((uintptr_t)action) & ~1); + void* action_ptr = untag_ptr(action); CHECK_ACCESS(action_ptr); LDKErrorAction action_conv = *(LDKErrorAction*)(action_ptr); - action_conv = ErrorAction_clone((LDKErrorAction*)(((uintptr_t)action) & ~1)); + action_conv = ErrorAction_clone((LDKErrorAction*)untag_ptr(action)); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_handle_error(node_id_ref, action_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_t __attribute__((export_name("TS_MessageSendEvent_send_channel_range_query"))) TS_MessageSendEvent_send_channel_range_query(int8_tArray node_id, uint64_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 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); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); 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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_t __attribute__((export_name("TS_MessageSendEvent_send_short_ids_query"))) TS_MessageSendEvent_send_short_ids_query(int8_tArray node_id, uint64_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 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); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); 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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_t __attribute__((export_name("TS_MessageSendEvent_send_reply_channel_range"))) TS_MessageSendEvent_send_reply_channel_range(int8_tArray node_id, uint64_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 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); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); 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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_MessageSendEvent_send_gossip_timestamp_filter"))) TS_MessageSendEvent_send_gossip_timestamp_filter(int8_tArray node_id, uint32_t msg) { +uint64_t __attribute__((export_name("TS_MessageSendEvent_send_gossip_timestamp_filter"))) TS_MessageSendEvent_send_gossip_timestamp_filter(int8_tArray node_id, uint64_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 33); memcpy(node_id_ref.compressed_form, node_id->elems, 33); FREE(node_id); LDKGossipTimestampFilter msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = (msg & 1) || (msg == 0); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = GossipTimestampFilter_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_send_gossip_timestamp_filter(node_id_ref, msg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_MessageSendEventsProvider_free"))) TS_MessageSendEventsProvider_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKMessageSendEventsProvider this_ptr_conv = *(LDKMessageSendEventsProvider*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); MessageSendEventsProvider_free(this_ptr_conv); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_EventsProvider_free"))) TS_EventsProvider_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKEventsProvider this_ptr_conv = *(LDKEventsProvider*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); EventsProvider_free(this_ptr_conv); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_EventHandler_free"))) TS_EventHandler_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKEventHandler this_ptr_conv = *(LDKEventHandler*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); EventHandler_free(this_ptr_conv); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_APIError_free"))) TS_APIError_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKAPIError this_ptr_conv = *(LDKAPIError*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); APIError_free(this_ptr_conv); } -static inline uintptr_t APIError_clone_ptr(LDKAPIError *NONNULL_PTR arg) { +static inline uint64_t APIError_clone_ptr(LDKAPIError *NONNULL_PTR arg) { LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError"); *ret_copy = APIError_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_APIError_clone_ptr"))) TS_APIError_clone_ptr(uint32_t arg) { - LDKAPIError* arg_conv = (LDKAPIError*)arg; - uint32_t ret_conv = APIError_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_APIError_clone_ptr"))) TS_APIError_clone_ptr(uint64_t arg) { + LDKAPIError* arg_conv = (LDKAPIError*)untag_ptr(arg); + int64_t ret_conv = APIError_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_APIError_clone"))) TS_APIError_clone(uint32_t orig) { - LDKAPIError* orig_conv = (LDKAPIError*)orig; +uint64_t __attribute__((export_name("TS_APIError_clone"))) TS_APIError_clone(uint64_t orig) { + LDKAPIError* orig_conv = (LDKAPIError*)untag_ptr(orig); LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError"); *ret_copy = APIError_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_APIError_apimisuse_error"))) TS_APIError_apimisuse_error(jstring err) { +uint64_t __attribute__((export_name("TS_APIError_apimisuse_error"))) TS_APIError_apimisuse_error(jstring err) { LDKStr err_conv = str_ref_to_owned_c(err); LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError"); *ret_copy = APIError_apimisuse_error(err_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_APIError_fee_rate_too_high"))) TS_APIError_fee_rate_too_high(jstring err, int32_t feerate) { +uint64_t __attribute__((export_name("TS_APIError_fee_rate_too_high"))) TS_APIError_fee_rate_too_high(jstring err, int32_t feerate) { 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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_APIError_route_error"))) TS_APIError_route_error(jstring err) { +uint64_t __attribute__((export_name("TS_APIError_route_error"))) TS_APIError_route_error(jstring err) { LDKStr err_conv = str_ref_to_owned_c(err); LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError"); *ret_copy = APIError_route_error(err_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_APIError_channel_unavailable"))) TS_APIError_channel_unavailable(jstring err) { +uint64_t __attribute__((export_name("TS_APIError_channel_unavailable"))) TS_APIError_channel_unavailable(jstring err) { LDKStr err_conv = str_ref_to_owned_c(err); LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError"); *ret_copy = APIError_channel_unavailable(err_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_APIError_monitor_update_failed"))) TS_APIError_monitor_update_failed() { +uint64_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(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_APIError_incompatible_shutdown_script"))) TS_APIError_incompatible_shutdown_script(uint32_t script) { +uint64_t __attribute__((export_name("TS_APIError_incompatible_shutdown_script"))) TS_APIError_incompatible_shutdown_script(uint64_t script) { LDKShutdownScript script_conv; - script_conv.inner = (void*)(script & (~1)); - script_conv.is_owned = (script & 1) || (script == 0); + script_conv.inner = untag_ptr(script); + script_conv.is_owned = ptr_is_owned(script); CHECK_INNER_FIELD_ACCESS_OR_NULL(script_conv); script_conv = ShutdownScript_clone(&script_conv); LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError"); *ret_copy = APIError_incompatible_shutdown_script(script_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_BigSize_free"))) TS_BigSize_free(uint32_t this_obj) { +void __attribute__((export_name("TS_BigSize_free"))) TS_BigSize_free(uint64_t this_obj) { LDKBigSize this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); BigSize_free(this_obj_conv); } -int64_t __attribute__((export_name("TS_BigSize_get_a"))) TS_BigSize_get_a(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_BigSize_get_a"))) TS_BigSize_get_a(uint64_t this_ptr) { LDKBigSize this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = BigSize_get_a(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_BigSize_set_a"))) TS_BigSize_set_a(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_BigSize_set_a"))) TS_BigSize_set_a(uint64_t this_ptr, int64_t val) { LDKBigSize this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; BigSize_set_a(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_BigSize_new"))) TS_BigSize_new(int64_t a_arg) { +uint64_t __attribute__((export_name("TS_BigSize_new"))) TS_BigSize_new(int64_t a_arg) { LDKBigSize ret_var = BigSize_new(a_arg); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_Hostname_free"))) TS_Hostname_free(uint32_t this_obj) { +void __attribute__((export_name("TS_Hostname_free"))) TS_Hostname_free(uint64_t this_obj) { LDKHostname this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); Hostname_free(this_obj_conv); } -static inline uintptr_t Hostname_clone_ptr(LDKHostname *NONNULL_PTR arg) { +static inline uint64_t Hostname_clone_ptr(LDKHostname *NONNULL_PTR arg) { LDKHostname ret_var = Hostname_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_Hostname_clone_ptr"))) TS_Hostname_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_Hostname_clone_ptr"))) TS_Hostname_clone_ptr(uint64_t arg) { LDKHostname arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = Hostname_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = Hostname_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_Hostname_clone"))) TS_Hostname_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_Hostname_clone"))) TS_Hostname_clone(uint64_t orig) { LDKHostname orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKHostname ret_var = Hostname_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_t __attribute__((export_name("TS_Hostname_len"))) TS_Hostname_len(uint32_t this_arg) { +int8_t __attribute__((export_name("TS_Hostname_len"))) TS_Hostname_len(uint64_t this_arg) { LDKHostname this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int8_t ret_conv = Hostname_len(&this_arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_sign"))) TS_sign(int8_tArray msg, int8_tArray sk) { +uint64_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; @@ -21804,10 +20521,10 @@ uint32_t __attribute__((export_name("TS_sign"))) TS_sign(int8_tArray msg, int8_ LDKCResult_StringErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_StringErrorZ), "LDKCResult_StringErrorZ"); *ret_conv = sign(msg_ref, sk_ref); FREE(msg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_recover_pk"))) TS_recover_pk(int8_tArray msg, jstring sig) { +uint64_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; @@ -21815,7 +20532,7 @@ uint32_t __attribute__((export_name("TS_recover_pk"))) TS_recover_pk(int8_tArra LDKCResult_PublicKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PublicKeyErrorZ), "LDKCResult_PublicKeyErrorZ"); *ret_conv = recover_pk(msg_ref, sig_conv); FREE(msg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } jboolean __attribute__((export_name("TS_verify"))) TS_verify(int8_tArray msg, jstring sig, int8_tArray pk) { @@ -21856,17 +20573,17 @@ int8_tArray __attribute__((export_name("TS_construct_invoice_preimage"))) TS_co return ret_arr; } -void __attribute__((export_name("TS_Persister_free"))) TS_Persister_free(uint32_t this_ptr) { - if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_Persister_free"))) TS_Persister_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKPersister this_ptr_conv = *(LDKPersister*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); Persister_free(this_ptr_conv); } -uint32_t __attribute__((export_name("TS_Level_clone"))) TS_Level_clone(uint32_t orig) { - LDKLevel* orig_conv = (LDKLevel*)(orig & ~1); +uint32_t __attribute__((export_name("TS_Level_clone"))) TS_Level_clone(uint64_t orig) { + LDKLevel* orig_conv = (LDKLevel*)untag_ptr(orig); uint32_t ret_conv = LDKLevel_to_js(Level_clone(orig_conv)); return ret_conv; } @@ -21901,15 +20618,15 @@ uint32_t __attribute__((export_name("TS_Level_error"))) TS_Level_error() { return ret_conv; } -jboolean __attribute__((export_name("TS_Level_eq"))) TS_Level_eq(uint32_t a, uint32_t b) { - LDKLevel* a_conv = (LDKLevel*)(a & ~1); - LDKLevel* b_conv = (LDKLevel*)(b & ~1); +jboolean __attribute__((export_name("TS_Level_eq"))) TS_Level_eq(uint64_t a, uint64_t b) { + LDKLevel* a_conv = (LDKLevel*)untag_ptr(a); + LDKLevel* b_conv = (LDKLevel*)untag_ptr(b); jboolean ret_conv = Level_eq(a_conv, b_conv); return ret_conv; } -int64_t __attribute__((export_name("TS_Level_hash"))) TS_Level_hash(uint32_t o) { - LDKLevel* o_conv = (LDKLevel*)(o & ~1); +int64_t __attribute__((export_name("TS_Level_hash"))) TS_Level_hash(uint64_t o) { + LDKLevel* o_conv = (LDKLevel*)untag_ptr(o); int64_t ret_conv = Level_hash(o_conv); return ret_conv; } @@ -21919,751 +20636,744 @@ uint32_t __attribute__((export_name("TS_Level_max"))) TS_Level_max() { return ret_conv; } -void __attribute__((export_name("TS_Record_free"))) TS_Record_free(uint32_t this_obj) { +void __attribute__((export_name("TS_Record_free"))) TS_Record_free(uint64_t this_obj) { LDKRecord this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); Record_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_Record_get_level"))) TS_Record_get_level(uint32_t this_ptr) { +uint32_t __attribute__((export_name("TS_Record_get_level"))) TS_Record_get_level(uint64_t this_ptr) { LDKRecord this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; uint32_t ret_conv = LDKLevel_to_js(Record_get_level(&this_ptr_conv)); return ret_conv; } -void __attribute__((export_name("TS_Record_set_level"))) TS_Record_set_level(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_Record_set_level"))) TS_Record_set_level(uint64_t this_ptr, uint32_t val) { LDKRecord this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKLevel val_conv = LDKLevel_from_js(val); Record_set_level(&this_ptr_conv, val_conv); } -jstring __attribute__((export_name("TS_Record_get_args"))) TS_Record_get_args(uint32_t this_ptr) { +jstring __attribute__((export_name("TS_Record_get_args"))) TS_Record_get_args(uint64_t this_ptr) { LDKRecord this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKStr ret_str = Record_get_args(&this_ptr_conv); jstring ret_conv = str_ref_to_ts(ret_str.chars, ret_str.len); Str_free(ret_str); return ret_conv; } -void __attribute__((export_name("TS_Record_set_args"))) TS_Record_set_args(uint32_t this_ptr, jstring val) { +void __attribute__((export_name("TS_Record_set_args"))) TS_Record_set_args(uint64_t this_ptr, jstring val) { LDKRecord this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKStr val_conv = str_ref_to_owned_c(val); Record_set_args(&this_ptr_conv, val_conv); } -jstring __attribute__((export_name("TS_Record_get_module_path"))) TS_Record_get_module_path(uint32_t this_ptr) { +jstring __attribute__((export_name("TS_Record_get_module_path"))) TS_Record_get_module_path(uint64_t this_ptr) { LDKRecord this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKStr ret_str = Record_get_module_path(&this_ptr_conv); jstring ret_conv = str_ref_to_ts(ret_str.chars, ret_str.len); Str_free(ret_str); return ret_conv; } -void __attribute__((export_name("TS_Record_set_module_path"))) TS_Record_set_module_path(uint32_t this_ptr, jstring val) { +void __attribute__((export_name("TS_Record_set_module_path"))) TS_Record_set_module_path(uint64_t this_ptr, jstring val) { LDKRecord this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKStr val_conv = str_ref_to_owned_c(val); Record_set_module_path(&this_ptr_conv, val_conv); } -jstring __attribute__((export_name("TS_Record_get_file"))) TS_Record_get_file(uint32_t this_ptr) { +jstring __attribute__((export_name("TS_Record_get_file"))) TS_Record_get_file(uint64_t this_ptr) { LDKRecord this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKStr ret_str = Record_get_file(&this_ptr_conv); jstring ret_conv = str_ref_to_ts(ret_str.chars, ret_str.len); Str_free(ret_str); return ret_conv; } -void __attribute__((export_name("TS_Record_set_file"))) TS_Record_set_file(uint32_t this_ptr, jstring val) { +void __attribute__((export_name("TS_Record_set_file"))) TS_Record_set_file(uint64_t this_ptr, jstring val) { LDKRecord this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKStr val_conv = str_ref_to_owned_c(val); Record_set_file(&this_ptr_conv, val_conv); } -int32_t __attribute__((export_name("TS_Record_get_line"))) TS_Record_get_line(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_Record_get_line"))) TS_Record_get_line(uint64_t this_ptr) { LDKRecord this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = Record_get_line(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_Record_set_line"))) TS_Record_set_line(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_Record_set_line"))) TS_Record_set_line(uint64_t this_ptr, int32_t val) { LDKRecord this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; Record_set_line(&this_ptr_conv, val); } -static inline uintptr_t Record_clone_ptr(LDKRecord *NONNULL_PTR arg) { +static inline uint64_t Record_clone_ptr(LDKRecord *NONNULL_PTR arg) { LDKRecord ret_var = Record_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_Record_clone_ptr"))) TS_Record_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_Record_clone_ptr"))) TS_Record_clone_ptr(uint64_t arg) { LDKRecord arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = Record_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = Record_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_Record_clone"))) TS_Record_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_Record_clone"))) TS_Record_clone(uint64_t orig) { LDKRecord orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKRecord ret_var = Record_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_Logger_free"))) TS_Logger_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKLogger this_ptr_conv = *(LDKLogger*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); Logger_free(this_ptr_conv); } -void __attribute__((export_name("TS_ChannelHandshakeConfig_free"))) TS_ChannelHandshakeConfig_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChannelHandshakeConfig_free"))) TS_ChannelHandshakeConfig_free(uint64_t this_obj) { LDKChannelHandshakeConfig this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChannelHandshakeConfig_free(this_obj_conv); } -int32_t __attribute__((export_name("TS_ChannelHandshakeConfig_get_minimum_depth"))) TS_ChannelHandshakeConfig_get_minimum_depth(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_ChannelHandshakeConfig_get_minimum_depth"))) TS_ChannelHandshakeConfig_get_minimum_depth(uint64_t this_ptr) { LDKChannelHandshakeConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = ChannelHandshakeConfig_get_minimum_depth(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelHandshakeConfig_set_minimum_depth"))) TS_ChannelHandshakeConfig_set_minimum_depth(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_ChannelHandshakeConfig_set_minimum_depth"))) TS_ChannelHandshakeConfig_set_minimum_depth(uint64_t this_ptr, int32_t val) { LDKChannelHandshakeConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelHandshakeConfig_set_minimum_depth(&this_ptr_conv, val); } -int16_t __attribute__((export_name("TS_ChannelHandshakeConfig_get_our_to_self_delay"))) TS_ChannelHandshakeConfig_get_our_to_self_delay(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_ChannelHandshakeConfig_get_our_to_self_delay"))) TS_ChannelHandshakeConfig_get_our_to_self_delay(uint64_t this_ptr) { LDKChannelHandshakeConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = ChannelHandshakeConfig_get_our_to_self_delay(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelHandshakeConfig_set_our_to_self_delay"))) TS_ChannelHandshakeConfig_set_our_to_self_delay(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_ChannelHandshakeConfig_set_our_to_self_delay"))) TS_ChannelHandshakeConfig_set_our_to_self_delay(uint64_t this_ptr, int16_t val) { LDKChannelHandshakeConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelHandshakeConfig_set_our_to_self_delay(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ChannelHandshakeConfig_get_our_htlc_minimum_msat"))) TS_ChannelHandshakeConfig_get_our_htlc_minimum_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelHandshakeConfig_get_our_htlc_minimum_msat"))) TS_ChannelHandshakeConfig_get_our_htlc_minimum_msat(uint64_t this_ptr) { LDKChannelHandshakeConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelHandshakeConfig_get_our_htlc_minimum_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelHandshakeConfig_set_our_htlc_minimum_msat"))) TS_ChannelHandshakeConfig_set_our_htlc_minimum_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelHandshakeConfig_set_our_htlc_minimum_msat"))) TS_ChannelHandshakeConfig_set_our_htlc_minimum_msat(uint64_t this_ptr, int64_t val) { LDKChannelHandshakeConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelHandshakeConfig_set_our_htlc_minimum_msat(&this_ptr_conv, val); } -int8_t __attribute__((export_name("TS_ChannelHandshakeConfig_get_max_inbound_htlc_value_in_flight_percent_of_channel"))) TS_ChannelHandshakeConfig_get_max_inbound_htlc_value_in_flight_percent_of_channel(uint32_t this_ptr) { +int8_t __attribute__((export_name("TS_ChannelHandshakeConfig_get_max_inbound_htlc_value_in_flight_percent_of_channel"))) TS_ChannelHandshakeConfig_get_max_inbound_htlc_value_in_flight_percent_of_channel(uint64_t this_ptr) { LDKChannelHandshakeConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_t ret_conv = ChannelHandshakeConfig_get_max_inbound_htlc_value_in_flight_percent_of_channel(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelHandshakeConfig_set_max_inbound_htlc_value_in_flight_percent_of_channel"))) TS_ChannelHandshakeConfig_set_max_inbound_htlc_value_in_flight_percent_of_channel(uint32_t this_ptr, int8_t val) { +void __attribute__((export_name("TS_ChannelHandshakeConfig_set_max_inbound_htlc_value_in_flight_percent_of_channel"))) TS_ChannelHandshakeConfig_set_max_inbound_htlc_value_in_flight_percent_of_channel(uint64_t this_ptr, int8_t val) { LDKChannelHandshakeConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelHandshakeConfig_set_max_inbound_htlc_value_in_flight_percent_of_channel(&this_ptr_conv, val); } -jboolean __attribute__((export_name("TS_ChannelHandshakeConfig_get_negotiate_scid_privacy"))) TS_ChannelHandshakeConfig_get_negotiate_scid_privacy(uint32_t this_ptr) { +jboolean __attribute__((export_name("TS_ChannelHandshakeConfig_get_negotiate_scid_privacy"))) TS_ChannelHandshakeConfig_get_negotiate_scid_privacy(uint64_t this_ptr) { LDKChannelHandshakeConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; jboolean ret_conv = ChannelHandshakeConfig_get_negotiate_scid_privacy(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelHandshakeConfig_set_negotiate_scid_privacy"))) TS_ChannelHandshakeConfig_set_negotiate_scid_privacy(uint32_t this_ptr, jboolean val) { +void __attribute__((export_name("TS_ChannelHandshakeConfig_set_negotiate_scid_privacy"))) TS_ChannelHandshakeConfig_set_negotiate_scid_privacy(uint64_t this_ptr, jboolean val) { LDKChannelHandshakeConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelHandshakeConfig_set_negotiate_scid_privacy(&this_ptr_conv, val); } -jboolean __attribute__((export_name("TS_ChannelHandshakeConfig_get_announced_channel"))) TS_ChannelHandshakeConfig_get_announced_channel(uint32_t this_ptr) { +jboolean __attribute__((export_name("TS_ChannelHandshakeConfig_get_announced_channel"))) TS_ChannelHandshakeConfig_get_announced_channel(uint64_t this_ptr) { LDKChannelHandshakeConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; jboolean ret_conv = ChannelHandshakeConfig_get_announced_channel(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelHandshakeConfig_set_announced_channel"))) TS_ChannelHandshakeConfig_set_announced_channel(uint32_t this_ptr, jboolean val) { +void __attribute__((export_name("TS_ChannelHandshakeConfig_set_announced_channel"))) TS_ChannelHandshakeConfig_set_announced_channel(uint64_t this_ptr, jboolean val) { LDKChannelHandshakeConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelHandshakeConfig_set_announced_channel(&this_ptr_conv, val); } -jboolean __attribute__((export_name("TS_ChannelHandshakeConfig_get_commit_upfront_shutdown_pubkey"))) TS_ChannelHandshakeConfig_get_commit_upfront_shutdown_pubkey(uint32_t this_ptr) { +jboolean __attribute__((export_name("TS_ChannelHandshakeConfig_get_commit_upfront_shutdown_pubkey"))) TS_ChannelHandshakeConfig_get_commit_upfront_shutdown_pubkey(uint64_t this_ptr) { LDKChannelHandshakeConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; jboolean ret_conv = ChannelHandshakeConfig_get_commit_upfront_shutdown_pubkey(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelHandshakeConfig_set_commit_upfront_shutdown_pubkey"))) TS_ChannelHandshakeConfig_set_commit_upfront_shutdown_pubkey(uint32_t this_ptr, jboolean val) { +void __attribute__((export_name("TS_ChannelHandshakeConfig_set_commit_upfront_shutdown_pubkey"))) TS_ChannelHandshakeConfig_set_commit_upfront_shutdown_pubkey(uint64_t this_ptr, jboolean val) { LDKChannelHandshakeConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelHandshakeConfig_set_commit_upfront_shutdown_pubkey(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_ChannelHandshakeConfig_new"))) TS_ChannelHandshakeConfig_new(int32_t minimum_depth_arg, int16_t our_to_self_delay_arg, int64_t our_htlc_minimum_msat_arg, int8_t max_inbound_htlc_value_in_flight_percent_of_channel_arg, jboolean negotiate_scid_privacy_arg, jboolean announced_channel_arg, jboolean commit_upfront_shutdown_pubkey_arg) { +uint64_t __attribute__((export_name("TS_ChannelHandshakeConfig_new"))) TS_ChannelHandshakeConfig_new(int32_t minimum_depth_arg, int16_t our_to_self_delay_arg, int64_t our_htlc_minimum_msat_arg, int8_t max_inbound_htlc_value_in_flight_percent_of_channel_arg, jboolean negotiate_scid_privacy_arg, jboolean announced_channel_arg, jboolean commit_upfront_shutdown_pubkey_arg) { LDKChannelHandshakeConfig ret_var = ChannelHandshakeConfig_new(minimum_depth_arg, our_to_self_delay_arg, our_htlc_minimum_msat_arg, max_inbound_htlc_value_in_flight_percent_of_channel_arg, negotiate_scid_privacy_arg, announced_channel_arg, commit_upfront_shutdown_pubkey_arg); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t ChannelHandshakeConfig_clone_ptr(LDKChannelHandshakeConfig *NONNULL_PTR arg) { +static inline uint64_t ChannelHandshakeConfig_clone_ptr(LDKChannelHandshakeConfig *NONNULL_PTR arg) { LDKChannelHandshakeConfig ret_var = ChannelHandshakeConfig_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelHandshakeConfig_clone_ptr"))) TS_ChannelHandshakeConfig_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ChannelHandshakeConfig_clone_ptr"))) TS_ChannelHandshakeConfig_clone_ptr(uint64_t arg) { LDKChannelHandshakeConfig arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ChannelHandshakeConfig_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ChannelHandshakeConfig_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelHandshakeConfig_clone"))) TS_ChannelHandshakeConfig_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ChannelHandshakeConfig_clone"))) TS_ChannelHandshakeConfig_clone(uint64_t orig) { LDKChannelHandshakeConfig orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKChannelHandshakeConfig ret_var = ChannelHandshakeConfig_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelHandshakeConfig_default"))) TS_ChannelHandshakeConfig_default() { +uint64_t __attribute__((export_name("TS_ChannelHandshakeConfig_default"))) TS_ChannelHandshakeConfig_default() { LDKChannelHandshakeConfig ret_var = ChannelHandshakeConfig_default(); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelHandshakeLimits_free"))) TS_ChannelHandshakeLimits_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChannelHandshakeLimits_free"))) TS_ChannelHandshakeLimits_free(uint64_t this_obj) { LDKChannelHandshakeLimits this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChannelHandshakeLimits_free(this_obj_conv); } -int64_t __attribute__((export_name("TS_ChannelHandshakeLimits_get_min_funding_satoshis"))) TS_ChannelHandshakeLimits_get_min_funding_satoshis(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelHandshakeLimits_get_min_funding_satoshis"))) TS_ChannelHandshakeLimits_get_min_funding_satoshis(uint64_t this_ptr) { LDKChannelHandshakeLimits this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelHandshakeLimits_get_min_funding_satoshis(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelHandshakeLimits_set_min_funding_satoshis"))) TS_ChannelHandshakeLimits_set_min_funding_satoshis(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelHandshakeLimits_set_min_funding_satoshis"))) TS_ChannelHandshakeLimits_set_min_funding_satoshis(uint64_t this_ptr, int64_t val) { LDKChannelHandshakeLimits this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelHandshakeLimits_set_min_funding_satoshis(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ChannelHandshakeLimits_get_max_funding_satoshis"))) TS_ChannelHandshakeLimits_get_max_funding_satoshis(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelHandshakeLimits_get_max_funding_satoshis"))) TS_ChannelHandshakeLimits_get_max_funding_satoshis(uint64_t this_ptr) { LDKChannelHandshakeLimits this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelHandshakeLimits_get_max_funding_satoshis(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelHandshakeLimits_set_max_funding_satoshis"))) TS_ChannelHandshakeLimits_set_max_funding_satoshis(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelHandshakeLimits_set_max_funding_satoshis"))) TS_ChannelHandshakeLimits_set_max_funding_satoshis(uint64_t this_ptr, int64_t val) { LDKChannelHandshakeLimits this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelHandshakeLimits_set_max_funding_satoshis(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ChannelHandshakeLimits_get_max_htlc_minimum_msat"))) TS_ChannelHandshakeLimits_get_max_htlc_minimum_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelHandshakeLimits_get_max_htlc_minimum_msat"))) TS_ChannelHandshakeLimits_get_max_htlc_minimum_msat(uint64_t this_ptr) { LDKChannelHandshakeLimits this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelHandshakeLimits_get_max_htlc_minimum_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelHandshakeLimits_set_max_htlc_minimum_msat"))) TS_ChannelHandshakeLimits_set_max_htlc_minimum_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelHandshakeLimits_set_max_htlc_minimum_msat"))) TS_ChannelHandshakeLimits_set_max_htlc_minimum_msat(uint64_t this_ptr, int64_t val) { LDKChannelHandshakeLimits this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelHandshakeLimits_set_max_htlc_minimum_msat(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ChannelHandshakeLimits_get_min_max_htlc_value_in_flight_msat"))) TS_ChannelHandshakeLimits_get_min_max_htlc_value_in_flight_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelHandshakeLimits_get_min_max_htlc_value_in_flight_msat"))) TS_ChannelHandshakeLimits_get_min_max_htlc_value_in_flight_msat(uint64_t this_ptr) { LDKChannelHandshakeLimits this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelHandshakeLimits_get_min_max_htlc_value_in_flight_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelHandshakeLimits_set_min_max_htlc_value_in_flight_msat"))) TS_ChannelHandshakeLimits_set_min_max_htlc_value_in_flight_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelHandshakeLimits_set_min_max_htlc_value_in_flight_msat"))) TS_ChannelHandshakeLimits_set_min_max_htlc_value_in_flight_msat(uint64_t this_ptr, int64_t val) { LDKChannelHandshakeLimits this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelHandshakeLimits_set_min_max_htlc_value_in_flight_msat(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ChannelHandshakeLimits_get_max_channel_reserve_satoshis"))) TS_ChannelHandshakeLimits_get_max_channel_reserve_satoshis(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelHandshakeLimits_get_max_channel_reserve_satoshis"))) TS_ChannelHandshakeLimits_get_max_channel_reserve_satoshis(uint64_t this_ptr) { LDKChannelHandshakeLimits this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelHandshakeLimits_get_max_channel_reserve_satoshis(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelHandshakeLimits_set_max_channel_reserve_satoshis"))) TS_ChannelHandshakeLimits_set_max_channel_reserve_satoshis(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelHandshakeLimits_set_max_channel_reserve_satoshis"))) TS_ChannelHandshakeLimits_set_max_channel_reserve_satoshis(uint64_t this_ptr, int64_t val) { LDKChannelHandshakeLimits this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelHandshakeLimits_set_max_channel_reserve_satoshis(&this_ptr_conv, val); } -int16_t __attribute__((export_name("TS_ChannelHandshakeLimits_get_min_max_accepted_htlcs"))) TS_ChannelHandshakeLimits_get_min_max_accepted_htlcs(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_ChannelHandshakeLimits_get_min_max_accepted_htlcs"))) TS_ChannelHandshakeLimits_get_min_max_accepted_htlcs(uint64_t this_ptr) { LDKChannelHandshakeLimits this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = ChannelHandshakeLimits_get_min_max_accepted_htlcs(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelHandshakeLimits_set_min_max_accepted_htlcs"))) TS_ChannelHandshakeLimits_set_min_max_accepted_htlcs(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_ChannelHandshakeLimits_set_min_max_accepted_htlcs"))) TS_ChannelHandshakeLimits_set_min_max_accepted_htlcs(uint64_t this_ptr, int16_t val) { LDKChannelHandshakeLimits this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelHandshakeLimits_set_min_max_accepted_htlcs(&this_ptr_conv, val); } -int32_t __attribute__((export_name("TS_ChannelHandshakeLimits_get_max_minimum_depth"))) TS_ChannelHandshakeLimits_get_max_minimum_depth(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_ChannelHandshakeLimits_get_max_minimum_depth"))) TS_ChannelHandshakeLimits_get_max_minimum_depth(uint64_t this_ptr) { LDKChannelHandshakeLimits this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = ChannelHandshakeLimits_get_max_minimum_depth(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelHandshakeLimits_set_max_minimum_depth"))) TS_ChannelHandshakeLimits_set_max_minimum_depth(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_ChannelHandshakeLimits_set_max_minimum_depth"))) TS_ChannelHandshakeLimits_set_max_minimum_depth(uint64_t this_ptr, int32_t val) { LDKChannelHandshakeLimits this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelHandshakeLimits_set_max_minimum_depth(&this_ptr_conv, val); } -jboolean __attribute__((export_name("TS_ChannelHandshakeLimits_get_trust_own_funding_0conf"))) TS_ChannelHandshakeLimits_get_trust_own_funding_0conf(uint32_t this_ptr) { +jboolean __attribute__((export_name("TS_ChannelHandshakeLimits_get_trust_own_funding_0conf"))) TS_ChannelHandshakeLimits_get_trust_own_funding_0conf(uint64_t this_ptr) { LDKChannelHandshakeLimits this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; jboolean ret_conv = ChannelHandshakeLimits_get_trust_own_funding_0conf(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelHandshakeLimits_set_trust_own_funding_0conf"))) TS_ChannelHandshakeLimits_set_trust_own_funding_0conf(uint32_t this_ptr, jboolean val) { +void __attribute__((export_name("TS_ChannelHandshakeLimits_set_trust_own_funding_0conf"))) TS_ChannelHandshakeLimits_set_trust_own_funding_0conf(uint64_t this_ptr, jboolean val) { LDKChannelHandshakeLimits this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelHandshakeLimits_set_trust_own_funding_0conf(&this_ptr_conv, val); } -jboolean __attribute__((export_name("TS_ChannelHandshakeLimits_get_force_announced_channel_preference"))) TS_ChannelHandshakeLimits_get_force_announced_channel_preference(uint32_t this_ptr) { +jboolean __attribute__((export_name("TS_ChannelHandshakeLimits_get_force_announced_channel_preference"))) TS_ChannelHandshakeLimits_get_force_announced_channel_preference(uint64_t this_ptr) { LDKChannelHandshakeLimits this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; jboolean ret_conv = ChannelHandshakeLimits_get_force_announced_channel_preference(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelHandshakeLimits_set_force_announced_channel_preference"))) TS_ChannelHandshakeLimits_set_force_announced_channel_preference(uint32_t this_ptr, jboolean val) { +void __attribute__((export_name("TS_ChannelHandshakeLimits_set_force_announced_channel_preference"))) TS_ChannelHandshakeLimits_set_force_announced_channel_preference(uint64_t this_ptr, jboolean val) { LDKChannelHandshakeLimits this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelHandshakeLimits_set_force_announced_channel_preference(&this_ptr_conv, val); } -int16_t __attribute__((export_name("TS_ChannelHandshakeLimits_get_their_to_self_delay"))) TS_ChannelHandshakeLimits_get_their_to_self_delay(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_ChannelHandshakeLimits_get_their_to_self_delay"))) TS_ChannelHandshakeLimits_get_their_to_self_delay(uint64_t this_ptr) { LDKChannelHandshakeLimits this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = ChannelHandshakeLimits_get_their_to_self_delay(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelHandshakeLimits_set_their_to_self_delay"))) TS_ChannelHandshakeLimits_set_their_to_self_delay(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_ChannelHandshakeLimits_set_their_to_self_delay"))) TS_ChannelHandshakeLimits_set_their_to_self_delay(uint64_t this_ptr, int16_t val) { LDKChannelHandshakeLimits this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelHandshakeLimits_set_their_to_self_delay(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_ChannelHandshakeLimits_new"))) TS_ChannelHandshakeLimits_new(int64_t min_funding_satoshis_arg, int64_t max_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 trust_own_funding_0conf_arg, jboolean force_announced_channel_preference_arg, int16_t their_to_self_delay_arg) { +uint64_t __attribute__((export_name("TS_ChannelHandshakeLimits_new"))) TS_ChannelHandshakeLimits_new(int64_t min_funding_satoshis_arg, int64_t max_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 trust_own_funding_0conf_arg, jboolean force_announced_channel_preference_arg, int16_t their_to_self_delay_arg) { LDKChannelHandshakeLimits ret_var = ChannelHandshakeLimits_new(min_funding_satoshis_arg, max_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, trust_own_funding_0conf_arg, force_announced_channel_preference_arg, their_to_self_delay_arg); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t ChannelHandshakeLimits_clone_ptr(LDKChannelHandshakeLimits *NONNULL_PTR arg) { +static inline uint64_t ChannelHandshakeLimits_clone_ptr(LDKChannelHandshakeLimits *NONNULL_PTR arg) { LDKChannelHandshakeLimits ret_var = ChannelHandshakeLimits_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelHandshakeLimits_clone_ptr"))) TS_ChannelHandshakeLimits_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ChannelHandshakeLimits_clone_ptr"))) TS_ChannelHandshakeLimits_clone_ptr(uint64_t arg) { LDKChannelHandshakeLimits arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ChannelHandshakeLimits_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ChannelHandshakeLimits_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelHandshakeLimits_clone"))) TS_ChannelHandshakeLimits_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ChannelHandshakeLimits_clone"))) TS_ChannelHandshakeLimits_clone(uint64_t orig) { LDKChannelHandshakeLimits orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKChannelHandshakeLimits ret_var = ChannelHandshakeLimits_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelHandshakeLimits_default"))) TS_ChannelHandshakeLimits_default() { +uint64_t __attribute__((export_name("TS_ChannelHandshakeLimits_default"))) TS_ChannelHandshakeLimits_default() { LDKChannelHandshakeLimits ret_var = ChannelHandshakeLimits_default(); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelConfig_free"))) TS_ChannelConfig_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChannelConfig_free"))) TS_ChannelConfig_free(uint64_t this_obj) { LDKChannelConfig this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChannelConfig_free(this_obj_conv); } -int32_t __attribute__((export_name("TS_ChannelConfig_get_forwarding_fee_proportional_millionths"))) TS_ChannelConfig_get_forwarding_fee_proportional_millionths(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_ChannelConfig_get_forwarding_fee_proportional_millionths"))) TS_ChannelConfig_get_forwarding_fee_proportional_millionths(uint64_t this_ptr) { LDKChannelConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = ChannelConfig_get_forwarding_fee_proportional_millionths(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelConfig_set_forwarding_fee_proportional_millionths"))) TS_ChannelConfig_set_forwarding_fee_proportional_millionths(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_ChannelConfig_set_forwarding_fee_proportional_millionths"))) TS_ChannelConfig_set_forwarding_fee_proportional_millionths(uint64_t this_ptr, int32_t val) { LDKChannelConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelConfig_set_forwarding_fee_proportional_millionths(&this_ptr_conv, val); } -int32_t __attribute__((export_name("TS_ChannelConfig_get_forwarding_fee_base_msat"))) TS_ChannelConfig_get_forwarding_fee_base_msat(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_ChannelConfig_get_forwarding_fee_base_msat"))) TS_ChannelConfig_get_forwarding_fee_base_msat(uint64_t this_ptr) { LDKChannelConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = ChannelConfig_get_forwarding_fee_base_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelConfig_set_forwarding_fee_base_msat"))) TS_ChannelConfig_set_forwarding_fee_base_msat(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_ChannelConfig_set_forwarding_fee_base_msat"))) TS_ChannelConfig_set_forwarding_fee_base_msat(uint64_t this_ptr, int32_t val) { LDKChannelConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelConfig_set_forwarding_fee_base_msat(&this_ptr_conv, val); } -int16_t __attribute__((export_name("TS_ChannelConfig_get_cltv_expiry_delta"))) TS_ChannelConfig_get_cltv_expiry_delta(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_ChannelConfig_get_cltv_expiry_delta"))) TS_ChannelConfig_get_cltv_expiry_delta(uint64_t this_ptr) { LDKChannelConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = ChannelConfig_get_cltv_expiry_delta(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelConfig_set_cltv_expiry_delta"))) TS_ChannelConfig_set_cltv_expiry_delta(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_ChannelConfig_set_cltv_expiry_delta"))) TS_ChannelConfig_set_cltv_expiry_delta(uint64_t this_ptr, int16_t val) { LDKChannelConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelConfig_set_cltv_expiry_delta(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ChannelConfig_get_max_dust_htlc_exposure_msat"))) TS_ChannelConfig_get_max_dust_htlc_exposure_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelConfig_get_max_dust_htlc_exposure_msat"))) TS_ChannelConfig_get_max_dust_htlc_exposure_msat(uint64_t this_ptr) { LDKChannelConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelConfig_get_max_dust_htlc_exposure_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelConfig_set_max_dust_htlc_exposure_msat"))) TS_ChannelConfig_set_max_dust_htlc_exposure_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelConfig_set_max_dust_htlc_exposure_msat"))) TS_ChannelConfig_set_max_dust_htlc_exposure_msat(uint64_t this_ptr, int64_t val) { LDKChannelConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelConfig_set_max_dust_htlc_exposure_msat(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ChannelConfig_get_force_close_avoidance_max_fee_satoshis"))) TS_ChannelConfig_get_force_close_avoidance_max_fee_satoshis(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelConfig_get_force_close_avoidance_max_fee_satoshis"))) TS_ChannelConfig_get_force_close_avoidance_max_fee_satoshis(uint64_t this_ptr) { LDKChannelConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelConfig_get_force_close_avoidance_max_fee_satoshis(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelConfig_set_force_close_avoidance_max_fee_satoshis"))) TS_ChannelConfig_set_force_close_avoidance_max_fee_satoshis(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelConfig_set_force_close_avoidance_max_fee_satoshis"))) TS_ChannelConfig_set_force_close_avoidance_max_fee_satoshis(uint64_t this_ptr, int64_t val) { LDKChannelConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelConfig_set_force_close_avoidance_max_fee_satoshis(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_ChannelConfig_new"))) TS_ChannelConfig_new(int32_t forwarding_fee_proportional_millionths_arg, int32_t forwarding_fee_base_msat_arg, int16_t cltv_expiry_delta_arg, int64_t max_dust_htlc_exposure_msat_arg, int64_t force_close_avoidance_max_fee_satoshis_arg) { +uint64_t __attribute__((export_name("TS_ChannelConfig_new"))) TS_ChannelConfig_new(int32_t forwarding_fee_proportional_millionths_arg, int32_t forwarding_fee_base_msat_arg, int16_t cltv_expiry_delta_arg, int64_t max_dust_htlc_exposure_msat_arg, int64_t force_close_avoidance_max_fee_satoshis_arg) { LDKChannelConfig ret_var = ChannelConfig_new(forwarding_fee_proportional_millionths_arg, forwarding_fee_base_msat_arg, cltv_expiry_delta_arg, max_dust_htlc_exposure_msat_arg, force_close_avoidance_max_fee_satoshis_arg); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t ChannelConfig_clone_ptr(LDKChannelConfig *NONNULL_PTR arg) { +static inline uint64_t ChannelConfig_clone_ptr(LDKChannelConfig *NONNULL_PTR arg) { LDKChannelConfig ret_var = ChannelConfig_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelConfig_clone_ptr"))) TS_ChannelConfig_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ChannelConfig_clone_ptr"))) TS_ChannelConfig_clone_ptr(uint64_t arg) { LDKChannelConfig arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ChannelConfig_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ChannelConfig_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelConfig_clone"))) TS_ChannelConfig_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ChannelConfig_clone"))) TS_ChannelConfig_clone(uint64_t orig) { LDKChannelConfig orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKChannelConfig ret_var = ChannelConfig_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelConfig_default"))) TS_ChannelConfig_default() { +uint64_t __attribute__((export_name("TS_ChannelConfig_default"))) TS_ChannelConfig_default() { LDKChannelConfig ret_var = ChannelConfig_default(); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_ChannelConfig_write"))) TS_ChannelConfig_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ChannelConfig_write"))) TS_ChannelConfig_write(uint64_t obj) { LDKChannelConfig obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ChannelConfig_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -22671,341 +21381,304 @@ int8_tArray __attribute__((export_name("TS_ChannelConfig_write"))) TS_ChannelCo return ret_arr; } -uint32_t __attribute__((export_name("TS_ChannelConfig_read"))) TS_ChannelConfig_read(int8_tArray ser) { +uint64_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; LDKCResult_ChannelConfigDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelConfigDecodeErrorZ), "LDKCResult_ChannelConfigDecodeErrorZ"); *ret_conv = ChannelConfig_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_UserConfig_free"))) TS_UserConfig_free(uint32_t this_obj) { +void __attribute__((export_name("TS_UserConfig_free"))) TS_UserConfig_free(uint64_t this_obj) { LDKUserConfig this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); UserConfig_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_UserConfig_get_channel_handshake_config"))) TS_UserConfig_get_channel_handshake_config(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_UserConfig_get_channel_handshake_config"))) TS_UserConfig_get_channel_handshake_config(uint64_t this_ptr) { LDKUserConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelHandshakeConfig ret_var = UserConfig_get_channel_handshake_config(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_UserConfig_set_channel_handshake_config"))) TS_UserConfig_set_channel_handshake_config(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_UserConfig_set_channel_handshake_config"))) TS_UserConfig_set_channel_handshake_config(uint64_t this_ptr, uint64_t val) { LDKUserConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelHandshakeConfig val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = ChannelHandshakeConfig_clone(&val_conv); UserConfig_set_channel_handshake_config(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_UserConfig_get_channel_handshake_limits"))) TS_UserConfig_get_channel_handshake_limits(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_UserConfig_get_channel_handshake_limits"))) TS_UserConfig_get_channel_handshake_limits(uint64_t this_ptr) { LDKUserConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelHandshakeLimits ret_var = UserConfig_get_channel_handshake_limits(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_UserConfig_set_channel_handshake_limits"))) TS_UserConfig_set_channel_handshake_limits(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_UserConfig_set_channel_handshake_limits"))) TS_UserConfig_set_channel_handshake_limits(uint64_t this_ptr, uint64_t val) { LDKUserConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelHandshakeLimits val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = ChannelHandshakeLimits_clone(&val_conv); UserConfig_set_channel_handshake_limits(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_UserConfig_get_channel_config"))) TS_UserConfig_get_channel_config(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_UserConfig_get_channel_config"))) TS_UserConfig_get_channel_config(uint64_t this_ptr) { LDKUserConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelConfig ret_var = UserConfig_get_channel_config(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_UserConfig_set_channel_config"))) TS_UserConfig_set_channel_config(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_UserConfig_set_channel_config"))) TS_UserConfig_set_channel_config(uint64_t this_ptr, uint64_t val) { LDKUserConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelConfig val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = ChannelConfig_clone(&val_conv); UserConfig_set_channel_config(&this_ptr_conv, val_conv); } -jboolean __attribute__((export_name("TS_UserConfig_get_accept_forwards_to_priv_channels"))) TS_UserConfig_get_accept_forwards_to_priv_channels(uint32_t this_ptr) { +jboolean __attribute__((export_name("TS_UserConfig_get_accept_forwards_to_priv_channels"))) TS_UserConfig_get_accept_forwards_to_priv_channels(uint64_t this_ptr) { LDKUserConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; jboolean ret_conv = UserConfig_get_accept_forwards_to_priv_channels(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UserConfig_set_accept_forwards_to_priv_channels"))) TS_UserConfig_set_accept_forwards_to_priv_channels(uint32_t this_ptr, jboolean val) { +void __attribute__((export_name("TS_UserConfig_set_accept_forwards_to_priv_channels"))) TS_UserConfig_set_accept_forwards_to_priv_channels(uint64_t this_ptr, jboolean val) { LDKUserConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UserConfig_set_accept_forwards_to_priv_channels(&this_ptr_conv, val); } -jboolean __attribute__((export_name("TS_UserConfig_get_accept_inbound_channels"))) TS_UserConfig_get_accept_inbound_channels(uint32_t this_ptr) { +jboolean __attribute__((export_name("TS_UserConfig_get_accept_inbound_channels"))) TS_UserConfig_get_accept_inbound_channels(uint64_t this_ptr) { LDKUserConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; jboolean ret_conv = UserConfig_get_accept_inbound_channels(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UserConfig_set_accept_inbound_channels"))) TS_UserConfig_set_accept_inbound_channels(uint32_t this_ptr, jboolean val) { +void __attribute__((export_name("TS_UserConfig_set_accept_inbound_channels"))) TS_UserConfig_set_accept_inbound_channels(uint64_t this_ptr, jboolean val) { LDKUserConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UserConfig_set_accept_inbound_channels(&this_ptr_conv, val); } -jboolean __attribute__((export_name("TS_UserConfig_get_manually_accept_inbound_channels"))) TS_UserConfig_get_manually_accept_inbound_channels(uint32_t this_ptr) { +jboolean __attribute__((export_name("TS_UserConfig_get_manually_accept_inbound_channels"))) TS_UserConfig_get_manually_accept_inbound_channels(uint64_t this_ptr) { LDKUserConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; jboolean ret_conv = UserConfig_get_manually_accept_inbound_channels(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UserConfig_set_manually_accept_inbound_channels"))) TS_UserConfig_set_manually_accept_inbound_channels(uint32_t this_ptr, jboolean val) { +void __attribute__((export_name("TS_UserConfig_set_manually_accept_inbound_channels"))) TS_UserConfig_set_manually_accept_inbound_channels(uint64_t this_ptr, jboolean val) { LDKUserConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UserConfig_set_manually_accept_inbound_channels(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_UserConfig_new"))) TS_UserConfig_new(uint32_t channel_handshake_config_arg, uint32_t channel_handshake_limits_arg, uint32_t channel_config_arg, jboolean accept_forwards_to_priv_channels_arg, jboolean accept_inbound_channels_arg, jboolean manually_accept_inbound_channels_arg) { +uint64_t __attribute__((export_name("TS_UserConfig_new"))) TS_UserConfig_new(uint64_t channel_handshake_config_arg, uint64_t channel_handshake_limits_arg, uint64_t channel_config_arg, jboolean accept_forwards_to_priv_channels_arg, jboolean accept_inbound_channels_arg, jboolean manually_accept_inbound_channels_arg) { LDKChannelHandshakeConfig channel_handshake_config_arg_conv; - channel_handshake_config_arg_conv.inner = (void*)(channel_handshake_config_arg & (~1)); - channel_handshake_config_arg_conv.is_owned = (channel_handshake_config_arg & 1) || (channel_handshake_config_arg == 0); + channel_handshake_config_arg_conv.inner = untag_ptr(channel_handshake_config_arg); + channel_handshake_config_arg_conv.is_owned = ptr_is_owned(channel_handshake_config_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_handshake_config_arg_conv); channel_handshake_config_arg_conv = ChannelHandshakeConfig_clone(&channel_handshake_config_arg_conv); LDKChannelHandshakeLimits channel_handshake_limits_arg_conv; - channel_handshake_limits_arg_conv.inner = (void*)(channel_handshake_limits_arg & (~1)); - channel_handshake_limits_arg_conv.is_owned = (channel_handshake_limits_arg & 1) || (channel_handshake_limits_arg == 0); + channel_handshake_limits_arg_conv.inner = untag_ptr(channel_handshake_limits_arg); + channel_handshake_limits_arg_conv.is_owned = ptr_is_owned(channel_handshake_limits_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_handshake_limits_arg_conv); channel_handshake_limits_arg_conv = ChannelHandshakeLimits_clone(&channel_handshake_limits_arg_conv); LDKChannelConfig channel_config_arg_conv; - channel_config_arg_conv.inner = (void*)(channel_config_arg & (~1)); - channel_config_arg_conv.is_owned = (channel_config_arg & 1) || (channel_config_arg == 0); + channel_config_arg_conv.inner = untag_ptr(channel_config_arg); + channel_config_arg_conv.is_owned = ptr_is_owned(channel_config_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_config_arg_conv); channel_config_arg_conv = ChannelConfig_clone(&channel_config_arg_conv); LDKUserConfig ret_var = UserConfig_new(channel_handshake_config_arg_conv, channel_handshake_limits_arg_conv, channel_config_arg_conv, accept_forwards_to_priv_channels_arg, accept_inbound_channels_arg, manually_accept_inbound_channels_arg); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t UserConfig_clone_ptr(LDKUserConfig *NONNULL_PTR arg) { +static inline uint64_t UserConfig_clone_ptr(LDKUserConfig *NONNULL_PTR arg) { LDKUserConfig ret_var = UserConfig_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_UserConfig_clone_ptr"))) TS_UserConfig_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_UserConfig_clone_ptr"))) TS_UserConfig_clone_ptr(uint64_t arg) { LDKUserConfig arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = UserConfig_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = UserConfig_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_UserConfig_clone"))) TS_UserConfig_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_UserConfig_clone"))) TS_UserConfig_clone(uint64_t orig) { LDKUserConfig orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKUserConfig ret_var = UserConfig_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_UserConfig_default"))) TS_UserConfig_default() { +uint64_t __attribute__((export_name("TS_UserConfig_default"))) TS_UserConfig_default() { LDKUserConfig ret_var = UserConfig_default(); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_BestBlock_free"))) TS_BestBlock_free(uint32_t this_obj) { +void __attribute__((export_name("TS_BestBlock_free"))) TS_BestBlock_free(uint64_t this_obj) { LDKBestBlock this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); BestBlock_free(this_obj_conv); } -static inline uintptr_t BestBlock_clone_ptr(LDKBestBlock *NONNULL_PTR arg) { +static inline uint64_t BestBlock_clone_ptr(LDKBestBlock *NONNULL_PTR arg) { LDKBestBlock ret_var = BestBlock_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_BestBlock_clone_ptr"))) TS_BestBlock_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_BestBlock_clone_ptr"))) TS_BestBlock_clone_ptr(uint64_t arg) { LDKBestBlock arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = BestBlock_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = BestBlock_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_BestBlock_clone"))) TS_BestBlock_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_BestBlock_clone"))) TS_BestBlock_clone(uint64_t orig) { LDKBestBlock orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKBestBlock ret_var = BestBlock_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_BestBlock_from_genesis"))) TS_BestBlock_from_genesis(uint32_t network) { +uint64_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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_BestBlock_new"))) TS_BestBlock_new(int8_tArray block_hash, int32_t height) { +uint64_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); FREE(block_hash); LDKBestBlock ret_var = BestBlock_new(block_hash_ref, height); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_BestBlock_block_hash"))) TS_BestBlock_block_hash(uint32_t this_arg) { +int8_tArray __attribute__((export_name("TS_BestBlock_block_hash"))) TS_BestBlock_block_hash(uint64_t this_arg) { LDKBestBlock this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, BestBlock_block_hash(&this_arg_conv).data, 32); return ret_arr; } -int32_t __attribute__((export_name("TS_BestBlock_height"))) TS_BestBlock_height(uint32_t this_arg) { +int32_t __attribute__((export_name("TS_BestBlock_height"))) TS_BestBlock_height(uint64_t this_arg) { LDKBestBlock this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int32_t ret_conv = BestBlock_height(&this_arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_AccessError_clone"))) TS_AccessError_clone(uint32_t orig) { - LDKAccessError* orig_conv = (LDKAccessError*)(orig & ~1); +uint32_t __attribute__((export_name("TS_AccessError_clone"))) TS_AccessError_clone(uint64_t orig) { + LDKAccessError* orig_conv = (LDKAccessError*)untag_ptr(orig); uint32_t ret_conv = LDKAccessError_to_js(AccessError_clone(orig_conv)); return ret_conv; } @@ -23020,35 +21693,35 @@ uint32_t __attribute__((export_name("TS_AccessError_unknown_tx"))) TS_AccessErr return ret_conv; } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_Access_free"))) TS_Access_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKAccess this_ptr_conv = *(LDKAccess*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); Access_free(this_ptr_conv); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_Listen_free"))) TS_Listen_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKListen this_ptr_conv = *(LDKListen*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); Listen_free(this_ptr_conv); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_Confirm_free"))) TS_Confirm_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKConfirm this_ptr_conv = *(LDKConfirm*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); Confirm_free(this_ptr_conv); } -uint32_t __attribute__((export_name("TS_ChannelMonitorUpdateErr_clone"))) TS_ChannelMonitorUpdateErr_clone(uint32_t orig) { - LDKChannelMonitorUpdateErr* orig_conv = (LDKChannelMonitorUpdateErr*)(orig & ~1); +uint32_t __attribute__((export_name("TS_ChannelMonitorUpdateErr_clone"))) TS_ChannelMonitorUpdateErr_clone(uint64_t orig) { + LDKChannelMonitorUpdateErr* orig_conv = (LDKChannelMonitorUpdateErr*)untag_ptr(orig); uint32_t ret_conv = LDKChannelMonitorUpdateErr_to_js(ChannelMonitorUpdateErr_clone(orig_conv)); return ret_conv; } @@ -23063,99 +21736,100 @@ uint32_t __attribute__((export_name("TS_ChannelMonitorUpdateErr_permanent_failu return ret_conv; } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_Watch_free"))) TS_Watch_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKWatch this_ptr_conv = *(LDKWatch*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); Watch_free(this_ptr_conv); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_Filter_free"))) TS_Filter_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKFilter this_ptr_conv = *(LDKFilter*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); Filter_free(this_ptr_conv); } -void __attribute__((export_name("TS_WatchedOutput_free"))) TS_WatchedOutput_free(uint32_t this_obj) { +void __attribute__((export_name("TS_WatchedOutput_free"))) TS_WatchedOutput_free(uint64_t this_obj) { LDKWatchedOutput this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); WatchedOutput_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_WatchedOutput_get_block_hash"))) TS_WatchedOutput_get_block_hash(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_WatchedOutput_get_block_hash"))) TS_WatchedOutput_get_block_hash(uint64_t this_ptr) { LDKWatchedOutput this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_WatchedOutput_set_block_hash"))) TS_WatchedOutput_set_block_hash(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_WatchedOutput_set_block_hash"))) TS_WatchedOutput_set_block_hash(uint64_t this_ptr, int8_tArray val) { LDKWatchedOutput this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); WatchedOutput_set_block_hash(&this_ptr_conv, val_ref); } -uint32_t __attribute__((export_name("TS_WatchedOutput_get_outpoint"))) TS_WatchedOutput_get_outpoint(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_WatchedOutput_get_outpoint"))) TS_WatchedOutput_get_outpoint(uint64_t this_ptr) { LDKWatchedOutput this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKOutPoint ret_var = WatchedOutput_get_outpoint(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_WatchedOutput_set_outpoint"))) TS_WatchedOutput_set_outpoint(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_WatchedOutput_set_outpoint"))) TS_WatchedOutput_set_outpoint(uint64_t this_ptr, uint64_t val) { LDKWatchedOutput this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKOutPoint val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = OutPoint_clone(&val_conv); WatchedOutput_set_outpoint(&this_ptr_conv, val_conv); } -int8_tArray __attribute__((export_name("TS_WatchedOutput_get_script_pubkey"))) TS_WatchedOutput_get_script_pubkey(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_WatchedOutput_get_script_pubkey"))) TS_WatchedOutput_get_script_pubkey(uint64_t this_ptr) { LDKWatchedOutput this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKu8slice ret_var = WatchedOutput_get_script_pubkey(&this_ptr_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); return ret_arr; } -void __attribute__((export_name("TS_WatchedOutput_set_script_pubkey"))) TS_WatchedOutput_set_script_pubkey(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_WatchedOutput_set_script_pubkey"))) TS_WatchedOutput_set_script_pubkey(uint64_t this_ptr, int8_tArray val) { LDKWatchedOutput this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_u8Z val_ref; val_ref.datalen = val->arr_len; val_ref.data = MALLOC(val_ref.datalen, "LDKCVec_u8Z Bytes"); @@ -23163,13 +21837,13 @@ void __attribute__((export_name("TS_WatchedOutput_set_script_pubkey"))) TS_Watc 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) { +uint64_t __attribute__((export_name("TS_WatchedOutput_new"))) TS_WatchedOutput_new(int8_tArray block_hash_arg, uint64_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); 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); + outpoint_arg_conv.inner = untag_ptr(outpoint_arg); + outpoint_arg_conv.is_owned = ptr_is_owned(outpoint_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(outpoint_arg_conv); outpoint_arg_conv = OutPoint_clone(&outpoint_arg_conv); LDKCVec_u8Z script_pubkey_arg_ref; @@ -23177,75 +21851,63 @@ uint32_t __attribute__((export_name("TS_WatchedOutput_new"))) TS_WatchedOutput_ 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); FREE(script_pubkey_arg); LDKWatchedOutput ret_var = WatchedOutput_new(block_hash_arg_ref, outpoint_arg_conv, script_pubkey_arg_ref); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t WatchedOutput_clone_ptr(LDKWatchedOutput *NONNULL_PTR arg) { +static inline uint64_t WatchedOutput_clone_ptr(LDKWatchedOutput *NONNULL_PTR arg) { LDKWatchedOutput ret_var = WatchedOutput_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_WatchedOutput_clone_ptr"))) TS_WatchedOutput_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_WatchedOutput_clone_ptr"))) TS_WatchedOutput_clone_ptr(uint64_t arg) { LDKWatchedOutput arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = WatchedOutput_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = WatchedOutput_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_WatchedOutput_clone"))) TS_WatchedOutput_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_WatchedOutput_clone"))) TS_WatchedOutput_clone(uint64_t orig) { LDKWatchedOutput orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKWatchedOutput ret_var = WatchedOutput_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int64_t __attribute__((export_name("TS_WatchedOutput_hash"))) TS_WatchedOutput_hash(uint32_t o) { +int64_t __attribute__((export_name("TS_WatchedOutput_hash"))) TS_WatchedOutput_hash(uint64_t o) { LDKWatchedOutput o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = false; + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); + o_conv.is_owned = false; int64_t ret_conv = WatchedOutput_hash(&o_conv); return ret_conv; } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_BroadcasterInterface_free"))) TS_BroadcasterInterface_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKBroadcasterInterface this_ptr_conv = *(LDKBroadcasterInterface*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); BroadcasterInterface_free(this_ptr_conv); } -uint32_t __attribute__((export_name("TS_ConfirmationTarget_clone"))) TS_ConfirmationTarget_clone(uint32_t orig) { - LDKConfirmationTarget* orig_conv = (LDKConfirmationTarget*)(orig & ~1); +uint32_t __attribute__((export_name("TS_ConfirmationTarget_clone"))) TS_ConfirmationTarget_clone(uint64_t orig) { + LDKConfirmationTarget* orig_conv = (LDKConfirmationTarget*)untag_ptr(orig); uint32_t ret_conv = LDKConfirmationTarget_to_js(ConfirmationTarget_clone(orig_conv)); return ret_conv; } @@ -23265,117 +21927,112 @@ uint32_t __attribute__((export_name("TS_ConfirmationTarget_high_priority"))) TS return ret_conv; } -jboolean __attribute__((export_name("TS_ConfirmationTarget_eq"))) TS_ConfirmationTarget_eq(uint32_t a, uint32_t b) { - LDKConfirmationTarget* a_conv = (LDKConfirmationTarget*)(a & ~1); - LDKConfirmationTarget* b_conv = (LDKConfirmationTarget*)(b & ~1); +jboolean __attribute__((export_name("TS_ConfirmationTarget_eq"))) TS_ConfirmationTarget_eq(uint64_t a, uint64_t b) { + LDKConfirmationTarget* a_conv = (LDKConfirmationTarget*)untag_ptr(a); + LDKConfirmationTarget* b_conv = (LDKConfirmationTarget*)untag_ptr(b); jboolean ret_conv = ConfirmationTarget_eq(a_conv, b_conv); return ret_conv; } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_FeeEstimator_free"))) TS_FeeEstimator_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKFeeEstimator this_ptr_conv = *(LDKFeeEstimator*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); FeeEstimator_free(this_ptr_conv); } -void __attribute__((export_name("TS_MonitorUpdateId_free"))) TS_MonitorUpdateId_free(uint32_t this_obj) { +void __attribute__((export_name("TS_MonitorUpdateId_free"))) TS_MonitorUpdateId_free(uint64_t this_obj) { LDKMonitorUpdateId this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); MonitorUpdateId_free(this_obj_conv); } -static inline uintptr_t MonitorUpdateId_clone_ptr(LDKMonitorUpdateId *NONNULL_PTR arg) { +static inline uint64_t MonitorUpdateId_clone_ptr(LDKMonitorUpdateId *NONNULL_PTR arg) { LDKMonitorUpdateId ret_var = MonitorUpdateId_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_MonitorUpdateId_clone_ptr"))) TS_MonitorUpdateId_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_MonitorUpdateId_clone_ptr"))) TS_MonitorUpdateId_clone_ptr(uint64_t arg) { LDKMonitorUpdateId arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = MonitorUpdateId_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = MonitorUpdateId_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_MonitorUpdateId_clone"))) TS_MonitorUpdateId_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_MonitorUpdateId_clone"))) TS_MonitorUpdateId_clone(uint64_t orig) { LDKMonitorUpdateId orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKMonitorUpdateId ret_var = MonitorUpdateId_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int64_t __attribute__((export_name("TS_MonitorUpdateId_hash"))) TS_MonitorUpdateId_hash(uint32_t o) { +int64_t __attribute__((export_name("TS_MonitorUpdateId_hash"))) TS_MonitorUpdateId_hash(uint64_t o) { LDKMonitorUpdateId o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = false; + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); + o_conv.is_owned = false; int64_t ret_conv = MonitorUpdateId_hash(&o_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_MonitorUpdateId_eq"))) TS_MonitorUpdateId_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_MonitorUpdateId_eq"))) TS_MonitorUpdateId_eq(uint64_t a, uint64_t b) { LDKMonitorUpdateId a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKMonitorUpdateId b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = MonitorUpdateId_eq(&a_conv, &b_conv); return ret_conv; } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_Persist_free"))) TS_Persist_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKPersist this_ptr_conv = *(LDKPersist*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); Persist_free(this_ptr_conv); } -void __attribute__((export_name("TS_LockedChannelMonitor_free"))) TS_LockedChannelMonitor_free(uint32_t this_obj) { +void __attribute__((export_name("TS_LockedChannelMonitor_free"))) TS_LockedChannelMonitor_free(uint64_t this_obj) { LDKLockedChannelMonitor this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); LockedChannelMonitor_free(this_obj_conv); } -void __attribute__((export_name("TS_ChainMonitor_free"))) TS_ChainMonitor_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChainMonitor_free"))) TS_ChainMonitor_free(uint64_t this_obj) { LDKChainMonitor this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChainMonitor_free(this_obj_conv); } -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*)(((uintptr_t)chain_source) & ~1); +uint64_t __attribute__((export_name("TS_ChainMonitor_new"))) TS_ChainMonitor_new(uint64_t chain_source, uint64_t broadcaster, uint64_t logger, uint64_t feeest, uint64_t persister) { + void* chain_source_ptr = untag_ptr(chain_source); 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 @@ -23386,28 +22043,28 @@ uint32_t __attribute__((export_name("TS_ChainMonitor_new"))) TS_ChainMonitor_ne LDKFilter_JCalls_cloned(&chain_source_conv.some); } } - void* broadcaster_ptr = (void*)(((uintptr_t)broadcaster) & ~1); + void* broadcaster_ptr = untag_ptr(broadcaster); CHECK_ACCESS(broadcaster_ptr); LDKBroadcasterInterface broadcaster_conv = *(LDKBroadcasterInterface*)(broadcaster_ptr); if (broadcaster_conv.free == LDKBroadcasterInterface_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKBroadcasterInterface_JCalls_cloned(&broadcaster_conv); } - void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); + void* logger_ptr = untag_ptr(logger); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); if (logger_conv.free == LDKLogger_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKLogger_JCalls_cloned(&logger_conv); } - void* feeest_ptr = (void*)(((uintptr_t)feeest) & ~1); + void* feeest_ptr = untag_ptr(feeest); CHECK_ACCESS(feeest_ptr); LDKFeeEstimator feeest_conv = *(LDKFeeEstimator*)(feeest_ptr); if (feeest_conv.free == LDKFeeEstimator_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKFeeEstimator_JCalls_cloned(&feeest_conv); } - void* persister_ptr = (void*)(((uintptr_t)persister) & ~1); + void* persister_ptr = untag_ptr(persister); CHECK_ACCESS(persister_ptr); LDKPersist persister_conv = *(LDKPersist*)(persister_ptr); if (persister_conv.free == LDKPersist_JCalls_free) { @@ -23415,47 +22072,43 @@ uint32_t __attribute__((export_name("TS_ChainMonitor_new"))) TS_ChainMonitor_ne LDKPersist_JCalls_cloned(&persister_conv); } LDKChainMonitor ret_var = ChainMonitor_new(chain_source_conv, broadcaster_conv, logger_conv, feeest_conv, persister_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_tArray __attribute__((export_name("TS_ChainMonitor_get_claimable_balances"))) TS_ChainMonitor_get_claimable_balances(uint32_t this_arg, uint32_tArray ignored_channels) { +uint64_tArray __attribute__((export_name("TS_ChainMonitor_get_claimable_balances"))) TS_ChainMonitor_get_claimable_balances(uint64_t this_arg, uint64_tArray ignored_channels) { LDKChainMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCVec_ChannelDetailsZ ignored_channels_constr; ignored_channels_constr.datalen = ignored_channels->arr_len; if (ignored_channels_constr.datalen > 0) 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; + uint64_t* ignored_channels_vals = ignored_channels->elems; for (size_t q = 0; q < ignored_channels_constr.datalen; q++) { - uint32_t ignored_channels_conv_16 = ignored_channels_vals[q]; + uint64_t ignored_channels_conv_16 = ignored_channels_vals[q]; LDKChannelDetails ignored_channels_conv_16_conv; - ignored_channels_conv_16_conv.inner = (void*)(ignored_channels_conv_16 & (~1)); - ignored_channels_conv_16_conv.is_owned = (ignored_channels_conv_16 & 1) || (ignored_channels_conv_16 == 0); + ignored_channels_conv_16_conv.inner = untag_ptr(ignored_channels_conv_16); + ignored_channels_conv_16_conv.is_owned = ptr_is_owned(ignored_channels_conv_16); CHECK_INNER_FIELD_ACCESS_OR_NULL(ignored_channels_conv_16_conv); ignored_channels_conv_16_conv = ChannelDetails_clone(&ignored_channels_conv_16_conv); ignored_channels_constr.data[q] = ignored_channels_conv_16_conv; } FREE(ignored_channels); LDKCVec_BalanceZ ret_var = ChainMonitor_get_claimable_balances(&this_arg_conv, ignored_channels_constr); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t j = 0; j < ret_var.datalen; j++) { LDKBalance *ret_conv_9_copy = MALLOC(sizeof(LDKBalance), "LDKBalance"); *ret_conv_9_copy = ret_var.data[j]; - uint32_t ret_conv_9_ref = (uintptr_t)ret_conv_9_copy; + uint64_t ret_conv_9_ref = tag_ptr(ret_conv_9_copy, true); ret_arr_ptr[j] = ret_conv_9_ref; } @@ -23463,40 +22116,37 @@ uint32_tArray __attribute__((export_name("TS_ChainMonitor_get_claimable_balance return ret_arr; } -uint32_t __attribute__((export_name("TS_ChainMonitor_get_monitor"))) TS_ChainMonitor_get_monitor(uint32_t this_arg, uint32_t funding_txo) { +uint64_t __attribute__((export_name("TS_ChainMonitor_get_monitor"))) TS_ChainMonitor_get_monitor(uint64_t this_arg, uint64_t funding_txo) { LDKChainMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKOutPoint funding_txo_conv; - funding_txo_conv.inner = (void*)(funding_txo & (~1)); - funding_txo_conv.is_owned = (funding_txo & 1) || (funding_txo == 0); + funding_txo_conv.inner = untag_ptr(funding_txo); + funding_txo_conv.is_owned = ptr_is_owned(funding_txo); CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_txo_conv); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_tArray __attribute__((export_name("TS_ChainMonitor_list_monitors"))) TS_ChainMonitor_list_monitors(uint32_t this_arg) { +uint64_tArray __attribute__((export_name("TS_ChainMonitor_list_monitors"))) TS_ChainMonitor_list_monitors(uint64_t this_arg) { LDKChainMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCVec_OutPointZ ret_var = ChainMonitor_list_monitors(&this_arg_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t k = 0; k < ret_var.datalen; k++) { LDKOutPoint ret_conv_10_var = ret_var.data[k]; - uint32_t ret_conv_10_ref = 0; - 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. + uint64_t ret_conv_10_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_10_var); - ret_conv_10_ref = (uintptr_t)ret_conv_10_var.inner; - if (ret_conv_10_var.is_owned) { - ret_conv_10_ref |= 1; - } + ret_conv_10_ref = tag_ptr(ret_conv_10_var.inner, ret_conv_10_var.is_owned); ret_arr_ptr[k] = ret_conv_10_ref; } @@ -23504,134 +22154,134 @@ uint32_tArray __attribute__((export_name("TS_ChainMonitor_list_monitors"))) TS_ return ret_arr; } -uint32_t __attribute__((export_name("TS_ChainMonitor_channel_monitor_updated"))) TS_ChainMonitor_channel_monitor_updated(uint32_t this_arg, uint32_t funding_txo, uint32_t completed_update_id) { +uint64_t __attribute__((export_name("TS_ChainMonitor_channel_monitor_updated"))) TS_ChainMonitor_channel_monitor_updated(uint64_t this_arg, uint64_t funding_txo, uint64_t completed_update_id) { LDKChainMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKOutPoint funding_txo_conv; - funding_txo_conv.inner = (void*)(funding_txo & (~1)); - funding_txo_conv.is_owned = (funding_txo & 1) || (funding_txo == 0); + funding_txo_conv.inner = untag_ptr(funding_txo); + funding_txo_conv.is_owned = ptr_is_owned(funding_txo); CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_txo_conv); funding_txo_conv = OutPoint_clone(&funding_txo_conv); LDKMonitorUpdateId completed_update_id_conv; - completed_update_id_conv.inner = (void*)(completed_update_id & (~1)); - completed_update_id_conv.is_owned = (completed_update_id & 1) || (completed_update_id == 0); + completed_update_id_conv.inner = untag_ptr(completed_update_id); + completed_update_id_conv.is_owned = ptr_is_owned(completed_update_id); CHECK_INNER_FIELD_ACCESS_OR_NULL(completed_update_id_conv); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_ChainMonitor_as_Listen"))) TS_ChainMonitor_as_Listen(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ChainMonitor_as_Listen"))) TS_ChainMonitor_as_Listen(uint64_t this_arg) { LDKChainMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKListen* ret_ret = MALLOC(sizeof(LDKListen), "LDKListen"); *ret_ret = ChainMonitor_as_Listen(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_t __attribute__((export_name("TS_ChainMonitor_as_Confirm"))) TS_ChainMonitor_as_Confirm(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ChainMonitor_as_Confirm"))) TS_ChainMonitor_as_Confirm(uint64_t this_arg) { LDKChainMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKConfirm* ret_ret = MALLOC(sizeof(LDKConfirm), "LDKConfirm"); *ret_ret = ChainMonitor_as_Confirm(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_t __attribute__((export_name("TS_ChainMonitor_as_Watch"))) TS_ChainMonitor_as_Watch(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ChainMonitor_as_Watch"))) TS_ChainMonitor_as_Watch(uint64_t this_arg) { LDKChainMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKWatch* ret_ret = MALLOC(sizeof(LDKWatch), "LDKWatch"); *ret_ret = ChainMonitor_as_Watch(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_t __attribute__((export_name("TS_ChainMonitor_as_EventsProvider"))) TS_ChainMonitor_as_EventsProvider(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ChainMonitor_as_EventsProvider"))) TS_ChainMonitor_as_EventsProvider(uint64_t this_arg) { LDKChainMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKEventsProvider* ret_ret = MALLOC(sizeof(LDKEventsProvider), "LDKEventsProvider"); *ret_ret = ChainMonitor_as_EventsProvider(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -void __attribute__((export_name("TS_ChannelMonitorUpdate_free"))) TS_ChannelMonitorUpdate_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChannelMonitorUpdate_free"))) TS_ChannelMonitorUpdate_free(uint64_t this_obj) { LDKChannelMonitorUpdate this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChannelMonitorUpdate_free(this_obj_conv); } -int64_t __attribute__((export_name("TS_ChannelMonitorUpdate_get_update_id"))) TS_ChannelMonitorUpdate_get_update_id(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelMonitorUpdate_get_update_id"))) TS_ChannelMonitorUpdate_get_update_id(uint64_t this_ptr) { LDKChannelMonitorUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelMonitorUpdate_get_update_id(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelMonitorUpdate_set_update_id"))) TS_ChannelMonitorUpdate_set_update_id(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelMonitorUpdate_set_update_id"))) TS_ChannelMonitorUpdate_set_update_id(uint64_t this_ptr, int64_t val) { LDKChannelMonitorUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelMonitorUpdate_set_update_id(&this_ptr_conv, val); } -static inline uintptr_t ChannelMonitorUpdate_clone_ptr(LDKChannelMonitorUpdate *NONNULL_PTR arg) { +static inline uint64_t ChannelMonitorUpdate_clone_ptr(LDKChannelMonitorUpdate *NONNULL_PTR arg) { LDKChannelMonitorUpdate ret_var = ChannelMonitorUpdate_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelMonitorUpdate_clone_ptr"))) TS_ChannelMonitorUpdate_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ChannelMonitorUpdate_clone_ptr"))) TS_ChannelMonitorUpdate_clone_ptr(uint64_t arg) { LDKChannelMonitorUpdate arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ChannelMonitorUpdate_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ChannelMonitorUpdate_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelMonitorUpdate_clone"))) TS_ChannelMonitorUpdate_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ChannelMonitorUpdate_clone"))) TS_ChannelMonitorUpdate_clone(uint64_t orig) { LDKChannelMonitorUpdate orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKChannelMonitorUpdate ret_var = ChannelMonitorUpdate_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_ChannelMonitorUpdate_write"))) TS_ChannelMonitorUpdate_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ChannelMonitorUpdate_write"))) TS_ChannelMonitorUpdate_write(uint64_t obj) { LDKChannelMonitorUpdate obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ChannelMonitorUpdate_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -23639,95 +22289,95 @@ int8_tArray __attribute__((export_name("TS_ChannelMonitorUpdate_write"))) TS_Ch return ret_arr; } -uint32_t __attribute__((export_name("TS_ChannelMonitorUpdate_read"))) TS_ChannelMonitorUpdate_read(int8_tArray ser) { +uint64_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; LDKCResult_ChannelMonitorUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelMonitorUpdateDecodeErrorZ), "LDKCResult_ChannelMonitorUpdateDecodeErrorZ"); *ret_conv = ChannelMonitorUpdate_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_MonitorEvent_free"))) TS_MonitorEvent_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKMonitorEvent this_ptr_conv = *(LDKMonitorEvent*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); MonitorEvent_free(this_ptr_conv); } -static inline uintptr_t MonitorEvent_clone_ptr(LDKMonitorEvent *NONNULL_PTR arg) { +static inline uint64_t MonitorEvent_clone_ptr(LDKMonitorEvent *NONNULL_PTR arg) { LDKMonitorEvent *ret_copy = MALLOC(sizeof(LDKMonitorEvent), "LDKMonitorEvent"); *ret_copy = MonitorEvent_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_MonitorEvent_clone_ptr"))) TS_MonitorEvent_clone_ptr(uint32_t arg) { - LDKMonitorEvent* arg_conv = (LDKMonitorEvent*)arg; - uint32_t ret_conv = MonitorEvent_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_MonitorEvent_clone_ptr"))) TS_MonitorEvent_clone_ptr(uint64_t arg) { + LDKMonitorEvent* arg_conv = (LDKMonitorEvent*)untag_ptr(arg); + int64_t ret_conv = MonitorEvent_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_MonitorEvent_clone"))) TS_MonitorEvent_clone(uint32_t orig) { - LDKMonitorEvent* orig_conv = (LDKMonitorEvent*)orig; +uint64_t __attribute__((export_name("TS_MonitorEvent_clone"))) TS_MonitorEvent_clone(uint64_t orig) { + LDKMonitorEvent* orig_conv = (LDKMonitorEvent*)untag_ptr(orig); LDKMonitorEvent *ret_copy = MALLOC(sizeof(LDKMonitorEvent), "LDKMonitorEvent"); *ret_copy = MonitorEvent_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_MonitorEvent_htlcevent"))) TS_MonitorEvent_htlcevent(uint32_t a) { +uint64_t __attribute__((export_name("TS_MonitorEvent_htlcevent"))) TS_MonitorEvent_htlcevent(uint64_t a) { LDKHTLCUpdate a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = (a & 1) || (a == 0); + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); a_conv = HTLCUpdate_clone(&a_conv); LDKMonitorEvent *ret_copy = MALLOC(sizeof(LDKMonitorEvent), "LDKMonitorEvent"); *ret_copy = MonitorEvent_htlcevent(a_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_MonitorEvent_commitment_tx_confirmed"))) TS_MonitorEvent_commitment_tx_confirmed(uint32_t a) { +uint64_t __attribute__((export_name("TS_MonitorEvent_commitment_tx_confirmed"))) TS_MonitorEvent_commitment_tx_confirmed(uint64_t a) { LDKOutPoint a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = (a & 1) || (a == 0); + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); a_conv = OutPoint_clone(&a_conv); LDKMonitorEvent *ret_copy = MALLOC(sizeof(LDKMonitorEvent), "LDKMonitorEvent"); *ret_copy = MonitorEvent_commitment_tx_confirmed(a_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_MonitorEvent_update_completed"))) TS_MonitorEvent_update_completed(uint32_t funding_txo, int64_t monitor_update_id) { +uint64_t __attribute__((export_name("TS_MonitorEvent_update_completed"))) TS_MonitorEvent_update_completed(uint64_t funding_txo, int64_t monitor_update_id) { LDKOutPoint funding_txo_conv; - funding_txo_conv.inner = (void*)(funding_txo & (~1)); - funding_txo_conv.is_owned = (funding_txo & 1) || (funding_txo == 0); + funding_txo_conv.inner = untag_ptr(funding_txo); + funding_txo_conv.is_owned = ptr_is_owned(funding_txo); CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_txo_conv); 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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_MonitorEvent_update_failed"))) TS_MonitorEvent_update_failed(uint32_t a) { +uint64_t __attribute__((export_name("TS_MonitorEvent_update_failed"))) TS_MonitorEvent_update_failed(uint64_t a) { LDKOutPoint a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = (a & 1) || (a == 0); + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); a_conv = OutPoint_clone(&a_conv); LDKMonitorEvent *ret_copy = MALLOC(sizeof(LDKMonitorEvent), "LDKMonitorEvent"); *ret_copy = MonitorEvent_update_failed(a_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -int8_tArray __attribute__((export_name("TS_MonitorEvent_write"))) TS_MonitorEvent_write(uint32_t obj) { - LDKMonitorEvent* obj_conv = (LDKMonitorEvent*)obj; +int8_tArray __attribute__((export_name("TS_MonitorEvent_write"))) TS_MonitorEvent_write(uint64_t obj) { + LDKMonitorEvent* obj_conv = (LDKMonitorEvent*)untag_ptr(obj); LDKCVec_u8Z ret_var = MonitorEvent_write(obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -23735,67 +22385,60 @@ int8_tArray __attribute__((export_name("TS_MonitorEvent_write"))) TS_MonitorEve return ret_arr; } -uint32_t __attribute__((export_name("TS_MonitorEvent_read"))) TS_MonitorEvent_read(int8_tArray ser) { +uint64_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; LDKCResult_COption_MonitorEventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_MonitorEventZDecodeErrorZ), "LDKCResult_COption_MonitorEventZDecodeErrorZ"); *ret_conv = MonitorEvent_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_HTLCUpdate_free"))) TS_HTLCUpdate_free(uint32_t this_obj) { +void __attribute__((export_name("TS_HTLCUpdate_free"))) TS_HTLCUpdate_free(uint64_t this_obj) { LDKHTLCUpdate this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); HTLCUpdate_free(this_obj_conv); } -static inline uintptr_t HTLCUpdate_clone_ptr(LDKHTLCUpdate *NONNULL_PTR arg) { +static inline uint64_t HTLCUpdate_clone_ptr(LDKHTLCUpdate *NONNULL_PTR arg) { LDKHTLCUpdate ret_var = HTLCUpdate_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_HTLCUpdate_clone_ptr"))) TS_HTLCUpdate_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_HTLCUpdate_clone_ptr"))) TS_HTLCUpdate_clone_ptr(uint64_t arg) { LDKHTLCUpdate arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = HTLCUpdate_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = HTLCUpdate_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_HTLCUpdate_clone"))) TS_HTLCUpdate_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_HTLCUpdate_clone"))) TS_HTLCUpdate_clone(uint64_t orig) { LDKHTLCUpdate orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKHTLCUpdate ret_var = HTLCUpdate_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_HTLCUpdate_write"))) TS_HTLCUpdate_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_HTLCUpdate_write"))) TS_HTLCUpdate_write(uint64_t obj) { LDKHTLCUpdate obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = HTLCUpdate_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -23803,131 +22446,124 @@ int8_tArray __attribute__((export_name("TS_HTLCUpdate_write"))) TS_HTLCUpdate_w return ret_arr; } -uint32_t __attribute__((export_name("TS_HTLCUpdate_read"))) TS_HTLCUpdate_read(int8_tArray ser) { +uint64_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; LDKCResult_HTLCUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCUpdateDecodeErrorZ), "LDKCResult_HTLCUpdateDecodeErrorZ"); *ret_conv = HTLCUpdate_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_Balance_free"))) TS_Balance_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKBalance this_ptr_conv = *(LDKBalance*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); Balance_free(this_ptr_conv); } -static inline uintptr_t Balance_clone_ptr(LDKBalance *NONNULL_PTR arg) { +static inline uint64_t Balance_clone_ptr(LDKBalance *NONNULL_PTR arg) { LDKBalance *ret_copy = MALLOC(sizeof(LDKBalance), "LDKBalance"); *ret_copy = Balance_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Balance_clone_ptr"))) TS_Balance_clone_ptr(uint32_t arg) { - LDKBalance* arg_conv = (LDKBalance*)arg; - uint32_t ret_conv = Balance_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_Balance_clone_ptr"))) TS_Balance_clone_ptr(uint64_t arg) { + LDKBalance* arg_conv = (LDKBalance*)untag_ptr(arg); + int64_t ret_conv = Balance_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_Balance_clone"))) TS_Balance_clone(uint32_t orig) { - LDKBalance* orig_conv = (LDKBalance*)orig; +uint64_t __attribute__((export_name("TS_Balance_clone"))) TS_Balance_clone(uint64_t orig) { + LDKBalance* orig_conv = (LDKBalance*)untag_ptr(orig); LDKBalance *ret_copy = MALLOC(sizeof(LDKBalance), "LDKBalance"); *ret_copy = Balance_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -jboolean __attribute__((export_name("TS_Balance_eq"))) TS_Balance_eq(uint32_t a, uint32_t b) { - LDKBalance* a_conv = (LDKBalance*)a; - LDKBalance* b_conv = (LDKBalance*)b; +jboolean __attribute__((export_name("TS_Balance_eq"))) TS_Balance_eq(uint64_t a, uint64_t b) { + LDKBalance* a_conv = (LDKBalance*)untag_ptr(a); + LDKBalance* b_conv = (LDKBalance*)untag_ptr(b); jboolean ret_conv = Balance_eq(a_conv, b_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelMonitor_free"))) TS_ChannelMonitor_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChannelMonitor_free"))) TS_ChannelMonitor_free(uint64_t this_obj) { LDKChannelMonitor this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChannelMonitor_free(this_obj_conv); } -static inline uintptr_t ChannelMonitor_clone_ptr(LDKChannelMonitor *NONNULL_PTR arg) { +static inline uint64_t ChannelMonitor_clone_ptr(LDKChannelMonitor *NONNULL_PTR arg) { LDKChannelMonitor ret_var = ChannelMonitor_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelMonitor_clone_ptr"))) TS_ChannelMonitor_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ChannelMonitor_clone_ptr"))) TS_ChannelMonitor_clone_ptr(uint64_t arg) { LDKChannelMonitor arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ChannelMonitor_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ChannelMonitor_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelMonitor_clone"))) TS_ChannelMonitor_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ChannelMonitor_clone"))) TS_ChannelMonitor_clone(uint64_t orig) { LDKChannelMonitor orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKChannelMonitor ret_var = ChannelMonitor_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_ChannelMonitor_write"))) TS_ChannelMonitor_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ChannelMonitor_write"))) TS_ChannelMonitor_write(uint64_t obj) { LDKChannelMonitor obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ChannelMonitor_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -23935,95 +22571,102 @@ int8_tArray __attribute__((export_name("TS_ChannelMonitor_write"))) TS_ChannelM return ret_arr; } -uint32_t __attribute__((export_name("TS_ChannelMonitor_update_monitor"))) TS_ChannelMonitor_update_monitor(uint32_t this_arg, uint32_t updates, uint32_t broadcaster, uint32_t fee_estimator, uint32_t logger) { +uint64_t __attribute__((export_name("TS_ChannelMonitor_update_monitor"))) TS_ChannelMonitor_update_monitor(uint64_t this_arg, uint64_t updates, uint64_t broadcaster, uint64_t fee_estimator, uint64_t logger) { LDKChannelMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKChannelMonitorUpdate updates_conv; - updates_conv.inner = (void*)(updates & (~1)); - updates_conv.is_owned = false; + updates_conv.inner = untag_ptr(updates); + updates_conv.is_owned = ptr_is_owned(updates); CHECK_INNER_FIELD_ACCESS_OR_NULL(updates_conv); - void* broadcaster_ptr = (void*)(((uintptr_t)broadcaster) & ~1); - if (!(broadcaster & 1)) { CHECK_ACCESS(broadcaster_ptr); } + updates_conv.is_owned = false; + void* broadcaster_ptr = untag_ptr(broadcaster); + if (ptr_is_owned(broadcaster)) { CHECK_ACCESS(broadcaster_ptr); } LDKBroadcasterInterface* broadcaster_conv = (LDKBroadcasterInterface*)broadcaster_ptr; - void* fee_estimator_ptr = (void*)(((uintptr_t)fee_estimator) & ~1); + void* fee_estimator_ptr = untag_ptr(fee_estimator); CHECK_ACCESS(fee_estimator_ptr); LDKFeeEstimator fee_estimator_conv = *(LDKFeeEstimator*)(fee_estimator_ptr); if (fee_estimator_conv.free == LDKFeeEstimator_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKFeeEstimator_JCalls_cloned(&fee_estimator_conv); } - void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); - if (!(logger & 1)) { CHECK_ACCESS(logger_ptr); } + void* logger_ptr = untag_ptr(logger); + if (ptr_is_owned(logger)) { 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int64_t __attribute__((export_name("TS_ChannelMonitor_get_latest_update_id"))) TS_ChannelMonitor_get_latest_update_id(uint32_t this_arg) { +int64_t __attribute__((export_name("TS_ChannelMonitor_get_latest_update_id"))) TS_ChannelMonitor_get_latest_update_id(uint64_t this_arg) { LDKChannelMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int64_t ret_conv = ChannelMonitor_get_latest_update_id(&this_arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelMonitor_get_funding_txo"))) TS_ChannelMonitor_get_funding_txo(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ChannelMonitor_get_funding_txo"))) TS_ChannelMonitor_get_funding_txo(uint64_t this_arg) { LDKChannelMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKC2Tuple_OutPointScriptZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_OutPointScriptZ), "LDKC2Tuple_OutPointScriptZ"); *ret_conv = ChannelMonitor_get_funding_txo(&this_arg_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_tArray __attribute__((export_name("TS_ChannelMonitor_get_outputs_to_watch"))) TS_ChannelMonitor_get_outputs_to_watch(uint32_t this_arg) { +uint64_tArray __attribute__((export_name("TS_ChannelMonitor_get_outputs_to_watch"))) TS_ChannelMonitor_get_outputs_to_watch(uint64_t this_arg) { LDKChannelMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ ret_var = ChannelMonitor_get_outputs_to_watch(&this_arg_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t o = 0; o < ret_var.datalen; o++) { LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ* ret_conv_40_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ"); *ret_conv_40_conv = ret_var.data[o]; - ret_arr_ptr[o] = ((uint32_t)ret_conv_40_conv); + ret_arr_ptr[o] = tag_ptr(ret_conv_40_conv, true); } FREE(ret_var.data); return ret_arr; } -void __attribute__((export_name("TS_ChannelMonitor_load_outputs_to_watch"))) TS_ChannelMonitor_load_outputs_to_watch(uint32_t this_arg, uint32_t filter) { +void __attribute__((export_name("TS_ChannelMonitor_load_outputs_to_watch"))) TS_ChannelMonitor_load_outputs_to_watch(uint64_t this_arg, uint64_t filter) { LDKChannelMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); - void* filter_ptr = (void*)(((uintptr_t)filter) & ~1); - if (!(filter & 1)) { CHECK_ACCESS(filter_ptr); } + this_arg_conv.is_owned = false; + void* filter_ptr = untag_ptr(filter); + if (ptr_is_owned(filter)) { CHECK_ACCESS(filter_ptr); } LDKFilter* filter_conv = (LDKFilter*)filter_ptr; ChannelMonitor_load_outputs_to_watch(&this_arg_conv, filter_conv); } -uint32_tArray __attribute__((export_name("TS_ChannelMonitor_get_and_clear_pending_monitor_events"))) TS_ChannelMonitor_get_and_clear_pending_monitor_events(uint32_t this_arg) { +uint64_tArray __attribute__((export_name("TS_ChannelMonitor_get_and_clear_pending_monitor_events"))) TS_ChannelMonitor_get_and_clear_pending_monitor_events(uint64_t this_arg) { LDKChannelMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCVec_MonitorEventZ ret_var = ChannelMonitor_get_and_clear_pending_monitor_events(&this_arg_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t o = 0; o < ret_var.datalen; o++) { LDKMonitorEvent *ret_conv_14_copy = MALLOC(sizeof(LDKMonitorEvent), "LDKMonitorEvent"); *ret_conv_14_copy = ret_var.data[o]; - uint32_t ret_conv_14_ref = (uintptr_t)ret_conv_14_copy; + uint64_t ret_conv_14_ref = tag_ptr(ret_conv_14_copy, true); ret_arr_ptr[o] = ret_conv_14_ref; } @@ -24031,19 +22674,20 @@ uint32_tArray __attribute__((export_name("TS_ChannelMonitor_get_and_clear_pendi return ret_arr; } -uint32_tArray __attribute__((export_name("TS_ChannelMonitor_get_and_clear_pending_events"))) TS_ChannelMonitor_get_and_clear_pending_events(uint32_t this_arg) { +uint64_tArray __attribute__((export_name("TS_ChannelMonitor_get_and_clear_pending_events"))) TS_ChannelMonitor_get_and_clear_pending_events(uint64_t this_arg) { LDKChannelMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCVec_EventZ ret_var = ChannelMonitor_get_and_clear_pending_events(&this_arg_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t h = 0; h < ret_var.datalen; h++) { LDKEvent *ret_conv_7_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_conv_7_copy = ret_var.data[h]; - uint32_t ret_conv_7_ref = (uintptr_t)ret_conv_7_copy; + uint64_t ret_conv_7_ref = tag_ptr(ret_conv_7_copy, true); ret_arr_ptr[h] = ret_conv_7_ref; } @@ -24051,23 +22695,25 @@ uint32_tArray __attribute__((export_name("TS_ChannelMonitor_get_and_clear_pendi return ret_arr; } -int8_tArray __attribute__((export_name("TS_ChannelMonitor_get_counterparty_node_id"))) TS_ChannelMonitor_get_counterparty_node_id(uint32_t this_arg) { +int8_tArray __attribute__((export_name("TS_ChannelMonitor_get_counterparty_node_id"))) TS_ChannelMonitor_get_counterparty_node_id(uint64_t this_arg) { LDKChannelMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, ChannelMonitor_get_counterparty_node_id(&this_arg_conv).compressed_form, 33); return ret_arr; } -ptrArray __attribute__((export_name("TS_ChannelMonitor_get_latest_holder_commitment_txn"))) TS_ChannelMonitor_get_latest_holder_commitment_txn(uint32_t this_arg, uint32_t logger) { +ptrArray __attribute__((export_name("TS_ChannelMonitor_get_latest_holder_commitment_txn"))) TS_ChannelMonitor_get_latest_holder_commitment_txn(uint64_t this_arg, uint64_t logger) { LDKChannelMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); - void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); - if (!(logger & 1)) { CHECK_ACCESS(logger_ptr); } + this_arg_conv.is_owned = false; + void* logger_ptr = untag_ptr(logger); + if (ptr_is_owned(logger)) { 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; @@ -24085,11 +22731,12 @@ ptrArray __attribute__((export_name("TS_ChannelMonitor_get_latest_holder_commit return ret_arr; } -uint32_tArray __attribute__((export_name("TS_ChannelMonitor_block_connected"))) TS_ChannelMonitor_block_connected(uint32_t this_arg, int8_tArray header, uint32_tArray txdata, int32_t height, uint32_t broadcaster, uint32_t fee_estimator, uint32_t logger) { +uint64_tArray __attribute__((export_name("TS_ChannelMonitor_block_connected"))) TS_ChannelMonitor_block_connected(uint64_t this_arg, int8_tArray header, uint64_tArray txdata, int32_t height, uint64_t broadcaster, uint64_t fee_estimator, uint64_t logger) { LDKChannelMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; unsigned char header_arr[80]; CHECK(header->arr_len == 80); memcpy(header_arr, header->elems, 80); FREE(header); @@ -24100,31 +22747,31 @@ 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; + uint64_t* txdata_vals = txdata->elems; for (size_t c = 0; c < txdata_constr.datalen; c++) { - uint32_t txdata_conv_28 = txdata_vals[c]; - void* txdata_conv_28_ptr = (void*)(((uintptr_t)txdata_conv_28) & ~1); + uint64_t txdata_conv_28 = txdata_vals[c]; + void* txdata_conv_28_ptr = untag_ptr(txdata_conv_28); 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*)(((uintptr_t)txdata_conv_28) & ~1)); + txdata_conv_28_conv = C2Tuple_usizeTransactionZ_clone((LDKC2Tuple_usizeTransactionZ*)untag_ptr(txdata_conv_28)); txdata_constr.data[c] = txdata_conv_28_conv; } FREE(txdata); - void* broadcaster_ptr = (void*)(((uintptr_t)broadcaster) & ~1); + void* broadcaster_ptr = untag_ptr(broadcaster); CHECK_ACCESS(broadcaster_ptr); LDKBroadcasterInterface broadcaster_conv = *(LDKBroadcasterInterface*)(broadcaster_ptr); if (broadcaster_conv.free == LDKBroadcasterInterface_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKBroadcasterInterface_JCalls_cloned(&broadcaster_conv); } - void* fee_estimator_ptr = (void*)(((uintptr_t)fee_estimator) & ~1); + void* fee_estimator_ptr = untag_ptr(fee_estimator); CHECK_ACCESS(fee_estimator_ptr); LDKFeeEstimator fee_estimator_conv = *(LDKFeeEstimator*)(fee_estimator_ptr); if (fee_estimator_conv.free == LDKFeeEstimator_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKFeeEstimator_JCalls_cloned(&fee_estimator_conv); } - void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); + void* logger_ptr = untag_ptr(logger); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); if (logger_conv.free == LDKLogger_JCalls_free) { @@ -24132,43 +22779,44 @@ uint32_tArray __attribute__((export_name("TS_ChannelMonitor_block_connected"))) LDKLogger_JCalls_cloned(&logger_conv); } LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ ret_var = ChannelMonitor_block_connected(&this_arg_conv, header_ref, txdata_constr, height, broadcaster_conv, fee_estimator_conv, logger_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t n = 0; n < ret_var.datalen; n++) { LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* ret_conv_39_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ"); *ret_conv_39_conv = ret_var.data[n]; - ret_arr_ptr[n] = ((uint32_t)ret_conv_39_conv); + ret_arr_ptr[n] = tag_ptr(ret_conv_39_conv, true); } FREE(ret_var.data); return ret_arr; } -void __attribute__((export_name("TS_ChannelMonitor_block_disconnected"))) TS_ChannelMonitor_block_disconnected(uint32_t this_arg, int8_tArray header, int32_t height, uint32_t broadcaster, uint32_t fee_estimator, uint32_t logger) { +void __attribute__((export_name("TS_ChannelMonitor_block_disconnected"))) TS_ChannelMonitor_block_disconnected(uint64_t this_arg, int8_tArray header, int32_t height, uint64_t broadcaster, uint64_t fee_estimator, uint64_t logger) { LDKChannelMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; unsigned char header_arr[80]; CHECK(header->arr_len == 80); memcpy(header_arr, header->elems, 80); FREE(header); unsigned char (*header_ref)[80] = &header_arr; - void* broadcaster_ptr = (void*)(((uintptr_t)broadcaster) & ~1); + void* broadcaster_ptr = untag_ptr(broadcaster); CHECK_ACCESS(broadcaster_ptr); LDKBroadcasterInterface broadcaster_conv = *(LDKBroadcasterInterface*)(broadcaster_ptr); if (broadcaster_conv.free == LDKBroadcasterInterface_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKBroadcasterInterface_JCalls_cloned(&broadcaster_conv); } - void* fee_estimator_ptr = (void*)(((uintptr_t)fee_estimator) & ~1); + void* fee_estimator_ptr = untag_ptr(fee_estimator); CHECK_ACCESS(fee_estimator_ptr); LDKFeeEstimator fee_estimator_conv = *(LDKFeeEstimator*)(fee_estimator_ptr); if (fee_estimator_conv.free == LDKFeeEstimator_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKFeeEstimator_JCalls_cloned(&fee_estimator_conv); } - void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); + void* logger_ptr = untag_ptr(logger); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); if (logger_conv.free == LDKLogger_JCalls_free) { @@ -24178,11 +22826,12 @@ void __attribute__((export_name("TS_ChannelMonitor_block_disconnected"))) TS_Ch ChannelMonitor_block_disconnected(&this_arg_conv, header_ref, height, broadcaster_conv, fee_estimator_conv, logger_conv); } -uint32_tArray __attribute__((export_name("TS_ChannelMonitor_transactions_confirmed"))) TS_ChannelMonitor_transactions_confirmed(uint32_t this_arg, int8_tArray header, uint32_tArray txdata, int32_t height, uint32_t broadcaster, uint32_t fee_estimator, uint32_t logger) { +uint64_tArray __attribute__((export_name("TS_ChannelMonitor_transactions_confirmed"))) TS_ChannelMonitor_transactions_confirmed(uint64_t this_arg, int8_tArray header, uint64_tArray txdata, int32_t height, uint64_t broadcaster, uint64_t fee_estimator, uint64_t logger) { LDKChannelMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; unsigned char header_arr[80]; CHECK(header->arr_len == 80); memcpy(header_arr, header->elems, 80); FREE(header); @@ -24193,31 +22842,31 @@ 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; + uint64_t* txdata_vals = txdata->elems; for (size_t c = 0; c < txdata_constr.datalen; c++) { - uint32_t txdata_conv_28 = txdata_vals[c]; - void* txdata_conv_28_ptr = (void*)(((uintptr_t)txdata_conv_28) & ~1); + uint64_t txdata_conv_28 = txdata_vals[c]; + void* txdata_conv_28_ptr = untag_ptr(txdata_conv_28); 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*)(((uintptr_t)txdata_conv_28) & ~1)); + txdata_conv_28_conv = C2Tuple_usizeTransactionZ_clone((LDKC2Tuple_usizeTransactionZ*)untag_ptr(txdata_conv_28)); txdata_constr.data[c] = txdata_conv_28_conv; } FREE(txdata); - void* broadcaster_ptr = (void*)(((uintptr_t)broadcaster) & ~1); + void* broadcaster_ptr = untag_ptr(broadcaster); CHECK_ACCESS(broadcaster_ptr); LDKBroadcasterInterface broadcaster_conv = *(LDKBroadcasterInterface*)(broadcaster_ptr); if (broadcaster_conv.free == LDKBroadcasterInterface_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKBroadcasterInterface_JCalls_cloned(&broadcaster_conv); } - void* fee_estimator_ptr = (void*)(((uintptr_t)fee_estimator) & ~1); + void* fee_estimator_ptr = untag_ptr(fee_estimator); CHECK_ACCESS(fee_estimator_ptr); LDKFeeEstimator fee_estimator_conv = *(LDKFeeEstimator*)(fee_estimator_ptr); if (fee_estimator_conv.free == LDKFeeEstimator_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKFeeEstimator_JCalls_cloned(&fee_estimator_conv); } - void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); + void* logger_ptr = untag_ptr(logger); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); if (logger_conv.free == LDKLogger_JCalls_free) { @@ -24225,43 +22874,44 @@ uint32_tArray __attribute__((export_name("TS_ChannelMonitor_transactions_confir LDKLogger_JCalls_cloned(&logger_conv); } LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ ret_var = ChannelMonitor_transactions_confirmed(&this_arg_conv, header_ref, txdata_constr, height, broadcaster_conv, fee_estimator_conv, logger_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t n = 0; n < ret_var.datalen; n++) { LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* ret_conv_39_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ"); *ret_conv_39_conv = ret_var.data[n]; - ret_arr_ptr[n] = ((uint32_t)ret_conv_39_conv); + ret_arr_ptr[n] = tag_ptr(ret_conv_39_conv, true); } FREE(ret_var.data); return ret_arr; } -void __attribute__((export_name("TS_ChannelMonitor_transaction_unconfirmed"))) TS_ChannelMonitor_transaction_unconfirmed(uint32_t this_arg, int8_tArray txid, uint32_t broadcaster, uint32_t fee_estimator, uint32_t logger) { +void __attribute__((export_name("TS_ChannelMonitor_transaction_unconfirmed"))) TS_ChannelMonitor_transaction_unconfirmed(uint64_t this_arg, int8_tArray txid, uint64_t broadcaster, uint64_t fee_estimator, uint64_t logger) { LDKChannelMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; unsigned char txid_arr[32]; CHECK(txid->arr_len == 32); memcpy(txid_arr, txid->elems, 32); FREE(txid); unsigned char (*txid_ref)[32] = &txid_arr; - void* broadcaster_ptr = (void*)(((uintptr_t)broadcaster) & ~1); + void* broadcaster_ptr = untag_ptr(broadcaster); CHECK_ACCESS(broadcaster_ptr); LDKBroadcasterInterface broadcaster_conv = *(LDKBroadcasterInterface*)(broadcaster_ptr); if (broadcaster_conv.free == LDKBroadcasterInterface_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKBroadcasterInterface_JCalls_cloned(&broadcaster_conv); } - void* fee_estimator_ptr = (void*)(((uintptr_t)fee_estimator) & ~1); + void* fee_estimator_ptr = untag_ptr(fee_estimator); CHECK_ACCESS(fee_estimator_ptr); LDKFeeEstimator fee_estimator_conv = *(LDKFeeEstimator*)(fee_estimator_ptr); if (fee_estimator_conv.free == LDKFeeEstimator_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKFeeEstimator_JCalls_cloned(&fee_estimator_conv); } - void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); + void* logger_ptr = untag_ptr(logger); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); if (logger_conv.free == LDKLogger_JCalls_free) { @@ -24271,30 +22921,31 @@ void __attribute__((export_name("TS_ChannelMonitor_transaction_unconfirmed"))) ChannelMonitor_transaction_unconfirmed(&this_arg_conv, txid_ref, broadcaster_conv, fee_estimator_conv, logger_conv); } -uint32_tArray __attribute__((export_name("TS_ChannelMonitor_best_block_updated"))) TS_ChannelMonitor_best_block_updated(uint32_t this_arg, int8_tArray header, int32_t height, uint32_t broadcaster, uint32_t fee_estimator, uint32_t logger) { +uint64_tArray __attribute__((export_name("TS_ChannelMonitor_best_block_updated"))) TS_ChannelMonitor_best_block_updated(uint64_t this_arg, int8_tArray header, int32_t height, uint64_t broadcaster, uint64_t fee_estimator, uint64_t logger) { LDKChannelMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; unsigned char header_arr[80]; CHECK(header->arr_len == 80); memcpy(header_arr, header->elems, 80); FREE(header); unsigned char (*header_ref)[80] = &header_arr; - void* broadcaster_ptr = (void*)(((uintptr_t)broadcaster) & ~1); + void* broadcaster_ptr = untag_ptr(broadcaster); CHECK_ACCESS(broadcaster_ptr); LDKBroadcasterInterface broadcaster_conv = *(LDKBroadcasterInterface*)(broadcaster_ptr); if (broadcaster_conv.free == LDKBroadcasterInterface_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKBroadcasterInterface_JCalls_cloned(&broadcaster_conv); } - void* fee_estimator_ptr = (void*)(((uintptr_t)fee_estimator) & ~1); + void* fee_estimator_ptr = untag_ptr(fee_estimator); CHECK_ACCESS(fee_estimator_ptr); LDKFeeEstimator fee_estimator_conv = *(LDKFeeEstimator*)(fee_estimator_ptr); if (fee_estimator_conv.free == LDKFeeEstimator_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKFeeEstimator_JCalls_cloned(&fee_estimator_conv); } - void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); + void* logger_ptr = untag_ptr(logger); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); if (logger_conv.free == LDKLogger_JCalls_free) { @@ -24302,24 +22953,25 @@ uint32_tArray __attribute__((export_name("TS_ChannelMonitor_best_block_updated" LDKLogger_JCalls_cloned(&logger_conv); } LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ ret_var = ChannelMonitor_best_block_updated(&this_arg_conv, header_ref, height, broadcaster_conv, fee_estimator_conv, logger_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t n = 0; n < ret_var.datalen; n++) { LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* ret_conv_39_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ"); *ret_conv_39_conv = ret_var.data[n]; - ret_arr_ptr[n] = ((uint32_t)ret_conv_39_conv); + ret_arr_ptr[n] = tag_ptr(ret_conv_39_conv, true); } FREE(ret_var.data); return ret_arr; } -ptrArray __attribute__((export_name("TS_ChannelMonitor_get_relevant_txids"))) TS_ChannelMonitor_get_relevant_txids(uint32_t this_arg) { +ptrArray __attribute__((export_name("TS_ChannelMonitor_get_relevant_txids"))) TS_ChannelMonitor_get_relevant_txids(uint64_t this_arg) { LDKChannelMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCVec_TxidZ ret_var = ChannelMonitor_get_relevant_txids(&this_arg_conv); ptrArray ret_arr = NULL; ret_arr = init_ptrArray(ret_var.datalen, __LINE__); @@ -24334,36 +22986,33 @@ ptrArray __attribute__((export_name("TS_ChannelMonitor_get_relevant_txids"))) T return ret_arr; } -uint32_t __attribute__((export_name("TS_ChannelMonitor_current_best_block"))) TS_ChannelMonitor_current_best_block(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ChannelMonitor_current_best_block"))) TS_ChannelMonitor_current_best_block(uint64_t this_arg) { LDKChannelMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKBestBlock ret_var = ChannelMonitor_current_best_block(&this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_tArray __attribute__((export_name("TS_ChannelMonitor_get_claimable_balances"))) TS_ChannelMonitor_get_claimable_balances(uint32_t this_arg) { +uint64_tArray __attribute__((export_name("TS_ChannelMonitor_get_claimable_balances"))) TS_ChannelMonitor_get_claimable_balances(uint64_t this_arg) { LDKChannelMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCVec_BalanceZ ret_var = ChannelMonitor_get_claimable_balances(&this_arg_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t j = 0; j < ret_var.datalen; j++) { LDKBalance *ret_conv_9_copy = MALLOC(sizeof(LDKBalance), "LDKBalance"); *ret_conv_9_copy = ret_var.data[j]; - uint32_t ret_conv_9_ref = (uintptr_t)ret_conv_9_copy; + uint64_t ret_conv_9_ref = tag_ptr(ret_conv_9_copy, true); ret_arr_ptr[j] = ret_conv_9_ref; } @@ -24371,156 +23020,152 @@ uint32_tArray __attribute__((export_name("TS_ChannelMonitor_get_claimable_balan return ret_arr; } -uint32_t __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_read"))) TS_C2Tuple_BlockHashChannelMonitorZ_read(int8_tArray ser, uint32_t arg) { +uint64_t __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_read"))) TS_C2Tuple_BlockHashChannelMonitorZ_read(int8_tArray ser, uint64_t arg) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; ser_ref.data = ser->elems; - void* arg_ptr = (void*)(((uintptr_t)arg) & ~1); - if (!(arg & 1)) { CHECK_ACCESS(arg_ptr); } + void* arg_ptr = untag_ptr(arg); + if (ptr_is_owned(arg)) { CHECK_ACCESS(arg_ptr); } LDKKeysInterface* arg_conv = (LDKKeysInterface*)arg_ptr; LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ), "LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ"); *ret_conv = C2Tuple_BlockHashChannelMonitorZ_read(ser_ref, arg_conv); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_OutPoint_free"))) TS_OutPoint_free(uint32_t this_obj) { +void __attribute__((export_name("TS_OutPoint_free"))) TS_OutPoint_free(uint64_t this_obj) { LDKOutPoint this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); OutPoint_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_OutPoint_get_txid"))) TS_OutPoint_get_txid(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_OutPoint_get_txid"))) TS_OutPoint_get_txid(uint64_t this_ptr) { LDKOutPoint this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *OutPoint_get_txid(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_OutPoint_set_txid"))) TS_OutPoint_set_txid(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_OutPoint_set_txid"))) TS_OutPoint_set_txid(uint64_t this_ptr, int8_tArray val) { LDKOutPoint this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); OutPoint_set_txid(&this_ptr_conv, val_ref); } -int16_t __attribute__((export_name("TS_OutPoint_get_index"))) TS_OutPoint_get_index(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_OutPoint_get_index"))) TS_OutPoint_get_index(uint64_t this_ptr) { LDKOutPoint this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = OutPoint_get_index(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_OutPoint_set_index"))) TS_OutPoint_set_index(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_OutPoint_set_index"))) TS_OutPoint_set_index(uint64_t this_ptr, int16_t val) { LDKOutPoint this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; OutPoint_set_index(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_OutPoint_new"))) TS_OutPoint_new(int8_tArray txid_arg, int16_t index_arg) { +uint64_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); FREE(txid_arg); LDKOutPoint ret_var = OutPoint_new(txid_arg_ref, index_arg); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t OutPoint_clone_ptr(LDKOutPoint *NONNULL_PTR arg) { +static inline uint64_t OutPoint_clone_ptr(LDKOutPoint *NONNULL_PTR arg) { LDKOutPoint ret_var = OutPoint_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_OutPoint_clone_ptr"))) TS_OutPoint_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_OutPoint_clone_ptr"))) TS_OutPoint_clone_ptr(uint64_t arg) { LDKOutPoint arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = OutPoint_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = OutPoint_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_OutPoint_clone"))) TS_OutPoint_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_OutPoint_clone"))) TS_OutPoint_clone(uint64_t orig) { LDKOutPoint orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKOutPoint ret_var = OutPoint_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -jboolean __attribute__((export_name("TS_OutPoint_eq"))) TS_OutPoint_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_OutPoint_eq"))) TS_OutPoint_eq(uint64_t a, uint64_t b) { LDKOutPoint a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKOutPoint b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = OutPoint_eq(&a_conv, &b_conv); return ret_conv; } -int64_t __attribute__((export_name("TS_OutPoint_hash"))) TS_OutPoint_hash(uint32_t o) { +int64_t __attribute__((export_name("TS_OutPoint_hash"))) TS_OutPoint_hash(uint64_t o) { LDKOutPoint o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = false; + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); + o_conv.is_owned = false; int64_t ret_conv = OutPoint_hash(&o_conv); return ret_conv; } -int8_tArray __attribute__((export_name("TS_OutPoint_to_channel_id"))) TS_OutPoint_to_channel_id(uint32_t this_arg) { +int8_tArray __attribute__((export_name("TS_OutPoint_to_channel_id"))) TS_OutPoint_to_channel_id(uint64_t this_arg) { LDKOutPoint this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; 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; } -int8_tArray __attribute__((export_name("TS_OutPoint_write"))) TS_OutPoint_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_OutPoint_write"))) TS_OutPoint_write(uint64_t obj) { LDKOutPoint obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = OutPoint_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -24528,186 +23173,195 @@ int8_tArray __attribute__((export_name("TS_OutPoint_write"))) TS_OutPoint_write return ret_arr; } -uint32_t __attribute__((export_name("TS_OutPoint_read"))) TS_OutPoint_read(int8_tArray ser) { +uint64_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; LDKCResult_OutPointDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OutPointDecodeErrorZ), "LDKCResult_OutPointDecodeErrorZ"); *ret_conv = OutPoint_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_free"))) TS_DelayedPaymentOutputDescriptor_free(uint32_t this_obj) { +void __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_free"))) TS_DelayedPaymentOutputDescriptor_free(uint64_t this_obj) { LDKDelayedPaymentOutputDescriptor this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); DelayedPaymentOutputDescriptor_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_get_outpoint"))) TS_DelayedPaymentOutputDescriptor_get_outpoint(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_get_outpoint"))) TS_DelayedPaymentOutputDescriptor_get_outpoint(uint64_t this_ptr) { LDKDelayedPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKOutPoint ret_var = DelayedPaymentOutputDescriptor_get_outpoint(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_set_outpoint"))) TS_DelayedPaymentOutputDescriptor_set_outpoint(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_set_outpoint"))) TS_DelayedPaymentOutputDescriptor_set_outpoint(uint64_t this_ptr, uint64_t val) { LDKDelayedPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKOutPoint val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = OutPoint_clone(&val_conv); DelayedPaymentOutputDescriptor_set_outpoint(&this_ptr_conv, val_conv); } -int8_tArray __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_get_per_commitment_point"))) TS_DelayedPaymentOutputDescriptor_get_per_commitment_point(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_get_per_commitment_point"))) TS_DelayedPaymentOutputDescriptor_get_per_commitment_point(uint64_t this_ptr) { LDKDelayedPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_set_per_commitment_point"))) TS_DelayedPaymentOutputDescriptor_set_per_commitment_point(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_set_per_commitment_point"))) TS_DelayedPaymentOutputDescriptor_set_per_commitment_point(uint64_t this_ptr, int8_tArray val) { LDKDelayedPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); DelayedPaymentOutputDescriptor_set_per_commitment_point(&this_ptr_conv, val_ref); } -int16_t __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_get_to_self_delay"))) TS_DelayedPaymentOutputDescriptor_get_to_self_delay(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_get_to_self_delay"))) TS_DelayedPaymentOutputDescriptor_get_to_self_delay(uint64_t this_ptr) { LDKDelayedPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = DelayedPaymentOutputDescriptor_get_to_self_delay(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_set_to_self_delay"))) TS_DelayedPaymentOutputDescriptor_set_to_self_delay(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_set_to_self_delay"))) TS_DelayedPaymentOutputDescriptor_set_to_self_delay(uint64_t this_ptr, int16_t val) { LDKDelayedPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; DelayedPaymentOutputDescriptor_set_to_self_delay(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_get_output"))) TS_DelayedPaymentOutputDescriptor_get_output(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_get_output"))) TS_DelayedPaymentOutputDescriptor_get_output(uint64_t this_ptr) { LDKDelayedPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKTxOut* ret_ref = MALLOC(sizeof(LDKTxOut), "LDKTxOut"); *ret_ref = DelayedPaymentOutputDescriptor_get_output(&this_ptr_conv); - return (uint32_t)ret_ref; + return tag_ptr(ret_ref, true); } -void __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_set_output"))) TS_DelayedPaymentOutputDescriptor_set_output(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_set_output"))) TS_DelayedPaymentOutputDescriptor_set_output(uint64_t this_ptr, uint64_t val) { LDKDelayedPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKTxOut val_conv = *(LDKTxOut*)(val_ptr); - val_conv = TxOut_clone((LDKTxOut*)(((uintptr_t)val) & ~1)); + val_conv = TxOut_clone((LDKTxOut*)untag_ptr(val)); DelayedPaymentOutputDescriptor_set_output(&this_ptr_conv, val_conv); } -int8_tArray __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_get_revocation_pubkey"))) TS_DelayedPaymentOutputDescriptor_get_revocation_pubkey(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_get_revocation_pubkey"))) TS_DelayedPaymentOutputDescriptor_get_revocation_pubkey(uint64_t this_ptr) { LDKDelayedPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_set_revocation_pubkey"))) TS_DelayedPaymentOutputDescriptor_set_revocation_pubkey(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_set_revocation_pubkey"))) TS_DelayedPaymentOutputDescriptor_set_revocation_pubkey(uint64_t this_ptr, int8_tArray val) { LDKDelayedPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); DelayedPaymentOutputDescriptor_set_revocation_pubkey(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_get_channel_keys_id"))) TS_DelayedPaymentOutputDescriptor_get_channel_keys_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_get_channel_keys_id"))) TS_DelayedPaymentOutputDescriptor_get_channel_keys_id(uint64_t this_ptr) { LDKDelayedPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_set_channel_keys_id"))) TS_DelayedPaymentOutputDescriptor_set_channel_keys_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_set_channel_keys_id"))) TS_DelayedPaymentOutputDescriptor_set_channel_keys_id(uint64_t this_ptr, int8_tArray val) { LDKDelayedPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); DelayedPaymentOutputDescriptor_set_channel_keys_id(&this_ptr_conv, val_ref); } -int64_t __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_get_channel_value_satoshis"))) TS_DelayedPaymentOutputDescriptor_get_channel_value_satoshis(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_get_channel_value_satoshis"))) TS_DelayedPaymentOutputDescriptor_get_channel_value_satoshis(uint64_t this_ptr) { LDKDelayedPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = DelayedPaymentOutputDescriptor_get_channel_value_satoshis(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_set_channel_value_satoshis"))) TS_DelayedPaymentOutputDescriptor_set_channel_value_satoshis(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_set_channel_value_satoshis"))) TS_DelayedPaymentOutputDescriptor_set_channel_value_satoshis(uint64_t this_ptr, int64_t val) { LDKDelayedPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; DelayedPaymentOutputDescriptor_set_channel_value_satoshis(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_new"))) TS_DelayedPaymentOutputDescriptor_new(uint32_t outpoint_arg, int8_tArray per_commitment_point_arg, int16_t to_self_delay_arg, uint32_t output_arg, int8_tArray revocation_pubkey_arg, int8_tArray channel_keys_id_arg, int64_t channel_value_satoshis_arg) { +uint64_t __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_new"))) TS_DelayedPaymentOutputDescriptor_new(uint64_t outpoint_arg, int8_tArray per_commitment_point_arg, int16_t to_self_delay_arg, uint64_t output_arg, int8_tArray revocation_pubkey_arg, int8_tArray channel_keys_id_arg, int64_t channel_value_satoshis_arg) { LDKOutPoint outpoint_arg_conv; - outpoint_arg_conv.inner = (void*)(outpoint_arg & (~1)); - outpoint_arg_conv.is_owned = (outpoint_arg & 1) || (outpoint_arg == 0); + outpoint_arg_conv.inner = untag_ptr(outpoint_arg); + outpoint_arg_conv.is_owned = ptr_is_owned(outpoint_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(outpoint_arg_conv); 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); FREE(per_commitment_point_arg); - void* output_arg_ptr = (void*)(((uintptr_t)output_arg) & ~1); + void* output_arg_ptr = untag_ptr(output_arg); CHECK_ACCESS(output_arg_ptr); LDKTxOut output_arg_conv = *(LDKTxOut*)(output_arg_ptr); - output_arg_conv = TxOut_clone((LDKTxOut*)(((uintptr_t)output_arg) & ~1)); + output_arg_conv = TxOut_clone((LDKTxOut*)untag_ptr(output_arg)); LDKPublicKey revocation_pubkey_arg_ref; CHECK(revocation_pubkey_arg->arr_len == 33); memcpy(revocation_pubkey_arg_ref.compressed_form, revocation_pubkey_arg->elems, 33); FREE(revocation_pubkey_arg); @@ -24715,60 +23369,48 @@ uint32_t __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_new"))) CHECK(channel_keys_id_arg->arr_len == 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t DelayedPaymentOutputDescriptor_clone_ptr(LDKDelayedPaymentOutputDescriptor *NONNULL_PTR arg) { +static inline uint64_t DelayedPaymentOutputDescriptor_clone_ptr(LDKDelayedPaymentOutputDescriptor *NONNULL_PTR arg) { LDKDelayedPaymentOutputDescriptor ret_var = DelayedPaymentOutputDescriptor_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_clone_ptr"))) TS_DelayedPaymentOutputDescriptor_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_clone_ptr"))) TS_DelayedPaymentOutputDescriptor_clone_ptr(uint64_t arg) { LDKDelayedPaymentOutputDescriptor arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = DelayedPaymentOutputDescriptor_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = DelayedPaymentOutputDescriptor_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_clone"))) TS_DelayedPaymentOutputDescriptor_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_clone"))) TS_DelayedPaymentOutputDescriptor_clone(uint64_t orig) { LDKDelayedPaymentOutputDescriptor orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKDelayedPaymentOutputDescriptor ret_var = DelayedPaymentOutputDescriptor_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_write"))) TS_DelayedPaymentOutputDescriptor_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_write"))) TS_DelayedPaymentOutputDescriptor_write(uint64_t obj) { LDKDelayedPaymentOutputDescriptor obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = DelayedPaymentOutputDescriptor_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -24776,182 +23418,173 @@ int8_tArray __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_write return ret_arr; } -uint32_t __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_read"))) TS_DelayedPaymentOutputDescriptor_read(int8_tArray ser) { +uint64_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; LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ"); *ret_conv = DelayedPaymentOutputDescriptor_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_StaticPaymentOutputDescriptor_free"))) TS_StaticPaymentOutputDescriptor_free(uint32_t this_obj) { +void __attribute__((export_name("TS_StaticPaymentOutputDescriptor_free"))) TS_StaticPaymentOutputDescriptor_free(uint64_t this_obj) { LDKStaticPaymentOutputDescriptor this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); StaticPaymentOutputDescriptor_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_StaticPaymentOutputDescriptor_get_outpoint"))) TS_StaticPaymentOutputDescriptor_get_outpoint(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_StaticPaymentOutputDescriptor_get_outpoint"))) TS_StaticPaymentOutputDescriptor_get_outpoint(uint64_t this_ptr) { LDKStaticPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKOutPoint ret_var = StaticPaymentOutputDescriptor_get_outpoint(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_StaticPaymentOutputDescriptor_set_outpoint"))) TS_StaticPaymentOutputDescriptor_set_outpoint(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_StaticPaymentOutputDescriptor_set_outpoint"))) TS_StaticPaymentOutputDescriptor_set_outpoint(uint64_t this_ptr, uint64_t val) { LDKStaticPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKOutPoint val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = OutPoint_clone(&val_conv); StaticPaymentOutputDescriptor_set_outpoint(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_StaticPaymentOutputDescriptor_get_output"))) TS_StaticPaymentOutputDescriptor_get_output(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_StaticPaymentOutputDescriptor_get_output"))) TS_StaticPaymentOutputDescriptor_get_output(uint64_t this_ptr) { LDKStaticPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKTxOut* ret_ref = MALLOC(sizeof(LDKTxOut), "LDKTxOut"); *ret_ref = StaticPaymentOutputDescriptor_get_output(&this_ptr_conv); - return (uint32_t)ret_ref; + return tag_ptr(ret_ref, true); } -void __attribute__((export_name("TS_StaticPaymentOutputDescriptor_set_output"))) TS_StaticPaymentOutputDescriptor_set_output(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_StaticPaymentOutputDescriptor_set_output"))) TS_StaticPaymentOutputDescriptor_set_output(uint64_t this_ptr, uint64_t val) { LDKStaticPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKTxOut val_conv = *(LDKTxOut*)(val_ptr); - val_conv = TxOut_clone((LDKTxOut*)(((uintptr_t)val) & ~1)); + val_conv = TxOut_clone((LDKTxOut*)untag_ptr(val)); StaticPaymentOutputDescriptor_set_output(&this_ptr_conv, val_conv); } -int8_tArray __attribute__((export_name("TS_StaticPaymentOutputDescriptor_get_channel_keys_id"))) TS_StaticPaymentOutputDescriptor_get_channel_keys_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_StaticPaymentOutputDescriptor_get_channel_keys_id"))) TS_StaticPaymentOutputDescriptor_get_channel_keys_id(uint64_t this_ptr) { LDKStaticPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_StaticPaymentOutputDescriptor_set_channel_keys_id"))) TS_StaticPaymentOutputDescriptor_set_channel_keys_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_StaticPaymentOutputDescriptor_set_channel_keys_id"))) TS_StaticPaymentOutputDescriptor_set_channel_keys_id(uint64_t this_ptr, int8_tArray val) { LDKStaticPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); StaticPaymentOutputDescriptor_set_channel_keys_id(&this_ptr_conv, val_ref); } -int64_t __attribute__((export_name("TS_StaticPaymentOutputDescriptor_get_channel_value_satoshis"))) TS_StaticPaymentOutputDescriptor_get_channel_value_satoshis(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_StaticPaymentOutputDescriptor_get_channel_value_satoshis"))) TS_StaticPaymentOutputDescriptor_get_channel_value_satoshis(uint64_t this_ptr) { LDKStaticPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = StaticPaymentOutputDescriptor_get_channel_value_satoshis(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_StaticPaymentOutputDescriptor_set_channel_value_satoshis"))) TS_StaticPaymentOutputDescriptor_set_channel_value_satoshis(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_StaticPaymentOutputDescriptor_set_channel_value_satoshis"))) TS_StaticPaymentOutputDescriptor_set_channel_value_satoshis(uint64_t this_ptr, int64_t val) { LDKStaticPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; StaticPaymentOutputDescriptor_set_channel_value_satoshis(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_StaticPaymentOutputDescriptor_new"))) TS_StaticPaymentOutputDescriptor_new(uint32_t outpoint_arg, uint32_t output_arg, int8_tArray channel_keys_id_arg, int64_t channel_value_satoshis_arg) { +uint64_t __attribute__((export_name("TS_StaticPaymentOutputDescriptor_new"))) TS_StaticPaymentOutputDescriptor_new(uint64_t outpoint_arg, uint64_t output_arg, int8_tArray channel_keys_id_arg, int64_t channel_value_satoshis_arg) { LDKOutPoint outpoint_arg_conv; - outpoint_arg_conv.inner = (void*)(outpoint_arg & (~1)); - outpoint_arg_conv.is_owned = (outpoint_arg & 1) || (outpoint_arg == 0); + outpoint_arg_conv.inner = untag_ptr(outpoint_arg); + outpoint_arg_conv.is_owned = ptr_is_owned(outpoint_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(outpoint_arg_conv); outpoint_arg_conv = OutPoint_clone(&outpoint_arg_conv); - void* output_arg_ptr = (void*)(((uintptr_t)output_arg) & ~1); + void* output_arg_ptr = untag_ptr(output_arg); CHECK_ACCESS(output_arg_ptr); LDKTxOut output_arg_conv = *(LDKTxOut*)(output_arg_ptr); - output_arg_conv = TxOut_clone((LDKTxOut*)(((uintptr_t)output_arg) & ~1)); + output_arg_conv = TxOut_clone((LDKTxOut*)untag_ptr(output_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); 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t StaticPaymentOutputDescriptor_clone_ptr(LDKStaticPaymentOutputDescriptor *NONNULL_PTR arg) { +static inline uint64_t StaticPaymentOutputDescriptor_clone_ptr(LDKStaticPaymentOutputDescriptor *NONNULL_PTR arg) { LDKStaticPaymentOutputDescriptor ret_var = StaticPaymentOutputDescriptor_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_StaticPaymentOutputDescriptor_clone_ptr"))) TS_StaticPaymentOutputDescriptor_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_StaticPaymentOutputDescriptor_clone_ptr"))) TS_StaticPaymentOutputDescriptor_clone_ptr(uint64_t arg) { LDKStaticPaymentOutputDescriptor arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = StaticPaymentOutputDescriptor_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = StaticPaymentOutputDescriptor_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_StaticPaymentOutputDescriptor_clone"))) TS_StaticPaymentOutputDescriptor_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_StaticPaymentOutputDescriptor_clone"))) TS_StaticPaymentOutputDescriptor_clone(uint64_t orig) { LDKStaticPaymentOutputDescriptor orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKStaticPaymentOutputDescriptor ret_var = StaticPaymentOutputDescriptor_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_StaticPaymentOutputDescriptor_write"))) TS_StaticPaymentOutputDescriptor_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_StaticPaymentOutputDescriptor_write"))) TS_StaticPaymentOutputDescriptor_write(uint64_t obj) { LDKStaticPaymentOutputDescriptor obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = StaticPaymentOutputDescriptor_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -24959,87 +23592,87 @@ int8_tArray __attribute__((export_name("TS_StaticPaymentOutputDescriptor_write" return ret_arr; } -uint32_t __attribute__((export_name("TS_StaticPaymentOutputDescriptor_read"))) TS_StaticPaymentOutputDescriptor_read(int8_tArray ser) { +uint64_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; LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ"); *ret_conv = StaticPaymentOutputDescriptor_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_SpendableOutputDescriptor_free"))) TS_SpendableOutputDescriptor_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKSpendableOutputDescriptor this_ptr_conv = *(LDKSpendableOutputDescriptor*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); SpendableOutputDescriptor_free(this_ptr_conv); } -static inline uintptr_t SpendableOutputDescriptor_clone_ptr(LDKSpendableOutputDescriptor *NONNULL_PTR arg) { +static inline uint64_t SpendableOutputDescriptor_clone_ptr(LDKSpendableOutputDescriptor *NONNULL_PTR arg) { LDKSpendableOutputDescriptor *ret_copy = MALLOC(sizeof(LDKSpendableOutputDescriptor), "LDKSpendableOutputDescriptor"); *ret_copy = SpendableOutputDescriptor_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_SpendableOutputDescriptor_clone_ptr"))) TS_SpendableOutputDescriptor_clone_ptr(uint32_t arg) { - LDKSpendableOutputDescriptor* arg_conv = (LDKSpendableOutputDescriptor*)arg; - uint32_t ret_conv = SpendableOutputDescriptor_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_SpendableOutputDescriptor_clone_ptr"))) TS_SpendableOutputDescriptor_clone_ptr(uint64_t arg) { + LDKSpendableOutputDescriptor* arg_conv = (LDKSpendableOutputDescriptor*)untag_ptr(arg); + int64_t ret_conv = SpendableOutputDescriptor_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_SpendableOutputDescriptor_clone"))) TS_SpendableOutputDescriptor_clone(uint32_t orig) { - LDKSpendableOutputDescriptor* orig_conv = (LDKSpendableOutputDescriptor*)orig; +uint64_t __attribute__((export_name("TS_SpendableOutputDescriptor_clone"))) TS_SpendableOutputDescriptor_clone(uint64_t orig) { + LDKSpendableOutputDescriptor* orig_conv = (LDKSpendableOutputDescriptor*)untag_ptr(orig); LDKSpendableOutputDescriptor *ret_copy = MALLOC(sizeof(LDKSpendableOutputDescriptor), "LDKSpendableOutputDescriptor"); *ret_copy = SpendableOutputDescriptor_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_SpendableOutputDescriptor_static_output"))) TS_SpendableOutputDescriptor_static_output(uint32_t outpoint, uint32_t output) { +uint64_t __attribute__((export_name("TS_SpendableOutputDescriptor_static_output"))) TS_SpendableOutputDescriptor_static_output(uint64_t outpoint, uint64_t output) { LDKOutPoint outpoint_conv; - outpoint_conv.inner = (void*)(outpoint & (~1)); - outpoint_conv.is_owned = (outpoint & 1) || (outpoint == 0); + outpoint_conv.inner = untag_ptr(outpoint); + outpoint_conv.is_owned = ptr_is_owned(outpoint); CHECK_INNER_FIELD_ACCESS_OR_NULL(outpoint_conv); outpoint_conv = OutPoint_clone(&outpoint_conv); - void* output_ptr = (void*)(((uintptr_t)output) & ~1); + void* output_ptr = untag_ptr(output); CHECK_ACCESS(output_ptr); LDKTxOut output_conv = *(LDKTxOut*)(output_ptr); - output_conv = TxOut_clone((LDKTxOut*)(((uintptr_t)output) & ~1)); + output_conv = TxOut_clone((LDKTxOut*)untag_ptr(output)); LDKSpendableOutputDescriptor *ret_copy = MALLOC(sizeof(LDKSpendableOutputDescriptor), "LDKSpendableOutputDescriptor"); *ret_copy = SpendableOutputDescriptor_static_output(outpoint_conv, output_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_SpendableOutputDescriptor_delayed_payment_output"))) TS_SpendableOutputDescriptor_delayed_payment_output(uint32_t a) { +uint64_t __attribute__((export_name("TS_SpendableOutputDescriptor_delayed_payment_output"))) TS_SpendableOutputDescriptor_delayed_payment_output(uint64_t a) { LDKDelayedPaymentOutputDescriptor a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = (a & 1) || (a == 0); + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); a_conv = DelayedPaymentOutputDescriptor_clone(&a_conv); LDKSpendableOutputDescriptor *ret_copy = MALLOC(sizeof(LDKSpendableOutputDescriptor), "LDKSpendableOutputDescriptor"); *ret_copy = SpendableOutputDescriptor_delayed_payment_output(a_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_SpendableOutputDescriptor_static_payment_output"))) TS_SpendableOutputDescriptor_static_payment_output(uint32_t a) { +uint64_t __attribute__((export_name("TS_SpendableOutputDescriptor_static_payment_output"))) TS_SpendableOutputDescriptor_static_payment_output(uint64_t a) { LDKStaticPaymentOutputDescriptor a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = (a & 1) || (a == 0); + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); a_conv = StaticPaymentOutputDescriptor_clone(&a_conv); LDKSpendableOutputDescriptor *ret_copy = MALLOC(sizeof(LDKSpendableOutputDescriptor), "LDKSpendableOutputDescriptor"); *ret_copy = SpendableOutputDescriptor_static_payment_output(a_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -int8_tArray __attribute__((export_name("TS_SpendableOutputDescriptor_write"))) TS_SpendableOutputDescriptor_write(uint32_t obj) { - LDKSpendableOutputDescriptor* obj_conv = (LDKSpendableOutputDescriptor*)obj; +int8_tArray __attribute__((export_name("TS_SpendableOutputDescriptor_write"))) TS_SpendableOutputDescriptor_write(uint64_t obj) { + LDKSpendableOutputDescriptor* obj_conv = (LDKSpendableOutputDescriptor*)untag_ptr(obj); LDKCVec_u8Z ret_var = SpendableOutputDescriptor_write(obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -25047,58 +23680,58 @@ int8_tArray __attribute__((export_name("TS_SpendableOutputDescriptor_write"))) return ret_arr; } -uint32_t __attribute__((export_name("TS_SpendableOutputDescriptor_read"))) TS_SpendableOutputDescriptor_read(int8_tArray ser) { +uint64_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; LDKCResult_SpendableOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SpendableOutputDescriptorDecodeErrorZ), "LDKCResult_SpendableOutputDescriptorDecodeErrorZ"); *ret_conv = SpendableOutputDescriptor_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_BaseSign_free"))) TS_BaseSign_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKBaseSign this_ptr_conv = *(LDKBaseSign*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); BaseSign_free(this_ptr_conv); } -static inline uintptr_t Sign_clone_ptr(LDKSign *NONNULL_PTR arg) { +static inline uint64_t Sign_clone_ptr(LDKSign *NONNULL_PTR arg) { LDKSign* ret_ret = MALLOC(sizeof(LDKSign), "LDKSign"); *ret_ret = Sign_clone(arg); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_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); } +int64_t __attribute__((export_name("TS_Sign_clone_ptr"))) TS_Sign_clone_ptr(uint64_t arg) { + void* arg_ptr = untag_ptr(arg); + if (ptr_is_owned(arg)) { CHECK_ACCESS(arg_ptr); } LDKSign* arg_conv = (LDKSign*)arg_ptr; - uint32_t ret_conv = Sign_clone_ptr(arg_conv); + int64_t ret_conv = Sign_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_Sign_clone"))) TS_Sign_clone(uint32_t orig) { - void* orig_ptr = (void*)(((uintptr_t)orig) & ~1); - if (!(orig & 1)) { CHECK_ACCESS(orig_ptr); } +uint64_t __attribute__((export_name("TS_Sign_clone"))) TS_Sign_clone(uint64_t orig) { + void* orig_ptr = untag_ptr(orig); + if (ptr_is_owned(orig)) { CHECK_ACCESS(orig_ptr); } LDKSign* orig_conv = (LDKSign*)orig_ptr; LDKSign* ret_ret = MALLOC(sizeof(LDKSign), "LDKSign"); *ret_ret = Sign_clone(orig_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_Sign_free"))) TS_Sign_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKSign this_ptr_conv = *(LDKSign*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); Sign_free(this_ptr_conv); } -uint32_t __attribute__((export_name("TS_Recipient_clone"))) TS_Recipient_clone(uint32_t orig) { - LDKRecipient* orig_conv = (LDKRecipient*)(orig & ~1); +uint32_t __attribute__((export_name("TS_Recipient_clone"))) TS_Recipient_clone(uint64_t orig) { + LDKRecipient* orig_conv = (LDKRecipient*)untag_ptr(orig); uint32_t ret_conv = LDKRecipient_to_js(Recipient_clone(orig_conv)); return ret_conv; } @@ -25113,188 +23746,192 @@ uint32_t __attribute__((export_name("TS_Recipient_phantom_node"))) TS_Recipient return ret_conv; } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_KeysInterface_free"))) TS_KeysInterface_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKKeysInterface this_ptr_conv = *(LDKKeysInterface*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); KeysInterface_free(this_ptr_conv); } -void __attribute__((export_name("TS_InMemorySigner_free"))) TS_InMemorySigner_free(uint32_t this_obj) { +void __attribute__((export_name("TS_InMemorySigner_free"))) TS_InMemorySigner_free(uint64_t this_obj) { LDKInMemorySigner this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); InMemorySigner_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_InMemorySigner_get_funding_key"))) TS_InMemorySigner_get_funding_key(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_InMemorySigner_get_funding_key"))) TS_InMemorySigner_get_funding_key(uint64_t this_ptr) { LDKInMemorySigner this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *InMemorySigner_get_funding_key(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_InMemorySigner_set_funding_key"))) TS_InMemorySigner_set_funding_key(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_InMemorySigner_set_funding_key"))) TS_InMemorySigner_set_funding_key(uint64_t this_ptr, int8_tArray val) { LDKInMemorySigner this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKSecretKey val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.bytes, val->elems, 32); FREE(val); InMemorySigner_set_funding_key(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_InMemorySigner_get_revocation_base_key"))) TS_InMemorySigner_get_revocation_base_key(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_InMemorySigner_get_revocation_base_key"))) TS_InMemorySigner_get_revocation_base_key(uint64_t this_ptr) { LDKInMemorySigner this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_InMemorySigner_set_revocation_base_key"))) TS_InMemorySigner_set_revocation_base_key(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_InMemorySigner_set_revocation_base_key"))) TS_InMemorySigner_set_revocation_base_key(uint64_t this_ptr, int8_tArray val) { LDKInMemorySigner this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKSecretKey val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.bytes, val->elems, 32); FREE(val); InMemorySigner_set_revocation_base_key(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_InMemorySigner_get_payment_key"))) TS_InMemorySigner_get_payment_key(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_InMemorySigner_get_payment_key"))) TS_InMemorySigner_get_payment_key(uint64_t this_ptr) { LDKInMemorySigner this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *InMemorySigner_get_payment_key(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_InMemorySigner_set_payment_key"))) TS_InMemorySigner_set_payment_key(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_InMemorySigner_set_payment_key"))) TS_InMemorySigner_set_payment_key(uint64_t this_ptr, int8_tArray val) { LDKInMemorySigner this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKSecretKey val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.bytes, val->elems, 32); FREE(val); InMemorySigner_set_payment_key(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_InMemorySigner_get_delayed_payment_base_key"))) TS_InMemorySigner_get_delayed_payment_base_key(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_InMemorySigner_get_delayed_payment_base_key"))) TS_InMemorySigner_get_delayed_payment_base_key(uint64_t this_ptr) { LDKInMemorySigner this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_InMemorySigner_set_delayed_payment_base_key"))) TS_InMemorySigner_set_delayed_payment_base_key(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_InMemorySigner_set_delayed_payment_base_key"))) TS_InMemorySigner_set_delayed_payment_base_key(uint64_t this_ptr, int8_tArray val) { LDKInMemorySigner this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKSecretKey val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.bytes, val->elems, 32); FREE(val); InMemorySigner_set_delayed_payment_base_key(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_InMemorySigner_get_htlc_base_key"))) TS_InMemorySigner_get_htlc_base_key(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_InMemorySigner_get_htlc_base_key"))) TS_InMemorySigner_get_htlc_base_key(uint64_t this_ptr) { LDKInMemorySigner this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_InMemorySigner_set_htlc_base_key"))) TS_InMemorySigner_set_htlc_base_key(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_InMemorySigner_set_htlc_base_key"))) TS_InMemorySigner_set_htlc_base_key(uint64_t this_ptr, int8_tArray val) { LDKInMemorySigner this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKSecretKey val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.bytes, val->elems, 32); FREE(val); InMemorySigner_set_htlc_base_key(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_InMemorySigner_get_commitment_seed"))) TS_InMemorySigner_get_commitment_seed(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_InMemorySigner_get_commitment_seed"))) TS_InMemorySigner_get_commitment_seed(uint64_t this_ptr) { LDKInMemorySigner this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *InMemorySigner_get_commitment_seed(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_InMemorySigner_set_commitment_seed"))) TS_InMemorySigner_set_commitment_seed(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_InMemorySigner_set_commitment_seed"))) TS_InMemorySigner_set_commitment_seed(uint64_t this_ptr, int8_tArray val) { LDKInMemorySigner this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 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) { +static inline uint64_t InMemorySigner_clone_ptr(LDKInMemorySigner *NONNULL_PTR arg) { LDKInMemorySigner ret_var = InMemorySigner_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_InMemorySigner_clone_ptr"))) TS_InMemorySigner_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_InMemorySigner_clone_ptr"))) TS_InMemorySigner_clone_ptr(uint64_t arg) { LDKInMemorySigner arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = InMemorySigner_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = InMemorySigner_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_InMemorySigner_clone"))) TS_InMemorySigner_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_InMemorySigner_clone"))) TS_InMemorySigner_clone(uint64_t orig) { LDKInMemorySigner orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKInMemorySigner ret_var = InMemorySigner_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_InMemorySigner_new"))) TS_InMemorySigner_new(int8_tArray node_secret, 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) { +uint64_t __attribute__((export_name("TS_InMemorySigner_new"))) TS_InMemorySigner_new(int8_tArray node_secret, 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 node_secret_ref; CHECK(node_secret->arr_len == 32); memcpy(node_secret_ref.bytes, node_secret->elems, 32); FREE(node_secret); @@ -25320,167 +23957,161 @@ uint32_t __attribute__((export_name("TS_InMemorySigner_new"))) TS_InMemorySigne CHECK(channel_keys_id->arr_len == 32); memcpy(channel_keys_id_ref.data, channel_keys_id->elems, 32); FREE(channel_keys_id); LDKInMemorySigner ret_var = InMemorySigner_new(node_secret_ref, 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_InMemorySigner_counterparty_pubkeys"))) TS_InMemorySigner_counterparty_pubkeys(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_InMemorySigner_counterparty_pubkeys"))) TS_InMemorySigner_counterparty_pubkeys(uint64_t this_arg) { LDKInMemorySigner this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKChannelPublicKeys ret_var = InMemorySigner_counterparty_pubkeys(&this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int16_t __attribute__((export_name("TS_InMemorySigner_counterparty_selected_contest_delay"))) TS_InMemorySigner_counterparty_selected_contest_delay(uint32_t this_arg) { +int16_t __attribute__((export_name("TS_InMemorySigner_counterparty_selected_contest_delay"))) TS_InMemorySigner_counterparty_selected_contest_delay(uint64_t this_arg) { LDKInMemorySigner this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int16_t ret_conv = InMemorySigner_counterparty_selected_contest_delay(&this_arg_conv); return ret_conv; } -int16_t __attribute__((export_name("TS_InMemorySigner_holder_selected_contest_delay"))) TS_InMemorySigner_holder_selected_contest_delay(uint32_t this_arg) { +int16_t __attribute__((export_name("TS_InMemorySigner_holder_selected_contest_delay"))) TS_InMemorySigner_holder_selected_contest_delay(uint64_t this_arg) { LDKInMemorySigner this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int16_t ret_conv = InMemorySigner_holder_selected_contest_delay(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_InMemorySigner_is_outbound"))) TS_InMemorySigner_is_outbound(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InMemorySigner_is_outbound"))) TS_InMemorySigner_is_outbound(uint64_t this_arg) { LDKInMemorySigner this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InMemorySigner_is_outbound(&this_arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_InMemorySigner_funding_outpoint"))) TS_InMemorySigner_funding_outpoint(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_InMemorySigner_funding_outpoint"))) TS_InMemorySigner_funding_outpoint(uint64_t this_arg) { LDKInMemorySigner this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKOutPoint ret_var = InMemorySigner_funding_outpoint(&this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_InMemorySigner_get_channel_parameters"))) TS_InMemorySigner_get_channel_parameters(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_InMemorySigner_get_channel_parameters"))) TS_InMemorySigner_get_channel_parameters(uint64_t this_arg) { LDKInMemorySigner this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKChannelTransactionParameters ret_var = InMemorySigner_get_channel_parameters(&this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -jboolean __attribute__((export_name("TS_InMemorySigner_opt_anchors"))) TS_InMemorySigner_opt_anchors(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InMemorySigner_opt_anchors"))) TS_InMemorySigner_opt_anchors(uint64_t this_arg) { LDKInMemorySigner this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InMemorySigner_opt_anchors(&this_arg_conv); return ret_conv; } -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, uint32_t input_idx, uint32_t descriptor) { +uint64_t __attribute__((export_name("TS_InMemorySigner_sign_counterparty_payment_input"))) TS_InMemorySigner_sign_counterparty_payment_input(uint64_t this_arg, int8_tArray spend_tx, uint32_t input_idx, uint64_t descriptor) { LDKInMemorySigner this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; 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); FREE(spend_tx); spend_tx_ref.data_is_owned = true; LDKStaticPaymentOutputDescriptor descriptor_conv; - descriptor_conv.inner = (void*)(descriptor & (~1)); - descriptor_conv.is_owned = false; + descriptor_conv.inner = untag_ptr(descriptor); + descriptor_conv.is_owned = ptr_is_owned(descriptor); CHECK_INNER_FIELD_ACCESS_OR_NULL(descriptor_conv); + descriptor_conv.is_owned = false; 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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, uint32_t input_idx, uint32_t descriptor) { +uint64_t __attribute__((export_name("TS_InMemorySigner_sign_dynamic_p2wsh_input"))) TS_InMemorySigner_sign_dynamic_p2wsh_input(uint64_t this_arg, int8_tArray spend_tx, uint32_t input_idx, uint64_t descriptor) { LDKInMemorySigner this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; 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); FREE(spend_tx); spend_tx_ref.data_is_owned = true; LDKDelayedPaymentOutputDescriptor descriptor_conv; - descriptor_conv.inner = (void*)(descriptor & (~1)); - descriptor_conv.is_owned = false; + descriptor_conv.inner = untag_ptr(descriptor); + descriptor_conv.is_owned = ptr_is_owned(descriptor); CHECK_INNER_FIELD_ACCESS_OR_NULL(descriptor_conv); + descriptor_conv.is_owned = false; 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_InMemorySigner_as_BaseSign"))) TS_InMemorySigner_as_BaseSign(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_InMemorySigner_as_BaseSign"))) TS_InMemorySigner_as_BaseSign(uint64_t this_arg) { LDKInMemorySigner this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKBaseSign* ret_ret = MALLOC(sizeof(LDKBaseSign), "LDKBaseSign"); *ret_ret = InMemorySigner_as_BaseSign(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_t __attribute__((export_name("TS_InMemorySigner_as_Sign"))) TS_InMemorySigner_as_Sign(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_InMemorySigner_as_Sign"))) TS_InMemorySigner_as_Sign(uint64_t this_arg) { LDKInMemorySigner this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKSign* ret_ret = MALLOC(sizeof(LDKSign), "LDKSign"); *ret_ret = InMemorySigner_as_Sign(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -int8_tArray __attribute__((export_name("TS_InMemorySigner_write"))) TS_InMemorySigner_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_InMemorySigner_write"))) TS_InMemorySigner_write(uint64_t obj) { LDKInMemorySigner obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = InMemorySigner_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -25488,7 +24119,7 @@ int8_tArray __attribute__((export_name("TS_InMemorySigner_write"))) TS_InMemory return ret_arr; } -uint32_t __attribute__((export_name("TS_InMemorySigner_read"))) TS_InMemorySigner_read(int8_tArray ser, int8_tArray arg) { +uint64_t __attribute__((export_name("TS_InMemorySigner_read"))) TS_InMemorySigner_read(int8_tArray ser, int8_tArray arg) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; ser_ref.data = ser->elems; @@ -25498,73 +24129,65 @@ uint32_t __attribute__((export_name("TS_InMemorySigner_read"))) TS_InMemorySign LDKCResult_InMemorySignerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InMemorySignerDecodeErrorZ), "LDKCResult_InMemorySignerDecodeErrorZ"); *ret_conv = InMemorySigner_read(ser_ref, arg_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_KeysManager_free"))) TS_KeysManager_free(uint32_t this_obj) { +void __attribute__((export_name("TS_KeysManager_free"))) TS_KeysManager_free(uint64_t this_obj) { LDKKeysManager this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); KeysManager_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_KeysManager_new"))) TS_KeysManager_new(int8_tArray seed, int64_t starting_time_secs, int32_t starting_time_nanos) { +uint64_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); FREE(seed); unsigned char (*seed_ref)[32] = &seed_arr; LDKKeysManager ret_var = KeysManager_new(seed_ref, starting_time_secs, starting_time_nanos); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_KeysManager_derive_channel_keys"))) TS_KeysManager_derive_channel_keys(uint32_t this_arg, int64_t channel_value_satoshis, int8_tArray params) { +uint64_t __attribute__((export_name("TS_KeysManager_derive_channel_keys"))) TS_KeysManager_derive_channel_keys(uint64_t this_arg, int64_t channel_value_satoshis, int8_tArray params) { LDKKeysManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; unsigned char params_arr[32]; CHECK(params->arr_len == 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_KeysManager_spend_spendable_outputs"))) TS_KeysManager_spend_spendable_outputs(uint32_t this_arg, uint32_tArray descriptors, uint32_tArray outputs, int8_tArray change_destination_script, int32_t feerate_sat_per_1000_weight) { +uint64_t __attribute__((export_name("TS_KeysManager_spend_spendable_outputs"))) TS_KeysManager_spend_spendable_outputs(uint64_t this_arg, uint64_tArray descriptors, uint64_tArray outputs, int8_tArray change_destination_script, int32_t feerate_sat_per_1000_weight) { LDKKeysManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCVec_SpendableOutputDescriptorZ descriptors_constr; descriptors_constr.datalen = descriptors->arr_len; if (descriptors_constr.datalen > 0) descriptors_constr.data = MALLOC(descriptors_constr.datalen * sizeof(LDKSpendableOutputDescriptor), "LDKCVec_SpendableOutputDescriptorZ Elements"); else descriptors_constr.data = NULL; - uint32_t* descriptors_vals = descriptors->elems; + uint64_t* descriptors_vals = descriptors->elems; for (size_t b = 0; b < descriptors_constr.datalen; b++) { - uint32_t descriptors_conv_27 = descriptors_vals[b]; - void* descriptors_conv_27_ptr = (void*)(((uintptr_t)descriptors_conv_27) & ~1); + uint64_t descriptors_conv_27 = descriptors_vals[b]; + void* descriptors_conv_27_ptr = untag_ptr(descriptors_conv_27); CHECK_ACCESS(descriptors_conv_27_ptr); LDKSpendableOutputDescriptor descriptors_conv_27_conv = *(LDKSpendableOutputDescriptor*)(descriptors_conv_27_ptr); - descriptors_conv_27_conv = SpendableOutputDescriptor_clone((LDKSpendableOutputDescriptor*)(((uintptr_t)descriptors_conv_27) & ~1)); + descriptors_conv_27_conv = SpendableOutputDescriptor_clone((LDKSpendableOutputDescriptor*)untag_ptr(descriptors_conv_27)); descriptors_constr.data[b] = descriptors_conv_27_conv; } FREE(descriptors); @@ -25574,13 +24197,13 @@ 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; + uint64_t* outputs_vals = outputs->elems; for (size_t h = 0; h < outputs_constr.datalen; h++) { - uint32_t outputs_conv_7 = outputs_vals[h]; - void* outputs_conv_7_ptr = (void*)(((uintptr_t)outputs_conv_7) & ~1); + uint64_t outputs_conv_7 = outputs_vals[h]; + void* outputs_conv_7_ptr = untag_ptr(outputs_conv_7); CHECK_ACCESS(outputs_conv_7_ptr); LDKTxOut outputs_conv_7_conv = *(LDKTxOut*)(outputs_conv_7_ptr); - outputs_conv_7_conv = TxOut_clone((LDKTxOut*)(((uintptr_t)outputs_conv_7) & ~1)); + outputs_conv_7_conv = TxOut_clone((LDKTxOut*)untag_ptr(outputs_conv_7)); outputs_constr.data[h] = outputs_conv_7_conv; } FREE(outputs); @@ -25590,38 +24213,40 @@ uint32_t __attribute__((export_name("TS_KeysManager_spend_spendable_outputs"))) 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_KeysManager_as_KeysInterface"))) TS_KeysManager_as_KeysInterface(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_KeysManager_as_KeysInterface"))) TS_KeysManager_as_KeysInterface(uint64_t this_arg) { LDKKeysManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKKeysInterface* ret_ret = MALLOC(sizeof(LDKKeysInterface), "LDKKeysInterface"); *ret_ret = KeysManager_as_KeysInterface(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -void __attribute__((export_name("TS_PhantomKeysManager_free"))) TS_PhantomKeysManager_free(uint32_t this_obj) { +void __attribute__((export_name("TS_PhantomKeysManager_free"))) TS_PhantomKeysManager_free(uint64_t this_obj) { LDKPhantomKeysManager this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); PhantomKeysManager_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_PhantomKeysManager_as_KeysInterface"))) TS_PhantomKeysManager_as_KeysInterface(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_PhantomKeysManager_as_KeysInterface"))) TS_PhantomKeysManager_as_KeysInterface(uint64_t this_arg) { LDKPhantomKeysManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKKeysInterface* ret_ret = MALLOC(sizeof(LDKKeysInterface), "LDKKeysInterface"); *ret_ret = PhantomKeysManager_as_KeysInterface(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_t __attribute__((export_name("TS_PhantomKeysManager_new"))) TS_PhantomKeysManager_new(int8_tArray seed, int64_t starting_time_secs, int32_t starting_time_nanos, int8_tArray cross_node_seed) { +uint64_t __attribute__((export_name("TS_PhantomKeysManager_new"))) TS_PhantomKeysManager_new(int8_tArray seed, int64_t starting_time_secs, int32_t starting_time_nanos, int8_tArray cross_node_seed) { unsigned char seed_arr[32]; CHECK(seed->arr_len == 32); memcpy(seed_arr, seed->elems, 32); FREE(seed); @@ -25631,35 +24256,31 @@ uint32_t __attribute__((export_name("TS_PhantomKeysManager_new"))) TS_PhantomKe memcpy(cross_node_seed_arr, cross_node_seed->elems, 32); FREE(cross_node_seed); unsigned char (*cross_node_seed_ref)[32] = &cross_node_seed_arr; LDKPhantomKeysManager ret_var = PhantomKeysManager_new(seed_ref, starting_time_secs, starting_time_nanos, cross_node_seed_ref); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_PhantomKeysManager_spend_spendable_outputs"))) TS_PhantomKeysManager_spend_spendable_outputs(uint32_t this_arg, uint32_tArray descriptors, uint32_tArray outputs, int8_tArray change_destination_script, int32_t feerate_sat_per_1000_weight) { +uint64_t __attribute__((export_name("TS_PhantomKeysManager_spend_spendable_outputs"))) TS_PhantomKeysManager_spend_spendable_outputs(uint64_t this_arg, uint64_tArray descriptors, uint64_tArray outputs, int8_tArray change_destination_script, int32_t feerate_sat_per_1000_weight) { LDKPhantomKeysManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCVec_SpendableOutputDescriptorZ descriptors_constr; descriptors_constr.datalen = descriptors->arr_len; if (descriptors_constr.datalen > 0) descriptors_constr.data = MALLOC(descriptors_constr.datalen * sizeof(LDKSpendableOutputDescriptor), "LDKCVec_SpendableOutputDescriptorZ Elements"); else descriptors_constr.data = NULL; - uint32_t* descriptors_vals = descriptors->elems; + uint64_t* descriptors_vals = descriptors->elems; for (size_t b = 0; b < descriptors_constr.datalen; b++) { - uint32_t descriptors_conv_27 = descriptors_vals[b]; - void* descriptors_conv_27_ptr = (void*)(((uintptr_t)descriptors_conv_27) & ~1); + uint64_t descriptors_conv_27 = descriptors_vals[b]; + void* descriptors_conv_27_ptr = untag_ptr(descriptors_conv_27); CHECK_ACCESS(descriptors_conv_27_ptr); LDKSpendableOutputDescriptor descriptors_conv_27_conv = *(LDKSpendableOutputDescriptor*)(descriptors_conv_27_ptr); - descriptors_conv_27_conv = SpendableOutputDescriptor_clone((LDKSpendableOutputDescriptor*)(((uintptr_t)descriptors_conv_27) & ~1)); + descriptors_conv_27_conv = SpendableOutputDescriptor_clone((LDKSpendableOutputDescriptor*)untag_ptr(descriptors_conv_27)); descriptors_constr.data[b] = descriptors_conv_27_conv; } FREE(descriptors); @@ -25669,13 +24290,13 @@ uint32_t __attribute__((export_name("TS_PhantomKeysManager_spend_spendable_outp outputs_constr.data = MALLOC(outputs_constr.datalen * sizeof(LDKTxOut), "LDKCVec_TxOutZ Elements"); else outputs_constr.data = NULL; - uint32_t* outputs_vals = outputs->elems; + uint64_t* outputs_vals = outputs->elems; for (size_t h = 0; h < outputs_constr.datalen; h++) { - uint32_t outputs_conv_7 = outputs_vals[h]; - void* outputs_conv_7_ptr = (void*)(((uintptr_t)outputs_conv_7) & ~1); + uint64_t outputs_conv_7 = outputs_vals[h]; + void* outputs_conv_7_ptr = untag_ptr(outputs_conv_7); CHECK_ACCESS(outputs_conv_7_ptr); LDKTxOut outputs_conv_7_conv = *(LDKTxOut*)(outputs_conv_7_ptr); - outputs_conv_7_conv = TxOut_clone((LDKTxOut*)(((uintptr_t)outputs_conv_7) & ~1)); + outputs_conv_7_conv = TxOut_clone((LDKTxOut*)untag_ptr(outputs_conv_7)); outputs_constr.data[h] = outputs_conv_7_conv; } FREE(outputs); @@ -25685,1228 +24306,1199 @@ uint32_t __attribute__((export_name("TS_PhantomKeysManager_spend_spendable_outp 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 = PhantomKeysManager_spend_spendable_outputs(&this_arg_conv, descriptors_constr, outputs_constr, change_destination_script_ref, feerate_sat_per_1000_weight); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_PhantomKeysManager_derive_channel_keys"))) TS_PhantomKeysManager_derive_channel_keys(uint32_t this_arg, int64_t channel_value_satoshis, int8_tArray params) { +uint64_t __attribute__((export_name("TS_PhantomKeysManager_derive_channel_keys"))) TS_PhantomKeysManager_derive_channel_keys(uint64_t this_arg, int64_t channel_value_satoshis, int8_tArray params) { LDKPhantomKeysManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; unsigned char params_arr[32]; CHECK(params->arr_len == 32); memcpy(params_arr, params->elems, 32); FREE(params); unsigned char (*params_ref)[32] = ¶ms_arr; LDKInMemorySigner ret_var = PhantomKeysManager_derive_channel_keys(&this_arg_conv, channel_value_satoshis, params_ref); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelManager_free"))) TS_ChannelManager_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChannelManager_free"))) TS_ChannelManager_free(uint64_t this_obj) { LDKChannelManager this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChannelManager_free(this_obj_conv); } -void __attribute__((export_name("TS_ChainParameters_free"))) TS_ChainParameters_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChainParameters_free"))) TS_ChainParameters_free(uint64_t this_obj) { LDKChainParameters this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChainParameters_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_ChainParameters_get_network"))) TS_ChainParameters_get_network(uint32_t this_ptr) { +uint32_t __attribute__((export_name("TS_ChainParameters_get_network"))) TS_ChainParameters_get_network(uint64_t this_ptr) { LDKChainParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; uint32_t ret_conv = LDKNetwork_to_js(ChainParameters_get_network(&this_ptr_conv)); return ret_conv; } -void __attribute__((export_name("TS_ChainParameters_set_network"))) TS_ChainParameters_set_network(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChainParameters_set_network"))) TS_ChainParameters_set_network(uint64_t this_ptr, uint32_t val) { LDKChainParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKNetwork val_conv = LDKNetwork_from_js(val); ChainParameters_set_network(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChainParameters_get_best_block"))) TS_ChainParameters_get_best_block(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChainParameters_get_best_block"))) TS_ChainParameters_get_best_block(uint64_t this_ptr) { LDKChainParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKBestBlock ret_var = ChainParameters_get_best_block(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChainParameters_set_best_block"))) TS_ChainParameters_set_best_block(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChainParameters_set_best_block"))) TS_ChainParameters_set_best_block(uint64_t this_ptr, uint64_t val) { LDKChainParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKBestBlock val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = BestBlock_clone(&val_conv); ChainParameters_set_best_block(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChainParameters_new"))) TS_ChainParameters_new(uint32_t network_arg, uint32_t best_block_arg) { +uint64_t __attribute__((export_name("TS_ChainParameters_new"))) TS_ChainParameters_new(uint32_t network_arg, uint64_t best_block_arg) { LDKNetwork network_arg_conv = LDKNetwork_from_js(network_arg); LDKBestBlock best_block_arg_conv; - best_block_arg_conv.inner = (void*)(best_block_arg & (~1)); - best_block_arg_conv.is_owned = (best_block_arg & 1) || (best_block_arg == 0); + best_block_arg_conv.inner = untag_ptr(best_block_arg); + best_block_arg_conv.is_owned = ptr_is_owned(best_block_arg); 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t ChainParameters_clone_ptr(LDKChainParameters *NONNULL_PTR arg) { +static inline uint64_t ChainParameters_clone_ptr(LDKChainParameters *NONNULL_PTR arg) { LDKChainParameters ret_var = ChainParameters_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChainParameters_clone_ptr"))) TS_ChainParameters_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ChainParameters_clone_ptr"))) TS_ChainParameters_clone_ptr(uint64_t arg) { LDKChainParameters arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ChainParameters_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ChainParameters_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChainParameters_clone"))) TS_ChainParameters_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ChainParameters_clone"))) TS_ChainParameters_clone(uint64_t orig) { LDKChainParameters orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKChainParameters ret_var = ChainParameters_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_CounterpartyForwardingInfo_free"))) TS_CounterpartyForwardingInfo_free(uint32_t this_obj) { +void __attribute__((export_name("TS_CounterpartyForwardingInfo_free"))) TS_CounterpartyForwardingInfo_free(uint64_t this_obj) { LDKCounterpartyForwardingInfo this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); CounterpartyForwardingInfo_free(this_obj_conv); } -int32_t __attribute__((export_name("TS_CounterpartyForwardingInfo_get_fee_base_msat"))) TS_CounterpartyForwardingInfo_get_fee_base_msat(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_CounterpartyForwardingInfo_get_fee_base_msat"))) TS_CounterpartyForwardingInfo_get_fee_base_msat(uint64_t this_ptr) { LDKCounterpartyForwardingInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = CounterpartyForwardingInfo_get_fee_base_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_CounterpartyForwardingInfo_set_fee_base_msat"))) TS_CounterpartyForwardingInfo_set_fee_base_msat(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_CounterpartyForwardingInfo_set_fee_base_msat"))) TS_CounterpartyForwardingInfo_set_fee_base_msat(uint64_t this_ptr, int32_t val) { LDKCounterpartyForwardingInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; CounterpartyForwardingInfo_set_fee_base_msat(&this_ptr_conv, val); } -int32_t __attribute__((export_name("TS_CounterpartyForwardingInfo_get_fee_proportional_millionths"))) TS_CounterpartyForwardingInfo_get_fee_proportional_millionths(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_CounterpartyForwardingInfo_get_fee_proportional_millionths"))) TS_CounterpartyForwardingInfo_get_fee_proportional_millionths(uint64_t this_ptr) { LDKCounterpartyForwardingInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = CounterpartyForwardingInfo_get_fee_proportional_millionths(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_CounterpartyForwardingInfo_set_fee_proportional_millionths"))) TS_CounterpartyForwardingInfo_set_fee_proportional_millionths(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_CounterpartyForwardingInfo_set_fee_proportional_millionths"))) TS_CounterpartyForwardingInfo_set_fee_proportional_millionths(uint64_t this_ptr, int32_t val) { LDKCounterpartyForwardingInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; CounterpartyForwardingInfo_set_fee_proportional_millionths(&this_ptr_conv, val); } -int16_t __attribute__((export_name("TS_CounterpartyForwardingInfo_get_cltv_expiry_delta"))) TS_CounterpartyForwardingInfo_get_cltv_expiry_delta(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_CounterpartyForwardingInfo_get_cltv_expiry_delta"))) TS_CounterpartyForwardingInfo_get_cltv_expiry_delta(uint64_t this_ptr) { LDKCounterpartyForwardingInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = CounterpartyForwardingInfo_get_cltv_expiry_delta(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_CounterpartyForwardingInfo_set_cltv_expiry_delta"))) TS_CounterpartyForwardingInfo_set_cltv_expiry_delta(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_CounterpartyForwardingInfo_set_cltv_expiry_delta"))) TS_CounterpartyForwardingInfo_set_cltv_expiry_delta(uint64_t this_ptr, int16_t val) { LDKCounterpartyForwardingInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; CounterpartyForwardingInfo_set_cltv_expiry_delta(&this_ptr_conv, val); } -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) { +uint64_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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t CounterpartyForwardingInfo_clone_ptr(LDKCounterpartyForwardingInfo *NONNULL_PTR arg) { +static inline uint64_t CounterpartyForwardingInfo_clone_ptr(LDKCounterpartyForwardingInfo *NONNULL_PTR arg) { LDKCounterpartyForwardingInfo ret_var = CounterpartyForwardingInfo_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_CounterpartyForwardingInfo_clone_ptr"))) TS_CounterpartyForwardingInfo_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_CounterpartyForwardingInfo_clone_ptr"))) TS_CounterpartyForwardingInfo_clone_ptr(uint64_t arg) { LDKCounterpartyForwardingInfo arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = CounterpartyForwardingInfo_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = CounterpartyForwardingInfo_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CounterpartyForwardingInfo_clone"))) TS_CounterpartyForwardingInfo_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_CounterpartyForwardingInfo_clone"))) TS_CounterpartyForwardingInfo_clone(uint64_t orig) { LDKCounterpartyForwardingInfo orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKCounterpartyForwardingInfo ret_var = CounterpartyForwardingInfo_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelCounterparty_free"))) TS_ChannelCounterparty_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChannelCounterparty_free"))) TS_ChannelCounterparty_free(uint64_t this_obj) { LDKChannelCounterparty this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChannelCounterparty_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_ChannelCounterparty_get_node_id"))) TS_ChannelCounterparty_get_node_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_ChannelCounterparty_get_node_id"))) TS_ChannelCounterparty_get_node_id(uint64_t this_ptr) { LDKChannelCounterparty this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_ChannelCounterparty_set_node_id"))) TS_ChannelCounterparty_set_node_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_ChannelCounterparty_set_node_id"))) TS_ChannelCounterparty_set_node_id(uint64_t this_ptr, int8_tArray val) { LDKChannelCounterparty this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); ChannelCounterparty_set_node_id(&this_ptr_conv, val_ref); } -uint32_t __attribute__((export_name("TS_ChannelCounterparty_get_features"))) TS_ChannelCounterparty_get_features(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelCounterparty_get_features"))) TS_ChannelCounterparty_get_features(uint64_t this_ptr) { LDKChannelCounterparty this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKInitFeatures ret_var = ChannelCounterparty_get_features(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelCounterparty_set_features"))) TS_ChannelCounterparty_set_features(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelCounterparty_set_features"))) TS_ChannelCounterparty_set_features(uint64_t this_ptr, uint64_t val) { LDKChannelCounterparty this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKInitFeatures val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = InitFeatures_clone(&val_conv); ChannelCounterparty_set_features(&this_ptr_conv, val_conv); } -int64_t __attribute__((export_name("TS_ChannelCounterparty_get_unspendable_punishment_reserve"))) TS_ChannelCounterparty_get_unspendable_punishment_reserve(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelCounterparty_get_unspendable_punishment_reserve"))) TS_ChannelCounterparty_get_unspendable_punishment_reserve(uint64_t this_ptr) { LDKChannelCounterparty this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelCounterparty_get_unspendable_punishment_reserve(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelCounterparty_set_unspendable_punishment_reserve"))) TS_ChannelCounterparty_set_unspendable_punishment_reserve(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelCounterparty_set_unspendable_punishment_reserve"))) TS_ChannelCounterparty_set_unspendable_punishment_reserve(uint64_t this_ptr, int64_t val) { LDKChannelCounterparty this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelCounterparty_set_unspendable_punishment_reserve(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_ChannelCounterparty_get_forwarding_info"))) TS_ChannelCounterparty_get_forwarding_info(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelCounterparty_get_forwarding_info"))) TS_ChannelCounterparty_get_forwarding_info(uint64_t this_ptr) { LDKChannelCounterparty this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCounterpartyForwardingInfo ret_var = ChannelCounterparty_get_forwarding_info(&this_ptr_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelCounterparty_set_forwarding_info"))) TS_ChannelCounterparty_set_forwarding_info(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelCounterparty_set_forwarding_info"))) TS_ChannelCounterparty_set_forwarding_info(uint64_t this_ptr, uint64_t val) { LDKChannelCounterparty this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCounterpartyForwardingInfo val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = CounterpartyForwardingInfo_clone(&val_conv); ChannelCounterparty_set_forwarding_info(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelCounterparty_get_outbound_htlc_minimum_msat"))) TS_ChannelCounterparty_get_outbound_htlc_minimum_msat(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelCounterparty_get_outbound_htlc_minimum_msat"))) TS_ChannelCounterparty_get_outbound_htlc_minimum_msat(uint64_t this_ptr) { LDKChannelCounterparty this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = ChannelCounterparty_get_outbound_htlc_minimum_msat(&this_ptr_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_ChannelCounterparty_set_outbound_htlc_minimum_msat"))) TS_ChannelCounterparty_set_outbound_htlc_minimum_msat(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelCounterparty_set_outbound_htlc_minimum_msat"))) TS_ChannelCounterparty_set_outbound_htlc_minimum_msat(uint64_t this_ptr, uint64_t val) { LDKChannelCounterparty this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr); - val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1)); + val_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(val)); ChannelCounterparty_set_outbound_htlc_minimum_msat(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelCounterparty_get_outbound_htlc_maximum_msat"))) TS_ChannelCounterparty_get_outbound_htlc_maximum_msat(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelCounterparty_get_outbound_htlc_maximum_msat"))) TS_ChannelCounterparty_get_outbound_htlc_maximum_msat(uint64_t this_ptr) { LDKChannelCounterparty this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = ChannelCounterparty_get_outbound_htlc_maximum_msat(&this_ptr_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_ChannelCounterparty_set_outbound_htlc_maximum_msat"))) TS_ChannelCounterparty_set_outbound_htlc_maximum_msat(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelCounterparty_set_outbound_htlc_maximum_msat"))) TS_ChannelCounterparty_set_outbound_htlc_maximum_msat(uint64_t this_ptr, uint64_t val) { LDKChannelCounterparty this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr); - val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1)); + val_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(val)); ChannelCounterparty_set_outbound_htlc_maximum_msat(&this_ptr_conv, val_conv); } -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, uint32_t outbound_htlc_minimum_msat_arg, uint32_t outbound_htlc_maximum_msat_arg) { +uint64_t __attribute__((export_name("TS_ChannelCounterparty_new"))) TS_ChannelCounterparty_new(int8_tArray node_id_arg, uint64_t features_arg, int64_t unspendable_punishment_reserve_arg, uint64_t forwarding_info_arg, uint64_t outbound_htlc_minimum_msat_arg, uint64_t outbound_htlc_maximum_msat_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); 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); + features_arg_conv.inner = untag_ptr(features_arg); + features_arg_conv.is_owned = ptr_is_owned(features_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(features_arg_conv); features_arg_conv = InitFeatures_clone(&features_arg_conv); LDKCounterpartyForwardingInfo forwarding_info_arg_conv; - forwarding_info_arg_conv.inner = (void*)(forwarding_info_arg & (~1)); - forwarding_info_arg_conv.is_owned = (forwarding_info_arg & 1) || (forwarding_info_arg == 0); + forwarding_info_arg_conv.inner = untag_ptr(forwarding_info_arg); + forwarding_info_arg_conv.is_owned = ptr_is_owned(forwarding_info_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(forwarding_info_arg_conv); forwarding_info_arg_conv = CounterpartyForwardingInfo_clone(&forwarding_info_arg_conv); - void* outbound_htlc_minimum_msat_arg_ptr = (void*)(((uintptr_t)outbound_htlc_minimum_msat_arg) & ~1); + void* outbound_htlc_minimum_msat_arg_ptr = untag_ptr(outbound_htlc_minimum_msat_arg); CHECK_ACCESS(outbound_htlc_minimum_msat_arg_ptr); LDKCOption_u64Z outbound_htlc_minimum_msat_arg_conv = *(LDKCOption_u64Z*)(outbound_htlc_minimum_msat_arg_ptr); - outbound_htlc_minimum_msat_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)outbound_htlc_minimum_msat_arg) & ~1)); - void* outbound_htlc_maximum_msat_arg_ptr = (void*)(((uintptr_t)outbound_htlc_maximum_msat_arg) & ~1); + outbound_htlc_minimum_msat_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(outbound_htlc_minimum_msat_arg)); + void* outbound_htlc_maximum_msat_arg_ptr = untag_ptr(outbound_htlc_maximum_msat_arg); CHECK_ACCESS(outbound_htlc_maximum_msat_arg_ptr); LDKCOption_u64Z outbound_htlc_maximum_msat_arg_conv = *(LDKCOption_u64Z*)(outbound_htlc_maximum_msat_arg_ptr); - outbound_htlc_maximum_msat_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)outbound_htlc_maximum_msat_arg) & ~1)); + outbound_htlc_maximum_msat_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(outbound_htlc_maximum_msat_arg)); LDKChannelCounterparty ret_var = ChannelCounterparty_new(node_id_arg_ref, features_arg_conv, unspendable_punishment_reserve_arg, forwarding_info_arg_conv, outbound_htlc_minimum_msat_arg_conv, outbound_htlc_maximum_msat_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t ChannelCounterparty_clone_ptr(LDKChannelCounterparty *NONNULL_PTR arg) { +static inline uint64_t ChannelCounterparty_clone_ptr(LDKChannelCounterparty *NONNULL_PTR arg) { LDKChannelCounterparty ret_var = ChannelCounterparty_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelCounterparty_clone_ptr"))) TS_ChannelCounterparty_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ChannelCounterparty_clone_ptr"))) TS_ChannelCounterparty_clone_ptr(uint64_t arg) { LDKChannelCounterparty arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ChannelCounterparty_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ChannelCounterparty_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelCounterparty_clone"))) TS_ChannelCounterparty_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ChannelCounterparty_clone"))) TS_ChannelCounterparty_clone(uint64_t orig) { LDKChannelCounterparty orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKChannelCounterparty ret_var = ChannelCounterparty_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelDetails_free"))) TS_ChannelDetails_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChannelDetails_free"))) TS_ChannelDetails_free(uint64_t this_obj) { LDKChannelDetails this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChannelDetails_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_ChannelDetails_get_channel_id"))) TS_ChannelDetails_get_channel_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_ChannelDetails_get_channel_id"))) TS_ChannelDetails_get_channel_id(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *ChannelDetails_get_channel_id(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_ChannelDetails_set_channel_id"))) TS_ChannelDetails_set_channel_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_ChannelDetails_set_channel_id"))) TS_ChannelDetails_set_channel_id(uint64_t this_ptr, int8_tArray val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); ChannelDetails_set_channel_id(&this_ptr_conv, val_ref); } -uint32_t __attribute__((export_name("TS_ChannelDetails_get_counterparty"))) TS_ChannelDetails_get_counterparty(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelDetails_get_counterparty"))) TS_ChannelDetails_get_counterparty(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelCounterparty ret_var = ChannelDetails_get_counterparty(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelDetails_set_counterparty"))) TS_ChannelDetails_set_counterparty(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelDetails_set_counterparty"))) TS_ChannelDetails_set_counterparty(uint64_t this_ptr, uint64_t val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelCounterparty val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = ChannelCounterparty_clone(&val_conv); ChannelDetails_set_counterparty(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelDetails_get_funding_txo"))) TS_ChannelDetails_get_funding_txo(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelDetails_get_funding_txo"))) TS_ChannelDetails_get_funding_txo(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKOutPoint ret_var = ChannelDetails_get_funding_txo(&this_ptr_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelDetails_set_funding_txo"))) TS_ChannelDetails_set_funding_txo(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelDetails_set_funding_txo"))) TS_ChannelDetails_set_funding_txo(uint64_t this_ptr, uint64_t val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKOutPoint val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = OutPoint_clone(&val_conv); ChannelDetails_set_funding_txo(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelDetails_get_channel_type"))) TS_ChannelDetails_get_channel_type(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelDetails_get_channel_type"))) TS_ChannelDetails_get_channel_type(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelTypeFeatures ret_var = ChannelDetails_get_channel_type(&this_ptr_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelDetails_set_channel_type"))) TS_ChannelDetails_set_channel_type(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelDetails_set_channel_type"))) TS_ChannelDetails_set_channel_type(uint64_t this_ptr, uint64_t val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelTypeFeatures val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = ChannelTypeFeatures_clone(&val_conv); ChannelDetails_set_channel_type(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelDetails_get_short_channel_id"))) TS_ChannelDetails_get_short_channel_id(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelDetails_get_short_channel_id"))) TS_ChannelDetails_get_short_channel_id(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = ChannelDetails_get_short_channel_id(&this_ptr_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_ChannelDetails_set_short_channel_id"))) TS_ChannelDetails_set_short_channel_id(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelDetails_set_short_channel_id"))) TS_ChannelDetails_set_short_channel_id(uint64_t this_ptr, uint64_t val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr); - val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1)); + val_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(val)); ChannelDetails_set_short_channel_id(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelDetails_get_outbound_scid_alias"))) TS_ChannelDetails_get_outbound_scid_alias(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelDetails_get_outbound_scid_alias"))) TS_ChannelDetails_get_outbound_scid_alias(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = ChannelDetails_get_outbound_scid_alias(&this_ptr_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_ChannelDetails_set_outbound_scid_alias"))) TS_ChannelDetails_set_outbound_scid_alias(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelDetails_set_outbound_scid_alias"))) TS_ChannelDetails_set_outbound_scid_alias(uint64_t this_ptr, uint64_t val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr); - val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1)); + val_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(val)); ChannelDetails_set_outbound_scid_alias(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelDetails_get_inbound_scid_alias"))) TS_ChannelDetails_get_inbound_scid_alias(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelDetails_get_inbound_scid_alias"))) TS_ChannelDetails_get_inbound_scid_alias(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = ChannelDetails_get_inbound_scid_alias(&this_ptr_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_ChannelDetails_set_inbound_scid_alias"))) TS_ChannelDetails_set_inbound_scid_alias(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelDetails_set_inbound_scid_alias"))) TS_ChannelDetails_set_inbound_scid_alias(uint64_t this_ptr, uint64_t val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr); - val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1)); + val_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(val)); ChannelDetails_set_inbound_scid_alias(&this_ptr_conv, val_conv); } -int64_t __attribute__((export_name("TS_ChannelDetails_get_channel_value_satoshis"))) TS_ChannelDetails_get_channel_value_satoshis(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelDetails_get_channel_value_satoshis"))) TS_ChannelDetails_get_channel_value_satoshis(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelDetails_get_channel_value_satoshis(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelDetails_set_channel_value_satoshis"))) TS_ChannelDetails_set_channel_value_satoshis(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelDetails_set_channel_value_satoshis"))) TS_ChannelDetails_set_channel_value_satoshis(uint64_t this_ptr, int64_t val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelDetails_set_channel_value_satoshis(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_ChannelDetails_get_unspendable_punishment_reserve"))) TS_ChannelDetails_get_unspendable_punishment_reserve(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelDetails_get_unspendable_punishment_reserve"))) TS_ChannelDetails_get_unspendable_punishment_reserve(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = ChannelDetails_get_unspendable_punishment_reserve(&this_ptr_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_ChannelDetails_set_unspendable_punishment_reserve"))) TS_ChannelDetails_set_unspendable_punishment_reserve(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelDetails_set_unspendable_punishment_reserve"))) TS_ChannelDetails_set_unspendable_punishment_reserve(uint64_t this_ptr, uint64_t val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr); - val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1)); + val_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(val)); ChannelDetails_set_unspendable_punishment_reserve(&this_ptr_conv, val_conv); } -int64_t __attribute__((export_name("TS_ChannelDetails_get_user_channel_id"))) TS_ChannelDetails_get_user_channel_id(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelDetails_get_user_channel_id"))) TS_ChannelDetails_get_user_channel_id(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelDetails_get_user_channel_id(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelDetails_set_user_channel_id"))) TS_ChannelDetails_set_user_channel_id(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelDetails_set_user_channel_id"))) TS_ChannelDetails_set_user_channel_id(uint64_t this_ptr, int64_t val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelDetails_set_user_channel_id(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ChannelDetails_get_balance_msat"))) TS_ChannelDetails_get_balance_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelDetails_get_balance_msat"))) TS_ChannelDetails_get_balance_msat(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelDetails_get_balance_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelDetails_set_balance_msat"))) TS_ChannelDetails_set_balance_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelDetails_set_balance_msat"))) TS_ChannelDetails_set_balance_msat(uint64_t this_ptr, int64_t val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelDetails_set_balance_msat(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ChannelDetails_get_outbound_capacity_msat"))) TS_ChannelDetails_get_outbound_capacity_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelDetails_get_outbound_capacity_msat"))) TS_ChannelDetails_get_outbound_capacity_msat(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelDetails_get_outbound_capacity_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelDetails_set_outbound_capacity_msat"))) TS_ChannelDetails_set_outbound_capacity_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelDetails_set_outbound_capacity_msat"))) TS_ChannelDetails_set_outbound_capacity_msat(uint64_t this_ptr, int64_t val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelDetails_set_outbound_capacity_msat(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ChannelDetails_get_next_outbound_htlc_limit_msat"))) TS_ChannelDetails_get_next_outbound_htlc_limit_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelDetails_get_next_outbound_htlc_limit_msat"))) TS_ChannelDetails_get_next_outbound_htlc_limit_msat(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelDetails_get_next_outbound_htlc_limit_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelDetails_set_next_outbound_htlc_limit_msat"))) TS_ChannelDetails_set_next_outbound_htlc_limit_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelDetails_set_next_outbound_htlc_limit_msat"))) TS_ChannelDetails_set_next_outbound_htlc_limit_msat(uint64_t this_ptr, int64_t val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelDetails_set_next_outbound_htlc_limit_msat(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ChannelDetails_get_inbound_capacity_msat"))) TS_ChannelDetails_get_inbound_capacity_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelDetails_get_inbound_capacity_msat"))) TS_ChannelDetails_get_inbound_capacity_msat(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelDetails_get_inbound_capacity_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelDetails_set_inbound_capacity_msat"))) TS_ChannelDetails_set_inbound_capacity_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelDetails_set_inbound_capacity_msat"))) TS_ChannelDetails_set_inbound_capacity_msat(uint64_t this_ptr, int64_t val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelDetails_set_inbound_capacity_msat(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_ChannelDetails_get_confirmations_required"))) TS_ChannelDetails_get_confirmations_required(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelDetails_get_confirmations_required"))) TS_ChannelDetails_get_confirmations_required(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCOption_u32Z *ret_copy = MALLOC(sizeof(LDKCOption_u32Z), "LDKCOption_u32Z"); *ret_copy = ChannelDetails_get_confirmations_required(&this_ptr_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_ChannelDetails_set_confirmations_required"))) TS_ChannelDetails_set_confirmations_required(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelDetails_set_confirmations_required"))) TS_ChannelDetails_set_confirmations_required(uint64_t this_ptr, uint64_t val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKCOption_u32Z val_conv = *(LDKCOption_u32Z*)(val_ptr); - val_conv = COption_u32Z_clone((LDKCOption_u32Z*)(((uintptr_t)val) & ~1)); + val_conv = COption_u32Z_clone((LDKCOption_u32Z*)untag_ptr(val)); ChannelDetails_set_confirmations_required(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelDetails_get_force_close_spend_delay"))) TS_ChannelDetails_get_force_close_spend_delay(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelDetails_get_force_close_spend_delay"))) TS_ChannelDetails_get_force_close_spend_delay(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCOption_u16Z *ret_copy = MALLOC(sizeof(LDKCOption_u16Z), "LDKCOption_u16Z"); *ret_copy = ChannelDetails_get_force_close_spend_delay(&this_ptr_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_ChannelDetails_set_force_close_spend_delay"))) TS_ChannelDetails_set_force_close_spend_delay(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelDetails_set_force_close_spend_delay"))) TS_ChannelDetails_set_force_close_spend_delay(uint64_t this_ptr, uint64_t val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKCOption_u16Z val_conv = *(LDKCOption_u16Z*)(val_ptr); - val_conv = COption_u16Z_clone((LDKCOption_u16Z*)(((uintptr_t)val) & ~1)); + val_conv = COption_u16Z_clone((LDKCOption_u16Z*)untag_ptr(val)); ChannelDetails_set_force_close_spend_delay(&this_ptr_conv, val_conv); } -jboolean __attribute__((export_name("TS_ChannelDetails_get_is_outbound"))) TS_ChannelDetails_get_is_outbound(uint32_t this_ptr) { +jboolean __attribute__((export_name("TS_ChannelDetails_get_is_outbound"))) TS_ChannelDetails_get_is_outbound(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; jboolean ret_conv = ChannelDetails_get_is_outbound(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelDetails_set_is_outbound"))) TS_ChannelDetails_set_is_outbound(uint32_t this_ptr, jboolean val) { +void __attribute__((export_name("TS_ChannelDetails_set_is_outbound"))) TS_ChannelDetails_set_is_outbound(uint64_t this_ptr, jboolean val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelDetails_set_is_outbound(&this_ptr_conv, val); } -jboolean __attribute__((export_name("TS_ChannelDetails_get_is_channel_ready"))) TS_ChannelDetails_get_is_channel_ready(uint32_t this_ptr) { +jboolean __attribute__((export_name("TS_ChannelDetails_get_is_channel_ready"))) TS_ChannelDetails_get_is_channel_ready(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; jboolean ret_conv = ChannelDetails_get_is_channel_ready(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelDetails_set_is_channel_ready"))) TS_ChannelDetails_set_is_channel_ready(uint32_t this_ptr, jboolean val) { +void __attribute__((export_name("TS_ChannelDetails_set_is_channel_ready"))) TS_ChannelDetails_set_is_channel_ready(uint64_t this_ptr, jboolean val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelDetails_set_is_channel_ready(&this_ptr_conv, val); } -jboolean __attribute__((export_name("TS_ChannelDetails_get_is_usable"))) TS_ChannelDetails_get_is_usable(uint32_t this_ptr) { +jboolean __attribute__((export_name("TS_ChannelDetails_get_is_usable"))) TS_ChannelDetails_get_is_usable(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; jboolean ret_conv = ChannelDetails_get_is_usable(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelDetails_set_is_usable"))) TS_ChannelDetails_set_is_usable(uint32_t this_ptr, jboolean val) { +void __attribute__((export_name("TS_ChannelDetails_set_is_usable"))) TS_ChannelDetails_set_is_usable(uint64_t this_ptr, jboolean val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelDetails_set_is_usable(&this_ptr_conv, val); } -jboolean __attribute__((export_name("TS_ChannelDetails_get_is_public"))) TS_ChannelDetails_get_is_public(uint32_t this_ptr) { +jboolean __attribute__((export_name("TS_ChannelDetails_get_is_public"))) TS_ChannelDetails_get_is_public(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; jboolean ret_conv = ChannelDetails_get_is_public(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelDetails_set_is_public"))) TS_ChannelDetails_set_is_public(uint32_t this_ptr, jboolean val) { +void __attribute__((export_name("TS_ChannelDetails_set_is_public"))) TS_ChannelDetails_set_is_public(uint64_t this_ptr, jboolean val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelDetails_set_is_public(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_ChannelDetails_get_inbound_htlc_minimum_msat"))) TS_ChannelDetails_get_inbound_htlc_minimum_msat(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelDetails_get_inbound_htlc_minimum_msat"))) TS_ChannelDetails_get_inbound_htlc_minimum_msat(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = ChannelDetails_get_inbound_htlc_minimum_msat(&this_ptr_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_ChannelDetails_set_inbound_htlc_minimum_msat"))) TS_ChannelDetails_set_inbound_htlc_minimum_msat(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelDetails_set_inbound_htlc_minimum_msat"))) TS_ChannelDetails_set_inbound_htlc_minimum_msat(uint64_t this_ptr, uint64_t val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr); - val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1)); + val_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(val)); ChannelDetails_set_inbound_htlc_minimum_msat(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelDetails_get_inbound_htlc_maximum_msat"))) TS_ChannelDetails_get_inbound_htlc_maximum_msat(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelDetails_get_inbound_htlc_maximum_msat"))) TS_ChannelDetails_get_inbound_htlc_maximum_msat(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = ChannelDetails_get_inbound_htlc_maximum_msat(&this_ptr_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_ChannelDetails_set_inbound_htlc_maximum_msat"))) TS_ChannelDetails_set_inbound_htlc_maximum_msat(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelDetails_set_inbound_htlc_maximum_msat"))) TS_ChannelDetails_set_inbound_htlc_maximum_msat(uint64_t this_ptr, uint64_t val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr); - val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1)); + val_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(val)); ChannelDetails_set_inbound_htlc_maximum_msat(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelDetails_get_config"))) TS_ChannelDetails_get_config(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelDetails_get_config"))) TS_ChannelDetails_get_config(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelConfig ret_var = ChannelDetails_get_config(&this_ptr_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelDetails_set_config"))) TS_ChannelDetails_set_config(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelDetails_set_config"))) TS_ChannelDetails_set_config(uint64_t this_ptr, uint64_t val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelConfig val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = ChannelConfig_clone(&val_conv); ChannelDetails_set_config(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelDetails_new"))) TS_ChannelDetails_new(int8_tArray channel_id_arg, uint32_t counterparty_arg, uint32_t funding_txo_arg, uint32_t channel_type_arg, uint32_t short_channel_id_arg, uint32_t outbound_scid_alias_arg, uint32_t inbound_scid_alias_arg, int64_t channel_value_satoshis_arg, uint32_t unspendable_punishment_reserve_arg, int64_t user_channel_id_arg, int64_t balance_msat_arg, int64_t outbound_capacity_msat_arg, int64_t next_outbound_htlc_limit_msat_arg, int64_t inbound_capacity_msat_arg, uint32_t confirmations_required_arg, uint32_t force_close_spend_delay_arg, jboolean is_outbound_arg, jboolean is_channel_ready_arg, jboolean is_usable_arg, jboolean is_public_arg, uint32_t inbound_htlc_minimum_msat_arg, uint32_t inbound_htlc_maximum_msat_arg, uint32_t config_arg) { +uint64_t __attribute__((export_name("TS_ChannelDetails_new"))) TS_ChannelDetails_new(int8_tArray channel_id_arg, uint64_t counterparty_arg, uint64_t funding_txo_arg, uint64_t channel_type_arg, uint64_t short_channel_id_arg, uint64_t outbound_scid_alias_arg, uint64_t inbound_scid_alias_arg, int64_t channel_value_satoshis_arg, uint64_t unspendable_punishment_reserve_arg, int64_t user_channel_id_arg, int64_t balance_msat_arg, int64_t outbound_capacity_msat_arg, int64_t next_outbound_htlc_limit_msat_arg, int64_t inbound_capacity_msat_arg, uint64_t confirmations_required_arg, uint64_t force_close_spend_delay_arg, jboolean is_outbound_arg, jboolean is_channel_ready_arg, jboolean is_usable_arg, jboolean is_public_arg, uint64_t inbound_htlc_minimum_msat_arg, uint64_t inbound_htlc_maximum_msat_arg, uint64_t config_arg) { LDKThirtyTwoBytes channel_id_arg_ref; CHECK(channel_id_arg->arr_len == 32); memcpy(channel_id_arg_ref.data, channel_id_arg->elems, 32); FREE(channel_id_arg); LDKChannelCounterparty counterparty_arg_conv; - counterparty_arg_conv.inner = (void*)(counterparty_arg & (~1)); - counterparty_arg_conv.is_owned = (counterparty_arg & 1) || (counterparty_arg == 0); + counterparty_arg_conv.inner = untag_ptr(counterparty_arg); + counterparty_arg_conv.is_owned = ptr_is_owned(counterparty_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(counterparty_arg_conv); counterparty_arg_conv = ChannelCounterparty_clone(&counterparty_arg_conv); LDKOutPoint funding_txo_arg_conv; - funding_txo_arg_conv.inner = (void*)(funding_txo_arg & (~1)); - funding_txo_arg_conv.is_owned = (funding_txo_arg & 1) || (funding_txo_arg == 0); + funding_txo_arg_conv.inner = untag_ptr(funding_txo_arg); + funding_txo_arg_conv.is_owned = ptr_is_owned(funding_txo_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_txo_arg_conv); funding_txo_arg_conv = OutPoint_clone(&funding_txo_arg_conv); LDKChannelTypeFeatures channel_type_arg_conv; - channel_type_arg_conv.inner = (void*)(channel_type_arg & (~1)); - channel_type_arg_conv.is_owned = (channel_type_arg & 1) || (channel_type_arg == 0); + channel_type_arg_conv.inner = untag_ptr(channel_type_arg); + channel_type_arg_conv.is_owned = ptr_is_owned(channel_type_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_type_arg_conv); channel_type_arg_conv = ChannelTypeFeatures_clone(&channel_type_arg_conv); - void* short_channel_id_arg_ptr = (void*)(((uintptr_t)short_channel_id_arg) & ~1); + void* short_channel_id_arg_ptr = untag_ptr(short_channel_id_arg); 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*)(((uintptr_t)short_channel_id_arg) & ~1)); - void* outbound_scid_alias_arg_ptr = (void*)(((uintptr_t)outbound_scid_alias_arg) & ~1); + short_channel_id_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(short_channel_id_arg)); + void* outbound_scid_alias_arg_ptr = untag_ptr(outbound_scid_alias_arg); CHECK_ACCESS(outbound_scid_alias_arg_ptr); LDKCOption_u64Z outbound_scid_alias_arg_conv = *(LDKCOption_u64Z*)(outbound_scid_alias_arg_ptr); - outbound_scid_alias_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)outbound_scid_alias_arg) & ~1)); - void* inbound_scid_alias_arg_ptr = (void*)(((uintptr_t)inbound_scid_alias_arg) & ~1); + outbound_scid_alias_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(outbound_scid_alias_arg)); + void* inbound_scid_alias_arg_ptr = untag_ptr(inbound_scid_alias_arg); CHECK_ACCESS(inbound_scid_alias_arg_ptr); LDKCOption_u64Z inbound_scid_alias_arg_conv = *(LDKCOption_u64Z*)(inbound_scid_alias_arg_ptr); - inbound_scid_alias_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)inbound_scid_alias_arg) & ~1)); - void* unspendable_punishment_reserve_arg_ptr = (void*)(((uintptr_t)unspendable_punishment_reserve_arg) & ~1); + inbound_scid_alias_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(inbound_scid_alias_arg)); + void* unspendable_punishment_reserve_arg_ptr = untag_ptr(unspendable_punishment_reserve_arg); 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*)(((uintptr_t)confirmations_required_arg) & ~1); + void* confirmations_required_arg_ptr = untag_ptr(confirmations_required_arg); 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*)(((uintptr_t)confirmations_required_arg) & ~1)); - void* force_close_spend_delay_arg_ptr = (void*)(((uintptr_t)force_close_spend_delay_arg) & ~1); + confirmations_required_arg_conv = COption_u32Z_clone((LDKCOption_u32Z*)untag_ptr(confirmations_required_arg)); + void* force_close_spend_delay_arg_ptr = untag_ptr(force_close_spend_delay_arg); 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*)(((uintptr_t)force_close_spend_delay_arg) & ~1)); - void* inbound_htlc_minimum_msat_arg_ptr = (void*)(((uintptr_t)inbound_htlc_minimum_msat_arg) & ~1); + force_close_spend_delay_arg_conv = COption_u16Z_clone((LDKCOption_u16Z*)untag_ptr(force_close_spend_delay_arg)); + void* inbound_htlc_minimum_msat_arg_ptr = untag_ptr(inbound_htlc_minimum_msat_arg); CHECK_ACCESS(inbound_htlc_minimum_msat_arg_ptr); LDKCOption_u64Z inbound_htlc_minimum_msat_arg_conv = *(LDKCOption_u64Z*)(inbound_htlc_minimum_msat_arg_ptr); - inbound_htlc_minimum_msat_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)inbound_htlc_minimum_msat_arg) & ~1)); - void* inbound_htlc_maximum_msat_arg_ptr = (void*)(((uintptr_t)inbound_htlc_maximum_msat_arg) & ~1); + inbound_htlc_minimum_msat_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(inbound_htlc_minimum_msat_arg)); + void* inbound_htlc_maximum_msat_arg_ptr = untag_ptr(inbound_htlc_maximum_msat_arg); CHECK_ACCESS(inbound_htlc_maximum_msat_arg_ptr); LDKCOption_u64Z inbound_htlc_maximum_msat_arg_conv = *(LDKCOption_u64Z*)(inbound_htlc_maximum_msat_arg_ptr); - inbound_htlc_maximum_msat_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)inbound_htlc_maximum_msat_arg) & ~1)); + inbound_htlc_maximum_msat_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(inbound_htlc_maximum_msat_arg)); LDKChannelConfig config_arg_conv; - config_arg_conv.inner = (void*)(config_arg & (~1)); - config_arg_conv.is_owned = (config_arg & 1) || (config_arg == 0); + config_arg_conv.inner = untag_ptr(config_arg); + config_arg_conv.is_owned = ptr_is_owned(config_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(config_arg_conv); config_arg_conv = ChannelConfig_clone(&config_arg_conv); LDKChannelDetails ret_var = ChannelDetails_new(channel_id_arg_ref, counterparty_arg_conv, funding_txo_arg_conv, channel_type_arg_conv, short_channel_id_arg_conv, outbound_scid_alias_arg_conv, inbound_scid_alias_arg_conv, channel_value_satoshis_arg, unspendable_punishment_reserve_arg_conv, user_channel_id_arg, balance_msat_arg, outbound_capacity_msat_arg, next_outbound_htlc_limit_msat_arg, inbound_capacity_msat_arg, confirmations_required_arg_conv, force_close_spend_delay_arg_conv, is_outbound_arg, is_channel_ready_arg, is_usable_arg, is_public_arg, inbound_htlc_minimum_msat_arg_conv, inbound_htlc_maximum_msat_arg_conv, config_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t ChannelDetails_clone_ptr(LDKChannelDetails *NONNULL_PTR arg) { +static inline uint64_t ChannelDetails_clone_ptr(LDKChannelDetails *NONNULL_PTR arg) { LDKChannelDetails ret_var = ChannelDetails_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelDetails_clone_ptr"))) TS_ChannelDetails_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ChannelDetails_clone_ptr"))) TS_ChannelDetails_clone_ptr(uint64_t arg) { LDKChannelDetails arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ChannelDetails_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ChannelDetails_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelDetails_clone"))) TS_ChannelDetails_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ChannelDetails_clone"))) TS_ChannelDetails_clone(uint64_t orig) { LDKChannelDetails orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKChannelDetails ret_var = ChannelDetails_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelDetails_get_inbound_payment_scid"))) TS_ChannelDetails_get_inbound_payment_scid(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ChannelDetails_get_inbound_payment_scid"))) TS_ChannelDetails_get_inbound_payment_scid(uint64_t this_arg) { LDKChannelDetails this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = ChannelDetails_get_inbound_payment_scid(&this_arg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelDetails_get_outbound_payment_scid"))) TS_ChannelDetails_get_outbound_payment_scid(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ChannelDetails_get_outbound_payment_scid"))) TS_ChannelDetails_get_outbound_payment_scid(uint64_t this_arg) { LDKChannelDetails this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = ChannelDetails_get_outbound_payment_scid(&this_arg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_PaymentSendFailure_free"))) TS_PaymentSendFailure_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKPaymentSendFailure this_ptr_conv = *(LDKPaymentSendFailure*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); PaymentSendFailure_free(this_ptr_conv); } -static inline uintptr_t PaymentSendFailure_clone_ptr(LDKPaymentSendFailure *NONNULL_PTR arg) { +static inline uint64_t PaymentSendFailure_clone_ptr(LDKPaymentSendFailure *NONNULL_PTR arg) { LDKPaymentSendFailure *ret_copy = MALLOC(sizeof(LDKPaymentSendFailure), "LDKPaymentSendFailure"); *ret_copy = PaymentSendFailure_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_PaymentSendFailure_clone_ptr"))) TS_PaymentSendFailure_clone_ptr(uint32_t arg) { - LDKPaymentSendFailure* arg_conv = (LDKPaymentSendFailure*)arg; - uint32_t ret_conv = PaymentSendFailure_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_PaymentSendFailure_clone_ptr"))) TS_PaymentSendFailure_clone_ptr(uint64_t arg) { + LDKPaymentSendFailure* arg_conv = (LDKPaymentSendFailure*)untag_ptr(arg); + int64_t ret_conv = PaymentSendFailure_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_PaymentSendFailure_clone"))) TS_PaymentSendFailure_clone(uint32_t orig) { - LDKPaymentSendFailure* orig_conv = (LDKPaymentSendFailure*)orig; +uint64_t __attribute__((export_name("TS_PaymentSendFailure_clone"))) TS_PaymentSendFailure_clone(uint64_t orig) { + LDKPaymentSendFailure* orig_conv = (LDKPaymentSendFailure*)untag_ptr(orig); LDKPaymentSendFailure *ret_copy = MALLOC(sizeof(LDKPaymentSendFailure), "LDKPaymentSendFailure"); *ret_copy = PaymentSendFailure_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_PaymentSendFailure_parameter_error"))) TS_PaymentSendFailure_parameter_error(uint32_t a) { - void* a_ptr = (void*)(((uintptr_t)a) & ~1); +uint64_t __attribute__((export_name("TS_PaymentSendFailure_parameter_error"))) TS_PaymentSendFailure_parameter_error(uint64_t a) { + void* a_ptr = untag_ptr(a); CHECK_ACCESS(a_ptr); LDKAPIError a_conv = *(LDKAPIError*)(a_ptr); - a_conv = APIError_clone((LDKAPIError*)(((uintptr_t)a) & ~1)); + a_conv = APIError_clone((LDKAPIError*)untag_ptr(a)); LDKPaymentSendFailure *ret_copy = MALLOC(sizeof(LDKPaymentSendFailure), "LDKPaymentSendFailure"); *ret_copy = PaymentSendFailure_parameter_error(a_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_PaymentSendFailure_path_parameter_error"))) TS_PaymentSendFailure_path_parameter_error(uint32_tArray a) { +uint64_t __attribute__((export_name("TS_PaymentSendFailure_path_parameter_error"))) TS_PaymentSendFailure_path_parameter_error(uint64_tArray a) { LDKCVec_CResult_NoneAPIErrorZZ a_constr; a_constr.datalen = a->arr_len; if (a_constr.datalen > 0) 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; + uint64_t* a_vals = a->elems; for (size_t w = 0; w < a_constr.datalen; w++) { - uint32_t a_conv_22 = a_vals[w]; - void* a_conv_22_ptr = (void*)(((uintptr_t)a_conv_22) & ~1); + uint64_t a_conv_22 = a_vals[w]; + void* a_conv_22_ptr = untag_ptr(a_conv_22); 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*)(((uintptr_t)a_conv_22) & ~1)); + a_conv_22_conv = CResult_NoneAPIErrorZ_clone((LDKCResult_NoneAPIErrorZ*)untag_ptr(a_conv_22)); a_constr.data[w] = a_conv_22_conv; } FREE(a); LDKPaymentSendFailure *ret_copy = MALLOC(sizeof(LDKPaymentSendFailure), "LDKPaymentSendFailure"); *ret_copy = PaymentSendFailure_path_parameter_error(a_constr); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_PaymentSendFailure_all_failed_retry_safe"))) TS_PaymentSendFailure_all_failed_retry_safe(uint32_tArray a) { +uint64_t __attribute__((export_name("TS_PaymentSendFailure_all_failed_retry_safe"))) TS_PaymentSendFailure_all_failed_retry_safe(uint64_tArray a) { LDKCVec_APIErrorZ a_constr; a_constr.datalen = a->arr_len; if (a_constr.datalen > 0) a_constr.data = MALLOC(a_constr.datalen * sizeof(LDKAPIError), "LDKCVec_APIErrorZ Elements"); else a_constr.data = NULL; - uint32_t* a_vals = a->elems; + uint64_t* a_vals = a->elems; for (size_t k = 0; k < a_constr.datalen; k++) { - uint32_t a_conv_10 = a_vals[k]; - void* a_conv_10_ptr = (void*)(((uintptr_t)a_conv_10) & ~1); + uint64_t a_conv_10 = a_vals[k]; + void* a_conv_10_ptr = untag_ptr(a_conv_10); CHECK_ACCESS(a_conv_10_ptr); LDKAPIError a_conv_10_conv = *(LDKAPIError*)(a_conv_10_ptr); - a_conv_10_conv = APIError_clone((LDKAPIError*)(((uintptr_t)a_conv_10) & ~1)); + a_conv_10_conv = APIError_clone((LDKAPIError*)untag_ptr(a_conv_10)); a_constr.data[k] = a_conv_10_conv; } FREE(a); LDKPaymentSendFailure *ret_copy = MALLOC(sizeof(LDKPaymentSendFailure), "LDKPaymentSendFailure"); *ret_copy = PaymentSendFailure_all_failed_retry_safe(a_constr); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_PaymentSendFailure_partial_failure"))) TS_PaymentSendFailure_partial_failure(uint32_tArray results, uint32_t failed_paths_retry, int8_tArray payment_id) { +uint64_t __attribute__((export_name("TS_PaymentSendFailure_partial_failure"))) TS_PaymentSendFailure_partial_failure(uint64_tArray results, uint64_t failed_paths_retry, int8_tArray payment_id) { LDKCVec_CResult_NoneAPIErrorZZ results_constr; results_constr.datalen = results->arr_len; if (results_constr.datalen > 0) 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; + uint64_t* results_vals = results->elems; for (size_t w = 0; w < results_constr.datalen; w++) { - uint32_t results_conv_22 = results_vals[w]; - void* results_conv_22_ptr = (void*)(((uintptr_t)results_conv_22) & ~1); + uint64_t results_conv_22 = results_vals[w]; + void* results_conv_22_ptr = untag_ptr(results_conv_22); 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; } FREE(results); LDKRouteParameters failed_paths_retry_conv; - failed_paths_retry_conv.inner = (void*)(failed_paths_retry & (~1)); - failed_paths_retry_conv.is_owned = (failed_paths_retry & 1) || (failed_paths_retry == 0); + failed_paths_retry_conv.inner = untag_ptr(failed_paths_retry); + failed_paths_retry_conv.is_owned = ptr_is_owned(failed_paths_retry); CHECK_INNER_FIELD_ACCESS_OR_NULL(failed_paths_retry_conv); failed_paths_retry_conv = RouteParameters_clone(&failed_paths_retry_conv); LDKThirtyTwoBytes payment_id_ref; @@ -26914,37 +25506,33 @@ uint32_t __attribute__((export_name("TS_PaymentSendFailure_partial_failure"))) 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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_PhantomRouteHints_free"))) TS_PhantomRouteHints_free(uint32_t this_obj) { +void __attribute__((export_name("TS_PhantomRouteHints_free"))) TS_PhantomRouteHints_free(uint64_t this_obj) { LDKPhantomRouteHints this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); PhantomRouteHints_free(this_obj_conv); } -uint32_tArray __attribute__((export_name("TS_PhantomRouteHints_get_channels"))) TS_PhantomRouteHints_get_channels(uint32_t this_ptr) { +uint64_tArray __attribute__((export_name("TS_PhantomRouteHints_get_channels"))) TS_PhantomRouteHints_get_channels(uint64_t this_ptr) { LDKPhantomRouteHints this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_ChannelDetailsZ ret_var = PhantomRouteHints_get_channels(&this_ptr_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t q = 0; q < ret_var.datalen; q++) { LDKChannelDetails ret_conv_16_var = ret_var.data[q]; - uint32_t ret_conv_16_ref = 0; - 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. + uint64_t ret_conv_16_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_16_var); - ret_conv_16_ref = (uintptr_t)ret_conv_16_var.inner; - if (ret_conv_16_var.is_owned) { - ret_conv_16_ref |= 1; - } + ret_conv_16_ref = tag_ptr(ret_conv_16_var.inner, ret_conv_16_var.is_owned); ret_arr_ptr[q] = ret_conv_16_ref; } @@ -26952,23 +25540,24 @@ uint32_tArray __attribute__((export_name("TS_PhantomRouteHints_get_channels"))) return ret_arr; } -void __attribute__((export_name("TS_PhantomRouteHints_set_channels"))) TS_PhantomRouteHints_set_channels(uint32_t this_ptr, uint32_tArray val) { +void __attribute__((export_name("TS_PhantomRouteHints_set_channels"))) TS_PhantomRouteHints_set_channels(uint64_t this_ptr, uint64_tArray val) { LDKPhantomRouteHints this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_ChannelDetailsZ val_constr; val_constr.datalen = val->arr_len; if (val_constr.datalen > 0) val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKChannelDetails), "LDKCVec_ChannelDetailsZ Elements"); else val_constr.data = NULL; - uint32_t* val_vals = val->elems; + uint64_t* val_vals = val->elems; for (size_t q = 0; q < val_constr.datalen; q++) { - uint32_t val_conv_16 = val_vals[q]; + uint64_t val_conv_16 = val_vals[q]; LDKChannelDetails val_conv_16_conv; - val_conv_16_conv.inner = (void*)(val_conv_16 & (~1)); - val_conv_16_conv.is_owned = (val_conv_16 & 1) || (val_conv_16 == 0); + val_conv_16_conv.inner = untag_ptr(val_conv_16); + val_conv_16_conv.is_owned = ptr_is_owned(val_conv_16); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv_16_conv); val_conv_16_conv = ChannelDetails_clone(&val_conv_16_conv); val_constr.data[q] = val_conv_16_conv; @@ -26977,57 +25566,61 @@ void __attribute__((export_name("TS_PhantomRouteHints_set_channels"))) TS_Phant PhantomRouteHints_set_channels(&this_ptr_conv, val_constr); } -int64_t __attribute__((export_name("TS_PhantomRouteHints_get_phantom_scid"))) TS_PhantomRouteHints_get_phantom_scid(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_PhantomRouteHints_get_phantom_scid"))) TS_PhantomRouteHints_get_phantom_scid(uint64_t this_ptr) { LDKPhantomRouteHints this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = PhantomRouteHints_get_phantom_scid(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_PhantomRouteHints_set_phantom_scid"))) TS_PhantomRouteHints_set_phantom_scid(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_PhantomRouteHints_set_phantom_scid"))) TS_PhantomRouteHints_set_phantom_scid(uint64_t this_ptr, int64_t val) { LDKPhantomRouteHints this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; PhantomRouteHints_set_phantom_scid(&this_ptr_conv, val); } -int8_tArray __attribute__((export_name("TS_PhantomRouteHints_get_real_node_pubkey"))) TS_PhantomRouteHints_get_real_node_pubkey(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_PhantomRouteHints_get_real_node_pubkey"))) TS_PhantomRouteHints_get_real_node_pubkey(uint64_t this_ptr) { LDKPhantomRouteHints this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, PhantomRouteHints_get_real_node_pubkey(&this_ptr_conv).compressed_form, 33); return ret_arr; } -void __attribute__((export_name("TS_PhantomRouteHints_set_real_node_pubkey"))) TS_PhantomRouteHints_set_real_node_pubkey(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_PhantomRouteHints_set_real_node_pubkey"))) TS_PhantomRouteHints_set_real_node_pubkey(uint64_t this_ptr, int8_tArray val) { LDKPhantomRouteHints this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); PhantomRouteHints_set_real_node_pubkey(&this_ptr_conv, val_ref); } -uint32_t __attribute__((export_name("TS_PhantomRouteHints_new"))) TS_PhantomRouteHints_new(uint32_tArray channels_arg, int64_t phantom_scid_arg, int8_tArray real_node_pubkey_arg) { +uint64_t __attribute__((export_name("TS_PhantomRouteHints_new"))) TS_PhantomRouteHints_new(uint64_tArray channels_arg, int64_t phantom_scid_arg, int8_tArray real_node_pubkey_arg) { LDKCVec_ChannelDetailsZ channels_arg_constr; channels_arg_constr.datalen = channels_arg->arr_len; if (channels_arg_constr.datalen > 0) channels_arg_constr.data = MALLOC(channels_arg_constr.datalen * sizeof(LDKChannelDetails), "LDKCVec_ChannelDetailsZ Elements"); else channels_arg_constr.data = NULL; - uint32_t* channels_arg_vals = channels_arg->elems; + uint64_t* channels_arg_vals = channels_arg->elems; for (size_t q = 0; q < channels_arg_constr.datalen; q++) { - uint32_t channels_arg_conv_16 = channels_arg_vals[q]; + uint64_t channels_arg_conv_16 = channels_arg_vals[q]; LDKChannelDetails channels_arg_conv_16_conv; - channels_arg_conv_16_conv.inner = (void*)(channels_arg_conv_16 & (~1)); - channels_arg_conv_16_conv.is_owned = (channels_arg_conv_16 & 1) || (channels_arg_conv_16 == 0); + channels_arg_conv_16_conv.inner = untag_ptr(channels_arg_conv_16); + channels_arg_conv_16_conv.is_owned = ptr_is_owned(channels_arg_conv_16); CHECK_INNER_FIELD_ACCESS_OR_NULL(channels_arg_conv_16_conv); channels_arg_conv_16_conv = ChannelDetails_clone(&channels_arg_conv_16_conv); channels_arg_constr.data[q] = channels_arg_conv_16_conv; @@ -27037,85 +25630,72 @@ uint32_t __attribute__((export_name("TS_PhantomRouteHints_new"))) TS_PhantomRou CHECK(real_node_pubkey_arg->arr_len == 33); memcpy(real_node_pubkey_arg_ref.compressed_form, real_node_pubkey_arg->elems, 33); FREE(real_node_pubkey_arg); LDKPhantomRouteHints ret_var = PhantomRouteHints_new(channels_arg_constr, phantom_scid_arg, real_node_pubkey_arg_ref); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t PhantomRouteHints_clone_ptr(LDKPhantomRouteHints *NONNULL_PTR arg) { +static inline uint64_t PhantomRouteHints_clone_ptr(LDKPhantomRouteHints *NONNULL_PTR arg) { LDKPhantomRouteHints ret_var = PhantomRouteHints_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_PhantomRouteHints_clone_ptr"))) TS_PhantomRouteHints_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_PhantomRouteHints_clone_ptr"))) TS_PhantomRouteHints_clone_ptr(uint64_t arg) { LDKPhantomRouteHints arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = PhantomRouteHints_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = PhantomRouteHints_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_PhantomRouteHints_clone"))) TS_PhantomRouteHints_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_PhantomRouteHints_clone"))) TS_PhantomRouteHints_clone(uint64_t orig) { LDKPhantomRouteHints orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKPhantomRouteHints ret_var = PhantomRouteHints_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); 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*)(((uintptr_t)fee_est) & ~1); +uint64_t __attribute__((export_name("TS_ChannelManager_new"))) TS_ChannelManager_new(uint64_t fee_est, uint64_t chain_monitor, uint64_t tx_broadcaster, uint64_t logger, uint64_t keys_manager, uint64_t config, uint64_t params) { + void* fee_est_ptr = untag_ptr(fee_est); CHECK_ACCESS(fee_est_ptr); LDKFeeEstimator fee_est_conv = *(LDKFeeEstimator*)(fee_est_ptr); if (fee_est_conv.free == LDKFeeEstimator_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKFeeEstimator_JCalls_cloned(&fee_est_conv); } - void* chain_monitor_ptr = (void*)(((uintptr_t)chain_monitor) & ~1); + void* chain_monitor_ptr = untag_ptr(chain_monitor); CHECK_ACCESS(chain_monitor_ptr); LDKWatch chain_monitor_conv = *(LDKWatch*)(chain_monitor_ptr); if (chain_monitor_conv.free == LDKWatch_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKWatch_JCalls_cloned(&chain_monitor_conv); } - void* tx_broadcaster_ptr = (void*)(((uintptr_t)tx_broadcaster) & ~1); + void* tx_broadcaster_ptr = untag_ptr(tx_broadcaster); CHECK_ACCESS(tx_broadcaster_ptr); LDKBroadcasterInterface tx_broadcaster_conv = *(LDKBroadcasterInterface*)(tx_broadcaster_ptr); if (tx_broadcaster_conv.free == LDKBroadcasterInterface_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKBroadcasterInterface_JCalls_cloned(&tx_broadcaster_conv); } - void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); + void* logger_ptr = untag_ptr(logger); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); if (logger_conv.free == LDKLogger_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKLogger_JCalls_cloned(&logger_conv); } - void* keys_manager_ptr = (void*)(((uintptr_t)keys_manager) & ~1); + void* keys_manager_ptr = untag_ptr(keys_manager); CHECK_ACCESS(keys_manager_ptr); LDKKeysInterface keys_manager_conv = *(LDKKeysInterface*)(keys_manager_ptr); if (keys_manager_conv.free == LDKKeysInterface_JCalls_free) { @@ -27123,81 +25703,69 @@ uint32_t __attribute__((export_name("TS_ChannelManager_new"))) TS_ChannelManage LDKKeysInterface_JCalls_cloned(&keys_manager_conv); } LDKUserConfig config_conv; - config_conv.inner = (void*)(config & (~1)); - config_conv.is_owned = (config & 1) || (config == 0); + config_conv.inner = untag_ptr(config); + config_conv.is_owned = ptr_is_owned(config); CHECK_INNER_FIELD_ACCESS_OR_NULL(config_conv); config_conv = UserConfig_clone(&config_conv); LDKChainParameters params_conv; - params_conv.inner = (void*)(params & (~1)); - params_conv.is_owned = (params & 1) || (params == 0); + params_conv.inner = untag_ptr(params); + params_conv.is_owned = ptr_is_owned(params); 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelManager_get_current_default_configuration"))) TS_ChannelManager_get_current_default_configuration(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ChannelManager_get_current_default_configuration"))) TS_ChannelManager_get_current_default_configuration(uint64_t this_arg) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKUserConfig ret_var = ChannelManager_get_current_default_configuration(&this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelManager_create_channel"))) TS_ChannelManager_create_channel(uint32_t this_arg, int8_tArray their_network_key, int64_t channel_value_satoshis, int64_t push_msat, int64_t user_channel_id, uint32_t override_config) { +uint64_t __attribute__((export_name("TS_ChannelManager_create_channel"))) TS_ChannelManager_create_channel(uint64_t this_arg, int8_tArray their_network_key, int64_t channel_value_satoshis, int64_t push_msat, int64_t user_channel_id, uint64_t override_config) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKPublicKey their_network_key_ref; CHECK(their_network_key->arr_len == 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); + override_config_conv.inner = untag_ptr(override_config); + override_config_conv.is_owned = ptr_is_owned(override_config); CHECK_INNER_FIELD_ACCESS_OR_NULL(override_config_conv); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_tArray __attribute__((export_name("TS_ChannelManager_list_channels"))) TS_ChannelManager_list_channels(uint32_t this_arg) { +uint64_tArray __attribute__((export_name("TS_ChannelManager_list_channels"))) TS_ChannelManager_list_channels(uint64_t this_arg) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCVec_ChannelDetailsZ ret_var = ChannelManager_list_channels(&this_arg_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t q = 0; q < ret_var.datalen; q++) { LDKChannelDetails ret_conv_16_var = ret_var.data[q]; - uint32_t ret_conv_16_ref = 0; - 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. + uint64_t ret_conv_16_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_16_var); - ret_conv_16_ref = (uintptr_t)ret_conv_16_var.inner; - if (ret_conv_16_var.is_owned) { - ret_conv_16_ref |= 1; - } + ret_conv_16_ref = tag_ptr(ret_conv_16_var.inner, ret_conv_16_var.is_owned); ret_arr_ptr[q] = ret_conv_16_ref; } @@ -27205,25 +25773,21 @@ uint32_tArray __attribute__((export_name("TS_ChannelManager_list_channels"))) T return ret_arr; } -uint32_tArray __attribute__((export_name("TS_ChannelManager_list_usable_channels"))) TS_ChannelManager_list_usable_channels(uint32_t this_arg) { +uint64_tArray __attribute__((export_name("TS_ChannelManager_list_usable_channels"))) TS_ChannelManager_list_usable_channels(uint64_t this_arg) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCVec_ChannelDetailsZ ret_var = ChannelManager_list_usable_channels(&this_arg_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t q = 0; q < ret_var.datalen; q++) { LDKChannelDetails ret_conv_16_var = ret_var.data[q]; - uint32_t ret_conv_16_ref = 0; - 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. + uint64_t ret_conv_16_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_16_var); - ret_conv_16_ref = (uintptr_t)ret_conv_16_var.inner; - if (ret_conv_16_var.is_owned) { - ret_conv_16_ref |= 1; - } + ret_conv_16_ref = tag_ptr(ret_conv_16_var.inner, ret_conv_16_var.is_owned); ret_arr_ptr[q] = ret_conv_16_ref; } @@ -27231,11 +25795,12 @@ uint32_tArray __attribute__((export_name("TS_ChannelManager_list_usable_channel return ret_arr; } -uint32_t __attribute__((export_name("TS_ChannelManager_close_channel"))) TS_ChannelManager_close_channel(uint32_t this_arg, int8_tArray channel_id, int8_tArray counterparty_node_id) { +uint64_t __attribute__((export_name("TS_ChannelManager_close_channel"))) TS_ChannelManager_close_channel(uint64_t this_arg, int8_tArray channel_id, int8_tArray counterparty_node_id) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; unsigned char channel_id_arr[32]; CHECK(channel_id->arr_len == 32); memcpy(channel_id_arr, channel_id->elems, 32); FREE(channel_id); @@ -27245,14 +25810,15 @@ uint32_t __attribute__((export_name("TS_ChannelManager_close_channel"))) TS_Cha memcpy(counterparty_node_id_ref.compressed_form, counterparty_node_id->elems, 33); FREE(counterparty_node_id); LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); *ret_conv = ChannelManager_close_channel(&this_arg_conv, channel_id_ref, counterparty_node_id_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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, int8_tArray counterparty_node_id, int32_t target_feerate_sats_per_1000_weight) { +uint64_t __attribute__((export_name("TS_ChannelManager_close_channel_with_target_feerate"))) TS_ChannelManager_close_channel_with_target_feerate(uint64_t this_arg, int8_tArray channel_id, int8_tArray counterparty_node_id, int32_t target_feerate_sats_per_1000_weight) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; unsigned char channel_id_arr[32]; CHECK(channel_id->arr_len == 32); memcpy(channel_id_arr, channel_id->elems, 32); FREE(channel_id); @@ -27262,14 +25828,15 @@ uint32_t __attribute__((export_name("TS_ChannelManager_close_channel_with_targe memcpy(counterparty_node_id_ref.compressed_form, counterparty_node_id->elems, 33); FREE(counterparty_node_id); LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); *ret_conv = ChannelManager_close_channel_with_target_feerate(&this_arg_conv, channel_id_ref, counterparty_node_id_ref, target_feerate_sats_per_1000_weight); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_ChannelManager_force_close_broadcasting_latest_txn"))) TS_ChannelManager_force_close_broadcasting_latest_txn(uint32_t this_arg, int8_tArray channel_id, int8_tArray counterparty_node_id) { +uint64_t __attribute__((export_name("TS_ChannelManager_force_close_broadcasting_latest_txn"))) TS_ChannelManager_force_close_broadcasting_latest_txn(uint64_t this_arg, int8_tArray channel_id, int8_tArray counterparty_node_id) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; unsigned char channel_id_arr[32]; CHECK(channel_id->arr_len == 32); memcpy(channel_id_arr, channel_id->elems, 32); FREE(channel_id); @@ -27279,14 +25846,15 @@ uint32_t __attribute__((export_name("TS_ChannelManager_force_close_broadcasting memcpy(counterparty_node_id_ref.compressed_form, counterparty_node_id->elems, 33); FREE(counterparty_node_id); LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); *ret_conv = ChannelManager_force_close_broadcasting_latest_txn(&this_arg_conv, channel_id_ref, counterparty_node_id_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_ChannelManager_force_close_without_broadcasting_txn"))) TS_ChannelManager_force_close_without_broadcasting_txn(uint32_t this_arg, int8_tArray channel_id, int8_tArray counterparty_node_id) { +uint64_t __attribute__((export_name("TS_ChannelManager_force_close_without_broadcasting_txn"))) TS_ChannelManager_force_close_without_broadcasting_txn(uint64_t this_arg, int8_tArray channel_id, int8_tArray counterparty_node_id) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; unsigned char channel_id_arr[32]; CHECK(channel_id->arr_len == 32); memcpy(channel_id_arr, channel_id->elems, 32); FREE(channel_id); @@ -27296,34 +25864,38 @@ uint32_t __attribute__((export_name("TS_ChannelManager_force_close_without_broa memcpy(counterparty_node_id_ref.compressed_form, counterparty_node_id->elems, 33); FREE(counterparty_node_id); LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); *ret_conv = ChannelManager_force_close_without_broadcasting_txn(&this_arg_conv, channel_id_ref, counterparty_node_id_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_ChannelManager_force_close_all_channels_broadcasting_latest_txn"))) TS_ChannelManager_force_close_all_channels_broadcasting_latest_txn(uint32_t this_arg) { +void __attribute__((export_name("TS_ChannelManager_force_close_all_channels_broadcasting_latest_txn"))) TS_ChannelManager_force_close_all_channels_broadcasting_latest_txn(uint64_t this_arg) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; ChannelManager_force_close_all_channels_broadcasting_latest_txn(&this_arg_conv); } -void __attribute__((export_name("TS_ChannelManager_force_close_all_channels_without_broadcasting_txn"))) TS_ChannelManager_force_close_all_channels_without_broadcasting_txn(uint32_t this_arg) { +void __attribute__((export_name("TS_ChannelManager_force_close_all_channels_without_broadcasting_txn"))) TS_ChannelManager_force_close_all_channels_without_broadcasting_txn(uint64_t this_arg) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; ChannelManager_force_close_all_channels_without_broadcasting_txn(&this_arg_conv); } -uint32_t __attribute__((export_name("TS_ChannelManager_send_payment"))) TS_ChannelManager_send_payment(uint32_t this_arg, uint32_t route, int8_tArray payment_hash, int8_tArray payment_secret) { +uint64_t __attribute__((export_name("TS_ChannelManager_send_payment"))) TS_ChannelManager_send_payment(uint64_t this_arg, uint64_t route, int8_tArray payment_hash, int8_tArray payment_secret) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKRoute route_conv; - route_conv.inner = (void*)(route & (~1)); - route_conv.is_owned = false; + route_conv.inner = untag_ptr(route); + route_conv.is_owned = ptr_is_owned(route); CHECK_INNER_FIELD_ACCESS_OR_NULL(route_conv); + route_conv.is_owned = false; LDKThirtyTwoBytes payment_hash_ref; CHECK(payment_hash->arr_len == 32); memcpy(payment_hash_ref.data, payment_hash->elems, 32); FREE(payment_hash); @@ -27332,71 +25904,77 @@ uint32_t __attribute__((export_name("TS_ChannelManager_send_payment"))) TS_Chan 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_ChannelManager_retry_payment"))) TS_ChannelManager_retry_payment(uint32_t this_arg, uint32_t route, int8_tArray payment_id) { +uint64_t __attribute__((export_name("TS_ChannelManager_retry_payment"))) TS_ChannelManager_retry_payment(uint64_t this_arg, uint64_t route, int8_tArray payment_id) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKRoute route_conv; - route_conv.inner = (void*)(route & (~1)); - route_conv.is_owned = false; + route_conv.inner = untag_ptr(route); + route_conv.is_owned = ptr_is_owned(route); CHECK_INNER_FIELD_ACCESS_OR_NULL(route_conv); + route_conv.is_owned = false; LDKThirtyTwoBytes payment_id_ref; CHECK(payment_id->arr_len == 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_ChannelManager_abandon_payment"))) TS_ChannelManager_abandon_payment(uint32_t this_arg, int8_tArray payment_id) { +void __attribute__((export_name("TS_ChannelManager_abandon_payment"))) TS_ChannelManager_abandon_payment(uint64_t this_arg, int8_tArray payment_id) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKThirtyTwoBytes payment_id_ref; CHECK(payment_id->arr_len == 32); memcpy(payment_id_ref.data, payment_id->elems, 32); FREE(payment_id); ChannelManager_abandon_payment(&this_arg_conv, payment_id_ref); } -uint32_t __attribute__((export_name("TS_ChannelManager_send_spontaneous_payment"))) TS_ChannelManager_send_spontaneous_payment(uint32_t this_arg, uint32_t route, int8_tArray payment_preimage) { +uint64_t __attribute__((export_name("TS_ChannelManager_send_spontaneous_payment"))) TS_ChannelManager_send_spontaneous_payment(uint64_t this_arg, uint64_t route, int8_tArray payment_preimage) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKRoute route_conv; - route_conv.inner = (void*)(route & (~1)); - route_conv.is_owned = false; + route_conv.inner = untag_ptr(route); + route_conv.is_owned = ptr_is_owned(route); CHECK_INNER_FIELD_ACCESS_OR_NULL(route_conv); + route_conv.is_owned = false; LDKThirtyTwoBytes payment_preimage_ref; CHECK(payment_preimage->arr_len == 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_ChannelManager_send_probe"))) TS_ChannelManager_send_probe(uint32_t this_arg, uint32_tArray hops) { +uint64_t __attribute__((export_name("TS_ChannelManager_send_probe"))) TS_ChannelManager_send_probe(uint64_t this_arg, uint64_tArray hops) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCVec_RouteHopZ hops_constr; hops_constr.datalen = hops->arr_len; if (hops_constr.datalen > 0) hops_constr.data = MALLOC(hops_constr.datalen * sizeof(LDKRouteHop), "LDKCVec_RouteHopZ Elements"); else hops_constr.data = NULL; - uint32_t* hops_vals = hops->elems; + uint64_t* hops_vals = hops->elems; for (size_t k = 0; k < hops_constr.datalen; k++) { - uint32_t hops_conv_10 = hops_vals[k]; + uint64_t hops_conv_10 = hops_vals[k]; LDKRouteHop hops_conv_10_conv; - hops_conv_10_conv.inner = (void*)(hops_conv_10 & (~1)); - hops_conv_10_conv.is_owned = (hops_conv_10 & 1) || (hops_conv_10 == 0); + hops_conv_10_conv.inner = untag_ptr(hops_conv_10); + hops_conv_10_conv.is_owned = ptr_is_owned(hops_conv_10); CHECK_INNER_FIELD_ACCESS_OR_NULL(hops_conv_10_conv); hops_conv_10_conv = RouteHop_clone(&hops_conv_10_conv); hops_constr.data[k] = hops_conv_10_conv; @@ -27404,14 +25982,15 @@ uint32_t __attribute__((export_name("TS_ChannelManager_send_probe"))) TS_Channe FREE(hops); LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ), "LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ"); *ret_conv = ChannelManager_send_probe(&this_arg_conv, hops_constr); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_ChannelManager_funding_transaction_generated"))) TS_ChannelManager_funding_transaction_generated(uint32_t this_arg, int8_tArray temporary_channel_id, int8_tArray counterparty_node_id, int8_tArray funding_transaction) { +uint64_t __attribute__((export_name("TS_ChannelManager_funding_transaction_generated"))) TS_ChannelManager_funding_transaction_generated(uint64_t this_arg, int8_tArray temporary_channel_id, int8_tArray counterparty_node_id, int8_tArray funding_transaction) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; unsigned char temporary_channel_id_arr[32]; CHECK(temporary_channel_id->arr_len == 32); memcpy(temporary_channel_id_arr, temporary_channel_id->elems, 32); FREE(temporary_channel_id); @@ -27426,14 +26005,15 @@ uint32_t __attribute__((export_name("TS_ChannelManager_funding_transaction_gene 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, counterparty_node_id_ref, funding_transaction_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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) { +void __attribute__((export_name("TS_ChannelManager_broadcast_node_announcement"))) TS_ChannelManager_broadcast_node_announcement(uint64_t this_arg, int8_tArray rgb, int8_tArray alias, uint64_tArray addresses) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKThreeBytes rgb_ref; CHECK(rgb->arr_len == 3); memcpy(rgb_ref.data, rgb->elems, 3); FREE(rgb); @@ -27446,10 +26026,10 @@ void __attribute__((export_name("TS_ChannelManager_broadcast_node_announcement" addresses_constr.data = MALLOC(addresses_constr.datalen * sizeof(LDKNetAddress), "LDKCVec_NetAddressZ Elements"); else addresses_constr.data = NULL; - uint32_t* addresses_vals = addresses->elems; + uint64_t* addresses_vals = addresses->elems; for (size_t m = 0; m < addresses_constr.datalen; m++) { - uint32_t addresses_conv_12 = addresses_vals[m]; - void* addresses_conv_12_ptr = (void*)(((uintptr_t)addresses_conv_12) & ~1); + uint64_t addresses_conv_12 = addresses_vals[m]; + void* addresses_conv_12_ptr = untag_ptr(addresses_conv_12); CHECK_ACCESS(addresses_conv_12_ptr); LDKNetAddress addresses_conv_12_conv = *(LDKNetAddress*)(addresses_conv_12_ptr); addresses_constr.data[m] = addresses_conv_12_conv; @@ -27458,11 +26038,12 @@ void __attribute__((export_name("TS_ChannelManager_broadcast_node_announcement" ChannelManager_broadcast_node_announcement(&this_arg_conv, rgb_ref, alias_ref, addresses_constr); } -uint32_t __attribute__((export_name("TS_ChannelManager_update_channel_config"))) TS_ChannelManager_update_channel_config(uint32_t this_arg, int8_tArray counterparty_node_id, ptrArray channel_ids, uint32_t config) { +uint64_t __attribute__((export_name("TS_ChannelManager_update_channel_config"))) TS_ChannelManager_update_channel_config(uint64_t this_arg, int8_tArray counterparty_node_id, ptrArray channel_ids, uint64_t config) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKPublicKey counterparty_node_id_ref; CHECK(counterparty_node_id->arr_len == 33); memcpy(counterparty_node_id_ref.compressed_form, counterparty_node_id->elems, 33); FREE(counterparty_node_id); @@ -27482,35 +26063,39 @@ uint32_t __attribute__((export_name("TS_ChannelManager_update_channel_config")) } FREE(channel_ids); LDKChannelConfig config_conv; - config_conv.inner = (void*)(config & (~1)); - config_conv.is_owned = false; + config_conv.inner = untag_ptr(config); + config_conv.is_owned = ptr_is_owned(config); CHECK_INNER_FIELD_ACCESS_OR_NULL(config_conv); + config_conv.is_owned = false; LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); *ret_conv = ChannelManager_update_channel_config(&this_arg_conv, counterparty_node_id_ref, channel_ids_constr, &config_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_ChannelManager_process_pending_htlc_forwards"))) TS_ChannelManager_process_pending_htlc_forwards(uint32_t this_arg) { +void __attribute__((export_name("TS_ChannelManager_process_pending_htlc_forwards"))) TS_ChannelManager_process_pending_htlc_forwards(uint64_t this_arg) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; ChannelManager_process_pending_htlc_forwards(&this_arg_conv); } -void __attribute__((export_name("TS_ChannelManager_timer_tick_occurred"))) TS_ChannelManager_timer_tick_occurred(uint32_t this_arg) { +void __attribute__((export_name("TS_ChannelManager_timer_tick_occurred"))) TS_ChannelManager_timer_tick_occurred(uint64_t this_arg) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; ChannelManager_timer_tick_occurred(&this_arg_conv); } -void __attribute__((export_name("TS_ChannelManager_fail_htlc_backwards"))) TS_ChannelManager_fail_htlc_backwards(uint32_t this_arg, int8_tArray payment_hash) { +void __attribute__((export_name("TS_ChannelManager_fail_htlc_backwards"))) TS_ChannelManager_fail_htlc_backwards(uint64_t this_arg, int8_tArray payment_hash) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; unsigned char payment_hash_arr[32]; CHECK(payment_hash->arr_len == 32); memcpy(payment_hash_arr, payment_hash->elems, 32); FREE(payment_hash); @@ -27518,32 +26103,35 @@ void __attribute__((export_name("TS_ChannelManager_fail_htlc_backwards"))) TS_C ChannelManager_fail_htlc_backwards(&this_arg_conv, payment_hash_ref); } -void __attribute__((export_name("TS_ChannelManager_claim_funds"))) TS_ChannelManager_claim_funds(uint32_t this_arg, int8_tArray payment_preimage) { +void __attribute__((export_name("TS_ChannelManager_claim_funds"))) TS_ChannelManager_claim_funds(uint64_t this_arg, int8_tArray payment_preimage) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKThirtyTwoBytes payment_preimage_ref; CHECK(payment_preimage->arr_len == 32); memcpy(payment_preimage_ref.data, payment_preimage->elems, 32); FREE(payment_preimage); ChannelManager_claim_funds(&this_arg_conv, payment_preimage_ref); } -int8_tArray __attribute__((export_name("TS_ChannelManager_get_our_node_id"))) TS_ChannelManager_get_our_node_id(uint32_t this_arg) { +int8_tArray __attribute__((export_name("TS_ChannelManager_get_our_node_id"))) TS_ChannelManager_get_our_node_id(uint64_t this_arg) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; 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; } -uint32_t __attribute__((export_name("TS_ChannelManager_accept_inbound_channel"))) TS_ChannelManager_accept_inbound_channel(uint32_t this_arg, int8_tArray temporary_channel_id, int8_tArray counterparty_node_id, int64_t user_channel_id) { +uint64_t __attribute__((export_name("TS_ChannelManager_accept_inbound_channel"))) TS_ChannelManager_accept_inbound_channel(uint64_t this_arg, int8_tArray temporary_channel_id, int8_tArray counterparty_node_id, int64_t user_channel_id) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; unsigned char temporary_channel_id_arr[32]; CHECK(temporary_channel_id->arr_len == 32); memcpy(temporary_channel_id_arr, temporary_channel_id->elems, 32); FREE(temporary_channel_id); @@ -27553,14 +26141,15 @@ uint32_t __attribute__((export_name("TS_ChannelManager_accept_inbound_channel") memcpy(counterparty_node_id_ref.compressed_form, counterparty_node_id->elems, 33); FREE(counterparty_node_id); LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); *ret_conv = ChannelManager_accept_inbound_channel(&this_arg_conv, temporary_channel_id_ref, counterparty_node_id_ref, user_channel_id); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_ChannelManager_accept_inbound_channel_from_trusted_peer_0conf"))) TS_ChannelManager_accept_inbound_channel_from_trusted_peer_0conf(uint32_t this_arg, int8_tArray temporary_channel_id, int8_tArray counterparty_node_id, int64_t user_channel_id) { +uint64_t __attribute__((export_name("TS_ChannelManager_accept_inbound_channel_from_trusted_peer_0conf"))) TS_ChannelManager_accept_inbound_channel_from_trusted_peer_0conf(uint64_t this_arg, int8_tArray temporary_channel_id, int8_tArray counterparty_node_id, int64_t user_channel_id) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; unsigned char temporary_channel_id_arr[32]; CHECK(temporary_channel_id->arr_len == 32); memcpy(temporary_channel_id_arr, temporary_channel_id->elems, 32); FREE(temporary_channel_id); @@ -27570,76 +26159,81 @@ uint32_t __attribute__((export_name("TS_ChannelManager_accept_inbound_channel_f memcpy(counterparty_node_id_ref.compressed_form, counterparty_node_id->elems, 33); FREE(counterparty_node_id); LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); *ret_conv = ChannelManager_accept_inbound_channel_from_trusted_peer_0conf(&this_arg_conv, temporary_channel_id_ref, counterparty_node_id_ref, user_channel_id); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_ChannelManager_create_inbound_payment"))) TS_ChannelManager_create_inbound_payment(uint32_t this_arg, uint32_t min_value_msat, int32_t invoice_expiry_delta_secs) { +uint64_t __attribute__((export_name("TS_ChannelManager_create_inbound_payment"))) TS_ChannelManager_create_inbound_payment(uint64_t this_arg, uint64_t min_value_msat, int32_t invoice_expiry_delta_secs) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); - void* min_value_msat_ptr = (void*)(((uintptr_t)min_value_msat) & ~1); + this_arg_conv.is_owned = false; + void* min_value_msat_ptr = untag_ptr(min_value_msat); 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*)(((uintptr_t)min_value_msat) & ~1)); + min_value_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(min_value_msat)); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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) { +uint64_t __attribute__((export_name("TS_ChannelManager_create_inbound_payment_legacy"))) TS_ChannelManager_create_inbound_payment_legacy(uint64_t this_arg, uint64_t min_value_msat, int32_t invoice_expiry_delta_secs) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); - void* min_value_msat_ptr = (void*)(((uintptr_t)min_value_msat) & ~1); + this_arg_conv.is_owned = false; + void* min_value_msat_ptr = untag_ptr(min_value_msat); 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*)(((uintptr_t)min_value_msat) & ~1)); + min_value_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(min_value_msat)); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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) { +uint64_t __attribute__((export_name("TS_ChannelManager_create_inbound_payment_for_hash"))) TS_ChannelManager_create_inbound_payment_for_hash(uint64_t this_arg, int8_tArray payment_hash, uint64_t min_value_msat, int32_t invoice_expiry_delta_secs) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKThirtyTwoBytes payment_hash_ref; CHECK(payment_hash->arr_len == 32); memcpy(payment_hash_ref.data, payment_hash->elems, 32); FREE(payment_hash); - void* min_value_msat_ptr = (void*)(((uintptr_t)min_value_msat) & ~1); + void* min_value_msat_ptr = untag_ptr(min_value_msat); 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*)(((uintptr_t)min_value_msat) & ~1)); + min_value_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(min_value_msat)); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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) { +uint64_t __attribute__((export_name("TS_ChannelManager_create_inbound_payment_for_hash_legacy"))) TS_ChannelManager_create_inbound_payment_for_hash_legacy(uint64_t this_arg, int8_tArray payment_hash, uint64_t min_value_msat, int32_t invoice_expiry_delta_secs) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKThirtyTwoBytes payment_hash_ref; CHECK(payment_hash->arr_len == 32); memcpy(payment_hash_ref.data, payment_hash->elems, 32); FREE(payment_hash); - void* min_value_msat_ptr = (void*)(((uintptr_t)min_value_msat) & ~1); + void* min_value_msat_ptr = untag_ptr(min_value_msat); 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*)(((uintptr_t)min_value_msat) & ~1)); + min_value_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(min_value_msat)); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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) { +uint64_t __attribute__((export_name("TS_ChannelManager_get_payment_preimage"))) TS_ChannelManager_get_payment_preimage(uint64_t this_arg, int8_tArray payment_hash, int8_tArray payment_secret) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKThirtyTwoBytes payment_hash_ref; CHECK(payment_hash->arr_len == 32); memcpy(payment_hash_ref.data, payment_hash->elems, 32); FREE(payment_hash); @@ -27648,115 +26242,115 @@ uint32_t __attribute__((export_name("TS_ChannelManager_get_payment_preimage"))) 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int64_t __attribute__((export_name("TS_ChannelManager_get_phantom_scid"))) TS_ChannelManager_get_phantom_scid(uint32_t this_arg) { +int64_t __attribute__((export_name("TS_ChannelManager_get_phantom_scid"))) TS_ChannelManager_get_phantom_scid(uint64_t this_arg) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int64_t ret_conv = ChannelManager_get_phantom_scid(&this_arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelManager_get_phantom_route_hints"))) TS_ChannelManager_get_phantom_route_hints(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ChannelManager_get_phantom_route_hints"))) TS_ChannelManager_get_phantom_route_hints(uint64_t this_arg) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKPhantomRouteHints ret_var = ChannelManager_get_phantom_route_hints(&this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelManager_as_MessageSendEventsProvider"))) TS_ChannelManager_as_MessageSendEventsProvider(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ChannelManager_as_MessageSendEventsProvider"))) TS_ChannelManager_as_MessageSendEventsProvider(uint64_t this_arg) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKMessageSendEventsProvider* ret_ret = MALLOC(sizeof(LDKMessageSendEventsProvider), "LDKMessageSendEventsProvider"); *ret_ret = ChannelManager_as_MessageSendEventsProvider(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_t __attribute__((export_name("TS_ChannelManager_as_EventsProvider"))) TS_ChannelManager_as_EventsProvider(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ChannelManager_as_EventsProvider"))) TS_ChannelManager_as_EventsProvider(uint64_t this_arg) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKEventsProvider* ret_ret = MALLOC(sizeof(LDKEventsProvider), "LDKEventsProvider"); *ret_ret = ChannelManager_as_EventsProvider(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_t __attribute__((export_name("TS_ChannelManager_as_Listen"))) TS_ChannelManager_as_Listen(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ChannelManager_as_Listen"))) TS_ChannelManager_as_Listen(uint64_t this_arg) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKListen* ret_ret = MALLOC(sizeof(LDKListen), "LDKListen"); *ret_ret = ChannelManager_as_Listen(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_t __attribute__((export_name("TS_ChannelManager_as_Confirm"))) TS_ChannelManager_as_Confirm(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ChannelManager_as_Confirm"))) TS_ChannelManager_as_Confirm(uint64_t this_arg) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKConfirm* ret_ret = MALLOC(sizeof(LDKConfirm), "LDKConfirm"); *ret_ret = ChannelManager_as_Confirm(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -void __attribute__((export_name("TS_ChannelManager_await_persistable_update"))) TS_ChannelManager_await_persistable_update(uint32_t this_arg) { +void __attribute__((export_name("TS_ChannelManager_await_persistable_update"))) TS_ChannelManager_await_persistable_update(uint64_t this_arg) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; ChannelManager_await_persistable_update(&this_arg_conv); } -uint32_t __attribute__((export_name("TS_ChannelManager_current_best_block"))) TS_ChannelManager_current_best_block(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ChannelManager_current_best_block"))) TS_ChannelManager_current_best_block(uint64_t this_arg) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKBestBlock ret_var = ChannelManager_current_best_block(&this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelManager_as_ChannelMessageHandler"))) TS_ChannelManager_as_ChannelMessageHandler(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ChannelManager_as_ChannelMessageHandler"))) TS_ChannelManager_as_ChannelMessageHandler(uint64_t this_arg) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKChannelMessageHandler* ret_ret = MALLOC(sizeof(LDKChannelMessageHandler), "LDKChannelMessageHandler"); *ret_ret = ChannelManager_as_ChannelMessageHandler(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -int8_tArray __attribute__((export_name("TS_CounterpartyForwardingInfo_write"))) TS_CounterpartyForwardingInfo_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_CounterpartyForwardingInfo_write"))) TS_CounterpartyForwardingInfo_write(uint64_t obj) { LDKCounterpartyForwardingInfo obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = CounterpartyForwardingInfo_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -27764,21 +26358,22 @@ int8_tArray __attribute__((export_name("TS_CounterpartyForwardingInfo_write"))) return ret_arr; } -uint32_t __attribute__((export_name("TS_CounterpartyForwardingInfo_read"))) TS_CounterpartyForwardingInfo_read(int8_tArray ser) { +uint64_t __attribute__((export_name("TS_CounterpartyForwardingInfo_read"))) TS_CounterpartyForwardingInfo_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; ser_ref.data = ser->elems; LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyForwardingInfoDecodeErrorZ), "LDKCResult_CounterpartyForwardingInfoDecodeErrorZ"); *ret_conv = CounterpartyForwardingInfo_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_ChannelCounterparty_write"))) TS_ChannelCounterparty_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ChannelCounterparty_write"))) TS_ChannelCounterparty_write(uint64_t obj) { LDKChannelCounterparty obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ChannelCounterparty_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -27786,21 +26381,22 @@ int8_tArray __attribute__((export_name("TS_ChannelCounterparty_write"))) TS_Cha return ret_arr; } -uint32_t __attribute__((export_name("TS_ChannelCounterparty_read"))) TS_ChannelCounterparty_read(int8_tArray ser) { +uint64_t __attribute__((export_name("TS_ChannelCounterparty_read"))) TS_ChannelCounterparty_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; ser_ref.data = ser->elems; LDKCResult_ChannelCounterpartyDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelCounterpartyDecodeErrorZ), "LDKCResult_ChannelCounterpartyDecodeErrorZ"); *ret_conv = ChannelCounterparty_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_ChannelDetails_write"))) TS_ChannelDetails_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ChannelDetails_write"))) TS_ChannelDetails_write(uint64_t obj) { LDKChannelDetails obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ChannelDetails_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -27808,21 +26404,22 @@ int8_tArray __attribute__((export_name("TS_ChannelDetails_write"))) TS_ChannelD return ret_arr; } -uint32_t __attribute__((export_name("TS_ChannelDetails_read"))) TS_ChannelDetails_read(int8_tArray ser) { +uint64_t __attribute__((export_name("TS_ChannelDetails_read"))) TS_ChannelDetails_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; ser_ref.data = ser->elems; LDKCResult_ChannelDetailsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelDetailsDecodeErrorZ), "LDKCResult_ChannelDetailsDecodeErrorZ"); *ret_conv = ChannelDetails_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_PhantomRouteHints_write"))) TS_PhantomRouteHints_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_PhantomRouteHints_write"))) TS_PhantomRouteHints_write(uint64_t obj) { LDKPhantomRouteHints obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = PhantomRouteHints_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -27830,21 +26427,22 @@ int8_tArray __attribute__((export_name("TS_PhantomRouteHints_write"))) TS_Phant return ret_arr; } -uint32_t __attribute__((export_name("TS_PhantomRouteHints_read"))) TS_PhantomRouteHints_read(int8_tArray ser) { +uint64_t __attribute__((export_name("TS_PhantomRouteHints_read"))) TS_PhantomRouteHints_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; ser_ref.data = ser->elems; LDKCResult_PhantomRouteHintsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PhantomRouteHintsDecodeErrorZ), "LDKCResult_PhantomRouteHintsDecodeErrorZ"); *ret_conv = PhantomRouteHints_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_ChannelManager_write"))) TS_ChannelManager_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ChannelManager_write"))) TS_ChannelManager_write(uint64_t obj) { LDKChannelManager obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ChannelManager_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -27852,30 +26450,32 @@ int8_tArray __attribute__((export_name("TS_ChannelManager_write"))) TS_ChannelM return ret_arr; } -void __attribute__((export_name("TS_ChannelManagerReadArgs_free"))) TS_ChannelManagerReadArgs_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChannelManagerReadArgs_free"))) TS_ChannelManagerReadArgs_free(uint64_t this_obj) { LDKChannelManagerReadArgs this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChannelManagerReadArgs_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_ChannelManagerReadArgs_get_keys_manager"))) TS_ChannelManagerReadArgs_get_keys_manager(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelManagerReadArgs_get_keys_manager"))) TS_ChannelManagerReadArgs_get_keys_manager(uint64_t this_ptr) { LDKChannelManagerReadArgs this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; // WARNING: This object doesn't live past this scope, needs clone! - uint32_t ret_ret = ((uintptr_t)ChannelManagerReadArgs_get_keys_manager(&this_ptr_conv)) | 1; + uint64_t ret_ret = tag_ptr(ChannelManagerReadArgs_get_keys_manager(&this_ptr_conv), false); return ret_ret; } -void __attribute__((export_name("TS_ChannelManagerReadArgs_set_keys_manager"))) TS_ChannelManagerReadArgs_set_keys_manager(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelManagerReadArgs_set_keys_manager"))) TS_ChannelManagerReadArgs_set_keys_manager(uint64_t this_ptr, uint64_t val) { LDKChannelManagerReadArgs this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKKeysInterface val_conv = *(LDKKeysInterface*)(val_ptr); if (val_conv.free == LDKKeysInterface_JCalls_free) { @@ -27885,22 +26485,24 @@ void __attribute__((export_name("TS_ChannelManagerReadArgs_set_keys_manager"))) ChannelManagerReadArgs_set_keys_manager(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelManagerReadArgs_get_fee_estimator"))) TS_ChannelManagerReadArgs_get_fee_estimator(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelManagerReadArgs_get_fee_estimator"))) TS_ChannelManagerReadArgs_get_fee_estimator(uint64_t this_ptr) { LDKChannelManagerReadArgs this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; // WARNING: This object doesn't live past this scope, needs clone! - uint32_t ret_ret = ((uintptr_t)ChannelManagerReadArgs_get_fee_estimator(&this_ptr_conv)) | 1; + uint64_t ret_ret = tag_ptr(ChannelManagerReadArgs_get_fee_estimator(&this_ptr_conv), false); return ret_ret; } -void __attribute__((export_name("TS_ChannelManagerReadArgs_set_fee_estimator"))) TS_ChannelManagerReadArgs_set_fee_estimator(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelManagerReadArgs_set_fee_estimator"))) TS_ChannelManagerReadArgs_set_fee_estimator(uint64_t this_ptr, uint64_t val) { LDKChannelManagerReadArgs this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKFeeEstimator val_conv = *(LDKFeeEstimator*)(val_ptr); if (val_conv.free == LDKFeeEstimator_JCalls_free) { @@ -27910,22 +26512,24 @@ void __attribute__((export_name("TS_ChannelManagerReadArgs_set_fee_estimator")) ChannelManagerReadArgs_set_fee_estimator(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelManagerReadArgs_get_chain_monitor"))) TS_ChannelManagerReadArgs_get_chain_monitor(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelManagerReadArgs_get_chain_monitor"))) TS_ChannelManagerReadArgs_get_chain_monitor(uint64_t this_ptr) { LDKChannelManagerReadArgs this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; // WARNING: This object doesn't live past this scope, needs clone! - uint32_t ret_ret = ((uintptr_t)ChannelManagerReadArgs_get_chain_monitor(&this_ptr_conv)) | 1; + uint64_t ret_ret = tag_ptr(ChannelManagerReadArgs_get_chain_monitor(&this_ptr_conv), false); return ret_ret; } -void __attribute__((export_name("TS_ChannelManagerReadArgs_set_chain_monitor"))) TS_ChannelManagerReadArgs_set_chain_monitor(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelManagerReadArgs_set_chain_monitor"))) TS_ChannelManagerReadArgs_set_chain_monitor(uint64_t this_ptr, uint64_t val) { LDKChannelManagerReadArgs this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKWatch val_conv = *(LDKWatch*)(val_ptr); if (val_conv.free == LDKWatch_JCalls_free) { @@ -27935,22 +26539,24 @@ void __attribute__((export_name("TS_ChannelManagerReadArgs_set_chain_monitor")) ChannelManagerReadArgs_set_chain_monitor(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelManagerReadArgs_get_tx_broadcaster"))) TS_ChannelManagerReadArgs_get_tx_broadcaster(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelManagerReadArgs_get_tx_broadcaster"))) TS_ChannelManagerReadArgs_get_tx_broadcaster(uint64_t this_ptr) { LDKChannelManagerReadArgs this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; // WARNING: This object doesn't live past this scope, needs clone! - uint32_t ret_ret = ((uintptr_t)ChannelManagerReadArgs_get_tx_broadcaster(&this_ptr_conv)) | 1; + uint64_t ret_ret = tag_ptr(ChannelManagerReadArgs_get_tx_broadcaster(&this_ptr_conv), false); return ret_ret; } -void __attribute__((export_name("TS_ChannelManagerReadArgs_set_tx_broadcaster"))) TS_ChannelManagerReadArgs_set_tx_broadcaster(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelManagerReadArgs_set_tx_broadcaster"))) TS_ChannelManagerReadArgs_set_tx_broadcaster(uint64_t this_ptr, uint64_t val) { LDKChannelManagerReadArgs this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKBroadcasterInterface val_conv = *(LDKBroadcasterInterface*)(val_ptr); if (val_conv.free == LDKBroadcasterInterface_JCalls_free) { @@ -27960,22 +26566,24 @@ void __attribute__((export_name("TS_ChannelManagerReadArgs_set_tx_broadcaster") ChannelManagerReadArgs_set_tx_broadcaster(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelManagerReadArgs_get_logger"))) TS_ChannelManagerReadArgs_get_logger(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelManagerReadArgs_get_logger"))) TS_ChannelManagerReadArgs_get_logger(uint64_t this_ptr) { LDKChannelManagerReadArgs this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; // WARNING: This object doesn't live past this scope, needs clone! - uint32_t ret_ret = ((uintptr_t)ChannelManagerReadArgs_get_logger(&this_ptr_conv)) | 1; + uint64_t ret_ret = tag_ptr(ChannelManagerReadArgs_get_logger(&this_ptr_conv), false); return ret_ret; } -void __attribute__((export_name("TS_ChannelManagerReadArgs_set_logger"))) TS_ChannelManagerReadArgs_set_logger(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelManagerReadArgs_set_logger"))) TS_ChannelManagerReadArgs_set_logger(uint64_t this_ptr, uint64_t val) { LDKChannelManagerReadArgs this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKLogger val_conv = *(LDKLogger*)(val_ptr); if (val_conv.free == LDKLogger_JCalls_free) { @@ -27985,66 +26593,63 @@ void __attribute__((export_name("TS_ChannelManagerReadArgs_set_logger"))) TS_Ch ChannelManagerReadArgs_set_logger(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelManagerReadArgs_get_default_config"))) TS_ChannelManagerReadArgs_get_default_config(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelManagerReadArgs_get_default_config"))) TS_ChannelManagerReadArgs_get_default_config(uint64_t this_ptr) { LDKChannelManagerReadArgs this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKUserConfig ret_var = ChannelManagerReadArgs_get_default_config(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelManagerReadArgs_set_default_config"))) TS_ChannelManagerReadArgs_set_default_config(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelManagerReadArgs_set_default_config"))) TS_ChannelManagerReadArgs_set_default_config(uint64_t this_ptr, uint64_t val) { LDKChannelManagerReadArgs this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKUserConfig val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = UserConfig_clone(&val_conv); ChannelManagerReadArgs_set_default_config(&this_ptr_conv, val_conv); } -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*)(((uintptr_t)keys_manager) & ~1); +uint64_t __attribute__((export_name("TS_ChannelManagerReadArgs_new"))) TS_ChannelManagerReadArgs_new(uint64_t keys_manager, uint64_t fee_estimator, uint64_t chain_monitor, uint64_t tx_broadcaster, uint64_t logger, uint64_t default_config, uint64_tArray channel_monitors) { + void* keys_manager_ptr = untag_ptr(keys_manager); CHECK_ACCESS(keys_manager_ptr); LDKKeysInterface keys_manager_conv = *(LDKKeysInterface*)(keys_manager_ptr); if (keys_manager_conv.free == LDKKeysInterface_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKKeysInterface_JCalls_cloned(&keys_manager_conv); } - void* fee_estimator_ptr = (void*)(((uintptr_t)fee_estimator) & ~1); + void* fee_estimator_ptr = untag_ptr(fee_estimator); CHECK_ACCESS(fee_estimator_ptr); LDKFeeEstimator fee_estimator_conv = *(LDKFeeEstimator*)(fee_estimator_ptr); if (fee_estimator_conv.free == LDKFeeEstimator_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKFeeEstimator_JCalls_cloned(&fee_estimator_conv); } - void* chain_monitor_ptr = (void*)(((uintptr_t)chain_monitor) & ~1); + void* chain_monitor_ptr = untag_ptr(chain_monitor); CHECK_ACCESS(chain_monitor_ptr); LDKWatch chain_monitor_conv = *(LDKWatch*)(chain_monitor_ptr); if (chain_monitor_conv.free == LDKWatch_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKWatch_JCalls_cloned(&chain_monitor_conv); } - void* tx_broadcaster_ptr = (void*)(((uintptr_t)tx_broadcaster) & ~1); + void* tx_broadcaster_ptr = untag_ptr(tx_broadcaster); CHECK_ACCESS(tx_broadcaster_ptr); LDKBroadcasterInterface tx_broadcaster_conv = *(LDKBroadcasterInterface*)(tx_broadcaster_ptr); if (tx_broadcaster_conv.free == LDKBroadcasterInterface_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKBroadcasterInterface_JCalls_cloned(&tx_broadcaster_conv); } - void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); + void* logger_ptr = untag_ptr(logger); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); if (logger_conv.free == LDKLogger_JCalls_free) { @@ -28052,8 +26657,8 @@ uint32_t __attribute__((export_name("TS_ChannelManagerReadArgs_new"))) TS_Chann LDKLogger_JCalls_cloned(&logger_conv); } LDKUserConfig default_config_conv; - default_config_conv.inner = (void*)(default_config & (~1)); - default_config_conv.is_owned = (default_config & 1) || (default_config == 0); + default_config_conv.inner = untag_ptr(default_config); + default_config_conv.is_owned = ptr_is_owned(default_config); CHECK_INNER_FIELD_ACCESS_OR_NULL(default_config_conv); default_config_conv = UserConfig_clone(&default_config_conv); LDKCVec_ChannelMonitorZ channel_monitors_constr; @@ -28062,1494 +26667,1474 @@ 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; + uint64_t* channel_monitors_vals = channel_monitors->elems; for (size_t q = 0; q < channel_monitors_constr.datalen; q++) { - uint32_t channel_monitors_conv_16 = channel_monitors_vals[q]; + uint64_t channel_monitors_conv_16 = channel_monitors_vals[q]; LDKChannelMonitor channel_monitors_conv_16_conv; - channel_monitors_conv_16_conv.inner = (void*)(channel_monitors_conv_16 & (~1)); - channel_monitors_conv_16_conv.is_owned = (channel_monitors_conv_16 & 1) || (channel_monitors_conv_16 == 0); + channel_monitors_conv_16_conv.inner = untag_ptr(channel_monitors_conv_16); + channel_monitors_conv_16_conv.is_owned = ptr_is_owned(channel_monitors_conv_16); CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_monitors_conv_16_conv); + channel_monitors_conv_16_conv.is_owned = false; channel_monitors_constr.data[q] = channel_monitors_conv_16_conv; } FREE(channel_monitors); LDKChannelManagerReadArgs ret_var = ChannelManagerReadArgs_new(keys_manager_conv, fee_estimator_conv, chain_monitor_conv, tx_broadcaster_conv, logger_conv, default_config_conv, channel_monitors_constr); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_C2Tuple_BlockHashChannelManagerZ_read"))) TS_C2Tuple_BlockHashChannelManagerZ_read(int8_tArray ser, uint32_t arg) { +uint64_t __attribute__((export_name("TS_C2Tuple_BlockHashChannelManagerZ_read"))) TS_C2Tuple_BlockHashChannelManagerZ_read(int8_tArray ser, uint64_t arg) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; ser_ref.data = ser->elems; LDKChannelManagerReadArgs arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = (arg & 1) || (arg == 0); + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); // WARNING: we need a move here but no clone is available for LDKChannelManagerReadArgs + LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ), "LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ"); *ret_conv = C2Tuple_BlockHashChannelManagerZ_read(ser_ref, arg_conv); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_ExpandedKey_free"))) TS_ExpandedKey_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ExpandedKey_free"))) TS_ExpandedKey_free(uint64_t this_obj) { LDKExpandedKey this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ExpandedKey_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_ExpandedKey_new"))) TS_ExpandedKey_new(int8_tArray key_material) { +uint64_t __attribute__((export_name("TS_ExpandedKey_new"))) TS_ExpandedKey_new(int8_tArray key_material) { unsigned char key_material_arr[32]; CHECK(key_material->arr_len == 32); memcpy(key_material_arr, key_material->elems, 32); FREE(key_material); unsigned char (*key_material_ref)[32] = &key_material_arr; LDKExpandedKey ret_var = ExpandedKey_new(key_material_ref); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_create"))) TS_create(uint32_t keys, uint32_t min_value_msat, int32_t invoice_expiry_delta_secs, uint32_t keys_manager, int64_t current_time) { +uint64_t __attribute__((export_name("TS_create"))) TS_create(uint64_t keys, uint64_t min_value_msat, int32_t invoice_expiry_delta_secs, uint64_t keys_manager, int64_t current_time) { LDKExpandedKey keys_conv; - keys_conv.inner = (void*)(keys & (~1)); - keys_conv.is_owned = false; + keys_conv.inner = untag_ptr(keys); + keys_conv.is_owned = ptr_is_owned(keys); CHECK_INNER_FIELD_ACCESS_OR_NULL(keys_conv); - void* min_value_msat_ptr = (void*)(((uintptr_t)min_value_msat) & ~1); + keys_conv.is_owned = false; + void* min_value_msat_ptr = untag_ptr(min_value_msat); 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*)(((uintptr_t)min_value_msat) & ~1)); - void* keys_manager_ptr = (void*)(((uintptr_t)keys_manager) & ~1); - if (!(keys_manager & 1)) { CHECK_ACCESS(keys_manager_ptr); } + min_value_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(min_value_msat)); + void* keys_manager_ptr = untag_ptr(keys_manager); + if (ptr_is_owned(keys_manager)) { CHECK_ACCESS(keys_manager_ptr); } LDKKeysInterface* keys_manager_conv = (LDKKeysInterface*)keys_manager_ptr; LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ"); *ret_conv = create(&keys_conv, min_value_msat_conv, invoice_expiry_delta_secs, keys_manager_conv, current_time); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_create_from_hash"))) TS_create_from_hash(uint32_t keys, uint32_t min_value_msat, int8_tArray payment_hash, int32_t invoice_expiry_delta_secs, int64_t current_time) { +uint64_t __attribute__((export_name("TS_create_from_hash"))) TS_create_from_hash(uint64_t keys, uint64_t min_value_msat, int8_tArray payment_hash, int32_t invoice_expiry_delta_secs, int64_t current_time) { LDKExpandedKey keys_conv; - keys_conv.inner = (void*)(keys & (~1)); - keys_conv.is_owned = false; + keys_conv.inner = untag_ptr(keys); + keys_conv.is_owned = ptr_is_owned(keys); CHECK_INNER_FIELD_ACCESS_OR_NULL(keys_conv); - void* min_value_msat_ptr = (void*)(((uintptr_t)min_value_msat) & ~1); + keys_conv.is_owned = false; + void* min_value_msat_ptr = untag_ptr(min_value_msat); 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*)(((uintptr_t)min_value_msat) & ~1)); + min_value_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(min_value_msat)); LDKThirtyTwoBytes payment_hash_ref; CHECK(payment_hash->arr_len == 32); memcpy(payment_hash_ref.data, payment_hash->elems, 32); FREE(payment_hash); LDKCResult_PaymentSecretNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretNoneZ), "LDKCResult_PaymentSecretNoneZ"); *ret_conv = create_from_hash(&keys_conv, min_value_msat_conv, payment_hash_ref, invoice_expiry_delta_secs, current_time); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_DecodeError_free"))) TS_DecodeError_free(uint32_t this_obj) { +void __attribute__((export_name("TS_DecodeError_free"))) TS_DecodeError_free(uint64_t this_obj) { LDKDecodeError this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); DecodeError_free(this_obj_conv); } -static inline uintptr_t DecodeError_clone_ptr(LDKDecodeError *NONNULL_PTR arg) { +static inline uint64_t DecodeError_clone_ptr(LDKDecodeError *NONNULL_PTR arg) { LDKDecodeError ret_var = DecodeError_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_DecodeError_clone_ptr"))) TS_DecodeError_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_DecodeError_clone_ptr"))) TS_DecodeError_clone_ptr(uint64_t arg) { LDKDecodeError arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = DecodeError_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = DecodeError_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_DecodeError_clone"))) TS_DecodeError_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_DecodeError_clone"))) TS_DecodeError_clone(uint64_t orig) { LDKDecodeError orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKDecodeError ret_var = DecodeError_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_Init_free"))) TS_Init_free(uint32_t this_obj) { +void __attribute__((export_name("TS_Init_free"))) TS_Init_free(uint64_t this_obj) { LDKInit this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); Init_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_Init_get_features"))) TS_Init_get_features(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_Init_get_features"))) TS_Init_get_features(uint64_t this_ptr) { LDKInit this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKInitFeatures ret_var = Init_get_features(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_Init_set_features"))) TS_Init_set_features(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_Init_set_features"))) TS_Init_set_features(uint64_t this_ptr, uint64_t val) { LDKInit this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKInitFeatures val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = InitFeatures_clone(&val_conv); Init_set_features(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_Init_get_remote_network_address"))) TS_Init_get_remote_network_address(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_Init_get_remote_network_address"))) TS_Init_get_remote_network_address(uint64_t this_ptr) { LDKInit this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCOption_NetAddressZ *ret_copy = MALLOC(sizeof(LDKCOption_NetAddressZ), "LDKCOption_NetAddressZ"); *ret_copy = Init_get_remote_network_address(&this_ptr_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_Init_set_remote_network_address"))) TS_Init_set_remote_network_address(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_Init_set_remote_network_address"))) TS_Init_set_remote_network_address(uint64_t this_ptr, uint64_t val) { LDKInit this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKCOption_NetAddressZ val_conv = *(LDKCOption_NetAddressZ*)(val_ptr); - val_conv = COption_NetAddressZ_clone((LDKCOption_NetAddressZ*)(((uintptr_t)val) & ~1)); + val_conv = COption_NetAddressZ_clone((LDKCOption_NetAddressZ*)untag_ptr(val)); Init_set_remote_network_address(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_Init_new"))) TS_Init_new(uint32_t features_arg, uint32_t remote_network_address_arg) { +uint64_t __attribute__((export_name("TS_Init_new"))) TS_Init_new(uint64_t features_arg, uint64_t remote_network_address_arg) { LDKInitFeatures features_arg_conv; - features_arg_conv.inner = (void*)(features_arg & (~1)); - features_arg_conv.is_owned = (features_arg & 1) || (features_arg == 0); + features_arg_conv.inner = untag_ptr(features_arg); + features_arg_conv.is_owned = ptr_is_owned(features_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(features_arg_conv); features_arg_conv = InitFeatures_clone(&features_arg_conv); - void* remote_network_address_arg_ptr = (void*)(((uintptr_t)remote_network_address_arg) & ~1); + void* remote_network_address_arg_ptr = untag_ptr(remote_network_address_arg); CHECK_ACCESS(remote_network_address_arg_ptr); LDKCOption_NetAddressZ remote_network_address_arg_conv = *(LDKCOption_NetAddressZ*)(remote_network_address_arg_ptr); LDKInit ret_var = Init_new(features_arg_conv, remote_network_address_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t Init_clone_ptr(LDKInit *NONNULL_PTR arg) { +static inline uint64_t Init_clone_ptr(LDKInit *NONNULL_PTR arg) { LDKInit ret_var = Init_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_Init_clone_ptr"))) TS_Init_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_Init_clone_ptr"))) TS_Init_clone_ptr(uint64_t arg) { LDKInit arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = Init_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = Init_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_Init_clone"))) TS_Init_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_Init_clone"))) TS_Init_clone(uint64_t orig) { LDKInit orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKInit ret_var = Init_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ErrorMessage_free"))) TS_ErrorMessage_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ErrorMessage_free"))) TS_ErrorMessage_free(uint64_t this_obj) { LDKErrorMessage this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ErrorMessage_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_ErrorMessage_get_channel_id"))) TS_ErrorMessage_get_channel_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_ErrorMessage_get_channel_id"))) TS_ErrorMessage_get_channel_id(uint64_t this_ptr) { LDKErrorMessage this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *ErrorMessage_get_channel_id(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_ErrorMessage_set_channel_id"))) TS_ErrorMessage_set_channel_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_ErrorMessage_set_channel_id"))) TS_ErrorMessage_set_channel_id(uint64_t this_ptr, int8_tArray val) { LDKErrorMessage this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); ErrorMessage_set_channel_id(&this_ptr_conv, val_ref); } -jstring __attribute__((export_name("TS_ErrorMessage_get_data"))) TS_ErrorMessage_get_data(uint32_t this_ptr) { +jstring __attribute__((export_name("TS_ErrorMessage_get_data"))) TS_ErrorMessage_get_data(uint64_t this_ptr) { LDKErrorMessage this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKStr ret_str = ErrorMessage_get_data(&this_ptr_conv); jstring ret_conv = str_ref_to_ts(ret_str.chars, ret_str.len); Str_free(ret_str); return ret_conv; } -void __attribute__((export_name("TS_ErrorMessage_set_data"))) TS_ErrorMessage_set_data(uint32_t this_ptr, jstring val) { +void __attribute__((export_name("TS_ErrorMessage_set_data"))) TS_ErrorMessage_set_data(uint64_t this_ptr, jstring val) { LDKErrorMessage this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKStr val_conv = str_ref_to_owned_c(val); ErrorMessage_set_data(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ErrorMessage_new"))) TS_ErrorMessage_new(int8_tArray channel_id_arg, jstring data_arg) { +uint64_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); 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t ErrorMessage_clone_ptr(LDKErrorMessage *NONNULL_PTR arg) { +static inline uint64_t ErrorMessage_clone_ptr(LDKErrorMessage *NONNULL_PTR arg) { LDKErrorMessage ret_var = ErrorMessage_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ErrorMessage_clone_ptr"))) TS_ErrorMessage_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ErrorMessage_clone_ptr"))) TS_ErrorMessage_clone_ptr(uint64_t arg) { LDKErrorMessage arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ErrorMessage_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ErrorMessage_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ErrorMessage_clone"))) TS_ErrorMessage_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ErrorMessage_clone"))) TS_ErrorMessage_clone(uint64_t orig) { LDKErrorMessage orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKErrorMessage ret_var = ErrorMessage_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_WarningMessage_free"))) TS_WarningMessage_free(uint32_t this_obj) { +void __attribute__((export_name("TS_WarningMessage_free"))) TS_WarningMessage_free(uint64_t this_obj) { LDKWarningMessage this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); WarningMessage_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_WarningMessage_get_channel_id"))) TS_WarningMessage_get_channel_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_WarningMessage_get_channel_id"))) TS_WarningMessage_get_channel_id(uint64_t this_ptr) { LDKWarningMessage this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *WarningMessage_get_channel_id(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_WarningMessage_set_channel_id"))) TS_WarningMessage_set_channel_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_WarningMessage_set_channel_id"))) TS_WarningMessage_set_channel_id(uint64_t this_ptr, int8_tArray val) { LDKWarningMessage this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); WarningMessage_set_channel_id(&this_ptr_conv, val_ref); } -jstring __attribute__((export_name("TS_WarningMessage_get_data"))) TS_WarningMessage_get_data(uint32_t this_ptr) { +jstring __attribute__((export_name("TS_WarningMessage_get_data"))) TS_WarningMessage_get_data(uint64_t this_ptr) { LDKWarningMessage this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKStr ret_str = WarningMessage_get_data(&this_ptr_conv); jstring ret_conv = str_ref_to_ts(ret_str.chars, ret_str.len); Str_free(ret_str); return ret_conv; } -void __attribute__((export_name("TS_WarningMessage_set_data"))) TS_WarningMessage_set_data(uint32_t this_ptr, jstring val) { +void __attribute__((export_name("TS_WarningMessage_set_data"))) TS_WarningMessage_set_data(uint64_t this_ptr, jstring val) { LDKWarningMessage this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKStr val_conv = str_ref_to_owned_c(val); WarningMessage_set_data(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_WarningMessage_new"))) TS_WarningMessage_new(int8_tArray channel_id_arg, jstring data_arg) { +uint64_t __attribute__((export_name("TS_WarningMessage_new"))) TS_WarningMessage_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); FREE(channel_id_arg); LDKStr data_arg_conv = str_ref_to_owned_c(data_arg); LDKWarningMessage ret_var = WarningMessage_new(channel_id_arg_ref, data_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t WarningMessage_clone_ptr(LDKWarningMessage *NONNULL_PTR arg) { +static inline uint64_t WarningMessage_clone_ptr(LDKWarningMessage *NONNULL_PTR arg) { LDKWarningMessage ret_var = WarningMessage_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_WarningMessage_clone_ptr"))) TS_WarningMessage_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_WarningMessage_clone_ptr"))) TS_WarningMessage_clone_ptr(uint64_t arg) { LDKWarningMessage arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = WarningMessage_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = WarningMessage_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_WarningMessage_clone"))) TS_WarningMessage_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_WarningMessage_clone"))) TS_WarningMessage_clone(uint64_t orig) { LDKWarningMessage orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKWarningMessage ret_var = WarningMessage_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_Ping_free"))) TS_Ping_free(uint32_t this_obj) { +void __attribute__((export_name("TS_Ping_free"))) TS_Ping_free(uint64_t this_obj) { LDKPing this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); Ping_free(this_obj_conv); } -int16_t __attribute__((export_name("TS_Ping_get_ponglen"))) TS_Ping_get_ponglen(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_Ping_get_ponglen"))) TS_Ping_get_ponglen(uint64_t this_ptr) { LDKPing this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = Ping_get_ponglen(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_Ping_set_ponglen"))) TS_Ping_set_ponglen(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_Ping_set_ponglen"))) TS_Ping_set_ponglen(uint64_t this_ptr, int16_t val) { LDKPing this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; Ping_set_ponglen(&this_ptr_conv, val); } -int16_t __attribute__((export_name("TS_Ping_get_byteslen"))) TS_Ping_get_byteslen(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_Ping_get_byteslen"))) TS_Ping_get_byteslen(uint64_t this_ptr) { LDKPing this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = Ping_get_byteslen(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_Ping_set_byteslen"))) TS_Ping_set_byteslen(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_Ping_set_byteslen"))) TS_Ping_set_byteslen(uint64_t this_ptr, int16_t val) { LDKPing this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; Ping_set_byteslen(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_Ping_new"))) TS_Ping_new(int16_t ponglen_arg, int16_t byteslen_arg) { +uint64_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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t Ping_clone_ptr(LDKPing *NONNULL_PTR arg) { +static inline uint64_t Ping_clone_ptr(LDKPing *NONNULL_PTR arg) { LDKPing ret_var = Ping_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_Ping_clone_ptr"))) TS_Ping_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_Ping_clone_ptr"))) TS_Ping_clone_ptr(uint64_t arg) { LDKPing arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = Ping_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = Ping_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_Ping_clone"))) TS_Ping_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_Ping_clone"))) TS_Ping_clone(uint64_t orig) { LDKPing orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKPing ret_var = Ping_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_Pong_free"))) TS_Pong_free(uint32_t this_obj) { +void __attribute__((export_name("TS_Pong_free"))) TS_Pong_free(uint64_t this_obj) { LDKPong this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); Pong_free(this_obj_conv); } -int16_t __attribute__((export_name("TS_Pong_get_byteslen"))) TS_Pong_get_byteslen(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_Pong_get_byteslen"))) TS_Pong_get_byteslen(uint64_t this_ptr) { LDKPong this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = Pong_get_byteslen(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_Pong_set_byteslen"))) TS_Pong_set_byteslen(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_Pong_set_byteslen"))) TS_Pong_set_byteslen(uint64_t this_ptr, int16_t val) { LDKPong this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; Pong_set_byteslen(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_Pong_new"))) TS_Pong_new(int16_t byteslen_arg) { +uint64_t __attribute__((export_name("TS_Pong_new"))) TS_Pong_new(int16_t byteslen_arg) { LDKPong ret_var = Pong_new(byteslen_arg); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t Pong_clone_ptr(LDKPong *NONNULL_PTR arg) { +static inline uint64_t Pong_clone_ptr(LDKPong *NONNULL_PTR arg) { LDKPong ret_var = Pong_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_Pong_clone_ptr"))) TS_Pong_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_Pong_clone_ptr"))) TS_Pong_clone_ptr(uint64_t arg) { LDKPong arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = Pong_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = Pong_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_Pong_clone"))) TS_Pong_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_Pong_clone"))) TS_Pong_clone(uint64_t orig) { LDKPong orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKPong ret_var = Pong_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_OpenChannel_free"))) TS_OpenChannel_free(uint32_t this_obj) { +void __attribute__((export_name("TS_OpenChannel_free"))) TS_OpenChannel_free(uint64_t this_obj) { LDKOpenChannel this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); OpenChannel_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_OpenChannel_get_chain_hash"))) TS_OpenChannel_get_chain_hash(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_OpenChannel_get_chain_hash"))) TS_OpenChannel_get_chain_hash(uint64_t this_ptr) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *OpenChannel_get_chain_hash(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_OpenChannel_set_chain_hash"))) TS_OpenChannel_set_chain_hash(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_OpenChannel_set_chain_hash"))) TS_OpenChannel_set_chain_hash(uint64_t this_ptr, int8_tArray val) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); OpenChannel_set_chain_hash(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_OpenChannel_get_temporary_channel_id"))) TS_OpenChannel_get_temporary_channel_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_OpenChannel_get_temporary_channel_id"))) TS_OpenChannel_get_temporary_channel_id(uint64_t this_ptr) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_OpenChannel_set_temporary_channel_id"))) TS_OpenChannel_set_temporary_channel_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_OpenChannel_set_temporary_channel_id"))) TS_OpenChannel_set_temporary_channel_id(uint64_t this_ptr, int8_tArray val) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); OpenChannel_set_temporary_channel_id(&this_ptr_conv, val_ref); } -int64_t __attribute__((export_name("TS_OpenChannel_get_funding_satoshis"))) TS_OpenChannel_get_funding_satoshis(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_OpenChannel_get_funding_satoshis"))) TS_OpenChannel_get_funding_satoshis(uint64_t this_ptr) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = OpenChannel_get_funding_satoshis(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_OpenChannel_set_funding_satoshis"))) TS_OpenChannel_set_funding_satoshis(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_OpenChannel_set_funding_satoshis"))) TS_OpenChannel_set_funding_satoshis(uint64_t this_ptr, int64_t val) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; OpenChannel_set_funding_satoshis(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_OpenChannel_get_push_msat"))) TS_OpenChannel_get_push_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_OpenChannel_get_push_msat"))) TS_OpenChannel_get_push_msat(uint64_t this_ptr) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = OpenChannel_get_push_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_OpenChannel_set_push_msat"))) TS_OpenChannel_set_push_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_OpenChannel_set_push_msat"))) TS_OpenChannel_set_push_msat(uint64_t this_ptr, int64_t val) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; OpenChannel_set_push_msat(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_OpenChannel_get_dust_limit_satoshis"))) TS_OpenChannel_get_dust_limit_satoshis(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_OpenChannel_get_dust_limit_satoshis"))) TS_OpenChannel_get_dust_limit_satoshis(uint64_t this_ptr) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = OpenChannel_get_dust_limit_satoshis(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_OpenChannel_set_dust_limit_satoshis"))) TS_OpenChannel_set_dust_limit_satoshis(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_OpenChannel_set_dust_limit_satoshis"))) TS_OpenChannel_set_dust_limit_satoshis(uint64_t this_ptr, int64_t val) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; OpenChannel_set_dust_limit_satoshis(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_OpenChannel_get_max_htlc_value_in_flight_msat"))) TS_OpenChannel_get_max_htlc_value_in_flight_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_OpenChannel_get_max_htlc_value_in_flight_msat"))) TS_OpenChannel_get_max_htlc_value_in_flight_msat(uint64_t this_ptr) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = OpenChannel_get_max_htlc_value_in_flight_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_OpenChannel_set_max_htlc_value_in_flight_msat"))) TS_OpenChannel_set_max_htlc_value_in_flight_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_OpenChannel_set_max_htlc_value_in_flight_msat"))) TS_OpenChannel_set_max_htlc_value_in_flight_msat(uint64_t this_ptr, int64_t val) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; OpenChannel_set_max_htlc_value_in_flight_msat(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_OpenChannel_get_channel_reserve_satoshis"))) TS_OpenChannel_get_channel_reserve_satoshis(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_OpenChannel_get_channel_reserve_satoshis"))) TS_OpenChannel_get_channel_reserve_satoshis(uint64_t this_ptr) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = OpenChannel_get_channel_reserve_satoshis(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_OpenChannel_set_channel_reserve_satoshis"))) TS_OpenChannel_set_channel_reserve_satoshis(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_OpenChannel_set_channel_reserve_satoshis"))) TS_OpenChannel_set_channel_reserve_satoshis(uint64_t this_ptr, int64_t val) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; OpenChannel_set_channel_reserve_satoshis(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_OpenChannel_get_htlc_minimum_msat"))) TS_OpenChannel_get_htlc_minimum_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_OpenChannel_get_htlc_minimum_msat"))) TS_OpenChannel_get_htlc_minimum_msat(uint64_t this_ptr) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = OpenChannel_get_htlc_minimum_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_OpenChannel_set_htlc_minimum_msat"))) TS_OpenChannel_set_htlc_minimum_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_OpenChannel_set_htlc_minimum_msat"))) TS_OpenChannel_set_htlc_minimum_msat(uint64_t this_ptr, int64_t val) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; OpenChannel_set_htlc_minimum_msat(&this_ptr_conv, val); } -int32_t __attribute__((export_name("TS_OpenChannel_get_feerate_per_kw"))) TS_OpenChannel_get_feerate_per_kw(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_OpenChannel_get_feerate_per_kw"))) TS_OpenChannel_get_feerate_per_kw(uint64_t this_ptr) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = OpenChannel_get_feerate_per_kw(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_OpenChannel_set_feerate_per_kw"))) TS_OpenChannel_set_feerate_per_kw(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_OpenChannel_set_feerate_per_kw"))) TS_OpenChannel_set_feerate_per_kw(uint64_t this_ptr, int32_t val) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; OpenChannel_set_feerate_per_kw(&this_ptr_conv, val); } -int16_t __attribute__((export_name("TS_OpenChannel_get_to_self_delay"))) TS_OpenChannel_get_to_self_delay(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_OpenChannel_get_to_self_delay"))) TS_OpenChannel_get_to_self_delay(uint64_t this_ptr) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = OpenChannel_get_to_self_delay(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_OpenChannel_set_to_self_delay"))) TS_OpenChannel_set_to_self_delay(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_OpenChannel_set_to_self_delay"))) TS_OpenChannel_set_to_self_delay(uint64_t this_ptr, int16_t val) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; OpenChannel_set_to_self_delay(&this_ptr_conv, val); } -int16_t __attribute__((export_name("TS_OpenChannel_get_max_accepted_htlcs"))) TS_OpenChannel_get_max_accepted_htlcs(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_OpenChannel_get_max_accepted_htlcs"))) TS_OpenChannel_get_max_accepted_htlcs(uint64_t this_ptr) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = OpenChannel_get_max_accepted_htlcs(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_OpenChannel_set_max_accepted_htlcs"))) TS_OpenChannel_set_max_accepted_htlcs(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_OpenChannel_set_max_accepted_htlcs"))) TS_OpenChannel_set_max_accepted_htlcs(uint64_t this_ptr, int16_t val) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; OpenChannel_set_max_accepted_htlcs(&this_ptr_conv, val); } -int8_tArray __attribute__((export_name("TS_OpenChannel_get_funding_pubkey"))) TS_OpenChannel_get_funding_pubkey(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_OpenChannel_get_funding_pubkey"))) TS_OpenChannel_get_funding_pubkey(uint64_t this_ptr) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_OpenChannel_set_funding_pubkey"))) TS_OpenChannel_set_funding_pubkey(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_OpenChannel_set_funding_pubkey"))) TS_OpenChannel_set_funding_pubkey(uint64_t this_ptr, int8_tArray val) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); OpenChannel_set_funding_pubkey(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_OpenChannel_get_revocation_basepoint"))) TS_OpenChannel_get_revocation_basepoint(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_OpenChannel_get_revocation_basepoint"))) TS_OpenChannel_get_revocation_basepoint(uint64_t this_ptr) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_OpenChannel_set_revocation_basepoint"))) TS_OpenChannel_set_revocation_basepoint(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_OpenChannel_set_revocation_basepoint"))) TS_OpenChannel_set_revocation_basepoint(uint64_t this_ptr, int8_tArray val) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); OpenChannel_set_revocation_basepoint(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_OpenChannel_get_payment_point"))) TS_OpenChannel_get_payment_point(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_OpenChannel_get_payment_point"))) TS_OpenChannel_get_payment_point(uint64_t this_ptr) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_OpenChannel_set_payment_point"))) TS_OpenChannel_set_payment_point(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_OpenChannel_set_payment_point"))) TS_OpenChannel_set_payment_point(uint64_t this_ptr, int8_tArray val) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); OpenChannel_set_payment_point(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_OpenChannel_get_delayed_payment_basepoint"))) TS_OpenChannel_get_delayed_payment_basepoint(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_OpenChannel_get_delayed_payment_basepoint"))) TS_OpenChannel_get_delayed_payment_basepoint(uint64_t this_ptr) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_OpenChannel_set_delayed_payment_basepoint"))) TS_OpenChannel_set_delayed_payment_basepoint(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_OpenChannel_set_delayed_payment_basepoint"))) TS_OpenChannel_set_delayed_payment_basepoint(uint64_t this_ptr, int8_tArray val) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); OpenChannel_set_delayed_payment_basepoint(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_OpenChannel_get_htlc_basepoint"))) TS_OpenChannel_get_htlc_basepoint(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_OpenChannel_get_htlc_basepoint"))) TS_OpenChannel_get_htlc_basepoint(uint64_t this_ptr) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_OpenChannel_set_htlc_basepoint"))) TS_OpenChannel_set_htlc_basepoint(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_OpenChannel_set_htlc_basepoint"))) TS_OpenChannel_set_htlc_basepoint(uint64_t this_ptr, int8_tArray val) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); OpenChannel_set_htlc_basepoint(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_OpenChannel_get_first_per_commitment_point"))) TS_OpenChannel_get_first_per_commitment_point(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_OpenChannel_get_first_per_commitment_point"))) TS_OpenChannel_get_first_per_commitment_point(uint64_t this_ptr) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_OpenChannel_set_first_per_commitment_point"))) TS_OpenChannel_set_first_per_commitment_point(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_OpenChannel_set_first_per_commitment_point"))) TS_OpenChannel_set_first_per_commitment_point(uint64_t this_ptr, int8_tArray val) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); OpenChannel_set_first_per_commitment_point(&this_ptr_conv, val_ref); } -int8_t __attribute__((export_name("TS_OpenChannel_get_channel_flags"))) TS_OpenChannel_get_channel_flags(uint32_t this_ptr) { +int8_t __attribute__((export_name("TS_OpenChannel_get_channel_flags"))) TS_OpenChannel_get_channel_flags(uint64_t this_ptr) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_t ret_conv = OpenChannel_get_channel_flags(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_OpenChannel_set_channel_flags"))) TS_OpenChannel_set_channel_flags(uint32_t this_ptr, int8_t val) { +void __attribute__((export_name("TS_OpenChannel_set_channel_flags"))) TS_OpenChannel_set_channel_flags(uint64_t this_ptr, int8_t val) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; OpenChannel_set_channel_flags(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_OpenChannel_get_channel_type"))) TS_OpenChannel_get_channel_type(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_OpenChannel_get_channel_type"))) TS_OpenChannel_get_channel_type(uint64_t this_ptr) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelTypeFeatures ret_var = OpenChannel_get_channel_type(&this_ptr_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_OpenChannel_set_channel_type"))) TS_OpenChannel_set_channel_type(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_OpenChannel_set_channel_type"))) TS_OpenChannel_set_channel_type(uint64_t this_ptr, uint64_t val) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelTypeFeatures val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = ChannelTypeFeatures_clone(&val_conv); OpenChannel_set_channel_type(&this_ptr_conv, val_conv); } -static inline uintptr_t OpenChannel_clone_ptr(LDKOpenChannel *NONNULL_PTR arg) { +static inline uint64_t OpenChannel_clone_ptr(LDKOpenChannel *NONNULL_PTR arg) { LDKOpenChannel ret_var = OpenChannel_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_OpenChannel_clone_ptr"))) TS_OpenChannel_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_OpenChannel_clone_ptr"))) TS_OpenChannel_clone_ptr(uint64_t arg) { LDKOpenChannel arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = OpenChannel_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = OpenChannel_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_OpenChannel_clone"))) TS_OpenChannel_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_OpenChannel_clone"))) TS_OpenChannel_clone(uint64_t orig) { LDKOpenChannel orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKOpenChannel ret_var = OpenChannel_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_AcceptChannel_free"))) TS_AcceptChannel_free(uint32_t this_obj) { +void __attribute__((export_name("TS_AcceptChannel_free"))) TS_AcceptChannel_free(uint64_t this_obj) { LDKAcceptChannel this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); AcceptChannel_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_AcceptChannel_get_temporary_channel_id"))) TS_AcceptChannel_get_temporary_channel_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_AcceptChannel_get_temporary_channel_id"))) TS_AcceptChannel_get_temporary_channel_id(uint64_t this_ptr) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_AcceptChannel_set_temporary_channel_id"))) TS_AcceptChannel_set_temporary_channel_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_AcceptChannel_set_temporary_channel_id"))) TS_AcceptChannel_set_temporary_channel_id(uint64_t this_ptr, int8_tArray val) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); AcceptChannel_set_temporary_channel_id(&this_ptr_conv, val_ref); } -int64_t __attribute__((export_name("TS_AcceptChannel_get_dust_limit_satoshis"))) TS_AcceptChannel_get_dust_limit_satoshis(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_AcceptChannel_get_dust_limit_satoshis"))) TS_AcceptChannel_get_dust_limit_satoshis(uint64_t this_ptr) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = AcceptChannel_get_dust_limit_satoshis(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_AcceptChannel_set_dust_limit_satoshis"))) TS_AcceptChannel_set_dust_limit_satoshis(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_AcceptChannel_set_dust_limit_satoshis"))) TS_AcceptChannel_set_dust_limit_satoshis(uint64_t this_ptr, int64_t val) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; AcceptChannel_set_dust_limit_satoshis(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_AcceptChannel_get_max_htlc_value_in_flight_msat"))) TS_AcceptChannel_get_max_htlc_value_in_flight_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_AcceptChannel_get_max_htlc_value_in_flight_msat"))) TS_AcceptChannel_get_max_htlc_value_in_flight_msat(uint64_t this_ptr) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = AcceptChannel_get_max_htlc_value_in_flight_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_AcceptChannel_set_max_htlc_value_in_flight_msat"))) TS_AcceptChannel_set_max_htlc_value_in_flight_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_AcceptChannel_set_max_htlc_value_in_flight_msat"))) TS_AcceptChannel_set_max_htlc_value_in_flight_msat(uint64_t this_ptr, int64_t val) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; AcceptChannel_set_max_htlc_value_in_flight_msat(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_AcceptChannel_get_channel_reserve_satoshis"))) TS_AcceptChannel_get_channel_reserve_satoshis(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_AcceptChannel_get_channel_reserve_satoshis"))) TS_AcceptChannel_get_channel_reserve_satoshis(uint64_t this_ptr) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = AcceptChannel_get_channel_reserve_satoshis(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_AcceptChannel_set_channel_reserve_satoshis"))) TS_AcceptChannel_set_channel_reserve_satoshis(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_AcceptChannel_set_channel_reserve_satoshis"))) TS_AcceptChannel_set_channel_reserve_satoshis(uint64_t this_ptr, int64_t val) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; AcceptChannel_set_channel_reserve_satoshis(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_AcceptChannel_get_htlc_minimum_msat"))) TS_AcceptChannel_get_htlc_minimum_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_AcceptChannel_get_htlc_minimum_msat"))) TS_AcceptChannel_get_htlc_minimum_msat(uint64_t this_ptr) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = AcceptChannel_get_htlc_minimum_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_AcceptChannel_set_htlc_minimum_msat"))) TS_AcceptChannel_set_htlc_minimum_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_AcceptChannel_set_htlc_minimum_msat"))) TS_AcceptChannel_set_htlc_minimum_msat(uint64_t this_ptr, int64_t val) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; AcceptChannel_set_htlc_minimum_msat(&this_ptr_conv, val); } -int32_t __attribute__((export_name("TS_AcceptChannel_get_minimum_depth"))) TS_AcceptChannel_get_minimum_depth(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_AcceptChannel_get_minimum_depth"))) TS_AcceptChannel_get_minimum_depth(uint64_t this_ptr) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = AcceptChannel_get_minimum_depth(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_AcceptChannel_set_minimum_depth"))) TS_AcceptChannel_set_minimum_depth(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_AcceptChannel_set_minimum_depth"))) TS_AcceptChannel_set_minimum_depth(uint64_t this_ptr, int32_t val) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; AcceptChannel_set_minimum_depth(&this_ptr_conv, val); } -int16_t __attribute__((export_name("TS_AcceptChannel_get_to_self_delay"))) TS_AcceptChannel_get_to_self_delay(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_AcceptChannel_get_to_self_delay"))) TS_AcceptChannel_get_to_self_delay(uint64_t this_ptr) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = AcceptChannel_get_to_self_delay(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_AcceptChannel_set_to_self_delay"))) TS_AcceptChannel_set_to_self_delay(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_AcceptChannel_set_to_self_delay"))) TS_AcceptChannel_set_to_self_delay(uint64_t this_ptr, int16_t val) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; AcceptChannel_set_to_self_delay(&this_ptr_conv, val); } -int16_t __attribute__((export_name("TS_AcceptChannel_get_max_accepted_htlcs"))) TS_AcceptChannel_get_max_accepted_htlcs(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_AcceptChannel_get_max_accepted_htlcs"))) TS_AcceptChannel_get_max_accepted_htlcs(uint64_t this_ptr) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = AcceptChannel_get_max_accepted_htlcs(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_AcceptChannel_set_max_accepted_htlcs"))) TS_AcceptChannel_set_max_accepted_htlcs(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_AcceptChannel_set_max_accepted_htlcs"))) TS_AcceptChannel_set_max_accepted_htlcs(uint64_t this_ptr, int16_t val) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; AcceptChannel_set_max_accepted_htlcs(&this_ptr_conv, val); } -int8_tArray __attribute__((export_name("TS_AcceptChannel_get_funding_pubkey"))) TS_AcceptChannel_get_funding_pubkey(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_AcceptChannel_get_funding_pubkey"))) TS_AcceptChannel_get_funding_pubkey(uint64_t this_ptr) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_AcceptChannel_set_funding_pubkey"))) TS_AcceptChannel_set_funding_pubkey(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_AcceptChannel_set_funding_pubkey"))) TS_AcceptChannel_set_funding_pubkey(uint64_t this_ptr, int8_tArray val) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); AcceptChannel_set_funding_pubkey(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_AcceptChannel_get_revocation_basepoint"))) TS_AcceptChannel_get_revocation_basepoint(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_AcceptChannel_get_revocation_basepoint"))) TS_AcceptChannel_get_revocation_basepoint(uint64_t this_ptr) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_AcceptChannel_set_revocation_basepoint"))) TS_AcceptChannel_set_revocation_basepoint(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_AcceptChannel_set_revocation_basepoint"))) TS_AcceptChannel_set_revocation_basepoint(uint64_t this_ptr, int8_tArray val) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); AcceptChannel_set_revocation_basepoint(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_AcceptChannel_get_payment_point"))) TS_AcceptChannel_get_payment_point(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_AcceptChannel_get_payment_point"))) TS_AcceptChannel_get_payment_point(uint64_t this_ptr) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_AcceptChannel_set_payment_point"))) TS_AcceptChannel_set_payment_point(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_AcceptChannel_set_payment_point"))) TS_AcceptChannel_set_payment_point(uint64_t this_ptr, int8_tArray val) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); AcceptChannel_set_payment_point(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_AcceptChannel_get_delayed_payment_basepoint"))) TS_AcceptChannel_get_delayed_payment_basepoint(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_AcceptChannel_get_delayed_payment_basepoint"))) TS_AcceptChannel_get_delayed_payment_basepoint(uint64_t this_ptr) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_AcceptChannel_set_delayed_payment_basepoint"))) TS_AcceptChannel_set_delayed_payment_basepoint(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_AcceptChannel_set_delayed_payment_basepoint"))) TS_AcceptChannel_set_delayed_payment_basepoint(uint64_t this_ptr, int8_tArray val) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); AcceptChannel_set_delayed_payment_basepoint(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_AcceptChannel_get_htlc_basepoint"))) TS_AcceptChannel_get_htlc_basepoint(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_AcceptChannel_get_htlc_basepoint"))) TS_AcceptChannel_get_htlc_basepoint(uint64_t this_ptr) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_AcceptChannel_set_htlc_basepoint"))) TS_AcceptChannel_set_htlc_basepoint(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_AcceptChannel_set_htlc_basepoint"))) TS_AcceptChannel_set_htlc_basepoint(uint64_t this_ptr, int8_tArray val) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); AcceptChannel_set_htlc_basepoint(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_AcceptChannel_get_first_per_commitment_point"))) TS_AcceptChannel_get_first_per_commitment_point(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_AcceptChannel_get_first_per_commitment_point"))) TS_AcceptChannel_get_first_per_commitment_point(uint64_t this_ptr) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_AcceptChannel_set_first_per_commitment_point"))) TS_AcceptChannel_set_first_per_commitment_point(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_AcceptChannel_set_first_per_commitment_point"))) TS_AcceptChannel_set_first_per_commitment_point(uint64_t this_ptr, int8_tArray val) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); AcceptChannel_set_first_per_commitment_point(&this_ptr_conv, val_ref); } -uint32_t __attribute__((export_name("TS_AcceptChannel_get_channel_type"))) TS_AcceptChannel_get_channel_type(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_AcceptChannel_get_channel_type"))) TS_AcceptChannel_get_channel_type(uint64_t this_ptr) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelTypeFeatures ret_var = AcceptChannel_get_channel_type(&this_ptr_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_AcceptChannel_set_channel_type"))) TS_AcceptChannel_set_channel_type(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_AcceptChannel_set_channel_type"))) TS_AcceptChannel_set_channel_type(uint64_t this_ptr, uint64_t val) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelTypeFeatures val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = ChannelTypeFeatures_clone(&val_conv); AcceptChannel_set_channel_type(&this_ptr_conv, val_conv); } -static inline uintptr_t AcceptChannel_clone_ptr(LDKAcceptChannel *NONNULL_PTR arg) { +static inline uint64_t AcceptChannel_clone_ptr(LDKAcceptChannel *NONNULL_PTR arg) { LDKAcceptChannel ret_var = AcceptChannel_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_AcceptChannel_clone_ptr"))) TS_AcceptChannel_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_AcceptChannel_clone_ptr"))) TS_AcceptChannel_clone_ptr(uint64_t arg) { LDKAcceptChannel arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = AcceptChannel_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = AcceptChannel_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_AcceptChannel_clone"))) TS_AcceptChannel_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_AcceptChannel_clone"))) TS_AcceptChannel_clone(uint64_t orig) { LDKAcceptChannel orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKAcceptChannel ret_var = AcceptChannel_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_FundingCreated_free"))) TS_FundingCreated_free(uint32_t this_obj) { +void __attribute__((export_name("TS_FundingCreated_free"))) TS_FundingCreated_free(uint64_t this_obj) { LDKFundingCreated this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); FundingCreated_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_FundingCreated_get_temporary_channel_id"))) TS_FundingCreated_get_temporary_channel_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_FundingCreated_get_temporary_channel_id"))) TS_FundingCreated_get_temporary_channel_id(uint64_t this_ptr) { LDKFundingCreated this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_FundingCreated_set_temporary_channel_id"))) TS_FundingCreated_set_temporary_channel_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_FundingCreated_set_temporary_channel_id"))) TS_FundingCreated_set_temporary_channel_id(uint64_t this_ptr, int8_tArray val) { LDKFundingCreated this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); FundingCreated_set_temporary_channel_id(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_FundingCreated_get_funding_txid"))) TS_FundingCreated_get_funding_txid(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_FundingCreated_get_funding_txid"))) TS_FundingCreated_get_funding_txid(uint64_t this_ptr) { LDKFundingCreated this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *FundingCreated_get_funding_txid(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_FundingCreated_set_funding_txid"))) TS_FundingCreated_set_funding_txid(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_FundingCreated_set_funding_txid"))) TS_FundingCreated_set_funding_txid(uint64_t this_ptr, int8_tArray val) { LDKFundingCreated this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); FundingCreated_set_funding_txid(&this_ptr_conv, val_ref); } -int16_t __attribute__((export_name("TS_FundingCreated_get_funding_output_index"))) TS_FundingCreated_get_funding_output_index(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_FundingCreated_get_funding_output_index"))) TS_FundingCreated_get_funding_output_index(uint64_t this_ptr) { LDKFundingCreated this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = FundingCreated_get_funding_output_index(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_FundingCreated_set_funding_output_index"))) TS_FundingCreated_set_funding_output_index(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_FundingCreated_set_funding_output_index"))) TS_FundingCreated_set_funding_output_index(uint64_t this_ptr, int16_t val) { LDKFundingCreated this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; FundingCreated_set_funding_output_index(&this_ptr_conv, val); } -int8_tArray __attribute__((export_name("TS_FundingCreated_get_signature"))) TS_FundingCreated_get_signature(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_FundingCreated_get_signature"))) TS_FundingCreated_get_signature(uint64_t this_ptr) { LDKFundingCreated this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_FundingCreated_set_signature"))) TS_FundingCreated_set_signature(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_FundingCreated_set_signature"))) TS_FundingCreated_set_signature(uint64_t this_ptr, int8_tArray val) { LDKFundingCreated this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKSignature val_ref; CHECK(val->arr_len == 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) { +uint64_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); FREE(temporary_channel_id_arg); @@ -29560,106 +28145,97 @@ uint32_t __attribute__((export_name("TS_FundingCreated_new"))) TS_FundingCreate CHECK(signature_arg->arr_len == 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t FundingCreated_clone_ptr(LDKFundingCreated *NONNULL_PTR arg) { +static inline uint64_t FundingCreated_clone_ptr(LDKFundingCreated *NONNULL_PTR arg) { LDKFundingCreated ret_var = FundingCreated_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_FundingCreated_clone_ptr"))) TS_FundingCreated_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_FundingCreated_clone_ptr"))) TS_FundingCreated_clone_ptr(uint64_t arg) { LDKFundingCreated arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = FundingCreated_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = FundingCreated_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_FundingCreated_clone"))) TS_FundingCreated_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_FundingCreated_clone"))) TS_FundingCreated_clone(uint64_t orig) { LDKFundingCreated orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKFundingCreated ret_var = FundingCreated_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_FundingSigned_free"))) TS_FundingSigned_free(uint32_t this_obj) { +void __attribute__((export_name("TS_FundingSigned_free"))) TS_FundingSigned_free(uint64_t this_obj) { LDKFundingSigned this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); FundingSigned_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_FundingSigned_get_channel_id"))) TS_FundingSigned_get_channel_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_FundingSigned_get_channel_id"))) TS_FundingSigned_get_channel_id(uint64_t this_ptr) { LDKFundingSigned this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *FundingSigned_get_channel_id(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_FundingSigned_set_channel_id"))) TS_FundingSigned_set_channel_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_FundingSigned_set_channel_id"))) TS_FundingSigned_set_channel_id(uint64_t this_ptr, int8_tArray val) { LDKFundingSigned this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); FundingSigned_set_channel_id(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_FundingSigned_get_signature"))) TS_FundingSigned_get_signature(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_FundingSigned_get_signature"))) TS_FundingSigned_get_signature(uint64_t this_ptr) { LDKFundingSigned this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_FundingSigned_set_signature"))) TS_FundingSigned_set_signature(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_FundingSigned_set_signature"))) TS_FundingSigned_set_signature(uint64_t this_ptr, int8_tArray val) { LDKFundingSigned this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKSignature val_ref; CHECK(val->arr_len == 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) { +uint64_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); FREE(channel_id_arg); @@ -29667,234 +28243,218 @@ uint32_t __attribute__((export_name("TS_FundingSigned_new"))) TS_FundingSigned_ CHECK(signature_arg->arr_len == 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t FundingSigned_clone_ptr(LDKFundingSigned *NONNULL_PTR arg) { +static inline uint64_t FundingSigned_clone_ptr(LDKFundingSigned *NONNULL_PTR arg) { LDKFundingSigned ret_var = FundingSigned_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_FundingSigned_clone_ptr"))) TS_FundingSigned_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_FundingSigned_clone_ptr"))) TS_FundingSigned_clone_ptr(uint64_t arg) { LDKFundingSigned arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = FundingSigned_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = FundingSigned_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_FundingSigned_clone"))) TS_FundingSigned_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_FundingSigned_clone"))) TS_FundingSigned_clone(uint64_t orig) { LDKFundingSigned orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKFundingSigned ret_var = FundingSigned_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelReady_free"))) TS_ChannelReady_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChannelReady_free"))) TS_ChannelReady_free(uint64_t this_obj) { LDKChannelReady this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChannelReady_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_ChannelReady_get_channel_id"))) TS_ChannelReady_get_channel_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_ChannelReady_get_channel_id"))) TS_ChannelReady_get_channel_id(uint64_t this_ptr) { LDKChannelReady this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *ChannelReady_get_channel_id(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_ChannelReady_set_channel_id"))) TS_ChannelReady_set_channel_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_ChannelReady_set_channel_id"))) TS_ChannelReady_set_channel_id(uint64_t this_ptr, int8_tArray val) { LDKChannelReady this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); ChannelReady_set_channel_id(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_ChannelReady_get_next_per_commitment_point"))) TS_ChannelReady_get_next_per_commitment_point(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_ChannelReady_get_next_per_commitment_point"))) TS_ChannelReady_get_next_per_commitment_point(uint64_t this_ptr) { LDKChannelReady this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, ChannelReady_get_next_per_commitment_point(&this_ptr_conv).compressed_form, 33); return ret_arr; } -void __attribute__((export_name("TS_ChannelReady_set_next_per_commitment_point"))) TS_ChannelReady_set_next_per_commitment_point(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_ChannelReady_set_next_per_commitment_point"))) TS_ChannelReady_set_next_per_commitment_point(uint64_t this_ptr, int8_tArray val) { LDKChannelReady this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); ChannelReady_set_next_per_commitment_point(&this_ptr_conv, val_ref); } -uint32_t __attribute__((export_name("TS_ChannelReady_get_short_channel_id_alias"))) TS_ChannelReady_get_short_channel_id_alias(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelReady_get_short_channel_id_alias"))) TS_ChannelReady_get_short_channel_id_alias(uint64_t this_ptr) { LDKChannelReady this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = ChannelReady_get_short_channel_id_alias(&this_ptr_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_ChannelReady_set_short_channel_id_alias"))) TS_ChannelReady_set_short_channel_id_alias(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelReady_set_short_channel_id_alias"))) TS_ChannelReady_set_short_channel_id_alias(uint64_t this_ptr, uint64_t val) { LDKChannelReady this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr); - val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1)); + val_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(val)); ChannelReady_set_short_channel_id_alias(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelReady_new"))) TS_ChannelReady_new(int8_tArray channel_id_arg, int8_tArray next_per_commitment_point_arg, uint32_t short_channel_id_alias_arg) { +uint64_t __attribute__((export_name("TS_ChannelReady_new"))) TS_ChannelReady_new(int8_tArray channel_id_arg, int8_tArray next_per_commitment_point_arg, uint64_t short_channel_id_alias_arg) { LDKThirtyTwoBytes channel_id_arg_ref; CHECK(channel_id_arg->arr_len == 32); memcpy(channel_id_arg_ref.data, channel_id_arg->elems, 32); FREE(channel_id_arg); 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); FREE(next_per_commitment_point_arg); - void* short_channel_id_alias_arg_ptr = (void*)(((uintptr_t)short_channel_id_alias_arg) & ~1); + void* short_channel_id_alias_arg_ptr = untag_ptr(short_channel_id_alias_arg); CHECK_ACCESS(short_channel_id_alias_arg_ptr); LDKCOption_u64Z short_channel_id_alias_arg_conv = *(LDKCOption_u64Z*)(short_channel_id_alias_arg_ptr); - short_channel_id_alias_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)short_channel_id_alias_arg) & ~1)); + short_channel_id_alias_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(short_channel_id_alias_arg)); LDKChannelReady ret_var = ChannelReady_new(channel_id_arg_ref, next_per_commitment_point_arg_ref, short_channel_id_alias_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t ChannelReady_clone_ptr(LDKChannelReady *NONNULL_PTR arg) { +static inline uint64_t ChannelReady_clone_ptr(LDKChannelReady *NONNULL_PTR arg) { LDKChannelReady ret_var = ChannelReady_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelReady_clone_ptr"))) TS_ChannelReady_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ChannelReady_clone_ptr"))) TS_ChannelReady_clone_ptr(uint64_t arg) { LDKChannelReady arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ChannelReady_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ChannelReady_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelReady_clone"))) TS_ChannelReady_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ChannelReady_clone"))) TS_ChannelReady_clone(uint64_t orig) { LDKChannelReady orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKChannelReady ret_var = ChannelReady_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_Shutdown_free"))) TS_Shutdown_free(uint32_t this_obj) { +void __attribute__((export_name("TS_Shutdown_free"))) TS_Shutdown_free(uint64_t this_obj) { LDKShutdown this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); Shutdown_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_Shutdown_get_channel_id"))) TS_Shutdown_get_channel_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_Shutdown_get_channel_id"))) TS_Shutdown_get_channel_id(uint64_t this_ptr) { LDKShutdown this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *Shutdown_get_channel_id(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_Shutdown_set_channel_id"))) TS_Shutdown_set_channel_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_Shutdown_set_channel_id"))) TS_Shutdown_set_channel_id(uint64_t this_ptr, int8_tArray val) { LDKShutdown this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); Shutdown_set_channel_id(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_Shutdown_get_scriptpubkey"))) TS_Shutdown_get_scriptpubkey(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_Shutdown_get_scriptpubkey"))) TS_Shutdown_get_scriptpubkey(uint64_t this_ptr) { LDKShutdown this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKu8slice ret_var = Shutdown_get_scriptpubkey(&this_ptr_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); return ret_arr; } -void __attribute__((export_name("TS_Shutdown_set_scriptpubkey"))) TS_Shutdown_set_scriptpubkey(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_Shutdown_set_scriptpubkey"))) TS_Shutdown_set_scriptpubkey(uint64_t this_ptr, int8_tArray val) { LDKShutdown this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_u8Z val_ref; val_ref.datalen = val->arr_len; val_ref.data = MALLOC(val_ref.datalen, "LDKCVec_u8Z Bytes"); @@ -29902,7 +28462,7 @@ void __attribute__((export_name("TS_Shutdown_set_scriptpubkey"))) TS_Shutdown_s 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) { +uint64_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); FREE(channel_id_arg); @@ -29911,248 +28471,227 @@ uint32_t __attribute__((export_name("TS_Shutdown_new"))) TS_Shutdown_new(int8_t scriptpubkey_arg_ref.data = MALLOC(scriptpubkey_arg_ref.datalen, "LDKCVec_u8Z Bytes"); 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t Shutdown_clone_ptr(LDKShutdown *NONNULL_PTR arg) { +static inline uint64_t Shutdown_clone_ptr(LDKShutdown *NONNULL_PTR arg) { LDKShutdown ret_var = Shutdown_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_Shutdown_clone_ptr"))) TS_Shutdown_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_Shutdown_clone_ptr"))) TS_Shutdown_clone_ptr(uint64_t arg) { LDKShutdown arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = Shutdown_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = Shutdown_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_Shutdown_clone"))) TS_Shutdown_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_Shutdown_clone"))) TS_Shutdown_clone(uint64_t orig) { LDKShutdown orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKShutdown ret_var = Shutdown_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ClosingSignedFeeRange_free"))) TS_ClosingSignedFeeRange_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ClosingSignedFeeRange_free"))) TS_ClosingSignedFeeRange_free(uint64_t this_obj) { LDKClosingSignedFeeRange this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ClosingSignedFeeRange_free(this_obj_conv); } -int64_t __attribute__((export_name("TS_ClosingSignedFeeRange_get_min_fee_satoshis"))) TS_ClosingSignedFeeRange_get_min_fee_satoshis(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ClosingSignedFeeRange_get_min_fee_satoshis"))) TS_ClosingSignedFeeRange_get_min_fee_satoshis(uint64_t this_ptr) { LDKClosingSignedFeeRange this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ClosingSignedFeeRange_get_min_fee_satoshis(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ClosingSignedFeeRange_set_min_fee_satoshis"))) TS_ClosingSignedFeeRange_set_min_fee_satoshis(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ClosingSignedFeeRange_set_min_fee_satoshis"))) TS_ClosingSignedFeeRange_set_min_fee_satoshis(uint64_t this_ptr, int64_t val) { LDKClosingSignedFeeRange this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ClosingSignedFeeRange_set_min_fee_satoshis(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ClosingSignedFeeRange_get_max_fee_satoshis"))) TS_ClosingSignedFeeRange_get_max_fee_satoshis(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ClosingSignedFeeRange_get_max_fee_satoshis"))) TS_ClosingSignedFeeRange_get_max_fee_satoshis(uint64_t this_ptr) { LDKClosingSignedFeeRange this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ClosingSignedFeeRange_get_max_fee_satoshis(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ClosingSignedFeeRange_set_max_fee_satoshis"))) TS_ClosingSignedFeeRange_set_max_fee_satoshis(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ClosingSignedFeeRange_set_max_fee_satoshis"))) TS_ClosingSignedFeeRange_set_max_fee_satoshis(uint64_t this_ptr, int64_t val) { LDKClosingSignedFeeRange this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ClosingSignedFeeRange_set_max_fee_satoshis(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_ClosingSignedFeeRange_new"))) TS_ClosingSignedFeeRange_new(int64_t min_fee_satoshis_arg, int64_t max_fee_satoshis_arg) { +uint64_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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t ClosingSignedFeeRange_clone_ptr(LDKClosingSignedFeeRange *NONNULL_PTR arg) { +static inline uint64_t ClosingSignedFeeRange_clone_ptr(LDKClosingSignedFeeRange *NONNULL_PTR arg) { LDKClosingSignedFeeRange ret_var = ClosingSignedFeeRange_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ClosingSignedFeeRange_clone_ptr"))) TS_ClosingSignedFeeRange_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ClosingSignedFeeRange_clone_ptr"))) TS_ClosingSignedFeeRange_clone_ptr(uint64_t arg) { LDKClosingSignedFeeRange arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ClosingSignedFeeRange_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ClosingSignedFeeRange_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ClosingSignedFeeRange_clone"))) TS_ClosingSignedFeeRange_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ClosingSignedFeeRange_clone"))) TS_ClosingSignedFeeRange_clone(uint64_t orig) { LDKClosingSignedFeeRange orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKClosingSignedFeeRange ret_var = ClosingSignedFeeRange_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ClosingSigned_free"))) TS_ClosingSigned_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ClosingSigned_free"))) TS_ClosingSigned_free(uint64_t this_obj) { LDKClosingSigned this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ClosingSigned_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_ClosingSigned_get_channel_id"))) TS_ClosingSigned_get_channel_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_ClosingSigned_get_channel_id"))) TS_ClosingSigned_get_channel_id(uint64_t this_ptr) { LDKClosingSigned this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *ClosingSigned_get_channel_id(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_ClosingSigned_set_channel_id"))) TS_ClosingSigned_set_channel_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_ClosingSigned_set_channel_id"))) TS_ClosingSigned_set_channel_id(uint64_t this_ptr, int8_tArray val) { LDKClosingSigned this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); ClosingSigned_set_channel_id(&this_ptr_conv, val_ref); } -int64_t __attribute__((export_name("TS_ClosingSigned_get_fee_satoshis"))) TS_ClosingSigned_get_fee_satoshis(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ClosingSigned_get_fee_satoshis"))) TS_ClosingSigned_get_fee_satoshis(uint64_t this_ptr) { LDKClosingSigned this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ClosingSigned_get_fee_satoshis(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ClosingSigned_set_fee_satoshis"))) TS_ClosingSigned_set_fee_satoshis(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ClosingSigned_set_fee_satoshis"))) TS_ClosingSigned_set_fee_satoshis(uint64_t this_ptr, int64_t val) { LDKClosingSigned this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ClosingSigned_set_fee_satoshis(&this_ptr_conv, val); } -int8_tArray __attribute__((export_name("TS_ClosingSigned_get_signature"))) TS_ClosingSigned_get_signature(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_ClosingSigned_get_signature"))) TS_ClosingSigned_get_signature(uint64_t this_ptr) { LDKClosingSigned this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_ClosingSigned_set_signature"))) TS_ClosingSigned_set_signature(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_ClosingSigned_set_signature"))) TS_ClosingSigned_set_signature(uint64_t this_ptr, int8_tArray val) { LDKClosingSigned this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKSignature val_ref; CHECK(val->arr_len == 64); memcpy(val_ref.compact_form, val->elems, 64); FREE(val); ClosingSigned_set_signature(&this_ptr_conv, val_ref); } -uint32_t __attribute__((export_name("TS_ClosingSigned_get_fee_range"))) TS_ClosingSigned_get_fee_range(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ClosingSigned_get_fee_range"))) TS_ClosingSigned_get_fee_range(uint64_t this_ptr) { LDKClosingSigned this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKClosingSignedFeeRange ret_var = ClosingSigned_get_fee_range(&this_ptr_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ClosingSigned_set_fee_range"))) TS_ClosingSigned_set_fee_range(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ClosingSigned_set_fee_range"))) TS_ClosingSigned_set_fee_range(uint64_t this_ptr, uint64_t val) { LDKClosingSigned this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKClosingSignedFeeRange val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = ClosingSignedFeeRange_clone(&val_conv); ClosingSigned_set_fee_range(&this_ptr_conv, val_conv); } -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) { +uint64_t __attribute__((export_name("TS_ClosingSigned_new"))) TS_ClosingSigned_new(int8_tArray channel_id_arg, int64_t fee_satoshis_arg, int8_tArray signature_arg, uint64_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); FREE(channel_id_arg); @@ -30160,267 +28699,262 @@ uint32_t __attribute__((export_name("TS_ClosingSigned_new"))) TS_ClosingSigned_ CHECK(signature_arg->arr_len == 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); + fee_range_arg_conv.inner = untag_ptr(fee_range_arg); + fee_range_arg_conv.is_owned = ptr_is_owned(fee_range_arg); 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t ClosingSigned_clone_ptr(LDKClosingSigned *NONNULL_PTR arg) { +static inline uint64_t ClosingSigned_clone_ptr(LDKClosingSigned *NONNULL_PTR arg) { LDKClosingSigned ret_var = ClosingSigned_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ClosingSigned_clone_ptr"))) TS_ClosingSigned_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ClosingSigned_clone_ptr"))) TS_ClosingSigned_clone_ptr(uint64_t arg) { LDKClosingSigned arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ClosingSigned_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ClosingSigned_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ClosingSigned_clone"))) TS_ClosingSigned_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ClosingSigned_clone"))) TS_ClosingSigned_clone(uint64_t orig) { LDKClosingSigned orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKClosingSigned ret_var = ClosingSigned_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_UpdateAddHTLC_free"))) TS_UpdateAddHTLC_free(uint32_t this_obj) { +void __attribute__((export_name("TS_UpdateAddHTLC_free"))) TS_UpdateAddHTLC_free(uint64_t this_obj) { LDKUpdateAddHTLC this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); UpdateAddHTLC_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_UpdateAddHTLC_get_channel_id"))) TS_UpdateAddHTLC_get_channel_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_UpdateAddHTLC_get_channel_id"))) TS_UpdateAddHTLC_get_channel_id(uint64_t this_ptr) { LDKUpdateAddHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *UpdateAddHTLC_get_channel_id(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_UpdateAddHTLC_set_channel_id"))) TS_UpdateAddHTLC_set_channel_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_UpdateAddHTLC_set_channel_id"))) TS_UpdateAddHTLC_set_channel_id(uint64_t this_ptr, int8_tArray val) { LDKUpdateAddHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); UpdateAddHTLC_set_channel_id(&this_ptr_conv, val_ref); } -int64_t __attribute__((export_name("TS_UpdateAddHTLC_get_htlc_id"))) TS_UpdateAddHTLC_get_htlc_id(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_UpdateAddHTLC_get_htlc_id"))) TS_UpdateAddHTLC_get_htlc_id(uint64_t this_ptr) { LDKUpdateAddHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = UpdateAddHTLC_get_htlc_id(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UpdateAddHTLC_set_htlc_id"))) TS_UpdateAddHTLC_set_htlc_id(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_UpdateAddHTLC_set_htlc_id"))) TS_UpdateAddHTLC_set_htlc_id(uint64_t this_ptr, int64_t val) { LDKUpdateAddHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UpdateAddHTLC_set_htlc_id(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_UpdateAddHTLC_get_amount_msat"))) TS_UpdateAddHTLC_get_amount_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_UpdateAddHTLC_get_amount_msat"))) TS_UpdateAddHTLC_get_amount_msat(uint64_t this_ptr) { LDKUpdateAddHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = UpdateAddHTLC_get_amount_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UpdateAddHTLC_set_amount_msat"))) TS_UpdateAddHTLC_set_amount_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_UpdateAddHTLC_set_amount_msat"))) TS_UpdateAddHTLC_set_amount_msat(uint64_t this_ptr, int64_t val) { LDKUpdateAddHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UpdateAddHTLC_set_amount_msat(&this_ptr_conv, val); } -int8_tArray __attribute__((export_name("TS_UpdateAddHTLC_get_payment_hash"))) TS_UpdateAddHTLC_get_payment_hash(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_UpdateAddHTLC_get_payment_hash"))) TS_UpdateAddHTLC_get_payment_hash(uint64_t this_ptr) { LDKUpdateAddHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *UpdateAddHTLC_get_payment_hash(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_UpdateAddHTLC_set_payment_hash"))) TS_UpdateAddHTLC_set_payment_hash(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_UpdateAddHTLC_set_payment_hash"))) TS_UpdateAddHTLC_set_payment_hash(uint64_t this_ptr, int8_tArray val) { LDKUpdateAddHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); UpdateAddHTLC_set_payment_hash(&this_ptr_conv, val_ref); } -int32_t __attribute__((export_name("TS_UpdateAddHTLC_get_cltv_expiry"))) TS_UpdateAddHTLC_get_cltv_expiry(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_UpdateAddHTLC_get_cltv_expiry"))) TS_UpdateAddHTLC_get_cltv_expiry(uint64_t this_ptr) { LDKUpdateAddHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = UpdateAddHTLC_get_cltv_expiry(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UpdateAddHTLC_set_cltv_expiry"))) TS_UpdateAddHTLC_set_cltv_expiry(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_UpdateAddHTLC_set_cltv_expiry"))) TS_UpdateAddHTLC_set_cltv_expiry(uint64_t this_ptr, int32_t val) { LDKUpdateAddHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UpdateAddHTLC_set_cltv_expiry(&this_ptr_conv, val); } -static inline uintptr_t UpdateAddHTLC_clone_ptr(LDKUpdateAddHTLC *NONNULL_PTR arg) { +static inline uint64_t UpdateAddHTLC_clone_ptr(LDKUpdateAddHTLC *NONNULL_PTR arg) { LDKUpdateAddHTLC ret_var = UpdateAddHTLC_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_UpdateAddHTLC_clone_ptr"))) TS_UpdateAddHTLC_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_UpdateAddHTLC_clone_ptr"))) TS_UpdateAddHTLC_clone_ptr(uint64_t arg) { LDKUpdateAddHTLC arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = UpdateAddHTLC_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = UpdateAddHTLC_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_UpdateAddHTLC_clone"))) TS_UpdateAddHTLC_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_UpdateAddHTLC_clone"))) TS_UpdateAddHTLC_clone(uint64_t orig) { LDKUpdateAddHTLC orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKUpdateAddHTLC ret_var = UpdateAddHTLC_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_UpdateFulfillHTLC_free"))) TS_UpdateFulfillHTLC_free(uint32_t this_obj) { +void __attribute__((export_name("TS_UpdateFulfillHTLC_free"))) TS_UpdateFulfillHTLC_free(uint64_t this_obj) { LDKUpdateFulfillHTLC this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); UpdateFulfillHTLC_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_UpdateFulfillHTLC_get_channel_id"))) TS_UpdateFulfillHTLC_get_channel_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_UpdateFulfillHTLC_get_channel_id"))) TS_UpdateFulfillHTLC_get_channel_id(uint64_t this_ptr) { LDKUpdateFulfillHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *UpdateFulfillHTLC_get_channel_id(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_UpdateFulfillHTLC_set_channel_id"))) TS_UpdateFulfillHTLC_set_channel_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_UpdateFulfillHTLC_set_channel_id"))) TS_UpdateFulfillHTLC_set_channel_id(uint64_t this_ptr, int8_tArray val) { LDKUpdateFulfillHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); UpdateFulfillHTLC_set_channel_id(&this_ptr_conv, val_ref); } -int64_t __attribute__((export_name("TS_UpdateFulfillHTLC_get_htlc_id"))) TS_UpdateFulfillHTLC_get_htlc_id(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_UpdateFulfillHTLC_get_htlc_id"))) TS_UpdateFulfillHTLC_get_htlc_id(uint64_t this_ptr) { LDKUpdateFulfillHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = UpdateFulfillHTLC_get_htlc_id(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UpdateFulfillHTLC_set_htlc_id"))) TS_UpdateFulfillHTLC_set_htlc_id(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_UpdateFulfillHTLC_set_htlc_id"))) TS_UpdateFulfillHTLC_set_htlc_id(uint64_t this_ptr, int64_t val) { LDKUpdateFulfillHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UpdateFulfillHTLC_set_htlc_id(&this_ptr_conv, val); } -int8_tArray __attribute__((export_name("TS_UpdateFulfillHTLC_get_payment_preimage"))) TS_UpdateFulfillHTLC_get_payment_preimage(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_UpdateFulfillHTLC_get_payment_preimage"))) TS_UpdateFulfillHTLC_get_payment_preimage(uint64_t this_ptr) { LDKUpdateFulfillHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *UpdateFulfillHTLC_get_payment_preimage(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_UpdateFulfillHTLC_set_payment_preimage"))) TS_UpdateFulfillHTLC_set_payment_preimage(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_UpdateFulfillHTLC_set_payment_preimage"))) TS_UpdateFulfillHTLC_set_payment_preimage(uint64_t this_ptr, int8_tArray val) { LDKUpdateFulfillHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 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) { +uint64_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); FREE(channel_id_arg); @@ -30428,295 +28962,281 @@ uint32_t __attribute__((export_name("TS_UpdateFulfillHTLC_new"))) TS_UpdateFulf CHECK(payment_preimage_arg->arr_len == 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t UpdateFulfillHTLC_clone_ptr(LDKUpdateFulfillHTLC *NONNULL_PTR arg) { +static inline uint64_t UpdateFulfillHTLC_clone_ptr(LDKUpdateFulfillHTLC *NONNULL_PTR arg) { LDKUpdateFulfillHTLC ret_var = UpdateFulfillHTLC_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_UpdateFulfillHTLC_clone_ptr"))) TS_UpdateFulfillHTLC_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_UpdateFulfillHTLC_clone_ptr"))) TS_UpdateFulfillHTLC_clone_ptr(uint64_t arg) { LDKUpdateFulfillHTLC arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = UpdateFulfillHTLC_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = UpdateFulfillHTLC_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_UpdateFulfillHTLC_clone"))) TS_UpdateFulfillHTLC_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_UpdateFulfillHTLC_clone"))) TS_UpdateFulfillHTLC_clone(uint64_t orig) { LDKUpdateFulfillHTLC orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKUpdateFulfillHTLC ret_var = UpdateFulfillHTLC_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_UpdateFailHTLC_free"))) TS_UpdateFailHTLC_free(uint32_t this_obj) { +void __attribute__((export_name("TS_UpdateFailHTLC_free"))) TS_UpdateFailHTLC_free(uint64_t this_obj) { LDKUpdateFailHTLC this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); UpdateFailHTLC_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_UpdateFailHTLC_get_channel_id"))) TS_UpdateFailHTLC_get_channel_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_UpdateFailHTLC_get_channel_id"))) TS_UpdateFailHTLC_get_channel_id(uint64_t this_ptr) { LDKUpdateFailHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *UpdateFailHTLC_get_channel_id(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_UpdateFailHTLC_set_channel_id"))) TS_UpdateFailHTLC_set_channel_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_UpdateFailHTLC_set_channel_id"))) TS_UpdateFailHTLC_set_channel_id(uint64_t this_ptr, int8_tArray val) { LDKUpdateFailHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); UpdateFailHTLC_set_channel_id(&this_ptr_conv, val_ref); } -int64_t __attribute__((export_name("TS_UpdateFailHTLC_get_htlc_id"))) TS_UpdateFailHTLC_get_htlc_id(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_UpdateFailHTLC_get_htlc_id"))) TS_UpdateFailHTLC_get_htlc_id(uint64_t this_ptr) { LDKUpdateFailHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = UpdateFailHTLC_get_htlc_id(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UpdateFailHTLC_set_htlc_id"))) TS_UpdateFailHTLC_set_htlc_id(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_UpdateFailHTLC_set_htlc_id"))) TS_UpdateFailHTLC_set_htlc_id(uint64_t this_ptr, int64_t val) { LDKUpdateFailHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UpdateFailHTLC_set_htlc_id(&this_ptr_conv, val); } -static inline uintptr_t UpdateFailHTLC_clone_ptr(LDKUpdateFailHTLC *NONNULL_PTR arg) { +static inline uint64_t UpdateFailHTLC_clone_ptr(LDKUpdateFailHTLC *NONNULL_PTR arg) { LDKUpdateFailHTLC ret_var = UpdateFailHTLC_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_UpdateFailHTLC_clone_ptr"))) TS_UpdateFailHTLC_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_UpdateFailHTLC_clone_ptr"))) TS_UpdateFailHTLC_clone_ptr(uint64_t arg) { LDKUpdateFailHTLC arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = UpdateFailHTLC_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = UpdateFailHTLC_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_UpdateFailHTLC_clone"))) TS_UpdateFailHTLC_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_UpdateFailHTLC_clone"))) TS_UpdateFailHTLC_clone(uint64_t orig) { LDKUpdateFailHTLC orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKUpdateFailHTLC ret_var = UpdateFailHTLC_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_UpdateFailMalformedHTLC_free"))) TS_UpdateFailMalformedHTLC_free(uint32_t this_obj) { +void __attribute__((export_name("TS_UpdateFailMalformedHTLC_free"))) TS_UpdateFailMalformedHTLC_free(uint64_t this_obj) { LDKUpdateFailMalformedHTLC this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); UpdateFailMalformedHTLC_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_UpdateFailMalformedHTLC_get_channel_id"))) TS_UpdateFailMalformedHTLC_get_channel_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_UpdateFailMalformedHTLC_get_channel_id"))) TS_UpdateFailMalformedHTLC_get_channel_id(uint64_t this_ptr) { LDKUpdateFailMalformedHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *UpdateFailMalformedHTLC_get_channel_id(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_UpdateFailMalformedHTLC_set_channel_id"))) TS_UpdateFailMalformedHTLC_set_channel_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_UpdateFailMalformedHTLC_set_channel_id"))) TS_UpdateFailMalformedHTLC_set_channel_id(uint64_t this_ptr, int8_tArray val) { LDKUpdateFailMalformedHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); UpdateFailMalformedHTLC_set_channel_id(&this_ptr_conv, val_ref); } -int64_t __attribute__((export_name("TS_UpdateFailMalformedHTLC_get_htlc_id"))) TS_UpdateFailMalformedHTLC_get_htlc_id(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_UpdateFailMalformedHTLC_get_htlc_id"))) TS_UpdateFailMalformedHTLC_get_htlc_id(uint64_t this_ptr) { LDKUpdateFailMalformedHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = UpdateFailMalformedHTLC_get_htlc_id(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UpdateFailMalformedHTLC_set_htlc_id"))) TS_UpdateFailMalformedHTLC_set_htlc_id(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_UpdateFailMalformedHTLC_set_htlc_id"))) TS_UpdateFailMalformedHTLC_set_htlc_id(uint64_t this_ptr, int64_t val) { LDKUpdateFailMalformedHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UpdateFailMalformedHTLC_set_htlc_id(&this_ptr_conv, val); } -int16_t __attribute__((export_name("TS_UpdateFailMalformedHTLC_get_failure_code"))) TS_UpdateFailMalformedHTLC_get_failure_code(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_UpdateFailMalformedHTLC_get_failure_code"))) TS_UpdateFailMalformedHTLC_get_failure_code(uint64_t this_ptr) { LDKUpdateFailMalformedHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = UpdateFailMalformedHTLC_get_failure_code(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UpdateFailMalformedHTLC_set_failure_code"))) TS_UpdateFailMalformedHTLC_set_failure_code(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_UpdateFailMalformedHTLC_set_failure_code"))) TS_UpdateFailMalformedHTLC_set_failure_code(uint64_t this_ptr, int16_t val) { LDKUpdateFailMalformedHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UpdateFailMalformedHTLC_set_failure_code(&this_ptr_conv, val); } -static inline uintptr_t UpdateFailMalformedHTLC_clone_ptr(LDKUpdateFailMalformedHTLC *NONNULL_PTR arg) { +static inline uint64_t UpdateFailMalformedHTLC_clone_ptr(LDKUpdateFailMalformedHTLC *NONNULL_PTR arg) { LDKUpdateFailMalformedHTLC ret_var = UpdateFailMalformedHTLC_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_UpdateFailMalformedHTLC_clone_ptr"))) TS_UpdateFailMalformedHTLC_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_UpdateFailMalformedHTLC_clone_ptr"))) TS_UpdateFailMalformedHTLC_clone_ptr(uint64_t arg) { LDKUpdateFailMalformedHTLC arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = UpdateFailMalformedHTLC_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = UpdateFailMalformedHTLC_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_UpdateFailMalformedHTLC_clone"))) TS_UpdateFailMalformedHTLC_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_UpdateFailMalformedHTLC_clone"))) TS_UpdateFailMalformedHTLC_clone(uint64_t orig) { LDKUpdateFailMalformedHTLC orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKUpdateFailMalformedHTLC ret_var = UpdateFailMalformedHTLC_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_CommitmentSigned_free"))) TS_CommitmentSigned_free(uint32_t this_obj) { +void __attribute__((export_name("TS_CommitmentSigned_free"))) TS_CommitmentSigned_free(uint64_t this_obj) { LDKCommitmentSigned this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); CommitmentSigned_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_CommitmentSigned_get_channel_id"))) TS_CommitmentSigned_get_channel_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_CommitmentSigned_get_channel_id"))) TS_CommitmentSigned_get_channel_id(uint64_t this_ptr) { LDKCommitmentSigned this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *CommitmentSigned_get_channel_id(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_CommitmentSigned_set_channel_id"))) TS_CommitmentSigned_set_channel_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_CommitmentSigned_set_channel_id"))) TS_CommitmentSigned_set_channel_id(uint64_t this_ptr, int8_tArray val) { LDKCommitmentSigned this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); CommitmentSigned_set_channel_id(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_CommitmentSigned_get_signature"))) TS_CommitmentSigned_get_signature(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_CommitmentSigned_get_signature"))) TS_CommitmentSigned_get_signature(uint64_t this_ptr) { LDKCommitmentSigned this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_CommitmentSigned_set_signature"))) TS_CommitmentSigned_set_signature(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_CommitmentSigned_set_signature"))) TS_CommitmentSigned_set_signature(uint64_t this_ptr, int8_tArray val) { LDKCommitmentSigned this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKSignature val_ref; CHECK(val->arr_len == 64); memcpy(val_ref.compact_form, val->elems, 64); FREE(val); CommitmentSigned_set_signature(&this_ptr_conv, val_ref); } -ptrArray __attribute__((export_name("TS_CommitmentSigned_get_htlc_signatures"))) TS_CommitmentSigned_get_htlc_signatures(uint32_t this_ptr) { +ptrArray __attribute__((export_name("TS_CommitmentSigned_get_htlc_signatures"))) TS_CommitmentSigned_get_htlc_signatures(uint64_t this_ptr) { LDKCommitmentSigned this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_SignatureZ ret_var = CommitmentSigned_get_htlc_signatures(&this_ptr_conv); ptrArray ret_arr = NULL; ret_arr = init_ptrArray(ret_var.datalen, __LINE__); @@ -30731,11 +29251,12 @@ ptrArray __attribute__((export_name("TS_CommitmentSigned_get_htlc_signatures")) return ret_arr; } -void __attribute__((export_name("TS_CommitmentSigned_set_htlc_signatures"))) TS_CommitmentSigned_set_htlc_signatures(uint32_t this_ptr, ptrArray val) { +void __attribute__((export_name("TS_CommitmentSigned_set_htlc_signatures"))) TS_CommitmentSigned_set_htlc_signatures(uint64_t this_ptr, ptrArray val) { LDKCommitmentSigned this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_SignatureZ val_constr; val_constr.datalen = val->arr_len; if (val_constr.datalen > 0) @@ -30754,7 +29275,7 @@ void __attribute__((export_name("TS_CommitmentSigned_set_htlc_signatures"))) TS CommitmentSigned_set_htlc_signatures(&this_ptr_conv, val_constr); } -uint32_t __attribute__((export_name("TS_CommitmentSigned_new"))) TS_CommitmentSigned_new(int8_tArray channel_id_arg, int8_tArray signature_arg, ptrArray htlc_signatures_arg) { +uint64_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); FREE(channel_id_arg); @@ -30777,127 +29298,120 @@ uint32_t __attribute__((export_name("TS_CommitmentSigned_new"))) TS_CommitmentS } FREE(htlc_signatures_arg); LDKCommitmentSigned ret_var = CommitmentSigned_new(channel_id_arg_ref, signature_arg_ref, htlc_signatures_arg_constr); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t CommitmentSigned_clone_ptr(LDKCommitmentSigned *NONNULL_PTR arg) { +static inline uint64_t CommitmentSigned_clone_ptr(LDKCommitmentSigned *NONNULL_PTR arg) { LDKCommitmentSigned ret_var = CommitmentSigned_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_CommitmentSigned_clone_ptr"))) TS_CommitmentSigned_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_CommitmentSigned_clone_ptr"))) TS_CommitmentSigned_clone_ptr(uint64_t arg) { LDKCommitmentSigned arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = CommitmentSigned_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = CommitmentSigned_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CommitmentSigned_clone"))) TS_CommitmentSigned_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_CommitmentSigned_clone"))) TS_CommitmentSigned_clone(uint64_t orig) { LDKCommitmentSigned orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKCommitmentSigned ret_var = CommitmentSigned_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_RevokeAndACK_free"))) TS_RevokeAndACK_free(uint32_t this_obj) { +void __attribute__((export_name("TS_RevokeAndACK_free"))) TS_RevokeAndACK_free(uint64_t this_obj) { LDKRevokeAndACK this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); RevokeAndACK_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_RevokeAndACK_get_channel_id"))) TS_RevokeAndACK_get_channel_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_RevokeAndACK_get_channel_id"))) TS_RevokeAndACK_get_channel_id(uint64_t this_ptr) { LDKRevokeAndACK this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *RevokeAndACK_get_channel_id(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_RevokeAndACK_set_channel_id"))) TS_RevokeAndACK_set_channel_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_RevokeAndACK_set_channel_id"))) TS_RevokeAndACK_set_channel_id(uint64_t this_ptr, int8_tArray val) { LDKRevokeAndACK this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); RevokeAndACK_set_channel_id(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_RevokeAndACK_get_per_commitment_secret"))) TS_RevokeAndACK_get_per_commitment_secret(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_RevokeAndACK_get_per_commitment_secret"))) TS_RevokeAndACK_get_per_commitment_secret(uint64_t this_ptr) { LDKRevokeAndACK this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_RevokeAndACK_set_per_commitment_secret"))) TS_RevokeAndACK_set_per_commitment_secret(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_RevokeAndACK_set_per_commitment_secret"))) TS_RevokeAndACK_set_per_commitment_secret(uint64_t this_ptr, int8_tArray val) { LDKRevokeAndACK this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); RevokeAndACK_set_per_commitment_secret(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_RevokeAndACK_get_next_per_commitment_point"))) TS_RevokeAndACK_get_next_per_commitment_point(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_RevokeAndACK_get_next_per_commitment_point"))) TS_RevokeAndACK_get_next_per_commitment_point(uint64_t this_ptr) { LDKRevokeAndACK this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_RevokeAndACK_set_next_per_commitment_point"))) TS_RevokeAndACK_set_next_per_commitment_point(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_RevokeAndACK_set_next_per_commitment_point"))) TS_RevokeAndACK_set_next_per_commitment_point(uint64_t this_ptr, int8_tArray val) { LDKRevokeAndACK this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 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) { +uint64_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); FREE(channel_id_arg); @@ -30908,206 +29422,188 @@ uint32_t __attribute__((export_name("TS_RevokeAndACK_new"))) TS_RevokeAndACK_ne 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); 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t RevokeAndACK_clone_ptr(LDKRevokeAndACK *NONNULL_PTR arg) { +static inline uint64_t RevokeAndACK_clone_ptr(LDKRevokeAndACK *NONNULL_PTR arg) { LDKRevokeAndACK ret_var = RevokeAndACK_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_RevokeAndACK_clone_ptr"))) TS_RevokeAndACK_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_RevokeAndACK_clone_ptr"))) TS_RevokeAndACK_clone_ptr(uint64_t arg) { LDKRevokeAndACK arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = RevokeAndACK_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = RevokeAndACK_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_RevokeAndACK_clone"))) TS_RevokeAndACK_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_RevokeAndACK_clone"))) TS_RevokeAndACK_clone(uint64_t orig) { LDKRevokeAndACK orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKRevokeAndACK ret_var = RevokeAndACK_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_UpdateFee_free"))) TS_UpdateFee_free(uint32_t this_obj) { +void __attribute__((export_name("TS_UpdateFee_free"))) TS_UpdateFee_free(uint64_t this_obj) { LDKUpdateFee this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); UpdateFee_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_UpdateFee_get_channel_id"))) TS_UpdateFee_get_channel_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_UpdateFee_get_channel_id"))) TS_UpdateFee_get_channel_id(uint64_t this_ptr) { LDKUpdateFee this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *UpdateFee_get_channel_id(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_UpdateFee_set_channel_id"))) TS_UpdateFee_set_channel_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_UpdateFee_set_channel_id"))) TS_UpdateFee_set_channel_id(uint64_t this_ptr, int8_tArray val) { LDKUpdateFee this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); UpdateFee_set_channel_id(&this_ptr_conv, val_ref); } -int32_t __attribute__((export_name("TS_UpdateFee_get_feerate_per_kw"))) TS_UpdateFee_get_feerate_per_kw(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_UpdateFee_get_feerate_per_kw"))) TS_UpdateFee_get_feerate_per_kw(uint64_t this_ptr) { LDKUpdateFee this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = UpdateFee_get_feerate_per_kw(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UpdateFee_set_feerate_per_kw"))) TS_UpdateFee_set_feerate_per_kw(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_UpdateFee_set_feerate_per_kw"))) TS_UpdateFee_set_feerate_per_kw(uint64_t this_ptr, int32_t val) { LDKUpdateFee this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UpdateFee_set_feerate_per_kw(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_UpdateFee_new"))) TS_UpdateFee_new(int8_tArray channel_id_arg, int32_t feerate_per_kw_arg) { +uint64_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); FREE(channel_id_arg); LDKUpdateFee ret_var = UpdateFee_new(channel_id_arg_ref, feerate_per_kw_arg); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t UpdateFee_clone_ptr(LDKUpdateFee *NONNULL_PTR arg) { +static inline uint64_t UpdateFee_clone_ptr(LDKUpdateFee *NONNULL_PTR arg) { LDKUpdateFee ret_var = UpdateFee_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_UpdateFee_clone_ptr"))) TS_UpdateFee_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_UpdateFee_clone_ptr"))) TS_UpdateFee_clone_ptr(uint64_t arg) { LDKUpdateFee arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = UpdateFee_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = UpdateFee_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_UpdateFee_clone"))) TS_UpdateFee_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_UpdateFee_clone"))) TS_UpdateFee_clone(uint64_t orig) { LDKUpdateFee orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKUpdateFee ret_var = UpdateFee_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_DataLossProtect_free"))) TS_DataLossProtect_free(uint32_t this_obj) { +void __attribute__((export_name("TS_DataLossProtect_free"))) TS_DataLossProtect_free(uint64_t this_obj) { LDKDataLossProtect this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); DataLossProtect_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_DataLossProtect_get_your_last_per_commitment_secret"))) TS_DataLossProtect_get_your_last_per_commitment_secret(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_DataLossProtect_get_your_last_per_commitment_secret"))) TS_DataLossProtect_get_your_last_per_commitment_secret(uint64_t this_ptr) { LDKDataLossProtect this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_DataLossProtect_set_your_last_per_commitment_secret"))) TS_DataLossProtect_set_your_last_per_commitment_secret(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_DataLossProtect_set_your_last_per_commitment_secret"))) TS_DataLossProtect_set_your_last_per_commitment_secret(uint64_t this_ptr, int8_tArray val) { LDKDataLossProtect this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); DataLossProtect_set_your_last_per_commitment_secret(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_DataLossProtect_get_my_current_per_commitment_point"))) TS_DataLossProtect_get_my_current_per_commitment_point(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_DataLossProtect_get_my_current_per_commitment_point"))) TS_DataLossProtect_get_my_current_per_commitment_point(uint64_t this_ptr) { LDKDataLossProtect this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_DataLossProtect_set_my_current_per_commitment_point"))) TS_DataLossProtect_set_my_current_per_commitment_point(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_DataLossProtect_set_my_current_per_commitment_point"))) TS_DataLossProtect_set_my_current_per_commitment_point(uint64_t this_ptr, int8_tArray val) { LDKDataLossProtect this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 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) { +uint64_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); FREE(your_last_per_commitment_secret_arg); @@ -31115,245 +29611,238 @@ uint32_t __attribute__((export_name("TS_DataLossProtect_new"))) TS_DataLossProt 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); 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t DataLossProtect_clone_ptr(LDKDataLossProtect *NONNULL_PTR arg) { +static inline uint64_t DataLossProtect_clone_ptr(LDKDataLossProtect *NONNULL_PTR arg) { LDKDataLossProtect ret_var = DataLossProtect_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_DataLossProtect_clone_ptr"))) TS_DataLossProtect_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_DataLossProtect_clone_ptr"))) TS_DataLossProtect_clone_ptr(uint64_t arg) { LDKDataLossProtect arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = DataLossProtect_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = DataLossProtect_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_DataLossProtect_clone"))) TS_DataLossProtect_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_DataLossProtect_clone"))) TS_DataLossProtect_clone(uint64_t orig) { LDKDataLossProtect orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKDataLossProtect ret_var = DataLossProtect_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelReestablish_free"))) TS_ChannelReestablish_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChannelReestablish_free"))) TS_ChannelReestablish_free(uint64_t this_obj) { LDKChannelReestablish this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChannelReestablish_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_ChannelReestablish_get_channel_id"))) TS_ChannelReestablish_get_channel_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_ChannelReestablish_get_channel_id"))) TS_ChannelReestablish_get_channel_id(uint64_t this_ptr) { LDKChannelReestablish this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *ChannelReestablish_get_channel_id(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_ChannelReestablish_set_channel_id"))) TS_ChannelReestablish_set_channel_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_ChannelReestablish_set_channel_id"))) TS_ChannelReestablish_set_channel_id(uint64_t this_ptr, int8_tArray val) { LDKChannelReestablish this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); ChannelReestablish_set_channel_id(&this_ptr_conv, val_ref); } -int64_t __attribute__((export_name("TS_ChannelReestablish_get_next_local_commitment_number"))) TS_ChannelReestablish_get_next_local_commitment_number(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelReestablish_get_next_local_commitment_number"))) TS_ChannelReestablish_get_next_local_commitment_number(uint64_t this_ptr) { LDKChannelReestablish this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelReestablish_get_next_local_commitment_number(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelReestablish_set_next_local_commitment_number"))) TS_ChannelReestablish_set_next_local_commitment_number(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelReestablish_set_next_local_commitment_number"))) TS_ChannelReestablish_set_next_local_commitment_number(uint64_t this_ptr, int64_t val) { LDKChannelReestablish this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelReestablish_set_next_local_commitment_number(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ChannelReestablish_get_next_remote_commitment_number"))) TS_ChannelReestablish_get_next_remote_commitment_number(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelReestablish_get_next_remote_commitment_number"))) TS_ChannelReestablish_get_next_remote_commitment_number(uint64_t this_ptr) { LDKChannelReestablish this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelReestablish_get_next_remote_commitment_number(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelReestablish_set_next_remote_commitment_number"))) TS_ChannelReestablish_set_next_remote_commitment_number(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelReestablish_set_next_remote_commitment_number"))) TS_ChannelReestablish_set_next_remote_commitment_number(uint64_t this_ptr, int64_t val) { LDKChannelReestablish this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelReestablish_set_next_remote_commitment_number(&this_ptr_conv, val); } -static inline uintptr_t ChannelReestablish_clone_ptr(LDKChannelReestablish *NONNULL_PTR arg) { +static inline uint64_t ChannelReestablish_clone_ptr(LDKChannelReestablish *NONNULL_PTR arg) { LDKChannelReestablish ret_var = ChannelReestablish_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelReestablish_clone_ptr"))) TS_ChannelReestablish_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ChannelReestablish_clone_ptr"))) TS_ChannelReestablish_clone_ptr(uint64_t arg) { LDKChannelReestablish arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ChannelReestablish_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ChannelReestablish_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelReestablish_clone"))) TS_ChannelReestablish_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ChannelReestablish_clone"))) TS_ChannelReestablish_clone(uint64_t orig) { LDKChannelReestablish orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKChannelReestablish ret_var = ChannelReestablish_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_AnnouncementSignatures_free"))) TS_AnnouncementSignatures_free(uint32_t this_obj) { +void __attribute__((export_name("TS_AnnouncementSignatures_free"))) TS_AnnouncementSignatures_free(uint64_t this_obj) { LDKAnnouncementSignatures this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); AnnouncementSignatures_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_AnnouncementSignatures_get_channel_id"))) TS_AnnouncementSignatures_get_channel_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_AnnouncementSignatures_get_channel_id"))) TS_AnnouncementSignatures_get_channel_id(uint64_t this_ptr) { LDKAnnouncementSignatures this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *AnnouncementSignatures_get_channel_id(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_AnnouncementSignatures_set_channel_id"))) TS_AnnouncementSignatures_set_channel_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_AnnouncementSignatures_set_channel_id"))) TS_AnnouncementSignatures_set_channel_id(uint64_t this_ptr, int8_tArray val) { LDKAnnouncementSignatures this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); AnnouncementSignatures_set_channel_id(&this_ptr_conv, val_ref); } -int64_t __attribute__((export_name("TS_AnnouncementSignatures_get_short_channel_id"))) TS_AnnouncementSignatures_get_short_channel_id(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_AnnouncementSignatures_get_short_channel_id"))) TS_AnnouncementSignatures_get_short_channel_id(uint64_t this_ptr) { LDKAnnouncementSignatures this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = AnnouncementSignatures_get_short_channel_id(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_AnnouncementSignatures_set_short_channel_id"))) TS_AnnouncementSignatures_set_short_channel_id(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_AnnouncementSignatures_set_short_channel_id"))) TS_AnnouncementSignatures_set_short_channel_id(uint64_t this_ptr, int64_t val) { LDKAnnouncementSignatures this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; AnnouncementSignatures_set_short_channel_id(&this_ptr_conv, val); } -int8_tArray __attribute__((export_name("TS_AnnouncementSignatures_get_node_signature"))) TS_AnnouncementSignatures_get_node_signature(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_AnnouncementSignatures_get_node_signature"))) TS_AnnouncementSignatures_get_node_signature(uint64_t this_ptr) { LDKAnnouncementSignatures this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_AnnouncementSignatures_set_node_signature"))) TS_AnnouncementSignatures_set_node_signature(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_AnnouncementSignatures_set_node_signature"))) TS_AnnouncementSignatures_set_node_signature(uint64_t this_ptr, int8_tArray val) { LDKAnnouncementSignatures this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKSignature val_ref; CHECK(val->arr_len == 64); memcpy(val_ref.compact_form, val->elems, 64); FREE(val); AnnouncementSignatures_set_node_signature(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_AnnouncementSignatures_get_bitcoin_signature"))) TS_AnnouncementSignatures_get_bitcoin_signature(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_AnnouncementSignatures_get_bitcoin_signature"))) TS_AnnouncementSignatures_get_bitcoin_signature(uint64_t this_ptr) { LDKAnnouncementSignatures this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_AnnouncementSignatures_set_bitcoin_signature"))) TS_AnnouncementSignatures_set_bitcoin_signature(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_AnnouncementSignatures_set_bitcoin_signature"))) TS_AnnouncementSignatures_set_bitcoin_signature(uint64_t this_ptr, int8_tArray val) { LDKAnnouncementSignatures this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKSignature val_ref; CHECK(val->arr_len == 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) { +uint64_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); FREE(channel_id_arg); @@ -31364,138 +29853,125 @@ uint32_t __attribute__((export_name("TS_AnnouncementSignatures_new"))) TS_Annou CHECK(bitcoin_signature_arg->arr_len == 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t AnnouncementSignatures_clone_ptr(LDKAnnouncementSignatures *NONNULL_PTR arg) { +static inline uint64_t AnnouncementSignatures_clone_ptr(LDKAnnouncementSignatures *NONNULL_PTR arg) { LDKAnnouncementSignatures ret_var = AnnouncementSignatures_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_AnnouncementSignatures_clone_ptr"))) TS_AnnouncementSignatures_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_AnnouncementSignatures_clone_ptr"))) TS_AnnouncementSignatures_clone_ptr(uint64_t arg) { LDKAnnouncementSignatures arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = AnnouncementSignatures_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = AnnouncementSignatures_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_AnnouncementSignatures_clone"))) TS_AnnouncementSignatures_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_AnnouncementSignatures_clone"))) TS_AnnouncementSignatures_clone(uint64_t orig) { LDKAnnouncementSignatures orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKAnnouncementSignatures ret_var = AnnouncementSignatures_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_NetAddress_free"))) TS_NetAddress_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKNetAddress this_ptr_conv = *(LDKNetAddress*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); NetAddress_free(this_ptr_conv); } -static inline uintptr_t NetAddress_clone_ptr(LDKNetAddress *NONNULL_PTR arg) { +static inline uint64_t NetAddress_clone_ptr(LDKNetAddress *NONNULL_PTR arg) { LDKNetAddress *ret_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress"); *ret_copy = NetAddress_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_NetAddress_clone_ptr"))) TS_NetAddress_clone_ptr(uint32_t arg) { - LDKNetAddress* arg_conv = (LDKNetAddress*)arg; - uint32_t ret_conv = NetAddress_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_NetAddress_clone_ptr"))) TS_NetAddress_clone_ptr(uint64_t arg) { + LDKNetAddress* arg_conv = (LDKNetAddress*)untag_ptr(arg); + int64_t ret_conv = NetAddress_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_NetAddress_clone"))) TS_NetAddress_clone(uint32_t orig) { - LDKNetAddress* orig_conv = (LDKNetAddress*)orig; +uint64_t __attribute__((export_name("TS_NetAddress_clone"))) TS_NetAddress_clone(uint64_t orig) { + LDKNetAddress* orig_conv = (LDKNetAddress*)untag_ptr(orig); LDKNetAddress *ret_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress"); *ret_copy = NetAddress_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_NetAddress_ipv4"))) TS_NetAddress_ipv4(int8_tArray addr, int16_t port) { +uint64_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); FREE(addr); LDKNetAddress *ret_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress"); *ret_copy = NetAddress_ipv4(addr_ref, port); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_NetAddress_ipv6"))) TS_NetAddress_ipv6(int8_tArray addr, int16_t port) { +uint64_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); FREE(addr); LDKNetAddress *ret_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress"); *ret_copy = NetAddress_ipv6(addr_ref, port); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_NetAddress_onion_v2"))) TS_NetAddress_onion_v2(int8_tArray a) { +uint64_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); FREE(a); LDKNetAddress *ret_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress"); *ret_copy = NetAddress_onion_v2(a_ref); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_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); FREE(ed25519_pubkey); LDKNetAddress *ret_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress"); *ret_copy = NetAddress_onion_v3(ed25519_pubkey_ref, checksum, version, port); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_NetAddress_hostname"))) TS_NetAddress_hostname(uint32_t hostname, int16_t port) { +uint64_t __attribute__((export_name("TS_NetAddress_hostname"))) TS_NetAddress_hostname(uint64_t hostname, int16_t port) { LDKHostname hostname_conv; - hostname_conv.inner = (void*)(hostname & (~1)); - hostname_conv.is_owned = (hostname & 1) || (hostname == 0); + hostname_conv.inner = untag_ptr(hostname); + hostname_conv.is_owned = ptr_is_owned(hostname); CHECK_INNER_FIELD_ACCESS_OR_NULL(hostname_conv); hostname_conv = Hostname_clone(&hostname_conv); LDKNetAddress *ret_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress"); *ret_copy = NetAddress_hostname(hostname_conv, port); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -int8_tArray __attribute__((export_name("TS_NetAddress_write"))) TS_NetAddress_write(uint32_t obj) { - LDKNetAddress* obj_conv = (LDKNetAddress*)obj; +int8_tArray __attribute__((export_name("TS_NetAddress_write"))) TS_NetAddress_write(uint64_t obj) { + LDKNetAddress* obj_conv = (LDKNetAddress*)untag_ptr(obj); LDKCVec_u8Z ret_var = NetAddress_write(obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -31503,147 +29979,153 @@ int8_tArray __attribute__((export_name("TS_NetAddress_write"))) TS_NetAddress_w return ret_arr; } -uint32_t __attribute__((export_name("TS_NetAddress_read"))) TS_NetAddress_read(int8_tArray ser) { +uint64_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; LDKCResult_NetAddressDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetAddressDecodeErrorZ), "LDKCResult_NetAddressDecodeErrorZ"); *ret_conv = NetAddress_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_UnsignedNodeAnnouncement_free"))) TS_UnsignedNodeAnnouncement_free(uint32_t this_obj) { +void __attribute__((export_name("TS_UnsignedNodeAnnouncement_free"))) TS_UnsignedNodeAnnouncement_free(uint64_t this_obj) { LDKUnsignedNodeAnnouncement this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); UnsignedNodeAnnouncement_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_UnsignedNodeAnnouncement_get_features"))) TS_UnsignedNodeAnnouncement_get_features(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_UnsignedNodeAnnouncement_get_features"))) TS_UnsignedNodeAnnouncement_get_features(uint64_t this_ptr) { LDKUnsignedNodeAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKNodeFeatures ret_var = UnsignedNodeAnnouncement_get_features(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_UnsignedNodeAnnouncement_set_features"))) TS_UnsignedNodeAnnouncement_set_features(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_UnsignedNodeAnnouncement_set_features"))) TS_UnsignedNodeAnnouncement_set_features(uint64_t this_ptr, uint64_t val) { LDKUnsignedNodeAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKNodeFeatures val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = NodeFeatures_clone(&val_conv); UnsignedNodeAnnouncement_set_features(&this_ptr_conv, val_conv); } -int32_t __attribute__((export_name("TS_UnsignedNodeAnnouncement_get_timestamp"))) TS_UnsignedNodeAnnouncement_get_timestamp(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_UnsignedNodeAnnouncement_get_timestamp"))) TS_UnsignedNodeAnnouncement_get_timestamp(uint64_t this_ptr) { LDKUnsignedNodeAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = UnsignedNodeAnnouncement_get_timestamp(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UnsignedNodeAnnouncement_set_timestamp"))) TS_UnsignedNodeAnnouncement_set_timestamp(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_UnsignedNodeAnnouncement_set_timestamp"))) TS_UnsignedNodeAnnouncement_set_timestamp(uint64_t this_ptr, int32_t val) { LDKUnsignedNodeAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UnsignedNodeAnnouncement_set_timestamp(&this_ptr_conv, val); } -int8_tArray __attribute__((export_name("TS_UnsignedNodeAnnouncement_get_node_id"))) TS_UnsignedNodeAnnouncement_get_node_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_UnsignedNodeAnnouncement_get_node_id"))) TS_UnsignedNodeAnnouncement_get_node_id(uint64_t this_ptr) { LDKUnsignedNodeAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_UnsignedNodeAnnouncement_set_node_id"))) TS_UnsignedNodeAnnouncement_set_node_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_UnsignedNodeAnnouncement_set_node_id"))) TS_UnsignedNodeAnnouncement_set_node_id(uint64_t this_ptr, int8_tArray val) { LDKUnsignedNodeAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); UnsignedNodeAnnouncement_set_node_id(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_UnsignedNodeAnnouncement_get_rgb"))) TS_UnsignedNodeAnnouncement_get_rgb(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_UnsignedNodeAnnouncement_get_rgb"))) TS_UnsignedNodeAnnouncement_get_rgb(uint64_t this_ptr) { LDKUnsignedNodeAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(3, __LINE__); memcpy(ret_arr->elems, *UnsignedNodeAnnouncement_get_rgb(&this_ptr_conv), 3); return ret_arr; } -void __attribute__((export_name("TS_UnsignedNodeAnnouncement_set_rgb"))) TS_UnsignedNodeAnnouncement_set_rgb(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_UnsignedNodeAnnouncement_set_rgb"))) TS_UnsignedNodeAnnouncement_set_rgb(uint64_t this_ptr, int8_tArray val) { LDKUnsignedNodeAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThreeBytes val_ref; CHECK(val->arr_len == 3); memcpy(val_ref.data, val->elems, 3); FREE(val); UnsignedNodeAnnouncement_set_rgb(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_UnsignedNodeAnnouncement_get_alias"))) TS_UnsignedNodeAnnouncement_get_alias(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_UnsignedNodeAnnouncement_get_alias"))) TS_UnsignedNodeAnnouncement_get_alias(uint64_t this_ptr) { LDKUnsignedNodeAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *UnsignedNodeAnnouncement_get_alias(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_UnsignedNodeAnnouncement_set_alias"))) TS_UnsignedNodeAnnouncement_set_alias(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_UnsignedNodeAnnouncement_set_alias"))) TS_UnsignedNodeAnnouncement_set_alias(uint64_t this_ptr, int8_tArray val) { LDKUnsignedNodeAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); UnsignedNodeAnnouncement_set_alias(&this_ptr_conv, val_ref); } -uint32_tArray __attribute__((export_name("TS_UnsignedNodeAnnouncement_get_addresses"))) TS_UnsignedNodeAnnouncement_get_addresses(uint32_t this_ptr) { +uint64_tArray __attribute__((export_name("TS_UnsignedNodeAnnouncement_get_addresses"))) TS_UnsignedNodeAnnouncement_get_addresses(uint64_t this_ptr) { LDKUnsignedNodeAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_NetAddressZ ret_var = UnsignedNodeAnnouncement_get_addresses(&this_ptr_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t m = 0; m < ret_var.datalen; m++) { LDKNetAddress *ret_conv_12_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress"); *ret_conv_12_copy = ret_var.data[m]; - uint32_t ret_conv_12_ref = (uintptr_t)ret_conv_12_copy; + uint64_t ret_conv_12_ref = tag_ptr(ret_conv_12_copy, true); ret_arr_ptr[m] = ret_conv_12_ref; } @@ -31651,507 +30133,492 @@ uint32_tArray __attribute__((export_name("TS_UnsignedNodeAnnouncement_get_addre return ret_arr; } -void __attribute__((export_name("TS_UnsignedNodeAnnouncement_set_addresses"))) TS_UnsignedNodeAnnouncement_set_addresses(uint32_t this_ptr, uint32_tArray val) { +void __attribute__((export_name("TS_UnsignedNodeAnnouncement_set_addresses"))) TS_UnsignedNodeAnnouncement_set_addresses(uint64_t this_ptr, uint64_tArray val) { LDKUnsignedNodeAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_NetAddressZ val_constr; val_constr.datalen = val->arr_len; if (val_constr.datalen > 0) val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKNetAddress), "LDKCVec_NetAddressZ Elements"); else val_constr.data = NULL; - uint32_t* val_vals = val->elems; + uint64_t* val_vals = val->elems; for (size_t m = 0; m < val_constr.datalen; m++) { - uint32_t val_conv_12 = val_vals[m]; - void* val_conv_12_ptr = (void*)(((uintptr_t)val_conv_12) & ~1); + uint64_t val_conv_12 = val_vals[m]; + void* val_conv_12_ptr = untag_ptr(val_conv_12); CHECK_ACCESS(val_conv_12_ptr); LDKNetAddress val_conv_12_conv = *(LDKNetAddress*)(val_conv_12_ptr); - val_conv_12_conv = NetAddress_clone((LDKNetAddress*)(((uintptr_t)val_conv_12) & ~1)); + val_conv_12_conv = NetAddress_clone((LDKNetAddress*)untag_ptr(val_conv_12)); val_constr.data[m] = val_conv_12_conv; } FREE(val); UnsignedNodeAnnouncement_set_addresses(&this_ptr_conv, val_constr); } -static inline uintptr_t UnsignedNodeAnnouncement_clone_ptr(LDKUnsignedNodeAnnouncement *NONNULL_PTR arg) { +static inline uint64_t UnsignedNodeAnnouncement_clone_ptr(LDKUnsignedNodeAnnouncement *NONNULL_PTR arg) { LDKUnsignedNodeAnnouncement ret_var = UnsignedNodeAnnouncement_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_UnsignedNodeAnnouncement_clone_ptr"))) TS_UnsignedNodeAnnouncement_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_UnsignedNodeAnnouncement_clone_ptr"))) TS_UnsignedNodeAnnouncement_clone_ptr(uint64_t arg) { LDKUnsignedNodeAnnouncement arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = UnsignedNodeAnnouncement_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = UnsignedNodeAnnouncement_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_UnsignedNodeAnnouncement_clone"))) TS_UnsignedNodeAnnouncement_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_UnsignedNodeAnnouncement_clone"))) TS_UnsignedNodeAnnouncement_clone(uint64_t orig) { LDKUnsignedNodeAnnouncement orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKUnsignedNodeAnnouncement ret_var = UnsignedNodeAnnouncement_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_NodeAnnouncement_free"))) TS_NodeAnnouncement_free(uint32_t this_obj) { +void __attribute__((export_name("TS_NodeAnnouncement_free"))) TS_NodeAnnouncement_free(uint64_t this_obj) { LDKNodeAnnouncement this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); NodeAnnouncement_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_NodeAnnouncement_get_signature"))) TS_NodeAnnouncement_get_signature(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_NodeAnnouncement_get_signature"))) TS_NodeAnnouncement_get_signature(uint64_t this_ptr) { LDKNodeAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_NodeAnnouncement_set_signature"))) TS_NodeAnnouncement_set_signature(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_NodeAnnouncement_set_signature"))) TS_NodeAnnouncement_set_signature(uint64_t this_ptr, int8_tArray val) { LDKNodeAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKSignature val_ref; CHECK(val->arr_len == 64); memcpy(val_ref.compact_form, val->elems, 64); FREE(val); NodeAnnouncement_set_signature(&this_ptr_conv, val_ref); } -uint32_t __attribute__((export_name("TS_NodeAnnouncement_get_contents"))) TS_NodeAnnouncement_get_contents(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_NodeAnnouncement_get_contents"))) TS_NodeAnnouncement_get_contents(uint64_t this_ptr) { LDKNodeAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKUnsignedNodeAnnouncement ret_var = NodeAnnouncement_get_contents(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_NodeAnnouncement_set_contents"))) TS_NodeAnnouncement_set_contents(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_NodeAnnouncement_set_contents"))) TS_NodeAnnouncement_set_contents(uint64_t this_ptr, uint64_t val) { LDKNodeAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKUnsignedNodeAnnouncement val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = UnsignedNodeAnnouncement_clone(&val_conv); NodeAnnouncement_set_contents(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_NodeAnnouncement_new"))) TS_NodeAnnouncement_new(int8_tArray signature_arg, uint32_t contents_arg) { +uint64_t __attribute__((export_name("TS_NodeAnnouncement_new"))) TS_NodeAnnouncement_new(int8_tArray signature_arg, uint64_t contents_arg) { LDKSignature signature_arg_ref; CHECK(signature_arg->arr_len == 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); + contents_arg_conv.inner = untag_ptr(contents_arg); + contents_arg_conv.is_owned = ptr_is_owned(contents_arg); 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t NodeAnnouncement_clone_ptr(LDKNodeAnnouncement *NONNULL_PTR arg) { +static inline uint64_t NodeAnnouncement_clone_ptr(LDKNodeAnnouncement *NONNULL_PTR arg) { LDKNodeAnnouncement ret_var = NodeAnnouncement_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_NodeAnnouncement_clone_ptr"))) TS_NodeAnnouncement_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_NodeAnnouncement_clone_ptr"))) TS_NodeAnnouncement_clone_ptr(uint64_t arg) { LDKNodeAnnouncement arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = NodeAnnouncement_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = NodeAnnouncement_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_NodeAnnouncement_clone"))) TS_NodeAnnouncement_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_NodeAnnouncement_clone"))) TS_NodeAnnouncement_clone(uint64_t orig) { LDKNodeAnnouncement orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKNodeAnnouncement ret_var = NodeAnnouncement_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_UnsignedChannelAnnouncement_free"))) TS_UnsignedChannelAnnouncement_free(uint32_t this_obj) { +void __attribute__((export_name("TS_UnsignedChannelAnnouncement_free"))) TS_UnsignedChannelAnnouncement_free(uint64_t this_obj) { LDKUnsignedChannelAnnouncement this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); UnsignedChannelAnnouncement_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_UnsignedChannelAnnouncement_get_features"))) TS_UnsignedChannelAnnouncement_get_features(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_UnsignedChannelAnnouncement_get_features"))) TS_UnsignedChannelAnnouncement_get_features(uint64_t this_ptr) { LDKUnsignedChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelFeatures ret_var = UnsignedChannelAnnouncement_get_features(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_UnsignedChannelAnnouncement_set_features"))) TS_UnsignedChannelAnnouncement_set_features(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_UnsignedChannelAnnouncement_set_features"))) TS_UnsignedChannelAnnouncement_set_features(uint64_t this_ptr, uint64_t val) { LDKUnsignedChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelFeatures val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = ChannelFeatures_clone(&val_conv); UnsignedChannelAnnouncement_set_features(&this_ptr_conv, val_conv); } -int8_tArray __attribute__((export_name("TS_UnsignedChannelAnnouncement_get_chain_hash"))) TS_UnsignedChannelAnnouncement_get_chain_hash(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_UnsignedChannelAnnouncement_get_chain_hash"))) TS_UnsignedChannelAnnouncement_get_chain_hash(uint64_t this_ptr) { LDKUnsignedChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *UnsignedChannelAnnouncement_get_chain_hash(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_UnsignedChannelAnnouncement_set_chain_hash"))) TS_UnsignedChannelAnnouncement_set_chain_hash(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_UnsignedChannelAnnouncement_set_chain_hash"))) TS_UnsignedChannelAnnouncement_set_chain_hash(uint64_t this_ptr, int8_tArray val) { LDKUnsignedChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); UnsignedChannelAnnouncement_set_chain_hash(&this_ptr_conv, val_ref); } -int64_t __attribute__((export_name("TS_UnsignedChannelAnnouncement_get_short_channel_id"))) TS_UnsignedChannelAnnouncement_get_short_channel_id(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_UnsignedChannelAnnouncement_get_short_channel_id"))) TS_UnsignedChannelAnnouncement_get_short_channel_id(uint64_t this_ptr) { LDKUnsignedChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = UnsignedChannelAnnouncement_get_short_channel_id(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UnsignedChannelAnnouncement_set_short_channel_id"))) TS_UnsignedChannelAnnouncement_set_short_channel_id(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_UnsignedChannelAnnouncement_set_short_channel_id"))) TS_UnsignedChannelAnnouncement_set_short_channel_id(uint64_t this_ptr, int64_t val) { LDKUnsignedChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UnsignedChannelAnnouncement_set_short_channel_id(&this_ptr_conv, val); } -int8_tArray __attribute__((export_name("TS_UnsignedChannelAnnouncement_get_node_id_1"))) TS_UnsignedChannelAnnouncement_get_node_id_1(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_UnsignedChannelAnnouncement_get_node_id_1"))) TS_UnsignedChannelAnnouncement_get_node_id_1(uint64_t this_ptr) { LDKUnsignedChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_UnsignedChannelAnnouncement_set_node_id_1"))) TS_UnsignedChannelAnnouncement_set_node_id_1(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_UnsignedChannelAnnouncement_set_node_id_1"))) TS_UnsignedChannelAnnouncement_set_node_id_1(uint64_t this_ptr, int8_tArray val) { LDKUnsignedChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); UnsignedChannelAnnouncement_set_node_id_1(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_UnsignedChannelAnnouncement_get_node_id_2"))) TS_UnsignedChannelAnnouncement_get_node_id_2(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_UnsignedChannelAnnouncement_get_node_id_2"))) TS_UnsignedChannelAnnouncement_get_node_id_2(uint64_t this_ptr) { LDKUnsignedChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_UnsignedChannelAnnouncement_set_node_id_2"))) TS_UnsignedChannelAnnouncement_set_node_id_2(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_UnsignedChannelAnnouncement_set_node_id_2"))) TS_UnsignedChannelAnnouncement_set_node_id_2(uint64_t this_ptr, int8_tArray val) { LDKUnsignedChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); UnsignedChannelAnnouncement_set_node_id_2(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_UnsignedChannelAnnouncement_get_bitcoin_key_1"))) TS_UnsignedChannelAnnouncement_get_bitcoin_key_1(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_UnsignedChannelAnnouncement_get_bitcoin_key_1"))) TS_UnsignedChannelAnnouncement_get_bitcoin_key_1(uint64_t this_ptr) { LDKUnsignedChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_UnsignedChannelAnnouncement_set_bitcoin_key_1"))) TS_UnsignedChannelAnnouncement_set_bitcoin_key_1(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_UnsignedChannelAnnouncement_set_bitcoin_key_1"))) TS_UnsignedChannelAnnouncement_set_bitcoin_key_1(uint64_t this_ptr, int8_tArray val) { LDKUnsignedChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); UnsignedChannelAnnouncement_set_bitcoin_key_1(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_UnsignedChannelAnnouncement_get_bitcoin_key_2"))) TS_UnsignedChannelAnnouncement_get_bitcoin_key_2(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_UnsignedChannelAnnouncement_get_bitcoin_key_2"))) TS_UnsignedChannelAnnouncement_get_bitcoin_key_2(uint64_t this_ptr) { LDKUnsignedChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_UnsignedChannelAnnouncement_set_bitcoin_key_2"))) TS_UnsignedChannelAnnouncement_set_bitcoin_key_2(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_UnsignedChannelAnnouncement_set_bitcoin_key_2"))) TS_UnsignedChannelAnnouncement_set_bitcoin_key_2(uint64_t this_ptr, int8_tArray val) { LDKUnsignedChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 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) { +static inline uint64_t UnsignedChannelAnnouncement_clone_ptr(LDKUnsignedChannelAnnouncement *NONNULL_PTR arg) { LDKUnsignedChannelAnnouncement ret_var = UnsignedChannelAnnouncement_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_UnsignedChannelAnnouncement_clone_ptr"))) TS_UnsignedChannelAnnouncement_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_UnsignedChannelAnnouncement_clone_ptr"))) TS_UnsignedChannelAnnouncement_clone_ptr(uint64_t arg) { LDKUnsignedChannelAnnouncement arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = UnsignedChannelAnnouncement_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = UnsignedChannelAnnouncement_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_UnsignedChannelAnnouncement_clone"))) TS_UnsignedChannelAnnouncement_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_UnsignedChannelAnnouncement_clone"))) TS_UnsignedChannelAnnouncement_clone(uint64_t orig) { LDKUnsignedChannelAnnouncement orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKUnsignedChannelAnnouncement ret_var = UnsignedChannelAnnouncement_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelAnnouncement_free"))) TS_ChannelAnnouncement_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChannelAnnouncement_free"))) TS_ChannelAnnouncement_free(uint64_t this_obj) { LDKChannelAnnouncement this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChannelAnnouncement_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_ChannelAnnouncement_get_node_signature_1"))) TS_ChannelAnnouncement_get_node_signature_1(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_ChannelAnnouncement_get_node_signature_1"))) TS_ChannelAnnouncement_get_node_signature_1(uint64_t this_ptr) { LDKChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_ChannelAnnouncement_set_node_signature_1"))) TS_ChannelAnnouncement_set_node_signature_1(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_ChannelAnnouncement_set_node_signature_1"))) TS_ChannelAnnouncement_set_node_signature_1(uint64_t this_ptr, int8_tArray val) { LDKChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKSignature val_ref; CHECK(val->arr_len == 64); memcpy(val_ref.compact_form, val->elems, 64); FREE(val); ChannelAnnouncement_set_node_signature_1(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_ChannelAnnouncement_get_node_signature_2"))) TS_ChannelAnnouncement_get_node_signature_2(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_ChannelAnnouncement_get_node_signature_2"))) TS_ChannelAnnouncement_get_node_signature_2(uint64_t this_ptr) { LDKChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_ChannelAnnouncement_set_node_signature_2"))) TS_ChannelAnnouncement_set_node_signature_2(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_ChannelAnnouncement_set_node_signature_2"))) TS_ChannelAnnouncement_set_node_signature_2(uint64_t this_ptr, int8_tArray val) { LDKChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKSignature val_ref; CHECK(val->arr_len == 64); memcpy(val_ref.compact_form, val->elems, 64); FREE(val); ChannelAnnouncement_set_node_signature_2(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_ChannelAnnouncement_get_bitcoin_signature_1"))) TS_ChannelAnnouncement_get_bitcoin_signature_1(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_ChannelAnnouncement_get_bitcoin_signature_1"))) TS_ChannelAnnouncement_get_bitcoin_signature_1(uint64_t this_ptr) { LDKChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_ChannelAnnouncement_set_bitcoin_signature_1"))) TS_ChannelAnnouncement_set_bitcoin_signature_1(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_ChannelAnnouncement_set_bitcoin_signature_1"))) TS_ChannelAnnouncement_set_bitcoin_signature_1(uint64_t this_ptr, int8_tArray val) { LDKChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKSignature val_ref; CHECK(val->arr_len == 64); memcpy(val_ref.compact_form, val->elems, 64); FREE(val); ChannelAnnouncement_set_bitcoin_signature_1(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_ChannelAnnouncement_get_bitcoin_signature_2"))) TS_ChannelAnnouncement_get_bitcoin_signature_2(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_ChannelAnnouncement_get_bitcoin_signature_2"))) TS_ChannelAnnouncement_get_bitcoin_signature_2(uint64_t this_ptr) { LDKChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_ChannelAnnouncement_set_bitcoin_signature_2"))) TS_ChannelAnnouncement_set_bitcoin_signature_2(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_ChannelAnnouncement_set_bitcoin_signature_2"))) TS_ChannelAnnouncement_set_bitcoin_signature_2(uint64_t this_ptr, int8_tArray val) { LDKChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKSignature val_ref; CHECK(val->arr_len == 64); memcpy(val_ref.compact_form, val->elems, 64); FREE(val); ChannelAnnouncement_set_bitcoin_signature_2(&this_ptr_conv, val_ref); } -uint32_t __attribute__((export_name("TS_ChannelAnnouncement_get_contents"))) TS_ChannelAnnouncement_get_contents(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelAnnouncement_get_contents"))) TS_ChannelAnnouncement_get_contents(uint64_t this_ptr) { LDKChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKUnsignedChannelAnnouncement ret_var = ChannelAnnouncement_get_contents(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelAnnouncement_set_contents"))) TS_ChannelAnnouncement_set_contents(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelAnnouncement_set_contents"))) TS_ChannelAnnouncement_set_contents(uint64_t this_ptr, uint64_t val) { LDKChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKUnsignedChannelAnnouncement val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = UnsignedChannelAnnouncement_clone(&val_conv); ChannelAnnouncement_set_contents(&this_ptr_conv, val_conv); } -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) { +uint64_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, uint64_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); FREE(node_signature_1_arg); @@ -32165,230 +30632,236 @@ uint32_t __attribute__((export_name("TS_ChannelAnnouncement_new"))) TS_ChannelA CHECK(bitcoin_signature_2_arg->arr_len == 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); + contents_arg_conv.inner = untag_ptr(contents_arg); + contents_arg_conv.is_owned = ptr_is_owned(contents_arg); 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t ChannelAnnouncement_clone_ptr(LDKChannelAnnouncement *NONNULL_PTR arg) { +static inline uint64_t ChannelAnnouncement_clone_ptr(LDKChannelAnnouncement *NONNULL_PTR arg) { LDKChannelAnnouncement ret_var = ChannelAnnouncement_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelAnnouncement_clone_ptr"))) TS_ChannelAnnouncement_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ChannelAnnouncement_clone_ptr"))) TS_ChannelAnnouncement_clone_ptr(uint64_t arg) { LDKChannelAnnouncement arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ChannelAnnouncement_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ChannelAnnouncement_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelAnnouncement_clone"))) TS_ChannelAnnouncement_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ChannelAnnouncement_clone"))) TS_ChannelAnnouncement_clone(uint64_t orig) { LDKChannelAnnouncement orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKChannelAnnouncement ret_var = ChannelAnnouncement_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_UnsignedChannelUpdate_free"))) TS_UnsignedChannelUpdate_free(uint32_t this_obj) { +void __attribute__((export_name("TS_UnsignedChannelUpdate_free"))) TS_UnsignedChannelUpdate_free(uint64_t this_obj) { LDKUnsignedChannelUpdate this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); UnsignedChannelUpdate_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_UnsignedChannelUpdate_get_chain_hash"))) TS_UnsignedChannelUpdate_get_chain_hash(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_UnsignedChannelUpdate_get_chain_hash"))) TS_UnsignedChannelUpdate_get_chain_hash(uint64_t this_ptr) { LDKUnsignedChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *UnsignedChannelUpdate_get_chain_hash(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_UnsignedChannelUpdate_set_chain_hash"))) TS_UnsignedChannelUpdate_set_chain_hash(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_UnsignedChannelUpdate_set_chain_hash"))) TS_UnsignedChannelUpdate_set_chain_hash(uint64_t this_ptr, int8_tArray val) { LDKUnsignedChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); UnsignedChannelUpdate_set_chain_hash(&this_ptr_conv, val_ref); } -int64_t __attribute__((export_name("TS_UnsignedChannelUpdate_get_short_channel_id"))) TS_UnsignedChannelUpdate_get_short_channel_id(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_UnsignedChannelUpdate_get_short_channel_id"))) TS_UnsignedChannelUpdate_get_short_channel_id(uint64_t this_ptr) { LDKUnsignedChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = UnsignedChannelUpdate_get_short_channel_id(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UnsignedChannelUpdate_set_short_channel_id"))) TS_UnsignedChannelUpdate_set_short_channel_id(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_UnsignedChannelUpdate_set_short_channel_id"))) TS_UnsignedChannelUpdate_set_short_channel_id(uint64_t this_ptr, int64_t val) { LDKUnsignedChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UnsignedChannelUpdate_set_short_channel_id(&this_ptr_conv, val); } -int32_t __attribute__((export_name("TS_UnsignedChannelUpdate_get_timestamp"))) TS_UnsignedChannelUpdate_get_timestamp(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_UnsignedChannelUpdate_get_timestamp"))) TS_UnsignedChannelUpdate_get_timestamp(uint64_t this_ptr) { LDKUnsignedChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = UnsignedChannelUpdate_get_timestamp(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UnsignedChannelUpdate_set_timestamp"))) TS_UnsignedChannelUpdate_set_timestamp(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_UnsignedChannelUpdate_set_timestamp"))) TS_UnsignedChannelUpdate_set_timestamp(uint64_t this_ptr, int32_t val) { LDKUnsignedChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UnsignedChannelUpdate_set_timestamp(&this_ptr_conv, val); } -int8_t __attribute__((export_name("TS_UnsignedChannelUpdate_get_flags"))) TS_UnsignedChannelUpdate_get_flags(uint32_t this_ptr) { +int8_t __attribute__((export_name("TS_UnsignedChannelUpdate_get_flags"))) TS_UnsignedChannelUpdate_get_flags(uint64_t this_ptr) { LDKUnsignedChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_t ret_conv = UnsignedChannelUpdate_get_flags(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UnsignedChannelUpdate_set_flags"))) TS_UnsignedChannelUpdate_set_flags(uint32_t this_ptr, int8_t val) { +void __attribute__((export_name("TS_UnsignedChannelUpdate_set_flags"))) TS_UnsignedChannelUpdate_set_flags(uint64_t this_ptr, int8_t val) { LDKUnsignedChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UnsignedChannelUpdate_set_flags(&this_ptr_conv, val); } -int16_t __attribute__((export_name("TS_UnsignedChannelUpdate_get_cltv_expiry_delta"))) TS_UnsignedChannelUpdate_get_cltv_expiry_delta(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_UnsignedChannelUpdate_get_cltv_expiry_delta"))) TS_UnsignedChannelUpdate_get_cltv_expiry_delta(uint64_t this_ptr) { LDKUnsignedChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = UnsignedChannelUpdate_get_cltv_expiry_delta(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UnsignedChannelUpdate_set_cltv_expiry_delta"))) TS_UnsignedChannelUpdate_set_cltv_expiry_delta(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_UnsignedChannelUpdate_set_cltv_expiry_delta"))) TS_UnsignedChannelUpdate_set_cltv_expiry_delta(uint64_t this_ptr, int16_t val) { LDKUnsignedChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UnsignedChannelUpdate_set_cltv_expiry_delta(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_UnsignedChannelUpdate_get_htlc_minimum_msat"))) TS_UnsignedChannelUpdate_get_htlc_minimum_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_UnsignedChannelUpdate_get_htlc_minimum_msat"))) TS_UnsignedChannelUpdate_get_htlc_minimum_msat(uint64_t this_ptr) { LDKUnsignedChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = UnsignedChannelUpdate_get_htlc_minimum_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UnsignedChannelUpdate_set_htlc_minimum_msat"))) TS_UnsignedChannelUpdate_set_htlc_minimum_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_UnsignedChannelUpdate_set_htlc_minimum_msat"))) TS_UnsignedChannelUpdate_set_htlc_minimum_msat(uint64_t this_ptr, int64_t val) { LDKUnsignedChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UnsignedChannelUpdate_set_htlc_minimum_msat(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_UnsignedChannelUpdate_get_htlc_maximum_msat"))) TS_UnsignedChannelUpdate_get_htlc_maximum_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_UnsignedChannelUpdate_get_htlc_maximum_msat"))) TS_UnsignedChannelUpdate_get_htlc_maximum_msat(uint64_t this_ptr) { LDKUnsignedChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = UnsignedChannelUpdate_get_htlc_maximum_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UnsignedChannelUpdate_set_htlc_maximum_msat"))) TS_UnsignedChannelUpdate_set_htlc_maximum_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_UnsignedChannelUpdate_set_htlc_maximum_msat"))) TS_UnsignedChannelUpdate_set_htlc_maximum_msat(uint64_t this_ptr, int64_t val) { LDKUnsignedChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UnsignedChannelUpdate_set_htlc_maximum_msat(&this_ptr_conv, val); } -int32_t __attribute__((export_name("TS_UnsignedChannelUpdate_get_fee_base_msat"))) TS_UnsignedChannelUpdate_get_fee_base_msat(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_UnsignedChannelUpdate_get_fee_base_msat"))) TS_UnsignedChannelUpdate_get_fee_base_msat(uint64_t this_ptr) { LDKUnsignedChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = UnsignedChannelUpdate_get_fee_base_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UnsignedChannelUpdate_set_fee_base_msat"))) TS_UnsignedChannelUpdate_set_fee_base_msat(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_UnsignedChannelUpdate_set_fee_base_msat"))) TS_UnsignedChannelUpdate_set_fee_base_msat(uint64_t this_ptr, int32_t val) { LDKUnsignedChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UnsignedChannelUpdate_set_fee_base_msat(&this_ptr_conv, val); } -int32_t __attribute__((export_name("TS_UnsignedChannelUpdate_get_fee_proportional_millionths"))) TS_UnsignedChannelUpdate_get_fee_proportional_millionths(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_UnsignedChannelUpdate_get_fee_proportional_millionths"))) TS_UnsignedChannelUpdate_get_fee_proportional_millionths(uint64_t this_ptr) { LDKUnsignedChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = UnsignedChannelUpdate_get_fee_proportional_millionths(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UnsignedChannelUpdate_set_fee_proportional_millionths"))) TS_UnsignedChannelUpdate_set_fee_proportional_millionths(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_UnsignedChannelUpdate_set_fee_proportional_millionths"))) TS_UnsignedChannelUpdate_set_fee_proportional_millionths(uint64_t this_ptr, int32_t val) { LDKUnsignedChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UnsignedChannelUpdate_set_fee_proportional_millionths(&this_ptr_conv, val); } -int8_tArray __attribute__((export_name("TS_UnsignedChannelUpdate_get_excess_data"))) TS_UnsignedChannelUpdate_get_excess_data(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_UnsignedChannelUpdate_get_excess_data"))) TS_UnsignedChannelUpdate_get_excess_data(uint64_t this_ptr) { LDKUnsignedChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_u8Z ret_var = UnsignedChannelUpdate_get_excess_data(&this_ptr_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -32396,11 +30869,12 @@ int8_tArray __attribute__((export_name("TS_UnsignedChannelUpdate_get_excess_dat return ret_arr; } -void __attribute__((export_name("TS_UnsignedChannelUpdate_set_excess_data"))) TS_UnsignedChannelUpdate_set_excess_data(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_UnsignedChannelUpdate_set_excess_data"))) TS_UnsignedChannelUpdate_set_excess_data(uint64_t this_ptr, int8_tArray val) { LDKUnsignedChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_u8Z val_ref; val_ref.datalen = val->arr_len; val_ref.data = MALLOC(val_ref.datalen, "LDKCVec_u8Z Bytes"); @@ -32408,7 +30882,7 @@ void __attribute__((export_name("TS_UnsignedChannelUpdate_set_excess_data"))) T UnsignedChannelUpdate_set_excess_data(&this_ptr_conv, val_ref); } -uint32_t __attribute__((export_name("TS_UnsignedChannelUpdate_new"))) TS_UnsignedChannelUpdate_new(int8_tArray chain_hash_arg, int64_t short_channel_id_arg, int32_t timestamp_arg, int8_t flags_arg, int16_t cltv_expiry_delta_arg, int64_t htlc_minimum_msat_arg, int64_t htlc_maximum_msat_arg, int32_t fee_base_msat_arg, int32_t fee_proportional_millionths_arg, int8_tArray excess_data_arg) { +uint64_t __attribute__((export_name("TS_UnsignedChannelUpdate_new"))) TS_UnsignedChannelUpdate_new(int8_tArray chain_hash_arg, int64_t short_channel_id_arg, int32_t timestamp_arg, int8_t flags_arg, int16_t cltv_expiry_delta_arg, int64_t htlc_minimum_msat_arg, int64_t htlc_maximum_msat_arg, int32_t fee_base_msat_arg, int32_t fee_proportional_millionths_arg, int8_tArray excess_data_arg) { LDKThirtyTwoBytes chain_hash_arg_ref; CHECK(chain_hash_arg->arr_len == 32); memcpy(chain_hash_arg_ref.data, chain_hash_arg->elems, 32); FREE(chain_hash_arg); @@ -32417,375 +30891,350 @@ uint32_t __attribute__((export_name("TS_UnsignedChannelUpdate_new"))) TS_Unsign excess_data_arg_ref.data = MALLOC(excess_data_arg_ref.datalen, "LDKCVec_u8Z Bytes"); memcpy(excess_data_arg_ref.data, excess_data_arg->elems, excess_data_arg_ref.datalen); FREE(excess_data_arg); LDKUnsignedChannelUpdate ret_var = UnsignedChannelUpdate_new(chain_hash_arg_ref, short_channel_id_arg, timestamp_arg, flags_arg, cltv_expiry_delta_arg, htlc_minimum_msat_arg, htlc_maximum_msat_arg, fee_base_msat_arg, fee_proportional_millionths_arg, excess_data_arg_ref); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t UnsignedChannelUpdate_clone_ptr(LDKUnsignedChannelUpdate *NONNULL_PTR arg) { +static inline uint64_t UnsignedChannelUpdate_clone_ptr(LDKUnsignedChannelUpdate *NONNULL_PTR arg) { LDKUnsignedChannelUpdate ret_var = UnsignedChannelUpdate_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_UnsignedChannelUpdate_clone_ptr"))) TS_UnsignedChannelUpdate_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_UnsignedChannelUpdate_clone_ptr"))) TS_UnsignedChannelUpdate_clone_ptr(uint64_t arg) { LDKUnsignedChannelUpdate arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = UnsignedChannelUpdate_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = UnsignedChannelUpdate_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_UnsignedChannelUpdate_clone"))) TS_UnsignedChannelUpdate_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_UnsignedChannelUpdate_clone"))) TS_UnsignedChannelUpdate_clone(uint64_t orig) { LDKUnsignedChannelUpdate orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKUnsignedChannelUpdate ret_var = UnsignedChannelUpdate_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelUpdate_free"))) TS_ChannelUpdate_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChannelUpdate_free"))) TS_ChannelUpdate_free(uint64_t this_obj) { LDKChannelUpdate this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChannelUpdate_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_ChannelUpdate_get_signature"))) TS_ChannelUpdate_get_signature(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_ChannelUpdate_get_signature"))) TS_ChannelUpdate_get_signature(uint64_t this_ptr) { LDKChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_ChannelUpdate_set_signature"))) TS_ChannelUpdate_set_signature(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_ChannelUpdate_set_signature"))) TS_ChannelUpdate_set_signature(uint64_t this_ptr, int8_tArray val) { LDKChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKSignature val_ref; CHECK(val->arr_len == 64); memcpy(val_ref.compact_form, val->elems, 64); FREE(val); ChannelUpdate_set_signature(&this_ptr_conv, val_ref); } -uint32_t __attribute__((export_name("TS_ChannelUpdate_get_contents"))) TS_ChannelUpdate_get_contents(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelUpdate_get_contents"))) TS_ChannelUpdate_get_contents(uint64_t this_ptr) { LDKChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKUnsignedChannelUpdate ret_var = ChannelUpdate_get_contents(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelUpdate_set_contents"))) TS_ChannelUpdate_set_contents(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelUpdate_set_contents"))) TS_ChannelUpdate_set_contents(uint64_t this_ptr, uint64_t val) { LDKChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKUnsignedChannelUpdate val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = UnsignedChannelUpdate_clone(&val_conv); ChannelUpdate_set_contents(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelUpdate_new"))) TS_ChannelUpdate_new(int8_tArray signature_arg, uint32_t contents_arg) { +uint64_t __attribute__((export_name("TS_ChannelUpdate_new"))) TS_ChannelUpdate_new(int8_tArray signature_arg, uint64_t contents_arg) { LDKSignature signature_arg_ref; CHECK(signature_arg->arr_len == 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); + contents_arg_conv.inner = untag_ptr(contents_arg); + contents_arg_conv.is_owned = ptr_is_owned(contents_arg); 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t ChannelUpdate_clone_ptr(LDKChannelUpdate *NONNULL_PTR arg) { +static inline uint64_t ChannelUpdate_clone_ptr(LDKChannelUpdate *NONNULL_PTR arg) { LDKChannelUpdate ret_var = ChannelUpdate_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelUpdate_clone_ptr"))) TS_ChannelUpdate_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ChannelUpdate_clone_ptr"))) TS_ChannelUpdate_clone_ptr(uint64_t arg) { LDKChannelUpdate arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ChannelUpdate_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ChannelUpdate_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelUpdate_clone"))) TS_ChannelUpdate_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ChannelUpdate_clone"))) TS_ChannelUpdate_clone(uint64_t orig) { LDKChannelUpdate orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKChannelUpdate ret_var = ChannelUpdate_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_QueryChannelRange_free"))) TS_QueryChannelRange_free(uint32_t this_obj) { +void __attribute__((export_name("TS_QueryChannelRange_free"))) TS_QueryChannelRange_free(uint64_t this_obj) { LDKQueryChannelRange this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); QueryChannelRange_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_QueryChannelRange_get_chain_hash"))) TS_QueryChannelRange_get_chain_hash(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_QueryChannelRange_get_chain_hash"))) TS_QueryChannelRange_get_chain_hash(uint64_t this_ptr) { LDKQueryChannelRange this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *QueryChannelRange_get_chain_hash(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_QueryChannelRange_set_chain_hash"))) TS_QueryChannelRange_set_chain_hash(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_QueryChannelRange_set_chain_hash"))) TS_QueryChannelRange_set_chain_hash(uint64_t this_ptr, int8_tArray val) { LDKQueryChannelRange this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); QueryChannelRange_set_chain_hash(&this_ptr_conv, val_ref); } -int32_t __attribute__((export_name("TS_QueryChannelRange_get_first_blocknum"))) TS_QueryChannelRange_get_first_blocknum(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_QueryChannelRange_get_first_blocknum"))) TS_QueryChannelRange_get_first_blocknum(uint64_t this_ptr) { LDKQueryChannelRange this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = QueryChannelRange_get_first_blocknum(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_QueryChannelRange_set_first_blocknum"))) TS_QueryChannelRange_set_first_blocknum(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_QueryChannelRange_set_first_blocknum"))) TS_QueryChannelRange_set_first_blocknum(uint64_t this_ptr, int32_t val) { LDKQueryChannelRange this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; QueryChannelRange_set_first_blocknum(&this_ptr_conv, val); } -int32_t __attribute__((export_name("TS_QueryChannelRange_get_number_of_blocks"))) TS_QueryChannelRange_get_number_of_blocks(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_QueryChannelRange_get_number_of_blocks"))) TS_QueryChannelRange_get_number_of_blocks(uint64_t this_ptr) { LDKQueryChannelRange this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = QueryChannelRange_get_number_of_blocks(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_QueryChannelRange_set_number_of_blocks"))) TS_QueryChannelRange_set_number_of_blocks(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_QueryChannelRange_set_number_of_blocks"))) TS_QueryChannelRange_set_number_of_blocks(uint64_t this_ptr, int32_t val) { LDKQueryChannelRange this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; QueryChannelRange_set_number_of_blocks(&this_ptr_conv, val); } -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) { +uint64_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); FREE(chain_hash_arg); LDKQueryChannelRange ret_var = QueryChannelRange_new(chain_hash_arg_ref, first_blocknum_arg, number_of_blocks_arg); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t QueryChannelRange_clone_ptr(LDKQueryChannelRange *NONNULL_PTR arg) { +static inline uint64_t QueryChannelRange_clone_ptr(LDKQueryChannelRange *NONNULL_PTR arg) { LDKQueryChannelRange ret_var = QueryChannelRange_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_QueryChannelRange_clone_ptr"))) TS_QueryChannelRange_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_QueryChannelRange_clone_ptr"))) TS_QueryChannelRange_clone_ptr(uint64_t arg) { LDKQueryChannelRange arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = QueryChannelRange_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = QueryChannelRange_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_QueryChannelRange_clone"))) TS_QueryChannelRange_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_QueryChannelRange_clone"))) TS_QueryChannelRange_clone(uint64_t orig) { LDKQueryChannelRange orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKQueryChannelRange ret_var = QueryChannelRange_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ReplyChannelRange_free"))) TS_ReplyChannelRange_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ReplyChannelRange_free"))) TS_ReplyChannelRange_free(uint64_t this_obj) { LDKReplyChannelRange this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ReplyChannelRange_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_ReplyChannelRange_get_chain_hash"))) TS_ReplyChannelRange_get_chain_hash(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_ReplyChannelRange_get_chain_hash"))) TS_ReplyChannelRange_get_chain_hash(uint64_t this_ptr) { LDKReplyChannelRange this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *ReplyChannelRange_get_chain_hash(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_ReplyChannelRange_set_chain_hash"))) TS_ReplyChannelRange_set_chain_hash(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_ReplyChannelRange_set_chain_hash"))) TS_ReplyChannelRange_set_chain_hash(uint64_t this_ptr, int8_tArray val) { LDKReplyChannelRange this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); ReplyChannelRange_set_chain_hash(&this_ptr_conv, val_ref); } -int32_t __attribute__((export_name("TS_ReplyChannelRange_get_first_blocknum"))) TS_ReplyChannelRange_get_first_blocknum(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_ReplyChannelRange_get_first_blocknum"))) TS_ReplyChannelRange_get_first_blocknum(uint64_t this_ptr) { LDKReplyChannelRange this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = ReplyChannelRange_get_first_blocknum(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ReplyChannelRange_set_first_blocknum"))) TS_ReplyChannelRange_set_first_blocknum(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_ReplyChannelRange_set_first_blocknum"))) TS_ReplyChannelRange_set_first_blocknum(uint64_t this_ptr, int32_t val) { LDKReplyChannelRange this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ReplyChannelRange_set_first_blocknum(&this_ptr_conv, val); } -int32_t __attribute__((export_name("TS_ReplyChannelRange_get_number_of_blocks"))) TS_ReplyChannelRange_get_number_of_blocks(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_ReplyChannelRange_get_number_of_blocks"))) TS_ReplyChannelRange_get_number_of_blocks(uint64_t this_ptr) { LDKReplyChannelRange this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = ReplyChannelRange_get_number_of_blocks(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ReplyChannelRange_set_number_of_blocks"))) TS_ReplyChannelRange_set_number_of_blocks(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_ReplyChannelRange_set_number_of_blocks"))) TS_ReplyChannelRange_set_number_of_blocks(uint64_t this_ptr, int32_t val) { LDKReplyChannelRange this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ReplyChannelRange_set_number_of_blocks(&this_ptr_conv, val); } -jboolean __attribute__((export_name("TS_ReplyChannelRange_get_sync_complete"))) TS_ReplyChannelRange_get_sync_complete(uint32_t this_ptr) { +jboolean __attribute__((export_name("TS_ReplyChannelRange_get_sync_complete"))) TS_ReplyChannelRange_get_sync_complete(uint64_t this_ptr) { LDKReplyChannelRange this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; jboolean ret_conv = ReplyChannelRange_get_sync_complete(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ReplyChannelRange_set_sync_complete"))) TS_ReplyChannelRange_set_sync_complete(uint32_t this_ptr, jboolean val) { +void __attribute__((export_name("TS_ReplyChannelRange_set_sync_complete"))) TS_ReplyChannelRange_set_sync_complete(uint64_t this_ptr, jboolean val) { LDKReplyChannelRange this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ReplyChannelRange_set_sync_complete(&this_ptr_conv, val); } -int64_tArray __attribute__((export_name("TS_ReplyChannelRange_get_short_channel_ids"))) TS_ReplyChannelRange_get_short_channel_ids(uint32_t this_ptr) { +int64_tArray __attribute__((export_name("TS_ReplyChannelRange_get_short_channel_ids"))) TS_ReplyChannelRange_get_short_channel_ids(uint64_t this_ptr) { LDKReplyChannelRange this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_u64Z ret_var = ReplyChannelRange_get_short_channel_ids(&this_ptr_conv); int64_tArray ret_arr = NULL; ret_arr = init_int64_tArray(ret_var.datalen, __LINE__); @@ -32799,11 +31248,12 @@ int64_tArray __attribute__((export_name("TS_ReplyChannelRange_get_short_channel return ret_arr; } -void __attribute__((export_name("TS_ReplyChannelRange_set_short_channel_ids"))) TS_ReplyChannelRange_set_short_channel_ids(uint32_t this_ptr, int64_tArray val) { +void __attribute__((export_name("TS_ReplyChannelRange_set_short_channel_ids"))) TS_ReplyChannelRange_set_short_channel_ids(uint64_t this_ptr, int64_tArray val) { LDKReplyChannelRange this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_u64Z val_constr; val_constr.datalen = val->arr_len; if (val_constr.datalen > 0) @@ -32819,7 +31269,7 @@ void __attribute__((export_name("TS_ReplyChannelRange_set_short_channel_ids"))) ReplyChannelRange_set_short_channel_ids(&this_ptr_conv, val_constr); } -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) { +uint64_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); FREE(chain_hash_arg); @@ -32836,89 +31286,79 @@ uint32_t __attribute__((export_name("TS_ReplyChannelRange_new"))) TS_ReplyChann } FREE(short_channel_ids_arg); LDKReplyChannelRange ret_var = ReplyChannelRange_new(chain_hash_arg_ref, first_blocknum_arg, number_of_blocks_arg, sync_complete_arg, short_channel_ids_arg_constr); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t ReplyChannelRange_clone_ptr(LDKReplyChannelRange *NONNULL_PTR arg) { +static inline uint64_t ReplyChannelRange_clone_ptr(LDKReplyChannelRange *NONNULL_PTR arg) { LDKReplyChannelRange ret_var = ReplyChannelRange_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ReplyChannelRange_clone_ptr"))) TS_ReplyChannelRange_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ReplyChannelRange_clone_ptr"))) TS_ReplyChannelRange_clone_ptr(uint64_t arg) { LDKReplyChannelRange arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ReplyChannelRange_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ReplyChannelRange_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ReplyChannelRange_clone"))) TS_ReplyChannelRange_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ReplyChannelRange_clone"))) TS_ReplyChannelRange_clone(uint64_t orig) { LDKReplyChannelRange orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKReplyChannelRange ret_var = ReplyChannelRange_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_QueryShortChannelIds_free"))) TS_QueryShortChannelIds_free(uint32_t this_obj) { +void __attribute__((export_name("TS_QueryShortChannelIds_free"))) TS_QueryShortChannelIds_free(uint64_t this_obj) { LDKQueryShortChannelIds this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); QueryShortChannelIds_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_QueryShortChannelIds_get_chain_hash"))) TS_QueryShortChannelIds_get_chain_hash(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_QueryShortChannelIds_get_chain_hash"))) TS_QueryShortChannelIds_get_chain_hash(uint64_t this_ptr) { LDKQueryShortChannelIds this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *QueryShortChannelIds_get_chain_hash(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_QueryShortChannelIds_set_chain_hash"))) TS_QueryShortChannelIds_set_chain_hash(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_QueryShortChannelIds_set_chain_hash"))) TS_QueryShortChannelIds_set_chain_hash(uint64_t this_ptr, int8_tArray val) { LDKQueryShortChannelIds this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); QueryShortChannelIds_set_chain_hash(&this_ptr_conv, val_ref); } -int64_tArray __attribute__((export_name("TS_QueryShortChannelIds_get_short_channel_ids"))) TS_QueryShortChannelIds_get_short_channel_ids(uint32_t this_ptr) { +int64_tArray __attribute__((export_name("TS_QueryShortChannelIds_get_short_channel_ids"))) TS_QueryShortChannelIds_get_short_channel_ids(uint64_t this_ptr) { LDKQueryShortChannelIds this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_u64Z ret_var = QueryShortChannelIds_get_short_channel_ids(&this_ptr_conv); int64_tArray ret_arr = NULL; ret_arr = init_int64_tArray(ret_var.datalen, __LINE__); @@ -32932,11 +31372,12 @@ int64_tArray __attribute__((export_name("TS_QueryShortChannelIds_get_short_chan return ret_arr; } -void __attribute__((export_name("TS_QueryShortChannelIds_set_short_channel_ids"))) TS_QueryShortChannelIds_set_short_channel_ids(uint32_t this_ptr, int64_tArray val) { +void __attribute__((export_name("TS_QueryShortChannelIds_set_short_channel_ids"))) TS_QueryShortChannelIds_set_short_channel_ids(uint64_t this_ptr, int64_tArray val) { LDKQueryShortChannelIds this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_u64Z val_constr; val_constr.datalen = val->arr_len; if (val_constr.datalen > 0) @@ -32952,7 +31393,7 @@ void __attribute__((export_name("TS_QueryShortChannelIds_set_short_channel_ids" QueryShortChannelIds_set_short_channel_ids(&this_ptr_conv, val_constr); } -uint32_t __attribute__((export_name("TS_QueryShortChannelIds_new"))) TS_QueryShortChannelIds_new(int8_tArray chain_hash_arg, int64_tArray short_channel_ids_arg) { +uint64_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); FREE(chain_hash_arg); @@ -32969,494 +31410,452 @@ uint32_t __attribute__((export_name("TS_QueryShortChannelIds_new"))) TS_QuerySh } FREE(short_channel_ids_arg); LDKQueryShortChannelIds ret_var = QueryShortChannelIds_new(chain_hash_arg_ref, short_channel_ids_arg_constr); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t QueryShortChannelIds_clone_ptr(LDKQueryShortChannelIds *NONNULL_PTR arg) { +static inline uint64_t QueryShortChannelIds_clone_ptr(LDKQueryShortChannelIds *NONNULL_PTR arg) { LDKQueryShortChannelIds ret_var = QueryShortChannelIds_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_QueryShortChannelIds_clone_ptr"))) TS_QueryShortChannelIds_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_QueryShortChannelIds_clone_ptr"))) TS_QueryShortChannelIds_clone_ptr(uint64_t arg) { LDKQueryShortChannelIds arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = QueryShortChannelIds_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = QueryShortChannelIds_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_QueryShortChannelIds_clone"))) TS_QueryShortChannelIds_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_QueryShortChannelIds_clone"))) TS_QueryShortChannelIds_clone(uint64_t orig) { LDKQueryShortChannelIds orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKQueryShortChannelIds ret_var = QueryShortChannelIds_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ReplyShortChannelIdsEnd_free"))) TS_ReplyShortChannelIdsEnd_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ReplyShortChannelIdsEnd_free"))) TS_ReplyShortChannelIdsEnd_free(uint64_t this_obj) { LDKReplyShortChannelIdsEnd this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ReplyShortChannelIdsEnd_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_ReplyShortChannelIdsEnd_get_chain_hash"))) TS_ReplyShortChannelIdsEnd_get_chain_hash(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_ReplyShortChannelIdsEnd_get_chain_hash"))) TS_ReplyShortChannelIdsEnd_get_chain_hash(uint64_t this_ptr) { LDKReplyShortChannelIdsEnd this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *ReplyShortChannelIdsEnd_get_chain_hash(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_ReplyShortChannelIdsEnd_set_chain_hash"))) TS_ReplyShortChannelIdsEnd_set_chain_hash(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_ReplyShortChannelIdsEnd_set_chain_hash"))) TS_ReplyShortChannelIdsEnd_set_chain_hash(uint64_t this_ptr, int8_tArray val) { LDKReplyShortChannelIdsEnd this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); ReplyShortChannelIdsEnd_set_chain_hash(&this_ptr_conv, val_ref); } -jboolean __attribute__((export_name("TS_ReplyShortChannelIdsEnd_get_full_information"))) TS_ReplyShortChannelIdsEnd_get_full_information(uint32_t this_ptr) { +jboolean __attribute__((export_name("TS_ReplyShortChannelIdsEnd_get_full_information"))) TS_ReplyShortChannelIdsEnd_get_full_information(uint64_t this_ptr) { LDKReplyShortChannelIdsEnd this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; jboolean ret_conv = ReplyShortChannelIdsEnd_get_full_information(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ReplyShortChannelIdsEnd_set_full_information"))) TS_ReplyShortChannelIdsEnd_set_full_information(uint32_t this_ptr, jboolean val) { +void __attribute__((export_name("TS_ReplyShortChannelIdsEnd_set_full_information"))) TS_ReplyShortChannelIdsEnd_set_full_information(uint64_t this_ptr, jboolean val) { LDKReplyShortChannelIdsEnd this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ReplyShortChannelIdsEnd_set_full_information(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_ReplyShortChannelIdsEnd_new"))) TS_ReplyShortChannelIdsEnd_new(int8_tArray chain_hash_arg, jboolean full_information_arg) { +uint64_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); FREE(chain_hash_arg); LDKReplyShortChannelIdsEnd ret_var = ReplyShortChannelIdsEnd_new(chain_hash_arg_ref, full_information_arg); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t ReplyShortChannelIdsEnd_clone_ptr(LDKReplyShortChannelIdsEnd *NONNULL_PTR arg) { +static inline uint64_t ReplyShortChannelIdsEnd_clone_ptr(LDKReplyShortChannelIdsEnd *NONNULL_PTR arg) { LDKReplyShortChannelIdsEnd ret_var = ReplyShortChannelIdsEnd_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ReplyShortChannelIdsEnd_clone_ptr"))) TS_ReplyShortChannelIdsEnd_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ReplyShortChannelIdsEnd_clone_ptr"))) TS_ReplyShortChannelIdsEnd_clone_ptr(uint64_t arg) { LDKReplyShortChannelIdsEnd arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ReplyShortChannelIdsEnd_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ReplyShortChannelIdsEnd_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ReplyShortChannelIdsEnd_clone"))) TS_ReplyShortChannelIdsEnd_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ReplyShortChannelIdsEnd_clone"))) TS_ReplyShortChannelIdsEnd_clone(uint64_t orig) { LDKReplyShortChannelIdsEnd orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKReplyShortChannelIdsEnd ret_var = ReplyShortChannelIdsEnd_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_GossipTimestampFilter_free"))) TS_GossipTimestampFilter_free(uint32_t this_obj) { +void __attribute__((export_name("TS_GossipTimestampFilter_free"))) TS_GossipTimestampFilter_free(uint64_t this_obj) { LDKGossipTimestampFilter this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); GossipTimestampFilter_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_GossipTimestampFilter_get_chain_hash"))) TS_GossipTimestampFilter_get_chain_hash(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_GossipTimestampFilter_get_chain_hash"))) TS_GossipTimestampFilter_get_chain_hash(uint64_t this_ptr) { LDKGossipTimestampFilter this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *GossipTimestampFilter_get_chain_hash(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_GossipTimestampFilter_set_chain_hash"))) TS_GossipTimestampFilter_set_chain_hash(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_GossipTimestampFilter_set_chain_hash"))) TS_GossipTimestampFilter_set_chain_hash(uint64_t this_ptr, int8_tArray val) { LDKGossipTimestampFilter this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); GossipTimestampFilter_set_chain_hash(&this_ptr_conv, val_ref); } -int32_t __attribute__((export_name("TS_GossipTimestampFilter_get_first_timestamp"))) TS_GossipTimestampFilter_get_first_timestamp(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_GossipTimestampFilter_get_first_timestamp"))) TS_GossipTimestampFilter_get_first_timestamp(uint64_t this_ptr) { LDKGossipTimestampFilter this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = GossipTimestampFilter_get_first_timestamp(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_GossipTimestampFilter_set_first_timestamp"))) TS_GossipTimestampFilter_set_first_timestamp(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_GossipTimestampFilter_set_first_timestamp"))) TS_GossipTimestampFilter_set_first_timestamp(uint64_t this_ptr, int32_t val) { LDKGossipTimestampFilter this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; GossipTimestampFilter_set_first_timestamp(&this_ptr_conv, val); } -int32_t __attribute__((export_name("TS_GossipTimestampFilter_get_timestamp_range"))) TS_GossipTimestampFilter_get_timestamp_range(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_GossipTimestampFilter_get_timestamp_range"))) TS_GossipTimestampFilter_get_timestamp_range(uint64_t this_ptr) { LDKGossipTimestampFilter this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = GossipTimestampFilter_get_timestamp_range(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_GossipTimestampFilter_set_timestamp_range"))) TS_GossipTimestampFilter_set_timestamp_range(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_GossipTimestampFilter_set_timestamp_range"))) TS_GossipTimestampFilter_set_timestamp_range(uint64_t this_ptr, int32_t val) { LDKGossipTimestampFilter this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; GossipTimestampFilter_set_timestamp_range(&this_ptr_conv, val); } -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) { +uint64_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); FREE(chain_hash_arg); LDKGossipTimestampFilter ret_var = GossipTimestampFilter_new(chain_hash_arg_ref, first_timestamp_arg, timestamp_range_arg); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t GossipTimestampFilter_clone_ptr(LDKGossipTimestampFilter *NONNULL_PTR arg) { +static inline uint64_t GossipTimestampFilter_clone_ptr(LDKGossipTimestampFilter *NONNULL_PTR arg) { LDKGossipTimestampFilter ret_var = GossipTimestampFilter_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_GossipTimestampFilter_clone_ptr"))) TS_GossipTimestampFilter_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_GossipTimestampFilter_clone_ptr"))) TS_GossipTimestampFilter_clone_ptr(uint64_t arg) { LDKGossipTimestampFilter arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = GossipTimestampFilter_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = GossipTimestampFilter_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_GossipTimestampFilter_clone"))) TS_GossipTimestampFilter_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_GossipTimestampFilter_clone"))) TS_GossipTimestampFilter_clone(uint64_t orig) { LDKGossipTimestampFilter orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKGossipTimestampFilter ret_var = GossipTimestampFilter_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_ErrorAction_free"))) TS_ErrorAction_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKErrorAction this_ptr_conv = *(LDKErrorAction*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); ErrorAction_free(this_ptr_conv); } -static inline uintptr_t ErrorAction_clone_ptr(LDKErrorAction *NONNULL_PTR arg) { +static inline uint64_t ErrorAction_clone_ptr(LDKErrorAction *NONNULL_PTR arg) { LDKErrorAction *ret_copy = MALLOC(sizeof(LDKErrorAction), "LDKErrorAction"); *ret_copy = ErrorAction_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ErrorAction_clone_ptr"))) TS_ErrorAction_clone_ptr(uint32_t arg) { - LDKErrorAction* arg_conv = (LDKErrorAction*)arg; - uint32_t ret_conv = ErrorAction_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_ErrorAction_clone_ptr"))) TS_ErrorAction_clone_ptr(uint64_t arg) { + LDKErrorAction* arg_conv = (LDKErrorAction*)untag_ptr(arg); + int64_t ret_conv = ErrorAction_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ErrorAction_clone"))) TS_ErrorAction_clone(uint32_t orig) { - LDKErrorAction* orig_conv = (LDKErrorAction*)orig; +uint64_t __attribute__((export_name("TS_ErrorAction_clone"))) TS_ErrorAction_clone(uint64_t orig) { + LDKErrorAction* orig_conv = (LDKErrorAction*)untag_ptr(orig); LDKErrorAction *ret_copy = MALLOC(sizeof(LDKErrorAction), "LDKErrorAction"); *ret_copy = ErrorAction_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ErrorAction_disconnect_peer"))) TS_ErrorAction_disconnect_peer(uint32_t msg) { +uint64_t __attribute__((export_name("TS_ErrorAction_disconnect_peer"))) TS_ErrorAction_disconnect_peer(uint64_t msg) { LDKErrorMessage msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = (msg & 1) || (msg == 0); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = ErrorMessage_clone(&msg_conv); LDKErrorAction *ret_copy = MALLOC(sizeof(LDKErrorAction), "LDKErrorAction"); *ret_copy = ErrorAction_disconnect_peer(msg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ErrorAction_ignore_error"))) TS_ErrorAction_ignore_error() { +uint64_t __attribute__((export_name("TS_ErrorAction_ignore_error"))) TS_ErrorAction_ignore_error() { LDKErrorAction *ret_copy = MALLOC(sizeof(LDKErrorAction), "LDKErrorAction"); *ret_copy = ErrorAction_ignore_error(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ErrorAction_ignore_and_log"))) TS_ErrorAction_ignore_and_log(uint32_t a) { +uint64_t __attribute__((export_name("TS_ErrorAction_ignore_and_log"))) TS_ErrorAction_ignore_and_log(uint32_t a) { LDKLevel a_conv = LDKLevel_from_js(a); LDKErrorAction *ret_copy = MALLOC(sizeof(LDKErrorAction), "LDKErrorAction"); *ret_copy = ErrorAction_ignore_and_log(a_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ErrorAction_ignore_duplicate_gossip"))) TS_ErrorAction_ignore_duplicate_gossip() { +uint64_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(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ErrorAction_send_error_message"))) TS_ErrorAction_send_error_message(uint32_t msg) { +uint64_t __attribute__((export_name("TS_ErrorAction_send_error_message"))) TS_ErrorAction_send_error_message(uint64_t msg) { LDKErrorMessage msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = (msg & 1) || (msg == 0); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = ErrorMessage_clone(&msg_conv); LDKErrorAction *ret_copy = MALLOC(sizeof(LDKErrorAction), "LDKErrorAction"); *ret_copy = ErrorAction_send_error_message(msg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ErrorAction_send_warning_message"))) TS_ErrorAction_send_warning_message(uint32_t msg, uint32_t log_level) { +uint64_t __attribute__((export_name("TS_ErrorAction_send_warning_message"))) TS_ErrorAction_send_warning_message(uint64_t msg, uint32_t log_level) { LDKWarningMessage msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = (msg & 1) || (msg == 0); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = WarningMessage_clone(&msg_conv); LDKLevel log_level_conv = LDKLevel_from_js(log_level); LDKErrorAction *ret_copy = MALLOC(sizeof(LDKErrorAction), "LDKErrorAction"); *ret_copy = ErrorAction_send_warning_message(msg_conv, log_level_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_LightningError_free"))) TS_LightningError_free(uint32_t this_obj) { +void __attribute__((export_name("TS_LightningError_free"))) TS_LightningError_free(uint64_t this_obj) { LDKLightningError this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); LightningError_free(this_obj_conv); } -jstring __attribute__((export_name("TS_LightningError_get_err"))) TS_LightningError_get_err(uint32_t this_ptr) { +jstring __attribute__((export_name("TS_LightningError_get_err"))) TS_LightningError_get_err(uint64_t this_ptr) { LDKLightningError this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKStr ret_str = LightningError_get_err(&this_ptr_conv); jstring ret_conv = str_ref_to_ts(ret_str.chars, ret_str.len); Str_free(ret_str); return ret_conv; } -void __attribute__((export_name("TS_LightningError_set_err"))) TS_LightningError_set_err(uint32_t this_ptr, jstring val) { +void __attribute__((export_name("TS_LightningError_set_err"))) TS_LightningError_set_err(uint64_t this_ptr, jstring val) { LDKLightningError this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKStr val_conv = str_ref_to_owned_c(val); LightningError_set_err(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_LightningError_get_action"))) TS_LightningError_get_action(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_LightningError_get_action"))) TS_LightningError_get_action(uint64_t this_ptr) { LDKLightningError this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKErrorAction *ret_copy = MALLOC(sizeof(LDKErrorAction), "LDKErrorAction"); *ret_copy = LightningError_get_action(&this_ptr_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_LightningError_set_action"))) TS_LightningError_set_action(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_LightningError_set_action"))) TS_LightningError_set_action(uint64_t this_ptr, uint64_t val) { LDKLightningError this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKErrorAction val_conv = *(LDKErrorAction*)(val_ptr); - val_conv = ErrorAction_clone((LDKErrorAction*)(((uintptr_t)val) & ~1)); + val_conv = ErrorAction_clone((LDKErrorAction*)untag_ptr(val)); 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) { +uint64_t __attribute__((export_name("TS_LightningError_new"))) TS_LightningError_new(jstring err_arg, uint64_t action_arg) { LDKStr err_arg_conv = str_ref_to_owned_c(err_arg); - void* action_arg_ptr = (void*)(((uintptr_t)action_arg) & ~1); + void* action_arg_ptr = untag_ptr(action_arg); CHECK_ACCESS(action_arg_ptr); LDKErrorAction action_arg_conv = *(LDKErrorAction*)(action_arg_ptr); - action_arg_conv = ErrorAction_clone((LDKErrorAction*)(((uintptr_t)action_arg) & ~1)); + action_arg_conv = ErrorAction_clone((LDKErrorAction*)untag_ptr(action_arg)); LDKLightningError ret_var = LightningError_new(err_arg_conv, action_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t LightningError_clone_ptr(LDKLightningError *NONNULL_PTR arg) { +static inline uint64_t LightningError_clone_ptr(LDKLightningError *NONNULL_PTR arg) { LDKLightningError ret_var = LightningError_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_LightningError_clone_ptr"))) TS_LightningError_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_LightningError_clone_ptr"))) TS_LightningError_clone_ptr(uint64_t arg) { LDKLightningError arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = LightningError_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = LightningError_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_LightningError_clone"))) TS_LightningError_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_LightningError_clone"))) TS_LightningError_clone(uint64_t orig) { LDKLightningError orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKLightningError ret_var = LightningError_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_CommitmentUpdate_free"))) TS_CommitmentUpdate_free(uint32_t this_obj) { +void __attribute__((export_name("TS_CommitmentUpdate_free"))) TS_CommitmentUpdate_free(uint64_t this_obj) { LDKCommitmentUpdate this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); CommitmentUpdate_free(this_obj_conv); } -uint32_tArray __attribute__((export_name("TS_CommitmentUpdate_get_update_add_htlcs"))) TS_CommitmentUpdate_get_update_add_htlcs(uint32_t this_ptr) { +uint64_tArray __attribute__((export_name("TS_CommitmentUpdate_get_update_add_htlcs"))) TS_CommitmentUpdate_get_update_add_htlcs(uint64_t this_ptr) { LDKCommitmentUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_UpdateAddHTLCZ ret_var = CommitmentUpdate_get_update_add_htlcs(&this_ptr_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t p = 0; p < ret_var.datalen; p++) { LDKUpdateAddHTLC ret_conv_15_var = ret_var.data[p]; - uint32_t ret_conv_15_ref = 0; - 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. + uint64_t ret_conv_15_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_15_var); - ret_conv_15_ref = (uintptr_t)ret_conv_15_var.inner; - if (ret_conv_15_var.is_owned) { - ret_conv_15_ref |= 1; - } + ret_conv_15_ref = tag_ptr(ret_conv_15_var.inner, ret_conv_15_var.is_owned); ret_arr_ptr[p] = ret_conv_15_ref; } @@ -33464,23 +31863,24 @@ uint32_tArray __attribute__((export_name("TS_CommitmentUpdate_get_update_add_ht return ret_arr; } -void __attribute__((export_name("TS_CommitmentUpdate_set_update_add_htlcs"))) TS_CommitmentUpdate_set_update_add_htlcs(uint32_t this_ptr, uint32_tArray val) { +void __attribute__((export_name("TS_CommitmentUpdate_set_update_add_htlcs"))) TS_CommitmentUpdate_set_update_add_htlcs(uint64_t this_ptr, uint64_tArray val) { LDKCommitmentUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_UpdateAddHTLCZ val_constr; val_constr.datalen = val->arr_len; if (val_constr.datalen > 0) val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKUpdateAddHTLC), "LDKCVec_UpdateAddHTLCZ Elements"); else val_constr.data = NULL; - uint32_t* val_vals = val->elems; + uint64_t* val_vals = val->elems; for (size_t p = 0; p < val_constr.datalen; p++) { - uint32_t val_conv_15 = val_vals[p]; + uint64_t val_conv_15 = val_vals[p]; LDKUpdateAddHTLC val_conv_15_conv; - val_conv_15_conv.inner = (void*)(val_conv_15 & (~1)); - val_conv_15_conv.is_owned = (val_conv_15 & 1) || (val_conv_15 == 0); + val_conv_15_conv.inner = untag_ptr(val_conv_15); + val_conv_15_conv.is_owned = ptr_is_owned(val_conv_15); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv_15_conv); val_conv_15_conv = UpdateAddHTLC_clone(&val_conv_15_conv); val_constr.data[p] = val_conv_15_conv; @@ -33489,25 +31889,21 @@ void __attribute__((export_name("TS_CommitmentUpdate_set_update_add_htlcs"))) T CommitmentUpdate_set_update_add_htlcs(&this_ptr_conv, val_constr); } -uint32_tArray __attribute__((export_name("TS_CommitmentUpdate_get_update_fulfill_htlcs"))) TS_CommitmentUpdate_get_update_fulfill_htlcs(uint32_t this_ptr) { +uint64_tArray __attribute__((export_name("TS_CommitmentUpdate_get_update_fulfill_htlcs"))) TS_CommitmentUpdate_get_update_fulfill_htlcs(uint64_t this_ptr) { LDKCommitmentUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_UpdateFulfillHTLCZ ret_var = CommitmentUpdate_get_update_fulfill_htlcs(&this_ptr_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t t = 0; t < ret_var.datalen; t++) { LDKUpdateFulfillHTLC ret_conv_19_var = ret_var.data[t]; - uint32_t ret_conv_19_ref = 0; - 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. + uint64_t ret_conv_19_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_19_var); - ret_conv_19_ref = (uintptr_t)ret_conv_19_var.inner; - if (ret_conv_19_var.is_owned) { - ret_conv_19_ref |= 1; - } + ret_conv_19_ref = tag_ptr(ret_conv_19_var.inner, ret_conv_19_var.is_owned); ret_arr_ptr[t] = ret_conv_19_ref; } @@ -33515,23 +31911,24 @@ uint32_tArray __attribute__((export_name("TS_CommitmentUpdate_get_update_fulfil return ret_arr; } -void __attribute__((export_name("TS_CommitmentUpdate_set_update_fulfill_htlcs"))) TS_CommitmentUpdate_set_update_fulfill_htlcs(uint32_t this_ptr, uint32_tArray val) { +void __attribute__((export_name("TS_CommitmentUpdate_set_update_fulfill_htlcs"))) TS_CommitmentUpdate_set_update_fulfill_htlcs(uint64_t this_ptr, uint64_tArray val) { LDKCommitmentUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_UpdateFulfillHTLCZ val_constr; val_constr.datalen = val->arr_len; if (val_constr.datalen > 0) val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKUpdateFulfillHTLC), "LDKCVec_UpdateFulfillHTLCZ Elements"); else val_constr.data = NULL; - uint32_t* val_vals = val->elems; + uint64_t* val_vals = val->elems; for (size_t t = 0; t < val_constr.datalen; t++) { - uint32_t val_conv_19 = val_vals[t]; + uint64_t val_conv_19 = val_vals[t]; LDKUpdateFulfillHTLC val_conv_19_conv; - val_conv_19_conv.inner = (void*)(val_conv_19 & (~1)); - val_conv_19_conv.is_owned = (val_conv_19 & 1) || (val_conv_19 == 0); + val_conv_19_conv.inner = untag_ptr(val_conv_19); + val_conv_19_conv.is_owned = ptr_is_owned(val_conv_19); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv_19_conv); val_conv_19_conv = UpdateFulfillHTLC_clone(&val_conv_19_conv); val_constr.data[t] = val_conv_19_conv; @@ -33540,25 +31937,21 @@ void __attribute__((export_name("TS_CommitmentUpdate_set_update_fulfill_htlcs") CommitmentUpdate_set_update_fulfill_htlcs(&this_ptr_conv, val_constr); } -uint32_tArray __attribute__((export_name("TS_CommitmentUpdate_get_update_fail_htlcs"))) TS_CommitmentUpdate_get_update_fail_htlcs(uint32_t this_ptr) { +uint64_tArray __attribute__((export_name("TS_CommitmentUpdate_get_update_fail_htlcs"))) TS_CommitmentUpdate_get_update_fail_htlcs(uint64_t this_ptr) { LDKCommitmentUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_UpdateFailHTLCZ ret_var = CommitmentUpdate_get_update_fail_htlcs(&this_ptr_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t q = 0; q < ret_var.datalen; q++) { LDKUpdateFailHTLC ret_conv_16_var = ret_var.data[q]; - uint32_t ret_conv_16_ref = 0; - 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. + uint64_t ret_conv_16_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_16_var); - ret_conv_16_ref = (uintptr_t)ret_conv_16_var.inner; - if (ret_conv_16_var.is_owned) { - ret_conv_16_ref |= 1; - } + ret_conv_16_ref = tag_ptr(ret_conv_16_var.inner, ret_conv_16_var.is_owned); ret_arr_ptr[q] = ret_conv_16_ref; } @@ -33566,23 +31959,24 @@ uint32_tArray __attribute__((export_name("TS_CommitmentUpdate_get_update_fail_h return ret_arr; } -void __attribute__((export_name("TS_CommitmentUpdate_set_update_fail_htlcs"))) TS_CommitmentUpdate_set_update_fail_htlcs(uint32_t this_ptr, uint32_tArray val) { +void __attribute__((export_name("TS_CommitmentUpdate_set_update_fail_htlcs"))) TS_CommitmentUpdate_set_update_fail_htlcs(uint64_t this_ptr, uint64_tArray val) { LDKCommitmentUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_UpdateFailHTLCZ val_constr; val_constr.datalen = val->arr_len; if (val_constr.datalen > 0) val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKUpdateFailHTLC), "LDKCVec_UpdateFailHTLCZ Elements"); else val_constr.data = NULL; - uint32_t* val_vals = val->elems; + uint64_t* val_vals = val->elems; for (size_t q = 0; q < val_constr.datalen; q++) { - uint32_t val_conv_16 = val_vals[q]; + uint64_t val_conv_16 = val_vals[q]; LDKUpdateFailHTLC val_conv_16_conv; - val_conv_16_conv.inner = (void*)(val_conv_16 & (~1)); - val_conv_16_conv.is_owned = (val_conv_16 & 1) || (val_conv_16 == 0); + val_conv_16_conv.inner = untag_ptr(val_conv_16); + val_conv_16_conv.is_owned = ptr_is_owned(val_conv_16); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv_16_conv); val_conv_16_conv = UpdateFailHTLC_clone(&val_conv_16_conv); val_constr.data[q] = val_conv_16_conv; @@ -33591,25 +31985,21 @@ void __attribute__((export_name("TS_CommitmentUpdate_set_update_fail_htlcs"))) CommitmentUpdate_set_update_fail_htlcs(&this_ptr_conv, val_constr); } -uint32_tArray __attribute__((export_name("TS_CommitmentUpdate_get_update_fail_malformed_htlcs"))) TS_CommitmentUpdate_get_update_fail_malformed_htlcs(uint32_t this_ptr) { +uint64_tArray __attribute__((export_name("TS_CommitmentUpdate_get_update_fail_malformed_htlcs"))) TS_CommitmentUpdate_get_update_fail_malformed_htlcs(uint64_t this_ptr) { LDKCommitmentUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_UpdateFailMalformedHTLCZ ret_var = CommitmentUpdate_get_update_fail_malformed_htlcs(&this_ptr_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t z = 0; z < ret_var.datalen; z++) { LDKUpdateFailMalformedHTLC ret_conv_25_var = ret_var.data[z]; - uint32_t ret_conv_25_ref = 0; - 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. + uint64_t ret_conv_25_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_25_var); - ret_conv_25_ref = (uintptr_t)ret_conv_25_var.inner; - if (ret_conv_25_var.is_owned) { - ret_conv_25_ref |= 1; - } + ret_conv_25_ref = tag_ptr(ret_conv_25_var.inner, ret_conv_25_var.is_owned); ret_arr_ptr[z] = ret_conv_25_ref; } @@ -33617,23 +32007,24 @@ uint32_tArray __attribute__((export_name("TS_CommitmentUpdate_get_update_fail_m return ret_arr; } -void __attribute__((export_name("TS_CommitmentUpdate_set_update_fail_malformed_htlcs"))) TS_CommitmentUpdate_set_update_fail_malformed_htlcs(uint32_t this_ptr, uint32_tArray val) { +void __attribute__((export_name("TS_CommitmentUpdate_set_update_fail_malformed_htlcs"))) TS_CommitmentUpdate_set_update_fail_malformed_htlcs(uint64_t this_ptr, uint64_tArray val) { LDKCommitmentUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_UpdateFailMalformedHTLCZ val_constr; val_constr.datalen = val->arr_len; if (val_constr.datalen > 0) val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKUpdateFailMalformedHTLC), "LDKCVec_UpdateFailMalformedHTLCZ Elements"); else val_constr.data = NULL; - uint32_t* val_vals = val->elems; + uint64_t* val_vals = val->elems; for (size_t z = 0; z < val_constr.datalen; z++) { - uint32_t val_conv_25 = val_vals[z]; + uint64_t val_conv_25 = val_vals[z]; LDKUpdateFailMalformedHTLC val_conv_25_conv; - val_conv_25_conv.inner = (void*)(val_conv_25 & (~1)); - val_conv_25_conv.is_owned = (val_conv_25 & 1) || (val_conv_25 == 0); + val_conv_25_conv.inner = untag_ptr(val_conv_25); + val_conv_25_conv.is_owned = ptr_is_owned(val_conv_25); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv_25_conv); val_conv_25_conv = UpdateFailMalformedHTLC_clone(&val_conv_25_conv); val_constr.data[z] = val_conv_25_conv; @@ -33642,81 +32033,73 @@ void __attribute__((export_name("TS_CommitmentUpdate_set_update_fail_malformed_ CommitmentUpdate_set_update_fail_malformed_htlcs(&this_ptr_conv, val_constr); } -uint32_t __attribute__((export_name("TS_CommitmentUpdate_get_update_fee"))) TS_CommitmentUpdate_get_update_fee(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_CommitmentUpdate_get_update_fee"))) TS_CommitmentUpdate_get_update_fee(uint64_t this_ptr) { LDKCommitmentUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKUpdateFee ret_var = CommitmentUpdate_get_update_fee(&this_ptr_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_CommitmentUpdate_set_update_fee"))) TS_CommitmentUpdate_set_update_fee(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_CommitmentUpdate_set_update_fee"))) TS_CommitmentUpdate_set_update_fee(uint64_t this_ptr, uint64_t val) { LDKCommitmentUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKUpdateFee val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = UpdateFee_clone(&val_conv); CommitmentUpdate_set_update_fee(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_CommitmentUpdate_get_commitment_signed"))) TS_CommitmentUpdate_get_commitment_signed(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_CommitmentUpdate_get_commitment_signed"))) TS_CommitmentUpdate_get_commitment_signed(uint64_t this_ptr) { LDKCommitmentUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCommitmentSigned ret_var = CommitmentUpdate_get_commitment_signed(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_CommitmentUpdate_set_commitment_signed"))) TS_CommitmentUpdate_set_commitment_signed(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_CommitmentUpdate_set_commitment_signed"))) TS_CommitmentUpdate_set_commitment_signed(uint64_t this_ptr, uint64_t val) { LDKCommitmentUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCommitmentSigned val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = CommitmentSigned_clone(&val_conv); CommitmentUpdate_set_commitment_signed(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_CommitmentUpdate_new"))) TS_CommitmentUpdate_new(uint32_tArray update_add_htlcs_arg, uint32_tArray update_fulfill_htlcs_arg, uint32_tArray update_fail_htlcs_arg, uint32_tArray update_fail_malformed_htlcs_arg, uint32_t update_fee_arg, uint32_t commitment_signed_arg) { +uint64_t __attribute__((export_name("TS_CommitmentUpdate_new"))) TS_CommitmentUpdate_new(uint64_tArray update_add_htlcs_arg, uint64_tArray update_fulfill_htlcs_arg, uint64_tArray update_fail_htlcs_arg, uint64_tArray update_fail_malformed_htlcs_arg, uint64_t update_fee_arg, uint64_t commitment_signed_arg) { LDKCVec_UpdateAddHTLCZ update_add_htlcs_arg_constr; update_add_htlcs_arg_constr.datalen = update_add_htlcs_arg->arr_len; if (update_add_htlcs_arg_constr.datalen > 0) 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; + uint64_t* update_add_htlcs_arg_vals = update_add_htlcs_arg->elems; for (size_t p = 0; p < update_add_htlcs_arg_constr.datalen; p++) { - uint32_t update_add_htlcs_arg_conv_15 = update_add_htlcs_arg_vals[p]; + uint64_t update_add_htlcs_arg_conv_15 = update_add_htlcs_arg_vals[p]; LDKUpdateAddHTLC update_add_htlcs_arg_conv_15_conv; - update_add_htlcs_arg_conv_15_conv.inner = (void*)(update_add_htlcs_arg_conv_15 & (~1)); - update_add_htlcs_arg_conv_15_conv.is_owned = (update_add_htlcs_arg_conv_15 & 1) || (update_add_htlcs_arg_conv_15 == 0); + update_add_htlcs_arg_conv_15_conv.inner = untag_ptr(update_add_htlcs_arg_conv_15); + update_add_htlcs_arg_conv_15_conv.is_owned = ptr_is_owned(update_add_htlcs_arg_conv_15); CHECK_INNER_FIELD_ACCESS_OR_NULL(update_add_htlcs_arg_conv_15_conv); update_add_htlcs_arg_conv_15_conv = UpdateAddHTLC_clone(&update_add_htlcs_arg_conv_15_conv); update_add_htlcs_arg_constr.data[p] = update_add_htlcs_arg_conv_15_conv; @@ -33728,12 +32111,12 @@ 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; + uint64_t* update_fulfill_htlcs_arg_vals = update_fulfill_htlcs_arg->elems; for (size_t t = 0; t < update_fulfill_htlcs_arg_constr.datalen; t++) { - uint32_t update_fulfill_htlcs_arg_conv_19 = update_fulfill_htlcs_arg_vals[t]; + uint64_t update_fulfill_htlcs_arg_conv_19 = update_fulfill_htlcs_arg_vals[t]; LDKUpdateFulfillHTLC update_fulfill_htlcs_arg_conv_19_conv; - update_fulfill_htlcs_arg_conv_19_conv.inner = (void*)(update_fulfill_htlcs_arg_conv_19 & (~1)); - update_fulfill_htlcs_arg_conv_19_conv.is_owned = (update_fulfill_htlcs_arg_conv_19 & 1) || (update_fulfill_htlcs_arg_conv_19 == 0); + update_fulfill_htlcs_arg_conv_19_conv.inner = untag_ptr(update_fulfill_htlcs_arg_conv_19); + update_fulfill_htlcs_arg_conv_19_conv.is_owned = ptr_is_owned(update_fulfill_htlcs_arg_conv_19); CHECK_INNER_FIELD_ACCESS_OR_NULL(update_fulfill_htlcs_arg_conv_19_conv); update_fulfill_htlcs_arg_conv_19_conv = UpdateFulfillHTLC_clone(&update_fulfill_htlcs_arg_conv_19_conv); update_fulfill_htlcs_arg_constr.data[t] = update_fulfill_htlcs_arg_conv_19_conv; @@ -33745,12 +32128,12 @@ 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; + uint64_t* update_fail_htlcs_arg_vals = update_fail_htlcs_arg->elems; for (size_t q = 0; q < update_fail_htlcs_arg_constr.datalen; q++) { - uint32_t update_fail_htlcs_arg_conv_16 = update_fail_htlcs_arg_vals[q]; + uint64_t update_fail_htlcs_arg_conv_16 = update_fail_htlcs_arg_vals[q]; LDKUpdateFailHTLC update_fail_htlcs_arg_conv_16_conv; - update_fail_htlcs_arg_conv_16_conv.inner = (void*)(update_fail_htlcs_arg_conv_16 & (~1)); - update_fail_htlcs_arg_conv_16_conv.is_owned = (update_fail_htlcs_arg_conv_16 & 1) || (update_fail_htlcs_arg_conv_16 == 0); + update_fail_htlcs_arg_conv_16_conv.inner = untag_ptr(update_fail_htlcs_arg_conv_16); + update_fail_htlcs_arg_conv_16_conv.is_owned = ptr_is_owned(update_fail_htlcs_arg_conv_16); CHECK_INNER_FIELD_ACCESS_OR_NULL(update_fail_htlcs_arg_conv_16_conv); update_fail_htlcs_arg_conv_16_conv = UpdateFailHTLC_clone(&update_fail_htlcs_arg_conv_16_conv); update_fail_htlcs_arg_constr.data[q] = update_fail_htlcs_arg_conv_16_conv; @@ -33762,100 +32145,88 @@ 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; + uint64_t* update_fail_malformed_htlcs_arg_vals = update_fail_malformed_htlcs_arg->elems; for (size_t z = 0; z < update_fail_malformed_htlcs_arg_constr.datalen; z++) { - uint32_t update_fail_malformed_htlcs_arg_conv_25 = update_fail_malformed_htlcs_arg_vals[z]; + uint64_t update_fail_malformed_htlcs_arg_conv_25 = update_fail_malformed_htlcs_arg_vals[z]; LDKUpdateFailMalformedHTLC update_fail_malformed_htlcs_arg_conv_25_conv; - update_fail_malformed_htlcs_arg_conv_25_conv.inner = (void*)(update_fail_malformed_htlcs_arg_conv_25 & (~1)); - update_fail_malformed_htlcs_arg_conv_25_conv.is_owned = (update_fail_malformed_htlcs_arg_conv_25 & 1) || (update_fail_malformed_htlcs_arg_conv_25 == 0); + update_fail_malformed_htlcs_arg_conv_25_conv.inner = untag_ptr(update_fail_malformed_htlcs_arg_conv_25); + update_fail_malformed_htlcs_arg_conv_25_conv.is_owned = ptr_is_owned(update_fail_malformed_htlcs_arg_conv_25); CHECK_INNER_FIELD_ACCESS_OR_NULL(update_fail_malformed_htlcs_arg_conv_25_conv); update_fail_malformed_htlcs_arg_conv_25_conv = UpdateFailMalformedHTLC_clone(&update_fail_malformed_htlcs_arg_conv_25_conv); update_fail_malformed_htlcs_arg_constr.data[z] = update_fail_malformed_htlcs_arg_conv_25_conv; } FREE(update_fail_malformed_htlcs_arg); LDKUpdateFee update_fee_arg_conv; - update_fee_arg_conv.inner = (void*)(update_fee_arg & (~1)); - update_fee_arg_conv.is_owned = (update_fee_arg & 1) || (update_fee_arg == 0); + update_fee_arg_conv.inner = untag_ptr(update_fee_arg); + update_fee_arg_conv.is_owned = ptr_is_owned(update_fee_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(update_fee_arg_conv); update_fee_arg_conv = UpdateFee_clone(&update_fee_arg_conv); LDKCommitmentSigned commitment_signed_arg_conv; - commitment_signed_arg_conv.inner = (void*)(commitment_signed_arg & (~1)); - commitment_signed_arg_conv.is_owned = (commitment_signed_arg & 1) || (commitment_signed_arg == 0); + commitment_signed_arg_conv.inner = untag_ptr(commitment_signed_arg); + commitment_signed_arg_conv.is_owned = ptr_is_owned(commitment_signed_arg); 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t CommitmentUpdate_clone_ptr(LDKCommitmentUpdate *NONNULL_PTR arg) { +static inline uint64_t CommitmentUpdate_clone_ptr(LDKCommitmentUpdate *NONNULL_PTR arg) { LDKCommitmentUpdate ret_var = CommitmentUpdate_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_CommitmentUpdate_clone_ptr"))) TS_CommitmentUpdate_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_CommitmentUpdate_clone_ptr"))) TS_CommitmentUpdate_clone_ptr(uint64_t arg) { LDKCommitmentUpdate arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = CommitmentUpdate_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = CommitmentUpdate_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CommitmentUpdate_clone"))) TS_CommitmentUpdate_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_CommitmentUpdate_clone"))) TS_CommitmentUpdate_clone(uint64_t orig) { LDKCommitmentUpdate orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKCommitmentUpdate ret_var = CommitmentUpdate_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_ChannelMessageHandler_free"))) TS_ChannelMessageHandler_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKChannelMessageHandler this_ptr_conv = *(LDKChannelMessageHandler*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); ChannelMessageHandler_free(this_ptr_conv); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_RoutingMessageHandler_free"))) TS_RoutingMessageHandler_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKRoutingMessageHandler this_ptr_conv = *(LDKRoutingMessageHandler*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); RoutingMessageHandler_free(this_ptr_conv); } -int8_tArray __attribute__((export_name("TS_AcceptChannel_write"))) TS_AcceptChannel_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_AcceptChannel_write"))) TS_AcceptChannel_write(uint64_t obj) { LDKAcceptChannel obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = AcceptChannel_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -33863,21 +32234,22 @@ int8_tArray __attribute__((export_name("TS_AcceptChannel_write"))) TS_AcceptCha return ret_arr; } -uint32_t __attribute__((export_name("TS_AcceptChannel_read"))) TS_AcceptChannel_read(int8_tArray ser) { +uint64_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; LDKCResult_AcceptChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AcceptChannelDecodeErrorZ), "LDKCResult_AcceptChannelDecodeErrorZ"); *ret_conv = AcceptChannel_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_AnnouncementSignatures_write"))) TS_AnnouncementSignatures_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_AnnouncementSignatures_write"))) TS_AnnouncementSignatures_write(uint64_t obj) { LDKAnnouncementSignatures obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = AnnouncementSignatures_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -33885,21 +32257,22 @@ int8_tArray __attribute__((export_name("TS_AnnouncementSignatures_write"))) TS_ return ret_arr; } -uint32_t __attribute__((export_name("TS_AnnouncementSignatures_read"))) TS_AnnouncementSignatures_read(int8_tArray ser) { +uint64_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; LDKCResult_AnnouncementSignaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AnnouncementSignaturesDecodeErrorZ), "LDKCResult_AnnouncementSignaturesDecodeErrorZ"); *ret_conv = AnnouncementSignatures_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_ChannelReestablish_write"))) TS_ChannelReestablish_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ChannelReestablish_write"))) TS_ChannelReestablish_write(uint64_t obj) { LDKChannelReestablish obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ChannelReestablish_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -33907,21 +32280,22 @@ int8_tArray __attribute__((export_name("TS_ChannelReestablish_write"))) TS_Chan return ret_arr; } -uint32_t __attribute__((export_name("TS_ChannelReestablish_read"))) TS_ChannelReestablish_read(int8_tArray ser) { +uint64_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; LDKCResult_ChannelReestablishDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelReestablishDecodeErrorZ), "LDKCResult_ChannelReestablishDecodeErrorZ"); *ret_conv = ChannelReestablish_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_ClosingSigned_write"))) TS_ClosingSigned_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ClosingSigned_write"))) TS_ClosingSigned_write(uint64_t obj) { LDKClosingSigned obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ClosingSigned_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -33929,21 +32303,22 @@ int8_tArray __attribute__((export_name("TS_ClosingSigned_write"))) TS_ClosingSi return ret_arr; } -uint32_t __attribute__((export_name("TS_ClosingSigned_read"))) TS_ClosingSigned_read(int8_tArray ser) { +uint64_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; LDKCResult_ClosingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedDecodeErrorZ), "LDKCResult_ClosingSignedDecodeErrorZ"); *ret_conv = ClosingSigned_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_ClosingSignedFeeRange_write"))) TS_ClosingSignedFeeRange_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ClosingSignedFeeRange_write"))) TS_ClosingSignedFeeRange_write(uint64_t obj) { LDKClosingSignedFeeRange obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ClosingSignedFeeRange_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -33951,21 +32326,22 @@ int8_tArray __attribute__((export_name("TS_ClosingSignedFeeRange_write"))) TS_C return ret_arr; } -uint32_t __attribute__((export_name("TS_ClosingSignedFeeRange_read"))) TS_ClosingSignedFeeRange_read(int8_tArray ser) { +uint64_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; LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedFeeRangeDecodeErrorZ), "LDKCResult_ClosingSignedFeeRangeDecodeErrorZ"); *ret_conv = ClosingSignedFeeRange_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_CommitmentSigned_write"))) TS_CommitmentSigned_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_CommitmentSigned_write"))) TS_CommitmentSigned_write(uint64_t obj) { LDKCommitmentSigned obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = CommitmentSigned_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -33973,21 +32349,22 @@ int8_tArray __attribute__((export_name("TS_CommitmentSigned_write"))) TS_Commit return ret_arr; } -uint32_t __attribute__((export_name("TS_CommitmentSigned_read"))) TS_CommitmentSigned_read(int8_tArray ser) { +uint64_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; LDKCResult_CommitmentSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentSignedDecodeErrorZ), "LDKCResult_CommitmentSignedDecodeErrorZ"); *ret_conv = CommitmentSigned_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_FundingCreated_write"))) TS_FundingCreated_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_FundingCreated_write"))) TS_FundingCreated_write(uint64_t obj) { LDKFundingCreated obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = FundingCreated_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -33995,21 +32372,22 @@ int8_tArray __attribute__((export_name("TS_FundingCreated_write"))) TS_FundingC return ret_arr; } -uint32_t __attribute__((export_name("TS_FundingCreated_read"))) TS_FundingCreated_read(int8_tArray ser) { +uint64_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; LDKCResult_FundingCreatedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingCreatedDecodeErrorZ), "LDKCResult_FundingCreatedDecodeErrorZ"); *ret_conv = FundingCreated_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_FundingSigned_write"))) TS_FundingSigned_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_FundingSigned_write"))) TS_FundingSigned_write(uint64_t obj) { LDKFundingSigned obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = FundingSigned_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34017,21 +32395,22 @@ int8_tArray __attribute__((export_name("TS_FundingSigned_write"))) TS_FundingSi return ret_arr; } -uint32_t __attribute__((export_name("TS_FundingSigned_read"))) TS_FundingSigned_read(int8_tArray ser) { +uint64_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; LDKCResult_FundingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingSignedDecodeErrorZ), "LDKCResult_FundingSignedDecodeErrorZ"); *ret_conv = FundingSigned_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_ChannelReady_write"))) TS_ChannelReady_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ChannelReady_write"))) TS_ChannelReady_write(uint64_t obj) { LDKChannelReady obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ChannelReady_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34039,21 +32418,22 @@ int8_tArray __attribute__((export_name("TS_ChannelReady_write"))) TS_ChannelRea return ret_arr; } -uint32_t __attribute__((export_name("TS_ChannelReady_read"))) TS_ChannelReady_read(int8_tArray ser) { +uint64_t __attribute__((export_name("TS_ChannelReady_read"))) TS_ChannelReady_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; ser_ref.data = ser->elems; LDKCResult_ChannelReadyDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelReadyDecodeErrorZ), "LDKCResult_ChannelReadyDecodeErrorZ"); *ret_conv = ChannelReady_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_Init_write"))) TS_Init_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_Init_write"))) TS_Init_write(uint64_t obj) { LDKInit obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = Init_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34061,21 +32441,22 @@ int8_tArray __attribute__((export_name("TS_Init_write"))) TS_Init_write(uint32_ return ret_arr; } -uint32_t __attribute__((export_name("TS_Init_read"))) TS_Init_read(int8_tArray ser) { +uint64_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; LDKCResult_InitDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitDecodeErrorZ), "LDKCResult_InitDecodeErrorZ"); *ret_conv = Init_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_OpenChannel_write"))) TS_OpenChannel_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_OpenChannel_write"))) TS_OpenChannel_write(uint64_t obj) { LDKOpenChannel obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = OpenChannel_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34083,21 +32464,22 @@ int8_tArray __attribute__((export_name("TS_OpenChannel_write"))) TS_OpenChannel return ret_arr; } -uint32_t __attribute__((export_name("TS_OpenChannel_read"))) TS_OpenChannel_read(int8_tArray ser) { +uint64_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; LDKCResult_OpenChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OpenChannelDecodeErrorZ), "LDKCResult_OpenChannelDecodeErrorZ"); *ret_conv = OpenChannel_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_RevokeAndACK_write"))) TS_RevokeAndACK_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_RevokeAndACK_write"))) TS_RevokeAndACK_write(uint64_t obj) { LDKRevokeAndACK obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = RevokeAndACK_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34105,21 +32487,22 @@ int8_tArray __attribute__((export_name("TS_RevokeAndACK_write"))) TS_RevokeAndA return ret_arr; } -uint32_t __attribute__((export_name("TS_RevokeAndACK_read"))) TS_RevokeAndACK_read(int8_tArray ser) { +uint64_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; LDKCResult_RevokeAndACKDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RevokeAndACKDecodeErrorZ), "LDKCResult_RevokeAndACKDecodeErrorZ"); *ret_conv = RevokeAndACK_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_Shutdown_write"))) TS_Shutdown_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_Shutdown_write"))) TS_Shutdown_write(uint64_t obj) { LDKShutdown obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = Shutdown_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34127,21 +32510,22 @@ int8_tArray __attribute__((export_name("TS_Shutdown_write"))) TS_Shutdown_write return ret_arr; } -uint32_t __attribute__((export_name("TS_Shutdown_read"))) TS_Shutdown_read(int8_tArray ser) { +uint64_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; LDKCResult_ShutdownDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownDecodeErrorZ), "LDKCResult_ShutdownDecodeErrorZ"); *ret_conv = Shutdown_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_UpdateFailHTLC_write"))) TS_UpdateFailHTLC_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_UpdateFailHTLC_write"))) TS_UpdateFailHTLC_write(uint64_t obj) { LDKUpdateFailHTLC obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = UpdateFailHTLC_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34149,21 +32533,22 @@ int8_tArray __attribute__((export_name("TS_UpdateFailHTLC_write"))) TS_UpdateFa return ret_arr; } -uint32_t __attribute__((export_name("TS_UpdateFailHTLC_read"))) TS_UpdateFailHTLC_read(int8_tArray ser) { +uint64_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; LDKCResult_UpdateFailHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailHTLCDecodeErrorZ), "LDKCResult_UpdateFailHTLCDecodeErrorZ"); *ret_conv = UpdateFailHTLC_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_UpdateFailMalformedHTLC_write"))) TS_UpdateFailMalformedHTLC_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_UpdateFailMalformedHTLC_write"))) TS_UpdateFailMalformedHTLC_write(uint64_t obj) { LDKUpdateFailMalformedHTLC obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = UpdateFailMalformedHTLC_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34171,21 +32556,22 @@ int8_tArray __attribute__((export_name("TS_UpdateFailMalformedHTLC_write"))) TS return ret_arr; } -uint32_t __attribute__((export_name("TS_UpdateFailMalformedHTLC_read"))) TS_UpdateFailMalformedHTLC_read(int8_tArray ser) { +uint64_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; LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ), "LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ"); *ret_conv = UpdateFailMalformedHTLC_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_UpdateFee_write"))) TS_UpdateFee_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_UpdateFee_write"))) TS_UpdateFee_write(uint64_t obj) { LDKUpdateFee obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = UpdateFee_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34193,21 +32579,22 @@ int8_tArray __attribute__((export_name("TS_UpdateFee_write"))) TS_UpdateFee_wri return ret_arr; } -uint32_t __attribute__((export_name("TS_UpdateFee_read"))) TS_UpdateFee_read(int8_tArray ser) { +uint64_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; LDKCResult_UpdateFeeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFeeDecodeErrorZ), "LDKCResult_UpdateFeeDecodeErrorZ"); *ret_conv = UpdateFee_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_UpdateFulfillHTLC_write"))) TS_UpdateFulfillHTLC_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_UpdateFulfillHTLC_write"))) TS_UpdateFulfillHTLC_write(uint64_t obj) { LDKUpdateFulfillHTLC obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = UpdateFulfillHTLC_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34215,21 +32602,22 @@ int8_tArray __attribute__((export_name("TS_UpdateFulfillHTLC_write"))) TS_Updat return ret_arr; } -uint32_t __attribute__((export_name("TS_UpdateFulfillHTLC_read"))) TS_UpdateFulfillHTLC_read(int8_tArray ser) { +uint64_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; LDKCResult_UpdateFulfillHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFulfillHTLCDecodeErrorZ), "LDKCResult_UpdateFulfillHTLCDecodeErrorZ"); *ret_conv = UpdateFulfillHTLC_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_UpdateAddHTLC_write"))) TS_UpdateAddHTLC_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_UpdateAddHTLC_write"))) TS_UpdateAddHTLC_write(uint64_t obj) { LDKUpdateAddHTLC obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = UpdateAddHTLC_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34237,21 +32625,22 @@ int8_tArray __attribute__((export_name("TS_UpdateAddHTLC_write"))) TS_UpdateAdd return ret_arr; } -uint32_t __attribute__((export_name("TS_UpdateAddHTLC_read"))) TS_UpdateAddHTLC_read(int8_tArray ser) { +uint64_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; LDKCResult_UpdateAddHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateAddHTLCDecodeErrorZ), "LDKCResult_UpdateAddHTLCDecodeErrorZ"); *ret_conv = UpdateAddHTLC_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_Ping_write"))) TS_Ping_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_Ping_write"))) TS_Ping_write(uint64_t obj) { LDKPing obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = Ping_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34259,21 +32648,22 @@ int8_tArray __attribute__((export_name("TS_Ping_write"))) TS_Ping_write(uint32_ return ret_arr; } -uint32_t __attribute__((export_name("TS_Ping_read"))) TS_Ping_read(int8_tArray ser) { +uint64_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; LDKCResult_PingDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PingDecodeErrorZ), "LDKCResult_PingDecodeErrorZ"); *ret_conv = Ping_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_Pong_write"))) TS_Pong_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_Pong_write"))) TS_Pong_write(uint64_t obj) { LDKPong obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = Pong_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34281,21 +32671,22 @@ int8_tArray __attribute__((export_name("TS_Pong_write"))) TS_Pong_write(uint32_ return ret_arr; } -uint32_t __attribute__((export_name("TS_Pong_read"))) TS_Pong_read(int8_tArray ser) { +uint64_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; LDKCResult_PongDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PongDecodeErrorZ), "LDKCResult_PongDecodeErrorZ"); *ret_conv = Pong_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_UnsignedChannelAnnouncement_write"))) TS_UnsignedChannelAnnouncement_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_UnsignedChannelAnnouncement_write"))) TS_UnsignedChannelAnnouncement_write(uint64_t obj) { LDKUnsignedChannelAnnouncement obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = UnsignedChannelAnnouncement_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34303,21 +32694,22 @@ int8_tArray __attribute__((export_name("TS_UnsignedChannelAnnouncement_write")) return ret_arr; } -uint32_t __attribute__((export_name("TS_UnsignedChannelAnnouncement_read"))) TS_UnsignedChannelAnnouncement_read(int8_tArray ser) { +uint64_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; LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ), "LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ"); *ret_conv = UnsignedChannelAnnouncement_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_ChannelAnnouncement_write"))) TS_ChannelAnnouncement_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ChannelAnnouncement_write"))) TS_ChannelAnnouncement_write(uint64_t obj) { LDKChannelAnnouncement obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ChannelAnnouncement_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34325,21 +32717,22 @@ int8_tArray __attribute__((export_name("TS_ChannelAnnouncement_write"))) TS_Cha return ret_arr; } -uint32_t __attribute__((export_name("TS_ChannelAnnouncement_read"))) TS_ChannelAnnouncement_read(int8_tArray ser) { +uint64_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; LDKCResult_ChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelAnnouncementDecodeErrorZ), "LDKCResult_ChannelAnnouncementDecodeErrorZ"); *ret_conv = ChannelAnnouncement_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_UnsignedChannelUpdate_write"))) TS_UnsignedChannelUpdate_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_UnsignedChannelUpdate_write"))) TS_UnsignedChannelUpdate_write(uint64_t obj) { LDKUnsignedChannelUpdate obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = UnsignedChannelUpdate_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34347,21 +32740,22 @@ int8_tArray __attribute__((export_name("TS_UnsignedChannelUpdate_write"))) TS_U return ret_arr; } -uint32_t __attribute__((export_name("TS_UnsignedChannelUpdate_read"))) TS_UnsignedChannelUpdate_read(int8_tArray ser) { +uint64_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; LDKCResult_UnsignedChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelUpdateDecodeErrorZ), "LDKCResult_UnsignedChannelUpdateDecodeErrorZ"); *ret_conv = UnsignedChannelUpdate_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_ChannelUpdate_write"))) TS_ChannelUpdate_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ChannelUpdate_write"))) TS_ChannelUpdate_write(uint64_t obj) { LDKChannelUpdate obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ChannelUpdate_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34369,21 +32763,22 @@ int8_tArray __attribute__((export_name("TS_ChannelUpdate_write"))) TS_ChannelUp return ret_arr; } -uint32_t __attribute__((export_name("TS_ChannelUpdate_read"))) TS_ChannelUpdate_read(int8_tArray ser) { +uint64_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; LDKCResult_ChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateDecodeErrorZ), "LDKCResult_ChannelUpdateDecodeErrorZ"); *ret_conv = ChannelUpdate_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_ErrorMessage_write"))) TS_ErrorMessage_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ErrorMessage_write"))) TS_ErrorMessage_write(uint64_t obj) { LDKErrorMessage obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ErrorMessage_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34391,21 +32786,22 @@ int8_tArray __attribute__((export_name("TS_ErrorMessage_write"))) TS_ErrorMessa return ret_arr; } -uint32_t __attribute__((export_name("TS_ErrorMessage_read"))) TS_ErrorMessage_read(int8_tArray ser) { +uint64_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; LDKCResult_ErrorMessageDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ErrorMessageDecodeErrorZ), "LDKCResult_ErrorMessageDecodeErrorZ"); *ret_conv = ErrorMessage_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_WarningMessage_write"))) TS_WarningMessage_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_WarningMessage_write"))) TS_WarningMessage_write(uint64_t obj) { LDKWarningMessage obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = WarningMessage_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34413,21 +32809,22 @@ int8_tArray __attribute__((export_name("TS_WarningMessage_write"))) TS_WarningM return ret_arr; } -uint32_t __attribute__((export_name("TS_WarningMessage_read"))) TS_WarningMessage_read(int8_tArray ser) { +uint64_t __attribute__((export_name("TS_WarningMessage_read"))) TS_WarningMessage_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; ser_ref.data = ser->elems; LDKCResult_WarningMessageDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_WarningMessageDecodeErrorZ), "LDKCResult_WarningMessageDecodeErrorZ"); *ret_conv = WarningMessage_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_UnsignedNodeAnnouncement_write"))) TS_UnsignedNodeAnnouncement_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_UnsignedNodeAnnouncement_write"))) TS_UnsignedNodeAnnouncement_write(uint64_t obj) { LDKUnsignedNodeAnnouncement obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = UnsignedNodeAnnouncement_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34435,21 +32832,22 @@ int8_tArray __attribute__((export_name("TS_UnsignedNodeAnnouncement_write"))) T return ret_arr; } -uint32_t __attribute__((export_name("TS_UnsignedNodeAnnouncement_read"))) TS_UnsignedNodeAnnouncement_read(int8_tArray ser) { +uint64_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; LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ), "LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ"); *ret_conv = UnsignedNodeAnnouncement_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_NodeAnnouncement_write"))) TS_NodeAnnouncement_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_NodeAnnouncement_write"))) TS_NodeAnnouncement_write(uint64_t obj) { LDKNodeAnnouncement obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = NodeAnnouncement_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34457,31 +32855,32 @@ int8_tArray __attribute__((export_name("TS_NodeAnnouncement_write"))) TS_NodeAn return ret_arr; } -uint32_t __attribute__((export_name("TS_NodeAnnouncement_read"))) TS_NodeAnnouncement_read(int8_tArray ser) { +uint64_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; LDKCResult_NodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementDecodeErrorZ), "LDKCResult_NodeAnnouncementDecodeErrorZ"); *ret_conv = NodeAnnouncement_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_QueryShortChannelIds_read"))) TS_QueryShortChannelIds_read(int8_tArray ser) { +uint64_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; LDKCResult_QueryShortChannelIdsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryShortChannelIdsDecodeErrorZ), "LDKCResult_QueryShortChannelIdsDecodeErrorZ"); *ret_conv = QueryShortChannelIds_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_QueryShortChannelIds_write"))) TS_QueryShortChannelIds_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_QueryShortChannelIds_write"))) TS_QueryShortChannelIds_write(uint64_t obj) { LDKQueryShortChannelIds obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = QueryShortChannelIds_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34489,11 +32888,12 @@ int8_tArray __attribute__((export_name("TS_QueryShortChannelIds_write"))) TS_Qu return ret_arr; } -int8_tArray __attribute__((export_name("TS_ReplyShortChannelIdsEnd_write"))) TS_ReplyShortChannelIdsEnd_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ReplyShortChannelIdsEnd_write"))) TS_ReplyShortChannelIdsEnd_write(uint64_t obj) { LDKReplyShortChannelIdsEnd obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ReplyShortChannelIdsEnd_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34501,30 +32901,32 @@ int8_tArray __attribute__((export_name("TS_ReplyShortChannelIdsEnd_write"))) TS return ret_arr; } -uint32_t __attribute__((export_name("TS_ReplyShortChannelIdsEnd_read"))) TS_ReplyShortChannelIdsEnd_read(int8_tArray ser) { +uint64_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; LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ), "LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ"); *ret_conv = ReplyShortChannelIdsEnd_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int32_t __attribute__((export_name("TS_QueryChannelRange_end_blocknum"))) TS_QueryChannelRange_end_blocknum(uint32_t this_arg) { +int32_t __attribute__((export_name("TS_QueryChannelRange_end_blocknum"))) TS_QueryChannelRange_end_blocknum(uint64_t this_arg) { LDKQueryChannelRange this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int32_t ret_conv = QueryChannelRange_end_blocknum(&this_arg_conv); return ret_conv; } -int8_tArray __attribute__((export_name("TS_QueryChannelRange_write"))) TS_QueryChannelRange_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_QueryChannelRange_write"))) TS_QueryChannelRange_write(uint64_t obj) { LDKQueryChannelRange obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = QueryChannelRange_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34532,31 +32934,32 @@ int8_tArray __attribute__((export_name("TS_QueryChannelRange_write"))) TS_Query return ret_arr; } -uint32_t __attribute__((export_name("TS_QueryChannelRange_read"))) TS_QueryChannelRange_read(int8_tArray ser) { +uint64_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; LDKCResult_QueryChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryChannelRangeDecodeErrorZ), "LDKCResult_QueryChannelRangeDecodeErrorZ"); *ret_conv = QueryChannelRange_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_ReplyChannelRange_read"))) TS_ReplyChannelRange_read(int8_tArray ser) { +uint64_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; LDKCResult_ReplyChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyChannelRangeDecodeErrorZ), "LDKCResult_ReplyChannelRangeDecodeErrorZ"); *ret_conv = ReplyChannelRange_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_ReplyChannelRange_write"))) TS_ReplyChannelRange_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ReplyChannelRange_write"))) TS_ReplyChannelRange_write(uint64_t obj) { LDKReplyChannelRange obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ReplyChannelRange_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34564,11 +32967,12 @@ int8_tArray __attribute__((export_name("TS_ReplyChannelRange_write"))) TS_Reply return ret_arr; } -int8_tArray __attribute__((export_name("TS_GossipTimestampFilter_write"))) TS_GossipTimestampFilter_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_GossipTimestampFilter_write"))) TS_GossipTimestampFilter_write(uint64_t obj) { LDKGossipTimestampFilter obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = GossipTimestampFilter_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34576,151 +32980,149 @@ int8_tArray __attribute__((export_name("TS_GossipTimestampFilter_write"))) TS_G return ret_arr; } -uint32_t __attribute__((export_name("TS_GossipTimestampFilter_read"))) TS_GossipTimestampFilter_read(int8_tArray ser) { +uint64_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; LDKCResult_GossipTimestampFilterDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_GossipTimestampFilterDecodeErrorZ), "LDKCResult_GossipTimestampFilterDecodeErrorZ"); *ret_conv = GossipTimestampFilter_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_CustomMessageHandler_free"))) TS_CustomMessageHandler_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKCustomMessageHandler this_ptr_conv = *(LDKCustomMessageHandler*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); CustomMessageHandler_free(this_ptr_conv); } -void __attribute__((export_name("TS_IgnoringMessageHandler_free"))) TS_IgnoringMessageHandler_free(uint32_t this_obj) { +void __attribute__((export_name("TS_IgnoringMessageHandler_free"))) TS_IgnoringMessageHandler_free(uint64_t this_obj) { LDKIgnoringMessageHandler this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); IgnoringMessageHandler_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_IgnoringMessageHandler_new"))) TS_IgnoringMessageHandler_new() { +uint64_t __attribute__((export_name("TS_IgnoringMessageHandler_new"))) TS_IgnoringMessageHandler_new() { LDKIgnoringMessageHandler ret_var = IgnoringMessageHandler_new(); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_IgnoringMessageHandler_as_MessageSendEventsProvider"))) TS_IgnoringMessageHandler_as_MessageSendEventsProvider(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_IgnoringMessageHandler_as_MessageSendEventsProvider"))) TS_IgnoringMessageHandler_as_MessageSendEventsProvider(uint64_t this_arg) { LDKIgnoringMessageHandler this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKMessageSendEventsProvider* ret_ret = MALLOC(sizeof(LDKMessageSendEventsProvider), "LDKMessageSendEventsProvider"); *ret_ret = IgnoringMessageHandler_as_MessageSendEventsProvider(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_t __attribute__((export_name("TS_IgnoringMessageHandler_as_RoutingMessageHandler"))) TS_IgnoringMessageHandler_as_RoutingMessageHandler(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_IgnoringMessageHandler_as_RoutingMessageHandler"))) TS_IgnoringMessageHandler_as_RoutingMessageHandler(uint64_t this_arg) { LDKIgnoringMessageHandler this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKRoutingMessageHandler* ret_ret = MALLOC(sizeof(LDKRoutingMessageHandler), "LDKRoutingMessageHandler"); *ret_ret = IgnoringMessageHandler_as_RoutingMessageHandler(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_t __attribute__((export_name("TS_IgnoringMessageHandler_as_CustomMessageReader"))) TS_IgnoringMessageHandler_as_CustomMessageReader(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_IgnoringMessageHandler_as_CustomMessageReader"))) TS_IgnoringMessageHandler_as_CustomMessageReader(uint64_t this_arg) { LDKIgnoringMessageHandler this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCustomMessageReader* ret_ret = MALLOC(sizeof(LDKCustomMessageReader), "LDKCustomMessageReader"); *ret_ret = IgnoringMessageHandler_as_CustomMessageReader(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_t __attribute__((export_name("TS_IgnoringMessageHandler_as_CustomMessageHandler"))) TS_IgnoringMessageHandler_as_CustomMessageHandler(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_IgnoringMessageHandler_as_CustomMessageHandler"))) TS_IgnoringMessageHandler_as_CustomMessageHandler(uint64_t this_arg) { LDKIgnoringMessageHandler this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCustomMessageHandler* ret_ret = MALLOC(sizeof(LDKCustomMessageHandler), "LDKCustomMessageHandler"); *ret_ret = IgnoringMessageHandler_as_CustomMessageHandler(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -void __attribute__((export_name("TS_ErroringMessageHandler_free"))) TS_ErroringMessageHandler_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ErroringMessageHandler_free"))) TS_ErroringMessageHandler_free(uint64_t this_obj) { LDKErroringMessageHandler this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ErroringMessageHandler_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_ErroringMessageHandler_new"))) TS_ErroringMessageHandler_new() { +uint64_t __attribute__((export_name("TS_ErroringMessageHandler_new"))) TS_ErroringMessageHandler_new() { LDKErroringMessageHandler ret_var = ErroringMessageHandler_new(); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ErroringMessageHandler_as_MessageSendEventsProvider"))) TS_ErroringMessageHandler_as_MessageSendEventsProvider(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ErroringMessageHandler_as_MessageSendEventsProvider"))) TS_ErroringMessageHandler_as_MessageSendEventsProvider(uint64_t this_arg) { LDKErroringMessageHandler this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKMessageSendEventsProvider* ret_ret = MALLOC(sizeof(LDKMessageSendEventsProvider), "LDKMessageSendEventsProvider"); *ret_ret = ErroringMessageHandler_as_MessageSendEventsProvider(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_t __attribute__((export_name("TS_ErroringMessageHandler_as_ChannelMessageHandler"))) TS_ErroringMessageHandler_as_ChannelMessageHandler(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ErroringMessageHandler_as_ChannelMessageHandler"))) TS_ErroringMessageHandler_as_ChannelMessageHandler(uint64_t this_arg) { LDKErroringMessageHandler this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKChannelMessageHandler* ret_ret = MALLOC(sizeof(LDKChannelMessageHandler), "LDKChannelMessageHandler"); *ret_ret = ErroringMessageHandler_as_ChannelMessageHandler(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -void __attribute__((export_name("TS_MessageHandler_free"))) TS_MessageHandler_free(uint32_t this_obj) { +void __attribute__((export_name("TS_MessageHandler_free"))) TS_MessageHandler_free(uint64_t this_obj) { LDKMessageHandler this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); MessageHandler_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_MessageHandler_get_chan_handler"))) TS_MessageHandler_get_chan_handler(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_MessageHandler_get_chan_handler"))) TS_MessageHandler_get_chan_handler(uint64_t this_ptr) { LDKMessageHandler this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; // WARNING: This object doesn't live past this scope, needs clone! - uint32_t ret_ret = ((uintptr_t)MessageHandler_get_chan_handler(&this_ptr_conv)) | 1; + uint64_t ret_ret = tag_ptr(MessageHandler_get_chan_handler(&this_ptr_conv), false); return ret_ret; } -void __attribute__((export_name("TS_MessageHandler_set_chan_handler"))) TS_MessageHandler_set_chan_handler(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_MessageHandler_set_chan_handler"))) TS_MessageHandler_set_chan_handler(uint64_t this_ptr, uint64_t val) { LDKMessageHandler this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKChannelMessageHandler val_conv = *(LDKChannelMessageHandler*)(val_ptr); if (val_conv.free == LDKChannelMessageHandler_JCalls_free) { @@ -34730,22 +33132,24 @@ void __attribute__((export_name("TS_MessageHandler_set_chan_handler"))) TS_Mess MessageHandler_set_chan_handler(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_MessageHandler_get_route_handler"))) TS_MessageHandler_get_route_handler(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_MessageHandler_get_route_handler"))) TS_MessageHandler_get_route_handler(uint64_t this_ptr) { LDKMessageHandler this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; // WARNING: This object doesn't live past this scope, needs clone! - uint32_t ret_ret = ((uintptr_t)MessageHandler_get_route_handler(&this_ptr_conv)) | 1; + uint64_t ret_ret = tag_ptr(MessageHandler_get_route_handler(&this_ptr_conv), false); return ret_ret; } -void __attribute__((export_name("TS_MessageHandler_set_route_handler"))) TS_MessageHandler_set_route_handler(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_MessageHandler_set_route_handler"))) TS_MessageHandler_set_route_handler(uint64_t this_ptr, uint64_t val) { LDKMessageHandler this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKRoutingMessageHandler val_conv = *(LDKRoutingMessageHandler*)(val_ptr); if (val_conv.free == LDKRoutingMessageHandler_JCalls_free) { @@ -34755,15 +33159,15 @@ void __attribute__((export_name("TS_MessageHandler_set_route_handler"))) TS_Mes 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*)(((uintptr_t)chan_handler_arg) & ~1); +uint64_t __attribute__((export_name("TS_MessageHandler_new"))) TS_MessageHandler_new(uint64_t chan_handler_arg, uint64_t route_handler_arg) { + void* chan_handler_arg_ptr = untag_ptr(chan_handler_arg); CHECK_ACCESS(chan_handler_arg_ptr); LDKChannelMessageHandler chan_handler_arg_conv = *(LDKChannelMessageHandler*)(chan_handler_arg_ptr); if (chan_handler_arg_conv.free == LDKChannelMessageHandler_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKChannelMessageHandler_JCalls_cloned(&chan_handler_arg_conv); } - void* route_handler_arg_ptr = (void*)(((uintptr_t)route_handler_arg) & ~1); + void* route_handler_arg_ptr = untag_ptr(route_handler_arg); CHECK_ACCESS(route_handler_arg_ptr); LDKRoutingMessageHandler route_handler_arg_conv = *(LDKRoutingMessageHandler*)(route_handler_arg_ptr); if (route_handler_arg_conv.free == LDKRoutingMessageHandler_JCalls_free) { @@ -34771,138 +33175,123 @@ uint32_t __attribute__((export_name("TS_MessageHandler_new"))) TS_MessageHandle LDKRoutingMessageHandler_JCalls_cloned(&route_handler_arg_conv); } LDKMessageHandler ret_var = MessageHandler_new(chan_handler_arg_conv, route_handler_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t SocketDescriptor_clone_ptr(LDKSocketDescriptor *NONNULL_PTR arg) { +static inline uint64_t SocketDescriptor_clone_ptr(LDKSocketDescriptor *NONNULL_PTR arg) { LDKSocketDescriptor* ret_ret = MALLOC(sizeof(LDKSocketDescriptor), "LDKSocketDescriptor"); *ret_ret = SocketDescriptor_clone(arg); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_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); } +int64_t __attribute__((export_name("TS_SocketDescriptor_clone_ptr"))) TS_SocketDescriptor_clone_ptr(uint64_t arg) { + void* arg_ptr = untag_ptr(arg); + if (ptr_is_owned(arg)) { CHECK_ACCESS(arg_ptr); } LDKSocketDescriptor* arg_conv = (LDKSocketDescriptor*)arg_ptr; - uint32_t ret_conv = SocketDescriptor_clone_ptr(arg_conv); + int64_t ret_conv = SocketDescriptor_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_SocketDescriptor_clone"))) TS_SocketDescriptor_clone(uint32_t orig) { - void* orig_ptr = (void*)(((uintptr_t)orig) & ~1); - if (!(orig & 1)) { CHECK_ACCESS(orig_ptr); } +uint64_t __attribute__((export_name("TS_SocketDescriptor_clone"))) TS_SocketDescriptor_clone(uint64_t orig) { + void* orig_ptr = untag_ptr(orig); + if (ptr_is_owned(orig)) { CHECK_ACCESS(orig_ptr); } LDKSocketDescriptor* orig_conv = (LDKSocketDescriptor*)orig_ptr; LDKSocketDescriptor* ret_ret = MALLOC(sizeof(LDKSocketDescriptor), "LDKSocketDescriptor"); *ret_ret = SocketDescriptor_clone(orig_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_SocketDescriptor_free"))) TS_SocketDescriptor_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKSocketDescriptor this_ptr_conv = *(LDKSocketDescriptor*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); SocketDescriptor_free(this_ptr_conv); } -void __attribute__((export_name("TS_PeerHandleError_free"))) TS_PeerHandleError_free(uint32_t this_obj) { +void __attribute__((export_name("TS_PeerHandleError_free"))) TS_PeerHandleError_free(uint64_t this_obj) { LDKPeerHandleError this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); PeerHandleError_free(this_obj_conv); } -jboolean __attribute__((export_name("TS_PeerHandleError_get_no_connection_possible"))) TS_PeerHandleError_get_no_connection_possible(uint32_t this_ptr) { +jboolean __attribute__((export_name("TS_PeerHandleError_get_no_connection_possible"))) TS_PeerHandleError_get_no_connection_possible(uint64_t this_ptr) { LDKPeerHandleError this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; jboolean ret_conv = PeerHandleError_get_no_connection_possible(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_PeerHandleError_set_no_connection_possible"))) TS_PeerHandleError_set_no_connection_possible(uint32_t this_ptr, jboolean val) { +void __attribute__((export_name("TS_PeerHandleError_set_no_connection_possible"))) TS_PeerHandleError_set_no_connection_possible(uint64_t this_ptr, jboolean val) { LDKPeerHandleError this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; PeerHandleError_set_no_connection_possible(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_PeerHandleError_new"))) TS_PeerHandleError_new(jboolean no_connection_possible_arg) { +uint64_t __attribute__((export_name("TS_PeerHandleError_new"))) TS_PeerHandleError_new(jboolean no_connection_possible_arg) { LDKPeerHandleError ret_var = PeerHandleError_new(no_connection_possible_arg); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t PeerHandleError_clone_ptr(LDKPeerHandleError *NONNULL_PTR arg) { +static inline uint64_t PeerHandleError_clone_ptr(LDKPeerHandleError *NONNULL_PTR arg) { LDKPeerHandleError ret_var = PeerHandleError_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_PeerHandleError_clone_ptr"))) TS_PeerHandleError_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_PeerHandleError_clone_ptr"))) TS_PeerHandleError_clone_ptr(uint64_t arg) { LDKPeerHandleError arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = PeerHandleError_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = PeerHandleError_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_PeerHandleError_clone"))) TS_PeerHandleError_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_PeerHandleError_clone"))) TS_PeerHandleError_clone(uint64_t orig) { LDKPeerHandleError orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKPeerHandleError ret_var = PeerHandleError_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_PeerManager_free"))) TS_PeerManager_free(uint32_t this_obj) { +void __attribute__((export_name("TS_PeerManager_free"))) TS_PeerManager_free(uint64_t this_obj) { LDKPeerManager this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); PeerManager_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_PeerManager_new"))) TS_PeerManager_new(uint32_t message_handler, int8_tArray our_node_secret, int8_tArray ephemeral_random_data, uint32_t logger, uint32_t custom_message_handler) { +uint64_t __attribute__((export_name("TS_PeerManager_new"))) TS_PeerManager_new(uint64_t message_handler, int8_tArray our_node_secret, int8_tArray ephemeral_random_data, uint64_t logger, uint64_t custom_message_handler) { LDKMessageHandler message_handler_conv; - message_handler_conv.inner = (void*)(message_handler & (~1)); - message_handler_conv.is_owned = (message_handler & 1) || (message_handler == 0); + message_handler_conv.inner = untag_ptr(message_handler); + message_handler_conv.is_owned = ptr_is_owned(message_handler); CHECK_INNER_FIELD_ACCESS_OR_NULL(message_handler_conv); // 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); FREE(our_node_secret); @@ -34910,14 +33299,14 @@ uint32_t __attribute__((export_name("TS_PeerManager_new"))) TS_PeerManager_new( CHECK(ephemeral_random_data->arr_len == 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*)(((uintptr_t)logger) & ~1); + void* logger_ptr = untag_ptr(logger); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); if (logger_conv.free == LDKLogger_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKLogger_JCalls_cloned(&logger_conv); } - void* custom_message_handler_ptr = (void*)(((uintptr_t)custom_message_handler) & ~1); + void* custom_message_handler_ptr = untag_ptr(custom_message_handler); CHECK_ACCESS(custom_message_handler_ptr); LDKCustomMessageHandler custom_message_handler_conv = *(LDKCustomMessageHandler*)(custom_message_handler_ptr); if (custom_message_handler_conv.free == LDKCustomMessageHandler_JCalls_free) { @@ -34925,22 +33314,18 @@ uint32_t __attribute__((export_name("TS_PeerManager_new"))) TS_PeerManager_new( LDKCustomMessageHandler_JCalls_cloned(&custom_message_handler_conv); } LDKPeerManager ret_var = PeerManager_new(message_handler_conv, our_node_secret_ref, ephemeral_random_data_ref, logger_conv, custom_message_handler_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -ptrArray __attribute__((export_name("TS_PeerManager_get_peer_node_ids"))) TS_PeerManager_get_peer_node_ids(uint32_t this_arg) { +ptrArray __attribute__((export_name("TS_PeerManager_get_peer_node_ids"))) TS_PeerManager_get_peer_node_ids(uint64_t this_arg) { LDKPeerManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCVec_PublicKeyZ ret_var = PeerManager_get_peer_node_ids(&this_arg_conv); ptrArray ret_arr = NULL; ret_arr = init_ptrArray(ret_var.datalen, __LINE__); @@ -34955,69 +33340,73 @@ ptrArray __attribute__((export_name("TS_PeerManager_get_peer_node_ids"))) TS_Pe return ret_arr; } -uint32_t __attribute__((export_name("TS_PeerManager_new_outbound_connection"))) TS_PeerManager_new_outbound_connection(uint32_t this_arg, int8_tArray their_node_id, uint32_t descriptor, uint32_t remote_network_address) { +uint64_t __attribute__((export_name("TS_PeerManager_new_outbound_connection"))) TS_PeerManager_new_outbound_connection(uint64_t this_arg, int8_tArray their_node_id, uint64_t descriptor, uint64_t remote_network_address) { LDKPeerManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKPublicKey their_node_id_ref; CHECK(their_node_id->arr_len == 33); memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); FREE(their_node_id); - void* descriptor_ptr = (void*)(((uintptr_t)descriptor) & ~1); + void* descriptor_ptr = untag_ptr(descriptor); CHECK_ACCESS(descriptor_ptr); LDKSocketDescriptor descriptor_conv = *(LDKSocketDescriptor*)(descriptor_ptr); if (descriptor_conv.free == LDKSocketDescriptor_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKSocketDescriptor_JCalls_cloned(&descriptor_conv); } - void* remote_network_address_ptr = (void*)(((uintptr_t)remote_network_address) & ~1); + void* remote_network_address_ptr = untag_ptr(remote_network_address); CHECK_ACCESS(remote_network_address_ptr); LDKCOption_NetAddressZ remote_network_address_conv = *(LDKCOption_NetAddressZ*)(remote_network_address_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, remote_network_address_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_PeerManager_new_inbound_connection"))) TS_PeerManager_new_inbound_connection(uint32_t this_arg, uint32_t descriptor, uint32_t remote_network_address) { +uint64_t __attribute__((export_name("TS_PeerManager_new_inbound_connection"))) TS_PeerManager_new_inbound_connection(uint64_t this_arg, uint64_t descriptor, uint64_t remote_network_address) { LDKPeerManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); - void* descriptor_ptr = (void*)(((uintptr_t)descriptor) & ~1); + this_arg_conv.is_owned = false; + void* descriptor_ptr = untag_ptr(descriptor); CHECK_ACCESS(descriptor_ptr); LDKSocketDescriptor descriptor_conv = *(LDKSocketDescriptor*)(descriptor_ptr); if (descriptor_conv.free == LDKSocketDescriptor_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKSocketDescriptor_JCalls_cloned(&descriptor_conv); } - void* remote_network_address_ptr = (void*)(((uintptr_t)remote_network_address) & ~1); + void* remote_network_address_ptr = untag_ptr(remote_network_address); CHECK_ACCESS(remote_network_address_ptr); LDKCOption_NetAddressZ remote_network_address_conv = *(LDKCOption_NetAddressZ*)(remote_network_address_ptr); LDKCResult_NonePeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePeerHandleErrorZ), "LDKCResult_NonePeerHandleErrorZ"); *ret_conv = PeerManager_new_inbound_connection(&this_arg_conv, descriptor_conv, remote_network_address_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_PeerManager_write_buffer_space_avail"))) TS_PeerManager_write_buffer_space_avail(uint32_t this_arg, uint32_t descriptor) { +uint64_t __attribute__((export_name("TS_PeerManager_write_buffer_space_avail"))) TS_PeerManager_write_buffer_space_avail(uint64_t this_arg, uint64_t descriptor) { LDKPeerManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); - void* descriptor_ptr = (void*)(((uintptr_t)descriptor) & ~1); - if (!(descriptor & 1)) { CHECK_ACCESS(descriptor_ptr); } + this_arg_conv.is_owned = false; + void* descriptor_ptr = untag_ptr(descriptor); + if (ptr_is_owned(descriptor)) { 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_PeerManager_read_event"))) TS_PeerManager_read_event(uint32_t this_arg, uint32_t peer_descriptor, int8_tArray data) { +uint64_t __attribute__((export_name("TS_PeerManager_read_event"))) TS_PeerManager_read_event(uint64_t this_arg, uint64_t peer_descriptor, int8_tArray data) { LDKPeerManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); - void* peer_descriptor_ptr = (void*)(((uintptr_t)peer_descriptor) & ~1); - if (!(peer_descriptor & 1)) { CHECK_ACCESS(peer_descriptor_ptr); } + this_arg_conv.is_owned = false; + void* peer_descriptor_ptr = untag_ptr(peer_descriptor); + if (ptr_is_owned(peer_descriptor)) { CHECK_ACCESS(peer_descriptor_ptr); } LDKSocketDescriptor* peer_descriptor_conv = (LDKSocketDescriptor*)peer_descriptor_ptr; LDKu8slice data_ref; data_ref.datalen = data->arr_len; @@ -35025,52 +33414,57 @@ uint32_t __attribute__((export_name("TS_PeerManager_read_event"))) TS_PeerManag LDKCResult_boolPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolPeerHandleErrorZ), "LDKCResult_boolPeerHandleErrorZ"); *ret_conv = PeerManager_read_event(&this_arg_conv, peer_descriptor_conv, data_ref); FREE(data); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_PeerManager_process_events"))) TS_PeerManager_process_events(uint32_t this_arg) { +void __attribute__((export_name("TS_PeerManager_process_events"))) TS_PeerManager_process_events(uint64_t this_arg) { LDKPeerManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; PeerManager_process_events(&this_arg_conv); } -void __attribute__((export_name("TS_PeerManager_socket_disconnected"))) TS_PeerManager_socket_disconnected(uint32_t this_arg, uint32_t descriptor) { +void __attribute__((export_name("TS_PeerManager_socket_disconnected"))) TS_PeerManager_socket_disconnected(uint64_t this_arg, uint64_t descriptor) { LDKPeerManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); - void* descriptor_ptr = (void*)(((uintptr_t)descriptor) & ~1); - if (!(descriptor & 1)) { CHECK_ACCESS(descriptor_ptr); } + this_arg_conv.is_owned = false; + void* descriptor_ptr = untag_ptr(descriptor); + if (ptr_is_owned(descriptor)) { CHECK_ACCESS(descriptor_ptr); } LDKSocketDescriptor* descriptor_conv = (LDKSocketDescriptor*)descriptor_ptr; PeerManager_socket_disconnected(&this_arg_conv, descriptor_conv); } -void __attribute__((export_name("TS_PeerManager_disconnect_by_node_id"))) TS_PeerManager_disconnect_by_node_id(uint32_t this_arg, int8_tArray node_id, jboolean no_connection_possible) { +void __attribute__((export_name("TS_PeerManager_disconnect_by_node_id"))) TS_PeerManager_disconnect_by_node_id(uint64_t this_arg, int8_tArray node_id, jboolean no_connection_possible) { LDKPeerManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 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); } -void __attribute__((export_name("TS_PeerManager_disconnect_all_peers"))) TS_PeerManager_disconnect_all_peers(uint32_t this_arg) { +void __attribute__((export_name("TS_PeerManager_disconnect_all_peers"))) TS_PeerManager_disconnect_all_peers(uint64_t this_arg) { LDKPeerManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; PeerManager_disconnect_all_peers(&this_arg_conv); } -void __attribute__((export_name("TS_PeerManager_timer_tick_occurred"))) TS_PeerManager_timer_tick_occurred(uint32_t this_arg) { +void __attribute__((export_name("TS_PeerManager_timer_tick_occurred"))) TS_PeerManager_timer_tick_occurred(uint64_t this_arg) { LDKPeerManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; PeerManager_timer_tick_occurred(&this_arg_conv); } @@ -35094,7 +33488,7 @@ int8_tArray __attribute__((export_name("TS_build_commitment_secret"))) TS_build return ret_arr; } -int8_tArray __attribute__((export_name("TS_build_closing_transaction"))) TS_build_closing_transaction(int64_t to_holder_value_sat, int64_t to_counterparty_value_sat, int8_tArray to_holder_script, int8_tArray to_counterparty_script, uint32_t funding_outpoint) { +int8_tArray __attribute__((export_name("TS_build_closing_transaction"))) TS_build_closing_transaction(int64_t to_holder_value_sat, int64_t to_counterparty_value_sat, int8_tArray to_holder_script, int8_tArray to_counterparty_script, uint64_t funding_outpoint) { 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"); @@ -35104,8 +33498,8 @@ int8_tArray __attribute__((export_name("TS_build_closing_transaction"))) TS_bui 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); 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); + funding_outpoint_conv.inner = untag_ptr(funding_outpoint); + funding_outpoint_conv.is_owned = ptr_is_owned(funding_outpoint); 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); @@ -35115,102 +33509,93 @@ int8_tArray __attribute__((export_name("TS_build_closing_transaction"))) TS_bui return ret_arr; } -void __attribute__((export_name("TS_CounterpartyCommitmentSecrets_free"))) TS_CounterpartyCommitmentSecrets_free(uint32_t this_obj) { +void __attribute__((export_name("TS_CounterpartyCommitmentSecrets_free"))) TS_CounterpartyCommitmentSecrets_free(uint64_t this_obj) { LDKCounterpartyCommitmentSecrets this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); CounterpartyCommitmentSecrets_free(this_obj_conv); } -static inline uintptr_t CounterpartyCommitmentSecrets_clone_ptr(LDKCounterpartyCommitmentSecrets *NONNULL_PTR arg) { +static inline uint64_t CounterpartyCommitmentSecrets_clone_ptr(LDKCounterpartyCommitmentSecrets *NONNULL_PTR arg) { LDKCounterpartyCommitmentSecrets ret_var = CounterpartyCommitmentSecrets_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_CounterpartyCommitmentSecrets_clone_ptr"))) TS_CounterpartyCommitmentSecrets_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_CounterpartyCommitmentSecrets_clone_ptr"))) TS_CounterpartyCommitmentSecrets_clone_ptr(uint64_t arg) { LDKCounterpartyCommitmentSecrets arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = CounterpartyCommitmentSecrets_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = CounterpartyCommitmentSecrets_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CounterpartyCommitmentSecrets_clone"))) TS_CounterpartyCommitmentSecrets_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_CounterpartyCommitmentSecrets_clone"))) TS_CounterpartyCommitmentSecrets_clone(uint64_t orig) { LDKCounterpartyCommitmentSecrets orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKCounterpartyCommitmentSecrets ret_var = CounterpartyCommitmentSecrets_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_CounterpartyCommitmentSecrets_new"))) TS_CounterpartyCommitmentSecrets_new() { +uint64_t __attribute__((export_name("TS_CounterpartyCommitmentSecrets_new"))) TS_CounterpartyCommitmentSecrets_new() { LDKCounterpartyCommitmentSecrets ret_var = CounterpartyCommitmentSecrets_new(); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int64_t __attribute__((export_name("TS_CounterpartyCommitmentSecrets_get_min_seen_secret"))) TS_CounterpartyCommitmentSecrets_get_min_seen_secret(uint32_t this_arg) { +int64_t __attribute__((export_name("TS_CounterpartyCommitmentSecrets_get_min_seen_secret"))) TS_CounterpartyCommitmentSecrets_get_min_seen_secret(uint64_t this_arg) { LDKCounterpartyCommitmentSecrets this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int64_t ret_conv = CounterpartyCommitmentSecrets_get_min_seen_secret(&this_arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CounterpartyCommitmentSecrets_provide_secret"))) TS_CounterpartyCommitmentSecrets_provide_secret(uint32_t this_arg, int64_t idx, int8_tArray secret) { +uint64_t __attribute__((export_name("TS_CounterpartyCommitmentSecrets_provide_secret"))) TS_CounterpartyCommitmentSecrets_provide_secret(uint64_t this_arg, int64_t idx, int8_tArray secret) { LDKCounterpartyCommitmentSecrets this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKThirtyTwoBytes secret_ref; CHECK(secret->arr_len == 32); memcpy(secret_ref.data, secret->elems, 32); FREE(secret); LDKCResult_NoneNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneNoneZ), "LDKCResult_NoneNoneZ"); *ret_conv = CounterpartyCommitmentSecrets_provide_secret(&this_arg_conv, idx, secret_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_CounterpartyCommitmentSecrets_get_secret"))) TS_CounterpartyCommitmentSecrets_get_secret(uint32_t this_arg, int64_t idx) { +int8_tArray __attribute__((export_name("TS_CounterpartyCommitmentSecrets_get_secret"))) TS_CounterpartyCommitmentSecrets_get_secret(uint64_t this_arg, int64_t idx) { LDKCounterpartyCommitmentSecrets this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, CounterpartyCommitmentSecrets_get_secret(&this_arg_conv, idx).data, 32); return ret_arr; } -int8_tArray __attribute__((export_name("TS_CounterpartyCommitmentSecrets_write"))) TS_CounterpartyCommitmentSecrets_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_CounterpartyCommitmentSecrets_write"))) TS_CounterpartyCommitmentSecrets_write(uint64_t obj) { LDKCounterpartyCommitmentSecrets obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = CounterpartyCommitmentSecrets_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -35218,17 +33603,17 @@ int8_tArray __attribute__((export_name("TS_CounterpartyCommitmentSecrets_write" return ret_arr; } -uint32_t __attribute__((export_name("TS_CounterpartyCommitmentSecrets_read"))) TS_CounterpartyCommitmentSecrets_read(int8_tArray ser) { +uint64_t __attribute__((export_name("TS_CounterpartyCommitmentSecrets_read"))) TS_CounterpartyCommitmentSecrets_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; ser_ref.data = ser->elems; LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ), "LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ"); *ret_conv = CounterpartyCommitmentSecrets_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_derive_private_key"))) TS_derive_private_key(int8_tArray per_commitment_point, int8_tArray base_secret) { +uint64_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); FREE(per_commitment_point); @@ -35238,10 +33623,10 @@ uint32_t __attribute__((export_name("TS_derive_private_key"))) TS_derive_privat 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_derive_public_key"))) TS_derive_public_key(int8_tArray per_commitment_point, int8_tArray base_point) { +uint64_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); FREE(per_commitment_point); @@ -35250,10 +33635,10 @@ uint32_t __attribute__((export_name("TS_derive_public_key"))) TS_derive_public_ 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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) { +uint64_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); FREE(per_commitment_secret); @@ -35264,10 +33649,10 @@ uint32_t __attribute__((export_name("TS_derive_private_revocation_key"))) TS_de 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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) { +uint64_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); FREE(per_commitment_point); @@ -35276,123 +33661,133 @@ uint32_t __attribute__((export_name("TS_derive_public_revocation_key"))) TS_der 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_TxCreationKeys_free"))) TS_TxCreationKeys_free(uint32_t this_obj) { +void __attribute__((export_name("TS_TxCreationKeys_free"))) TS_TxCreationKeys_free(uint64_t this_obj) { LDKTxCreationKeys this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); TxCreationKeys_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_TxCreationKeys_get_per_commitment_point"))) TS_TxCreationKeys_get_per_commitment_point(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_TxCreationKeys_get_per_commitment_point"))) TS_TxCreationKeys_get_per_commitment_point(uint64_t this_ptr) { LDKTxCreationKeys this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_TxCreationKeys_set_per_commitment_point"))) TS_TxCreationKeys_set_per_commitment_point(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_TxCreationKeys_set_per_commitment_point"))) TS_TxCreationKeys_set_per_commitment_point(uint64_t this_ptr, int8_tArray val) { LDKTxCreationKeys this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); TxCreationKeys_set_per_commitment_point(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_TxCreationKeys_get_revocation_key"))) TS_TxCreationKeys_get_revocation_key(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_TxCreationKeys_get_revocation_key"))) TS_TxCreationKeys_get_revocation_key(uint64_t this_ptr) { LDKTxCreationKeys this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_TxCreationKeys_set_revocation_key"))) TS_TxCreationKeys_set_revocation_key(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_TxCreationKeys_set_revocation_key"))) TS_TxCreationKeys_set_revocation_key(uint64_t this_ptr, int8_tArray val) { LDKTxCreationKeys this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); TxCreationKeys_set_revocation_key(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_TxCreationKeys_get_broadcaster_htlc_key"))) TS_TxCreationKeys_get_broadcaster_htlc_key(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_TxCreationKeys_get_broadcaster_htlc_key"))) TS_TxCreationKeys_get_broadcaster_htlc_key(uint64_t this_ptr) { LDKTxCreationKeys this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_TxCreationKeys_set_broadcaster_htlc_key"))) TS_TxCreationKeys_set_broadcaster_htlc_key(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_TxCreationKeys_set_broadcaster_htlc_key"))) TS_TxCreationKeys_set_broadcaster_htlc_key(uint64_t this_ptr, int8_tArray val) { LDKTxCreationKeys this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); TxCreationKeys_set_broadcaster_htlc_key(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_TxCreationKeys_get_countersignatory_htlc_key"))) TS_TxCreationKeys_get_countersignatory_htlc_key(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_TxCreationKeys_get_countersignatory_htlc_key"))) TS_TxCreationKeys_get_countersignatory_htlc_key(uint64_t this_ptr) { LDKTxCreationKeys this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_TxCreationKeys_set_countersignatory_htlc_key"))) TS_TxCreationKeys_set_countersignatory_htlc_key(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_TxCreationKeys_set_countersignatory_htlc_key"))) TS_TxCreationKeys_set_countersignatory_htlc_key(uint64_t this_ptr, int8_tArray val) { LDKTxCreationKeys this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); TxCreationKeys_set_countersignatory_htlc_key(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_TxCreationKeys_get_broadcaster_delayed_payment_key"))) TS_TxCreationKeys_get_broadcaster_delayed_payment_key(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_TxCreationKeys_get_broadcaster_delayed_payment_key"))) TS_TxCreationKeys_get_broadcaster_delayed_payment_key(uint64_t this_ptr) { LDKTxCreationKeys this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_TxCreationKeys_set_broadcaster_delayed_payment_key"))) TS_TxCreationKeys_set_broadcaster_delayed_payment_key(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_TxCreationKeys_set_broadcaster_delayed_payment_key"))) TS_TxCreationKeys_set_broadcaster_delayed_payment_key(uint64_t this_ptr, int8_tArray val) { LDKTxCreationKeys this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 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) { +uint64_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); FREE(per_commitment_point_arg); @@ -35409,60 +33804,48 @@ uint32_t __attribute__((export_name("TS_TxCreationKeys_new"))) TS_TxCreationKey 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); 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t TxCreationKeys_clone_ptr(LDKTxCreationKeys *NONNULL_PTR arg) { +static inline uint64_t TxCreationKeys_clone_ptr(LDKTxCreationKeys *NONNULL_PTR arg) { LDKTxCreationKeys ret_var = TxCreationKeys_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_TxCreationKeys_clone_ptr"))) TS_TxCreationKeys_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_TxCreationKeys_clone_ptr"))) TS_TxCreationKeys_clone_ptr(uint64_t arg) { LDKTxCreationKeys arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = TxCreationKeys_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = TxCreationKeys_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_TxCreationKeys_clone"))) TS_TxCreationKeys_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_TxCreationKeys_clone"))) TS_TxCreationKeys_clone(uint64_t orig) { LDKTxCreationKeys orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKTxCreationKeys ret_var = TxCreationKeys_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_TxCreationKeys_write"))) TS_TxCreationKeys_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_TxCreationKeys_write"))) TS_TxCreationKeys_write(uint64_t obj) { LDKTxCreationKeys obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = TxCreationKeys_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -35470,130 +33853,140 @@ int8_tArray __attribute__((export_name("TS_TxCreationKeys_write"))) TS_TxCreati return ret_arr; } -uint32_t __attribute__((export_name("TS_TxCreationKeys_read"))) TS_TxCreationKeys_read(int8_tArray ser) { +uint64_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; LDKCResult_TxCreationKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysDecodeErrorZ), "LDKCResult_TxCreationKeysDecodeErrorZ"); *ret_conv = TxCreationKeys_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_ChannelPublicKeys_free"))) TS_ChannelPublicKeys_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChannelPublicKeys_free"))) TS_ChannelPublicKeys_free(uint64_t this_obj) { LDKChannelPublicKeys this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChannelPublicKeys_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_ChannelPublicKeys_get_funding_pubkey"))) TS_ChannelPublicKeys_get_funding_pubkey(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_ChannelPublicKeys_get_funding_pubkey"))) TS_ChannelPublicKeys_get_funding_pubkey(uint64_t this_ptr) { LDKChannelPublicKeys this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_ChannelPublicKeys_set_funding_pubkey"))) TS_ChannelPublicKeys_set_funding_pubkey(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_ChannelPublicKeys_set_funding_pubkey"))) TS_ChannelPublicKeys_set_funding_pubkey(uint64_t this_ptr, int8_tArray val) { LDKChannelPublicKeys this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); ChannelPublicKeys_set_funding_pubkey(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_ChannelPublicKeys_get_revocation_basepoint"))) TS_ChannelPublicKeys_get_revocation_basepoint(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_ChannelPublicKeys_get_revocation_basepoint"))) TS_ChannelPublicKeys_get_revocation_basepoint(uint64_t this_ptr) { LDKChannelPublicKeys this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_ChannelPublicKeys_set_revocation_basepoint"))) TS_ChannelPublicKeys_set_revocation_basepoint(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_ChannelPublicKeys_set_revocation_basepoint"))) TS_ChannelPublicKeys_set_revocation_basepoint(uint64_t this_ptr, int8_tArray val) { LDKChannelPublicKeys this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); ChannelPublicKeys_set_revocation_basepoint(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_ChannelPublicKeys_get_payment_point"))) TS_ChannelPublicKeys_get_payment_point(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_ChannelPublicKeys_get_payment_point"))) TS_ChannelPublicKeys_get_payment_point(uint64_t this_ptr) { LDKChannelPublicKeys this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_ChannelPublicKeys_set_payment_point"))) TS_ChannelPublicKeys_set_payment_point(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_ChannelPublicKeys_set_payment_point"))) TS_ChannelPublicKeys_set_payment_point(uint64_t this_ptr, int8_tArray val) { LDKChannelPublicKeys this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); ChannelPublicKeys_set_payment_point(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_ChannelPublicKeys_get_delayed_payment_basepoint"))) TS_ChannelPublicKeys_get_delayed_payment_basepoint(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_ChannelPublicKeys_get_delayed_payment_basepoint"))) TS_ChannelPublicKeys_get_delayed_payment_basepoint(uint64_t this_ptr) { LDKChannelPublicKeys this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_ChannelPublicKeys_set_delayed_payment_basepoint"))) TS_ChannelPublicKeys_set_delayed_payment_basepoint(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_ChannelPublicKeys_set_delayed_payment_basepoint"))) TS_ChannelPublicKeys_set_delayed_payment_basepoint(uint64_t this_ptr, int8_tArray val) { LDKChannelPublicKeys this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); ChannelPublicKeys_set_delayed_payment_basepoint(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_ChannelPublicKeys_get_htlc_basepoint"))) TS_ChannelPublicKeys_get_htlc_basepoint(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_ChannelPublicKeys_get_htlc_basepoint"))) TS_ChannelPublicKeys_get_htlc_basepoint(uint64_t this_ptr) { LDKChannelPublicKeys this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_ChannelPublicKeys_set_htlc_basepoint"))) TS_ChannelPublicKeys_set_htlc_basepoint(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_ChannelPublicKeys_set_htlc_basepoint"))) TS_ChannelPublicKeys_set_htlc_basepoint(uint64_t this_ptr, int8_tArray val) { LDKChannelPublicKeys this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 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) { +uint64_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); FREE(funding_pubkey_arg); @@ -35610,60 +34003,48 @@ uint32_t __attribute__((export_name("TS_ChannelPublicKeys_new"))) TS_ChannelPub CHECK(htlc_basepoint_arg->arr_len == 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t ChannelPublicKeys_clone_ptr(LDKChannelPublicKeys *NONNULL_PTR arg) { +static inline uint64_t ChannelPublicKeys_clone_ptr(LDKChannelPublicKeys *NONNULL_PTR arg) { LDKChannelPublicKeys ret_var = ChannelPublicKeys_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelPublicKeys_clone_ptr"))) TS_ChannelPublicKeys_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ChannelPublicKeys_clone_ptr"))) TS_ChannelPublicKeys_clone_ptr(uint64_t arg) { LDKChannelPublicKeys arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ChannelPublicKeys_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ChannelPublicKeys_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelPublicKeys_clone"))) TS_ChannelPublicKeys_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ChannelPublicKeys_clone"))) TS_ChannelPublicKeys_clone(uint64_t orig) { LDKChannelPublicKeys orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKChannelPublicKeys ret_var = ChannelPublicKeys_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_ChannelPublicKeys_write"))) TS_ChannelPublicKeys_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ChannelPublicKeys_write"))) TS_ChannelPublicKeys_write(uint64_t obj) { LDKChannelPublicKeys obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ChannelPublicKeys_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -35671,17 +34052,17 @@ int8_tArray __attribute__((export_name("TS_ChannelPublicKeys_write"))) TS_Chann return ret_arr; } -uint32_t __attribute__((export_name("TS_ChannelPublicKeys_read"))) TS_ChannelPublicKeys_read(int8_tArray ser) { +uint64_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; LDKCResult_ChannelPublicKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelPublicKeysDecodeErrorZ), "LDKCResult_ChannelPublicKeysDecodeErrorZ"); *ret_conv = ChannelPublicKeys_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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) { +uint64_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); FREE(per_commitment_point); @@ -35699,24 +34080,26 @@ uint32_t __attribute__((export_name("TS_TxCreationKeys_derive_new"))) TS_TxCrea 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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) { +uint64_t __attribute__((export_name("TS_TxCreationKeys_from_channel_static_keys"))) TS_TxCreationKeys_from_channel_static_keys(int8_tArray per_commitment_point, uint64_t broadcaster_keys, uint64_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); FREE(per_commitment_point); LDKChannelPublicKeys broadcaster_keys_conv; - broadcaster_keys_conv.inner = (void*)(broadcaster_keys & (~1)); - broadcaster_keys_conv.is_owned = false; + broadcaster_keys_conv.inner = untag_ptr(broadcaster_keys); + broadcaster_keys_conv.is_owned = ptr_is_owned(broadcaster_keys); CHECK_INNER_FIELD_ACCESS_OR_NULL(broadcaster_keys_conv); + broadcaster_keys_conv.is_owned = false; LDKChannelPublicKeys countersignatory_keys_conv; - countersignatory_keys_conv.inner = (void*)(countersignatory_keys & (~1)); - countersignatory_keys_conv.is_owned = false; + countersignatory_keys_conv.inner = untag_ptr(countersignatory_keys); + countersignatory_keys_conv.is_owned = ptr_is_owned(countersignatory_keys); CHECK_INNER_FIELD_ACCESS_OR_NULL(countersignatory_keys_conv); + countersignatory_keys_conv.is_owned = false; 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } 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) { @@ -35733,172 +34116,170 @@ int8_tArray __attribute__((export_name("TS_get_revokeable_redeemscript"))) TS_g return ret_arr; } -void __attribute__((export_name("TS_HTLCOutputInCommitment_free"))) TS_HTLCOutputInCommitment_free(uint32_t this_obj) { +void __attribute__((export_name("TS_HTLCOutputInCommitment_free"))) TS_HTLCOutputInCommitment_free(uint64_t this_obj) { LDKHTLCOutputInCommitment this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); HTLCOutputInCommitment_free(this_obj_conv); } -jboolean __attribute__((export_name("TS_HTLCOutputInCommitment_get_offered"))) TS_HTLCOutputInCommitment_get_offered(uint32_t this_ptr) { +jboolean __attribute__((export_name("TS_HTLCOutputInCommitment_get_offered"))) TS_HTLCOutputInCommitment_get_offered(uint64_t this_ptr) { LDKHTLCOutputInCommitment this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; jboolean ret_conv = HTLCOutputInCommitment_get_offered(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_HTLCOutputInCommitment_set_offered"))) TS_HTLCOutputInCommitment_set_offered(uint32_t this_ptr, jboolean val) { +void __attribute__((export_name("TS_HTLCOutputInCommitment_set_offered"))) TS_HTLCOutputInCommitment_set_offered(uint64_t this_ptr, jboolean val) { LDKHTLCOutputInCommitment this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; HTLCOutputInCommitment_set_offered(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_HTLCOutputInCommitment_get_amount_msat"))) TS_HTLCOutputInCommitment_get_amount_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_HTLCOutputInCommitment_get_amount_msat"))) TS_HTLCOutputInCommitment_get_amount_msat(uint64_t this_ptr) { LDKHTLCOutputInCommitment this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = HTLCOutputInCommitment_get_amount_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_HTLCOutputInCommitment_set_amount_msat"))) TS_HTLCOutputInCommitment_set_amount_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_HTLCOutputInCommitment_set_amount_msat"))) TS_HTLCOutputInCommitment_set_amount_msat(uint64_t this_ptr, int64_t val) { LDKHTLCOutputInCommitment this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; HTLCOutputInCommitment_set_amount_msat(&this_ptr_conv, val); } -int32_t __attribute__((export_name("TS_HTLCOutputInCommitment_get_cltv_expiry"))) TS_HTLCOutputInCommitment_get_cltv_expiry(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_HTLCOutputInCommitment_get_cltv_expiry"))) TS_HTLCOutputInCommitment_get_cltv_expiry(uint64_t this_ptr) { LDKHTLCOutputInCommitment this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = HTLCOutputInCommitment_get_cltv_expiry(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_HTLCOutputInCommitment_set_cltv_expiry"))) TS_HTLCOutputInCommitment_set_cltv_expiry(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_HTLCOutputInCommitment_set_cltv_expiry"))) TS_HTLCOutputInCommitment_set_cltv_expiry(uint64_t this_ptr, int32_t val) { LDKHTLCOutputInCommitment this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; HTLCOutputInCommitment_set_cltv_expiry(&this_ptr_conv, val); } -int8_tArray __attribute__((export_name("TS_HTLCOutputInCommitment_get_payment_hash"))) TS_HTLCOutputInCommitment_get_payment_hash(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_HTLCOutputInCommitment_get_payment_hash"))) TS_HTLCOutputInCommitment_get_payment_hash(uint64_t this_ptr) { LDKHTLCOutputInCommitment this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *HTLCOutputInCommitment_get_payment_hash(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_HTLCOutputInCommitment_set_payment_hash"))) TS_HTLCOutputInCommitment_set_payment_hash(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_HTLCOutputInCommitment_set_payment_hash"))) TS_HTLCOutputInCommitment_set_payment_hash(uint64_t this_ptr, int8_tArray val) { LDKHTLCOutputInCommitment this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); HTLCOutputInCommitment_set_payment_hash(&this_ptr_conv, val_ref); } -uint32_t __attribute__((export_name("TS_HTLCOutputInCommitment_get_transaction_output_index"))) TS_HTLCOutputInCommitment_get_transaction_output_index(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_HTLCOutputInCommitment_get_transaction_output_index"))) TS_HTLCOutputInCommitment_get_transaction_output_index(uint64_t this_ptr) { LDKHTLCOutputInCommitment this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCOption_u32Z *ret_copy = MALLOC(sizeof(LDKCOption_u32Z), "LDKCOption_u32Z"); *ret_copy = HTLCOutputInCommitment_get_transaction_output_index(&this_ptr_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_HTLCOutputInCommitment_set_transaction_output_index"))) TS_HTLCOutputInCommitment_set_transaction_output_index(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_HTLCOutputInCommitment_set_transaction_output_index"))) TS_HTLCOutputInCommitment_set_transaction_output_index(uint64_t this_ptr, uint64_t val) { LDKHTLCOutputInCommitment this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKCOption_u32Z val_conv = *(LDKCOption_u32Z*)(val_ptr); - val_conv = COption_u32Z_clone((LDKCOption_u32Z*)(((uintptr_t)val) & ~1)); + val_conv = COption_u32Z_clone((LDKCOption_u32Z*)untag_ptr(val)); 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) { +uint64_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, uint64_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); FREE(payment_hash_arg); - void* transaction_output_index_arg_ptr = (void*)(((uintptr_t)transaction_output_index_arg) & ~1); + void* transaction_output_index_arg_ptr = untag_ptr(transaction_output_index_arg); 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*)(((uintptr_t)transaction_output_index_arg) & ~1)); + transaction_output_index_arg_conv = COption_u32Z_clone((LDKCOption_u32Z*)untag_ptr(transaction_output_index_arg)); LDKHTLCOutputInCommitment ret_var = HTLCOutputInCommitment_new(offered_arg, amount_msat_arg, cltv_expiry_arg, payment_hash_arg_ref, transaction_output_index_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t HTLCOutputInCommitment_clone_ptr(LDKHTLCOutputInCommitment *NONNULL_PTR arg) { +static inline uint64_t HTLCOutputInCommitment_clone_ptr(LDKHTLCOutputInCommitment *NONNULL_PTR arg) { LDKHTLCOutputInCommitment ret_var = HTLCOutputInCommitment_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_HTLCOutputInCommitment_clone_ptr"))) TS_HTLCOutputInCommitment_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_HTLCOutputInCommitment_clone_ptr"))) TS_HTLCOutputInCommitment_clone_ptr(uint64_t arg) { LDKHTLCOutputInCommitment arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = HTLCOutputInCommitment_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = HTLCOutputInCommitment_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_HTLCOutputInCommitment_clone"))) TS_HTLCOutputInCommitment_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_HTLCOutputInCommitment_clone"))) TS_HTLCOutputInCommitment_clone(uint64_t orig) { LDKHTLCOutputInCommitment orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKHTLCOutputInCommitment ret_var = HTLCOutputInCommitment_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_HTLCOutputInCommitment_write"))) TS_HTLCOutputInCommitment_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_HTLCOutputInCommitment_write"))) TS_HTLCOutputInCommitment_write(uint64_t obj) { LDKHTLCOutputInCommitment obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = HTLCOutputInCommitment_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -35906,25 +34287,27 @@ int8_tArray __attribute__((export_name("TS_HTLCOutputInCommitment_write"))) TS_ return ret_arr; } -uint32_t __attribute__((export_name("TS_HTLCOutputInCommitment_read"))) TS_HTLCOutputInCommitment_read(int8_tArray ser) { +uint64_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; LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCOutputInCommitmentDecodeErrorZ), "LDKCResult_HTLCOutputInCommitmentDecodeErrorZ"); *ret_conv = HTLCOutputInCommitment_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_get_htlc_redeemscript"))) TS_get_htlc_redeemscript(uint32_t htlc, jboolean opt_anchors, uint32_t keys) { +int8_tArray __attribute__((export_name("TS_get_htlc_redeemscript"))) TS_get_htlc_redeemscript(uint64_t htlc, jboolean opt_anchors, uint64_t keys) { LDKHTLCOutputInCommitment htlc_conv; - htlc_conv.inner = (void*)(htlc & (~1)); - htlc_conv.is_owned = false; + htlc_conv.inner = untag_ptr(htlc); + htlc_conv.is_owned = ptr_is_owned(htlc); CHECK_INNER_FIELD_ACCESS_OR_NULL(htlc_conv); + htlc_conv.is_owned = false; LDKTxCreationKeys keys_conv; - keys_conv.inner = (void*)(keys & (~1)); - keys_conv.is_owned = false; + keys_conv.inner = untag_ptr(keys); + keys_conv.is_owned = ptr_is_owned(keys); CHECK_INNER_FIELD_ACCESS_OR_NULL(keys_conv); + keys_conv.is_owned = false; LDKCVec_u8Z ret_var = get_htlc_redeemscript(&htlc_conv, opt_anchors, &keys_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -35946,15 +34329,16 @@ int8_tArray __attribute__((export_name("TS_make_funding_redeemscript"))) TS_mak return ret_arr; } -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) { +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, uint64_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); FREE(commitment_txid); unsigned char (*commitment_txid_ref)[32] = &commitment_txid_arr; LDKHTLCOutputInCommitment htlc_conv; - htlc_conv.inner = (void*)(htlc & (~1)); - htlc_conv.is_owned = false; + htlc_conv.inner = untag_ptr(htlc); + htlc_conv.is_owned = ptr_is_owned(htlc); CHECK_INNER_FIELD_ACCESS_OR_NULL(htlc_conv); + htlc_conv.is_owned = false; 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); FREE(broadcaster_delayed_payment_key); @@ -35979,386 +34363,346 @@ int8_tArray __attribute__((export_name("TS_get_anchor_redeemscript"))) TS_get_a return ret_arr; } -void __attribute__((export_name("TS_ChannelTransactionParameters_free"))) TS_ChannelTransactionParameters_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChannelTransactionParameters_free"))) TS_ChannelTransactionParameters_free(uint64_t this_obj) { LDKChannelTransactionParameters this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChannelTransactionParameters_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_ChannelTransactionParameters_get_holder_pubkeys"))) TS_ChannelTransactionParameters_get_holder_pubkeys(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelTransactionParameters_get_holder_pubkeys"))) TS_ChannelTransactionParameters_get_holder_pubkeys(uint64_t this_ptr) { LDKChannelTransactionParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelPublicKeys ret_var = ChannelTransactionParameters_get_holder_pubkeys(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelTransactionParameters_set_holder_pubkeys"))) TS_ChannelTransactionParameters_set_holder_pubkeys(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelTransactionParameters_set_holder_pubkeys"))) TS_ChannelTransactionParameters_set_holder_pubkeys(uint64_t this_ptr, uint64_t val) { LDKChannelTransactionParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelPublicKeys val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = ChannelPublicKeys_clone(&val_conv); ChannelTransactionParameters_set_holder_pubkeys(&this_ptr_conv, val_conv); } -int16_t __attribute__((export_name("TS_ChannelTransactionParameters_get_holder_selected_contest_delay"))) TS_ChannelTransactionParameters_get_holder_selected_contest_delay(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_ChannelTransactionParameters_get_holder_selected_contest_delay"))) TS_ChannelTransactionParameters_get_holder_selected_contest_delay(uint64_t this_ptr) { LDKChannelTransactionParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = ChannelTransactionParameters_get_holder_selected_contest_delay(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelTransactionParameters_set_holder_selected_contest_delay"))) TS_ChannelTransactionParameters_set_holder_selected_contest_delay(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_ChannelTransactionParameters_set_holder_selected_contest_delay"))) TS_ChannelTransactionParameters_set_holder_selected_contest_delay(uint64_t this_ptr, int16_t val) { LDKChannelTransactionParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelTransactionParameters_set_holder_selected_contest_delay(&this_ptr_conv, val); } -jboolean __attribute__((export_name("TS_ChannelTransactionParameters_get_is_outbound_from_holder"))) TS_ChannelTransactionParameters_get_is_outbound_from_holder(uint32_t this_ptr) { +jboolean __attribute__((export_name("TS_ChannelTransactionParameters_get_is_outbound_from_holder"))) TS_ChannelTransactionParameters_get_is_outbound_from_holder(uint64_t this_ptr) { LDKChannelTransactionParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; jboolean ret_conv = ChannelTransactionParameters_get_is_outbound_from_holder(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelTransactionParameters_set_is_outbound_from_holder"))) TS_ChannelTransactionParameters_set_is_outbound_from_holder(uint32_t this_ptr, jboolean val) { +void __attribute__((export_name("TS_ChannelTransactionParameters_set_is_outbound_from_holder"))) TS_ChannelTransactionParameters_set_is_outbound_from_holder(uint64_t this_ptr, jboolean val) { LDKChannelTransactionParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelTransactionParameters_set_is_outbound_from_holder(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_ChannelTransactionParameters_get_counterparty_parameters"))) TS_ChannelTransactionParameters_get_counterparty_parameters(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelTransactionParameters_get_counterparty_parameters"))) TS_ChannelTransactionParameters_get_counterparty_parameters(uint64_t this_ptr) { LDKChannelTransactionParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCounterpartyChannelTransactionParameters ret_var = ChannelTransactionParameters_get_counterparty_parameters(&this_ptr_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelTransactionParameters_set_counterparty_parameters"))) TS_ChannelTransactionParameters_set_counterparty_parameters(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelTransactionParameters_set_counterparty_parameters"))) TS_ChannelTransactionParameters_set_counterparty_parameters(uint64_t this_ptr, uint64_t val) { LDKChannelTransactionParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCounterpartyChannelTransactionParameters val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = CounterpartyChannelTransactionParameters_clone(&val_conv); ChannelTransactionParameters_set_counterparty_parameters(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelTransactionParameters_get_funding_outpoint"))) TS_ChannelTransactionParameters_get_funding_outpoint(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelTransactionParameters_get_funding_outpoint"))) TS_ChannelTransactionParameters_get_funding_outpoint(uint64_t this_ptr) { LDKChannelTransactionParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKOutPoint ret_var = ChannelTransactionParameters_get_funding_outpoint(&this_ptr_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelTransactionParameters_set_funding_outpoint"))) TS_ChannelTransactionParameters_set_funding_outpoint(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelTransactionParameters_set_funding_outpoint"))) TS_ChannelTransactionParameters_set_funding_outpoint(uint64_t this_ptr, uint64_t val) { LDKChannelTransactionParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKOutPoint val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = OutPoint_clone(&val_conv); ChannelTransactionParameters_set_funding_outpoint(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelTransactionParameters_get_opt_anchors"))) TS_ChannelTransactionParameters_get_opt_anchors(uint32_t this_ptr) { +uint32_t __attribute__((export_name("TS_ChannelTransactionParameters_get_opt_anchors"))) TS_ChannelTransactionParameters_get_opt_anchors(uint64_t this_ptr) { LDKChannelTransactionParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; uint32_t ret_conv = LDKCOption_NoneZ_to_js(ChannelTransactionParameters_get_opt_anchors(&this_ptr_conv)); return ret_conv; } -void __attribute__((export_name("TS_ChannelTransactionParameters_set_opt_anchors"))) TS_ChannelTransactionParameters_set_opt_anchors(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelTransactionParameters_set_opt_anchors"))) TS_ChannelTransactionParameters_set_opt_anchors(uint64_t this_ptr, uint32_t val) { LDKChannelTransactionParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCOption_NoneZ val_conv = LDKCOption_NoneZ_from_js(val); ChannelTransactionParameters_set_opt_anchors(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelTransactionParameters_new"))) TS_ChannelTransactionParameters_new(uint32_t holder_pubkeys_arg, int16_t holder_selected_contest_delay_arg, jboolean is_outbound_from_holder_arg, uint32_t counterparty_parameters_arg, uint32_t funding_outpoint_arg, uint32_t opt_anchors_arg) { +uint64_t __attribute__((export_name("TS_ChannelTransactionParameters_new"))) TS_ChannelTransactionParameters_new(uint64_t holder_pubkeys_arg, int16_t holder_selected_contest_delay_arg, jboolean is_outbound_from_holder_arg, uint64_t counterparty_parameters_arg, uint64_t funding_outpoint_arg, uint32_t opt_anchors_arg) { LDKChannelPublicKeys holder_pubkeys_arg_conv; - holder_pubkeys_arg_conv.inner = (void*)(holder_pubkeys_arg & (~1)); - holder_pubkeys_arg_conv.is_owned = (holder_pubkeys_arg & 1) || (holder_pubkeys_arg == 0); + holder_pubkeys_arg_conv.inner = untag_ptr(holder_pubkeys_arg); + holder_pubkeys_arg_conv.is_owned = ptr_is_owned(holder_pubkeys_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(holder_pubkeys_arg_conv); holder_pubkeys_arg_conv = ChannelPublicKeys_clone(&holder_pubkeys_arg_conv); LDKCounterpartyChannelTransactionParameters counterparty_parameters_arg_conv; - counterparty_parameters_arg_conv.inner = (void*)(counterparty_parameters_arg & (~1)); - counterparty_parameters_arg_conv.is_owned = (counterparty_parameters_arg & 1) || (counterparty_parameters_arg == 0); + counterparty_parameters_arg_conv.inner = untag_ptr(counterparty_parameters_arg); + counterparty_parameters_arg_conv.is_owned = ptr_is_owned(counterparty_parameters_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(counterparty_parameters_arg_conv); counterparty_parameters_arg_conv = CounterpartyChannelTransactionParameters_clone(&counterparty_parameters_arg_conv); LDKOutPoint funding_outpoint_arg_conv; - funding_outpoint_arg_conv.inner = (void*)(funding_outpoint_arg & (~1)); - funding_outpoint_arg_conv.is_owned = (funding_outpoint_arg & 1) || (funding_outpoint_arg == 0); + funding_outpoint_arg_conv.inner = untag_ptr(funding_outpoint_arg); + funding_outpoint_arg_conv.is_owned = ptr_is_owned(funding_outpoint_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_outpoint_arg_conv); 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t ChannelTransactionParameters_clone_ptr(LDKChannelTransactionParameters *NONNULL_PTR arg) { +static inline uint64_t ChannelTransactionParameters_clone_ptr(LDKChannelTransactionParameters *NONNULL_PTR arg) { LDKChannelTransactionParameters ret_var = ChannelTransactionParameters_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelTransactionParameters_clone_ptr"))) TS_ChannelTransactionParameters_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ChannelTransactionParameters_clone_ptr"))) TS_ChannelTransactionParameters_clone_ptr(uint64_t arg) { LDKChannelTransactionParameters arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ChannelTransactionParameters_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ChannelTransactionParameters_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelTransactionParameters_clone"))) TS_ChannelTransactionParameters_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ChannelTransactionParameters_clone"))) TS_ChannelTransactionParameters_clone(uint64_t orig) { LDKChannelTransactionParameters orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKChannelTransactionParameters ret_var = ChannelTransactionParameters_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_free"))) TS_CounterpartyChannelTransactionParameters_free(uint32_t this_obj) { +void __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_free"))) TS_CounterpartyChannelTransactionParameters_free(uint64_t this_obj) { LDKCounterpartyChannelTransactionParameters this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); CounterpartyChannelTransactionParameters_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_get_pubkeys"))) TS_CounterpartyChannelTransactionParameters_get_pubkeys(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_get_pubkeys"))) TS_CounterpartyChannelTransactionParameters_get_pubkeys(uint64_t this_ptr) { LDKCounterpartyChannelTransactionParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelPublicKeys ret_var = CounterpartyChannelTransactionParameters_get_pubkeys(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_set_pubkeys"))) TS_CounterpartyChannelTransactionParameters_set_pubkeys(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_set_pubkeys"))) TS_CounterpartyChannelTransactionParameters_set_pubkeys(uint64_t this_ptr, uint64_t val) { LDKCounterpartyChannelTransactionParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelPublicKeys val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = ChannelPublicKeys_clone(&val_conv); CounterpartyChannelTransactionParameters_set_pubkeys(&this_ptr_conv, val_conv); } -int16_t __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_get_selected_contest_delay"))) TS_CounterpartyChannelTransactionParameters_get_selected_contest_delay(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_get_selected_contest_delay"))) TS_CounterpartyChannelTransactionParameters_get_selected_contest_delay(uint64_t this_ptr) { LDKCounterpartyChannelTransactionParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = CounterpartyChannelTransactionParameters_get_selected_contest_delay(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_set_selected_contest_delay"))) TS_CounterpartyChannelTransactionParameters_set_selected_contest_delay(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_set_selected_contest_delay"))) TS_CounterpartyChannelTransactionParameters_set_selected_contest_delay(uint64_t this_ptr, int16_t val) { LDKCounterpartyChannelTransactionParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; CounterpartyChannelTransactionParameters_set_selected_contest_delay(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_new"))) TS_CounterpartyChannelTransactionParameters_new(uint32_t pubkeys_arg, int16_t selected_contest_delay_arg) { +uint64_t __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_new"))) TS_CounterpartyChannelTransactionParameters_new(uint64_t pubkeys_arg, int16_t selected_contest_delay_arg) { LDKChannelPublicKeys pubkeys_arg_conv; - pubkeys_arg_conv.inner = (void*)(pubkeys_arg & (~1)); - pubkeys_arg_conv.is_owned = (pubkeys_arg & 1) || (pubkeys_arg == 0); + pubkeys_arg_conv.inner = untag_ptr(pubkeys_arg); + pubkeys_arg_conv.is_owned = ptr_is_owned(pubkeys_arg); 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t CounterpartyChannelTransactionParameters_clone_ptr(LDKCounterpartyChannelTransactionParameters *NONNULL_PTR arg) { +static inline uint64_t CounterpartyChannelTransactionParameters_clone_ptr(LDKCounterpartyChannelTransactionParameters *NONNULL_PTR arg) { LDKCounterpartyChannelTransactionParameters ret_var = CounterpartyChannelTransactionParameters_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_clone_ptr"))) TS_CounterpartyChannelTransactionParameters_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_clone_ptr"))) TS_CounterpartyChannelTransactionParameters_clone_ptr(uint64_t arg) { LDKCounterpartyChannelTransactionParameters arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = CounterpartyChannelTransactionParameters_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = CounterpartyChannelTransactionParameters_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_clone"))) TS_CounterpartyChannelTransactionParameters_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_clone"))) TS_CounterpartyChannelTransactionParameters_clone(uint64_t orig) { LDKCounterpartyChannelTransactionParameters orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKCounterpartyChannelTransactionParameters ret_var = CounterpartyChannelTransactionParameters_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -jboolean __attribute__((export_name("TS_ChannelTransactionParameters_is_populated"))) TS_ChannelTransactionParameters_is_populated(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_ChannelTransactionParameters_is_populated"))) TS_ChannelTransactionParameters_is_populated(uint64_t this_arg) { LDKChannelTransactionParameters this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = ChannelTransactionParameters_is_populated(&this_arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelTransactionParameters_as_holder_broadcastable"))) TS_ChannelTransactionParameters_as_holder_broadcastable(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ChannelTransactionParameters_as_holder_broadcastable"))) TS_ChannelTransactionParameters_as_holder_broadcastable(uint64_t this_arg) { LDKChannelTransactionParameters this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKDirectedChannelTransactionParameters ret_var = ChannelTransactionParameters_as_holder_broadcastable(&this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelTransactionParameters_as_counterparty_broadcastable"))) TS_ChannelTransactionParameters_as_counterparty_broadcastable(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ChannelTransactionParameters_as_counterparty_broadcastable"))) TS_ChannelTransactionParameters_as_counterparty_broadcastable(uint64_t this_arg) { LDKChannelTransactionParameters this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKDirectedChannelTransactionParameters ret_var = ChannelTransactionParameters_as_counterparty_broadcastable(&this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_write"))) TS_CounterpartyChannelTransactionParameters_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_write"))) TS_CounterpartyChannelTransactionParameters_write(uint64_t obj) { LDKCounterpartyChannelTransactionParameters obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = CounterpartyChannelTransactionParameters_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -36366,21 +34710,22 @@ int8_tArray __attribute__((export_name("TS_CounterpartyChannelTransactionParame return ret_arr; } -uint32_t __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_read"))) TS_CounterpartyChannelTransactionParameters_read(int8_tArray ser) { +uint64_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; LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ), "LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ"); *ret_conv = CounterpartyChannelTransactionParameters_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_ChannelTransactionParameters_write"))) TS_ChannelTransactionParameters_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ChannelTransactionParameters_write"))) TS_ChannelTransactionParameters_write(uint64_t obj) { LDKChannelTransactionParameters obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ChannelTransactionParameters_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -36388,136 +34733,130 @@ int8_tArray __attribute__((export_name("TS_ChannelTransactionParameters_write") return ret_arr; } -uint32_t __attribute__((export_name("TS_ChannelTransactionParameters_read"))) TS_ChannelTransactionParameters_read(int8_tArray ser) { +uint64_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; LDKCResult_ChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTransactionParametersDecodeErrorZ), "LDKCResult_ChannelTransactionParametersDecodeErrorZ"); *ret_conv = ChannelTransactionParameters_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_DirectedChannelTransactionParameters_free"))) TS_DirectedChannelTransactionParameters_free(uint32_t this_obj) { +void __attribute__((export_name("TS_DirectedChannelTransactionParameters_free"))) TS_DirectedChannelTransactionParameters_free(uint64_t this_obj) { LDKDirectedChannelTransactionParameters this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); DirectedChannelTransactionParameters_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_DirectedChannelTransactionParameters_broadcaster_pubkeys"))) TS_DirectedChannelTransactionParameters_broadcaster_pubkeys(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_DirectedChannelTransactionParameters_broadcaster_pubkeys"))) TS_DirectedChannelTransactionParameters_broadcaster_pubkeys(uint64_t this_arg) { LDKDirectedChannelTransactionParameters this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKChannelPublicKeys ret_var = DirectedChannelTransactionParameters_broadcaster_pubkeys(&this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_DirectedChannelTransactionParameters_countersignatory_pubkeys"))) TS_DirectedChannelTransactionParameters_countersignatory_pubkeys(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_DirectedChannelTransactionParameters_countersignatory_pubkeys"))) TS_DirectedChannelTransactionParameters_countersignatory_pubkeys(uint64_t this_arg) { LDKDirectedChannelTransactionParameters this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKChannelPublicKeys ret_var = DirectedChannelTransactionParameters_countersignatory_pubkeys(&this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int16_t __attribute__((export_name("TS_DirectedChannelTransactionParameters_contest_delay"))) TS_DirectedChannelTransactionParameters_contest_delay(uint32_t this_arg) { +int16_t __attribute__((export_name("TS_DirectedChannelTransactionParameters_contest_delay"))) TS_DirectedChannelTransactionParameters_contest_delay(uint64_t this_arg) { LDKDirectedChannelTransactionParameters this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int16_t ret_conv = DirectedChannelTransactionParameters_contest_delay(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_DirectedChannelTransactionParameters_is_outbound"))) TS_DirectedChannelTransactionParameters_is_outbound(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_DirectedChannelTransactionParameters_is_outbound"))) TS_DirectedChannelTransactionParameters_is_outbound(uint64_t this_arg) { LDKDirectedChannelTransactionParameters this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = DirectedChannelTransactionParameters_is_outbound(&this_arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_DirectedChannelTransactionParameters_funding_outpoint"))) TS_DirectedChannelTransactionParameters_funding_outpoint(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_DirectedChannelTransactionParameters_funding_outpoint"))) TS_DirectedChannelTransactionParameters_funding_outpoint(uint64_t this_arg) { LDKDirectedChannelTransactionParameters this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKOutPoint ret_var = DirectedChannelTransactionParameters_funding_outpoint(&this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -jboolean __attribute__((export_name("TS_DirectedChannelTransactionParameters_opt_anchors"))) TS_DirectedChannelTransactionParameters_opt_anchors(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_DirectedChannelTransactionParameters_opt_anchors"))) TS_DirectedChannelTransactionParameters_opt_anchors(uint64_t this_arg) { LDKDirectedChannelTransactionParameters this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = DirectedChannelTransactionParameters_opt_anchors(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_HolderCommitmentTransaction_free"))) TS_HolderCommitmentTransaction_free(uint32_t this_obj) { +void __attribute__((export_name("TS_HolderCommitmentTransaction_free"))) TS_HolderCommitmentTransaction_free(uint64_t this_obj) { LDKHolderCommitmentTransaction this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); HolderCommitmentTransaction_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_HolderCommitmentTransaction_get_counterparty_sig"))) TS_HolderCommitmentTransaction_get_counterparty_sig(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_HolderCommitmentTransaction_get_counterparty_sig"))) TS_HolderCommitmentTransaction_get_counterparty_sig(uint64_t this_ptr) { LDKHolderCommitmentTransaction this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_HolderCommitmentTransaction_set_counterparty_sig"))) TS_HolderCommitmentTransaction_set_counterparty_sig(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_HolderCommitmentTransaction_set_counterparty_sig"))) TS_HolderCommitmentTransaction_set_counterparty_sig(uint64_t this_ptr, int8_tArray val) { LDKHolderCommitmentTransaction this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKSignature val_ref; CHECK(val->arr_len == 64); memcpy(val_ref.compact_form, val->elems, 64); FREE(val); HolderCommitmentTransaction_set_counterparty_sig(&this_ptr_conv, val_ref); } -ptrArray __attribute__((export_name("TS_HolderCommitmentTransaction_get_counterparty_htlc_sigs"))) TS_HolderCommitmentTransaction_get_counterparty_htlc_sigs(uint32_t this_ptr) { +ptrArray __attribute__((export_name("TS_HolderCommitmentTransaction_get_counterparty_htlc_sigs"))) TS_HolderCommitmentTransaction_get_counterparty_htlc_sigs(uint64_t this_ptr) { LDKHolderCommitmentTransaction this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_SignatureZ ret_var = HolderCommitmentTransaction_get_counterparty_htlc_sigs(&this_ptr_conv); ptrArray ret_arr = NULL; ret_arr = init_ptrArray(ret_var.datalen, __LINE__); @@ -36532,11 +34871,12 @@ ptrArray __attribute__((export_name("TS_HolderCommitmentTransaction_get_counter return ret_arr; } -void __attribute__((export_name("TS_HolderCommitmentTransaction_set_counterparty_htlc_sigs"))) TS_HolderCommitmentTransaction_set_counterparty_htlc_sigs(uint32_t this_ptr, ptrArray val) { +void __attribute__((export_name("TS_HolderCommitmentTransaction_set_counterparty_htlc_sigs"))) TS_HolderCommitmentTransaction_set_counterparty_htlc_sigs(uint64_t this_ptr, ptrArray val) { LDKHolderCommitmentTransaction this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_SignatureZ val_constr; val_constr.datalen = val->arr_len; if (val_constr.datalen > 0) @@ -36555,49 +34895,42 @@ void __attribute__((export_name("TS_HolderCommitmentTransaction_set_counterpart HolderCommitmentTransaction_set_counterparty_htlc_sigs(&this_ptr_conv, val_constr); } -static inline uintptr_t HolderCommitmentTransaction_clone_ptr(LDKHolderCommitmentTransaction *NONNULL_PTR arg) { +static inline uint64_t HolderCommitmentTransaction_clone_ptr(LDKHolderCommitmentTransaction *NONNULL_PTR arg) { LDKHolderCommitmentTransaction ret_var = HolderCommitmentTransaction_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_HolderCommitmentTransaction_clone_ptr"))) TS_HolderCommitmentTransaction_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_HolderCommitmentTransaction_clone_ptr"))) TS_HolderCommitmentTransaction_clone_ptr(uint64_t arg) { LDKHolderCommitmentTransaction arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = HolderCommitmentTransaction_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = HolderCommitmentTransaction_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_HolderCommitmentTransaction_clone"))) TS_HolderCommitmentTransaction_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_HolderCommitmentTransaction_clone"))) TS_HolderCommitmentTransaction_clone(uint64_t orig) { LDKHolderCommitmentTransaction orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKHolderCommitmentTransaction ret_var = HolderCommitmentTransaction_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_HolderCommitmentTransaction_write"))) TS_HolderCommitmentTransaction_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_HolderCommitmentTransaction_write"))) TS_HolderCommitmentTransaction_write(uint64_t obj) { LDKHolderCommitmentTransaction obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = HolderCommitmentTransaction_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -36605,20 +34938,20 @@ int8_tArray __attribute__((export_name("TS_HolderCommitmentTransaction_write")) return ret_arr; } -uint32_t __attribute__((export_name("TS_HolderCommitmentTransaction_read"))) TS_HolderCommitmentTransaction_read(int8_tArray ser) { +uint64_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; LDKCResult_HolderCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HolderCommitmentTransactionDecodeErrorZ), "LDKCResult_HolderCommitmentTransactionDecodeErrorZ"); *ret_conv = HolderCommitmentTransaction_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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) { +uint64_t __attribute__((export_name("TS_HolderCommitmentTransaction_new"))) TS_HolderCommitmentTransaction_new(uint64_t commitment_tx, int8_tArray counterparty_sig, ptrArray counterparty_htlc_sigs, int8_tArray holder_funding_key, int8_tArray counterparty_funding_key) { LDKCommitmentTransaction commitment_tx_conv; - commitment_tx_conv.inner = (void*)(commitment_tx & (~1)); - commitment_tx_conv.is_owned = (commitment_tx & 1) || (commitment_tx == 0); + commitment_tx_conv.inner = untag_ptr(commitment_tx); + commitment_tx_conv.is_owned = ptr_is_owned(commitment_tx); CHECK_INNER_FIELD_ACCESS_OR_NULL(commitment_tx_conv); commitment_tx_conv = CommitmentTransaction_clone(&commitment_tx_conv); LDKSignature counterparty_sig_ref; @@ -36646,30 +34979,26 @@ uint32_t __attribute__((export_name("TS_HolderCommitmentTransaction_new"))) TS_ CHECK(counterparty_funding_key->arr_len == 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_BuiltCommitmentTransaction_free"))) TS_BuiltCommitmentTransaction_free(uint32_t this_obj) { +void __attribute__((export_name("TS_BuiltCommitmentTransaction_free"))) TS_BuiltCommitmentTransaction_free(uint64_t this_obj) { LDKBuiltCommitmentTransaction this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); BuiltCommitmentTransaction_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_BuiltCommitmentTransaction_get_transaction"))) TS_BuiltCommitmentTransaction_get_transaction(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_BuiltCommitmentTransaction_get_transaction"))) TS_BuiltCommitmentTransaction_get_transaction(uint64_t this_ptr) { LDKBuiltCommitmentTransaction this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKTransaction ret_var = BuiltCommitmentTransaction_get_transaction(&this_ptr_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -36677,11 +35006,12 @@ int8_tArray __attribute__((export_name("TS_BuiltCommitmentTransaction_get_trans return ret_arr; } -void __attribute__((export_name("TS_BuiltCommitmentTransaction_set_transaction"))) TS_BuiltCommitmentTransaction_set_transaction(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_BuiltCommitmentTransaction_set_transaction"))) TS_BuiltCommitmentTransaction_set_transaction(uint64_t this_ptr, int8_tArray val) { LDKBuiltCommitmentTransaction this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKTransaction val_ref; val_ref.datalen = val->arr_len; val_ref.data = MALLOC(val_ref.datalen, "LDKTransaction Bytes"); @@ -36690,28 +35020,30 @@ void __attribute__((export_name("TS_BuiltCommitmentTransaction_set_transaction" BuiltCommitmentTransaction_set_transaction(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_BuiltCommitmentTransaction_get_txid"))) TS_BuiltCommitmentTransaction_get_txid(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_BuiltCommitmentTransaction_get_txid"))) TS_BuiltCommitmentTransaction_get_txid(uint64_t this_ptr) { LDKBuiltCommitmentTransaction this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *BuiltCommitmentTransaction_get_txid(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_BuiltCommitmentTransaction_set_txid"))) TS_BuiltCommitmentTransaction_set_txid(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_BuiltCommitmentTransaction_set_txid"))) TS_BuiltCommitmentTransaction_set_txid(uint64_t this_ptr, int8_tArray val) { LDKBuiltCommitmentTransaction this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); BuiltCommitmentTransaction_set_txid(&this_ptr_conv, val_ref); } -uint32_t __attribute__((export_name("TS_BuiltCommitmentTransaction_new"))) TS_BuiltCommitmentTransaction_new(int8_tArray transaction_arg, int8_tArray txid_arg) { +uint64_t __attribute__((export_name("TS_BuiltCommitmentTransaction_new"))) TS_BuiltCommitmentTransaction_new(int8_tArray transaction_arg, int8_tArray txid_arg) { LDKTransaction transaction_arg_ref; transaction_arg_ref.datalen = transaction_arg->arr_len; transaction_arg_ref.data = MALLOC(transaction_arg_ref.datalen, "LDKTransaction Bytes"); @@ -36721,60 +35053,48 @@ uint32_t __attribute__((export_name("TS_BuiltCommitmentTransaction_new"))) TS_B CHECK(txid_arg->arr_len == 32); memcpy(txid_arg_ref.data, txid_arg->elems, 32); FREE(txid_arg); LDKBuiltCommitmentTransaction ret_var = BuiltCommitmentTransaction_new(transaction_arg_ref, txid_arg_ref); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t BuiltCommitmentTransaction_clone_ptr(LDKBuiltCommitmentTransaction *NONNULL_PTR arg) { +static inline uint64_t BuiltCommitmentTransaction_clone_ptr(LDKBuiltCommitmentTransaction *NONNULL_PTR arg) { LDKBuiltCommitmentTransaction ret_var = BuiltCommitmentTransaction_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_BuiltCommitmentTransaction_clone_ptr"))) TS_BuiltCommitmentTransaction_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_BuiltCommitmentTransaction_clone_ptr"))) TS_BuiltCommitmentTransaction_clone_ptr(uint64_t arg) { LDKBuiltCommitmentTransaction arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = BuiltCommitmentTransaction_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = BuiltCommitmentTransaction_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_BuiltCommitmentTransaction_clone"))) TS_BuiltCommitmentTransaction_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_BuiltCommitmentTransaction_clone"))) TS_BuiltCommitmentTransaction_clone(uint64_t orig) { LDKBuiltCommitmentTransaction orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKBuiltCommitmentTransaction ret_var = BuiltCommitmentTransaction_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_BuiltCommitmentTransaction_write"))) TS_BuiltCommitmentTransaction_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_BuiltCommitmentTransaction_write"))) TS_BuiltCommitmentTransaction_write(uint64_t obj) { LDKBuiltCommitmentTransaction obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = BuiltCommitmentTransaction_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -36782,21 +35102,22 @@ int8_tArray __attribute__((export_name("TS_BuiltCommitmentTransaction_write"))) return ret_arr; } -uint32_t __attribute__((export_name("TS_BuiltCommitmentTransaction_read"))) TS_BuiltCommitmentTransaction_read(int8_tArray ser) { +uint64_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; LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_BuiltCommitmentTransactionDecodeErrorZ), "LDKCResult_BuiltCommitmentTransactionDecodeErrorZ"); *ret_conv = BuiltCommitmentTransaction_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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) { +int8_tArray __attribute__((export_name("TS_BuiltCommitmentTransaction_get_sighash_all"))) TS_BuiltCommitmentTransaction_get_sighash_all(uint64_t this_arg, int8_tArray funding_redeemscript, int64_t channel_value_satoshis) { LDKBuiltCommitmentTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKu8slice funding_redeemscript_ref; funding_redeemscript_ref.datalen = funding_redeemscript->arr_len; funding_redeemscript_ref.data = funding_redeemscript->elems; @@ -36806,11 +35127,12 @@ int8_tArray __attribute__((export_name("TS_BuiltCommitmentTransaction_get_sigha return ret_arr; } -int8_tArray __attribute__((export_name("TS_BuiltCommitmentTransaction_sign"))) TS_BuiltCommitmentTransaction_sign(uint32_t this_arg, int8_tArray funding_key, int8_tArray funding_redeemscript, int64_t channel_value_satoshis) { +int8_tArray __attribute__((export_name("TS_BuiltCommitmentTransaction_sign"))) TS_BuiltCommitmentTransaction_sign(uint64_t this_arg, int8_tArray funding_key, int8_tArray funding_redeemscript, int64_t channel_value_satoshis) { LDKBuiltCommitmentTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; unsigned char funding_key_arr[32]; CHECK(funding_key->arr_len == 32); memcpy(funding_key_arr, funding_key->elems, 32); FREE(funding_key); @@ -36824,62 +35146,55 @@ int8_tArray __attribute__((export_name("TS_BuiltCommitmentTransaction_sign"))) return ret_arr; } -void __attribute__((export_name("TS_ClosingTransaction_free"))) TS_ClosingTransaction_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ClosingTransaction_free"))) TS_ClosingTransaction_free(uint64_t this_obj) { LDKClosingTransaction this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ClosingTransaction_free(this_obj_conv); } -static inline uintptr_t ClosingTransaction_clone_ptr(LDKClosingTransaction *NONNULL_PTR arg) { +static inline uint64_t ClosingTransaction_clone_ptr(LDKClosingTransaction *NONNULL_PTR arg) { LDKClosingTransaction ret_var = ClosingTransaction_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ClosingTransaction_clone_ptr"))) TS_ClosingTransaction_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ClosingTransaction_clone_ptr"))) TS_ClosingTransaction_clone_ptr(uint64_t arg) { LDKClosingTransaction arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ClosingTransaction_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ClosingTransaction_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ClosingTransaction_clone"))) TS_ClosingTransaction_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ClosingTransaction_clone"))) TS_ClosingTransaction_clone(uint64_t orig) { LDKClosingTransaction orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKClosingTransaction ret_var = ClosingTransaction_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int64_t __attribute__((export_name("TS_ClosingTransaction_hash"))) TS_ClosingTransaction_hash(uint32_t o) { +int64_t __attribute__((export_name("TS_ClosingTransaction_hash"))) TS_ClosingTransaction_hash(uint64_t o) { LDKClosingTransaction o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = false; + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); + o_conv.is_owned = false; int64_t ret_conv = ClosingTransaction_hash(&o_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ClosingTransaction_new"))) TS_ClosingTransaction_new(int64_t to_holder_value_sat, int64_t to_counterparty_value_sat, int8_tArray to_holder_script, int8_tArray to_counterparty_script, uint32_t funding_outpoint) { +uint64_t __attribute__((export_name("TS_ClosingTransaction_new"))) TS_ClosingTransaction_new(int64_t to_holder_value_sat, int64_t to_counterparty_value_sat, int8_tArray to_holder_script, int8_tArray to_counterparty_script, uint64_t funding_outpoint) { 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"); @@ -36889,107 +35204,104 @@ uint32_t __attribute__((export_name("TS_ClosingTransaction_new"))) TS_ClosingTr 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); 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); + funding_outpoint_conv.inner = untag_ptr(funding_outpoint); + funding_outpoint_conv.is_owned = ptr_is_owned(funding_outpoint); 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ClosingTransaction_trust"))) TS_ClosingTransaction_trust(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ClosingTransaction_trust"))) TS_ClosingTransaction_trust(uint64_t this_arg) { LDKClosingTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKTrustedClosingTransaction ret_var = ClosingTransaction_trust(&this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ClosingTransaction_verify"))) TS_ClosingTransaction_verify(uint32_t this_arg, uint32_t funding_outpoint) { +uint64_t __attribute__((export_name("TS_ClosingTransaction_verify"))) TS_ClosingTransaction_verify(uint64_t this_arg, uint64_t funding_outpoint) { LDKClosingTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKOutPoint funding_outpoint_conv; - funding_outpoint_conv.inner = (void*)(funding_outpoint & (~1)); - funding_outpoint_conv.is_owned = (funding_outpoint & 1) || (funding_outpoint == 0); + funding_outpoint_conv.inner = untag_ptr(funding_outpoint); + funding_outpoint_conv.is_owned = ptr_is_owned(funding_outpoint); CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_outpoint_conv); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int64_t __attribute__((export_name("TS_ClosingTransaction_to_holder_value_sat"))) TS_ClosingTransaction_to_holder_value_sat(uint32_t this_arg) { +int64_t __attribute__((export_name("TS_ClosingTransaction_to_holder_value_sat"))) TS_ClosingTransaction_to_holder_value_sat(uint64_t this_arg) { LDKClosingTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int64_t ret_conv = ClosingTransaction_to_holder_value_sat(&this_arg_conv); return ret_conv; } -int64_t __attribute__((export_name("TS_ClosingTransaction_to_counterparty_value_sat"))) TS_ClosingTransaction_to_counterparty_value_sat(uint32_t this_arg) { +int64_t __attribute__((export_name("TS_ClosingTransaction_to_counterparty_value_sat"))) TS_ClosingTransaction_to_counterparty_value_sat(uint64_t this_arg) { LDKClosingTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int64_t ret_conv = ClosingTransaction_to_counterparty_value_sat(&this_arg_conv); return ret_conv; } -int8_tArray __attribute__((export_name("TS_ClosingTransaction_to_holder_script"))) TS_ClosingTransaction_to_holder_script(uint32_t this_arg) { +int8_tArray __attribute__((export_name("TS_ClosingTransaction_to_holder_script"))) TS_ClosingTransaction_to_holder_script(uint64_t this_arg) { LDKClosingTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKu8slice ret_var = ClosingTransaction_to_holder_script(&this_arg_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); return ret_arr; } -int8_tArray __attribute__((export_name("TS_ClosingTransaction_to_counterparty_script"))) TS_ClosingTransaction_to_counterparty_script(uint32_t this_arg) { +int8_tArray __attribute__((export_name("TS_ClosingTransaction_to_counterparty_script"))) TS_ClosingTransaction_to_counterparty_script(uint64_t this_arg) { LDKClosingTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKu8slice ret_var = ClosingTransaction_to_counterparty_script(&this_arg_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); return ret_arr; } -void __attribute__((export_name("TS_TrustedClosingTransaction_free"))) TS_TrustedClosingTransaction_free(uint32_t this_obj) { +void __attribute__((export_name("TS_TrustedClosingTransaction_free"))) TS_TrustedClosingTransaction_free(uint64_t this_obj) { LDKTrustedClosingTransaction this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); TrustedClosingTransaction_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_TrustedClosingTransaction_built_transaction"))) TS_TrustedClosingTransaction_built_transaction(uint32_t this_arg) { +int8_tArray __attribute__((export_name("TS_TrustedClosingTransaction_built_transaction"))) TS_TrustedClosingTransaction_built_transaction(uint64_t this_arg) { LDKTrustedClosingTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKTransaction ret_var = TrustedClosingTransaction_built_transaction(&this_arg_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -36997,11 +35309,12 @@ int8_tArray __attribute__((export_name("TS_TrustedClosingTransaction_built_tran return ret_arr; } -int8_tArray __attribute__((export_name("TS_TrustedClosingTransaction_get_sighash_all"))) TS_TrustedClosingTransaction_get_sighash_all(uint32_t this_arg, int8_tArray funding_redeemscript, int64_t channel_value_satoshis) { +int8_tArray __attribute__((export_name("TS_TrustedClosingTransaction_get_sighash_all"))) TS_TrustedClosingTransaction_get_sighash_all(uint64_t this_arg, int8_tArray funding_redeemscript, int64_t channel_value_satoshis) { LDKTrustedClosingTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKu8slice funding_redeemscript_ref; funding_redeemscript_ref.datalen = funding_redeemscript->arr_len; funding_redeemscript_ref.data = funding_redeemscript->elems; @@ -37011,11 +35324,12 @@ int8_tArray __attribute__((export_name("TS_TrustedClosingTransaction_get_sighas return ret_arr; } -int8_tArray __attribute__((export_name("TS_TrustedClosingTransaction_sign"))) TS_TrustedClosingTransaction_sign(uint32_t this_arg, int8_tArray funding_key, int8_tArray funding_redeemscript, int64_t channel_value_satoshis) { +int8_tArray __attribute__((export_name("TS_TrustedClosingTransaction_sign"))) TS_TrustedClosingTransaction_sign(uint64_t this_arg, int8_tArray funding_key, int8_tArray funding_redeemscript, int64_t channel_value_satoshis) { LDKTrustedClosingTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; unsigned char funding_key_arr[32]; CHECK(funding_key->arr_len == 32); memcpy(funding_key_arr, funding_key->elems, 32); FREE(funding_key); @@ -37029,57 +35343,50 @@ int8_tArray __attribute__((export_name("TS_TrustedClosingTransaction_sign"))) T return ret_arr; } -void __attribute__((export_name("TS_CommitmentTransaction_free"))) TS_CommitmentTransaction_free(uint32_t this_obj) { +void __attribute__((export_name("TS_CommitmentTransaction_free"))) TS_CommitmentTransaction_free(uint64_t this_obj) { LDKCommitmentTransaction this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); CommitmentTransaction_free(this_obj_conv); } -static inline uintptr_t CommitmentTransaction_clone_ptr(LDKCommitmentTransaction *NONNULL_PTR arg) { +static inline uint64_t CommitmentTransaction_clone_ptr(LDKCommitmentTransaction *NONNULL_PTR arg) { LDKCommitmentTransaction ret_var = CommitmentTransaction_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_CommitmentTransaction_clone_ptr"))) TS_CommitmentTransaction_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_CommitmentTransaction_clone_ptr"))) TS_CommitmentTransaction_clone_ptr(uint64_t arg) { LDKCommitmentTransaction arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = CommitmentTransaction_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = CommitmentTransaction_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CommitmentTransaction_clone"))) TS_CommitmentTransaction_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_CommitmentTransaction_clone"))) TS_CommitmentTransaction_clone(uint64_t orig) { LDKCommitmentTransaction orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKCommitmentTransaction ret_var = CommitmentTransaction_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_CommitmentTransaction_write"))) TS_CommitmentTransaction_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_CommitmentTransaction_write"))) TS_CommitmentTransaction_write(uint64_t obj) { LDKCommitmentTransaction obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = CommitmentTransaction_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -37087,168 +35394,168 @@ int8_tArray __attribute__((export_name("TS_CommitmentTransaction_write"))) TS_C return ret_arr; } -uint32_t __attribute__((export_name("TS_CommitmentTransaction_read"))) TS_CommitmentTransaction_read(int8_tArray ser) { +uint64_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; LDKCResult_CommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentTransactionDecodeErrorZ), "LDKCResult_CommitmentTransactionDecodeErrorZ"); *ret_conv = CommitmentTransaction_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int64_t __attribute__((export_name("TS_CommitmentTransaction_commitment_number"))) TS_CommitmentTransaction_commitment_number(uint32_t this_arg) { +int64_t __attribute__((export_name("TS_CommitmentTransaction_commitment_number"))) TS_CommitmentTransaction_commitment_number(uint64_t this_arg) { LDKCommitmentTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int64_t ret_conv = CommitmentTransaction_commitment_number(&this_arg_conv); return ret_conv; } -int64_t __attribute__((export_name("TS_CommitmentTransaction_to_broadcaster_value_sat"))) TS_CommitmentTransaction_to_broadcaster_value_sat(uint32_t this_arg) { +int64_t __attribute__((export_name("TS_CommitmentTransaction_to_broadcaster_value_sat"))) TS_CommitmentTransaction_to_broadcaster_value_sat(uint64_t this_arg) { LDKCommitmentTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int64_t ret_conv = CommitmentTransaction_to_broadcaster_value_sat(&this_arg_conv); return ret_conv; } -int64_t __attribute__((export_name("TS_CommitmentTransaction_to_countersignatory_value_sat"))) TS_CommitmentTransaction_to_countersignatory_value_sat(uint32_t this_arg) { +int64_t __attribute__((export_name("TS_CommitmentTransaction_to_countersignatory_value_sat"))) TS_CommitmentTransaction_to_countersignatory_value_sat(uint64_t this_arg) { LDKCommitmentTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int64_t ret_conv = CommitmentTransaction_to_countersignatory_value_sat(&this_arg_conv); return ret_conv; } -int32_t __attribute__((export_name("TS_CommitmentTransaction_feerate_per_kw"))) TS_CommitmentTransaction_feerate_per_kw(uint32_t this_arg) { +int32_t __attribute__((export_name("TS_CommitmentTransaction_feerate_per_kw"))) TS_CommitmentTransaction_feerate_per_kw(uint64_t this_arg) { LDKCommitmentTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int32_t ret_conv = CommitmentTransaction_feerate_per_kw(&this_arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CommitmentTransaction_trust"))) TS_CommitmentTransaction_trust(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_CommitmentTransaction_trust"))) TS_CommitmentTransaction_trust(uint64_t this_arg) { LDKCommitmentTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKTrustedCommitmentTransaction ret_var = CommitmentTransaction_trust(&this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_CommitmentTransaction_verify"))) TS_CommitmentTransaction_verify(uint32_t this_arg, uint32_t channel_parameters, uint32_t broadcaster_keys, uint32_t countersignatory_keys) { +uint64_t __attribute__((export_name("TS_CommitmentTransaction_verify"))) TS_CommitmentTransaction_verify(uint64_t this_arg, uint64_t channel_parameters, uint64_t broadcaster_keys, uint64_t countersignatory_keys) { LDKCommitmentTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKDirectedChannelTransactionParameters channel_parameters_conv; - channel_parameters_conv.inner = (void*)(channel_parameters & (~1)); - channel_parameters_conv.is_owned = false; + channel_parameters_conv.inner = untag_ptr(channel_parameters); + channel_parameters_conv.is_owned = ptr_is_owned(channel_parameters); CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_parameters_conv); + channel_parameters_conv.is_owned = false; LDKChannelPublicKeys broadcaster_keys_conv; - broadcaster_keys_conv.inner = (void*)(broadcaster_keys & (~1)); - broadcaster_keys_conv.is_owned = false; + broadcaster_keys_conv.inner = untag_ptr(broadcaster_keys); + broadcaster_keys_conv.is_owned = ptr_is_owned(broadcaster_keys); CHECK_INNER_FIELD_ACCESS_OR_NULL(broadcaster_keys_conv); + broadcaster_keys_conv.is_owned = false; LDKChannelPublicKeys countersignatory_keys_conv; - countersignatory_keys_conv.inner = (void*)(countersignatory_keys & (~1)); - countersignatory_keys_conv.is_owned = false; + countersignatory_keys_conv.inner = untag_ptr(countersignatory_keys); + countersignatory_keys_conv.is_owned = ptr_is_owned(countersignatory_keys); CHECK_INNER_FIELD_ACCESS_OR_NULL(countersignatory_keys_conv); + countersignatory_keys_conv.is_owned = false; 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_TrustedCommitmentTransaction_free"))) TS_TrustedCommitmentTransaction_free(uint32_t this_obj) { +void __attribute__((export_name("TS_TrustedCommitmentTransaction_free"))) TS_TrustedCommitmentTransaction_free(uint64_t this_obj) { LDKTrustedCommitmentTransaction this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); TrustedCommitmentTransaction_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_TrustedCommitmentTransaction_txid"))) TS_TrustedCommitmentTransaction_txid(uint32_t this_arg) { +int8_tArray __attribute__((export_name("TS_TrustedCommitmentTransaction_txid"))) TS_TrustedCommitmentTransaction_txid(uint64_t this_arg) { LDKTrustedCommitmentTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, TrustedCommitmentTransaction_txid(&this_arg_conv).data, 32); return ret_arr; } -uint32_t __attribute__((export_name("TS_TrustedCommitmentTransaction_built_transaction"))) TS_TrustedCommitmentTransaction_built_transaction(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_TrustedCommitmentTransaction_built_transaction"))) TS_TrustedCommitmentTransaction_built_transaction(uint64_t this_arg) { LDKTrustedCommitmentTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKBuiltCommitmentTransaction ret_var = TrustedCommitmentTransaction_built_transaction(&this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_TrustedCommitmentTransaction_keys"))) TS_TrustedCommitmentTransaction_keys(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_TrustedCommitmentTransaction_keys"))) TS_TrustedCommitmentTransaction_keys(uint64_t this_arg) { LDKTrustedCommitmentTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKTxCreationKeys ret_var = TrustedCommitmentTransaction_keys(&this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -jboolean __attribute__((export_name("TS_TrustedCommitmentTransaction_opt_anchors"))) TS_TrustedCommitmentTransaction_opt_anchors(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_TrustedCommitmentTransaction_opt_anchors"))) TS_TrustedCommitmentTransaction_opt_anchors(uint64_t this_arg) { LDKTrustedCommitmentTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = TrustedCommitmentTransaction_opt_anchors(&this_arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_TrustedCommitmentTransaction_get_htlc_sigs"))) TS_TrustedCommitmentTransaction_get_htlc_sigs(uint32_t this_arg, int8_tArray htlc_base_key, uint32_t channel_parameters) { +uint64_t __attribute__((export_name("TS_TrustedCommitmentTransaction_get_htlc_sigs"))) TS_TrustedCommitmentTransaction_get_htlc_sigs(uint64_t this_arg, int8_tArray htlc_base_key, uint64_t channel_parameters) { LDKTrustedCommitmentTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; unsigned char htlc_base_key_arr[32]; CHECK(htlc_base_key->arr_len == 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)); - channel_parameters_conv.is_owned = false; + channel_parameters_conv.inner = untag_ptr(channel_parameters); + channel_parameters_conv.is_owned = ptr_is_owned(channel_parameters); CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_parameters_conv); + channel_parameters_conv.is_owned = false; 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } 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) { @@ -37262,481 +35569,407 @@ int64_t __attribute__((export_name("TS_get_commitment_transaction_number_obscur return ret_conv; } -jboolean __attribute__((export_name("TS_InitFeatures_eq"))) TS_InitFeatures_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_InitFeatures_eq"))) TS_InitFeatures_eq(uint64_t a, uint64_t b) { LDKInitFeatures a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKInitFeatures b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = InitFeatures_eq(&a_conv, &b_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_NodeFeatures_eq"))) TS_NodeFeatures_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_NodeFeatures_eq"))) TS_NodeFeatures_eq(uint64_t a, uint64_t b) { LDKNodeFeatures a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKNodeFeatures b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = NodeFeatures_eq(&a_conv, &b_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_ChannelFeatures_eq"))) TS_ChannelFeatures_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_ChannelFeatures_eq"))) TS_ChannelFeatures_eq(uint64_t a, uint64_t b) { LDKChannelFeatures a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKChannelFeatures b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = ChannelFeatures_eq(&a_conv, &b_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_InvoiceFeatures_eq"))) TS_InvoiceFeatures_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_InvoiceFeatures_eq"))) TS_InvoiceFeatures_eq(uint64_t a, uint64_t b) { LDKInvoiceFeatures a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKInvoiceFeatures b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = InvoiceFeatures_eq(&a_conv, &b_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_ChannelTypeFeatures_eq"))) TS_ChannelTypeFeatures_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_ChannelTypeFeatures_eq"))) TS_ChannelTypeFeatures_eq(uint64_t a, uint64_t b) { LDKChannelTypeFeatures a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKChannelTypeFeatures b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = ChannelTypeFeatures_eq(&a_conv, &b_conv); return ret_conv; } -static inline uintptr_t InitFeatures_clone_ptr(LDKInitFeatures *NONNULL_PTR arg) { +static inline uint64_t InitFeatures_clone_ptr(LDKInitFeatures *NONNULL_PTR arg) { LDKInitFeatures ret_var = InitFeatures_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_InitFeatures_clone_ptr"))) TS_InitFeatures_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_InitFeatures_clone_ptr"))) TS_InitFeatures_clone_ptr(uint64_t arg) { LDKInitFeatures arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = InitFeatures_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = InitFeatures_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_InitFeatures_clone"))) TS_InitFeatures_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_InitFeatures_clone"))) TS_InitFeatures_clone(uint64_t orig) { LDKInitFeatures orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKInitFeatures ret_var = InitFeatures_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t NodeFeatures_clone_ptr(LDKNodeFeatures *NONNULL_PTR arg) { +static inline uint64_t NodeFeatures_clone_ptr(LDKNodeFeatures *NONNULL_PTR arg) { LDKNodeFeatures ret_var = NodeFeatures_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_NodeFeatures_clone_ptr"))) TS_NodeFeatures_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_NodeFeatures_clone_ptr"))) TS_NodeFeatures_clone_ptr(uint64_t arg) { LDKNodeFeatures arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = NodeFeatures_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = NodeFeatures_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_NodeFeatures_clone"))) TS_NodeFeatures_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_NodeFeatures_clone"))) TS_NodeFeatures_clone(uint64_t orig) { LDKNodeFeatures orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKNodeFeatures ret_var = NodeFeatures_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t ChannelFeatures_clone_ptr(LDKChannelFeatures *NONNULL_PTR arg) { +static inline uint64_t ChannelFeatures_clone_ptr(LDKChannelFeatures *NONNULL_PTR arg) { LDKChannelFeatures ret_var = ChannelFeatures_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelFeatures_clone_ptr"))) TS_ChannelFeatures_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ChannelFeatures_clone_ptr"))) TS_ChannelFeatures_clone_ptr(uint64_t arg) { LDKChannelFeatures arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ChannelFeatures_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ChannelFeatures_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelFeatures_clone"))) TS_ChannelFeatures_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ChannelFeatures_clone"))) TS_ChannelFeatures_clone(uint64_t orig) { LDKChannelFeatures orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKChannelFeatures ret_var = ChannelFeatures_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t InvoiceFeatures_clone_ptr(LDKInvoiceFeatures *NONNULL_PTR arg) { +static inline uint64_t InvoiceFeatures_clone_ptr(LDKInvoiceFeatures *NONNULL_PTR arg) { LDKInvoiceFeatures ret_var = InvoiceFeatures_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_InvoiceFeatures_clone_ptr"))) TS_InvoiceFeatures_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_InvoiceFeatures_clone_ptr"))) TS_InvoiceFeatures_clone_ptr(uint64_t arg) { LDKInvoiceFeatures arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = InvoiceFeatures_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = InvoiceFeatures_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_InvoiceFeatures_clone"))) TS_InvoiceFeatures_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_InvoiceFeatures_clone"))) TS_InvoiceFeatures_clone(uint64_t orig) { LDKInvoiceFeatures orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKInvoiceFeatures ret_var = InvoiceFeatures_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t ChannelTypeFeatures_clone_ptr(LDKChannelTypeFeatures *NONNULL_PTR arg) { +static inline uint64_t ChannelTypeFeatures_clone_ptr(LDKChannelTypeFeatures *NONNULL_PTR arg) { LDKChannelTypeFeatures ret_var = ChannelTypeFeatures_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelTypeFeatures_clone_ptr"))) TS_ChannelTypeFeatures_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ChannelTypeFeatures_clone_ptr"))) TS_ChannelTypeFeatures_clone_ptr(uint64_t arg) { LDKChannelTypeFeatures arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ChannelTypeFeatures_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ChannelTypeFeatures_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelTypeFeatures_clone"))) TS_ChannelTypeFeatures_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ChannelTypeFeatures_clone"))) TS_ChannelTypeFeatures_clone(uint64_t orig) { LDKChannelTypeFeatures orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKChannelTypeFeatures ret_var = ChannelTypeFeatures_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_InitFeatures_free"))) TS_InitFeatures_free(uint32_t this_obj) { +void __attribute__((export_name("TS_InitFeatures_free"))) TS_InitFeatures_free(uint64_t this_obj) { LDKInitFeatures this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); InitFeatures_free(this_obj_conv); } -void __attribute__((export_name("TS_NodeFeatures_free"))) TS_NodeFeatures_free(uint32_t this_obj) { +void __attribute__((export_name("TS_NodeFeatures_free"))) TS_NodeFeatures_free(uint64_t this_obj) { LDKNodeFeatures this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); NodeFeatures_free(this_obj_conv); } -void __attribute__((export_name("TS_ChannelFeatures_free"))) TS_ChannelFeatures_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChannelFeatures_free"))) TS_ChannelFeatures_free(uint64_t this_obj) { LDKChannelFeatures this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChannelFeatures_free(this_obj_conv); } -void __attribute__((export_name("TS_InvoiceFeatures_free"))) TS_InvoiceFeatures_free(uint32_t this_obj) { +void __attribute__((export_name("TS_InvoiceFeatures_free"))) TS_InvoiceFeatures_free(uint64_t this_obj) { LDKInvoiceFeatures this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); InvoiceFeatures_free(this_obj_conv); } -void __attribute__((export_name("TS_ChannelTypeFeatures_free"))) TS_ChannelTypeFeatures_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChannelTypeFeatures_free"))) TS_ChannelTypeFeatures_free(uint64_t this_obj) { LDKChannelTypeFeatures this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChannelTypeFeatures_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_InitFeatures_empty"))) TS_InitFeatures_empty() { +uint64_t __attribute__((export_name("TS_InitFeatures_empty"))) TS_InitFeatures_empty() { LDKInitFeatures ret_var = InitFeatures_empty(); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_InitFeatures_known"))) TS_InitFeatures_known() { +uint64_t __attribute__((export_name("TS_InitFeatures_known"))) TS_InitFeatures_known() { LDKInitFeatures ret_var = InitFeatures_known(); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -jboolean __attribute__((export_name("TS_InitFeatures_requires_unknown_bits"))) TS_InitFeatures_requires_unknown_bits(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_requires_unknown_bits"))) TS_InitFeatures_requires_unknown_bits(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_requires_unknown_bits(&this_arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_NodeFeatures_empty"))) TS_NodeFeatures_empty() { +uint64_t __attribute__((export_name("TS_NodeFeatures_empty"))) TS_NodeFeatures_empty() { LDKNodeFeatures ret_var = NodeFeatures_empty(); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_NodeFeatures_known"))) TS_NodeFeatures_known() { +uint64_t __attribute__((export_name("TS_NodeFeatures_known"))) TS_NodeFeatures_known() { LDKNodeFeatures ret_var = NodeFeatures_known(); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -jboolean __attribute__((export_name("TS_NodeFeatures_requires_unknown_bits"))) TS_NodeFeatures_requires_unknown_bits(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_requires_unknown_bits"))) TS_NodeFeatures_requires_unknown_bits(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_requires_unknown_bits(&this_arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelFeatures_empty"))) TS_ChannelFeatures_empty() { +uint64_t __attribute__((export_name("TS_ChannelFeatures_empty"))) TS_ChannelFeatures_empty() { LDKChannelFeatures ret_var = ChannelFeatures_empty(); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelFeatures_known"))) TS_ChannelFeatures_known() { +uint64_t __attribute__((export_name("TS_ChannelFeatures_known"))) TS_ChannelFeatures_known() { LDKChannelFeatures ret_var = ChannelFeatures_known(); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -jboolean __attribute__((export_name("TS_ChannelFeatures_requires_unknown_bits"))) TS_ChannelFeatures_requires_unknown_bits(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_ChannelFeatures_requires_unknown_bits"))) TS_ChannelFeatures_requires_unknown_bits(uint64_t this_arg) { LDKChannelFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = ChannelFeatures_requires_unknown_bits(&this_arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_InvoiceFeatures_empty"))) TS_InvoiceFeatures_empty() { +uint64_t __attribute__((export_name("TS_InvoiceFeatures_empty"))) TS_InvoiceFeatures_empty() { LDKInvoiceFeatures ret_var = InvoiceFeatures_empty(); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_InvoiceFeatures_known"))) TS_InvoiceFeatures_known() { +uint64_t __attribute__((export_name("TS_InvoiceFeatures_known"))) TS_InvoiceFeatures_known() { LDKInvoiceFeatures ret_var = InvoiceFeatures_known(); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -jboolean __attribute__((export_name("TS_InvoiceFeatures_requires_unknown_bits"))) TS_InvoiceFeatures_requires_unknown_bits(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InvoiceFeatures_requires_unknown_bits"))) TS_InvoiceFeatures_requires_unknown_bits(uint64_t this_arg) { LDKInvoiceFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InvoiceFeatures_requires_unknown_bits(&this_arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelTypeFeatures_empty"))) TS_ChannelTypeFeatures_empty() { +uint64_t __attribute__((export_name("TS_ChannelTypeFeatures_empty"))) TS_ChannelTypeFeatures_empty() { LDKChannelTypeFeatures ret_var = ChannelTypeFeatures_empty(); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelTypeFeatures_known"))) TS_ChannelTypeFeatures_known() { +uint64_t __attribute__((export_name("TS_ChannelTypeFeatures_known"))) TS_ChannelTypeFeatures_known() { LDKChannelTypeFeatures ret_var = ChannelTypeFeatures_known(); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -jboolean __attribute__((export_name("TS_ChannelTypeFeatures_requires_unknown_bits"))) TS_ChannelTypeFeatures_requires_unknown_bits(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_ChannelTypeFeatures_requires_unknown_bits"))) TS_ChannelTypeFeatures_requires_unknown_bits(uint64_t this_arg) { LDKChannelTypeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = ChannelTypeFeatures_requires_unknown_bits(&this_arg_conv); return ret_conv; } -int8_tArray __attribute__((export_name("TS_InitFeatures_write"))) TS_InitFeatures_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_InitFeatures_write"))) TS_InitFeatures_write(uint64_t obj) { LDKInitFeatures obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = InitFeatures_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -37744,21 +35977,22 @@ int8_tArray __attribute__((export_name("TS_InitFeatures_write"))) TS_InitFeatur return ret_arr; } -uint32_t __attribute__((export_name("TS_InitFeatures_read"))) TS_InitFeatures_read(int8_tArray ser) { +uint64_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; LDKCResult_InitFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitFeaturesDecodeErrorZ), "LDKCResult_InitFeaturesDecodeErrorZ"); *ret_conv = InitFeatures_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_ChannelFeatures_write"))) TS_ChannelFeatures_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ChannelFeatures_write"))) TS_ChannelFeatures_write(uint64_t obj) { LDKChannelFeatures obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ChannelFeatures_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -37766,21 +36000,22 @@ int8_tArray __attribute__((export_name("TS_ChannelFeatures_write"))) TS_Channel return ret_arr; } -uint32_t __attribute__((export_name("TS_ChannelFeatures_read"))) TS_ChannelFeatures_read(int8_tArray ser) { +uint64_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; LDKCResult_ChannelFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelFeaturesDecodeErrorZ), "LDKCResult_ChannelFeaturesDecodeErrorZ"); *ret_conv = ChannelFeatures_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_NodeFeatures_write"))) TS_NodeFeatures_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_NodeFeatures_write"))) TS_NodeFeatures_write(uint64_t obj) { LDKNodeFeatures obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = NodeFeatures_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -37788,21 +36023,22 @@ int8_tArray __attribute__((export_name("TS_NodeFeatures_write"))) TS_NodeFeatur return ret_arr; } -uint32_t __attribute__((export_name("TS_NodeFeatures_read"))) TS_NodeFeatures_read(int8_tArray ser) { +uint64_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; LDKCResult_NodeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeFeaturesDecodeErrorZ), "LDKCResult_NodeFeaturesDecodeErrorZ"); *ret_conv = NodeFeatures_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_InvoiceFeatures_write"))) TS_InvoiceFeatures_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_InvoiceFeatures_write"))) TS_InvoiceFeatures_write(uint64_t obj) { LDKInvoiceFeatures obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = InvoiceFeatures_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -37810,21 +36046,22 @@ int8_tArray __attribute__((export_name("TS_InvoiceFeatures_write"))) TS_Invoice return ret_arr; } -uint32_t __attribute__((export_name("TS_InvoiceFeatures_read"))) TS_InvoiceFeatures_read(int8_tArray ser) { +uint64_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; LDKCResult_InvoiceFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceFeaturesDecodeErrorZ), "LDKCResult_InvoiceFeaturesDecodeErrorZ"); *ret_conv = InvoiceFeatures_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_ChannelTypeFeatures_write"))) TS_ChannelTypeFeatures_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ChannelTypeFeatures_write"))) TS_ChannelTypeFeatures_write(uint64_t obj) { LDKChannelTypeFeatures obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ChannelTypeFeatures_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -37832,1165 +36069,1286 @@ int8_tArray __attribute__((export_name("TS_ChannelTypeFeatures_write"))) TS_Cha return ret_arr; } -uint32_t __attribute__((export_name("TS_ChannelTypeFeatures_read"))) TS_ChannelTypeFeatures_read(int8_tArray ser) { +uint64_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; LDKCResult_ChannelTypeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTypeFeaturesDecodeErrorZ), "LDKCResult_ChannelTypeFeaturesDecodeErrorZ"); *ret_conv = ChannelTypeFeatures_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_InitFeatures_set_data_loss_protect_optional"))) TS_InitFeatures_set_data_loss_protect_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_data_loss_protect_optional"))) TS_InitFeatures_set_data_loss_protect_optional(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_data_loss_protect_optional(&this_arg_conv); } -void __attribute__((export_name("TS_InitFeatures_set_data_loss_protect_required"))) TS_InitFeatures_set_data_loss_protect_required(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_data_loss_protect_required"))) TS_InitFeatures_set_data_loss_protect_required(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_data_loss_protect_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_InitFeatures_supports_data_loss_protect"))) TS_InitFeatures_supports_data_loss_protect(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_supports_data_loss_protect"))) TS_InitFeatures_supports_data_loss_protect(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_supports_data_loss_protect(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_NodeFeatures_set_data_loss_protect_optional"))) TS_NodeFeatures_set_data_loss_protect_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_data_loss_protect_optional"))) TS_NodeFeatures_set_data_loss_protect_optional(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_data_loss_protect_optional(&this_arg_conv); } -void __attribute__((export_name("TS_NodeFeatures_set_data_loss_protect_required"))) TS_NodeFeatures_set_data_loss_protect_required(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_data_loss_protect_required"))) TS_NodeFeatures_set_data_loss_protect_required(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_data_loss_protect_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_NodeFeatures_supports_data_loss_protect"))) TS_NodeFeatures_supports_data_loss_protect(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_supports_data_loss_protect"))) TS_NodeFeatures_supports_data_loss_protect(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_supports_data_loss_protect(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_InitFeatures_requires_data_loss_protect"))) TS_InitFeatures_requires_data_loss_protect(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_requires_data_loss_protect"))) TS_InitFeatures_requires_data_loss_protect(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_requires_data_loss_protect(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_NodeFeatures_requires_data_loss_protect"))) TS_NodeFeatures_requires_data_loss_protect(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_requires_data_loss_protect"))) TS_NodeFeatures_requires_data_loss_protect(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_requires_data_loss_protect(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_InitFeatures_set_initial_routing_sync_optional"))) TS_InitFeatures_set_initial_routing_sync_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_initial_routing_sync_optional"))) TS_InitFeatures_set_initial_routing_sync_optional(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_initial_routing_sync_optional(&this_arg_conv); } -void __attribute__((export_name("TS_InitFeatures_set_initial_routing_sync_required"))) TS_InitFeatures_set_initial_routing_sync_required(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_initial_routing_sync_required"))) TS_InitFeatures_set_initial_routing_sync_required(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_initial_routing_sync_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_InitFeatures_initial_routing_sync"))) TS_InitFeatures_initial_routing_sync(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_initial_routing_sync"))) TS_InitFeatures_initial_routing_sync(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_initial_routing_sync(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_InitFeatures_set_upfront_shutdown_script_optional"))) TS_InitFeatures_set_upfront_shutdown_script_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_upfront_shutdown_script_optional"))) TS_InitFeatures_set_upfront_shutdown_script_optional(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_upfront_shutdown_script_optional(&this_arg_conv); } -void __attribute__((export_name("TS_InitFeatures_set_upfront_shutdown_script_required"))) TS_InitFeatures_set_upfront_shutdown_script_required(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_upfront_shutdown_script_required"))) TS_InitFeatures_set_upfront_shutdown_script_required(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_upfront_shutdown_script_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_InitFeatures_supports_upfront_shutdown_script"))) TS_InitFeatures_supports_upfront_shutdown_script(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_supports_upfront_shutdown_script"))) TS_InitFeatures_supports_upfront_shutdown_script(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_supports_upfront_shutdown_script(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_NodeFeatures_set_upfront_shutdown_script_optional"))) TS_NodeFeatures_set_upfront_shutdown_script_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_upfront_shutdown_script_optional"))) TS_NodeFeatures_set_upfront_shutdown_script_optional(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_upfront_shutdown_script_optional(&this_arg_conv); } -void __attribute__((export_name("TS_NodeFeatures_set_upfront_shutdown_script_required"))) TS_NodeFeatures_set_upfront_shutdown_script_required(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_upfront_shutdown_script_required"))) TS_NodeFeatures_set_upfront_shutdown_script_required(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_upfront_shutdown_script_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_NodeFeatures_supports_upfront_shutdown_script"))) TS_NodeFeatures_supports_upfront_shutdown_script(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_supports_upfront_shutdown_script"))) TS_NodeFeatures_supports_upfront_shutdown_script(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_supports_upfront_shutdown_script(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_InitFeatures_requires_upfront_shutdown_script"))) TS_InitFeatures_requires_upfront_shutdown_script(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_requires_upfront_shutdown_script"))) TS_InitFeatures_requires_upfront_shutdown_script(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_requires_upfront_shutdown_script(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_NodeFeatures_requires_upfront_shutdown_script"))) TS_NodeFeatures_requires_upfront_shutdown_script(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_requires_upfront_shutdown_script"))) TS_NodeFeatures_requires_upfront_shutdown_script(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_requires_upfront_shutdown_script(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_InitFeatures_set_gossip_queries_optional"))) TS_InitFeatures_set_gossip_queries_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_gossip_queries_optional"))) TS_InitFeatures_set_gossip_queries_optional(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_gossip_queries_optional(&this_arg_conv); } -void __attribute__((export_name("TS_InitFeatures_set_gossip_queries_required"))) TS_InitFeatures_set_gossip_queries_required(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_gossip_queries_required"))) TS_InitFeatures_set_gossip_queries_required(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_gossip_queries_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_InitFeatures_supports_gossip_queries"))) TS_InitFeatures_supports_gossip_queries(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_supports_gossip_queries"))) TS_InitFeatures_supports_gossip_queries(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_supports_gossip_queries(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_NodeFeatures_set_gossip_queries_optional"))) TS_NodeFeatures_set_gossip_queries_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_gossip_queries_optional"))) TS_NodeFeatures_set_gossip_queries_optional(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_gossip_queries_optional(&this_arg_conv); } -void __attribute__((export_name("TS_NodeFeatures_set_gossip_queries_required"))) TS_NodeFeatures_set_gossip_queries_required(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_gossip_queries_required"))) TS_NodeFeatures_set_gossip_queries_required(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_gossip_queries_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_NodeFeatures_supports_gossip_queries"))) TS_NodeFeatures_supports_gossip_queries(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_supports_gossip_queries"))) TS_NodeFeatures_supports_gossip_queries(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_supports_gossip_queries(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_InitFeatures_requires_gossip_queries"))) TS_InitFeatures_requires_gossip_queries(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_requires_gossip_queries"))) TS_InitFeatures_requires_gossip_queries(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_requires_gossip_queries(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_NodeFeatures_requires_gossip_queries"))) TS_NodeFeatures_requires_gossip_queries(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_requires_gossip_queries"))) TS_NodeFeatures_requires_gossip_queries(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_requires_gossip_queries(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_InitFeatures_set_variable_length_onion_optional"))) TS_InitFeatures_set_variable_length_onion_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_variable_length_onion_optional"))) TS_InitFeatures_set_variable_length_onion_optional(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_variable_length_onion_optional(&this_arg_conv); } -void __attribute__((export_name("TS_InitFeatures_set_variable_length_onion_required"))) TS_InitFeatures_set_variable_length_onion_required(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_variable_length_onion_required"))) TS_InitFeatures_set_variable_length_onion_required(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_variable_length_onion_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_InitFeatures_supports_variable_length_onion"))) TS_InitFeatures_supports_variable_length_onion(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_supports_variable_length_onion"))) TS_InitFeatures_supports_variable_length_onion(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_supports_variable_length_onion(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_NodeFeatures_set_variable_length_onion_optional"))) TS_NodeFeatures_set_variable_length_onion_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_variable_length_onion_optional"))) TS_NodeFeatures_set_variable_length_onion_optional(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_variable_length_onion_optional(&this_arg_conv); } -void __attribute__((export_name("TS_NodeFeatures_set_variable_length_onion_required"))) TS_NodeFeatures_set_variable_length_onion_required(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_variable_length_onion_required"))) TS_NodeFeatures_set_variable_length_onion_required(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_variable_length_onion_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_NodeFeatures_supports_variable_length_onion"))) TS_NodeFeatures_supports_variable_length_onion(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_supports_variable_length_onion"))) TS_NodeFeatures_supports_variable_length_onion(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_supports_variable_length_onion(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_InvoiceFeatures_set_variable_length_onion_optional"))) TS_InvoiceFeatures_set_variable_length_onion_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_InvoiceFeatures_set_variable_length_onion_optional"))) TS_InvoiceFeatures_set_variable_length_onion_optional(uint64_t this_arg) { LDKInvoiceFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InvoiceFeatures_set_variable_length_onion_optional(&this_arg_conv); } -void __attribute__((export_name("TS_InvoiceFeatures_set_variable_length_onion_required"))) TS_InvoiceFeatures_set_variable_length_onion_required(uint32_t this_arg) { +void __attribute__((export_name("TS_InvoiceFeatures_set_variable_length_onion_required"))) TS_InvoiceFeatures_set_variable_length_onion_required(uint64_t this_arg) { LDKInvoiceFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InvoiceFeatures_set_variable_length_onion_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_InvoiceFeatures_supports_variable_length_onion"))) TS_InvoiceFeatures_supports_variable_length_onion(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InvoiceFeatures_supports_variable_length_onion"))) TS_InvoiceFeatures_supports_variable_length_onion(uint64_t this_arg) { LDKInvoiceFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InvoiceFeatures_supports_variable_length_onion(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_InitFeatures_requires_variable_length_onion"))) TS_InitFeatures_requires_variable_length_onion(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_requires_variable_length_onion"))) TS_InitFeatures_requires_variable_length_onion(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_requires_variable_length_onion(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_NodeFeatures_requires_variable_length_onion"))) TS_NodeFeatures_requires_variable_length_onion(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_requires_variable_length_onion"))) TS_NodeFeatures_requires_variable_length_onion(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_requires_variable_length_onion(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_InvoiceFeatures_requires_variable_length_onion"))) TS_InvoiceFeatures_requires_variable_length_onion(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InvoiceFeatures_requires_variable_length_onion"))) TS_InvoiceFeatures_requires_variable_length_onion(uint64_t this_arg) { LDKInvoiceFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InvoiceFeatures_requires_variable_length_onion(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_InitFeatures_set_static_remote_key_optional"))) TS_InitFeatures_set_static_remote_key_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_static_remote_key_optional"))) TS_InitFeatures_set_static_remote_key_optional(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_static_remote_key_optional(&this_arg_conv); } -void __attribute__((export_name("TS_InitFeatures_set_static_remote_key_required"))) TS_InitFeatures_set_static_remote_key_required(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_static_remote_key_required"))) TS_InitFeatures_set_static_remote_key_required(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_static_remote_key_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_InitFeatures_supports_static_remote_key"))) TS_InitFeatures_supports_static_remote_key(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_supports_static_remote_key"))) TS_InitFeatures_supports_static_remote_key(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_supports_static_remote_key(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_NodeFeatures_set_static_remote_key_optional"))) TS_NodeFeatures_set_static_remote_key_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_static_remote_key_optional"))) TS_NodeFeatures_set_static_remote_key_optional(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_static_remote_key_optional(&this_arg_conv); } -void __attribute__((export_name("TS_NodeFeatures_set_static_remote_key_required"))) TS_NodeFeatures_set_static_remote_key_required(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_static_remote_key_required"))) TS_NodeFeatures_set_static_remote_key_required(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_static_remote_key_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_NodeFeatures_supports_static_remote_key"))) TS_NodeFeatures_supports_static_remote_key(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_supports_static_remote_key"))) TS_NodeFeatures_supports_static_remote_key(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_supports_static_remote_key(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelTypeFeatures_set_static_remote_key_optional"))) TS_ChannelTypeFeatures_set_static_remote_key_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_ChannelTypeFeatures_set_static_remote_key_optional"))) TS_ChannelTypeFeatures_set_static_remote_key_optional(uint64_t this_arg) { LDKChannelTypeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; ChannelTypeFeatures_set_static_remote_key_optional(&this_arg_conv); } -void __attribute__((export_name("TS_ChannelTypeFeatures_set_static_remote_key_required"))) TS_ChannelTypeFeatures_set_static_remote_key_required(uint32_t this_arg) { +void __attribute__((export_name("TS_ChannelTypeFeatures_set_static_remote_key_required"))) TS_ChannelTypeFeatures_set_static_remote_key_required(uint64_t this_arg) { LDKChannelTypeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; ChannelTypeFeatures_set_static_remote_key_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_ChannelTypeFeatures_supports_static_remote_key"))) TS_ChannelTypeFeatures_supports_static_remote_key(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_ChannelTypeFeatures_supports_static_remote_key"))) TS_ChannelTypeFeatures_supports_static_remote_key(uint64_t this_arg) { LDKChannelTypeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = ChannelTypeFeatures_supports_static_remote_key(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_InitFeatures_requires_static_remote_key"))) TS_InitFeatures_requires_static_remote_key(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_requires_static_remote_key"))) TS_InitFeatures_requires_static_remote_key(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_requires_static_remote_key(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_NodeFeatures_requires_static_remote_key"))) TS_NodeFeatures_requires_static_remote_key(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_requires_static_remote_key"))) TS_NodeFeatures_requires_static_remote_key(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_requires_static_remote_key(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_ChannelTypeFeatures_requires_static_remote_key"))) TS_ChannelTypeFeatures_requires_static_remote_key(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_ChannelTypeFeatures_requires_static_remote_key"))) TS_ChannelTypeFeatures_requires_static_remote_key(uint64_t this_arg) { LDKChannelTypeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = ChannelTypeFeatures_requires_static_remote_key(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_InitFeatures_set_payment_secret_optional"))) TS_InitFeatures_set_payment_secret_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_payment_secret_optional"))) TS_InitFeatures_set_payment_secret_optional(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_payment_secret_optional(&this_arg_conv); } -void __attribute__((export_name("TS_InitFeatures_set_payment_secret_required"))) TS_InitFeatures_set_payment_secret_required(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_payment_secret_required"))) TS_InitFeatures_set_payment_secret_required(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_payment_secret_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_InitFeatures_supports_payment_secret"))) TS_InitFeatures_supports_payment_secret(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_supports_payment_secret"))) TS_InitFeatures_supports_payment_secret(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_supports_payment_secret(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_NodeFeatures_set_payment_secret_optional"))) TS_NodeFeatures_set_payment_secret_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_payment_secret_optional"))) TS_NodeFeatures_set_payment_secret_optional(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_payment_secret_optional(&this_arg_conv); } -void __attribute__((export_name("TS_NodeFeatures_set_payment_secret_required"))) TS_NodeFeatures_set_payment_secret_required(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_payment_secret_required"))) TS_NodeFeatures_set_payment_secret_required(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_payment_secret_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_NodeFeatures_supports_payment_secret"))) TS_NodeFeatures_supports_payment_secret(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_supports_payment_secret"))) TS_NodeFeatures_supports_payment_secret(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_supports_payment_secret(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_InvoiceFeatures_set_payment_secret_optional"))) TS_InvoiceFeatures_set_payment_secret_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_InvoiceFeatures_set_payment_secret_optional"))) TS_InvoiceFeatures_set_payment_secret_optional(uint64_t this_arg) { LDKInvoiceFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InvoiceFeatures_set_payment_secret_optional(&this_arg_conv); } -void __attribute__((export_name("TS_InvoiceFeatures_set_payment_secret_required"))) TS_InvoiceFeatures_set_payment_secret_required(uint32_t this_arg) { +void __attribute__((export_name("TS_InvoiceFeatures_set_payment_secret_required"))) TS_InvoiceFeatures_set_payment_secret_required(uint64_t this_arg) { LDKInvoiceFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InvoiceFeatures_set_payment_secret_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_InvoiceFeatures_supports_payment_secret"))) TS_InvoiceFeatures_supports_payment_secret(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InvoiceFeatures_supports_payment_secret"))) TS_InvoiceFeatures_supports_payment_secret(uint64_t this_arg) { LDKInvoiceFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InvoiceFeatures_supports_payment_secret(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_InitFeatures_requires_payment_secret"))) TS_InitFeatures_requires_payment_secret(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_requires_payment_secret"))) TS_InitFeatures_requires_payment_secret(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_requires_payment_secret(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_NodeFeatures_requires_payment_secret"))) TS_NodeFeatures_requires_payment_secret(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_requires_payment_secret"))) TS_NodeFeatures_requires_payment_secret(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_requires_payment_secret(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_InvoiceFeatures_requires_payment_secret"))) TS_InvoiceFeatures_requires_payment_secret(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InvoiceFeatures_requires_payment_secret"))) TS_InvoiceFeatures_requires_payment_secret(uint64_t this_arg) { LDKInvoiceFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InvoiceFeatures_requires_payment_secret(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_InitFeatures_set_basic_mpp_optional"))) TS_InitFeatures_set_basic_mpp_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_basic_mpp_optional"))) TS_InitFeatures_set_basic_mpp_optional(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_basic_mpp_optional(&this_arg_conv); } -void __attribute__((export_name("TS_InitFeatures_set_basic_mpp_required"))) TS_InitFeatures_set_basic_mpp_required(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_basic_mpp_required"))) TS_InitFeatures_set_basic_mpp_required(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_basic_mpp_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_InitFeatures_supports_basic_mpp"))) TS_InitFeatures_supports_basic_mpp(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_supports_basic_mpp"))) TS_InitFeatures_supports_basic_mpp(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_supports_basic_mpp(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_NodeFeatures_set_basic_mpp_optional"))) TS_NodeFeatures_set_basic_mpp_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_basic_mpp_optional"))) TS_NodeFeatures_set_basic_mpp_optional(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_basic_mpp_optional(&this_arg_conv); } -void __attribute__((export_name("TS_NodeFeatures_set_basic_mpp_required"))) TS_NodeFeatures_set_basic_mpp_required(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_basic_mpp_required"))) TS_NodeFeatures_set_basic_mpp_required(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_basic_mpp_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_NodeFeatures_supports_basic_mpp"))) TS_NodeFeatures_supports_basic_mpp(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_supports_basic_mpp"))) TS_NodeFeatures_supports_basic_mpp(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_supports_basic_mpp(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_InvoiceFeatures_set_basic_mpp_optional"))) TS_InvoiceFeatures_set_basic_mpp_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_InvoiceFeatures_set_basic_mpp_optional"))) TS_InvoiceFeatures_set_basic_mpp_optional(uint64_t this_arg) { LDKInvoiceFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InvoiceFeatures_set_basic_mpp_optional(&this_arg_conv); } -void __attribute__((export_name("TS_InvoiceFeatures_set_basic_mpp_required"))) TS_InvoiceFeatures_set_basic_mpp_required(uint32_t this_arg) { +void __attribute__((export_name("TS_InvoiceFeatures_set_basic_mpp_required"))) TS_InvoiceFeatures_set_basic_mpp_required(uint64_t this_arg) { LDKInvoiceFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InvoiceFeatures_set_basic_mpp_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_InvoiceFeatures_supports_basic_mpp"))) TS_InvoiceFeatures_supports_basic_mpp(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InvoiceFeatures_supports_basic_mpp"))) TS_InvoiceFeatures_supports_basic_mpp(uint64_t this_arg) { LDKInvoiceFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InvoiceFeatures_supports_basic_mpp(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_InitFeatures_requires_basic_mpp"))) TS_InitFeatures_requires_basic_mpp(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_requires_basic_mpp"))) TS_InitFeatures_requires_basic_mpp(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_requires_basic_mpp(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_NodeFeatures_requires_basic_mpp"))) TS_NodeFeatures_requires_basic_mpp(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_requires_basic_mpp"))) TS_NodeFeatures_requires_basic_mpp(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_requires_basic_mpp(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_InvoiceFeatures_requires_basic_mpp"))) TS_InvoiceFeatures_requires_basic_mpp(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InvoiceFeatures_requires_basic_mpp"))) TS_InvoiceFeatures_requires_basic_mpp(uint64_t this_arg) { LDKInvoiceFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InvoiceFeatures_requires_basic_mpp(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_InitFeatures_set_wumbo_optional"))) TS_InitFeatures_set_wumbo_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_wumbo_optional"))) TS_InitFeatures_set_wumbo_optional(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_wumbo_optional(&this_arg_conv); } -void __attribute__((export_name("TS_InitFeatures_set_wumbo_required"))) TS_InitFeatures_set_wumbo_required(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_wumbo_required"))) TS_InitFeatures_set_wumbo_required(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_wumbo_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_InitFeatures_supports_wumbo"))) TS_InitFeatures_supports_wumbo(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_supports_wumbo"))) TS_InitFeatures_supports_wumbo(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_supports_wumbo(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_NodeFeatures_set_wumbo_optional"))) TS_NodeFeatures_set_wumbo_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_wumbo_optional"))) TS_NodeFeatures_set_wumbo_optional(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_wumbo_optional(&this_arg_conv); } -void __attribute__((export_name("TS_NodeFeatures_set_wumbo_required"))) TS_NodeFeatures_set_wumbo_required(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_wumbo_required"))) TS_NodeFeatures_set_wumbo_required(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_wumbo_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_NodeFeatures_supports_wumbo"))) TS_NodeFeatures_supports_wumbo(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_supports_wumbo"))) TS_NodeFeatures_supports_wumbo(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_supports_wumbo(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_InitFeatures_requires_wumbo"))) TS_InitFeatures_requires_wumbo(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_requires_wumbo"))) TS_InitFeatures_requires_wumbo(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_requires_wumbo(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_NodeFeatures_requires_wumbo"))) TS_NodeFeatures_requires_wumbo(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_requires_wumbo"))) TS_NodeFeatures_requires_wumbo(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_requires_wumbo(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_InitFeatures_set_shutdown_any_segwit_optional"))) TS_InitFeatures_set_shutdown_any_segwit_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_shutdown_any_segwit_optional"))) TS_InitFeatures_set_shutdown_any_segwit_optional(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_shutdown_any_segwit_optional(&this_arg_conv); } -void __attribute__((export_name("TS_InitFeatures_set_shutdown_any_segwit_required"))) TS_InitFeatures_set_shutdown_any_segwit_required(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_shutdown_any_segwit_required"))) TS_InitFeatures_set_shutdown_any_segwit_required(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_shutdown_any_segwit_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_InitFeatures_supports_shutdown_anysegwit"))) TS_InitFeatures_supports_shutdown_anysegwit(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_supports_shutdown_anysegwit"))) TS_InitFeatures_supports_shutdown_anysegwit(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_supports_shutdown_anysegwit(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_NodeFeatures_set_shutdown_any_segwit_optional"))) TS_NodeFeatures_set_shutdown_any_segwit_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_shutdown_any_segwit_optional"))) TS_NodeFeatures_set_shutdown_any_segwit_optional(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_shutdown_any_segwit_optional(&this_arg_conv); } -void __attribute__((export_name("TS_NodeFeatures_set_shutdown_any_segwit_required"))) TS_NodeFeatures_set_shutdown_any_segwit_required(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_shutdown_any_segwit_required"))) TS_NodeFeatures_set_shutdown_any_segwit_required(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_shutdown_any_segwit_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_NodeFeatures_supports_shutdown_anysegwit"))) TS_NodeFeatures_supports_shutdown_anysegwit(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_supports_shutdown_anysegwit"))) TS_NodeFeatures_supports_shutdown_anysegwit(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_supports_shutdown_anysegwit(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_InitFeatures_requires_shutdown_anysegwit"))) TS_InitFeatures_requires_shutdown_anysegwit(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_requires_shutdown_anysegwit"))) TS_InitFeatures_requires_shutdown_anysegwit(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_requires_shutdown_anysegwit(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_NodeFeatures_requires_shutdown_anysegwit"))) TS_NodeFeatures_requires_shutdown_anysegwit(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_requires_shutdown_anysegwit"))) TS_NodeFeatures_requires_shutdown_anysegwit(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_requires_shutdown_anysegwit(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_InitFeatures_set_channel_type_optional"))) TS_InitFeatures_set_channel_type_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_channel_type_optional"))) TS_InitFeatures_set_channel_type_optional(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_channel_type_optional(&this_arg_conv); } -void __attribute__((export_name("TS_InitFeatures_set_channel_type_required"))) TS_InitFeatures_set_channel_type_required(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_channel_type_required"))) TS_InitFeatures_set_channel_type_required(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_channel_type_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_InitFeatures_supports_channel_type"))) TS_InitFeatures_supports_channel_type(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_supports_channel_type"))) TS_InitFeatures_supports_channel_type(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_supports_channel_type(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_NodeFeatures_set_channel_type_optional"))) TS_NodeFeatures_set_channel_type_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_channel_type_optional"))) TS_NodeFeatures_set_channel_type_optional(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_channel_type_optional(&this_arg_conv); } -void __attribute__((export_name("TS_NodeFeatures_set_channel_type_required"))) TS_NodeFeatures_set_channel_type_required(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_channel_type_required"))) TS_NodeFeatures_set_channel_type_required(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_channel_type_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_NodeFeatures_supports_channel_type"))) TS_NodeFeatures_supports_channel_type(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_supports_channel_type"))) TS_NodeFeatures_supports_channel_type(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_supports_channel_type(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_InitFeatures_requires_channel_type"))) TS_InitFeatures_requires_channel_type(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_requires_channel_type"))) TS_InitFeatures_requires_channel_type(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_requires_channel_type(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_NodeFeatures_requires_channel_type"))) TS_NodeFeatures_requires_channel_type(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_requires_channel_type"))) TS_NodeFeatures_requires_channel_type(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_requires_channel_type(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_InitFeatures_set_scid_privacy_optional"))) TS_InitFeatures_set_scid_privacy_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_scid_privacy_optional"))) TS_InitFeatures_set_scid_privacy_optional(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_scid_privacy_optional(&this_arg_conv); } -void __attribute__((export_name("TS_InitFeatures_set_scid_privacy_required"))) TS_InitFeatures_set_scid_privacy_required(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_scid_privacy_required"))) TS_InitFeatures_set_scid_privacy_required(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_scid_privacy_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_InitFeatures_supports_scid_privacy"))) TS_InitFeatures_supports_scid_privacy(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_supports_scid_privacy"))) TS_InitFeatures_supports_scid_privacy(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_supports_scid_privacy(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_NodeFeatures_set_scid_privacy_optional"))) TS_NodeFeatures_set_scid_privacy_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_scid_privacy_optional"))) TS_NodeFeatures_set_scid_privacy_optional(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_scid_privacy_optional(&this_arg_conv); } -void __attribute__((export_name("TS_NodeFeatures_set_scid_privacy_required"))) TS_NodeFeatures_set_scid_privacy_required(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_scid_privacy_required"))) TS_NodeFeatures_set_scid_privacy_required(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_scid_privacy_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_NodeFeatures_supports_scid_privacy"))) TS_NodeFeatures_supports_scid_privacy(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_supports_scid_privacy"))) TS_NodeFeatures_supports_scid_privacy(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_supports_scid_privacy(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelTypeFeatures_set_scid_privacy_optional"))) TS_ChannelTypeFeatures_set_scid_privacy_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_ChannelTypeFeatures_set_scid_privacy_optional"))) TS_ChannelTypeFeatures_set_scid_privacy_optional(uint64_t this_arg) { LDKChannelTypeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; ChannelTypeFeatures_set_scid_privacy_optional(&this_arg_conv); } -void __attribute__((export_name("TS_ChannelTypeFeatures_set_scid_privacy_required"))) TS_ChannelTypeFeatures_set_scid_privacy_required(uint32_t this_arg) { +void __attribute__((export_name("TS_ChannelTypeFeatures_set_scid_privacy_required"))) TS_ChannelTypeFeatures_set_scid_privacy_required(uint64_t this_arg) { LDKChannelTypeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; ChannelTypeFeatures_set_scid_privacy_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_ChannelTypeFeatures_supports_scid_privacy"))) TS_ChannelTypeFeatures_supports_scid_privacy(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_ChannelTypeFeatures_supports_scid_privacy"))) TS_ChannelTypeFeatures_supports_scid_privacy(uint64_t this_arg) { LDKChannelTypeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = ChannelTypeFeatures_supports_scid_privacy(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_InitFeatures_requires_scid_privacy"))) TS_InitFeatures_requires_scid_privacy(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_requires_scid_privacy"))) TS_InitFeatures_requires_scid_privacy(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_requires_scid_privacy(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_NodeFeatures_requires_scid_privacy"))) TS_NodeFeatures_requires_scid_privacy(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_requires_scid_privacy"))) TS_NodeFeatures_requires_scid_privacy(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_requires_scid_privacy(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_ChannelTypeFeatures_requires_scid_privacy"))) TS_ChannelTypeFeatures_requires_scid_privacy(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_ChannelTypeFeatures_requires_scid_privacy"))) TS_ChannelTypeFeatures_requires_scid_privacy(uint64_t this_arg) { LDKChannelTypeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = ChannelTypeFeatures_requires_scid_privacy(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_InitFeatures_set_zero_conf_optional"))) TS_InitFeatures_set_zero_conf_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_zero_conf_optional"))) TS_InitFeatures_set_zero_conf_optional(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_zero_conf_optional(&this_arg_conv); } -void __attribute__((export_name("TS_InitFeatures_set_zero_conf_required"))) TS_InitFeatures_set_zero_conf_required(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_zero_conf_required"))) TS_InitFeatures_set_zero_conf_required(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_zero_conf_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_InitFeatures_supports_zero_conf"))) TS_InitFeatures_supports_zero_conf(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_supports_zero_conf"))) TS_InitFeatures_supports_zero_conf(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_supports_zero_conf(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_NodeFeatures_set_zero_conf_optional"))) TS_NodeFeatures_set_zero_conf_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_zero_conf_optional"))) TS_NodeFeatures_set_zero_conf_optional(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_zero_conf_optional(&this_arg_conv); } -void __attribute__((export_name("TS_NodeFeatures_set_zero_conf_required"))) TS_NodeFeatures_set_zero_conf_required(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_zero_conf_required"))) TS_NodeFeatures_set_zero_conf_required(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_zero_conf_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_NodeFeatures_supports_zero_conf"))) TS_NodeFeatures_supports_zero_conf(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_supports_zero_conf"))) TS_NodeFeatures_supports_zero_conf(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_supports_zero_conf(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelTypeFeatures_set_zero_conf_optional"))) TS_ChannelTypeFeatures_set_zero_conf_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_ChannelTypeFeatures_set_zero_conf_optional"))) TS_ChannelTypeFeatures_set_zero_conf_optional(uint64_t this_arg) { LDKChannelTypeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; ChannelTypeFeatures_set_zero_conf_optional(&this_arg_conv); } -void __attribute__((export_name("TS_ChannelTypeFeatures_set_zero_conf_required"))) TS_ChannelTypeFeatures_set_zero_conf_required(uint32_t this_arg) { +void __attribute__((export_name("TS_ChannelTypeFeatures_set_zero_conf_required"))) TS_ChannelTypeFeatures_set_zero_conf_required(uint64_t this_arg) { LDKChannelTypeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; ChannelTypeFeatures_set_zero_conf_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_ChannelTypeFeatures_supports_zero_conf"))) TS_ChannelTypeFeatures_supports_zero_conf(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_ChannelTypeFeatures_supports_zero_conf"))) TS_ChannelTypeFeatures_supports_zero_conf(uint64_t this_arg) { LDKChannelTypeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = ChannelTypeFeatures_supports_zero_conf(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_InitFeatures_requires_zero_conf"))) TS_InitFeatures_requires_zero_conf(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_requires_zero_conf"))) TS_InitFeatures_requires_zero_conf(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_requires_zero_conf(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_NodeFeatures_requires_zero_conf"))) TS_NodeFeatures_requires_zero_conf(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_requires_zero_conf"))) TS_NodeFeatures_requires_zero_conf(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_requires_zero_conf(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_ChannelTypeFeatures_requires_zero_conf"))) TS_ChannelTypeFeatures_requires_zero_conf(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_ChannelTypeFeatures_requires_zero_conf"))) TS_ChannelTypeFeatures_requires_zero_conf(uint64_t this_arg) { LDKChannelTypeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = ChannelTypeFeatures_requires_zero_conf(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_NodeFeatures_set_keysend_optional"))) TS_NodeFeatures_set_keysend_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_keysend_optional"))) TS_NodeFeatures_set_keysend_optional(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_keysend_optional(&this_arg_conv); } -void __attribute__((export_name("TS_NodeFeatures_set_keysend_required"))) TS_NodeFeatures_set_keysend_required(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_keysend_required"))) TS_NodeFeatures_set_keysend_required(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_keysend_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_NodeFeatures_supports_keysend"))) TS_NodeFeatures_supports_keysend(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_supports_keysend"))) TS_NodeFeatures_supports_keysend(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_supports_keysend(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_NodeFeatures_requires_keysend"))) TS_NodeFeatures_requires_keysend(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_requires_keysend"))) TS_NodeFeatures_requires_keysend(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_requires_keysend(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_ShutdownScript_free"))) TS_ShutdownScript_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ShutdownScript_free"))) TS_ShutdownScript_free(uint64_t this_obj) { LDKShutdownScript this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ShutdownScript_free(this_obj_conv); } -static inline uintptr_t ShutdownScript_clone_ptr(LDKShutdownScript *NONNULL_PTR arg) { +static inline uint64_t ShutdownScript_clone_ptr(LDKShutdownScript *NONNULL_PTR arg) { LDKShutdownScript ret_var = ShutdownScript_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ShutdownScript_clone_ptr"))) TS_ShutdownScript_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ShutdownScript_clone_ptr"))) TS_ShutdownScript_clone_ptr(uint64_t arg) { LDKShutdownScript arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ShutdownScript_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ShutdownScript_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ShutdownScript_clone"))) TS_ShutdownScript_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ShutdownScript_clone"))) TS_ShutdownScript_clone(uint64_t orig) { LDKShutdownScript orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKShutdownScript ret_var = ShutdownScript_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_InvalidShutdownScript_free"))) TS_InvalidShutdownScript_free(uint32_t this_obj) { +void __attribute__((export_name("TS_InvalidShutdownScript_free"))) TS_InvalidShutdownScript_free(uint64_t this_obj) { LDKInvalidShutdownScript this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); InvalidShutdownScript_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_InvalidShutdownScript_get_script"))) TS_InvalidShutdownScript_get_script(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_InvalidShutdownScript_get_script"))) TS_InvalidShutdownScript_get_script(uint64_t this_ptr) { LDKInvalidShutdownScript this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKu8slice ret_var = InvalidShutdownScript_get_script(&this_ptr_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); return ret_arr; } -void __attribute__((export_name("TS_InvalidShutdownScript_set_script"))) TS_InvalidShutdownScript_set_script(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_InvalidShutdownScript_set_script"))) TS_InvalidShutdownScript_set_script(uint64_t this_ptr, int8_tArray val) { LDKInvalidShutdownScript this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_u8Z val_ref; val_ref.datalen = val->arr_len; val_ref.data = MALLOC(val_ref.datalen, "LDKCVec_u8Z Bytes"); @@ -38998,66 +37356,54 @@ void __attribute__((export_name("TS_InvalidShutdownScript_set_script"))) TS_Inv InvalidShutdownScript_set_script(&this_ptr_conv, val_ref); } -uint32_t __attribute__((export_name("TS_InvalidShutdownScript_new"))) TS_InvalidShutdownScript_new(int8_tArray script_arg) { +uint64_t __attribute__((export_name("TS_InvalidShutdownScript_new"))) TS_InvalidShutdownScript_new(int8_tArray script_arg) { 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); FREE(script_arg); LDKInvalidShutdownScript ret_var = InvalidShutdownScript_new(script_arg_ref); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t InvalidShutdownScript_clone_ptr(LDKInvalidShutdownScript *NONNULL_PTR arg) { +static inline uint64_t InvalidShutdownScript_clone_ptr(LDKInvalidShutdownScript *NONNULL_PTR arg) { LDKInvalidShutdownScript ret_var = InvalidShutdownScript_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_InvalidShutdownScript_clone_ptr"))) TS_InvalidShutdownScript_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_InvalidShutdownScript_clone_ptr"))) TS_InvalidShutdownScript_clone_ptr(uint64_t arg) { LDKInvalidShutdownScript arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = InvalidShutdownScript_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = InvalidShutdownScript_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_InvalidShutdownScript_clone"))) TS_InvalidShutdownScript_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_InvalidShutdownScript_clone"))) TS_InvalidShutdownScript_clone(uint64_t orig) { LDKInvalidShutdownScript orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKInvalidShutdownScript ret_var = InvalidShutdownScript_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_ShutdownScript_write"))) TS_ShutdownScript_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ShutdownScript_write"))) TS_ShutdownScript_write(uint64_t obj) { LDKShutdownScript obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ShutdownScript_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -39065,51 +37411,41 @@ int8_tArray __attribute__((export_name("TS_ShutdownScript_write"))) TS_Shutdown return ret_arr; } -uint32_t __attribute__((export_name("TS_ShutdownScript_read"))) TS_ShutdownScript_read(int8_tArray ser) { +uint64_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; LDKCResult_ShutdownScriptDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptDecodeErrorZ), "LDKCResult_ShutdownScriptDecodeErrorZ"); *ret_conv = ShutdownScript_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_ShutdownScript_new_p2wpkh"))) TS_ShutdownScript_new_p2wpkh(int8_tArray pubkey_hash) { +uint64_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); FREE(pubkey_hash); unsigned char (*pubkey_hash_ref)[20] = &pubkey_hash_arr; LDKShutdownScript ret_var = ShutdownScript_new_p2wpkh(pubkey_hash_ref); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ShutdownScript_new_p2wsh"))) TS_ShutdownScript_new_p2wsh(int8_tArray script_hash) { +uint64_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); FREE(script_hash); unsigned char (*script_hash_ref)[32] = &script_hash_arr; LDKShutdownScript ret_var = ShutdownScript_new_p2wsh(script_hash_ref); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ShutdownScript_new_witness_program"))) TS_ShutdownScript_new_witness_program(int8_t version, int8_tArray program) { +uint64_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; @@ -39117,13 +37453,13 @@ uint32_t __attribute__((export_name("TS_ShutdownScript_new_witness_program"))) LDKCResult_ShutdownScriptInvalidShutdownScriptZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptInvalidShutdownScriptZ), "LDKCResult_ShutdownScriptInvalidShutdownScriptZ"); *ret_conv = ShutdownScript_new_witness_program((LDKWitnessVersion){ ._0 = version }, program_ref); FREE(program); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_ShutdownScript_into_inner"))) TS_ShutdownScript_into_inner(uint32_t this_arg) { +int8_tArray __attribute__((export_name("TS_ShutdownScript_into_inner"))) TS_ShutdownScript_into_inner(uint64_t this_arg) { LDKShutdownScript this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0); + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); 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); @@ -39133,156 +37469,149 @@ int8_tArray __attribute__((export_name("TS_ShutdownScript_into_inner"))) TS_Shu return ret_arr; } -int8_tArray __attribute__((export_name("TS_ShutdownScript_as_legacy_pubkey"))) TS_ShutdownScript_as_legacy_pubkey(uint32_t this_arg) { +int8_tArray __attribute__((export_name("TS_ShutdownScript_as_legacy_pubkey"))) TS_ShutdownScript_as_legacy_pubkey(uint64_t this_arg) { LDKShutdownScript this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; 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; } -jboolean __attribute__((export_name("TS_ShutdownScript_is_compatible"))) TS_ShutdownScript_is_compatible(uint32_t this_arg, uint32_t features) { +jboolean __attribute__((export_name("TS_ShutdownScript_is_compatible"))) TS_ShutdownScript_is_compatible(uint64_t this_arg, uint64_t features) { LDKShutdownScript this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKInitFeatures features_conv; - features_conv.inner = (void*)(features & (~1)); - features_conv.is_owned = false; + features_conv.inner = untag_ptr(features); + features_conv.is_owned = ptr_is_owned(features); CHECK_INNER_FIELD_ACCESS_OR_NULL(features_conv); + features_conv.is_owned = false; jboolean ret_conv = ShutdownScript_is_compatible(&this_arg_conv, &features_conv); return ret_conv; } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_CustomMessageReader_free"))) TS_CustomMessageReader_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKCustomMessageReader this_ptr_conv = *(LDKCustomMessageReader*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); CustomMessageReader_free(this_ptr_conv); } -static inline uintptr_t Type_clone_ptr(LDKType *NONNULL_PTR arg) { +static inline uint64_t Type_clone_ptr(LDKType *NONNULL_PTR arg) { LDKType* ret_ret = MALLOC(sizeof(LDKType), "LDKType"); *ret_ret = Type_clone(arg); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_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); } +int64_t __attribute__((export_name("TS_Type_clone_ptr"))) TS_Type_clone_ptr(uint64_t arg) { + void* arg_ptr = untag_ptr(arg); + if (ptr_is_owned(arg)) { CHECK_ACCESS(arg_ptr); } LDKType* arg_conv = (LDKType*)arg_ptr; - uint32_t ret_conv = Type_clone_ptr(arg_conv); + int64_t ret_conv = Type_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_Type_clone"))) TS_Type_clone(uint32_t orig) { - void* orig_ptr = (void*)(((uintptr_t)orig) & ~1); - if (!(orig & 1)) { CHECK_ACCESS(orig_ptr); } +uint64_t __attribute__((export_name("TS_Type_clone"))) TS_Type_clone(uint64_t orig) { + void* orig_ptr = untag_ptr(orig); + if (ptr_is_owned(orig)) { CHECK_ACCESS(orig_ptr); } LDKType* orig_conv = (LDKType*)orig_ptr; LDKType* ret_ret = MALLOC(sizeof(LDKType), "LDKType"); *ret_ret = Type_clone(orig_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_Type_free"))) TS_Type_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKType this_ptr_conv = *(LDKType*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); Type_free(this_ptr_conv); } -void __attribute__((export_name("TS_NodeId_free"))) TS_NodeId_free(uint32_t this_obj) { +void __attribute__((export_name("TS_NodeId_free"))) TS_NodeId_free(uint64_t this_obj) { LDKNodeId this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); NodeId_free(this_obj_conv); } -static inline uintptr_t NodeId_clone_ptr(LDKNodeId *NONNULL_PTR arg) { +static inline uint64_t NodeId_clone_ptr(LDKNodeId *NONNULL_PTR arg) { LDKNodeId ret_var = NodeId_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_NodeId_clone_ptr"))) TS_NodeId_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_NodeId_clone_ptr"))) TS_NodeId_clone_ptr(uint64_t arg) { LDKNodeId arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = NodeId_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = NodeId_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_NodeId_clone"))) TS_NodeId_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_NodeId_clone"))) TS_NodeId_clone(uint64_t orig) { LDKNodeId orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKNodeId ret_var = NodeId_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_NodeId_from_pubkey"))) TS_NodeId_from_pubkey(int8_tArray pubkey) { +uint64_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); FREE(pubkey); LDKNodeId ret_var = NodeId_from_pubkey(pubkey_ref); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_NodeId_as_slice"))) TS_NodeId_as_slice(uint32_t this_arg) { +int8_tArray __attribute__((export_name("TS_NodeId_as_slice"))) TS_NodeId_as_slice(uint64_t this_arg) { LDKNodeId this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKu8slice ret_var = NodeId_as_slice(&this_arg_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); return ret_arr; } -int64_t __attribute__((export_name("TS_NodeId_hash"))) TS_NodeId_hash(uint32_t o) { +int64_t __attribute__((export_name("TS_NodeId_hash"))) TS_NodeId_hash(uint64_t o) { LDKNodeId o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = false; + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); + o_conv.is_owned = false; int64_t ret_conv = NodeId_hash(&o_conv); return ret_conv; } -int8_tArray __attribute__((export_name("TS_NodeId_write"))) TS_NodeId_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_NodeId_write"))) TS_NodeId_write(uint64_t obj) { LDKNodeId obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = NodeId_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -39290,92 +37619,92 @@ int8_tArray __attribute__((export_name("TS_NodeId_write"))) TS_NodeId_write(uin return ret_arr; } -uint32_t __attribute__((export_name("TS_NodeId_read"))) TS_NodeId_read(int8_tArray ser) { +uint64_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; LDKCResult_NodeIdDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeIdDecodeErrorZ), "LDKCResult_NodeIdDecodeErrorZ"); *ret_conv = NodeId_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_NetworkGraph_free"))) TS_NetworkGraph_free(uint32_t this_obj) { +void __attribute__((export_name("TS_NetworkGraph_free"))) TS_NetworkGraph_free(uint64_t this_obj) { LDKNetworkGraph this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); NetworkGraph_free(this_obj_conv); } -void __attribute__((export_name("TS_ReadOnlyNetworkGraph_free"))) TS_ReadOnlyNetworkGraph_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ReadOnlyNetworkGraph_free"))) TS_ReadOnlyNetworkGraph_free(uint64_t this_obj) { LDKReadOnlyNetworkGraph this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ReadOnlyNetworkGraph_free(this_obj_conv); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_NetworkUpdate_free"))) TS_NetworkUpdate_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKNetworkUpdate this_ptr_conv = *(LDKNetworkUpdate*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); NetworkUpdate_free(this_ptr_conv); } -static inline uintptr_t NetworkUpdate_clone_ptr(LDKNetworkUpdate *NONNULL_PTR arg) { +static inline uint64_t NetworkUpdate_clone_ptr(LDKNetworkUpdate *NONNULL_PTR arg) { LDKNetworkUpdate *ret_copy = MALLOC(sizeof(LDKNetworkUpdate), "LDKNetworkUpdate"); *ret_copy = NetworkUpdate_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_NetworkUpdate_clone_ptr"))) TS_NetworkUpdate_clone_ptr(uint32_t arg) { - LDKNetworkUpdate* arg_conv = (LDKNetworkUpdate*)arg; - uint32_t ret_conv = NetworkUpdate_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_NetworkUpdate_clone_ptr"))) TS_NetworkUpdate_clone_ptr(uint64_t arg) { + LDKNetworkUpdate* arg_conv = (LDKNetworkUpdate*)untag_ptr(arg); + int64_t ret_conv = NetworkUpdate_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_NetworkUpdate_clone"))) TS_NetworkUpdate_clone(uint32_t orig) { - LDKNetworkUpdate* orig_conv = (LDKNetworkUpdate*)orig; +uint64_t __attribute__((export_name("TS_NetworkUpdate_clone"))) TS_NetworkUpdate_clone(uint64_t orig) { + LDKNetworkUpdate* orig_conv = (LDKNetworkUpdate*)untag_ptr(orig); LDKNetworkUpdate *ret_copy = MALLOC(sizeof(LDKNetworkUpdate), "LDKNetworkUpdate"); *ret_copy = NetworkUpdate_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_NetworkUpdate_channel_update_message"))) TS_NetworkUpdate_channel_update_message(uint32_t msg) { +uint64_t __attribute__((export_name("TS_NetworkUpdate_channel_update_message"))) TS_NetworkUpdate_channel_update_message(uint64_t msg) { LDKChannelUpdate msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = (msg & 1) || (msg == 0); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = ChannelUpdate_clone(&msg_conv); LDKNetworkUpdate *ret_copy = MALLOC(sizeof(LDKNetworkUpdate), "LDKNetworkUpdate"); *ret_copy = NetworkUpdate_channel_update_message(msg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_NetworkUpdate_channel_failure"))) TS_NetworkUpdate_channel_failure(int64_t short_channel_id, jboolean is_permanent) { +uint64_t __attribute__((export_name("TS_NetworkUpdate_channel_failure"))) TS_NetworkUpdate_channel_failure(int64_t short_channel_id, jboolean is_permanent) { LDKNetworkUpdate *ret_copy = MALLOC(sizeof(LDKNetworkUpdate), "LDKNetworkUpdate"); *ret_copy = NetworkUpdate_channel_failure(short_channel_id, is_permanent); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_NetworkUpdate_node_failure"))) TS_NetworkUpdate_node_failure(int8_tArray node_id, jboolean is_permanent) { +uint64_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); FREE(node_id); LDKNetworkUpdate *ret_copy = MALLOC(sizeof(LDKNetworkUpdate), "LDKNetworkUpdate"); *ret_copy = NetworkUpdate_node_failure(node_id_ref, is_permanent); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -int8_tArray __attribute__((export_name("TS_NetworkUpdate_write"))) TS_NetworkUpdate_write(uint32_t obj) { - LDKNetworkUpdate* obj_conv = (LDKNetworkUpdate*)obj; +int8_tArray __attribute__((export_name("TS_NetworkUpdate_write"))) TS_NetworkUpdate_write(uint64_t obj) { + LDKNetworkUpdate* obj_conv = (LDKNetworkUpdate*)untag_ptr(obj); LDKCVec_u8Z ret_var = NetworkUpdate_write(obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -39383,30 +37712,31 @@ int8_tArray __attribute__((export_name("TS_NetworkUpdate_write"))) TS_NetworkUp return ret_arr; } -uint32_t __attribute__((export_name("TS_NetworkUpdate_read"))) TS_NetworkUpdate_read(int8_tArray ser) { +uint64_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; LDKCResult_COption_NetworkUpdateZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_NetworkUpdateZDecodeErrorZ), "LDKCResult_COption_NetworkUpdateZDecodeErrorZ"); *ret_conv = NetworkUpdate_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_P2PGossipSync_free"))) TS_P2PGossipSync_free(uint32_t this_obj) { +void __attribute__((export_name("TS_P2PGossipSync_free"))) TS_P2PGossipSync_free(uint64_t this_obj) { LDKP2PGossipSync this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); P2PGossipSync_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_P2PGossipSync_new"))) TS_P2PGossipSync_new(uint32_t network_graph, uint32_t chain_access, uint32_t logger) { +uint64_t __attribute__((export_name("TS_P2PGossipSync_new"))) TS_P2PGossipSync_new(uint64_t network_graph, uint64_t chain_access, uint64_t logger) { LDKNetworkGraph network_graph_conv; - network_graph_conv.inner = (void*)(network_graph & (~1)); - network_graph_conv.is_owned = false; + network_graph_conv.inner = untag_ptr(network_graph); + network_graph_conv.is_owned = ptr_is_owned(network_graph); CHECK_INNER_FIELD_ACCESS_OR_NULL(network_graph_conv); - void* chain_access_ptr = (void*)(((uintptr_t)chain_access) & ~1); + network_graph_conv.is_owned = false; + void* chain_access_ptr = untag_ptr(chain_access); 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 @@ -39417,7 +37747,7 @@ uint32_t __attribute__((export_name("TS_P2PGossipSync_new"))) TS_P2PGossipSync_ LDKAccess_JCalls_cloned(&chain_access_conv.some); } } - void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); + void* logger_ptr = untag_ptr(logger); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); if (logger_conv.free == LDKLogger_JCalls_free) { @@ -39425,23 +37755,19 @@ uint32_t __attribute__((export_name("TS_P2PGossipSync_new"))) TS_P2PGossipSync_ LDKLogger_JCalls_cloned(&logger_conv); } LDKP2PGossipSync ret_var = P2PGossipSync_new(&network_graph_conv, chain_access_conv, logger_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_P2PGossipSync_add_chain_access"))) TS_P2PGossipSync_add_chain_access(uint32_t this_arg, uint32_t chain_access) { +void __attribute__((export_name("TS_P2PGossipSync_add_chain_access"))) TS_P2PGossipSync_add_chain_access(uint64_t this_arg, uint64_t chain_access) { LDKP2PGossipSync this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); - void* chain_access_ptr = (void*)(((uintptr_t)chain_access) & ~1); + this_arg_conv.is_owned = false; + void* chain_access_ptr = untag_ptr(chain_access); 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 @@ -39455,257 +37781,250 @@ void __attribute__((export_name("TS_P2PGossipSync_add_chain_access"))) TS_P2PGo P2PGossipSync_add_chain_access(&this_arg_conv, chain_access_conv); } -uint32_t __attribute__((export_name("TS_NetworkGraph_as_EventHandler"))) TS_NetworkGraph_as_EventHandler(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_NetworkGraph_as_EventHandler"))) TS_NetworkGraph_as_EventHandler(uint64_t this_arg) { LDKNetworkGraph this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKEventHandler* ret_ret = MALLOC(sizeof(LDKEventHandler), "LDKEventHandler"); *ret_ret = NetworkGraph_as_EventHandler(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_t __attribute__((export_name("TS_P2PGossipSync_as_RoutingMessageHandler"))) TS_P2PGossipSync_as_RoutingMessageHandler(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_P2PGossipSync_as_RoutingMessageHandler"))) TS_P2PGossipSync_as_RoutingMessageHandler(uint64_t this_arg) { LDKP2PGossipSync this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKRoutingMessageHandler* ret_ret = MALLOC(sizeof(LDKRoutingMessageHandler), "LDKRoutingMessageHandler"); *ret_ret = P2PGossipSync_as_RoutingMessageHandler(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_t __attribute__((export_name("TS_P2PGossipSync_as_MessageSendEventsProvider"))) TS_P2PGossipSync_as_MessageSendEventsProvider(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_P2PGossipSync_as_MessageSendEventsProvider"))) TS_P2PGossipSync_as_MessageSendEventsProvider(uint64_t this_arg) { LDKP2PGossipSync this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKMessageSendEventsProvider* ret_ret = MALLOC(sizeof(LDKMessageSendEventsProvider), "LDKMessageSendEventsProvider"); *ret_ret = P2PGossipSync_as_MessageSendEventsProvider(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -void __attribute__((export_name("TS_ChannelUpdateInfo_free"))) TS_ChannelUpdateInfo_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChannelUpdateInfo_free"))) TS_ChannelUpdateInfo_free(uint64_t this_obj) { LDKChannelUpdateInfo this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChannelUpdateInfo_free(this_obj_conv); } -int32_t __attribute__((export_name("TS_ChannelUpdateInfo_get_last_update"))) TS_ChannelUpdateInfo_get_last_update(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_ChannelUpdateInfo_get_last_update"))) TS_ChannelUpdateInfo_get_last_update(uint64_t this_ptr) { LDKChannelUpdateInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = ChannelUpdateInfo_get_last_update(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelUpdateInfo_set_last_update"))) TS_ChannelUpdateInfo_set_last_update(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_ChannelUpdateInfo_set_last_update"))) TS_ChannelUpdateInfo_set_last_update(uint64_t this_ptr, int32_t val) { LDKChannelUpdateInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelUpdateInfo_set_last_update(&this_ptr_conv, val); } -jboolean __attribute__((export_name("TS_ChannelUpdateInfo_get_enabled"))) TS_ChannelUpdateInfo_get_enabled(uint32_t this_ptr) { +jboolean __attribute__((export_name("TS_ChannelUpdateInfo_get_enabled"))) TS_ChannelUpdateInfo_get_enabled(uint64_t this_ptr) { LDKChannelUpdateInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; jboolean ret_conv = ChannelUpdateInfo_get_enabled(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelUpdateInfo_set_enabled"))) TS_ChannelUpdateInfo_set_enabled(uint32_t this_ptr, jboolean val) { +void __attribute__((export_name("TS_ChannelUpdateInfo_set_enabled"))) TS_ChannelUpdateInfo_set_enabled(uint64_t this_ptr, jboolean val) { LDKChannelUpdateInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelUpdateInfo_set_enabled(&this_ptr_conv, val); } -int16_t __attribute__((export_name("TS_ChannelUpdateInfo_get_cltv_expiry_delta"))) TS_ChannelUpdateInfo_get_cltv_expiry_delta(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_ChannelUpdateInfo_get_cltv_expiry_delta"))) TS_ChannelUpdateInfo_get_cltv_expiry_delta(uint64_t this_ptr) { LDKChannelUpdateInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = ChannelUpdateInfo_get_cltv_expiry_delta(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelUpdateInfo_set_cltv_expiry_delta"))) TS_ChannelUpdateInfo_set_cltv_expiry_delta(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_ChannelUpdateInfo_set_cltv_expiry_delta"))) TS_ChannelUpdateInfo_set_cltv_expiry_delta(uint64_t this_ptr, int16_t val) { LDKChannelUpdateInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelUpdateInfo_set_cltv_expiry_delta(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ChannelUpdateInfo_get_htlc_minimum_msat"))) TS_ChannelUpdateInfo_get_htlc_minimum_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelUpdateInfo_get_htlc_minimum_msat"))) TS_ChannelUpdateInfo_get_htlc_minimum_msat(uint64_t this_ptr) { LDKChannelUpdateInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelUpdateInfo_get_htlc_minimum_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelUpdateInfo_set_htlc_minimum_msat"))) TS_ChannelUpdateInfo_set_htlc_minimum_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelUpdateInfo_set_htlc_minimum_msat"))) TS_ChannelUpdateInfo_set_htlc_minimum_msat(uint64_t this_ptr, int64_t val) { LDKChannelUpdateInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelUpdateInfo_set_htlc_minimum_msat(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ChannelUpdateInfo_get_htlc_maximum_msat"))) TS_ChannelUpdateInfo_get_htlc_maximum_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelUpdateInfo_get_htlc_maximum_msat"))) TS_ChannelUpdateInfo_get_htlc_maximum_msat(uint64_t this_ptr) { LDKChannelUpdateInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelUpdateInfo_get_htlc_maximum_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelUpdateInfo_set_htlc_maximum_msat"))) TS_ChannelUpdateInfo_set_htlc_maximum_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelUpdateInfo_set_htlc_maximum_msat"))) TS_ChannelUpdateInfo_set_htlc_maximum_msat(uint64_t this_ptr, int64_t val) { LDKChannelUpdateInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelUpdateInfo_set_htlc_maximum_msat(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_ChannelUpdateInfo_get_fees"))) TS_ChannelUpdateInfo_get_fees(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelUpdateInfo_get_fees"))) TS_ChannelUpdateInfo_get_fees(uint64_t this_ptr) { LDKChannelUpdateInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKRoutingFees ret_var = ChannelUpdateInfo_get_fees(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelUpdateInfo_set_fees"))) TS_ChannelUpdateInfo_set_fees(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelUpdateInfo_set_fees"))) TS_ChannelUpdateInfo_set_fees(uint64_t this_ptr, uint64_t val) { LDKChannelUpdateInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKRoutingFees val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = RoutingFees_clone(&val_conv); ChannelUpdateInfo_set_fees(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelUpdateInfo_get_last_update_message"))) TS_ChannelUpdateInfo_get_last_update_message(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelUpdateInfo_get_last_update_message"))) TS_ChannelUpdateInfo_get_last_update_message(uint64_t this_ptr) { LDKChannelUpdateInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelUpdate ret_var = ChannelUpdateInfo_get_last_update_message(&this_ptr_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelUpdateInfo_set_last_update_message"))) TS_ChannelUpdateInfo_set_last_update_message(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelUpdateInfo_set_last_update_message"))) TS_ChannelUpdateInfo_set_last_update_message(uint64_t this_ptr, uint64_t val) { LDKChannelUpdateInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelUpdate val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = ChannelUpdate_clone(&val_conv); ChannelUpdateInfo_set_last_update_message(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelUpdateInfo_new"))) TS_ChannelUpdateInfo_new(int32_t last_update_arg, jboolean enabled_arg, int16_t cltv_expiry_delta_arg, int64_t htlc_minimum_msat_arg, int64_t htlc_maximum_msat_arg, uint32_t fees_arg, uint32_t last_update_message_arg) { +uint64_t __attribute__((export_name("TS_ChannelUpdateInfo_new"))) TS_ChannelUpdateInfo_new(int32_t last_update_arg, jboolean enabled_arg, int16_t cltv_expiry_delta_arg, int64_t htlc_minimum_msat_arg, int64_t htlc_maximum_msat_arg, uint64_t fees_arg, uint64_t last_update_message_arg) { LDKRoutingFees fees_arg_conv; - fees_arg_conv.inner = (void*)(fees_arg & (~1)); - fees_arg_conv.is_owned = (fees_arg & 1) || (fees_arg == 0); + fees_arg_conv.inner = untag_ptr(fees_arg); + fees_arg_conv.is_owned = ptr_is_owned(fees_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(fees_arg_conv); fees_arg_conv = RoutingFees_clone(&fees_arg_conv); LDKChannelUpdate last_update_message_arg_conv; - last_update_message_arg_conv.inner = (void*)(last_update_message_arg & (~1)); - last_update_message_arg_conv.is_owned = (last_update_message_arg & 1) || (last_update_message_arg == 0); + last_update_message_arg_conv.inner = untag_ptr(last_update_message_arg); + last_update_message_arg_conv.is_owned = ptr_is_owned(last_update_message_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(last_update_message_arg_conv); last_update_message_arg_conv = ChannelUpdate_clone(&last_update_message_arg_conv); LDKChannelUpdateInfo ret_var = ChannelUpdateInfo_new(last_update_arg, enabled_arg, cltv_expiry_delta_arg, htlc_minimum_msat_arg, htlc_maximum_msat_arg, fees_arg_conv, last_update_message_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t ChannelUpdateInfo_clone_ptr(LDKChannelUpdateInfo *NONNULL_PTR arg) { +static inline uint64_t ChannelUpdateInfo_clone_ptr(LDKChannelUpdateInfo *NONNULL_PTR arg) { LDKChannelUpdateInfo ret_var = ChannelUpdateInfo_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelUpdateInfo_clone_ptr"))) TS_ChannelUpdateInfo_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ChannelUpdateInfo_clone_ptr"))) TS_ChannelUpdateInfo_clone_ptr(uint64_t arg) { LDKChannelUpdateInfo arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ChannelUpdateInfo_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ChannelUpdateInfo_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelUpdateInfo_clone"))) TS_ChannelUpdateInfo_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ChannelUpdateInfo_clone"))) TS_ChannelUpdateInfo_clone(uint64_t orig) { LDKChannelUpdateInfo orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKChannelUpdateInfo ret_var = ChannelUpdateInfo_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_ChannelUpdateInfo_write"))) TS_ChannelUpdateInfo_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ChannelUpdateInfo_write"))) TS_ChannelUpdateInfo_write(uint64_t obj) { LDKChannelUpdateInfo obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ChannelUpdateInfo_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -39713,295 +38032,260 @@ int8_tArray __attribute__((export_name("TS_ChannelUpdateInfo_write"))) TS_Chann return ret_arr; } -uint32_t __attribute__((export_name("TS_ChannelUpdateInfo_read"))) TS_ChannelUpdateInfo_read(int8_tArray ser) { +uint64_t __attribute__((export_name("TS_ChannelUpdateInfo_read"))) TS_ChannelUpdateInfo_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; ser_ref.data = ser->elems; LDKCResult_ChannelUpdateInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateInfoDecodeErrorZ), "LDKCResult_ChannelUpdateInfoDecodeErrorZ"); *ret_conv = ChannelUpdateInfo_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_ChannelInfo_free"))) TS_ChannelInfo_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChannelInfo_free"))) TS_ChannelInfo_free(uint64_t this_obj) { LDKChannelInfo this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChannelInfo_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_ChannelInfo_get_features"))) TS_ChannelInfo_get_features(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelInfo_get_features"))) TS_ChannelInfo_get_features(uint64_t this_ptr) { LDKChannelInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelFeatures ret_var = ChannelInfo_get_features(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelInfo_set_features"))) TS_ChannelInfo_set_features(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelInfo_set_features"))) TS_ChannelInfo_set_features(uint64_t this_ptr, uint64_t val) { LDKChannelInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelFeatures val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = ChannelFeatures_clone(&val_conv); ChannelInfo_set_features(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelInfo_get_node_one"))) TS_ChannelInfo_get_node_one(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelInfo_get_node_one"))) TS_ChannelInfo_get_node_one(uint64_t this_ptr) { LDKChannelInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKNodeId ret_var = ChannelInfo_get_node_one(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelInfo_set_node_one"))) TS_ChannelInfo_set_node_one(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelInfo_set_node_one"))) TS_ChannelInfo_set_node_one(uint64_t this_ptr, uint64_t val) { LDKChannelInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKNodeId val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = NodeId_clone(&val_conv); ChannelInfo_set_node_one(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelInfo_get_one_to_two"))) TS_ChannelInfo_get_one_to_two(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelInfo_get_one_to_two"))) TS_ChannelInfo_get_one_to_two(uint64_t this_ptr) { LDKChannelInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelUpdateInfo ret_var = ChannelInfo_get_one_to_two(&this_ptr_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelInfo_set_one_to_two"))) TS_ChannelInfo_set_one_to_two(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelInfo_set_one_to_two"))) TS_ChannelInfo_set_one_to_two(uint64_t this_ptr, uint64_t val) { LDKChannelInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelUpdateInfo val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = ChannelUpdateInfo_clone(&val_conv); ChannelInfo_set_one_to_two(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelInfo_get_node_two"))) TS_ChannelInfo_get_node_two(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelInfo_get_node_two"))) TS_ChannelInfo_get_node_two(uint64_t this_ptr) { LDKChannelInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKNodeId ret_var = ChannelInfo_get_node_two(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelInfo_set_node_two"))) TS_ChannelInfo_set_node_two(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelInfo_set_node_two"))) TS_ChannelInfo_set_node_two(uint64_t this_ptr, uint64_t val) { LDKChannelInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKNodeId val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = NodeId_clone(&val_conv); ChannelInfo_set_node_two(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelInfo_get_two_to_one"))) TS_ChannelInfo_get_two_to_one(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelInfo_get_two_to_one"))) TS_ChannelInfo_get_two_to_one(uint64_t this_ptr) { LDKChannelInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelUpdateInfo ret_var = ChannelInfo_get_two_to_one(&this_ptr_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelInfo_set_two_to_one"))) TS_ChannelInfo_set_two_to_one(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelInfo_set_two_to_one"))) TS_ChannelInfo_set_two_to_one(uint64_t this_ptr, uint64_t val) { LDKChannelInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelUpdateInfo val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = ChannelUpdateInfo_clone(&val_conv); ChannelInfo_set_two_to_one(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelInfo_get_capacity_sats"))) TS_ChannelInfo_get_capacity_sats(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelInfo_get_capacity_sats"))) TS_ChannelInfo_get_capacity_sats(uint64_t this_ptr) { LDKChannelInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = ChannelInfo_get_capacity_sats(&this_ptr_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_ChannelInfo_set_capacity_sats"))) TS_ChannelInfo_set_capacity_sats(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelInfo_set_capacity_sats"))) TS_ChannelInfo_set_capacity_sats(uint64_t this_ptr, uint64_t val) { LDKChannelInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr); - val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1)); + val_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(val)); ChannelInfo_set_capacity_sats(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelInfo_get_announcement_message"))) TS_ChannelInfo_get_announcement_message(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelInfo_get_announcement_message"))) TS_ChannelInfo_get_announcement_message(uint64_t this_ptr) { LDKChannelInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelAnnouncement ret_var = ChannelInfo_get_announcement_message(&this_ptr_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelInfo_set_announcement_message"))) TS_ChannelInfo_set_announcement_message(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelInfo_set_announcement_message"))) TS_ChannelInfo_set_announcement_message(uint64_t this_ptr, uint64_t val) { LDKChannelInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelAnnouncement val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = ChannelAnnouncement_clone(&val_conv); ChannelInfo_set_announcement_message(&this_ptr_conv, val_conv); } -static inline uintptr_t ChannelInfo_clone_ptr(LDKChannelInfo *NONNULL_PTR arg) { +static inline uint64_t ChannelInfo_clone_ptr(LDKChannelInfo *NONNULL_PTR arg) { LDKChannelInfo ret_var = ChannelInfo_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelInfo_clone_ptr"))) TS_ChannelInfo_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ChannelInfo_clone_ptr"))) TS_ChannelInfo_clone_ptr(uint64_t arg) { LDKChannelInfo arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ChannelInfo_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ChannelInfo_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelInfo_clone"))) TS_ChannelInfo_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ChannelInfo_clone"))) TS_ChannelInfo_clone(uint64_t orig) { LDKChannelInfo orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKChannelInfo ret_var = ChannelInfo_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelInfo_get_directional_info"))) TS_ChannelInfo_get_directional_info(uint32_t this_arg, int8_t channel_flags) { +uint64_t __attribute__((export_name("TS_ChannelInfo_get_directional_info"))) TS_ChannelInfo_get_directional_info(uint64_t this_arg, int8_t channel_flags) { LDKChannelInfo this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKChannelUpdateInfo ret_var = ChannelInfo_get_directional_info(&this_arg_conv, channel_flags); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_ChannelInfo_write"))) TS_ChannelInfo_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ChannelInfo_write"))) TS_ChannelInfo_write(uint64_t obj) { LDKChannelInfo obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ChannelInfo_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -40009,312 +38293,291 @@ int8_tArray __attribute__((export_name("TS_ChannelInfo_write"))) TS_ChannelInfo return ret_arr; } -uint32_t __attribute__((export_name("TS_ChannelInfo_read"))) TS_ChannelInfo_read(int8_tArray ser) { +uint64_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; LDKCResult_ChannelInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelInfoDecodeErrorZ), "LDKCResult_ChannelInfoDecodeErrorZ"); *ret_conv = ChannelInfo_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_DirectedChannelInfo_free"))) TS_DirectedChannelInfo_free(uint32_t this_obj) { +void __attribute__((export_name("TS_DirectedChannelInfo_free"))) TS_DirectedChannelInfo_free(uint64_t this_obj) { LDKDirectedChannelInfo this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); DirectedChannelInfo_free(this_obj_conv); } -static inline uintptr_t DirectedChannelInfo_clone_ptr(LDKDirectedChannelInfo *NONNULL_PTR arg) { +static inline uint64_t DirectedChannelInfo_clone_ptr(LDKDirectedChannelInfo *NONNULL_PTR arg) { LDKDirectedChannelInfo ret_var = DirectedChannelInfo_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_DirectedChannelInfo_clone_ptr"))) TS_DirectedChannelInfo_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_DirectedChannelInfo_clone_ptr"))) TS_DirectedChannelInfo_clone_ptr(uint64_t arg) { LDKDirectedChannelInfo arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = DirectedChannelInfo_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = DirectedChannelInfo_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_DirectedChannelInfo_clone"))) TS_DirectedChannelInfo_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_DirectedChannelInfo_clone"))) TS_DirectedChannelInfo_clone(uint64_t orig) { LDKDirectedChannelInfo orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKDirectedChannelInfo ret_var = DirectedChannelInfo_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_DirectedChannelInfo_channel"))) TS_DirectedChannelInfo_channel(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_DirectedChannelInfo_channel"))) TS_DirectedChannelInfo_channel(uint64_t this_arg) { LDKDirectedChannelInfo this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKChannelInfo ret_var = DirectedChannelInfo_channel(&this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_DirectedChannelInfo_direction"))) TS_DirectedChannelInfo_direction(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_DirectedChannelInfo_direction"))) TS_DirectedChannelInfo_direction(uint64_t this_arg) { LDKDirectedChannelInfo this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKChannelUpdateInfo ret_var = DirectedChannelInfo_direction(&this_arg_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int64_t __attribute__((export_name("TS_DirectedChannelInfo_htlc_maximum_msat"))) TS_DirectedChannelInfo_htlc_maximum_msat(uint32_t this_arg) { +int64_t __attribute__((export_name("TS_DirectedChannelInfo_htlc_maximum_msat"))) TS_DirectedChannelInfo_htlc_maximum_msat(uint64_t this_arg) { LDKDirectedChannelInfo this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int64_t ret_conv = DirectedChannelInfo_htlc_maximum_msat(&this_arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_DirectedChannelInfo_effective_capacity"))) TS_DirectedChannelInfo_effective_capacity(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_DirectedChannelInfo_effective_capacity"))) TS_DirectedChannelInfo_effective_capacity(uint64_t this_arg) { LDKDirectedChannelInfo this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKEffectiveCapacity *ret_copy = MALLOC(sizeof(LDKEffectiveCapacity), "LDKEffectiveCapacity"); *ret_copy = DirectedChannelInfo_effective_capacity(&this_arg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_EffectiveCapacity_free"))) TS_EffectiveCapacity_free(uint32_t this_ptr) { - if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_EffectiveCapacity_free"))) TS_EffectiveCapacity_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKEffectiveCapacity this_ptr_conv = *(LDKEffectiveCapacity*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); EffectiveCapacity_free(this_ptr_conv); } -static inline uintptr_t EffectiveCapacity_clone_ptr(LDKEffectiveCapacity *NONNULL_PTR arg) { +static inline uint64_t EffectiveCapacity_clone_ptr(LDKEffectiveCapacity *NONNULL_PTR arg) { LDKEffectiveCapacity *ret_copy = MALLOC(sizeof(LDKEffectiveCapacity), "LDKEffectiveCapacity"); *ret_copy = EffectiveCapacity_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_EffectiveCapacity_clone_ptr"))) TS_EffectiveCapacity_clone_ptr(uint32_t arg) { - LDKEffectiveCapacity* arg_conv = (LDKEffectiveCapacity*)arg; - uint32_t ret_conv = EffectiveCapacity_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_EffectiveCapacity_clone_ptr"))) TS_EffectiveCapacity_clone_ptr(uint64_t arg) { + LDKEffectiveCapacity* arg_conv = (LDKEffectiveCapacity*)untag_ptr(arg); + int64_t ret_conv = EffectiveCapacity_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_EffectiveCapacity_clone"))) TS_EffectiveCapacity_clone(uint32_t orig) { - LDKEffectiveCapacity* orig_conv = (LDKEffectiveCapacity*)orig; +uint64_t __attribute__((export_name("TS_EffectiveCapacity_clone"))) TS_EffectiveCapacity_clone(uint64_t orig) { + LDKEffectiveCapacity* orig_conv = (LDKEffectiveCapacity*)untag_ptr(orig); LDKEffectiveCapacity *ret_copy = MALLOC(sizeof(LDKEffectiveCapacity), "LDKEffectiveCapacity"); *ret_copy = EffectiveCapacity_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_EffectiveCapacity_exact_liquidity"))) TS_EffectiveCapacity_exact_liquidity(int64_t liquidity_msat) { +uint64_t __attribute__((export_name("TS_EffectiveCapacity_exact_liquidity"))) TS_EffectiveCapacity_exact_liquidity(int64_t liquidity_msat) { LDKEffectiveCapacity *ret_copy = MALLOC(sizeof(LDKEffectiveCapacity), "LDKEffectiveCapacity"); *ret_copy = EffectiveCapacity_exact_liquidity(liquidity_msat); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_EffectiveCapacity_maximum_htlc"))) TS_EffectiveCapacity_maximum_htlc(int64_t amount_msat) { +uint64_t __attribute__((export_name("TS_EffectiveCapacity_maximum_htlc"))) TS_EffectiveCapacity_maximum_htlc(int64_t amount_msat) { LDKEffectiveCapacity *ret_copy = MALLOC(sizeof(LDKEffectiveCapacity), "LDKEffectiveCapacity"); *ret_copy = EffectiveCapacity_maximum_htlc(amount_msat); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_EffectiveCapacity_total"))) TS_EffectiveCapacity_total(int64_t capacity_msat, uint32_t htlc_maximum_msat) { - void* htlc_maximum_msat_ptr = (void*)(((uintptr_t)htlc_maximum_msat) & ~1); +uint64_t __attribute__((export_name("TS_EffectiveCapacity_total"))) TS_EffectiveCapacity_total(int64_t capacity_msat, uint64_t htlc_maximum_msat) { + void* htlc_maximum_msat_ptr = untag_ptr(htlc_maximum_msat); CHECK_ACCESS(htlc_maximum_msat_ptr); LDKCOption_u64Z htlc_maximum_msat_conv = *(LDKCOption_u64Z*)(htlc_maximum_msat_ptr); - htlc_maximum_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)htlc_maximum_msat) & ~1)); + htlc_maximum_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(htlc_maximum_msat)); LDKEffectiveCapacity *ret_copy = MALLOC(sizeof(LDKEffectiveCapacity), "LDKEffectiveCapacity"); *ret_copy = EffectiveCapacity_total(capacity_msat, htlc_maximum_msat_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_EffectiveCapacity_infinite"))) TS_EffectiveCapacity_infinite() { +uint64_t __attribute__((export_name("TS_EffectiveCapacity_infinite"))) TS_EffectiveCapacity_infinite() { LDKEffectiveCapacity *ret_copy = MALLOC(sizeof(LDKEffectiveCapacity), "LDKEffectiveCapacity"); *ret_copy = EffectiveCapacity_infinite(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_EffectiveCapacity_unknown"))) TS_EffectiveCapacity_unknown() { +uint64_t __attribute__((export_name("TS_EffectiveCapacity_unknown"))) TS_EffectiveCapacity_unknown() { LDKEffectiveCapacity *ret_copy = MALLOC(sizeof(LDKEffectiveCapacity), "LDKEffectiveCapacity"); *ret_copy = EffectiveCapacity_unknown(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -int64_t __attribute__((export_name("TS_EffectiveCapacity_as_msat"))) TS_EffectiveCapacity_as_msat(uint32_t this_arg) { - LDKEffectiveCapacity* this_arg_conv = (LDKEffectiveCapacity*)this_arg; +int64_t __attribute__((export_name("TS_EffectiveCapacity_as_msat"))) TS_EffectiveCapacity_as_msat(uint64_t this_arg) { + LDKEffectiveCapacity* this_arg_conv = (LDKEffectiveCapacity*)untag_ptr(this_arg); int64_t ret_conv = EffectiveCapacity_as_msat(this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_RoutingFees_free"))) TS_RoutingFees_free(uint32_t this_obj) { +void __attribute__((export_name("TS_RoutingFees_free"))) TS_RoutingFees_free(uint64_t this_obj) { LDKRoutingFees this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); RoutingFees_free(this_obj_conv); } -int32_t __attribute__((export_name("TS_RoutingFees_get_base_msat"))) TS_RoutingFees_get_base_msat(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_RoutingFees_get_base_msat"))) TS_RoutingFees_get_base_msat(uint64_t this_ptr) { LDKRoutingFees this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = RoutingFees_get_base_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_RoutingFees_set_base_msat"))) TS_RoutingFees_set_base_msat(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_RoutingFees_set_base_msat"))) TS_RoutingFees_set_base_msat(uint64_t this_ptr, int32_t val) { LDKRoutingFees this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; RoutingFees_set_base_msat(&this_ptr_conv, val); } -int32_t __attribute__((export_name("TS_RoutingFees_get_proportional_millionths"))) TS_RoutingFees_get_proportional_millionths(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_RoutingFees_get_proportional_millionths"))) TS_RoutingFees_get_proportional_millionths(uint64_t this_ptr) { LDKRoutingFees this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = RoutingFees_get_proportional_millionths(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_RoutingFees_set_proportional_millionths"))) TS_RoutingFees_set_proportional_millionths(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_RoutingFees_set_proportional_millionths"))) TS_RoutingFees_set_proportional_millionths(uint64_t this_ptr, int32_t val) { LDKRoutingFees this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; RoutingFees_set_proportional_millionths(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_RoutingFees_new"))) TS_RoutingFees_new(int32_t base_msat_arg, int32_t proportional_millionths_arg) { +uint64_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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -jboolean __attribute__((export_name("TS_RoutingFees_eq"))) TS_RoutingFees_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_RoutingFees_eq"))) TS_RoutingFees_eq(uint64_t a, uint64_t b) { LDKRoutingFees a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKRoutingFees b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = RoutingFees_eq(&a_conv, &b_conv); return ret_conv; } -static inline uintptr_t RoutingFees_clone_ptr(LDKRoutingFees *NONNULL_PTR arg) { +static inline uint64_t RoutingFees_clone_ptr(LDKRoutingFees *NONNULL_PTR arg) { LDKRoutingFees ret_var = RoutingFees_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_RoutingFees_clone_ptr"))) TS_RoutingFees_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_RoutingFees_clone_ptr"))) TS_RoutingFees_clone_ptr(uint64_t arg) { LDKRoutingFees arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = RoutingFees_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = RoutingFees_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_RoutingFees_clone"))) TS_RoutingFees_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_RoutingFees_clone"))) TS_RoutingFees_clone(uint64_t orig) { LDKRoutingFees orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKRoutingFees ret_var = RoutingFees_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int64_t __attribute__((export_name("TS_RoutingFees_hash"))) TS_RoutingFees_hash(uint32_t o) { +int64_t __attribute__((export_name("TS_RoutingFees_hash"))) TS_RoutingFees_hash(uint64_t o) { LDKRoutingFees o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = false; + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); + o_conv.is_owned = false; int64_t ret_conv = RoutingFees_hash(&o_conv); return ret_conv; } -int8_tArray __attribute__((export_name("TS_RoutingFees_write"))) TS_RoutingFees_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_RoutingFees_write"))) TS_RoutingFees_write(uint64_t obj) { LDKRoutingFees obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = RoutingFees_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -40322,135 +38585,134 @@ int8_tArray __attribute__((export_name("TS_RoutingFees_write"))) TS_RoutingFees return ret_arr; } -uint32_t __attribute__((export_name("TS_RoutingFees_read"))) TS_RoutingFees_read(int8_tArray ser) { +uint64_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; LDKCResult_RoutingFeesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RoutingFeesDecodeErrorZ), "LDKCResult_RoutingFeesDecodeErrorZ"); *ret_conv = RoutingFees_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_NodeAnnouncementInfo_free"))) TS_NodeAnnouncementInfo_free(uint32_t this_obj) { +void __attribute__((export_name("TS_NodeAnnouncementInfo_free"))) TS_NodeAnnouncementInfo_free(uint64_t this_obj) { LDKNodeAnnouncementInfo this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); NodeAnnouncementInfo_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_NodeAnnouncementInfo_get_features"))) TS_NodeAnnouncementInfo_get_features(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_NodeAnnouncementInfo_get_features"))) TS_NodeAnnouncementInfo_get_features(uint64_t this_ptr) { LDKNodeAnnouncementInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKNodeFeatures ret_var = NodeAnnouncementInfo_get_features(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_NodeAnnouncementInfo_set_features"))) TS_NodeAnnouncementInfo_set_features(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_NodeAnnouncementInfo_set_features"))) TS_NodeAnnouncementInfo_set_features(uint64_t this_ptr, uint64_t val) { LDKNodeAnnouncementInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKNodeFeatures val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = NodeFeatures_clone(&val_conv); NodeAnnouncementInfo_set_features(&this_ptr_conv, val_conv); } -int32_t __attribute__((export_name("TS_NodeAnnouncementInfo_get_last_update"))) TS_NodeAnnouncementInfo_get_last_update(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_NodeAnnouncementInfo_get_last_update"))) TS_NodeAnnouncementInfo_get_last_update(uint64_t this_ptr) { LDKNodeAnnouncementInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = NodeAnnouncementInfo_get_last_update(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_NodeAnnouncementInfo_set_last_update"))) TS_NodeAnnouncementInfo_set_last_update(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_NodeAnnouncementInfo_set_last_update"))) TS_NodeAnnouncementInfo_set_last_update(uint64_t this_ptr, int32_t val) { LDKNodeAnnouncementInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; NodeAnnouncementInfo_set_last_update(&this_ptr_conv, val); } -int8_tArray __attribute__((export_name("TS_NodeAnnouncementInfo_get_rgb"))) TS_NodeAnnouncementInfo_get_rgb(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_NodeAnnouncementInfo_get_rgb"))) TS_NodeAnnouncementInfo_get_rgb(uint64_t this_ptr) { LDKNodeAnnouncementInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(3, __LINE__); memcpy(ret_arr->elems, *NodeAnnouncementInfo_get_rgb(&this_ptr_conv), 3); return ret_arr; } -void __attribute__((export_name("TS_NodeAnnouncementInfo_set_rgb"))) TS_NodeAnnouncementInfo_set_rgb(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_NodeAnnouncementInfo_set_rgb"))) TS_NodeAnnouncementInfo_set_rgb(uint64_t this_ptr, int8_tArray val) { LDKNodeAnnouncementInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThreeBytes val_ref; CHECK(val->arr_len == 3); memcpy(val_ref.data, val->elems, 3); FREE(val); NodeAnnouncementInfo_set_rgb(&this_ptr_conv, val_ref); } -uint32_t __attribute__((export_name("TS_NodeAnnouncementInfo_get_alias"))) TS_NodeAnnouncementInfo_get_alias(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_NodeAnnouncementInfo_get_alias"))) TS_NodeAnnouncementInfo_get_alias(uint64_t this_ptr) { LDKNodeAnnouncementInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKNodeAlias ret_var = NodeAnnouncementInfo_get_alias(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_NodeAnnouncementInfo_set_alias"))) TS_NodeAnnouncementInfo_set_alias(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_NodeAnnouncementInfo_set_alias"))) TS_NodeAnnouncementInfo_set_alias(uint64_t this_ptr, uint64_t val) { LDKNodeAnnouncementInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKNodeAlias val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = NodeAlias_clone(&val_conv); NodeAnnouncementInfo_set_alias(&this_ptr_conv, val_conv); } -uint32_tArray __attribute__((export_name("TS_NodeAnnouncementInfo_get_addresses"))) TS_NodeAnnouncementInfo_get_addresses(uint32_t this_ptr) { +uint64_tArray __attribute__((export_name("TS_NodeAnnouncementInfo_get_addresses"))) TS_NodeAnnouncementInfo_get_addresses(uint64_t this_ptr) { LDKNodeAnnouncementInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_NetAddressZ ret_var = NodeAnnouncementInfo_get_addresses(&this_ptr_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t m = 0; m < ret_var.datalen; m++) { LDKNetAddress *ret_conv_12_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress"); *ret_conv_12_copy = ret_var.data[m]; - uint32_t ret_conv_12_ref = (uintptr_t)ret_conv_12_copy; + uint64_t ret_conv_12_ref = tag_ptr(ret_conv_12_copy, true); ret_arr_ptr[m] = ret_conv_12_ref; } @@ -40458,74 +38720,70 @@ uint32_tArray __attribute__((export_name("TS_NodeAnnouncementInfo_get_addresses return ret_arr; } -void __attribute__((export_name("TS_NodeAnnouncementInfo_set_addresses"))) TS_NodeAnnouncementInfo_set_addresses(uint32_t this_ptr, uint32_tArray val) { +void __attribute__((export_name("TS_NodeAnnouncementInfo_set_addresses"))) TS_NodeAnnouncementInfo_set_addresses(uint64_t this_ptr, uint64_tArray val) { LDKNodeAnnouncementInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_NetAddressZ val_constr; val_constr.datalen = val->arr_len; if (val_constr.datalen > 0) val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKNetAddress), "LDKCVec_NetAddressZ Elements"); else val_constr.data = NULL; - uint32_t* val_vals = val->elems; + uint64_t* val_vals = val->elems; for (size_t m = 0; m < val_constr.datalen; m++) { - uint32_t val_conv_12 = val_vals[m]; - void* val_conv_12_ptr = (void*)(((uintptr_t)val_conv_12) & ~1); + uint64_t val_conv_12 = val_vals[m]; + void* val_conv_12_ptr = untag_ptr(val_conv_12); CHECK_ACCESS(val_conv_12_ptr); LDKNetAddress val_conv_12_conv = *(LDKNetAddress*)(val_conv_12_ptr); - val_conv_12_conv = NetAddress_clone((LDKNetAddress*)(((uintptr_t)val_conv_12) & ~1)); + val_conv_12_conv = NetAddress_clone((LDKNetAddress*)untag_ptr(val_conv_12)); val_constr.data[m] = val_conv_12_conv; } FREE(val); NodeAnnouncementInfo_set_addresses(&this_ptr_conv, val_constr); } -uint32_t __attribute__((export_name("TS_NodeAnnouncementInfo_get_announcement_message"))) TS_NodeAnnouncementInfo_get_announcement_message(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_NodeAnnouncementInfo_get_announcement_message"))) TS_NodeAnnouncementInfo_get_announcement_message(uint64_t this_ptr) { LDKNodeAnnouncementInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKNodeAnnouncement ret_var = NodeAnnouncementInfo_get_announcement_message(&this_ptr_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_NodeAnnouncementInfo_set_announcement_message"))) TS_NodeAnnouncementInfo_set_announcement_message(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_NodeAnnouncementInfo_set_announcement_message"))) TS_NodeAnnouncementInfo_set_announcement_message(uint64_t this_ptr, uint64_t val) { LDKNodeAnnouncementInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKNodeAnnouncement val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = NodeAnnouncement_clone(&val_conv); NodeAnnouncementInfo_set_announcement_message(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_NodeAnnouncementInfo_new"))) TS_NodeAnnouncementInfo_new(uint32_t features_arg, int32_t last_update_arg, int8_tArray rgb_arg, uint32_t alias_arg, uint32_tArray addresses_arg, uint32_t announcement_message_arg) { +uint64_t __attribute__((export_name("TS_NodeAnnouncementInfo_new"))) TS_NodeAnnouncementInfo_new(uint64_t features_arg, int32_t last_update_arg, int8_tArray rgb_arg, uint64_t alias_arg, uint64_tArray addresses_arg, uint64_t announcement_message_arg) { LDKNodeFeatures features_arg_conv; - features_arg_conv.inner = (void*)(features_arg & (~1)); - features_arg_conv.is_owned = (features_arg & 1) || (features_arg == 0); + features_arg_conv.inner = untag_ptr(features_arg); + features_arg_conv.is_owned = ptr_is_owned(features_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(features_arg_conv); 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); FREE(rgb_arg); LDKNodeAlias alias_arg_conv; - alias_arg_conv.inner = (void*)(alias_arg & (~1)); - alias_arg_conv.is_owned = (alias_arg & 1) || (alias_arg == 0); + alias_arg_conv.inner = untag_ptr(alias_arg); + alias_arg_conv.is_owned = ptr_is_owned(alias_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(alias_arg_conv); alias_arg_conv = NodeAlias_clone(&alias_arg_conv); LDKCVec_NetAddressZ addresses_arg_constr; @@ -40534,75 +38792,63 @@ uint32_t __attribute__((export_name("TS_NodeAnnouncementInfo_new"))) TS_NodeAnn 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; + uint64_t* addresses_arg_vals = addresses_arg->elems; for (size_t m = 0; m < addresses_arg_constr.datalen; m++) { - uint32_t addresses_arg_conv_12 = addresses_arg_vals[m]; - void* addresses_arg_conv_12_ptr = (void*)(((uintptr_t)addresses_arg_conv_12) & ~1); + uint64_t addresses_arg_conv_12 = addresses_arg_vals[m]; + void* addresses_arg_conv_12_ptr = untag_ptr(addresses_arg_conv_12); 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; } FREE(addresses_arg); LDKNodeAnnouncement announcement_message_arg_conv; - announcement_message_arg_conv.inner = (void*)(announcement_message_arg & (~1)); - announcement_message_arg_conv.is_owned = (announcement_message_arg & 1) || (announcement_message_arg == 0); + announcement_message_arg_conv.inner = untag_ptr(announcement_message_arg); + announcement_message_arg_conv.is_owned = ptr_is_owned(announcement_message_arg); 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_conv, addresses_arg_constr, announcement_message_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t NodeAnnouncementInfo_clone_ptr(LDKNodeAnnouncementInfo *NONNULL_PTR arg) { +static inline uint64_t NodeAnnouncementInfo_clone_ptr(LDKNodeAnnouncementInfo *NONNULL_PTR arg) { LDKNodeAnnouncementInfo ret_var = NodeAnnouncementInfo_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_NodeAnnouncementInfo_clone_ptr"))) TS_NodeAnnouncementInfo_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_NodeAnnouncementInfo_clone_ptr"))) TS_NodeAnnouncementInfo_clone_ptr(uint64_t arg) { LDKNodeAnnouncementInfo arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = NodeAnnouncementInfo_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = NodeAnnouncementInfo_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_NodeAnnouncementInfo_clone"))) TS_NodeAnnouncementInfo_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_NodeAnnouncementInfo_clone"))) TS_NodeAnnouncementInfo_clone(uint64_t orig) { LDKNodeAnnouncementInfo orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKNodeAnnouncementInfo ret_var = NodeAnnouncementInfo_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_NodeAnnouncementInfo_write"))) TS_NodeAnnouncementInfo_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_NodeAnnouncementInfo_write"))) TS_NodeAnnouncementInfo_write(uint64_t obj) { LDKNodeAnnouncementInfo obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = NodeAnnouncementInfo_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -40610,104 +38856,94 @@ int8_tArray __attribute__((export_name("TS_NodeAnnouncementInfo_write"))) TS_No return ret_arr; } -uint32_t __attribute__((export_name("TS_NodeAnnouncementInfo_read"))) TS_NodeAnnouncementInfo_read(int8_tArray ser) { +uint64_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; LDKCResult_NodeAnnouncementInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementInfoDecodeErrorZ), "LDKCResult_NodeAnnouncementInfoDecodeErrorZ"); *ret_conv = NodeAnnouncementInfo_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_NodeAlias_free"))) TS_NodeAlias_free(uint32_t this_obj) { +void __attribute__((export_name("TS_NodeAlias_free"))) TS_NodeAlias_free(uint64_t this_obj) { LDKNodeAlias this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); NodeAlias_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_NodeAlias_get_a"))) TS_NodeAlias_get_a(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_NodeAlias_get_a"))) TS_NodeAlias_get_a(uint64_t this_ptr) { LDKNodeAlias this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *NodeAlias_get_a(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_NodeAlias_set_a"))) TS_NodeAlias_set_a(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_NodeAlias_set_a"))) TS_NodeAlias_set_a(uint64_t this_ptr, int8_tArray val) { LDKNodeAlias this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); NodeAlias_set_a(&this_ptr_conv, val_ref); } -uint32_t __attribute__((export_name("TS_NodeAlias_new"))) TS_NodeAlias_new(int8_tArray a_arg) { +uint64_t __attribute__((export_name("TS_NodeAlias_new"))) TS_NodeAlias_new(int8_tArray a_arg) { LDKThirtyTwoBytes a_arg_ref; CHECK(a_arg->arr_len == 32); memcpy(a_arg_ref.data, a_arg->elems, 32); FREE(a_arg); LDKNodeAlias ret_var = NodeAlias_new(a_arg_ref); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t NodeAlias_clone_ptr(LDKNodeAlias *NONNULL_PTR arg) { +static inline uint64_t NodeAlias_clone_ptr(LDKNodeAlias *NONNULL_PTR arg) { LDKNodeAlias ret_var = NodeAlias_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_NodeAlias_clone_ptr"))) TS_NodeAlias_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_NodeAlias_clone_ptr"))) TS_NodeAlias_clone_ptr(uint64_t arg) { LDKNodeAlias arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = NodeAlias_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = NodeAlias_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_NodeAlias_clone"))) TS_NodeAlias_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_NodeAlias_clone"))) TS_NodeAlias_clone(uint64_t orig) { LDKNodeAlias orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKNodeAlias ret_var = NodeAlias_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_NodeAlias_write"))) TS_NodeAlias_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_NodeAlias_write"))) TS_NodeAlias_write(uint64_t obj) { LDKNodeAlias obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = NodeAlias_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -40715,29 +38951,30 @@ int8_tArray __attribute__((export_name("TS_NodeAlias_write"))) TS_NodeAlias_wri return ret_arr; } -uint32_t __attribute__((export_name("TS_NodeAlias_read"))) TS_NodeAlias_read(int8_tArray ser) { +uint64_t __attribute__((export_name("TS_NodeAlias_read"))) TS_NodeAlias_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; ser_ref.data = ser->elems; LDKCResult_NodeAliasDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAliasDecodeErrorZ), "LDKCResult_NodeAliasDecodeErrorZ"); *ret_conv = NodeAlias_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_NodeInfo_free"))) TS_NodeInfo_free(uint32_t this_obj) { +void __attribute__((export_name("TS_NodeInfo_free"))) TS_NodeInfo_free(uint64_t this_obj) { LDKNodeInfo this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); NodeInfo_free(this_obj_conv); } -int64_tArray __attribute__((export_name("TS_NodeInfo_get_channels"))) TS_NodeInfo_get_channels(uint32_t this_ptr) { +int64_tArray __attribute__((export_name("TS_NodeInfo_get_channels"))) TS_NodeInfo_get_channels(uint64_t this_ptr) { LDKNodeInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_u64Z ret_var = NodeInfo_get_channels(&this_ptr_conv); int64_tArray ret_arr = NULL; ret_arr = init_int64_tArray(ret_var.datalen, __LINE__); @@ -40751,11 +38988,12 @@ int64_tArray __attribute__((export_name("TS_NodeInfo_get_channels"))) TS_NodeIn return ret_arr; } -void __attribute__((export_name("TS_NodeInfo_set_channels"))) TS_NodeInfo_set_channels(uint32_t this_ptr, int64_tArray val) { +void __attribute__((export_name("TS_NodeInfo_set_channels"))) TS_NodeInfo_set_channels(uint64_t this_ptr, int64_tArray val) { LDKNodeInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_u64Z val_constr; val_constr.datalen = val->arr_len; if (val_constr.datalen > 0) @@ -40771,71 +39009,61 @@ void __attribute__((export_name("TS_NodeInfo_set_channels"))) TS_NodeInfo_set_c NodeInfo_set_channels(&this_ptr_conv, val_constr); } -uint32_t __attribute__((export_name("TS_NodeInfo_get_lowest_inbound_channel_fees"))) TS_NodeInfo_get_lowest_inbound_channel_fees(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_NodeInfo_get_lowest_inbound_channel_fees"))) TS_NodeInfo_get_lowest_inbound_channel_fees(uint64_t this_ptr) { LDKNodeInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKRoutingFees ret_var = NodeInfo_get_lowest_inbound_channel_fees(&this_ptr_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_NodeInfo_set_lowest_inbound_channel_fees"))) TS_NodeInfo_set_lowest_inbound_channel_fees(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_NodeInfo_set_lowest_inbound_channel_fees"))) TS_NodeInfo_set_lowest_inbound_channel_fees(uint64_t this_ptr, uint64_t val) { LDKNodeInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKRoutingFees val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = RoutingFees_clone(&val_conv); NodeInfo_set_lowest_inbound_channel_fees(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_NodeInfo_get_announcement_info"))) TS_NodeInfo_get_announcement_info(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_NodeInfo_get_announcement_info"))) TS_NodeInfo_get_announcement_info(uint64_t this_ptr) { LDKNodeInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKNodeAnnouncementInfo ret_var = NodeInfo_get_announcement_info(&this_ptr_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_NodeInfo_set_announcement_info"))) TS_NodeInfo_set_announcement_info(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_NodeInfo_set_announcement_info"))) TS_NodeInfo_set_announcement_info(uint64_t this_ptr, uint64_t val) { LDKNodeInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKNodeAnnouncementInfo val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = NodeAnnouncementInfo_clone(&val_conv); NodeInfo_set_announcement_info(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_NodeInfo_new"))) TS_NodeInfo_new(int64_tArray channels_arg, uint32_t lowest_inbound_channel_fees_arg, uint32_t announcement_info_arg) { +uint64_t __attribute__((export_name("TS_NodeInfo_new"))) TS_NodeInfo_new(int64_tArray channels_arg, uint64_t lowest_inbound_channel_fees_arg, uint64_t announcement_info_arg) { LDKCVec_u64Z channels_arg_constr; channels_arg_constr.datalen = channels_arg->arr_len; if (channels_arg_constr.datalen > 0) @@ -40849,70 +39077,58 @@ uint32_t __attribute__((export_name("TS_NodeInfo_new"))) TS_NodeInfo_new(int64_ } FREE(channels_arg); LDKRoutingFees lowest_inbound_channel_fees_arg_conv; - lowest_inbound_channel_fees_arg_conv.inner = (void*)(lowest_inbound_channel_fees_arg & (~1)); - lowest_inbound_channel_fees_arg_conv.is_owned = (lowest_inbound_channel_fees_arg & 1) || (lowest_inbound_channel_fees_arg == 0); + lowest_inbound_channel_fees_arg_conv.inner = untag_ptr(lowest_inbound_channel_fees_arg); + lowest_inbound_channel_fees_arg_conv.is_owned = ptr_is_owned(lowest_inbound_channel_fees_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(lowest_inbound_channel_fees_arg_conv); lowest_inbound_channel_fees_arg_conv = RoutingFees_clone(&lowest_inbound_channel_fees_arg_conv); LDKNodeAnnouncementInfo announcement_info_arg_conv; - announcement_info_arg_conv.inner = (void*)(announcement_info_arg & (~1)); - announcement_info_arg_conv.is_owned = (announcement_info_arg & 1) || (announcement_info_arg == 0); + announcement_info_arg_conv.inner = untag_ptr(announcement_info_arg); + announcement_info_arg_conv.is_owned = ptr_is_owned(announcement_info_arg); 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t NodeInfo_clone_ptr(LDKNodeInfo *NONNULL_PTR arg) { +static inline uint64_t NodeInfo_clone_ptr(LDKNodeInfo *NONNULL_PTR arg) { LDKNodeInfo ret_var = NodeInfo_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_NodeInfo_clone_ptr"))) TS_NodeInfo_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_NodeInfo_clone_ptr"))) TS_NodeInfo_clone_ptr(uint64_t arg) { LDKNodeInfo arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = NodeInfo_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = NodeInfo_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_NodeInfo_clone"))) TS_NodeInfo_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_NodeInfo_clone"))) TS_NodeInfo_clone(uint64_t orig) { LDKNodeInfo orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKNodeInfo ret_var = NodeInfo_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_NodeInfo_write"))) TS_NodeInfo_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_NodeInfo_write"))) TS_NodeInfo_write(uint64_t obj) { LDKNodeInfo obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = NodeInfo_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -40920,21 +39136,22 @@ int8_tArray __attribute__((export_name("TS_NodeInfo_write"))) TS_NodeInfo_write return ret_arr; } -uint32_t __attribute__((export_name("TS_NodeInfo_read"))) TS_NodeInfo_read(int8_tArray ser) { +uint64_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; LDKCResult_NodeInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeInfoDecodeErrorZ), "LDKCResult_NodeInfoDecodeErrorZ"); *ret_conv = NodeInfo_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_NetworkGraph_write"))) TS_NetworkGraph_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_NetworkGraph_write"))) TS_NetworkGraph_write(uint64_t obj) { LDKNetworkGraph obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = NetworkGraph_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -40942,11 +39159,11 @@ int8_tArray __attribute__((export_name("TS_NetworkGraph_write"))) TS_NetworkGra return ret_arr; } -uint32_t __attribute__((export_name("TS_NetworkGraph_read"))) TS_NetworkGraph_read(int8_tArray ser, uint32_t arg) { +uint64_t __attribute__((export_name("TS_NetworkGraph_read"))) TS_NetworkGraph_read(int8_tArray ser, uint64_t arg) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; ser_ref.data = ser->elems; - void* arg_ptr = (void*)(((uintptr_t)arg) & ~1); + void* arg_ptr = untag_ptr(arg); CHECK_ACCESS(arg_ptr); LDKLogger arg_conv = *(LDKLogger*)(arg_ptr); if (arg_conv.free == LDKLogger_JCalls_free) { @@ -40956,14 +39173,14 @@ uint32_t __attribute__((export_name("TS_NetworkGraph_read"))) TS_NetworkGraph_r LDKCResult_NetworkGraphDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetworkGraphDecodeErrorZ), "LDKCResult_NetworkGraphDecodeErrorZ"); *ret_conv = NetworkGraph_read(ser_ref, arg_conv); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_NetworkGraph_new"))) TS_NetworkGraph_new(int8_tArray genesis_hash, uint32_t logger) { +uint64_t __attribute__((export_name("TS_NetworkGraph_new"))) TS_NetworkGraph_new(int8_tArray genesis_hash, uint64_t logger) { LDKThirtyTwoBytes genesis_hash_ref; CHECK(genesis_hash->arr_len == 32); memcpy(genesis_hash_ref.data, genesis_hash->elems, 32); FREE(genesis_hash); - void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); + void* logger_ptr = untag_ptr(logger); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); if (logger_conv.free == LDKLogger_JCalls_free) { @@ -40971,91 +39188,90 @@ uint32_t __attribute__((export_name("TS_NetworkGraph_new"))) TS_NetworkGraph_ne LDKLogger_JCalls_cloned(&logger_conv); } LDKNetworkGraph ret_var = NetworkGraph_new(genesis_hash_ref, logger_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_NetworkGraph_read_only"))) TS_NetworkGraph_read_only(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_NetworkGraph_read_only"))) TS_NetworkGraph_read_only(uint64_t this_arg) { LDKNetworkGraph this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKReadOnlyNetworkGraph ret_var = NetworkGraph_read_only(&this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_NetworkGraph_get_last_rapid_gossip_sync_timestamp"))) TS_NetworkGraph_get_last_rapid_gossip_sync_timestamp(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_NetworkGraph_get_last_rapid_gossip_sync_timestamp"))) TS_NetworkGraph_get_last_rapid_gossip_sync_timestamp(uint64_t this_arg) { LDKNetworkGraph this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCOption_u32Z *ret_copy = MALLOC(sizeof(LDKCOption_u32Z), "LDKCOption_u32Z"); *ret_copy = NetworkGraph_get_last_rapid_gossip_sync_timestamp(&this_arg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_NetworkGraph_set_last_rapid_gossip_sync_timestamp"))) TS_NetworkGraph_set_last_rapid_gossip_sync_timestamp(uint32_t this_arg, int32_t last_rapid_gossip_sync_timestamp) { +void __attribute__((export_name("TS_NetworkGraph_set_last_rapid_gossip_sync_timestamp"))) TS_NetworkGraph_set_last_rapid_gossip_sync_timestamp(uint64_t this_arg, int32_t last_rapid_gossip_sync_timestamp) { LDKNetworkGraph this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NetworkGraph_set_last_rapid_gossip_sync_timestamp(&this_arg_conv, last_rapid_gossip_sync_timestamp); } -uint32_t __attribute__((export_name("TS_NetworkGraph_update_node_from_announcement"))) TS_NetworkGraph_update_node_from_announcement(uint32_t this_arg, uint32_t msg) { +uint64_t __attribute__((export_name("TS_NetworkGraph_update_node_from_announcement"))) TS_NetworkGraph_update_node_from_announcement(uint64_t this_arg, uint64_t msg) { LDKNetworkGraph this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKNodeAnnouncement msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = NetworkGraph_update_node_from_announcement(&this_arg_conv, &msg_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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) { +uint64_t __attribute__((export_name("TS_NetworkGraph_update_node_from_unsigned_announcement"))) TS_NetworkGraph_update_node_from_unsigned_announcement(uint64_t this_arg, uint64_t msg) { LDKNetworkGraph this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKUnsignedNodeAnnouncement msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = NetworkGraph_update_node_from_unsigned_announcement(&this_arg_conv, &msg_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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) { +uint64_t __attribute__((export_name("TS_NetworkGraph_update_channel_from_announcement"))) TS_NetworkGraph_update_channel_from_announcement(uint64_t this_arg, uint64_t msg, uint64_t chain_access) { LDKNetworkGraph this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKChannelAnnouncement msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); - void* chain_access_ptr = (void*)(((uintptr_t)chain_access) & ~1); + msg_conv.is_owned = false; + void* chain_access_ptr = untag_ptr(chain_access); 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 @@ -41068,19 +39284,21 @@ 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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) { +uint64_t __attribute__((export_name("TS_NetworkGraph_update_channel_from_unsigned_announcement"))) TS_NetworkGraph_update_channel_from_unsigned_announcement(uint64_t this_arg, uint64_t msg, uint64_t chain_access) { LDKNetworkGraph this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKUnsignedChannelAnnouncement msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); - void* chain_access_ptr = (void*)(((uintptr_t)chain_access) & ~1); + msg_conv.is_owned = false; + void* chain_access_ptr = untag_ptr(chain_access); 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 @@ -41093,17 +39311,18 @@ 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_NetworkGraph_add_channel_from_partial_announcement"))) TS_NetworkGraph_add_channel_from_partial_announcement(uint32_t this_arg, int64_t short_channel_id, int64_t timestamp, uint32_t features, int8_tArray node_id_1, int8_tArray node_id_2) { +uint64_t __attribute__((export_name("TS_NetworkGraph_add_channel_from_partial_announcement"))) TS_NetworkGraph_add_channel_from_partial_announcement(uint64_t this_arg, int64_t short_channel_id, int64_t timestamp, uint64_t features, int8_tArray node_id_1, int8_tArray node_id_2) { LDKNetworkGraph this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKChannelFeatures features_conv; - features_conv.inner = (void*)(features & (~1)); - features_conv.is_owned = (features & 1) || (features == 0); + features_conv.inner = untag_ptr(features); + features_conv.is_owned = ptr_is_owned(features); CHECK_INNER_FIELD_ACCESS_OR_NULL(features_conv); features_conv = ChannelFeatures_clone(&features_conv); LDKPublicKey node_id_1_ref; @@ -41114,88 +39333,90 @@ uint32_t __attribute__((export_name("TS_NetworkGraph_add_channel_from_partial_a memcpy(node_id_2_ref.compressed_form, node_id_2->elems, 33); FREE(node_id_2); LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = NetworkGraph_add_channel_from_partial_announcement(&this_arg_conv, short_channel_id, timestamp, features_conv, node_id_1_ref, node_id_2_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_NetworkGraph_channel_failed"))) TS_NetworkGraph_channel_failed(uint32_t this_arg, int64_t short_channel_id, jboolean is_permanent) { +void __attribute__((export_name("TS_NetworkGraph_channel_failed"))) TS_NetworkGraph_channel_failed(uint64_t this_arg, int64_t short_channel_id, jboolean is_permanent) { LDKNetworkGraph this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NetworkGraph_channel_failed(&this_arg_conv, short_channel_id, is_permanent); } -void __attribute__((export_name("TS_NetworkGraph_node_failed"))) TS_NetworkGraph_node_failed(uint32_t this_arg, int8_tArray _node_id, jboolean is_permanent) { +void __attribute__((export_name("TS_NetworkGraph_node_failed"))) TS_NetworkGraph_node_failed(uint64_t this_arg, int8_tArray _node_id, jboolean is_permanent) { LDKNetworkGraph this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKPublicKey _node_id_ref; CHECK(_node_id->arr_len == 33); memcpy(_node_id_ref.compressed_form, _node_id->elems, 33); FREE(_node_id); NetworkGraph_node_failed(&this_arg_conv, _node_id_ref, is_permanent); } -void __attribute__((export_name("TS_NetworkGraph_remove_stale_channels_with_time"))) TS_NetworkGraph_remove_stale_channels_with_time(uint32_t this_arg, int64_t current_time_unix) { +void __attribute__((export_name("TS_NetworkGraph_remove_stale_channels_with_time"))) TS_NetworkGraph_remove_stale_channels_with_time(uint64_t this_arg, int64_t current_time_unix) { LDKNetworkGraph this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NetworkGraph_remove_stale_channels_with_time(&this_arg_conv, current_time_unix); } -uint32_t __attribute__((export_name("TS_NetworkGraph_update_channel"))) TS_NetworkGraph_update_channel(uint32_t this_arg, uint32_t msg) { +uint64_t __attribute__((export_name("TS_NetworkGraph_update_channel"))) TS_NetworkGraph_update_channel(uint64_t this_arg, uint64_t msg) { LDKNetworkGraph this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKChannelUpdate msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = NetworkGraph_update_channel(&this_arg_conv, &msg_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_NetworkGraph_update_channel_unsigned"))) TS_NetworkGraph_update_channel_unsigned(uint32_t this_arg, uint32_t msg) { +uint64_t __attribute__((export_name("TS_NetworkGraph_update_channel_unsigned"))) TS_NetworkGraph_update_channel_unsigned(uint64_t this_arg, uint64_t msg) { LDKNetworkGraph this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKUnsignedChannelUpdate msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = NetworkGraph_update_channel_unsigned(&this_arg_conv, &msg_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_ReadOnlyNetworkGraph_channel"))) TS_ReadOnlyNetworkGraph_channel(uint32_t this_arg, int64_t short_channel_id) { +uint64_t __attribute__((export_name("TS_ReadOnlyNetworkGraph_channel"))) TS_ReadOnlyNetworkGraph_channel(uint64_t this_arg, int64_t short_channel_id) { LDKReadOnlyNetworkGraph this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKChannelInfo ret_var = ReadOnlyNetworkGraph_channel(&this_arg_conv, short_channel_id); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int64_tArray __attribute__((export_name("TS_ReadOnlyNetworkGraph_list_channels"))) TS_ReadOnlyNetworkGraph_list_channels(uint32_t this_arg) { +int64_tArray __attribute__((export_name("TS_ReadOnlyNetworkGraph_list_channels"))) TS_ReadOnlyNetworkGraph_list_channels(uint64_t this_arg) { LDKReadOnlyNetworkGraph this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCVec_u64Z ret_var = ReadOnlyNetworkGraph_list_channels(&this_arg_conv); int64_tArray ret_arr = NULL; ret_arr = init_int64_tArray(ret_var.datalen, __LINE__); @@ -41209,48 +39430,39 @@ int64_tArray __attribute__((export_name("TS_ReadOnlyNetworkGraph_list_channels" return ret_arr; } -uint32_t __attribute__((export_name("TS_ReadOnlyNetworkGraph_node"))) TS_ReadOnlyNetworkGraph_node(uint32_t this_arg, uint32_t node_id) { +uint64_t __attribute__((export_name("TS_ReadOnlyNetworkGraph_node"))) TS_ReadOnlyNetworkGraph_node(uint64_t this_arg, uint64_t node_id) { LDKReadOnlyNetworkGraph this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKNodeId node_id_conv; - node_id_conv.inner = (void*)(node_id & (~1)); - node_id_conv.is_owned = false; + node_id_conv.inner = untag_ptr(node_id); + node_id_conv.is_owned = ptr_is_owned(node_id); CHECK_INNER_FIELD_ACCESS_OR_NULL(node_id_conv); + node_id_conv.is_owned = false; LDKNodeInfo ret_var = ReadOnlyNetworkGraph_node(&this_arg_conv, &node_id_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_tArray __attribute__((export_name("TS_ReadOnlyNetworkGraph_list_nodes"))) TS_ReadOnlyNetworkGraph_list_nodes(uint32_t this_arg) { +uint64_tArray __attribute__((export_name("TS_ReadOnlyNetworkGraph_list_nodes"))) TS_ReadOnlyNetworkGraph_list_nodes(uint64_t this_arg) { LDKReadOnlyNetworkGraph this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCVec_NodeIdZ ret_var = ReadOnlyNetworkGraph_list_nodes(&this_arg_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t i = 0; i < ret_var.datalen; i++) { LDKNodeId ret_conv_8_var = ret_var.data[i]; - uint32_t ret_conv_8_ref = 0; - CHECK((((uintptr_t)ret_conv_8_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_conv_8_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_conv_8_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_8_var); - ret_conv_8_ref = (uintptr_t)ret_conv_8_var.inner; - if (ret_conv_8_var.is_owned) { - ret_conv_8_ref |= 1; - } + ret_conv_8_ref = tag_ptr(ret_conv_8_var.inner, ret_conv_8_var.is_owned); ret_arr_ptr[i] = ret_conv_8_ref; } @@ -41258,251 +39470,245 @@ uint32_tArray __attribute__((export_name("TS_ReadOnlyNetworkGraph_list_nodes")) return ret_arr; } -uint32_t __attribute__((export_name("TS_ReadOnlyNetworkGraph_get_addresses"))) TS_ReadOnlyNetworkGraph_get_addresses(uint32_t this_arg, int8_tArray pubkey) { +uint64_t __attribute__((export_name("TS_ReadOnlyNetworkGraph_get_addresses"))) TS_ReadOnlyNetworkGraph_get_addresses(uint64_t this_arg, int8_tArray pubkey) { LDKReadOnlyNetworkGraph this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKPublicKey pubkey_ref; CHECK(pubkey->arr_len == 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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_RouteHop_free"))) TS_RouteHop_free(uint32_t this_obj) { +void __attribute__((export_name("TS_RouteHop_free"))) TS_RouteHop_free(uint64_t this_obj) { LDKRouteHop this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); RouteHop_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_RouteHop_get_pubkey"))) TS_RouteHop_get_pubkey(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_RouteHop_get_pubkey"))) TS_RouteHop_get_pubkey(uint64_t this_ptr) { LDKRouteHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_RouteHop_set_pubkey"))) TS_RouteHop_set_pubkey(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_RouteHop_set_pubkey"))) TS_RouteHop_set_pubkey(uint64_t this_ptr, int8_tArray val) { LDKRouteHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); RouteHop_set_pubkey(&this_ptr_conv, val_ref); } -uint32_t __attribute__((export_name("TS_RouteHop_get_node_features"))) TS_RouteHop_get_node_features(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_RouteHop_get_node_features"))) TS_RouteHop_get_node_features(uint64_t this_ptr) { LDKRouteHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKNodeFeatures ret_var = RouteHop_get_node_features(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_RouteHop_set_node_features"))) TS_RouteHop_set_node_features(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_RouteHop_set_node_features"))) TS_RouteHop_set_node_features(uint64_t this_ptr, uint64_t val) { LDKRouteHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKNodeFeatures val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = NodeFeatures_clone(&val_conv); RouteHop_set_node_features(&this_ptr_conv, val_conv); } -int64_t __attribute__((export_name("TS_RouteHop_get_short_channel_id"))) TS_RouteHop_get_short_channel_id(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_RouteHop_get_short_channel_id"))) TS_RouteHop_get_short_channel_id(uint64_t this_ptr) { LDKRouteHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = RouteHop_get_short_channel_id(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_RouteHop_set_short_channel_id"))) TS_RouteHop_set_short_channel_id(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_RouteHop_set_short_channel_id"))) TS_RouteHop_set_short_channel_id(uint64_t this_ptr, int64_t val) { LDKRouteHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; RouteHop_set_short_channel_id(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_RouteHop_get_channel_features"))) TS_RouteHop_get_channel_features(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_RouteHop_get_channel_features"))) TS_RouteHop_get_channel_features(uint64_t this_ptr) { LDKRouteHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelFeatures ret_var = RouteHop_get_channel_features(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_RouteHop_set_channel_features"))) TS_RouteHop_set_channel_features(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_RouteHop_set_channel_features"))) TS_RouteHop_set_channel_features(uint64_t this_ptr, uint64_t val) { LDKRouteHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelFeatures val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = ChannelFeatures_clone(&val_conv); RouteHop_set_channel_features(&this_ptr_conv, val_conv); } -int64_t __attribute__((export_name("TS_RouteHop_get_fee_msat"))) TS_RouteHop_get_fee_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_RouteHop_get_fee_msat"))) TS_RouteHop_get_fee_msat(uint64_t this_ptr) { LDKRouteHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = RouteHop_get_fee_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_RouteHop_set_fee_msat"))) TS_RouteHop_set_fee_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_RouteHop_set_fee_msat"))) TS_RouteHop_set_fee_msat(uint64_t this_ptr, int64_t val) { LDKRouteHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; RouteHop_set_fee_msat(&this_ptr_conv, val); } -int32_t __attribute__((export_name("TS_RouteHop_get_cltv_expiry_delta"))) TS_RouteHop_get_cltv_expiry_delta(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_RouteHop_get_cltv_expiry_delta"))) TS_RouteHop_get_cltv_expiry_delta(uint64_t this_ptr) { LDKRouteHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = RouteHop_get_cltv_expiry_delta(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_RouteHop_set_cltv_expiry_delta"))) TS_RouteHop_set_cltv_expiry_delta(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_RouteHop_set_cltv_expiry_delta"))) TS_RouteHop_set_cltv_expiry_delta(uint64_t this_ptr, int32_t val) { LDKRouteHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; RouteHop_set_cltv_expiry_delta(&this_ptr_conv, val); } -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) { +uint64_t __attribute__((export_name("TS_RouteHop_new"))) TS_RouteHop_new(int8_tArray pubkey_arg, uint64_t node_features_arg, int64_t short_channel_id_arg, uint64_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); 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); + node_features_arg_conv.inner = untag_ptr(node_features_arg); + node_features_arg_conv.is_owned = ptr_is_owned(node_features_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(node_features_arg_conv); node_features_arg_conv = NodeFeatures_clone(&node_features_arg_conv); LDKChannelFeatures channel_features_arg_conv; - channel_features_arg_conv.inner = (void*)(channel_features_arg & (~1)); - channel_features_arg_conv.is_owned = (channel_features_arg & 1) || (channel_features_arg == 0); + channel_features_arg_conv.inner = untag_ptr(channel_features_arg); + channel_features_arg_conv.is_owned = ptr_is_owned(channel_features_arg); 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t RouteHop_clone_ptr(LDKRouteHop *NONNULL_PTR arg) { +static inline uint64_t RouteHop_clone_ptr(LDKRouteHop *NONNULL_PTR arg) { LDKRouteHop ret_var = RouteHop_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_RouteHop_clone_ptr"))) TS_RouteHop_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_RouteHop_clone_ptr"))) TS_RouteHop_clone_ptr(uint64_t arg) { LDKRouteHop arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = RouteHop_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = RouteHop_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_RouteHop_clone"))) TS_RouteHop_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_RouteHop_clone"))) TS_RouteHop_clone(uint64_t orig) { LDKRouteHop orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKRouteHop ret_var = RouteHop_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int64_t __attribute__((export_name("TS_RouteHop_hash"))) TS_RouteHop_hash(uint32_t o) { +int64_t __attribute__((export_name("TS_RouteHop_hash"))) TS_RouteHop_hash(uint64_t o) { LDKRouteHop o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = false; + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); + o_conv.is_owned = false; int64_t ret_conv = RouteHop_hash(&o_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_RouteHop_eq"))) TS_RouteHop_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_RouteHop_eq"))) TS_RouteHop_eq(uint64_t a, uint64_t b) { LDKRouteHop a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKRouteHop b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = RouteHop_eq(&a_conv, &b_conv); return ret_conv; } -int8_tArray __attribute__((export_name("TS_RouteHop_write"))) TS_RouteHop_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_RouteHop_write"))) TS_RouteHop_write(uint64_t obj) { LDKRouteHop obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = RouteHop_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -41510,48 +39716,44 @@ int8_tArray __attribute__((export_name("TS_RouteHop_write"))) TS_RouteHop_write return ret_arr; } -uint32_t __attribute__((export_name("TS_RouteHop_read"))) TS_RouteHop_read(int8_tArray ser) { +uint64_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; LDKCResult_RouteHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHopDecodeErrorZ), "LDKCResult_RouteHopDecodeErrorZ"); *ret_conv = RouteHop_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_Route_free"))) TS_Route_free(uint32_t this_obj) { +void __attribute__((export_name("TS_Route_free"))) TS_Route_free(uint64_t this_obj) { LDKRoute this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); Route_free(this_obj_conv); } -ptrArray __attribute__((export_name("TS_Route_get_paths"))) TS_Route_get_paths(uint32_t this_ptr) { +ptrArray __attribute__((export_name("TS_Route_get_paths"))) TS_Route_get_paths(uint64_t this_ptr) { LDKRoute this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_CVec_RouteHopZZ ret_var = Route_get_paths(&this_ptr_conv); ptrArray ret_arr = NULL; ret_arr = init_ptrArray(ret_var.datalen, __LINE__); - uint32_tArray *ret_arr_ptr = (uint32_tArray*)(((uint8_t*)ret_arr) + 8); + uint64_tArray *ret_arr_ptr = (uint64_tArray*)(((uint8_t*)ret_arr) + 8); for (size_t m = 0; m < ret_var.datalen; m++) { LDKCVec_RouteHopZ ret_conv_12_var = ret_var.data[m]; - uint32_tArray ret_conv_12_arr = NULL; - ret_conv_12_arr = init_uint32_tArray(ret_conv_12_var.datalen, __LINE__); - uint32_t *ret_conv_12_arr_ptr = (uint32_t*)(((uint8_t*)ret_conv_12_arr) + 8); + uint64_tArray ret_conv_12_arr = NULL; + ret_conv_12_arr = init_uint64_tArray(ret_conv_12_var.datalen, __LINE__); + uint64_t *ret_conv_12_arr_ptr = (uint64_t*)(((uint8_t*)ret_conv_12_arr) + 8); for (size_t k = 0; k < ret_conv_12_var.datalen; k++) { LDKRouteHop ret_conv_12_conv_10_var = ret_conv_12_var.data[k]; - uint32_t ret_conv_12_conv_10_ref = 0; - 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. + uint64_t ret_conv_12_conv_10_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_12_conv_10_var); - 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; - } + ret_conv_12_conv_10_ref = tag_ptr(ret_conv_12_conv_10_var.inner, ret_conv_12_conv_10_var.is_owned); ret_conv_12_arr_ptr[k] = ret_conv_12_conv_10_ref; } @@ -41563,32 +39765,33 @@ ptrArray __attribute__((export_name("TS_Route_get_paths"))) TS_Route_get_paths( return ret_arr; } -void __attribute__((export_name("TS_Route_set_paths"))) TS_Route_set_paths(uint32_t this_ptr, ptrArray val) { +void __attribute__((export_name("TS_Route_set_paths"))) TS_Route_set_paths(uint64_t this_ptr, ptrArray val) { LDKRoute this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_CVec_RouteHopZZ val_constr; val_constr.datalen = val->arr_len; if (val_constr.datalen > 0) 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; + uint64_tArray* val_vals = (void*) val->elems; for (size_t m = 0; m < val_constr.datalen; m++) { - uint32_tArray val_conv_12 = val_vals[m]; + uint64_tArray val_conv_12 = val_vals[m]; LDKCVec_RouteHopZ val_conv_12_constr; val_conv_12_constr.datalen = val_conv_12->arr_len; if (val_conv_12_constr.datalen > 0) 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; + uint64_t* val_conv_12_vals = val_conv_12->elems; for (size_t k = 0; k < val_conv_12_constr.datalen; k++) { - uint32_t val_conv_12_conv_10 = val_conv_12_vals[k]; + uint64_t val_conv_12_conv_10 = val_conv_12_vals[k]; LDKRouteHop val_conv_12_conv_10_conv; - val_conv_12_conv_10_conv.inner = (void*)(val_conv_12_conv_10 & (~1)); - val_conv_12_conv_10_conv.is_owned = (val_conv_12_conv_10 & 1) || (val_conv_12_conv_10 == 0); + val_conv_12_conv_10_conv.inner = untag_ptr(val_conv_12_conv_10); + val_conv_12_conv_10_conv.is_owned = ptr_is_owned(val_conv_12_conv_10); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv_12_conv_10_conv); val_conv_12_conv_10_conv = RouteHop_clone(&val_conv_12_conv_10_conv); val_conv_12_constr.data[k] = val_conv_12_conv_10_conv; @@ -41600,60 +39803,55 @@ void __attribute__((export_name("TS_Route_set_paths"))) TS_Route_set_paths(uint Route_set_paths(&this_ptr_conv, val_constr); } -uint32_t __attribute__((export_name("TS_Route_get_payment_params"))) TS_Route_get_payment_params(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_Route_get_payment_params"))) TS_Route_get_payment_params(uint64_t this_ptr) { LDKRoute this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPaymentParameters ret_var = Route_get_payment_params(&this_ptr_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_Route_set_payment_params"))) TS_Route_set_payment_params(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_Route_set_payment_params"))) TS_Route_set_payment_params(uint64_t this_ptr, uint64_t val) { LDKRoute this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPaymentParameters val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = PaymentParameters_clone(&val_conv); Route_set_payment_params(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_Route_new"))) TS_Route_new(ptrArray paths_arg, uint32_t payment_params_arg) { +uint64_t __attribute__((export_name("TS_Route_new"))) TS_Route_new(ptrArray paths_arg, uint64_t payment_params_arg) { LDKCVec_CVec_RouteHopZZ paths_arg_constr; paths_arg_constr.datalen = paths_arg->arr_len; if (paths_arg_constr.datalen > 0) 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; + uint64_tArray* paths_arg_vals = (void*) paths_arg->elems; for (size_t m = 0; m < paths_arg_constr.datalen; m++) { - uint32_tArray paths_arg_conv_12 = paths_arg_vals[m]; + uint64_tArray paths_arg_conv_12 = paths_arg_vals[m]; LDKCVec_RouteHopZ paths_arg_conv_12_constr; paths_arg_conv_12_constr.datalen = paths_arg_conv_12->arr_len; if (paths_arg_conv_12_constr.datalen > 0) 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; + uint64_t* paths_arg_conv_12_vals = paths_arg_conv_12->elems; for (size_t k = 0; k < paths_arg_conv_12_constr.datalen; k++) { - uint32_t paths_arg_conv_12_conv_10 = paths_arg_conv_12_vals[k]; + uint64_t paths_arg_conv_12_conv_10 = paths_arg_conv_12_vals[k]; LDKRouteHop paths_arg_conv_12_conv_10_conv; - paths_arg_conv_12_conv_10_conv.inner = (void*)(paths_arg_conv_12_conv_10 & (~1)); - paths_arg_conv_12_conv_10_conv.is_owned = (paths_arg_conv_12_conv_10 & 1) || (paths_arg_conv_12_conv_10 == 0); + paths_arg_conv_12_conv_10_conv.inner = untag_ptr(paths_arg_conv_12_conv_10); + paths_arg_conv_12_conv_10_conv.is_owned = ptr_is_owned(paths_arg_conv_12_conv_10); CHECK_INNER_FIELD_ACCESS_OR_NULL(paths_arg_conv_12_conv_10_conv); paths_arg_conv_12_conv_10_conv = RouteHop_clone(&paths_arg_conv_12_conv_10_conv); paths_arg_conv_12_constr.data[k] = paths_arg_conv_12_conv_10_conv; @@ -41663,105 +39861,98 @@ uint32_t __attribute__((export_name("TS_Route_new"))) TS_Route_new(ptrArray pat } FREE(paths_arg); LDKPaymentParameters payment_params_arg_conv; - payment_params_arg_conv.inner = (void*)(payment_params_arg & (~1)); - payment_params_arg_conv.is_owned = (payment_params_arg & 1) || (payment_params_arg == 0); + payment_params_arg_conv.inner = untag_ptr(payment_params_arg); + payment_params_arg_conv.is_owned = ptr_is_owned(payment_params_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(payment_params_arg_conv); payment_params_arg_conv = PaymentParameters_clone(&payment_params_arg_conv); LDKRoute ret_var = Route_new(paths_arg_constr, payment_params_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t Route_clone_ptr(LDKRoute *NONNULL_PTR arg) { +static inline uint64_t Route_clone_ptr(LDKRoute *NONNULL_PTR arg) { LDKRoute ret_var = Route_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_Route_clone_ptr"))) TS_Route_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_Route_clone_ptr"))) TS_Route_clone_ptr(uint64_t arg) { LDKRoute arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = Route_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = Route_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_Route_clone"))) TS_Route_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_Route_clone"))) TS_Route_clone(uint64_t orig) { LDKRoute orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKRoute ret_var = Route_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int64_t __attribute__((export_name("TS_Route_hash"))) TS_Route_hash(uint32_t o) { +int64_t __attribute__((export_name("TS_Route_hash"))) TS_Route_hash(uint64_t o) { LDKRoute o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = false; + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); + o_conv.is_owned = false; int64_t ret_conv = Route_hash(&o_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_Route_eq"))) TS_Route_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_Route_eq"))) TS_Route_eq(uint64_t a, uint64_t b) { LDKRoute a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKRoute b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = Route_eq(&a_conv, &b_conv); return ret_conv; } -int64_t __attribute__((export_name("TS_Route_get_total_fees"))) TS_Route_get_total_fees(uint32_t this_arg) { +int64_t __attribute__((export_name("TS_Route_get_total_fees"))) TS_Route_get_total_fees(uint64_t this_arg) { LDKRoute this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int64_t ret_conv = Route_get_total_fees(&this_arg_conv); return ret_conv; } -int64_t __attribute__((export_name("TS_Route_get_total_amount"))) TS_Route_get_total_amount(uint32_t this_arg) { +int64_t __attribute__((export_name("TS_Route_get_total_amount"))) TS_Route_get_total_amount(uint64_t this_arg) { LDKRoute this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int64_t ret_conv = Route_get_total_amount(&this_arg_conv); return ret_conv; } -int8_tArray __attribute__((export_name("TS_Route_write"))) TS_Route_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_Route_write"))) TS_Route_write(uint64_t obj) { LDKRoute obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = Route_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -41769,149 +39960,138 @@ int8_tArray __attribute__((export_name("TS_Route_write"))) TS_Route_write(uint3 return ret_arr; } -uint32_t __attribute__((export_name("TS_Route_read"))) TS_Route_read(int8_tArray ser) { +uint64_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; LDKCResult_RouteDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteDecodeErrorZ), "LDKCResult_RouteDecodeErrorZ"); *ret_conv = Route_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_RouteParameters_free"))) TS_RouteParameters_free(uint32_t this_obj) { +void __attribute__((export_name("TS_RouteParameters_free"))) TS_RouteParameters_free(uint64_t this_obj) { LDKRouteParameters this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); RouteParameters_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_RouteParameters_get_payment_params"))) TS_RouteParameters_get_payment_params(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_RouteParameters_get_payment_params"))) TS_RouteParameters_get_payment_params(uint64_t this_ptr) { LDKRouteParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPaymentParameters ret_var = RouteParameters_get_payment_params(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_RouteParameters_set_payment_params"))) TS_RouteParameters_set_payment_params(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_RouteParameters_set_payment_params"))) TS_RouteParameters_set_payment_params(uint64_t this_ptr, uint64_t val) { LDKRouteParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPaymentParameters val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = PaymentParameters_clone(&val_conv); RouteParameters_set_payment_params(&this_ptr_conv, val_conv); } -int64_t __attribute__((export_name("TS_RouteParameters_get_final_value_msat"))) TS_RouteParameters_get_final_value_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_RouteParameters_get_final_value_msat"))) TS_RouteParameters_get_final_value_msat(uint64_t this_ptr) { LDKRouteParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = RouteParameters_get_final_value_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_RouteParameters_set_final_value_msat"))) TS_RouteParameters_set_final_value_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_RouteParameters_set_final_value_msat"))) TS_RouteParameters_set_final_value_msat(uint64_t this_ptr, int64_t val) { LDKRouteParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; RouteParameters_set_final_value_msat(&this_ptr_conv, val); } -int32_t __attribute__((export_name("TS_RouteParameters_get_final_cltv_expiry_delta"))) TS_RouteParameters_get_final_cltv_expiry_delta(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_RouteParameters_get_final_cltv_expiry_delta"))) TS_RouteParameters_get_final_cltv_expiry_delta(uint64_t this_ptr) { LDKRouteParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = RouteParameters_get_final_cltv_expiry_delta(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_RouteParameters_set_final_cltv_expiry_delta"))) TS_RouteParameters_set_final_cltv_expiry_delta(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_RouteParameters_set_final_cltv_expiry_delta"))) TS_RouteParameters_set_final_cltv_expiry_delta(uint64_t this_ptr, int32_t val) { LDKRouteParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; RouteParameters_set_final_cltv_expiry_delta(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_RouteParameters_new"))) TS_RouteParameters_new(uint32_t payment_params_arg, int64_t final_value_msat_arg, int32_t final_cltv_expiry_delta_arg) { +uint64_t __attribute__((export_name("TS_RouteParameters_new"))) TS_RouteParameters_new(uint64_t payment_params_arg, int64_t final_value_msat_arg, int32_t final_cltv_expiry_delta_arg) { LDKPaymentParameters payment_params_arg_conv; - payment_params_arg_conv.inner = (void*)(payment_params_arg & (~1)); - payment_params_arg_conv.is_owned = (payment_params_arg & 1) || (payment_params_arg == 0); + payment_params_arg_conv.inner = untag_ptr(payment_params_arg); + payment_params_arg_conv.is_owned = ptr_is_owned(payment_params_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(payment_params_arg_conv); payment_params_arg_conv = PaymentParameters_clone(&payment_params_arg_conv); LDKRouteParameters ret_var = RouteParameters_new(payment_params_arg_conv, final_value_msat_arg, final_cltv_expiry_delta_arg); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t RouteParameters_clone_ptr(LDKRouteParameters *NONNULL_PTR arg) { +static inline uint64_t RouteParameters_clone_ptr(LDKRouteParameters *NONNULL_PTR arg) { LDKRouteParameters ret_var = RouteParameters_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_RouteParameters_clone_ptr"))) TS_RouteParameters_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_RouteParameters_clone_ptr"))) TS_RouteParameters_clone_ptr(uint64_t arg) { LDKRouteParameters arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = RouteParameters_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = RouteParameters_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_RouteParameters_clone"))) TS_RouteParameters_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_RouteParameters_clone"))) TS_RouteParameters_clone(uint64_t orig) { LDKRouteParameters orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKRouteParameters ret_var = RouteParameters_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_RouteParameters_write"))) TS_RouteParameters_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_RouteParameters_write"))) TS_RouteParameters_write(uint64_t obj) { LDKRouteParameters obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = RouteParameters_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -41919,96 +40099,89 @@ int8_tArray __attribute__((export_name("TS_RouteParameters_write"))) TS_RoutePa return ret_arr; } -uint32_t __attribute__((export_name("TS_RouteParameters_read"))) TS_RouteParameters_read(int8_tArray ser) { +uint64_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; LDKCResult_RouteParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteParametersDecodeErrorZ), "LDKCResult_RouteParametersDecodeErrorZ"); *ret_conv = RouteParameters_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_PaymentParameters_free"))) TS_PaymentParameters_free(uint32_t this_obj) { +void __attribute__((export_name("TS_PaymentParameters_free"))) TS_PaymentParameters_free(uint64_t this_obj) { LDKPaymentParameters this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); PaymentParameters_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_PaymentParameters_get_payee_pubkey"))) TS_PaymentParameters_get_payee_pubkey(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_PaymentParameters_get_payee_pubkey"))) TS_PaymentParameters_get_payee_pubkey(uint64_t this_ptr) { LDKPaymentParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, PaymentParameters_get_payee_pubkey(&this_ptr_conv).compressed_form, 33); return ret_arr; } -void __attribute__((export_name("TS_PaymentParameters_set_payee_pubkey"))) TS_PaymentParameters_set_payee_pubkey(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_PaymentParameters_set_payee_pubkey"))) TS_PaymentParameters_set_payee_pubkey(uint64_t this_ptr, int8_tArray val) { LDKPaymentParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); PaymentParameters_set_payee_pubkey(&this_ptr_conv, val_ref); } -uint32_t __attribute__((export_name("TS_PaymentParameters_get_features"))) TS_PaymentParameters_get_features(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_PaymentParameters_get_features"))) TS_PaymentParameters_get_features(uint64_t this_ptr) { LDKPaymentParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKInvoiceFeatures ret_var = PaymentParameters_get_features(&this_ptr_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_PaymentParameters_set_features"))) TS_PaymentParameters_set_features(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_PaymentParameters_set_features"))) TS_PaymentParameters_set_features(uint64_t this_ptr, uint64_t val) { LDKPaymentParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKInvoiceFeatures val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = InvoiceFeatures_clone(&val_conv); PaymentParameters_set_features(&this_ptr_conv, val_conv); } -uint32_tArray __attribute__((export_name("TS_PaymentParameters_get_route_hints"))) TS_PaymentParameters_get_route_hints(uint32_t this_ptr) { +uint64_tArray __attribute__((export_name("TS_PaymentParameters_get_route_hints"))) TS_PaymentParameters_get_route_hints(uint64_t this_ptr) { LDKPaymentParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_RouteHintZ ret_var = PaymentParameters_get_route_hints(&this_ptr_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t l = 0; l < ret_var.datalen; l++) { LDKRouteHint ret_conv_11_var = ret_var.data[l]; - uint32_t ret_conv_11_ref = 0; - 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. + uint64_t ret_conv_11_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_11_var); - ret_conv_11_ref = (uintptr_t)ret_conv_11_var.inner; - if (ret_conv_11_var.is_owned) { - ret_conv_11_ref |= 1; - } + ret_conv_11_ref = tag_ptr(ret_conv_11_var.inner, ret_conv_11_var.is_owned); ret_arr_ptr[l] = ret_conv_11_ref; } @@ -42016,23 +40189,24 @@ uint32_tArray __attribute__((export_name("TS_PaymentParameters_get_route_hints" return ret_arr; } -void __attribute__((export_name("TS_PaymentParameters_set_route_hints"))) TS_PaymentParameters_set_route_hints(uint32_t this_ptr, uint32_tArray val) { +void __attribute__((export_name("TS_PaymentParameters_set_route_hints"))) TS_PaymentParameters_set_route_hints(uint64_t this_ptr, uint64_tArray val) { LDKPaymentParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_RouteHintZ val_constr; val_constr.datalen = val->arr_len; if (val_constr.datalen > 0) val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKRouteHint), "LDKCVec_RouteHintZ Elements"); else val_constr.data = NULL; - uint32_t* val_vals = val->elems; + uint64_t* val_vals = val->elems; for (size_t l = 0; l < val_constr.datalen; l++) { - uint32_t val_conv_11 = val_vals[l]; + uint64_t val_conv_11 = val_vals[l]; LDKRouteHint val_conv_11_conv; - val_conv_11_conv.inner = (void*)(val_conv_11 & (~1)); - val_conv_11_conv.is_owned = (val_conv_11 & 1) || (val_conv_11 == 0); + val_conv_11_conv.inner = untag_ptr(val_conv_11); + val_conv_11_conv.is_owned = ptr_is_owned(val_conv_11); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv_11_conv); val_conv_11_conv = RouteHint_clone(&val_conv_11_conv); val_constr.data[l] = val_conv_11_conv; @@ -42041,85 +40215,94 @@ void __attribute__((export_name("TS_PaymentParameters_set_route_hints"))) TS_Pa PaymentParameters_set_route_hints(&this_ptr_conv, val_constr); } -uint32_t __attribute__((export_name("TS_PaymentParameters_get_expiry_time"))) TS_PaymentParameters_get_expiry_time(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_PaymentParameters_get_expiry_time"))) TS_PaymentParameters_get_expiry_time(uint64_t this_ptr) { LDKPaymentParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = PaymentParameters_get_expiry_time(&this_ptr_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_PaymentParameters_set_expiry_time"))) TS_PaymentParameters_set_expiry_time(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_PaymentParameters_set_expiry_time"))) TS_PaymentParameters_set_expiry_time(uint64_t this_ptr, uint64_t val) { LDKPaymentParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr); - val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1)); + val_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(val)); PaymentParameters_set_expiry_time(&this_ptr_conv, val_conv); } -int32_t __attribute__((export_name("TS_PaymentParameters_get_max_total_cltv_expiry_delta"))) TS_PaymentParameters_get_max_total_cltv_expiry_delta(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_PaymentParameters_get_max_total_cltv_expiry_delta"))) TS_PaymentParameters_get_max_total_cltv_expiry_delta(uint64_t this_ptr) { LDKPaymentParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = PaymentParameters_get_max_total_cltv_expiry_delta(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_PaymentParameters_set_max_total_cltv_expiry_delta"))) TS_PaymentParameters_set_max_total_cltv_expiry_delta(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_PaymentParameters_set_max_total_cltv_expiry_delta"))) TS_PaymentParameters_set_max_total_cltv_expiry_delta(uint64_t this_ptr, int32_t val) { LDKPaymentParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; PaymentParameters_set_max_total_cltv_expiry_delta(&this_ptr_conv, val); } -int8_t __attribute__((export_name("TS_PaymentParameters_get_max_path_count"))) TS_PaymentParameters_get_max_path_count(uint32_t this_ptr) { +int8_t __attribute__((export_name("TS_PaymentParameters_get_max_path_count"))) TS_PaymentParameters_get_max_path_count(uint64_t this_ptr) { LDKPaymentParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_t ret_conv = PaymentParameters_get_max_path_count(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_PaymentParameters_set_max_path_count"))) TS_PaymentParameters_set_max_path_count(uint32_t this_ptr, int8_t val) { +void __attribute__((export_name("TS_PaymentParameters_set_max_path_count"))) TS_PaymentParameters_set_max_path_count(uint64_t this_ptr, int8_t val) { LDKPaymentParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; PaymentParameters_set_max_path_count(&this_ptr_conv, val); } -int8_t __attribute__((export_name("TS_PaymentParameters_get_max_channel_saturation_power_of_half"))) TS_PaymentParameters_get_max_channel_saturation_power_of_half(uint32_t this_ptr) { +int8_t __attribute__((export_name("TS_PaymentParameters_get_max_channel_saturation_power_of_half"))) TS_PaymentParameters_get_max_channel_saturation_power_of_half(uint64_t this_ptr) { LDKPaymentParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_t ret_conv = PaymentParameters_get_max_channel_saturation_power_of_half(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_PaymentParameters_set_max_channel_saturation_power_of_half"))) TS_PaymentParameters_set_max_channel_saturation_power_of_half(uint32_t this_ptr, int8_t val) { +void __attribute__((export_name("TS_PaymentParameters_set_max_channel_saturation_power_of_half"))) TS_PaymentParameters_set_max_channel_saturation_power_of_half(uint64_t this_ptr, int8_t val) { LDKPaymentParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; PaymentParameters_set_max_channel_saturation_power_of_half(&this_ptr_conv, val); } -int64_tArray __attribute__((export_name("TS_PaymentParameters_get_previously_failed_channels"))) TS_PaymentParameters_get_previously_failed_channels(uint32_t this_ptr) { +int64_tArray __attribute__((export_name("TS_PaymentParameters_get_previously_failed_channels"))) TS_PaymentParameters_get_previously_failed_channels(uint64_t this_ptr) { LDKPaymentParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_u64Z ret_var = PaymentParameters_get_previously_failed_channels(&this_ptr_conv); int64_tArray ret_arr = NULL; ret_arr = init_int64_tArray(ret_var.datalen, __LINE__); @@ -42133,11 +40316,12 @@ int64_tArray __attribute__((export_name("TS_PaymentParameters_get_previously_fa return ret_arr; } -void __attribute__((export_name("TS_PaymentParameters_set_previously_failed_channels"))) TS_PaymentParameters_set_previously_failed_channels(uint32_t this_ptr, int64_tArray val) { +void __attribute__((export_name("TS_PaymentParameters_set_previously_failed_channels"))) TS_PaymentParameters_set_previously_failed_channels(uint64_t this_ptr, int64_tArray val) { LDKPaymentParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_u64Z val_constr; val_constr.datalen = val->arr_len; if (val_constr.datalen > 0) @@ -42153,13 +40337,13 @@ void __attribute__((export_name("TS_PaymentParameters_set_previously_failed_cha PaymentParameters_set_previously_failed_channels(&this_ptr_conv, val_constr); } -uint32_t __attribute__((export_name("TS_PaymentParameters_new"))) TS_PaymentParameters_new(int8_tArray payee_pubkey_arg, uint32_t features_arg, uint32_tArray route_hints_arg, uint32_t expiry_time_arg, int32_t max_total_cltv_expiry_delta_arg, int8_t max_path_count_arg, int8_t max_channel_saturation_power_of_half_arg, int64_tArray previously_failed_channels_arg) { +uint64_t __attribute__((export_name("TS_PaymentParameters_new"))) TS_PaymentParameters_new(int8_tArray payee_pubkey_arg, uint64_t features_arg, uint64_tArray route_hints_arg, uint64_t expiry_time_arg, int32_t max_total_cltv_expiry_delta_arg, int8_t max_path_count_arg, int8_t max_channel_saturation_power_of_half_arg, int64_tArray previously_failed_channels_arg) { LDKPublicKey payee_pubkey_arg_ref; CHECK(payee_pubkey_arg->arr_len == 33); memcpy(payee_pubkey_arg_ref.compressed_form, payee_pubkey_arg->elems, 33); FREE(payee_pubkey_arg); LDKInvoiceFeatures features_arg_conv; - features_arg_conv.inner = (void*)(features_arg & (~1)); - features_arg_conv.is_owned = (features_arg & 1) || (features_arg == 0); + features_arg_conv.inner = untag_ptr(features_arg); + features_arg_conv.is_owned = ptr_is_owned(features_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(features_arg_conv); features_arg_conv = InvoiceFeatures_clone(&features_arg_conv); LDKCVec_RouteHintZ route_hints_arg_constr; @@ -42168,21 +40352,21 @@ uint32_t __attribute__((export_name("TS_PaymentParameters_new"))) TS_PaymentPar route_hints_arg_constr.data = MALLOC(route_hints_arg_constr.datalen * sizeof(LDKRouteHint), "LDKCVec_RouteHintZ Elements"); else route_hints_arg_constr.data = NULL; - uint32_t* route_hints_arg_vals = route_hints_arg->elems; + uint64_t* route_hints_arg_vals = route_hints_arg->elems; for (size_t l = 0; l < route_hints_arg_constr.datalen; l++) { - uint32_t route_hints_arg_conv_11 = route_hints_arg_vals[l]; + uint64_t route_hints_arg_conv_11 = route_hints_arg_vals[l]; LDKRouteHint route_hints_arg_conv_11_conv; - route_hints_arg_conv_11_conv.inner = (void*)(route_hints_arg_conv_11 & (~1)); - route_hints_arg_conv_11_conv.is_owned = (route_hints_arg_conv_11 & 1) || (route_hints_arg_conv_11 == 0); + route_hints_arg_conv_11_conv.inner = untag_ptr(route_hints_arg_conv_11); + route_hints_arg_conv_11_conv.is_owned = ptr_is_owned(route_hints_arg_conv_11); CHECK_INNER_FIELD_ACCESS_OR_NULL(route_hints_arg_conv_11_conv); route_hints_arg_conv_11_conv = RouteHint_clone(&route_hints_arg_conv_11_conv); route_hints_arg_constr.data[l] = route_hints_arg_conv_11_conv; } FREE(route_hints_arg); - void* expiry_time_arg_ptr = (void*)(((uintptr_t)expiry_time_arg) & ~1); + void* expiry_time_arg_ptr = untag_ptr(expiry_time_arg); CHECK_ACCESS(expiry_time_arg_ptr); LDKCOption_u64Z expiry_time_arg_conv = *(LDKCOption_u64Z*)(expiry_time_arg_ptr); - expiry_time_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)expiry_time_arg) & ~1)); + expiry_time_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(expiry_time_arg)); LDKCVec_u64Z previously_failed_channels_arg_constr; previously_failed_channels_arg_constr.datalen = previously_failed_channels_arg->arr_len; if (previously_failed_channels_arg_constr.datalen > 0) @@ -42196,82 +40380,73 @@ uint32_t __attribute__((export_name("TS_PaymentParameters_new"))) TS_PaymentPar } FREE(previously_failed_channels_arg); LDKPaymentParameters ret_var = PaymentParameters_new(payee_pubkey_arg_ref, features_arg_conv, route_hints_arg_constr, expiry_time_arg_conv, max_total_cltv_expiry_delta_arg, max_path_count_arg, max_channel_saturation_power_of_half_arg, previously_failed_channels_arg_constr); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t PaymentParameters_clone_ptr(LDKPaymentParameters *NONNULL_PTR arg) { +static inline uint64_t PaymentParameters_clone_ptr(LDKPaymentParameters *NONNULL_PTR arg) { LDKPaymentParameters ret_var = PaymentParameters_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_PaymentParameters_clone_ptr"))) TS_PaymentParameters_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_PaymentParameters_clone_ptr"))) TS_PaymentParameters_clone_ptr(uint64_t arg) { LDKPaymentParameters arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = PaymentParameters_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = PaymentParameters_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_PaymentParameters_clone"))) TS_PaymentParameters_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_PaymentParameters_clone"))) TS_PaymentParameters_clone(uint64_t orig) { LDKPaymentParameters orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKPaymentParameters ret_var = PaymentParameters_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int64_t __attribute__((export_name("TS_PaymentParameters_hash"))) TS_PaymentParameters_hash(uint32_t o) { +int64_t __attribute__((export_name("TS_PaymentParameters_hash"))) TS_PaymentParameters_hash(uint64_t o) { LDKPaymentParameters o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = false; + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); + o_conv.is_owned = false; int64_t ret_conv = PaymentParameters_hash(&o_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_PaymentParameters_eq"))) TS_PaymentParameters_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_PaymentParameters_eq"))) TS_PaymentParameters_eq(uint64_t a, uint64_t b) { LDKPaymentParameters a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKPaymentParameters b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = PaymentParameters_eq(&a_conv, &b_conv); return ret_conv; } -int8_tArray __attribute__((export_name("TS_PaymentParameters_write"))) TS_PaymentParameters_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_PaymentParameters_write"))) TS_PaymentParameters_write(uint64_t obj) { LDKPaymentParameters obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = PaymentParameters_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -42279,75 +40454,61 @@ int8_tArray __attribute__((export_name("TS_PaymentParameters_write"))) TS_Payme return ret_arr; } -uint32_t __attribute__((export_name("TS_PaymentParameters_read"))) TS_PaymentParameters_read(int8_tArray ser) { +uint64_t __attribute__((export_name("TS_PaymentParameters_read"))) TS_PaymentParameters_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; ser_ref.data = ser->elems; LDKCResult_PaymentParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentParametersDecodeErrorZ), "LDKCResult_PaymentParametersDecodeErrorZ"); *ret_conv = PaymentParameters_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_PaymentParameters_from_node_id"))) TS_PaymentParameters_from_node_id(int8_tArray payee_pubkey) { +uint64_t __attribute__((export_name("TS_PaymentParameters_from_node_id"))) TS_PaymentParameters_from_node_id(int8_tArray payee_pubkey) { LDKPublicKey payee_pubkey_ref; CHECK(payee_pubkey->arr_len == 33); memcpy(payee_pubkey_ref.compressed_form, payee_pubkey->elems, 33); FREE(payee_pubkey); LDKPaymentParameters ret_var = PaymentParameters_from_node_id(payee_pubkey_ref); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_PaymentParameters_for_keysend"))) TS_PaymentParameters_for_keysend(int8_tArray payee_pubkey) { +uint64_t __attribute__((export_name("TS_PaymentParameters_for_keysend"))) TS_PaymentParameters_for_keysend(int8_tArray payee_pubkey) { LDKPublicKey payee_pubkey_ref; CHECK(payee_pubkey->arr_len == 33); memcpy(payee_pubkey_ref.compressed_form, payee_pubkey->elems, 33); FREE(payee_pubkey); LDKPaymentParameters ret_var = PaymentParameters_for_keysend(payee_pubkey_ref); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_RouteHint_free"))) TS_RouteHint_free(uint32_t this_obj) { +void __attribute__((export_name("TS_RouteHint_free"))) TS_RouteHint_free(uint64_t this_obj) { LDKRouteHint this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); RouteHint_free(this_obj_conv); } -uint32_tArray __attribute__((export_name("TS_RouteHint_get_a"))) TS_RouteHint_get_a(uint32_t this_ptr) { +uint64_tArray __attribute__((export_name("TS_RouteHint_get_a"))) TS_RouteHint_get_a(uint64_t this_ptr) { LDKRouteHint this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_RouteHintHopZ ret_var = RouteHint_get_a(&this_ptr_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t o = 0; o < ret_var.datalen; o++) { LDKRouteHintHop ret_conv_14_var = ret_var.data[o]; - uint32_t ret_conv_14_ref = 0; - 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. + uint64_t ret_conv_14_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_14_var); - ret_conv_14_ref = (uintptr_t)ret_conv_14_var.inner; - if (ret_conv_14_var.is_owned) { - ret_conv_14_ref |= 1; - } + ret_conv_14_ref = tag_ptr(ret_conv_14_var.inner, ret_conv_14_var.is_owned); ret_arr_ptr[o] = ret_conv_14_ref; } @@ -42355,23 +40516,24 @@ uint32_tArray __attribute__((export_name("TS_RouteHint_get_a"))) TS_RouteHint_g return ret_arr; } -void __attribute__((export_name("TS_RouteHint_set_a"))) TS_RouteHint_set_a(uint32_t this_ptr, uint32_tArray val) { +void __attribute__((export_name("TS_RouteHint_set_a"))) TS_RouteHint_set_a(uint64_t this_ptr, uint64_tArray val) { LDKRouteHint this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_RouteHintHopZ val_constr; val_constr.datalen = val->arr_len; if (val_constr.datalen > 0) val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKRouteHintHop), "LDKCVec_RouteHintHopZ Elements"); else val_constr.data = NULL; - uint32_t* val_vals = val->elems; + uint64_t* val_vals = val->elems; for (size_t o = 0; o < val_constr.datalen; o++) { - uint32_t val_conv_14 = val_vals[o]; + uint64_t val_conv_14 = val_vals[o]; LDKRouteHintHop val_conv_14_conv; - val_conv_14_conv.inner = (void*)(val_conv_14 & (~1)); - val_conv_14_conv.is_owned = (val_conv_14 & 1) || (val_conv_14 == 0); + val_conv_14_conv.inner = untag_ptr(val_conv_14); + val_conv_14_conv.is_owned = ptr_is_owned(val_conv_14); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv_14_conv); val_conv_14_conv = RouteHintHop_clone(&val_conv_14_conv); val_constr.data[o] = val_conv_14_conv; @@ -42380,101 +40542,92 @@ void __attribute__((export_name("TS_RouteHint_set_a"))) TS_RouteHint_set_a(uint RouteHint_set_a(&this_ptr_conv, val_constr); } -uint32_t __attribute__((export_name("TS_RouteHint_new"))) TS_RouteHint_new(uint32_tArray a_arg) { +uint64_t __attribute__((export_name("TS_RouteHint_new"))) TS_RouteHint_new(uint64_tArray a_arg) { LDKCVec_RouteHintHopZ a_arg_constr; a_arg_constr.datalen = a_arg->arr_len; if (a_arg_constr.datalen > 0) 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; + uint64_t* a_arg_vals = a_arg->elems; for (size_t o = 0; o < a_arg_constr.datalen; o++) { - uint32_t a_arg_conv_14 = a_arg_vals[o]; + uint64_t a_arg_conv_14 = a_arg_vals[o]; LDKRouteHintHop a_arg_conv_14_conv; - a_arg_conv_14_conv.inner = (void*)(a_arg_conv_14 & (~1)); - a_arg_conv_14_conv.is_owned = (a_arg_conv_14 & 1) || (a_arg_conv_14 == 0); + a_arg_conv_14_conv.inner = untag_ptr(a_arg_conv_14); + a_arg_conv_14_conv.is_owned = ptr_is_owned(a_arg_conv_14); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_arg_conv_14_conv); a_arg_conv_14_conv = RouteHintHop_clone(&a_arg_conv_14_conv); a_arg_constr.data[o] = a_arg_conv_14_conv; } FREE(a_arg); LDKRouteHint ret_var = RouteHint_new(a_arg_constr); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t RouteHint_clone_ptr(LDKRouteHint *NONNULL_PTR arg) { +static inline uint64_t RouteHint_clone_ptr(LDKRouteHint *NONNULL_PTR arg) { LDKRouteHint ret_var = RouteHint_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_RouteHint_clone_ptr"))) TS_RouteHint_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_RouteHint_clone_ptr"))) TS_RouteHint_clone_ptr(uint64_t arg) { LDKRouteHint arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = RouteHint_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = RouteHint_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_RouteHint_clone"))) TS_RouteHint_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_RouteHint_clone"))) TS_RouteHint_clone(uint64_t orig) { LDKRouteHint orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKRouteHint ret_var = RouteHint_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int64_t __attribute__((export_name("TS_RouteHint_hash"))) TS_RouteHint_hash(uint32_t o) { +int64_t __attribute__((export_name("TS_RouteHint_hash"))) TS_RouteHint_hash(uint64_t o) { LDKRouteHint o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = false; + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); + o_conv.is_owned = false; int64_t ret_conv = RouteHint_hash(&o_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_RouteHint_eq"))) TS_RouteHint_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_RouteHint_eq"))) TS_RouteHint_eq(uint64_t a, uint64_t b) { LDKRouteHint a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKRouteHint b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = RouteHint_eq(&a_conv, &b_conv); return ret_conv; } -int8_tArray __attribute__((export_name("TS_RouteHint_write"))) TS_RouteHint_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_RouteHint_write"))) TS_RouteHint_write(uint64_t obj) { LDKRouteHint obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = RouteHint_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -42482,249 +40635,247 @@ int8_tArray __attribute__((export_name("TS_RouteHint_write"))) TS_RouteHint_wri return ret_arr; } -uint32_t __attribute__((export_name("TS_RouteHint_read"))) TS_RouteHint_read(int8_tArray ser) { +uint64_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; LDKCResult_RouteHintDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintDecodeErrorZ), "LDKCResult_RouteHintDecodeErrorZ"); *ret_conv = RouteHint_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_RouteHintHop_free"))) TS_RouteHintHop_free(uint32_t this_obj) { +void __attribute__((export_name("TS_RouteHintHop_free"))) TS_RouteHintHop_free(uint64_t this_obj) { LDKRouteHintHop this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); RouteHintHop_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_RouteHintHop_get_src_node_id"))) TS_RouteHintHop_get_src_node_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_RouteHintHop_get_src_node_id"))) TS_RouteHintHop_get_src_node_id(uint64_t this_ptr) { LDKRouteHintHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_RouteHintHop_set_src_node_id"))) TS_RouteHintHop_set_src_node_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_RouteHintHop_set_src_node_id"))) TS_RouteHintHop_set_src_node_id(uint64_t this_ptr, int8_tArray val) { LDKRouteHintHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); RouteHintHop_set_src_node_id(&this_ptr_conv, val_ref); } -int64_t __attribute__((export_name("TS_RouteHintHop_get_short_channel_id"))) TS_RouteHintHop_get_short_channel_id(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_RouteHintHop_get_short_channel_id"))) TS_RouteHintHop_get_short_channel_id(uint64_t this_ptr) { LDKRouteHintHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = RouteHintHop_get_short_channel_id(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_RouteHintHop_set_short_channel_id"))) TS_RouteHintHop_set_short_channel_id(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_RouteHintHop_set_short_channel_id"))) TS_RouteHintHop_set_short_channel_id(uint64_t this_ptr, int64_t val) { LDKRouteHintHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; RouteHintHop_set_short_channel_id(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_RouteHintHop_get_fees"))) TS_RouteHintHop_get_fees(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_RouteHintHop_get_fees"))) TS_RouteHintHop_get_fees(uint64_t this_ptr) { LDKRouteHintHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKRoutingFees ret_var = RouteHintHop_get_fees(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_RouteHintHop_set_fees"))) TS_RouteHintHop_set_fees(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_RouteHintHop_set_fees"))) TS_RouteHintHop_set_fees(uint64_t this_ptr, uint64_t val) { LDKRouteHintHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKRoutingFees val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = RoutingFees_clone(&val_conv); RouteHintHop_set_fees(&this_ptr_conv, val_conv); } -int16_t __attribute__((export_name("TS_RouteHintHop_get_cltv_expiry_delta"))) TS_RouteHintHop_get_cltv_expiry_delta(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_RouteHintHop_get_cltv_expiry_delta"))) TS_RouteHintHop_get_cltv_expiry_delta(uint64_t this_ptr) { LDKRouteHintHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = RouteHintHop_get_cltv_expiry_delta(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_RouteHintHop_set_cltv_expiry_delta"))) TS_RouteHintHop_set_cltv_expiry_delta(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_RouteHintHop_set_cltv_expiry_delta"))) TS_RouteHintHop_set_cltv_expiry_delta(uint64_t this_ptr, int16_t val) { LDKRouteHintHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; RouteHintHop_set_cltv_expiry_delta(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_RouteHintHop_get_htlc_minimum_msat"))) TS_RouteHintHop_get_htlc_minimum_msat(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_RouteHintHop_get_htlc_minimum_msat"))) TS_RouteHintHop_get_htlc_minimum_msat(uint64_t this_ptr) { LDKRouteHintHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = RouteHintHop_get_htlc_minimum_msat(&this_ptr_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_RouteHintHop_set_htlc_minimum_msat"))) TS_RouteHintHop_set_htlc_minimum_msat(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_RouteHintHop_set_htlc_minimum_msat"))) TS_RouteHintHop_set_htlc_minimum_msat(uint64_t this_ptr, uint64_t val) { LDKRouteHintHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr); - val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1)); + val_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(val)); RouteHintHop_set_htlc_minimum_msat(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_RouteHintHop_get_htlc_maximum_msat"))) TS_RouteHintHop_get_htlc_maximum_msat(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_RouteHintHop_get_htlc_maximum_msat"))) TS_RouteHintHop_get_htlc_maximum_msat(uint64_t this_ptr) { LDKRouteHintHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = RouteHintHop_get_htlc_maximum_msat(&this_ptr_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_RouteHintHop_set_htlc_maximum_msat"))) TS_RouteHintHop_set_htlc_maximum_msat(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_RouteHintHop_set_htlc_maximum_msat"))) TS_RouteHintHop_set_htlc_maximum_msat(uint64_t this_ptr, uint64_t val) { LDKRouteHintHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr); - val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1)); + val_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(val)); 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) { +uint64_t __attribute__((export_name("TS_RouteHintHop_new"))) TS_RouteHintHop_new(int8_tArray src_node_id_arg, int64_t short_channel_id_arg, uint64_t fees_arg, int16_t cltv_expiry_delta_arg, uint64_t htlc_minimum_msat_arg, uint64_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); 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); + fees_arg_conv.inner = untag_ptr(fees_arg); + fees_arg_conv.is_owned = ptr_is_owned(fees_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(fees_arg_conv); fees_arg_conv = RoutingFees_clone(&fees_arg_conv); - void* htlc_minimum_msat_arg_ptr = (void*)(((uintptr_t)htlc_minimum_msat_arg) & ~1); + void* htlc_minimum_msat_arg_ptr = untag_ptr(htlc_minimum_msat_arg); 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*)(((uintptr_t)htlc_minimum_msat_arg) & ~1)); - void* htlc_maximum_msat_arg_ptr = (void*)(((uintptr_t)htlc_maximum_msat_arg) & ~1); + htlc_minimum_msat_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(htlc_minimum_msat_arg)); + void* htlc_maximum_msat_arg_ptr = untag_ptr(htlc_maximum_msat_arg); CHECK_ACCESS(htlc_maximum_msat_arg_ptr); LDKCOption_u64Z htlc_maximum_msat_arg_conv = *(LDKCOption_u64Z*)(htlc_maximum_msat_arg_ptr); - htlc_maximum_msat_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)htlc_maximum_msat_arg) & ~1)); + htlc_maximum_msat_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(htlc_maximum_msat_arg)); 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t RouteHintHop_clone_ptr(LDKRouteHintHop *NONNULL_PTR arg) { +static inline uint64_t RouteHintHop_clone_ptr(LDKRouteHintHop *NONNULL_PTR arg) { LDKRouteHintHop ret_var = RouteHintHop_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_RouteHintHop_clone_ptr"))) TS_RouteHintHop_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_RouteHintHop_clone_ptr"))) TS_RouteHintHop_clone_ptr(uint64_t arg) { LDKRouteHintHop arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = RouteHintHop_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = RouteHintHop_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_RouteHintHop_clone"))) TS_RouteHintHop_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_RouteHintHop_clone"))) TS_RouteHintHop_clone(uint64_t orig) { LDKRouteHintHop orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKRouteHintHop ret_var = RouteHintHop_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int64_t __attribute__((export_name("TS_RouteHintHop_hash"))) TS_RouteHintHop_hash(uint32_t o) { +int64_t __attribute__((export_name("TS_RouteHintHop_hash"))) TS_RouteHintHop_hash(uint64_t o) { LDKRouteHintHop o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = false; + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); + o_conv.is_owned = false; int64_t ret_conv = RouteHintHop_hash(&o_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_RouteHintHop_eq"))) TS_RouteHintHop_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_RouteHintHop_eq"))) TS_RouteHintHop_eq(uint64_t a, uint64_t b) { LDKRouteHintHop a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKRouteHintHop b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = RouteHintHop_eq(&a_conv, &b_conv); return ret_conv; } -int8_tArray __attribute__((export_name("TS_RouteHintHop_write"))) TS_RouteHintHop_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_RouteHintHop_write"))) TS_RouteHintHop_write(uint64_t obj) { LDKRouteHintHop obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = RouteHintHop_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -42732,28 +40883,30 @@ int8_tArray __attribute__((export_name("TS_RouteHintHop_write"))) TS_RouteHintH return ret_arr; } -uint32_t __attribute__((export_name("TS_RouteHintHop_read"))) TS_RouteHintHop_read(int8_tArray ser) { +uint64_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; LDKCResult_RouteHintHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintHopDecodeErrorZ), "LDKCResult_RouteHintHopDecodeErrorZ"); *ret_conv = RouteHintHop_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_find_route"))) TS_find_route(int8_tArray our_node_pubkey, uint32_t route_params, uint32_t network_graph, uint32_tArray first_hops, uint32_t logger, uint32_t scorer, int8_tArray random_seed_bytes) { +uint64_t __attribute__((export_name("TS_find_route"))) TS_find_route(int8_tArray our_node_pubkey, uint64_t route_params, uint64_t network_graph, uint64_tArray first_hops, uint64_t logger, uint64_t scorer, int8_tArray random_seed_bytes) { LDKPublicKey our_node_pubkey_ref; CHECK(our_node_pubkey->arr_len == 33); memcpy(our_node_pubkey_ref.compressed_form, our_node_pubkey->elems, 33); FREE(our_node_pubkey); LDKRouteParameters route_params_conv; - route_params_conv.inner = (void*)(route_params & (~1)); - route_params_conv.is_owned = false; + route_params_conv.inner = untag_ptr(route_params); + route_params_conv.is_owned = ptr_is_owned(route_params); CHECK_INNER_FIELD_ACCESS_OR_NULL(route_params_conv); + route_params_conv.is_owned = false; LDKNetworkGraph network_graph_conv; - network_graph_conv.inner = (void*)(network_graph & (~1)); - network_graph_conv.is_owned = false; + network_graph_conv.inner = untag_ptr(network_graph); + network_graph_conv.is_owned = ptr_is_owned(network_graph); CHECK_INNER_FIELD_ACCESS_OR_NULL(network_graph_conv); + network_graph_conv.is_owned = false; LDKCVec_ChannelDetailsZ first_hops_constr; LDKCVec_ChannelDetailsZ *first_hops_ptr = NULL; if (first_hops != 0) { @@ -42762,27 +40915,28 @@ 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; + uint64_t* first_hops_vals = first_hops->elems; for (size_t q = 0; q < first_hops_constr.datalen; q++) { - uint32_t first_hops_conv_16 = first_hops_vals[q]; + uint64_t first_hops_conv_16 = first_hops_vals[q]; LDKChannelDetails first_hops_conv_16_conv; - first_hops_conv_16_conv.inner = (void*)(first_hops_conv_16 & (~1)); - first_hops_conv_16_conv.is_owned = (first_hops_conv_16 & 1) || (first_hops_conv_16 == 0); + first_hops_conv_16_conv.inner = untag_ptr(first_hops_conv_16); + first_hops_conv_16_conv.is_owned = ptr_is_owned(first_hops_conv_16); CHECK_INNER_FIELD_ACCESS_OR_NULL(first_hops_conv_16_conv); + first_hops_conv_16_conv.is_owned = false; first_hops_constr.data[q] = first_hops_conv_16_conv; } FREE(first_hops); first_hops_ptr = &first_hops_constr; } - void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); + void* logger_ptr = untag_ptr(logger); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); if (logger_conv.free == LDKLogger_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKLogger_JCalls_cloned(&logger_conv); } - void* scorer_ptr = (void*)(((uintptr_t)scorer) & ~1); - if (!(scorer & 1)) { CHECK_ACCESS(scorer_ptr); } + void* scorer_ptr = untag_ptr(scorer); + if (ptr_is_owned(scorer)) { CHECK_ACCESS(scorer_ptr); } LDKScore* scorer_conv = (LDKScore*)scorer_ptr; unsigned char random_seed_bytes_arr[32]; CHECK(random_seed_bytes->arr_len == 32); @@ -42791,10 +40945,10 @@ uint32_t __attribute__((export_name("TS_find_route"))) TS_find_route(int8_tArra LDKCResult_RouteLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteLightningErrorZ), "LDKCResult_RouteLightningErrorZ"); *ret_conv = find_route(our_node_pubkey_ref, &route_params_conv, &network_graph_conv, first_hops_ptr, logger_conv, scorer_conv, random_seed_bytes_ref); if (first_hops_ptr != NULL) { FREE(first_hops_constr.data); } - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_build_route_from_hops"))) TS_build_route_from_hops(int8_tArray our_node_pubkey, ptrArray hops, uint32_t route_params, uint32_t network_graph, uint32_t logger, int8_tArray random_seed_bytes) { +uint64_t __attribute__((export_name("TS_build_route_from_hops"))) TS_build_route_from_hops(int8_tArray our_node_pubkey, ptrArray hops, uint64_t route_params, uint64_t network_graph, uint64_t logger, int8_tArray random_seed_bytes) { LDKPublicKey our_node_pubkey_ref; CHECK(our_node_pubkey->arr_len == 33); memcpy(our_node_pubkey_ref.compressed_form, our_node_pubkey->elems, 33); FREE(our_node_pubkey); @@ -42814,14 +40968,16 @@ uint32_t __attribute__((export_name("TS_build_route_from_hops"))) TS_build_rout } FREE(hops); LDKRouteParameters route_params_conv; - route_params_conv.inner = (void*)(route_params & (~1)); - route_params_conv.is_owned = false; + route_params_conv.inner = untag_ptr(route_params); + route_params_conv.is_owned = ptr_is_owned(route_params); CHECK_INNER_FIELD_ACCESS_OR_NULL(route_params_conv); + route_params_conv.is_owned = false; LDKNetworkGraph network_graph_conv; - network_graph_conv.inner = (void*)(network_graph & (~1)); - network_graph_conv.is_owned = false; + network_graph_conv.inner = untag_ptr(network_graph); + network_graph_conv.is_owned = ptr_is_owned(network_graph); CHECK_INNER_FIELD_ACCESS_OR_NULL(network_graph_conv); - void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); + network_graph_conv.is_owned = false; + void* logger_ptr = untag_ptr(logger); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); if (logger_conv.free == LDKLogger_JCalls_free) { @@ -42834,40 +40990,41 @@ uint32_t __attribute__((export_name("TS_build_route_from_hops"))) TS_build_rout unsigned char (*random_seed_bytes_ref)[32] = &random_seed_bytes_arr; LDKCResult_RouteLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteLightningErrorZ), "LDKCResult_RouteLightningErrorZ"); *ret_conv = build_route_from_hops(our_node_pubkey_ref, hops_constr, &route_params_conv, &network_graph_conv, logger_conv, random_seed_bytes_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_Score_free"))) TS_Score_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKScore this_ptr_conv = *(LDKScore*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); Score_free(this_ptr_conv); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_LockableScore_free"))) TS_LockableScore_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKLockableScore this_ptr_conv = *(LDKLockableScore*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); LockableScore_free(this_ptr_conv); } -void __attribute__((export_name("TS_MultiThreadedLockableScore_free"))) TS_MultiThreadedLockableScore_free(uint32_t this_obj) { +void __attribute__((export_name("TS_MultiThreadedLockableScore_free"))) TS_MultiThreadedLockableScore_free(uint64_t this_obj) { LDKMultiThreadedLockableScore this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); MultiThreadedLockableScore_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_MultiThreadedLockableScore_write"))) TS_MultiThreadedLockableScore_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_MultiThreadedLockableScore_write"))) TS_MultiThreadedLockableScore_write(uint64_t obj) { LDKMultiThreadedLockableScore obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = MultiThreadedLockableScore_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -42875,8 +41032,8 @@ int8_tArray __attribute__((export_name("TS_MultiThreadedLockableScore_write"))) return ret_arr; } -uint32_t __attribute__((export_name("TS_MultiThreadedLockableScore_new"))) TS_MultiThreadedLockableScore_new(uint32_t score) { - void* score_ptr = (void*)(((uintptr_t)score) & ~1); +uint64_t __attribute__((export_name("TS_MultiThreadedLockableScore_new"))) TS_MultiThreadedLockableScore_new(uint64_t score) { + void* score_ptr = untag_ptr(score); CHECK_ACCESS(score_ptr); LDKScore score_conv = *(LDKScore*)(score_ptr); if (score_conv.free == LDKScore_JCalls_free) { @@ -42884,211 +41041,188 @@ uint32_t __attribute__((export_name("TS_MultiThreadedLockableScore_new"))) TS_M LDKScore_JCalls_cloned(&score_conv); } LDKMultiThreadedLockableScore ret_var = MultiThreadedLockableScore_new(score_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelUsage_free"))) TS_ChannelUsage_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChannelUsage_free"))) TS_ChannelUsage_free(uint64_t this_obj) { LDKChannelUsage this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChannelUsage_free(this_obj_conv); } -int64_t __attribute__((export_name("TS_ChannelUsage_get_amount_msat"))) TS_ChannelUsage_get_amount_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelUsage_get_amount_msat"))) TS_ChannelUsage_get_amount_msat(uint64_t this_ptr) { LDKChannelUsage this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelUsage_get_amount_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelUsage_set_amount_msat"))) TS_ChannelUsage_set_amount_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelUsage_set_amount_msat"))) TS_ChannelUsage_set_amount_msat(uint64_t this_ptr, int64_t val) { LDKChannelUsage this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelUsage_set_amount_msat(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ChannelUsage_get_inflight_htlc_msat"))) TS_ChannelUsage_get_inflight_htlc_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelUsage_get_inflight_htlc_msat"))) TS_ChannelUsage_get_inflight_htlc_msat(uint64_t this_ptr) { LDKChannelUsage this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelUsage_get_inflight_htlc_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelUsage_set_inflight_htlc_msat"))) TS_ChannelUsage_set_inflight_htlc_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelUsage_set_inflight_htlc_msat"))) TS_ChannelUsage_set_inflight_htlc_msat(uint64_t this_ptr, int64_t val) { LDKChannelUsage this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelUsage_set_inflight_htlc_msat(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_ChannelUsage_get_effective_capacity"))) TS_ChannelUsage_get_effective_capacity(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelUsage_get_effective_capacity"))) TS_ChannelUsage_get_effective_capacity(uint64_t this_ptr) { LDKChannelUsage this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKEffectiveCapacity *ret_copy = MALLOC(sizeof(LDKEffectiveCapacity), "LDKEffectiveCapacity"); *ret_copy = ChannelUsage_get_effective_capacity(&this_ptr_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_ChannelUsage_set_effective_capacity"))) TS_ChannelUsage_set_effective_capacity(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelUsage_set_effective_capacity"))) TS_ChannelUsage_set_effective_capacity(uint64_t this_ptr, uint64_t val) { LDKChannelUsage this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKEffectiveCapacity val_conv = *(LDKEffectiveCapacity*)(val_ptr); - val_conv = EffectiveCapacity_clone((LDKEffectiveCapacity*)(((uintptr_t)val) & ~1)); + val_conv = EffectiveCapacity_clone((LDKEffectiveCapacity*)untag_ptr(val)); ChannelUsage_set_effective_capacity(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelUsage_new"))) TS_ChannelUsage_new(int64_t amount_msat_arg, int64_t inflight_htlc_msat_arg, uint32_t effective_capacity_arg) { - void* effective_capacity_arg_ptr = (void*)(((uintptr_t)effective_capacity_arg) & ~1); +uint64_t __attribute__((export_name("TS_ChannelUsage_new"))) TS_ChannelUsage_new(int64_t amount_msat_arg, int64_t inflight_htlc_msat_arg, uint64_t effective_capacity_arg) { + void* effective_capacity_arg_ptr = untag_ptr(effective_capacity_arg); CHECK_ACCESS(effective_capacity_arg_ptr); LDKEffectiveCapacity effective_capacity_arg_conv = *(LDKEffectiveCapacity*)(effective_capacity_arg_ptr); - effective_capacity_arg_conv = EffectiveCapacity_clone((LDKEffectiveCapacity*)(((uintptr_t)effective_capacity_arg) & ~1)); + effective_capacity_arg_conv = EffectiveCapacity_clone((LDKEffectiveCapacity*)untag_ptr(effective_capacity_arg)); LDKChannelUsage ret_var = ChannelUsage_new(amount_msat_arg, inflight_htlc_msat_arg, effective_capacity_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t ChannelUsage_clone_ptr(LDKChannelUsage *NONNULL_PTR arg) { +static inline uint64_t ChannelUsage_clone_ptr(LDKChannelUsage *NONNULL_PTR arg) { LDKChannelUsage ret_var = ChannelUsage_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelUsage_clone_ptr"))) TS_ChannelUsage_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ChannelUsage_clone_ptr"))) TS_ChannelUsage_clone_ptr(uint64_t arg) { LDKChannelUsage arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ChannelUsage_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ChannelUsage_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelUsage_clone"))) TS_ChannelUsage_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ChannelUsage_clone"))) TS_ChannelUsage_clone(uint64_t orig) { LDKChannelUsage orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKChannelUsage ret_var = ChannelUsage_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_FixedPenaltyScorer_free"))) TS_FixedPenaltyScorer_free(uint32_t this_obj) { +void __attribute__((export_name("TS_FixedPenaltyScorer_free"))) TS_FixedPenaltyScorer_free(uint64_t this_obj) { LDKFixedPenaltyScorer this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); FixedPenaltyScorer_free(this_obj_conv); } -static inline uintptr_t FixedPenaltyScorer_clone_ptr(LDKFixedPenaltyScorer *NONNULL_PTR arg) { +static inline uint64_t FixedPenaltyScorer_clone_ptr(LDKFixedPenaltyScorer *NONNULL_PTR arg) { LDKFixedPenaltyScorer ret_var = FixedPenaltyScorer_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_FixedPenaltyScorer_clone_ptr"))) TS_FixedPenaltyScorer_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_FixedPenaltyScorer_clone_ptr"))) TS_FixedPenaltyScorer_clone_ptr(uint64_t arg) { LDKFixedPenaltyScorer arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = FixedPenaltyScorer_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = FixedPenaltyScorer_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_FixedPenaltyScorer_clone"))) TS_FixedPenaltyScorer_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_FixedPenaltyScorer_clone"))) TS_FixedPenaltyScorer_clone(uint64_t orig) { LDKFixedPenaltyScorer orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKFixedPenaltyScorer ret_var = FixedPenaltyScorer_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_FixedPenaltyScorer_with_penalty"))) TS_FixedPenaltyScorer_with_penalty(int64_t penalty_msat) { +uint64_t __attribute__((export_name("TS_FixedPenaltyScorer_with_penalty"))) TS_FixedPenaltyScorer_with_penalty(int64_t penalty_msat) { LDKFixedPenaltyScorer ret_var = FixedPenaltyScorer_with_penalty(penalty_msat); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_FixedPenaltyScorer_as_Score"))) TS_FixedPenaltyScorer_as_Score(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_FixedPenaltyScorer_as_Score"))) TS_FixedPenaltyScorer_as_Score(uint64_t this_arg) { LDKFixedPenaltyScorer this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKScore* ret_ret = MALLOC(sizeof(LDKScore), "LDKScore"); *ret_ret = FixedPenaltyScorer_as_Score(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -int8_tArray __attribute__((export_name("TS_FixedPenaltyScorer_write"))) TS_FixedPenaltyScorer_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_FixedPenaltyScorer_write"))) TS_FixedPenaltyScorer_write(uint64_t obj) { LDKFixedPenaltyScorer obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = FixedPenaltyScorer_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -43096,200 +41230,207 @@ int8_tArray __attribute__((export_name("TS_FixedPenaltyScorer_write"))) TS_Fixe return ret_arr; } -uint32_t __attribute__((export_name("TS_FixedPenaltyScorer_read"))) TS_FixedPenaltyScorer_read(int8_tArray ser, int64_t arg) { +uint64_t __attribute__((export_name("TS_FixedPenaltyScorer_read"))) TS_FixedPenaltyScorer_read(int8_tArray ser, int64_t arg) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; ser_ref.data = ser->elems; LDKCResult_FixedPenaltyScorerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FixedPenaltyScorerDecodeErrorZ), "LDKCResult_FixedPenaltyScorerDecodeErrorZ"); *ret_conv = FixedPenaltyScorer_read(ser_ref, arg); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_ProbabilisticScorer_free"))) TS_ProbabilisticScorer_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ProbabilisticScorer_free"))) TS_ProbabilisticScorer_free(uint64_t this_obj) { LDKProbabilisticScorer this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ProbabilisticScorer_free(this_obj_conv); } -void __attribute__((export_name("TS_ProbabilisticScoringParameters_free"))) TS_ProbabilisticScoringParameters_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ProbabilisticScoringParameters_free"))) TS_ProbabilisticScoringParameters_free(uint64_t this_obj) { LDKProbabilisticScoringParameters this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ProbabilisticScoringParameters_free(this_obj_conv); } -int64_t __attribute__((export_name("TS_ProbabilisticScoringParameters_get_base_penalty_msat"))) TS_ProbabilisticScoringParameters_get_base_penalty_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ProbabilisticScoringParameters_get_base_penalty_msat"))) TS_ProbabilisticScoringParameters_get_base_penalty_msat(uint64_t this_ptr) { LDKProbabilisticScoringParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ProbabilisticScoringParameters_get_base_penalty_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ProbabilisticScoringParameters_set_base_penalty_msat"))) TS_ProbabilisticScoringParameters_set_base_penalty_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ProbabilisticScoringParameters_set_base_penalty_msat"))) TS_ProbabilisticScoringParameters_set_base_penalty_msat(uint64_t this_ptr, int64_t val) { LDKProbabilisticScoringParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ProbabilisticScoringParameters_set_base_penalty_msat(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ProbabilisticScoringParameters_get_base_penalty_amount_multiplier_msat"))) TS_ProbabilisticScoringParameters_get_base_penalty_amount_multiplier_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ProbabilisticScoringParameters_get_base_penalty_amount_multiplier_msat"))) TS_ProbabilisticScoringParameters_get_base_penalty_amount_multiplier_msat(uint64_t this_ptr) { LDKProbabilisticScoringParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ProbabilisticScoringParameters_get_base_penalty_amount_multiplier_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ProbabilisticScoringParameters_set_base_penalty_amount_multiplier_msat"))) TS_ProbabilisticScoringParameters_set_base_penalty_amount_multiplier_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ProbabilisticScoringParameters_set_base_penalty_amount_multiplier_msat"))) TS_ProbabilisticScoringParameters_set_base_penalty_amount_multiplier_msat(uint64_t this_ptr, int64_t val) { LDKProbabilisticScoringParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ProbabilisticScoringParameters_set_base_penalty_amount_multiplier_msat(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ProbabilisticScoringParameters_get_liquidity_penalty_multiplier_msat"))) TS_ProbabilisticScoringParameters_get_liquidity_penalty_multiplier_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ProbabilisticScoringParameters_get_liquidity_penalty_multiplier_msat"))) TS_ProbabilisticScoringParameters_get_liquidity_penalty_multiplier_msat(uint64_t this_ptr) { LDKProbabilisticScoringParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ProbabilisticScoringParameters_get_liquidity_penalty_multiplier_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ProbabilisticScoringParameters_set_liquidity_penalty_multiplier_msat"))) TS_ProbabilisticScoringParameters_set_liquidity_penalty_multiplier_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ProbabilisticScoringParameters_set_liquidity_penalty_multiplier_msat"))) TS_ProbabilisticScoringParameters_set_liquidity_penalty_multiplier_msat(uint64_t this_ptr, int64_t val) { LDKProbabilisticScoringParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ProbabilisticScoringParameters_set_liquidity_penalty_multiplier_msat(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ProbabilisticScoringParameters_get_liquidity_offset_half_life"))) TS_ProbabilisticScoringParameters_get_liquidity_offset_half_life(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ProbabilisticScoringParameters_get_liquidity_offset_half_life"))) TS_ProbabilisticScoringParameters_get_liquidity_offset_half_life(uint64_t this_ptr) { LDKProbabilisticScoringParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ProbabilisticScoringParameters_get_liquidity_offset_half_life(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ProbabilisticScoringParameters_set_liquidity_offset_half_life"))) TS_ProbabilisticScoringParameters_set_liquidity_offset_half_life(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ProbabilisticScoringParameters_set_liquidity_offset_half_life"))) TS_ProbabilisticScoringParameters_set_liquidity_offset_half_life(uint64_t this_ptr, int64_t val) { LDKProbabilisticScoringParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ProbabilisticScoringParameters_set_liquidity_offset_half_life(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ProbabilisticScoringParameters_get_liquidity_penalty_amount_multiplier_msat"))) TS_ProbabilisticScoringParameters_get_liquidity_penalty_amount_multiplier_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ProbabilisticScoringParameters_get_liquidity_penalty_amount_multiplier_msat"))) TS_ProbabilisticScoringParameters_get_liquidity_penalty_amount_multiplier_msat(uint64_t this_ptr) { LDKProbabilisticScoringParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ProbabilisticScoringParameters_get_liquidity_penalty_amount_multiplier_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ProbabilisticScoringParameters_set_liquidity_penalty_amount_multiplier_msat"))) TS_ProbabilisticScoringParameters_set_liquidity_penalty_amount_multiplier_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ProbabilisticScoringParameters_set_liquidity_penalty_amount_multiplier_msat"))) TS_ProbabilisticScoringParameters_set_liquidity_penalty_amount_multiplier_msat(uint64_t this_ptr, int64_t val) { LDKProbabilisticScoringParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ProbabilisticScoringParameters_set_liquidity_penalty_amount_multiplier_msat(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ProbabilisticScoringParameters_get_anti_probing_penalty_msat"))) TS_ProbabilisticScoringParameters_get_anti_probing_penalty_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ProbabilisticScoringParameters_get_anti_probing_penalty_msat"))) TS_ProbabilisticScoringParameters_get_anti_probing_penalty_msat(uint64_t this_ptr) { LDKProbabilisticScoringParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ProbabilisticScoringParameters_get_anti_probing_penalty_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ProbabilisticScoringParameters_set_anti_probing_penalty_msat"))) TS_ProbabilisticScoringParameters_set_anti_probing_penalty_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ProbabilisticScoringParameters_set_anti_probing_penalty_msat"))) TS_ProbabilisticScoringParameters_set_anti_probing_penalty_msat(uint64_t this_ptr, int64_t val) { LDKProbabilisticScoringParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ProbabilisticScoringParameters_set_anti_probing_penalty_msat(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ProbabilisticScoringParameters_get_considered_impossible_penalty_msat"))) TS_ProbabilisticScoringParameters_get_considered_impossible_penalty_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ProbabilisticScoringParameters_get_considered_impossible_penalty_msat"))) TS_ProbabilisticScoringParameters_get_considered_impossible_penalty_msat(uint64_t this_ptr) { LDKProbabilisticScoringParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ProbabilisticScoringParameters_get_considered_impossible_penalty_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ProbabilisticScoringParameters_set_considered_impossible_penalty_msat"))) TS_ProbabilisticScoringParameters_set_considered_impossible_penalty_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ProbabilisticScoringParameters_set_considered_impossible_penalty_msat"))) TS_ProbabilisticScoringParameters_set_considered_impossible_penalty_msat(uint64_t this_ptr, int64_t val) { LDKProbabilisticScoringParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ProbabilisticScoringParameters_set_considered_impossible_penalty_msat(&this_ptr_conv, val); } -static inline uintptr_t ProbabilisticScoringParameters_clone_ptr(LDKProbabilisticScoringParameters *NONNULL_PTR arg) { +static inline uint64_t ProbabilisticScoringParameters_clone_ptr(LDKProbabilisticScoringParameters *NONNULL_PTR arg) { LDKProbabilisticScoringParameters ret_var = ProbabilisticScoringParameters_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ProbabilisticScoringParameters_clone_ptr"))) TS_ProbabilisticScoringParameters_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ProbabilisticScoringParameters_clone_ptr"))) TS_ProbabilisticScoringParameters_clone_ptr(uint64_t arg) { LDKProbabilisticScoringParameters arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ProbabilisticScoringParameters_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ProbabilisticScoringParameters_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ProbabilisticScoringParameters_clone"))) TS_ProbabilisticScoringParameters_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ProbabilisticScoringParameters_clone"))) TS_ProbabilisticScoringParameters_clone(uint64_t orig) { LDKProbabilisticScoringParameters orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKProbabilisticScoringParameters ret_var = ProbabilisticScoringParameters_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ProbabilisticScorer_new"))) TS_ProbabilisticScorer_new(uint32_t params, uint32_t network_graph, uint32_t logger) { +uint64_t __attribute__((export_name("TS_ProbabilisticScorer_new"))) TS_ProbabilisticScorer_new(uint64_t params, uint64_t network_graph, uint64_t logger) { LDKProbabilisticScoringParameters params_conv; - params_conv.inner = (void*)(params & (~1)); - params_conv.is_owned = (params & 1) || (params == 0); + params_conv.inner = untag_ptr(params); + params_conv.is_owned = ptr_is_owned(params); CHECK_INNER_FIELD_ACCESS_OR_NULL(params_conv); params_conv = ProbabilisticScoringParameters_clone(¶ms_conv); LDKNetworkGraph network_graph_conv; - network_graph_conv.inner = (void*)(network_graph & (~1)); - network_graph_conv.is_owned = false; + network_graph_conv.inner = untag_ptr(network_graph); + network_graph_conv.is_owned = ptr_is_owned(network_graph); CHECK_INNER_FIELD_ACCESS_OR_NULL(network_graph_conv); - void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); + network_graph_conv.is_owned = false; + void* logger_ptr = untag_ptr(logger); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); if (logger_conv.free == LDKLogger_JCalls_free) { @@ -43297,113 +41438,121 @@ uint32_t __attribute__((export_name("TS_ProbabilisticScorer_new"))) TS_Probabil LDKLogger_JCalls_cloned(&logger_conv); } LDKProbabilisticScorer ret_var = ProbabilisticScorer_new(params_conv, &network_graph_conv, logger_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ProbabilisticScorer_debug_log_liquidity_stats"))) TS_ProbabilisticScorer_debug_log_liquidity_stats(uint32_t this_arg) { +void __attribute__((export_name("TS_ProbabilisticScorer_debug_log_liquidity_stats"))) TS_ProbabilisticScorer_debug_log_liquidity_stats(uint64_t this_arg) { LDKProbabilisticScorer this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; ProbabilisticScorer_debug_log_liquidity_stats(&this_arg_conv); } -uint32_t __attribute__((export_name("TS_ProbabilisticScorer_estimated_channel_liquidity_range"))) TS_ProbabilisticScorer_estimated_channel_liquidity_range(uint32_t this_arg, int64_t scid, uint32_t target) { +uint64_t __attribute__((export_name("TS_ProbabilisticScorer_estimated_channel_liquidity_range"))) TS_ProbabilisticScorer_estimated_channel_liquidity_range(uint64_t this_arg, int64_t scid, uint64_t target) { LDKProbabilisticScorer this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKNodeId target_conv; - target_conv.inner = (void*)(target & (~1)); - target_conv.is_owned = false; + target_conv.inner = untag_ptr(target); + target_conv.is_owned = ptr_is_owned(target); CHECK_INNER_FIELD_ACCESS_OR_NULL(target_conv); + target_conv.is_owned = false; LDKCOption_C2Tuple_u64u64ZZ *ret_copy = MALLOC(sizeof(LDKCOption_C2Tuple_u64u64ZZ), "LDKCOption_C2Tuple_u64u64ZZ"); *ret_copy = ProbabilisticScorer_estimated_channel_liquidity_range(&this_arg_conv, scid, &target_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_ProbabilisticScorer_add_banned"))) TS_ProbabilisticScorer_add_banned(uint32_t this_arg, uint32_t node_id) { +void __attribute__((export_name("TS_ProbabilisticScorer_add_banned"))) TS_ProbabilisticScorer_add_banned(uint64_t this_arg, uint64_t node_id) { LDKProbabilisticScorer this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKNodeId node_id_conv; - node_id_conv.inner = (void*)(node_id & (~1)); - node_id_conv.is_owned = false; + node_id_conv.inner = untag_ptr(node_id); + node_id_conv.is_owned = ptr_is_owned(node_id); CHECK_INNER_FIELD_ACCESS_OR_NULL(node_id_conv); + node_id_conv.is_owned = false; ProbabilisticScorer_add_banned(&this_arg_conv, &node_id_conv); } -void __attribute__((export_name("TS_ProbabilisticScorer_remove_banned"))) TS_ProbabilisticScorer_remove_banned(uint32_t this_arg, uint32_t node_id) { +void __attribute__((export_name("TS_ProbabilisticScorer_remove_banned"))) TS_ProbabilisticScorer_remove_banned(uint64_t this_arg, uint64_t node_id) { LDKProbabilisticScorer this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKNodeId node_id_conv; - node_id_conv.inner = (void*)(node_id & (~1)); - node_id_conv.is_owned = false; + node_id_conv.inner = untag_ptr(node_id); + node_id_conv.is_owned = ptr_is_owned(node_id); CHECK_INNER_FIELD_ACCESS_OR_NULL(node_id_conv); + node_id_conv.is_owned = false; ProbabilisticScorer_remove_banned(&this_arg_conv, &node_id_conv); } -void __attribute__((export_name("TS_ProbabilisticScorer_set_manual_penalty"))) TS_ProbabilisticScorer_set_manual_penalty(uint32_t this_arg, uint32_t node_id, int64_t penalty) { +void __attribute__((export_name("TS_ProbabilisticScorer_set_manual_penalty"))) TS_ProbabilisticScorer_set_manual_penalty(uint64_t this_arg, uint64_t node_id, int64_t penalty) { LDKProbabilisticScorer this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKNodeId node_id_conv; - node_id_conv.inner = (void*)(node_id & (~1)); - node_id_conv.is_owned = false; + node_id_conv.inner = untag_ptr(node_id); + node_id_conv.is_owned = ptr_is_owned(node_id); CHECK_INNER_FIELD_ACCESS_OR_NULL(node_id_conv); + node_id_conv.is_owned = false; ProbabilisticScorer_set_manual_penalty(&this_arg_conv, &node_id_conv, penalty); } -void __attribute__((export_name("TS_ProbabilisticScorer_remove_manual_penalty"))) TS_ProbabilisticScorer_remove_manual_penalty(uint32_t this_arg, uint32_t node_id) { +void __attribute__((export_name("TS_ProbabilisticScorer_remove_manual_penalty"))) TS_ProbabilisticScorer_remove_manual_penalty(uint64_t this_arg, uint64_t node_id) { LDKProbabilisticScorer this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKNodeId node_id_conv; - node_id_conv.inner = (void*)(node_id & (~1)); - node_id_conv.is_owned = false; + node_id_conv.inner = untag_ptr(node_id); + node_id_conv.is_owned = ptr_is_owned(node_id); CHECK_INNER_FIELD_ACCESS_OR_NULL(node_id_conv); + node_id_conv.is_owned = false; ProbabilisticScorer_remove_manual_penalty(&this_arg_conv, &node_id_conv); } -void __attribute__((export_name("TS_ProbabilisticScorer_clear_manual_penalties"))) TS_ProbabilisticScorer_clear_manual_penalties(uint32_t this_arg) { +void __attribute__((export_name("TS_ProbabilisticScorer_clear_manual_penalties"))) TS_ProbabilisticScorer_clear_manual_penalties(uint64_t this_arg) { LDKProbabilisticScorer this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; ProbabilisticScorer_clear_manual_penalties(&this_arg_conv); } -void __attribute__((export_name("TS_ProbabilisticScoringParameters_add_banned_from_list"))) TS_ProbabilisticScoringParameters_add_banned_from_list(uint32_t this_arg, uint32_tArray node_ids) { +void __attribute__((export_name("TS_ProbabilisticScoringParameters_add_banned_from_list"))) TS_ProbabilisticScoringParameters_add_banned_from_list(uint64_t this_arg, uint64_tArray node_ids) { LDKProbabilisticScoringParameters this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCVec_NodeIdZ node_ids_constr; node_ids_constr.datalen = node_ids->arr_len; if (node_ids_constr.datalen > 0) node_ids_constr.data = MALLOC(node_ids_constr.datalen * sizeof(LDKNodeId), "LDKCVec_NodeIdZ Elements"); else node_ids_constr.data = NULL; - uint32_t* node_ids_vals = node_ids->elems; + uint64_t* node_ids_vals = node_ids->elems; for (size_t i = 0; i < node_ids_constr.datalen; i++) { - uint32_t node_ids_conv_8 = node_ids_vals[i]; + uint64_t node_ids_conv_8 = node_ids_vals[i]; LDKNodeId node_ids_conv_8_conv; - node_ids_conv_8_conv.inner = (void*)(node_ids_conv_8 & (~1)); - node_ids_conv_8_conv.is_owned = (node_ids_conv_8 & 1) || (node_ids_conv_8 == 0); + node_ids_conv_8_conv.inner = untag_ptr(node_ids_conv_8); + node_ids_conv_8_conv.is_owned = ptr_is_owned(node_ids_conv_8); CHECK_INNER_FIELD_ACCESS_OR_NULL(node_ids_conv_8_conv); node_ids_conv_8_conv = NodeId_clone(&node_ids_conv_8_conv); node_ids_constr.data[i] = node_ids_conv_8_conv; @@ -43412,34 +41561,31 @@ void __attribute__((export_name("TS_ProbabilisticScoringParameters_add_banned_f ProbabilisticScoringParameters_add_banned_from_list(&this_arg_conv, node_ids_constr); } -uint32_t __attribute__((export_name("TS_ProbabilisticScoringParameters_default"))) TS_ProbabilisticScoringParameters_default() { +uint64_t __attribute__((export_name("TS_ProbabilisticScoringParameters_default"))) TS_ProbabilisticScoringParameters_default() { LDKProbabilisticScoringParameters ret_var = ProbabilisticScoringParameters_default(); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ProbabilisticScorer_as_Score"))) TS_ProbabilisticScorer_as_Score(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ProbabilisticScorer_as_Score"))) TS_ProbabilisticScorer_as_Score(uint64_t this_arg) { LDKProbabilisticScorer this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKScore* ret_ret = MALLOC(sizeof(LDKScore), "LDKScore"); *ret_ret = ProbabilisticScorer_as_Score(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -int8_tArray __attribute__((export_name("TS_ProbabilisticScorer_write"))) TS_ProbabilisticScorer_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ProbabilisticScorer_write"))) TS_ProbabilisticScorer_write(uint64_t obj) { LDKProbabilisticScorer obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ProbabilisticScorer_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -43447,20 +41593,21 @@ int8_tArray __attribute__((export_name("TS_ProbabilisticScorer_write"))) TS_Pro return ret_arr; } -uint32_t __attribute__((export_name("TS_ProbabilisticScorer_read"))) TS_ProbabilisticScorer_read(int8_tArray ser, uint32_t arg_a, uint32_t arg_b, uint32_t arg_c) { +uint64_t __attribute__((export_name("TS_ProbabilisticScorer_read"))) TS_ProbabilisticScorer_read(int8_tArray ser, uint64_t arg_a, uint64_t arg_b, uint64_t arg_c) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; ser_ref.data = ser->elems; LDKProbabilisticScoringParameters arg_a_conv; - arg_a_conv.inner = (void*)(arg_a & (~1)); - arg_a_conv.is_owned = (arg_a & 1) || (arg_a == 0); + arg_a_conv.inner = untag_ptr(arg_a); + arg_a_conv.is_owned = ptr_is_owned(arg_a); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_a_conv); arg_a_conv = ProbabilisticScoringParameters_clone(&arg_a_conv); LDKNetworkGraph arg_b_conv; - arg_b_conv.inner = (void*)(arg_b & (~1)); - arg_b_conv.is_owned = false; + arg_b_conv.inner = untag_ptr(arg_b); + arg_b_conv.is_owned = ptr_is_owned(arg_b); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_b_conv); - void* arg_c_ptr = (void*)(((uintptr_t)arg_c) & ~1); + arg_b_conv.is_owned = false; + void* arg_c_ptr = untag_ptr(arg_c); CHECK_ACCESS(arg_c_ptr); LDKLogger arg_c_conv = *(LDKLogger*)(arg_c_ptr); if (arg_c_conv.free == LDKLogger_JCalls_free) { @@ -43470,577 +41617,541 @@ uint32_t __attribute__((export_name("TS_ProbabilisticScorer_read"))) TS_Probabi LDKCResult_ProbabilisticScorerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ProbabilisticScorerDecodeErrorZ), "LDKCResult_ProbabilisticScorerDecodeErrorZ"); *ret_conv = ProbabilisticScorer_read(ser_ref, arg_a_conv, &arg_b_conv, arg_c_conv); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_ParseError_free"))) TS_ParseError_free(uint32_t this_ptr) { - if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_ParseError_free"))) TS_ParseError_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKParseError this_ptr_conv = *(LDKParseError*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); ParseError_free(this_ptr_conv); } -static inline uintptr_t ParseError_clone_ptr(LDKParseError *NONNULL_PTR arg) { +static inline uint64_t ParseError_clone_ptr(LDKParseError *NONNULL_PTR arg) { LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = ParseError_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseError_clone_ptr"))) TS_ParseError_clone_ptr(uint32_t arg) { - LDKParseError* arg_conv = (LDKParseError*)arg; - uint32_t ret_conv = ParseError_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_ParseError_clone_ptr"))) TS_ParseError_clone_ptr(uint64_t arg) { + LDKParseError* arg_conv = (LDKParseError*)untag_ptr(arg); + int64_t ret_conv = ParseError_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ParseError_clone"))) TS_ParseError_clone(uint32_t orig) { - LDKParseError* orig_conv = (LDKParseError*)orig; +uint64_t __attribute__((export_name("TS_ParseError_clone"))) TS_ParseError_clone(uint64_t orig) { + LDKParseError* orig_conv = (LDKParseError*)untag_ptr(orig); LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = ParseError_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseError_bech32_error"))) TS_ParseError_bech32_error(uint32_t a) { - void* a_ptr = (void*)(((uintptr_t)a) & ~1); +uint64_t __attribute__((export_name("TS_ParseError_bech32_error"))) TS_ParseError_bech32_error(uint64_t a) { + void* a_ptr = untag_ptr(a); CHECK_ACCESS(a_ptr); LDKBech32Error a_conv = *(LDKBech32Error*)(a_ptr); - a_conv = Bech32Error_clone((LDKBech32Error*)(((uintptr_t)a) & ~1)); + a_conv = Bech32Error_clone((LDKBech32Error*)untag_ptr(a)); LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = ParseError_bech32_error(a_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseError_parse_amount_error"))) TS_ParseError_parse_amount_error(int32_t a) { +uint64_t __attribute__((export_name("TS_ParseError_parse_amount_error"))) TS_ParseError_parse_amount_error(int32_t a) { LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = ParseError_parse_amount_error((LDKError){ ._dummy = 0 }); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseError_malformed_signature"))) TS_ParseError_malformed_signature(uint32_t a) { +uint64_t __attribute__((export_name("TS_ParseError_malformed_signature"))) TS_ParseError_malformed_signature(uint32_t a) { LDKSecp256k1Error a_conv = LDKSecp256k1Error_from_js(a); LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = ParseError_malformed_signature(a_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseError_bad_prefix"))) TS_ParseError_bad_prefix() { +uint64_t __attribute__((export_name("TS_ParseError_bad_prefix"))) TS_ParseError_bad_prefix() { LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = ParseError_bad_prefix(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseError_unknown_currency"))) TS_ParseError_unknown_currency() { +uint64_t __attribute__((export_name("TS_ParseError_unknown_currency"))) TS_ParseError_unknown_currency() { LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = ParseError_unknown_currency(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseError_unknown_si_prefix"))) TS_ParseError_unknown_si_prefix() { +uint64_t __attribute__((export_name("TS_ParseError_unknown_si_prefix"))) TS_ParseError_unknown_si_prefix() { LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = ParseError_unknown_si_prefix(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseError_malformed_hrp"))) TS_ParseError_malformed_hrp() { +uint64_t __attribute__((export_name("TS_ParseError_malformed_hrp"))) TS_ParseError_malformed_hrp() { LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = ParseError_malformed_hrp(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseError_too_short_data_part"))) TS_ParseError_too_short_data_part() { +uint64_t __attribute__((export_name("TS_ParseError_too_short_data_part"))) TS_ParseError_too_short_data_part() { LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = ParseError_too_short_data_part(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseError_unexpected_end_of_tagged_fields"))) TS_ParseError_unexpected_end_of_tagged_fields() { +uint64_t __attribute__((export_name("TS_ParseError_unexpected_end_of_tagged_fields"))) TS_ParseError_unexpected_end_of_tagged_fields() { LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = ParseError_unexpected_end_of_tagged_fields(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseError_description_decode_error"))) TS_ParseError_description_decode_error(int32_t a) { +uint64_t __attribute__((export_name("TS_ParseError_description_decode_error"))) TS_ParseError_description_decode_error(int32_t a) { LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = ParseError_description_decode_error((LDKError){ ._dummy = 0 }); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseError_padding_error"))) TS_ParseError_padding_error() { +uint64_t __attribute__((export_name("TS_ParseError_padding_error"))) TS_ParseError_padding_error() { LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = ParseError_padding_error(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseError_integer_overflow_error"))) TS_ParseError_integer_overflow_error() { +uint64_t __attribute__((export_name("TS_ParseError_integer_overflow_error"))) TS_ParseError_integer_overflow_error() { LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = ParseError_integer_overflow_error(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseError_invalid_seg_wit_program_length"))) TS_ParseError_invalid_seg_wit_program_length() { +uint64_t __attribute__((export_name("TS_ParseError_invalid_seg_wit_program_length"))) TS_ParseError_invalid_seg_wit_program_length() { LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = ParseError_invalid_seg_wit_program_length(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseError_invalid_pub_key_hash_length"))) TS_ParseError_invalid_pub_key_hash_length() { +uint64_t __attribute__((export_name("TS_ParseError_invalid_pub_key_hash_length"))) TS_ParseError_invalid_pub_key_hash_length() { LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = ParseError_invalid_pub_key_hash_length(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseError_invalid_script_hash_length"))) TS_ParseError_invalid_script_hash_length() { +uint64_t __attribute__((export_name("TS_ParseError_invalid_script_hash_length"))) TS_ParseError_invalid_script_hash_length() { LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = ParseError_invalid_script_hash_length(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseError_invalid_recovery_id"))) TS_ParseError_invalid_recovery_id() { +uint64_t __attribute__((export_name("TS_ParseError_invalid_recovery_id"))) TS_ParseError_invalid_recovery_id() { LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = ParseError_invalid_recovery_id(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseError_invalid_slice_length"))) TS_ParseError_invalid_slice_length(jstring a) { +uint64_t __attribute__((export_name("TS_ParseError_invalid_slice_length"))) TS_ParseError_invalid_slice_length(jstring a) { LDKStr a_conv = str_ref_to_owned_c(a); LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = ParseError_invalid_slice_length(a_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseError_skip"))) TS_ParseError_skip() { +uint64_t __attribute__((export_name("TS_ParseError_skip"))) TS_ParseError_skip() { LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = ParseError_skip(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_ParseOrSemanticError_free"))) TS_ParseOrSemanticError_free(uint32_t this_ptr) { - if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_ParseOrSemanticError_free"))) TS_ParseOrSemanticError_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKParseOrSemanticError this_ptr_conv = *(LDKParseOrSemanticError*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); ParseOrSemanticError_free(this_ptr_conv); } -static inline uintptr_t ParseOrSemanticError_clone_ptr(LDKParseOrSemanticError *NONNULL_PTR arg) { +static inline uint64_t ParseOrSemanticError_clone_ptr(LDKParseOrSemanticError *NONNULL_PTR arg) { LDKParseOrSemanticError *ret_copy = MALLOC(sizeof(LDKParseOrSemanticError), "LDKParseOrSemanticError"); *ret_copy = ParseOrSemanticError_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseOrSemanticError_clone_ptr"))) TS_ParseOrSemanticError_clone_ptr(uint32_t arg) { - LDKParseOrSemanticError* arg_conv = (LDKParseOrSemanticError*)arg; - uint32_t ret_conv = ParseOrSemanticError_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_ParseOrSemanticError_clone_ptr"))) TS_ParseOrSemanticError_clone_ptr(uint64_t arg) { + LDKParseOrSemanticError* arg_conv = (LDKParseOrSemanticError*)untag_ptr(arg); + int64_t ret_conv = ParseOrSemanticError_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ParseOrSemanticError_clone"))) TS_ParseOrSemanticError_clone(uint32_t orig) { - LDKParseOrSemanticError* orig_conv = (LDKParseOrSemanticError*)orig; +uint64_t __attribute__((export_name("TS_ParseOrSemanticError_clone"))) TS_ParseOrSemanticError_clone(uint64_t orig) { + LDKParseOrSemanticError* orig_conv = (LDKParseOrSemanticError*)untag_ptr(orig); LDKParseOrSemanticError *ret_copy = MALLOC(sizeof(LDKParseOrSemanticError), "LDKParseOrSemanticError"); *ret_copy = ParseOrSemanticError_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseOrSemanticError_parse_error"))) TS_ParseOrSemanticError_parse_error(uint32_t a) { - void* a_ptr = (void*)(((uintptr_t)a) & ~1); +uint64_t __attribute__((export_name("TS_ParseOrSemanticError_parse_error"))) TS_ParseOrSemanticError_parse_error(uint64_t a) { + void* a_ptr = untag_ptr(a); CHECK_ACCESS(a_ptr); LDKParseError a_conv = *(LDKParseError*)(a_ptr); - a_conv = ParseError_clone((LDKParseError*)(((uintptr_t)a) & ~1)); + a_conv = ParseError_clone((LDKParseError*)untag_ptr(a)); LDKParseOrSemanticError *ret_copy = MALLOC(sizeof(LDKParseOrSemanticError), "LDKParseOrSemanticError"); *ret_copy = ParseOrSemanticError_parse_error(a_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseOrSemanticError_semantic_error"))) TS_ParseOrSemanticError_semantic_error(uint32_t a) { +uint64_t __attribute__((export_name("TS_ParseOrSemanticError_semantic_error"))) TS_ParseOrSemanticError_semantic_error(uint32_t a) { LDKSemanticError a_conv = LDKSemanticError_from_js(a); LDKParseOrSemanticError *ret_copy = MALLOC(sizeof(LDKParseOrSemanticError), "LDKParseOrSemanticError"); *ret_copy = ParseOrSemanticError_semantic_error(a_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_Invoice_free"))) TS_Invoice_free(uint32_t this_obj) { +void __attribute__((export_name("TS_Invoice_free"))) TS_Invoice_free(uint64_t this_obj) { LDKInvoice this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); Invoice_free(this_obj_conv); } -jboolean __attribute__((export_name("TS_Invoice_eq"))) TS_Invoice_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_Invoice_eq"))) TS_Invoice_eq(uint64_t a, uint64_t b) { LDKInvoice a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKInvoice b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = Invoice_eq(&a_conv, &b_conv); return ret_conv; } -static inline uintptr_t Invoice_clone_ptr(LDKInvoice *NONNULL_PTR arg) { +static inline uint64_t Invoice_clone_ptr(LDKInvoice *NONNULL_PTR arg) { LDKInvoice ret_var = Invoice_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_Invoice_clone_ptr"))) TS_Invoice_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_Invoice_clone_ptr"))) TS_Invoice_clone_ptr(uint64_t arg) { LDKInvoice arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = Invoice_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = Invoice_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_Invoice_clone"))) TS_Invoice_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_Invoice_clone"))) TS_Invoice_clone(uint64_t orig) { LDKInvoice orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKInvoice ret_var = Invoice_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_SignedRawInvoice_free"))) TS_SignedRawInvoice_free(uint32_t this_obj) { +void __attribute__((export_name("TS_SignedRawInvoice_free"))) TS_SignedRawInvoice_free(uint64_t this_obj) { LDKSignedRawInvoice this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); SignedRawInvoice_free(this_obj_conv); } -jboolean __attribute__((export_name("TS_SignedRawInvoice_eq"))) TS_SignedRawInvoice_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_SignedRawInvoice_eq"))) TS_SignedRawInvoice_eq(uint64_t a, uint64_t b) { LDKSignedRawInvoice a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKSignedRawInvoice b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = SignedRawInvoice_eq(&a_conv, &b_conv); return ret_conv; } -static inline uintptr_t SignedRawInvoice_clone_ptr(LDKSignedRawInvoice *NONNULL_PTR arg) { +static inline uint64_t SignedRawInvoice_clone_ptr(LDKSignedRawInvoice *NONNULL_PTR arg) { LDKSignedRawInvoice ret_var = SignedRawInvoice_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_SignedRawInvoice_clone_ptr"))) TS_SignedRawInvoice_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_SignedRawInvoice_clone_ptr"))) TS_SignedRawInvoice_clone_ptr(uint64_t arg) { LDKSignedRawInvoice arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = SignedRawInvoice_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = SignedRawInvoice_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_SignedRawInvoice_clone"))) TS_SignedRawInvoice_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_SignedRawInvoice_clone"))) TS_SignedRawInvoice_clone(uint64_t orig) { LDKSignedRawInvoice orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKSignedRawInvoice ret_var = SignedRawInvoice_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_RawInvoice_free"))) TS_RawInvoice_free(uint32_t this_obj) { +void __attribute__((export_name("TS_RawInvoice_free"))) TS_RawInvoice_free(uint64_t this_obj) { LDKRawInvoice this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); RawInvoice_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_RawInvoice_get_data"))) TS_RawInvoice_get_data(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_RawInvoice_get_data"))) TS_RawInvoice_get_data(uint64_t this_ptr) { LDKRawInvoice this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKRawDataPart ret_var = RawInvoice_get_data(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_RawInvoice_set_data"))) TS_RawInvoice_set_data(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_RawInvoice_set_data"))) TS_RawInvoice_set_data(uint64_t this_ptr, uint64_t val) { LDKRawInvoice this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKRawDataPart val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = RawDataPart_clone(&val_conv); RawInvoice_set_data(&this_ptr_conv, val_conv); } -jboolean __attribute__((export_name("TS_RawInvoice_eq"))) TS_RawInvoice_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_RawInvoice_eq"))) TS_RawInvoice_eq(uint64_t a, uint64_t b) { LDKRawInvoice a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKRawInvoice b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = RawInvoice_eq(&a_conv, &b_conv); return ret_conv; } -static inline uintptr_t RawInvoice_clone_ptr(LDKRawInvoice *NONNULL_PTR arg) { +static inline uint64_t RawInvoice_clone_ptr(LDKRawInvoice *NONNULL_PTR arg) { LDKRawInvoice ret_var = RawInvoice_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_RawInvoice_clone_ptr"))) TS_RawInvoice_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_RawInvoice_clone_ptr"))) TS_RawInvoice_clone_ptr(uint64_t arg) { LDKRawInvoice arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = RawInvoice_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = RawInvoice_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_RawInvoice_clone"))) TS_RawInvoice_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_RawInvoice_clone"))) TS_RawInvoice_clone(uint64_t orig) { LDKRawInvoice orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKRawInvoice ret_var = RawInvoice_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_RawDataPart_free"))) TS_RawDataPart_free(uint32_t this_obj) { +void __attribute__((export_name("TS_RawDataPart_free"))) TS_RawDataPart_free(uint64_t this_obj) { LDKRawDataPart this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); RawDataPart_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_RawDataPart_get_timestamp"))) TS_RawDataPart_get_timestamp(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_RawDataPart_get_timestamp"))) TS_RawDataPart_get_timestamp(uint64_t this_ptr) { LDKRawDataPart this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPositiveTimestamp ret_var = RawDataPart_get_timestamp(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_RawDataPart_set_timestamp"))) TS_RawDataPart_set_timestamp(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_RawDataPart_set_timestamp"))) TS_RawDataPart_set_timestamp(uint64_t this_ptr, uint64_t val) { LDKRawDataPart this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPositiveTimestamp val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = PositiveTimestamp_clone(&val_conv); RawDataPart_set_timestamp(&this_ptr_conv, val_conv); } -jboolean __attribute__((export_name("TS_RawDataPart_eq"))) TS_RawDataPart_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_RawDataPart_eq"))) TS_RawDataPart_eq(uint64_t a, uint64_t b) { LDKRawDataPart a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKRawDataPart b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = RawDataPart_eq(&a_conv, &b_conv); return ret_conv; } -static inline uintptr_t RawDataPart_clone_ptr(LDKRawDataPart *NONNULL_PTR arg) { +static inline uint64_t RawDataPart_clone_ptr(LDKRawDataPart *NONNULL_PTR arg) { LDKRawDataPart ret_var = RawDataPart_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_RawDataPart_clone_ptr"))) TS_RawDataPart_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_RawDataPart_clone_ptr"))) TS_RawDataPart_clone_ptr(uint64_t arg) { LDKRawDataPart arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = RawDataPart_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = RawDataPart_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_RawDataPart_clone"))) TS_RawDataPart_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_RawDataPart_clone"))) TS_RawDataPart_clone(uint64_t orig) { LDKRawDataPart orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKRawDataPart ret_var = RawDataPart_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_PositiveTimestamp_free"))) TS_PositiveTimestamp_free(uint32_t this_obj) { +void __attribute__((export_name("TS_PositiveTimestamp_free"))) TS_PositiveTimestamp_free(uint64_t this_obj) { LDKPositiveTimestamp this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); PositiveTimestamp_free(this_obj_conv); } -jboolean __attribute__((export_name("TS_PositiveTimestamp_eq"))) TS_PositiveTimestamp_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_PositiveTimestamp_eq"))) TS_PositiveTimestamp_eq(uint64_t a, uint64_t b) { LDKPositiveTimestamp a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKPositiveTimestamp b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = PositiveTimestamp_eq(&a_conv, &b_conv); return ret_conv; } -static inline uintptr_t PositiveTimestamp_clone_ptr(LDKPositiveTimestamp *NONNULL_PTR arg) { +static inline uint64_t PositiveTimestamp_clone_ptr(LDKPositiveTimestamp *NONNULL_PTR arg) { LDKPositiveTimestamp ret_var = PositiveTimestamp_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_PositiveTimestamp_clone_ptr"))) TS_PositiveTimestamp_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_PositiveTimestamp_clone_ptr"))) TS_PositiveTimestamp_clone_ptr(uint64_t arg) { LDKPositiveTimestamp arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = PositiveTimestamp_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = PositiveTimestamp_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_PositiveTimestamp_clone"))) TS_PositiveTimestamp_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_PositiveTimestamp_clone"))) TS_PositiveTimestamp_clone(uint64_t orig) { LDKPositiveTimestamp orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKPositiveTimestamp ret_var = PositiveTimestamp_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_SiPrefix_clone"))) TS_SiPrefix_clone(uint32_t orig) { - LDKSiPrefix* orig_conv = (LDKSiPrefix*)(orig & ~1); +uint32_t __attribute__((export_name("TS_SiPrefix_clone"))) TS_SiPrefix_clone(uint64_t orig) { + LDKSiPrefix* orig_conv = (LDKSiPrefix*)untag_ptr(orig); uint32_t ret_conv = LDKSiPrefix_to_js(SiPrefix_clone(orig_conv)); return ret_conv; } @@ -44065,21 +42176,21 @@ uint32_t __attribute__((export_name("TS_SiPrefix_pico"))) TS_SiPrefix_pico() { return ret_conv; } -jboolean __attribute__((export_name("TS_SiPrefix_eq"))) TS_SiPrefix_eq(uint32_t a, uint32_t b) { - LDKSiPrefix* a_conv = (LDKSiPrefix*)(a & ~1); - LDKSiPrefix* b_conv = (LDKSiPrefix*)(b & ~1); +jboolean __attribute__((export_name("TS_SiPrefix_eq"))) TS_SiPrefix_eq(uint64_t a, uint64_t b) { + LDKSiPrefix* a_conv = (LDKSiPrefix*)untag_ptr(a); + LDKSiPrefix* b_conv = (LDKSiPrefix*)untag_ptr(b); jboolean ret_conv = SiPrefix_eq(a_conv, b_conv); return ret_conv; } -int64_t __attribute__((export_name("TS_SiPrefix_multiplier"))) TS_SiPrefix_multiplier(uint32_t this_arg) { - LDKSiPrefix* this_arg_conv = (LDKSiPrefix*)(this_arg & ~1); +int64_t __attribute__((export_name("TS_SiPrefix_multiplier"))) TS_SiPrefix_multiplier(uint64_t this_arg) { + LDKSiPrefix* this_arg_conv = (LDKSiPrefix*)untag_ptr(this_arg); int64_t ret_conv = SiPrefix_multiplier(this_arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_Currency_clone"))) TS_Currency_clone(uint32_t orig) { - LDKCurrency* orig_conv = (LDKCurrency*)(orig & ~1); +uint32_t __attribute__((export_name("TS_Currency_clone"))) TS_Currency_clone(uint64_t orig) { + LDKCurrency* orig_conv = (LDKCurrency*)untag_ptr(orig); uint32_t ret_conv = LDKCurrency_to_js(Currency_clone(orig_conv)); return ret_conv; } @@ -44109,456 +42220,425 @@ uint32_t __attribute__((export_name("TS_Currency_signet"))) TS_Currency_signet( return ret_conv; } -int64_t __attribute__((export_name("TS_Currency_hash"))) TS_Currency_hash(uint32_t o) { - LDKCurrency* o_conv = (LDKCurrency*)(o & ~1); +int64_t __attribute__((export_name("TS_Currency_hash"))) TS_Currency_hash(uint64_t o) { + LDKCurrency* o_conv = (LDKCurrency*)untag_ptr(o); int64_t ret_conv = Currency_hash(o_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_Currency_eq"))) TS_Currency_eq(uint32_t a, uint32_t b) { - LDKCurrency* a_conv = (LDKCurrency*)(a & ~1); - LDKCurrency* b_conv = (LDKCurrency*)(b & ~1); +jboolean __attribute__((export_name("TS_Currency_eq"))) TS_Currency_eq(uint64_t a, uint64_t b) { + LDKCurrency* a_conv = (LDKCurrency*)untag_ptr(a); + LDKCurrency* b_conv = (LDKCurrency*)untag_ptr(b); jboolean ret_conv = Currency_eq(a_conv, b_conv); return ret_conv; } -void __attribute__((export_name("TS_Sha256_free"))) TS_Sha256_free(uint32_t this_obj) { +void __attribute__((export_name("TS_Sha256_free"))) TS_Sha256_free(uint64_t this_obj) { LDKSha256 this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); Sha256_free(this_obj_conv); } -static inline uintptr_t Sha256_clone_ptr(LDKSha256 *NONNULL_PTR arg) { +static inline uint64_t Sha256_clone_ptr(LDKSha256 *NONNULL_PTR arg) { LDKSha256 ret_var = Sha256_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_Sha256_clone_ptr"))) TS_Sha256_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_Sha256_clone_ptr"))) TS_Sha256_clone_ptr(uint64_t arg) { LDKSha256 arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = Sha256_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = Sha256_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_Sha256_clone"))) TS_Sha256_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_Sha256_clone"))) TS_Sha256_clone(uint64_t orig) { LDKSha256 orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKSha256 ret_var = Sha256_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int64_t __attribute__((export_name("TS_Sha256_hash"))) TS_Sha256_hash(uint32_t o) { +int64_t __attribute__((export_name("TS_Sha256_hash"))) TS_Sha256_hash(uint64_t o) { LDKSha256 o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = false; + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); + o_conv.is_owned = false; int64_t ret_conv = Sha256_hash(&o_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_Sha256_eq"))) TS_Sha256_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_Sha256_eq"))) TS_Sha256_eq(uint64_t a, uint64_t b) { LDKSha256 a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKSha256 b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = Sha256_eq(&a_conv, &b_conv); return ret_conv; } -void __attribute__((export_name("TS_Description_free"))) TS_Description_free(uint32_t this_obj) { +void __attribute__((export_name("TS_Description_free"))) TS_Description_free(uint64_t this_obj) { LDKDescription this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); Description_free(this_obj_conv); } -static inline uintptr_t Description_clone_ptr(LDKDescription *NONNULL_PTR arg) { +static inline uint64_t Description_clone_ptr(LDKDescription *NONNULL_PTR arg) { LDKDescription ret_var = Description_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_Description_clone_ptr"))) TS_Description_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_Description_clone_ptr"))) TS_Description_clone_ptr(uint64_t arg) { LDKDescription arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = Description_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = Description_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_Description_clone"))) TS_Description_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_Description_clone"))) TS_Description_clone(uint64_t orig) { LDKDescription orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKDescription ret_var = Description_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int64_t __attribute__((export_name("TS_Description_hash"))) TS_Description_hash(uint32_t o) { +int64_t __attribute__((export_name("TS_Description_hash"))) TS_Description_hash(uint64_t o) { LDKDescription o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = false; + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); + o_conv.is_owned = false; int64_t ret_conv = Description_hash(&o_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_Description_eq"))) TS_Description_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_Description_eq"))) TS_Description_eq(uint64_t a, uint64_t b) { LDKDescription a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKDescription b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = Description_eq(&a_conv, &b_conv); return ret_conv; } -void __attribute__((export_name("TS_PayeePubKey_free"))) TS_PayeePubKey_free(uint32_t this_obj) { +void __attribute__((export_name("TS_PayeePubKey_free"))) TS_PayeePubKey_free(uint64_t this_obj) { LDKPayeePubKey this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); PayeePubKey_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_PayeePubKey_get_a"))) TS_PayeePubKey_get_a(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_PayeePubKey_get_a"))) TS_PayeePubKey_get_a(uint64_t this_ptr) { LDKPayeePubKey this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, PayeePubKey_get_a(&this_ptr_conv).compressed_form, 33); return ret_arr; } -void __attribute__((export_name("TS_PayeePubKey_set_a"))) TS_PayeePubKey_set_a(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_PayeePubKey_set_a"))) TS_PayeePubKey_set_a(uint64_t this_ptr, int8_tArray val) { LDKPayeePubKey this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); PayeePubKey_set_a(&this_ptr_conv, val_ref); } -uint32_t __attribute__((export_name("TS_PayeePubKey_new"))) TS_PayeePubKey_new(int8_tArray a_arg) { +uint64_t __attribute__((export_name("TS_PayeePubKey_new"))) TS_PayeePubKey_new(int8_tArray a_arg) { LDKPublicKey a_arg_ref; CHECK(a_arg->arr_len == 33); memcpy(a_arg_ref.compressed_form, a_arg->elems, 33); FREE(a_arg); LDKPayeePubKey ret_var = PayeePubKey_new(a_arg_ref); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t PayeePubKey_clone_ptr(LDKPayeePubKey *NONNULL_PTR arg) { +static inline uint64_t PayeePubKey_clone_ptr(LDKPayeePubKey *NONNULL_PTR arg) { LDKPayeePubKey ret_var = PayeePubKey_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_PayeePubKey_clone_ptr"))) TS_PayeePubKey_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_PayeePubKey_clone_ptr"))) TS_PayeePubKey_clone_ptr(uint64_t arg) { LDKPayeePubKey arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = PayeePubKey_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = PayeePubKey_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_PayeePubKey_clone"))) TS_PayeePubKey_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_PayeePubKey_clone"))) TS_PayeePubKey_clone(uint64_t orig) { LDKPayeePubKey orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKPayeePubKey ret_var = PayeePubKey_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int64_t __attribute__((export_name("TS_PayeePubKey_hash"))) TS_PayeePubKey_hash(uint32_t o) { +int64_t __attribute__((export_name("TS_PayeePubKey_hash"))) TS_PayeePubKey_hash(uint64_t o) { LDKPayeePubKey o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = false; + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); + o_conv.is_owned = false; int64_t ret_conv = PayeePubKey_hash(&o_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_PayeePubKey_eq"))) TS_PayeePubKey_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_PayeePubKey_eq"))) TS_PayeePubKey_eq(uint64_t a, uint64_t b) { LDKPayeePubKey a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKPayeePubKey b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = PayeePubKey_eq(&a_conv, &b_conv); return ret_conv; } -void __attribute__((export_name("TS_ExpiryTime_free"))) TS_ExpiryTime_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ExpiryTime_free"))) TS_ExpiryTime_free(uint64_t this_obj) { LDKExpiryTime this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ExpiryTime_free(this_obj_conv); } -static inline uintptr_t ExpiryTime_clone_ptr(LDKExpiryTime *NONNULL_PTR arg) { +static inline uint64_t ExpiryTime_clone_ptr(LDKExpiryTime *NONNULL_PTR arg) { LDKExpiryTime ret_var = ExpiryTime_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ExpiryTime_clone_ptr"))) TS_ExpiryTime_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ExpiryTime_clone_ptr"))) TS_ExpiryTime_clone_ptr(uint64_t arg) { LDKExpiryTime arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ExpiryTime_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ExpiryTime_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ExpiryTime_clone"))) TS_ExpiryTime_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ExpiryTime_clone"))) TS_ExpiryTime_clone(uint64_t orig) { LDKExpiryTime orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKExpiryTime ret_var = ExpiryTime_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int64_t __attribute__((export_name("TS_ExpiryTime_hash"))) TS_ExpiryTime_hash(uint32_t o) { +int64_t __attribute__((export_name("TS_ExpiryTime_hash"))) TS_ExpiryTime_hash(uint64_t o) { LDKExpiryTime o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = false; + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); + o_conv.is_owned = false; int64_t ret_conv = ExpiryTime_hash(&o_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_ExpiryTime_eq"))) TS_ExpiryTime_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_ExpiryTime_eq"))) TS_ExpiryTime_eq(uint64_t a, uint64_t b) { LDKExpiryTime a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKExpiryTime b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = ExpiryTime_eq(&a_conv, &b_conv); return ret_conv; } -void __attribute__((export_name("TS_MinFinalCltvExpiry_free"))) TS_MinFinalCltvExpiry_free(uint32_t this_obj) { +void __attribute__((export_name("TS_MinFinalCltvExpiry_free"))) TS_MinFinalCltvExpiry_free(uint64_t this_obj) { LDKMinFinalCltvExpiry this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); MinFinalCltvExpiry_free(this_obj_conv); } -int64_t __attribute__((export_name("TS_MinFinalCltvExpiry_get_a"))) TS_MinFinalCltvExpiry_get_a(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_MinFinalCltvExpiry_get_a"))) TS_MinFinalCltvExpiry_get_a(uint64_t this_ptr) { LDKMinFinalCltvExpiry this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = MinFinalCltvExpiry_get_a(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_MinFinalCltvExpiry_set_a"))) TS_MinFinalCltvExpiry_set_a(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_MinFinalCltvExpiry_set_a"))) TS_MinFinalCltvExpiry_set_a(uint64_t this_ptr, int64_t val) { LDKMinFinalCltvExpiry this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; MinFinalCltvExpiry_set_a(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_MinFinalCltvExpiry_new"))) TS_MinFinalCltvExpiry_new(int64_t a_arg) { +uint64_t __attribute__((export_name("TS_MinFinalCltvExpiry_new"))) TS_MinFinalCltvExpiry_new(int64_t a_arg) { LDKMinFinalCltvExpiry ret_var = MinFinalCltvExpiry_new(a_arg); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t MinFinalCltvExpiry_clone_ptr(LDKMinFinalCltvExpiry *NONNULL_PTR arg) { +static inline uint64_t MinFinalCltvExpiry_clone_ptr(LDKMinFinalCltvExpiry *NONNULL_PTR arg) { LDKMinFinalCltvExpiry ret_var = MinFinalCltvExpiry_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_MinFinalCltvExpiry_clone_ptr"))) TS_MinFinalCltvExpiry_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_MinFinalCltvExpiry_clone_ptr"))) TS_MinFinalCltvExpiry_clone_ptr(uint64_t arg) { LDKMinFinalCltvExpiry arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = MinFinalCltvExpiry_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = MinFinalCltvExpiry_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_MinFinalCltvExpiry_clone"))) TS_MinFinalCltvExpiry_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_MinFinalCltvExpiry_clone"))) TS_MinFinalCltvExpiry_clone(uint64_t orig) { LDKMinFinalCltvExpiry orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKMinFinalCltvExpiry ret_var = MinFinalCltvExpiry_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int64_t __attribute__((export_name("TS_MinFinalCltvExpiry_hash"))) TS_MinFinalCltvExpiry_hash(uint32_t o) { +int64_t __attribute__((export_name("TS_MinFinalCltvExpiry_hash"))) TS_MinFinalCltvExpiry_hash(uint64_t o) { LDKMinFinalCltvExpiry o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = false; + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); + o_conv.is_owned = false; int64_t ret_conv = MinFinalCltvExpiry_hash(&o_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_MinFinalCltvExpiry_eq"))) TS_MinFinalCltvExpiry_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_MinFinalCltvExpiry_eq"))) TS_MinFinalCltvExpiry_eq(uint64_t a, uint64_t b) { LDKMinFinalCltvExpiry a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKMinFinalCltvExpiry b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = MinFinalCltvExpiry_eq(&a_conv, &b_conv); return ret_conv; } -void __attribute__((export_name("TS_Fallback_free"))) TS_Fallback_free(uint32_t this_ptr) { - if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_Fallback_free"))) TS_Fallback_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKFallback this_ptr_conv = *(LDKFallback*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); Fallback_free(this_ptr_conv); } -static inline uintptr_t Fallback_clone_ptr(LDKFallback *NONNULL_PTR arg) { +static inline uint64_t Fallback_clone_ptr(LDKFallback *NONNULL_PTR arg) { LDKFallback *ret_copy = MALLOC(sizeof(LDKFallback), "LDKFallback"); *ret_copy = Fallback_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Fallback_clone_ptr"))) TS_Fallback_clone_ptr(uint32_t arg) { - LDKFallback* arg_conv = (LDKFallback*)arg; - uint32_t ret_conv = Fallback_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_Fallback_clone_ptr"))) TS_Fallback_clone_ptr(uint64_t arg) { + LDKFallback* arg_conv = (LDKFallback*)untag_ptr(arg); + int64_t ret_conv = Fallback_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_Fallback_clone"))) TS_Fallback_clone(uint32_t orig) { - LDKFallback* orig_conv = (LDKFallback*)orig; +uint64_t __attribute__((export_name("TS_Fallback_clone"))) TS_Fallback_clone(uint64_t orig) { + LDKFallback* orig_conv = (LDKFallback*)untag_ptr(orig); LDKFallback *ret_copy = MALLOC(sizeof(LDKFallback), "LDKFallback"); *ret_copy = Fallback_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Fallback_seg_wit_program"))) TS_Fallback_seg_wit_program(int8_t version, int8_tArray program) { +uint64_t __attribute__((export_name("TS_Fallback_seg_wit_program"))) TS_Fallback_seg_wit_program(int8_t version, int8_tArray program) { LDKCVec_u8Z program_ref; program_ref.datalen = program->arr_len; @@ -44566,416 +42646,356 @@ uint32_t __attribute__((export_name("TS_Fallback_seg_wit_program"))) TS_Fallbac memcpy(program_ref.data, program->elems, program_ref.datalen); FREE(program); LDKFallback *ret_copy = MALLOC(sizeof(LDKFallback), "LDKFallback"); *ret_copy = Fallback_seg_wit_program((LDKu5){ ._0 = version }, program_ref); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Fallback_pub_key_hash"))) TS_Fallback_pub_key_hash(int8_tArray a) { +uint64_t __attribute__((export_name("TS_Fallback_pub_key_hash"))) TS_Fallback_pub_key_hash(int8_tArray a) { LDKTwentyBytes a_ref; CHECK(a->arr_len == 20); memcpy(a_ref.data, a->elems, 20); FREE(a); LDKFallback *ret_copy = MALLOC(sizeof(LDKFallback), "LDKFallback"); *ret_copy = Fallback_pub_key_hash(a_ref); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Fallback_script_hash"))) TS_Fallback_script_hash(int8_tArray a) { +uint64_t __attribute__((export_name("TS_Fallback_script_hash"))) TS_Fallback_script_hash(int8_tArray a) { LDKTwentyBytes a_ref; CHECK(a->arr_len == 20); memcpy(a_ref.data, a->elems, 20); FREE(a); LDKFallback *ret_copy = MALLOC(sizeof(LDKFallback), "LDKFallback"); *ret_copy = Fallback_script_hash(a_ref); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -int64_t __attribute__((export_name("TS_Fallback_hash"))) TS_Fallback_hash(uint32_t o) { - LDKFallback* o_conv = (LDKFallback*)o; +int64_t __attribute__((export_name("TS_Fallback_hash"))) TS_Fallback_hash(uint64_t o) { + LDKFallback* o_conv = (LDKFallback*)untag_ptr(o); int64_t ret_conv = Fallback_hash(o_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_Fallback_eq"))) TS_Fallback_eq(uint32_t a, uint32_t b) { - LDKFallback* a_conv = (LDKFallback*)a; - LDKFallback* b_conv = (LDKFallback*)b; +jboolean __attribute__((export_name("TS_Fallback_eq"))) TS_Fallback_eq(uint64_t a, uint64_t b) { + LDKFallback* a_conv = (LDKFallback*)untag_ptr(a); + LDKFallback* b_conv = (LDKFallback*)untag_ptr(b); jboolean ret_conv = Fallback_eq(a_conv, b_conv); return ret_conv; } -void __attribute__((export_name("TS_InvoiceSignature_free"))) TS_InvoiceSignature_free(uint32_t this_obj) { +void __attribute__((export_name("TS_InvoiceSignature_free"))) TS_InvoiceSignature_free(uint64_t this_obj) { LDKInvoiceSignature this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); InvoiceSignature_free(this_obj_conv); } -static inline uintptr_t InvoiceSignature_clone_ptr(LDKInvoiceSignature *NONNULL_PTR arg) { +static inline uint64_t InvoiceSignature_clone_ptr(LDKInvoiceSignature *NONNULL_PTR arg) { LDKInvoiceSignature ret_var = InvoiceSignature_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_InvoiceSignature_clone_ptr"))) TS_InvoiceSignature_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_InvoiceSignature_clone_ptr"))) TS_InvoiceSignature_clone_ptr(uint64_t arg) { LDKInvoiceSignature arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = InvoiceSignature_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = InvoiceSignature_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_InvoiceSignature_clone"))) TS_InvoiceSignature_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_InvoiceSignature_clone"))) TS_InvoiceSignature_clone(uint64_t orig) { LDKInvoiceSignature orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKInvoiceSignature ret_var = InvoiceSignature_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -jboolean __attribute__((export_name("TS_InvoiceSignature_eq"))) TS_InvoiceSignature_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_InvoiceSignature_eq"))) TS_InvoiceSignature_eq(uint64_t a, uint64_t b) { LDKInvoiceSignature a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKInvoiceSignature b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = InvoiceSignature_eq(&a_conv, &b_conv); return ret_conv; } -void __attribute__((export_name("TS_PrivateRoute_free"))) TS_PrivateRoute_free(uint32_t this_obj) { +void __attribute__((export_name("TS_PrivateRoute_free"))) TS_PrivateRoute_free(uint64_t this_obj) { LDKPrivateRoute this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); PrivateRoute_free(this_obj_conv); } -static inline uintptr_t PrivateRoute_clone_ptr(LDKPrivateRoute *NONNULL_PTR arg) { +static inline uint64_t PrivateRoute_clone_ptr(LDKPrivateRoute *NONNULL_PTR arg) { LDKPrivateRoute ret_var = PrivateRoute_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_PrivateRoute_clone_ptr"))) TS_PrivateRoute_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_PrivateRoute_clone_ptr"))) TS_PrivateRoute_clone_ptr(uint64_t arg) { LDKPrivateRoute arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = PrivateRoute_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = PrivateRoute_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_PrivateRoute_clone"))) TS_PrivateRoute_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_PrivateRoute_clone"))) TS_PrivateRoute_clone(uint64_t orig) { LDKPrivateRoute orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKPrivateRoute ret_var = PrivateRoute_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int64_t __attribute__((export_name("TS_PrivateRoute_hash"))) TS_PrivateRoute_hash(uint32_t o) { +int64_t __attribute__((export_name("TS_PrivateRoute_hash"))) TS_PrivateRoute_hash(uint64_t o) { LDKPrivateRoute o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = false; + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); + o_conv.is_owned = false; int64_t ret_conv = PrivateRoute_hash(&o_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_PrivateRoute_eq"))) TS_PrivateRoute_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_PrivateRoute_eq"))) TS_PrivateRoute_eq(uint64_t a, uint64_t b) { LDKPrivateRoute a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKPrivateRoute b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = PrivateRoute_eq(&a_conv, &b_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_SignedRawInvoice_into_parts"))) TS_SignedRawInvoice_into_parts(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_SignedRawInvoice_into_parts"))) TS_SignedRawInvoice_into_parts(uint64_t this_arg) { LDKSignedRawInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0); + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); this_arg_conv = SignedRawInvoice_clone(&this_arg_conv); LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* ret_conv = MALLOC(sizeof(LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ), "LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ"); *ret_conv = SignedRawInvoice_into_parts(this_arg_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_SignedRawInvoice_raw_invoice"))) TS_SignedRawInvoice_raw_invoice(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_SignedRawInvoice_raw_invoice"))) TS_SignedRawInvoice_raw_invoice(uint64_t this_arg) { LDKSignedRawInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKRawInvoice ret_var = SignedRawInvoice_raw_invoice(&this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_SignedRawInvoice_hash"))) TS_SignedRawInvoice_hash(uint32_t this_arg) { +int8_tArray __attribute__((export_name("TS_SignedRawInvoice_hash"))) TS_SignedRawInvoice_hash(uint64_t this_arg) { LDKSignedRawInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *SignedRawInvoice_hash(&this_arg_conv), 32); return ret_arr; } -uint32_t __attribute__((export_name("TS_SignedRawInvoice_signature"))) TS_SignedRawInvoice_signature(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_SignedRawInvoice_signature"))) TS_SignedRawInvoice_signature(uint64_t this_arg) { LDKSignedRawInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKInvoiceSignature ret_var = SignedRawInvoice_signature(&this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_SignedRawInvoice_recover_payee_pub_key"))) TS_SignedRawInvoice_recover_payee_pub_key(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_SignedRawInvoice_recover_payee_pub_key"))) TS_SignedRawInvoice_recover_payee_pub_key(uint64_t this_arg) { LDKSignedRawInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCResult_PayeePubKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PayeePubKeyErrorZ), "LDKCResult_PayeePubKeyErrorZ"); *ret_conv = SignedRawInvoice_recover_payee_pub_key(&this_arg_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_SignedRawInvoice_check_signature"))) TS_SignedRawInvoice_check_signature(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_SignedRawInvoice_check_signature"))) TS_SignedRawInvoice_check_signature(uint64_t this_arg) { LDKSignedRawInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = SignedRawInvoice_check_signature(&this_arg_conv); return ret_conv; } -int8_tArray __attribute__((export_name("TS_RawInvoice_hash"))) TS_RawInvoice_hash(uint32_t this_arg) { +int8_tArray __attribute__((export_name("TS_RawInvoice_hash"))) TS_RawInvoice_hash(uint64_t this_arg) { LDKRawInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, RawInvoice_hash(&this_arg_conv).data, 32); return ret_arr; } -uint32_t __attribute__((export_name("TS_RawInvoice_payment_hash"))) TS_RawInvoice_payment_hash(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_RawInvoice_payment_hash"))) TS_RawInvoice_payment_hash(uint64_t this_arg) { LDKRawInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKSha256 ret_var = RawInvoice_payment_hash(&this_arg_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_RawInvoice_description"))) TS_RawInvoice_description(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_RawInvoice_description"))) TS_RawInvoice_description(uint64_t this_arg) { LDKRawInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKDescription ret_var = RawInvoice_description(&this_arg_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_RawInvoice_payee_pub_key"))) TS_RawInvoice_payee_pub_key(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_RawInvoice_payee_pub_key"))) TS_RawInvoice_payee_pub_key(uint64_t this_arg) { LDKRawInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKPayeePubKey ret_var = RawInvoice_payee_pub_key(&this_arg_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_RawInvoice_description_hash"))) TS_RawInvoice_description_hash(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_RawInvoice_description_hash"))) TS_RawInvoice_description_hash(uint64_t this_arg) { LDKRawInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKSha256 ret_var = RawInvoice_description_hash(&this_arg_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_RawInvoice_expiry_time"))) TS_RawInvoice_expiry_time(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_RawInvoice_expiry_time"))) TS_RawInvoice_expiry_time(uint64_t this_arg) { LDKRawInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKExpiryTime ret_var = RawInvoice_expiry_time(&this_arg_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_RawInvoice_min_final_cltv_expiry"))) TS_RawInvoice_min_final_cltv_expiry(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_RawInvoice_min_final_cltv_expiry"))) TS_RawInvoice_min_final_cltv_expiry(uint64_t this_arg) { LDKRawInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKMinFinalCltvExpiry ret_var = RawInvoice_min_final_cltv_expiry(&this_arg_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_RawInvoice_payment_secret"))) TS_RawInvoice_payment_secret(uint32_t this_arg) { +int8_tArray __attribute__((export_name("TS_RawInvoice_payment_secret"))) TS_RawInvoice_payment_secret(uint64_t this_arg) { LDKRawInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, RawInvoice_payment_secret(&this_arg_conv).data, 32); return ret_arr; } -uint32_t __attribute__((export_name("TS_RawInvoice_features"))) TS_RawInvoice_features(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_RawInvoice_features"))) TS_RawInvoice_features(uint64_t this_arg) { LDKRawInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKInvoiceFeatures ret_var = RawInvoice_features(&this_arg_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_tArray __attribute__((export_name("TS_RawInvoice_private_routes"))) TS_RawInvoice_private_routes(uint32_t this_arg) { +uint64_tArray __attribute__((export_name("TS_RawInvoice_private_routes"))) TS_RawInvoice_private_routes(uint64_t this_arg) { LDKRawInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCVec_PrivateRouteZ ret_var = RawInvoice_private_routes(&this_arg_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t o = 0; o < ret_var.datalen; o++) { LDKPrivateRoute ret_conv_14_var = ret_var.data[o]; - uint32_t ret_conv_14_ref = 0; - 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. + uint64_t ret_conv_14_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_14_var); - ret_conv_14_ref = (uintptr_t)ret_conv_14_var.inner; - if (ret_conv_14_var.is_owned) { - ret_conv_14_ref |= 1; - } + ret_conv_14_ref = tag_ptr(ret_conv_14_var.inner, ret_conv_14_var.is_owned); ret_arr_ptr[o] = ret_conv_14_ref; } @@ -44983,209 +43003,207 @@ uint32_tArray __attribute__((export_name("TS_RawInvoice_private_routes"))) TS_R return ret_arr; } -uint32_t __attribute__((export_name("TS_RawInvoice_amount_pico_btc"))) TS_RawInvoice_amount_pico_btc(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_RawInvoice_amount_pico_btc"))) TS_RawInvoice_amount_pico_btc(uint64_t this_arg) { LDKRawInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = RawInvoice_amount_pico_btc(&this_arg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_RawInvoice_currency"))) TS_RawInvoice_currency(uint32_t this_arg) { +uint32_t __attribute__((export_name("TS_RawInvoice_currency"))) TS_RawInvoice_currency(uint64_t this_arg) { LDKRawInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; uint32_t ret_conv = LDKCurrency_to_js(RawInvoice_currency(&this_arg_conv)); return ret_conv; } -uint32_t __attribute__((export_name("TS_PositiveTimestamp_from_unix_timestamp"))) TS_PositiveTimestamp_from_unix_timestamp(int64_t unix_seconds) { +uint64_t __attribute__((export_name("TS_PositiveTimestamp_from_unix_timestamp"))) TS_PositiveTimestamp_from_unix_timestamp(int64_t unix_seconds) { LDKCResult_PositiveTimestampCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PositiveTimestampCreationErrorZ), "LDKCResult_PositiveTimestampCreationErrorZ"); *ret_conv = PositiveTimestamp_from_unix_timestamp(unix_seconds); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_PositiveTimestamp_from_duration_since_epoch"))) TS_PositiveTimestamp_from_duration_since_epoch(int64_t duration) { +uint64_t __attribute__((export_name("TS_PositiveTimestamp_from_duration_since_epoch"))) TS_PositiveTimestamp_from_duration_since_epoch(int64_t duration) { LDKCResult_PositiveTimestampCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PositiveTimestampCreationErrorZ), "LDKCResult_PositiveTimestampCreationErrorZ"); *ret_conv = PositiveTimestamp_from_duration_since_epoch(duration); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int64_t __attribute__((export_name("TS_PositiveTimestamp_as_unix_timestamp"))) TS_PositiveTimestamp_as_unix_timestamp(uint32_t this_arg) { +int64_t __attribute__((export_name("TS_PositiveTimestamp_as_unix_timestamp"))) TS_PositiveTimestamp_as_unix_timestamp(uint64_t this_arg) { LDKPositiveTimestamp this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int64_t ret_conv = PositiveTimestamp_as_unix_timestamp(&this_arg_conv); return ret_conv; } -int64_t __attribute__((export_name("TS_PositiveTimestamp_as_duration_since_epoch"))) TS_PositiveTimestamp_as_duration_since_epoch(uint32_t this_arg) { +int64_t __attribute__((export_name("TS_PositiveTimestamp_as_duration_since_epoch"))) TS_PositiveTimestamp_as_duration_since_epoch(uint64_t this_arg) { LDKPositiveTimestamp this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int64_t ret_conv = PositiveTimestamp_as_duration_since_epoch(&this_arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_Invoice_into_signed_raw"))) TS_Invoice_into_signed_raw(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_Invoice_into_signed_raw"))) TS_Invoice_into_signed_raw(uint64_t this_arg) { LDKInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0); + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); this_arg_conv = Invoice_clone(&this_arg_conv); LDKSignedRawInvoice ret_var = Invoice_into_signed_raw(this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_Invoice_check_signature"))) TS_Invoice_check_signature(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_Invoice_check_signature"))) TS_Invoice_check_signature(uint64_t this_arg) { LDKInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCResult_NoneSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneSemanticErrorZ), "LDKCResult_NoneSemanticErrorZ"); *ret_conv = Invoice_check_signature(&this_arg_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_Invoice_from_signed"))) TS_Invoice_from_signed(uint32_t signed_invoice) { +uint64_t __attribute__((export_name("TS_Invoice_from_signed"))) TS_Invoice_from_signed(uint64_t signed_invoice) { LDKSignedRawInvoice signed_invoice_conv; - signed_invoice_conv.inner = (void*)(signed_invoice & (~1)); - signed_invoice_conv.is_owned = (signed_invoice & 1) || (signed_invoice == 0); + signed_invoice_conv.inner = untag_ptr(signed_invoice); + signed_invoice_conv.is_owned = ptr_is_owned(signed_invoice); CHECK_INNER_FIELD_ACCESS_OR_NULL(signed_invoice_conv); signed_invoice_conv = SignedRawInvoice_clone(&signed_invoice_conv); LDKCResult_InvoiceSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceSemanticErrorZ), "LDKCResult_InvoiceSemanticErrorZ"); *ret_conv = Invoice_from_signed(signed_invoice_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int64_t __attribute__((export_name("TS_Invoice_duration_since_epoch"))) TS_Invoice_duration_since_epoch(uint32_t this_arg) { +int64_t __attribute__((export_name("TS_Invoice_duration_since_epoch"))) TS_Invoice_duration_since_epoch(uint64_t this_arg) { LDKInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int64_t ret_conv = Invoice_duration_since_epoch(&this_arg_conv); return ret_conv; } -int8_tArray __attribute__((export_name("TS_Invoice_payment_hash"))) TS_Invoice_payment_hash(uint32_t this_arg) { +int8_tArray __attribute__((export_name("TS_Invoice_payment_hash"))) TS_Invoice_payment_hash(uint64_t this_arg) { LDKInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *Invoice_payment_hash(&this_arg_conv), 32); return ret_arr; } -int8_tArray __attribute__((export_name("TS_Invoice_payee_pub_key"))) TS_Invoice_payee_pub_key(uint32_t this_arg) { +int8_tArray __attribute__((export_name("TS_Invoice_payee_pub_key"))) TS_Invoice_payee_pub_key(uint64_t this_arg) { LDKInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, Invoice_payee_pub_key(&this_arg_conv).compressed_form, 33); return ret_arr; } -int8_tArray __attribute__((export_name("TS_Invoice_payment_secret"))) TS_Invoice_payment_secret(uint32_t this_arg) { +int8_tArray __attribute__((export_name("TS_Invoice_payment_secret"))) TS_Invoice_payment_secret(uint64_t this_arg) { LDKInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *Invoice_payment_secret(&this_arg_conv), 32); return ret_arr; } -uint32_t __attribute__((export_name("TS_Invoice_features"))) TS_Invoice_features(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_Invoice_features"))) TS_Invoice_features(uint64_t this_arg) { LDKInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKInvoiceFeatures ret_var = Invoice_features(&this_arg_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_Invoice_recover_payee_pub_key"))) TS_Invoice_recover_payee_pub_key(uint32_t this_arg) { +int8_tArray __attribute__((export_name("TS_Invoice_recover_payee_pub_key"))) TS_Invoice_recover_payee_pub_key(uint64_t this_arg) { LDKInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, Invoice_recover_payee_pub_key(&this_arg_conv).compressed_form, 33); return ret_arr; } -int64_t __attribute__((export_name("TS_Invoice_expiry_time"))) TS_Invoice_expiry_time(uint32_t this_arg) { +int64_t __attribute__((export_name("TS_Invoice_expiry_time"))) TS_Invoice_expiry_time(uint64_t this_arg) { LDKInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int64_t ret_conv = Invoice_expiry_time(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_Invoice_would_expire"))) TS_Invoice_would_expire(uint32_t this_arg, int64_t at_time) { +jboolean __attribute__((export_name("TS_Invoice_would_expire"))) TS_Invoice_would_expire(uint64_t this_arg, int64_t at_time) { LDKInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = Invoice_would_expire(&this_arg_conv, at_time); return ret_conv; } -int64_t __attribute__((export_name("TS_Invoice_min_final_cltv_expiry"))) TS_Invoice_min_final_cltv_expiry(uint32_t this_arg) { +int64_t __attribute__((export_name("TS_Invoice_min_final_cltv_expiry"))) TS_Invoice_min_final_cltv_expiry(uint64_t this_arg) { LDKInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int64_t ret_conv = Invoice_min_final_cltv_expiry(&this_arg_conv); return ret_conv; } -uint32_tArray __attribute__((export_name("TS_Invoice_private_routes"))) TS_Invoice_private_routes(uint32_t this_arg) { +uint64_tArray __attribute__((export_name("TS_Invoice_private_routes"))) TS_Invoice_private_routes(uint64_t this_arg) { LDKInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCVec_PrivateRouteZ ret_var = Invoice_private_routes(&this_arg_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t o = 0; o < ret_var.datalen; o++) { LDKPrivateRoute ret_conv_14_var = ret_var.data[o]; - uint32_t ret_conv_14_ref = 0; - 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. + uint64_t ret_conv_14_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_14_var); - ret_conv_14_ref = (uintptr_t)ret_conv_14_var.inner; - if (ret_conv_14_var.is_owned) { - ret_conv_14_ref |= 1; - } + ret_conv_14_ref = tag_ptr(ret_conv_14_var.inner, ret_conv_14_var.is_owned); ret_arr_ptr[o] = ret_conv_14_ref; } @@ -45193,25 +43211,21 @@ uint32_tArray __attribute__((export_name("TS_Invoice_private_routes"))) TS_Invo return ret_arr; } -uint32_tArray __attribute__((export_name("TS_Invoice_route_hints"))) TS_Invoice_route_hints(uint32_t this_arg) { +uint64_tArray __attribute__((export_name("TS_Invoice_route_hints"))) TS_Invoice_route_hints(uint64_t this_arg) { LDKInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCVec_RouteHintZ ret_var = Invoice_route_hints(&this_arg_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t l = 0; l < ret_var.datalen; l++) { LDKRouteHint ret_conv_11_var = ret_var.data[l]; - uint32_t ret_conv_11_ref = 0; - 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. + uint64_t ret_conv_11_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_11_var); - ret_conv_11_ref = (uintptr_t)ret_conv_11_var.inner; - if (ret_conv_11_var.is_owned) { - ret_conv_11_ref |= 1; - } + ret_conv_11_ref = tag_ptr(ret_conv_11_var.inner, ret_conv_11_var.is_owned); ret_arr_ptr[l] = ret_conv_11_ref; } @@ -45219,37 +43233,39 @@ uint32_tArray __attribute__((export_name("TS_Invoice_route_hints"))) TS_Invoice return ret_arr; } -uint32_t __attribute__((export_name("TS_Invoice_currency"))) TS_Invoice_currency(uint32_t this_arg) { +uint32_t __attribute__((export_name("TS_Invoice_currency"))) TS_Invoice_currency(uint64_t this_arg) { LDKInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; uint32_t ret_conv = LDKCurrency_to_js(Invoice_currency(&this_arg_conv)); return ret_conv; } -uint32_t __attribute__((export_name("TS_Invoice_amount_milli_satoshis"))) TS_Invoice_amount_milli_satoshis(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_Invoice_amount_milli_satoshis"))) TS_Invoice_amount_milli_satoshis(uint64_t this_arg) { LDKInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = Invoice_amount_milli_satoshis(&this_arg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Description_new"))) TS_Description_new(jstring description) { +uint64_t __attribute__((export_name("TS_Description_new"))) TS_Description_new(jstring description) { LDKStr description_conv = str_ref_to_owned_c(description); LDKCResult_DescriptionCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DescriptionCreationErrorZ), "LDKCResult_DescriptionCreationErrorZ"); *ret_conv = Description_new(description_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jstring __attribute__((export_name("TS_Description_into_inner"))) TS_Description_into_inner(uint32_t this_arg) { +jstring __attribute__((export_name("TS_Description_into_inner"))) TS_Description_into_inner(uint64_t this_arg) { LDKDescription this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0); + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); this_arg_conv = Description_clone(&this_arg_conv); LDKStr ret_str = Description_into_inner(this_arg_conv); @@ -45258,81 +43274,68 @@ jstring __attribute__((export_name("TS_Description_into_inner"))) TS_Descriptio return ret_conv; } -uint32_t __attribute__((export_name("TS_ExpiryTime_from_seconds"))) TS_ExpiryTime_from_seconds(int64_t seconds) { +uint64_t __attribute__((export_name("TS_ExpiryTime_from_seconds"))) TS_ExpiryTime_from_seconds(int64_t seconds) { LDKExpiryTime ret_var = ExpiryTime_from_seconds(seconds); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ExpiryTime_from_duration"))) TS_ExpiryTime_from_duration(int64_t duration) { +uint64_t __attribute__((export_name("TS_ExpiryTime_from_duration"))) TS_ExpiryTime_from_duration(int64_t duration) { LDKExpiryTime ret_var = ExpiryTime_from_duration(duration); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int64_t __attribute__((export_name("TS_ExpiryTime_as_seconds"))) TS_ExpiryTime_as_seconds(uint32_t this_arg) { +int64_t __attribute__((export_name("TS_ExpiryTime_as_seconds"))) TS_ExpiryTime_as_seconds(uint64_t this_arg) { LDKExpiryTime this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int64_t ret_conv = ExpiryTime_as_seconds(&this_arg_conv); return ret_conv; } -int64_t __attribute__((export_name("TS_ExpiryTime_as_duration"))) TS_ExpiryTime_as_duration(uint32_t this_arg) { +int64_t __attribute__((export_name("TS_ExpiryTime_as_duration"))) TS_ExpiryTime_as_duration(uint64_t this_arg) { LDKExpiryTime this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int64_t ret_conv = ExpiryTime_as_duration(&this_arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_PrivateRoute_new"))) TS_PrivateRoute_new(uint32_t hops) { +uint64_t __attribute__((export_name("TS_PrivateRoute_new"))) TS_PrivateRoute_new(uint64_t hops) { LDKRouteHint hops_conv; - hops_conv.inner = (void*)(hops & (~1)); - hops_conv.is_owned = (hops & 1) || (hops == 0); + hops_conv.inner = untag_ptr(hops); + hops_conv.is_owned = ptr_is_owned(hops); CHECK_INNER_FIELD_ACCESS_OR_NULL(hops_conv); hops_conv = RouteHint_clone(&hops_conv); LDKCResult_PrivateRouteCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PrivateRouteCreationErrorZ), "LDKCResult_PrivateRouteCreationErrorZ"); *ret_conv = PrivateRoute_new(hops_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_PrivateRoute_into_inner"))) TS_PrivateRoute_into_inner(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_PrivateRoute_into_inner"))) TS_PrivateRoute_into_inner(uint64_t this_arg) { LDKPrivateRoute this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0); + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); this_arg_conv = PrivateRoute_clone(&this_arg_conv); LDKRouteHint ret_var = PrivateRoute_into_inner(this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_CreationError_clone"))) TS_CreationError_clone(uint32_t orig) { - LDKCreationError* orig_conv = (LDKCreationError*)(orig & ~1); +uint32_t __attribute__((export_name("TS_CreationError_clone"))) TS_CreationError_clone(uint64_t orig) { + LDKCreationError* orig_conv = (LDKCreationError*)untag_ptr(orig); uint32_t ret_conv = LDKCreationError_to_js(CreationError_clone(orig_conv)); return ret_conv; } @@ -45362,23 +43365,23 @@ uint32_t __attribute__((export_name("TS_CreationError_missing_route_hints"))) T return ret_conv; } -jboolean __attribute__((export_name("TS_CreationError_eq"))) TS_CreationError_eq(uint32_t a, uint32_t b) { - LDKCreationError* a_conv = (LDKCreationError*)(a & ~1); - LDKCreationError* b_conv = (LDKCreationError*)(b & ~1); +jboolean __attribute__((export_name("TS_CreationError_eq"))) TS_CreationError_eq(uint64_t a, uint64_t b) { + LDKCreationError* a_conv = (LDKCreationError*)untag_ptr(a); + LDKCreationError* b_conv = (LDKCreationError*)untag_ptr(b); jboolean ret_conv = CreationError_eq(a_conv, b_conv); return ret_conv; } -jstring __attribute__((export_name("TS_CreationError_to_str"))) TS_CreationError_to_str(uint32_t o) { - LDKCreationError* o_conv = (LDKCreationError*)(o & ~1); +jstring __attribute__((export_name("TS_CreationError_to_str"))) TS_CreationError_to_str(uint64_t o) { + LDKCreationError* o_conv = (LDKCreationError*)untag_ptr(o); LDKStr ret_str = CreationError_to_str(o_conv); jstring ret_conv = str_ref_to_ts(ret_str.chars, ret_str.len); Str_free(ret_str); return ret_conv; } -uint32_t __attribute__((export_name("TS_SemanticError_clone"))) TS_SemanticError_clone(uint32_t orig) { - LDKSemanticError* orig_conv = (LDKSemanticError*)(orig & ~1); +uint32_t __attribute__((export_name("TS_SemanticError_clone"))) TS_SemanticError_clone(uint64_t orig) { + LDKSemanticError* orig_conv = (LDKSemanticError*)untag_ptr(orig); uint32_t ret_conv = LDKSemanticError_to_js(SemanticError_clone(orig_conv)); return ret_conv; } @@ -45433,224 +43436,224 @@ uint32_t __attribute__((export_name("TS_SemanticError_imprecise_amount"))) TS_S return ret_conv; } -jboolean __attribute__((export_name("TS_SemanticError_eq"))) TS_SemanticError_eq(uint32_t a, uint32_t b) { - LDKSemanticError* a_conv = (LDKSemanticError*)(a & ~1); - LDKSemanticError* b_conv = (LDKSemanticError*)(b & ~1); +jboolean __attribute__((export_name("TS_SemanticError_eq"))) TS_SemanticError_eq(uint64_t a, uint64_t b) { + LDKSemanticError* a_conv = (LDKSemanticError*)untag_ptr(a); + LDKSemanticError* b_conv = (LDKSemanticError*)untag_ptr(b); jboolean ret_conv = SemanticError_eq(a_conv, b_conv); return ret_conv; } -jstring __attribute__((export_name("TS_SemanticError_to_str"))) TS_SemanticError_to_str(uint32_t o) { - LDKSemanticError* o_conv = (LDKSemanticError*)(o & ~1); +jstring __attribute__((export_name("TS_SemanticError_to_str"))) TS_SemanticError_to_str(uint64_t o) { + LDKSemanticError* o_conv = (LDKSemanticError*)untag_ptr(o); LDKStr ret_str = SemanticError_to_str(o_conv); jstring ret_conv = str_ref_to_ts(ret_str.chars, ret_str.len); Str_free(ret_str); return ret_conv; } -void __attribute__((export_name("TS_SignOrCreationError_free"))) TS_SignOrCreationError_free(uint32_t this_ptr) { - if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_SignOrCreationError_free"))) TS_SignOrCreationError_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKSignOrCreationError this_ptr_conv = *(LDKSignOrCreationError*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); SignOrCreationError_free(this_ptr_conv); } -static inline uintptr_t SignOrCreationError_clone_ptr(LDKSignOrCreationError *NONNULL_PTR arg) { +static inline uint64_t SignOrCreationError_clone_ptr(LDKSignOrCreationError *NONNULL_PTR arg) { LDKSignOrCreationError *ret_copy = MALLOC(sizeof(LDKSignOrCreationError), "LDKSignOrCreationError"); *ret_copy = SignOrCreationError_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_SignOrCreationError_clone_ptr"))) TS_SignOrCreationError_clone_ptr(uint32_t arg) { - LDKSignOrCreationError* arg_conv = (LDKSignOrCreationError*)arg; - uint32_t ret_conv = SignOrCreationError_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_SignOrCreationError_clone_ptr"))) TS_SignOrCreationError_clone_ptr(uint64_t arg) { + LDKSignOrCreationError* arg_conv = (LDKSignOrCreationError*)untag_ptr(arg); + int64_t ret_conv = SignOrCreationError_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_SignOrCreationError_clone"))) TS_SignOrCreationError_clone(uint32_t orig) { - LDKSignOrCreationError* orig_conv = (LDKSignOrCreationError*)orig; +uint64_t __attribute__((export_name("TS_SignOrCreationError_clone"))) TS_SignOrCreationError_clone(uint64_t orig) { + LDKSignOrCreationError* orig_conv = (LDKSignOrCreationError*)untag_ptr(orig); LDKSignOrCreationError *ret_copy = MALLOC(sizeof(LDKSignOrCreationError), "LDKSignOrCreationError"); *ret_copy = SignOrCreationError_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_SignOrCreationError_sign_error"))) TS_SignOrCreationError_sign_error() { +uint64_t __attribute__((export_name("TS_SignOrCreationError_sign_error"))) TS_SignOrCreationError_sign_error() { LDKSignOrCreationError *ret_copy = MALLOC(sizeof(LDKSignOrCreationError), "LDKSignOrCreationError"); *ret_copy = SignOrCreationError_sign_error(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_SignOrCreationError_creation_error"))) TS_SignOrCreationError_creation_error(uint32_t a) { +uint64_t __attribute__((export_name("TS_SignOrCreationError_creation_error"))) TS_SignOrCreationError_creation_error(uint32_t a) { LDKCreationError a_conv = LDKCreationError_from_js(a); LDKSignOrCreationError *ret_copy = MALLOC(sizeof(LDKSignOrCreationError), "LDKSignOrCreationError"); *ret_copy = SignOrCreationError_creation_error(a_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -jboolean __attribute__((export_name("TS_SignOrCreationError_eq"))) TS_SignOrCreationError_eq(uint32_t a, uint32_t b) { - LDKSignOrCreationError* a_conv = (LDKSignOrCreationError*)a; - LDKSignOrCreationError* b_conv = (LDKSignOrCreationError*)b; +jboolean __attribute__((export_name("TS_SignOrCreationError_eq"))) TS_SignOrCreationError_eq(uint64_t a, uint64_t b) { + LDKSignOrCreationError* a_conv = (LDKSignOrCreationError*)untag_ptr(a); + LDKSignOrCreationError* b_conv = (LDKSignOrCreationError*)untag_ptr(b); jboolean ret_conv = SignOrCreationError_eq(a_conv, b_conv); return ret_conv; } -jstring __attribute__((export_name("TS_SignOrCreationError_to_str"))) TS_SignOrCreationError_to_str(uint32_t o) { - LDKSignOrCreationError* o_conv = (LDKSignOrCreationError*)o; +jstring __attribute__((export_name("TS_SignOrCreationError_to_str"))) TS_SignOrCreationError_to_str(uint64_t o) { + LDKSignOrCreationError* o_conv = (LDKSignOrCreationError*)untag_ptr(o); LDKStr ret_str = SignOrCreationError_to_str(o_conv); jstring ret_conv = str_ref_to_ts(ret_str.chars, ret_str.len); Str_free(ret_str); return ret_conv; } -void __attribute__((export_name("TS_InvoicePayer_free"))) TS_InvoicePayer_free(uint32_t this_obj) { +void __attribute__((export_name("TS_InvoicePayer_free"))) TS_InvoicePayer_free(uint64_t this_obj) { LDKInvoicePayer this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); InvoicePayer_free(this_obj_conv); } -void __attribute__((export_name("TS_Payer_free"))) TS_Payer_free(uint32_t this_ptr) { - if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_Payer_free"))) TS_Payer_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKPayer this_ptr_conv = *(LDKPayer*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); Payer_free(this_ptr_conv); } -void __attribute__((export_name("TS_Router_free"))) TS_Router_free(uint32_t this_ptr) { - if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_Router_free"))) TS_Router_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKRouter this_ptr_conv = *(LDKRouter*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); Router_free(this_ptr_conv); } -void __attribute__((export_name("TS_Retry_free"))) TS_Retry_free(uint32_t this_ptr) { - if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_Retry_free"))) TS_Retry_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKRetry this_ptr_conv = *(LDKRetry*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); Retry_free(this_ptr_conv); } -static inline uintptr_t Retry_clone_ptr(LDKRetry *NONNULL_PTR arg) { +static inline uint64_t Retry_clone_ptr(LDKRetry *NONNULL_PTR arg) { LDKRetry *ret_copy = MALLOC(sizeof(LDKRetry), "LDKRetry"); *ret_copy = Retry_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Retry_clone_ptr"))) TS_Retry_clone_ptr(uint32_t arg) { - LDKRetry* arg_conv = (LDKRetry*)arg; - uint32_t ret_conv = Retry_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_Retry_clone_ptr"))) TS_Retry_clone_ptr(uint64_t arg) { + LDKRetry* arg_conv = (LDKRetry*)untag_ptr(arg); + int64_t ret_conv = Retry_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_Retry_clone"))) TS_Retry_clone(uint32_t orig) { - LDKRetry* orig_conv = (LDKRetry*)orig; +uint64_t __attribute__((export_name("TS_Retry_clone"))) TS_Retry_clone(uint64_t orig) { + LDKRetry* orig_conv = (LDKRetry*)untag_ptr(orig); LDKRetry *ret_copy = MALLOC(sizeof(LDKRetry), "LDKRetry"); *ret_copy = Retry_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Retry_attempts"))) TS_Retry_attempts(uint32_t a) { +uint64_t __attribute__((export_name("TS_Retry_attempts"))) TS_Retry_attempts(uint32_t a) { LDKRetry *ret_copy = MALLOC(sizeof(LDKRetry), "LDKRetry"); *ret_copy = Retry_attempts(a); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -jboolean __attribute__((export_name("TS_Retry_eq"))) TS_Retry_eq(uint32_t a, uint32_t b) { - LDKRetry* a_conv = (LDKRetry*)a; - LDKRetry* b_conv = (LDKRetry*)b; +jboolean __attribute__((export_name("TS_Retry_eq"))) TS_Retry_eq(uint64_t a, uint64_t b) { + LDKRetry* a_conv = (LDKRetry*)untag_ptr(a); + LDKRetry* b_conv = (LDKRetry*)untag_ptr(b); jboolean ret_conv = Retry_eq(a_conv, b_conv); return ret_conv; } -int64_t __attribute__((export_name("TS_Retry_hash"))) TS_Retry_hash(uint32_t o) { - LDKRetry* o_conv = (LDKRetry*)o; +int64_t __attribute__((export_name("TS_Retry_hash"))) TS_Retry_hash(uint64_t o) { + LDKRetry* o_conv = (LDKRetry*)untag_ptr(o); int64_t ret_conv = Retry_hash(o_conv); return ret_conv; } -void __attribute__((export_name("TS_PaymentError_free"))) TS_PaymentError_free(uint32_t this_ptr) { - if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_PaymentError_free"))) TS_PaymentError_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKPaymentError this_ptr_conv = *(LDKPaymentError*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); PaymentError_free(this_ptr_conv); } -static inline uintptr_t PaymentError_clone_ptr(LDKPaymentError *NONNULL_PTR arg) { +static inline uint64_t PaymentError_clone_ptr(LDKPaymentError *NONNULL_PTR arg) { LDKPaymentError *ret_copy = MALLOC(sizeof(LDKPaymentError), "LDKPaymentError"); *ret_copy = PaymentError_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_PaymentError_clone_ptr"))) TS_PaymentError_clone_ptr(uint32_t arg) { - LDKPaymentError* arg_conv = (LDKPaymentError*)arg; - uint32_t ret_conv = PaymentError_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_PaymentError_clone_ptr"))) TS_PaymentError_clone_ptr(uint64_t arg) { + LDKPaymentError* arg_conv = (LDKPaymentError*)untag_ptr(arg); + int64_t ret_conv = PaymentError_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_PaymentError_clone"))) TS_PaymentError_clone(uint32_t orig) { - LDKPaymentError* orig_conv = (LDKPaymentError*)orig; +uint64_t __attribute__((export_name("TS_PaymentError_clone"))) TS_PaymentError_clone(uint64_t orig) { + LDKPaymentError* orig_conv = (LDKPaymentError*)untag_ptr(orig); LDKPaymentError *ret_copy = MALLOC(sizeof(LDKPaymentError), "LDKPaymentError"); *ret_copy = PaymentError_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_PaymentError_invoice"))) TS_PaymentError_invoice(jstring a) { +uint64_t __attribute__((export_name("TS_PaymentError_invoice"))) TS_PaymentError_invoice(jstring a) { LDKStr a_conv = str_ref_to_owned_c(a); LDKPaymentError *ret_copy = MALLOC(sizeof(LDKPaymentError), "LDKPaymentError"); *ret_copy = PaymentError_invoice(a_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_PaymentError_routing"))) TS_PaymentError_routing(uint32_t a) { +uint64_t __attribute__((export_name("TS_PaymentError_routing"))) TS_PaymentError_routing(uint64_t a) { LDKLightningError a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = (a & 1) || (a == 0); + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); a_conv = LightningError_clone(&a_conv); LDKPaymentError *ret_copy = MALLOC(sizeof(LDKPaymentError), "LDKPaymentError"); *ret_copy = PaymentError_routing(a_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_PaymentError_sending"))) TS_PaymentError_sending(uint32_t a) { - void* a_ptr = (void*)(((uintptr_t)a) & ~1); +uint64_t __attribute__((export_name("TS_PaymentError_sending"))) TS_PaymentError_sending(uint64_t a) { + void* a_ptr = untag_ptr(a); CHECK_ACCESS(a_ptr); LDKPaymentSendFailure a_conv = *(LDKPaymentSendFailure*)(a_ptr); - a_conv = PaymentSendFailure_clone((LDKPaymentSendFailure*)(((uintptr_t)a) & ~1)); + a_conv = PaymentSendFailure_clone((LDKPaymentSendFailure*)untag_ptr(a)); LDKPaymentError *ret_copy = MALLOC(sizeof(LDKPaymentError), "LDKPaymentError"); *ret_copy = PaymentError_sending(a_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_InvoicePayer_new"))) TS_InvoicePayer_new(uint32_t payer, uint32_t router, uint32_t scorer, uint32_t logger, uint32_t event_handler, uint32_t retry) { - void* payer_ptr = (void*)(((uintptr_t)payer) & ~1); +uint64_t __attribute__((export_name("TS_InvoicePayer_new"))) TS_InvoicePayer_new(uint64_t payer, uint64_t router, uint64_t scorer, uint64_t logger, uint64_t event_handler, uint64_t retry) { + void* payer_ptr = untag_ptr(payer); CHECK_ACCESS(payer_ptr); LDKPayer payer_conv = *(LDKPayer*)(payer_ptr); if (payer_conv.free == LDKPayer_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKPayer_JCalls_cloned(&payer_conv); } - void* router_ptr = (void*)(((uintptr_t)router) & ~1); + void* router_ptr = untag_ptr(router); CHECK_ACCESS(router_ptr); LDKRouter router_conv = *(LDKRouter*)(router_ptr); if (router_conv.free == LDKRouter_JCalls_free) { @@ -45658,72 +43661,73 @@ uint32_t __attribute__((export_name("TS_InvoicePayer_new"))) TS_InvoicePayer_ne LDKRouter_JCalls_cloned(&router_conv); } LDKMultiThreadedLockableScore scorer_conv; - scorer_conv.inner = (void*)(scorer & (~1)); - scorer_conv.is_owned = false; + scorer_conv.inner = untag_ptr(scorer); + scorer_conv.is_owned = ptr_is_owned(scorer); CHECK_INNER_FIELD_ACCESS_OR_NULL(scorer_conv); - void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); + scorer_conv.is_owned = false; + void* logger_ptr = untag_ptr(logger); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); if (logger_conv.free == LDKLogger_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKLogger_JCalls_cloned(&logger_conv); } - void* event_handler_ptr = (void*)(((uintptr_t)event_handler) & ~1); + void* event_handler_ptr = untag_ptr(event_handler); CHECK_ACCESS(event_handler_ptr); LDKEventHandler event_handler_conv = *(LDKEventHandler*)(event_handler_ptr); if (event_handler_conv.free == LDKEventHandler_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKEventHandler_JCalls_cloned(&event_handler_conv); } - void* retry_ptr = (void*)(((uintptr_t)retry) & ~1); + void* retry_ptr = untag_ptr(retry); CHECK_ACCESS(retry_ptr); LDKRetry retry_conv = *(LDKRetry*)(retry_ptr); - retry_conv = Retry_clone((LDKRetry*)(((uintptr_t)retry) & ~1)); + retry_conv = Retry_clone((LDKRetry*)untag_ptr(retry)); LDKInvoicePayer ret_var = InvoicePayer_new(payer_conv, router_conv, &scorer_conv, logger_conv, event_handler_conv, retry_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_InvoicePayer_pay_invoice"))) TS_InvoicePayer_pay_invoice(uint32_t this_arg, uint32_t invoice) { +uint64_t __attribute__((export_name("TS_InvoicePayer_pay_invoice"))) TS_InvoicePayer_pay_invoice(uint64_t this_arg, uint64_t invoice) { LDKInvoicePayer this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKInvoice invoice_conv; - invoice_conv.inner = (void*)(invoice & (~1)); - invoice_conv.is_owned = false; + invoice_conv.inner = untag_ptr(invoice); + invoice_conv.is_owned = ptr_is_owned(invoice); CHECK_INNER_FIELD_ACCESS_OR_NULL(invoice_conv); + invoice_conv.is_owned = false; LDKCResult_PaymentIdPaymentErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentErrorZ), "LDKCResult_PaymentIdPaymentErrorZ"); *ret_conv = InvoicePayer_pay_invoice(&this_arg_conv, &invoice_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_InvoicePayer_pay_zero_value_invoice"))) TS_InvoicePayer_pay_zero_value_invoice(uint32_t this_arg, uint32_t invoice, int64_t amount_msats) { +uint64_t __attribute__((export_name("TS_InvoicePayer_pay_zero_value_invoice"))) TS_InvoicePayer_pay_zero_value_invoice(uint64_t this_arg, uint64_t invoice, int64_t amount_msats) { LDKInvoicePayer this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKInvoice invoice_conv; - invoice_conv.inner = (void*)(invoice & (~1)); - invoice_conv.is_owned = false; + invoice_conv.inner = untag_ptr(invoice); + invoice_conv.is_owned = ptr_is_owned(invoice); CHECK_INNER_FIELD_ACCESS_OR_NULL(invoice_conv); + invoice_conv.is_owned = false; LDKCResult_PaymentIdPaymentErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentErrorZ), "LDKCResult_PaymentIdPaymentErrorZ"); *ret_conv = InvoicePayer_pay_zero_value_invoice(&this_arg_conv, &invoice_conv, amount_msats); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_InvoicePayer_pay_pubkey"))) TS_InvoicePayer_pay_pubkey(uint32_t this_arg, int8_tArray pubkey, int8_tArray payment_preimage, int64_t amount_msats, int32_t final_cltv_expiry_delta) { +uint64_t __attribute__((export_name("TS_InvoicePayer_pay_pubkey"))) TS_InvoicePayer_pay_pubkey(uint64_t this_arg, int8_tArray pubkey, int8_tArray payment_preimage, int64_t amount_msats, int32_t final_cltv_expiry_delta) { LDKInvoicePayer this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKPublicKey pubkey_ref; CHECK(pubkey->arr_len == 33); memcpy(pubkey_ref.compressed_form, pubkey->elems, 33); FREE(pubkey); @@ -45732,14 +43736,15 @@ uint32_t __attribute__((export_name("TS_InvoicePayer_pay_pubkey"))) TS_InvoiceP memcpy(payment_preimage_ref.data, payment_preimage->elems, 32); FREE(payment_preimage); LDKCResult_PaymentIdPaymentErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentErrorZ), "LDKCResult_PaymentIdPaymentErrorZ"); *ret_conv = InvoicePayer_pay_pubkey(&this_arg_conv, pubkey_ref, payment_preimage_ref, amount_msats, final_cltv_expiry_delta); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_InvoicePayer_remove_cached_payment"))) TS_InvoicePayer_remove_cached_payment(uint32_t this_arg, int8_tArray payment_hash) { +void __attribute__((export_name("TS_InvoicePayer_remove_cached_payment"))) TS_InvoicePayer_remove_cached_payment(uint64_t this_arg, int8_tArray payment_hash) { LDKInvoicePayer this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; unsigned char payment_hash_arr[32]; CHECK(payment_hash->arr_len == 32); memcpy(payment_hash_arr, payment_hash->elems, 32); FREE(payment_hash); @@ -45747,22 +43752,24 @@ void __attribute__((export_name("TS_InvoicePayer_remove_cached_payment"))) TS_I InvoicePayer_remove_cached_payment(&this_arg_conv, payment_hash_ref); } -uint32_t __attribute__((export_name("TS_InvoicePayer_as_EventHandler"))) TS_InvoicePayer_as_EventHandler(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_InvoicePayer_as_EventHandler"))) TS_InvoicePayer_as_EventHandler(uint64_t this_arg) { LDKInvoicePayer this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKEventHandler* ret_ret = MALLOC(sizeof(LDKEventHandler), "LDKEventHandler"); *ret_ret = InvoicePayer_as_EventHandler(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_t __attribute__((export_name("TS_create_invoice_from_channelmanager_with_description_hash_and_duration_since_epoch"))) TS_create_invoice_from_channelmanager_with_description_hash_and_duration_since_epoch(uint32_t channelmanager, uint32_t keys_manager, uint32_t network, uint32_t amt_msat, uint32_t description_hash, int64_t duration_since_epoch, int32_t invoice_expiry_delta_secs) { +uint64_t __attribute__((export_name("TS_create_invoice_from_channelmanager_with_description_hash_and_duration_since_epoch"))) TS_create_invoice_from_channelmanager_with_description_hash_and_duration_since_epoch(uint64_t channelmanager, uint64_t keys_manager, uint32_t network, uint64_t amt_msat, uint64_t description_hash, int64_t duration_since_epoch, int32_t invoice_expiry_delta_secs) { LDKChannelManager channelmanager_conv; - channelmanager_conv.inner = (void*)(channelmanager & (~1)); - channelmanager_conv.is_owned = false; + channelmanager_conv.inner = untag_ptr(channelmanager); + channelmanager_conv.is_owned = ptr_is_owned(channelmanager); CHECK_INNER_FIELD_ACCESS_OR_NULL(channelmanager_conv); - void* keys_manager_ptr = (void*)(((uintptr_t)keys_manager) & ~1); + channelmanager_conv.is_owned = false; + void* keys_manager_ptr = untag_ptr(keys_manager); CHECK_ACCESS(keys_manager_ptr); LDKKeysInterface keys_manager_conv = *(LDKKeysInterface*)(keys_manager_ptr); if (keys_manager_conv.free == LDKKeysInterface_JCalls_free) { @@ -45770,26 +43777,27 @@ uint32_t __attribute__((export_name("TS_create_invoice_from_channelmanager_with LDKKeysInterface_JCalls_cloned(&keys_manager_conv); } LDKCurrency network_conv = LDKCurrency_from_js(network); - void* amt_msat_ptr = (void*)(((uintptr_t)amt_msat) & ~1); + void* amt_msat_ptr = untag_ptr(amt_msat); CHECK_ACCESS(amt_msat_ptr); LDKCOption_u64Z amt_msat_conv = *(LDKCOption_u64Z*)(amt_msat_ptr); - amt_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)amt_msat) & ~1)); + amt_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(amt_msat)); LDKSha256 description_hash_conv; - description_hash_conv.inner = (void*)(description_hash & (~1)); - description_hash_conv.is_owned = (description_hash & 1) || (description_hash == 0); + description_hash_conv.inner = untag_ptr(description_hash); + description_hash_conv.is_owned = ptr_is_owned(description_hash); CHECK_INNER_FIELD_ACCESS_OR_NULL(description_hash_conv); description_hash_conv = Sha256_clone(&description_hash_conv); LDKCResult_InvoiceSignOrCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceSignOrCreationErrorZ), "LDKCResult_InvoiceSignOrCreationErrorZ"); *ret_conv = create_invoice_from_channelmanager_with_description_hash_and_duration_since_epoch(&channelmanager_conv, keys_manager_conv, network_conv, amt_msat_conv, description_hash_conv, duration_since_epoch, invoice_expiry_delta_secs); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_create_invoice_from_channelmanager_and_duration_since_epoch"))) TS_create_invoice_from_channelmanager_and_duration_since_epoch(uint32_t channelmanager, uint32_t keys_manager, uint32_t network, uint32_t amt_msat, jstring description, int64_t duration_since_epoch, int32_t invoice_expiry_delta_secs) { +uint64_t __attribute__((export_name("TS_create_invoice_from_channelmanager_and_duration_since_epoch"))) TS_create_invoice_from_channelmanager_and_duration_since_epoch(uint64_t channelmanager, uint64_t keys_manager, uint32_t network, uint64_t amt_msat, jstring description, int64_t duration_since_epoch, int32_t invoice_expiry_delta_secs) { LDKChannelManager channelmanager_conv; - channelmanager_conv.inner = (void*)(channelmanager & (~1)); - channelmanager_conv.is_owned = false; + channelmanager_conv.inner = untag_ptr(channelmanager); + channelmanager_conv.is_owned = ptr_is_owned(channelmanager); CHECK_INNER_FIELD_ACCESS_OR_NULL(channelmanager_conv); - void* keys_manager_ptr = (void*)(((uintptr_t)keys_manager) & ~1); + channelmanager_conv.is_owned = false; + void* keys_manager_ptr = untag_ptr(keys_manager); CHECK_ACCESS(keys_manager_ptr); LDKKeysInterface keys_manager_conv = *(LDKKeysInterface*)(keys_manager_ptr); if (keys_manager_conv.free == LDKKeysInterface_JCalls_free) { @@ -45797,30 +43805,31 @@ uint32_t __attribute__((export_name("TS_create_invoice_from_channelmanager_and_ LDKKeysInterface_JCalls_cloned(&keys_manager_conv); } LDKCurrency network_conv = LDKCurrency_from_js(network); - void* amt_msat_ptr = (void*)(((uintptr_t)amt_msat) & ~1); + void* amt_msat_ptr = untag_ptr(amt_msat); CHECK_ACCESS(amt_msat_ptr); LDKCOption_u64Z amt_msat_conv = *(LDKCOption_u64Z*)(amt_msat_ptr); - amt_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)amt_msat) & ~1)); + amt_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(amt_msat)); LDKStr description_conv = str_ref_to_owned_c(description); LDKCResult_InvoiceSignOrCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceSignOrCreationErrorZ), "LDKCResult_InvoiceSignOrCreationErrorZ"); *ret_conv = create_invoice_from_channelmanager_and_duration_since_epoch(&channelmanager_conv, keys_manager_conv, network_conv, amt_msat_conv, description_conv, duration_since_epoch, invoice_expiry_delta_secs); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_DefaultRouter_free"))) TS_DefaultRouter_free(uint32_t this_obj) { +void __attribute__((export_name("TS_DefaultRouter_free"))) TS_DefaultRouter_free(uint64_t this_obj) { LDKDefaultRouter this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); DefaultRouter_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_DefaultRouter_new"))) TS_DefaultRouter_new(uint32_t network_graph, uint32_t logger, int8_tArray random_seed_bytes) { +uint64_t __attribute__((export_name("TS_DefaultRouter_new"))) TS_DefaultRouter_new(uint64_t network_graph, uint64_t logger, int8_tArray random_seed_bytes) { LDKNetworkGraph network_graph_conv; - network_graph_conv.inner = (void*)(network_graph & (~1)); - network_graph_conv.is_owned = false; + network_graph_conv.inner = untag_ptr(network_graph); + network_graph_conv.is_owned = ptr_is_owned(network_graph); CHECK_INNER_FIELD_ACCESS_OR_NULL(network_graph_conv); - void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); + network_graph_conv.is_owned = false; + void* logger_ptr = untag_ptr(logger); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); if (logger_conv.free == LDKLogger_JCalls_free) { @@ -45831,106 +43840,105 @@ uint32_t __attribute__((export_name("TS_DefaultRouter_new"))) TS_DefaultRouter_ CHECK(random_seed_bytes->arr_len == 32); memcpy(random_seed_bytes_ref.data, random_seed_bytes->elems, 32); FREE(random_seed_bytes); LDKDefaultRouter ret_var = DefaultRouter_new(&network_graph_conv, logger_conv, random_seed_bytes_ref); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_DefaultRouter_as_Router"))) TS_DefaultRouter_as_Router(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_DefaultRouter_as_Router"))) TS_DefaultRouter_as_Router(uint64_t this_arg) { LDKDefaultRouter this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKRouter* ret_ret = MALLOC(sizeof(LDKRouter), "LDKRouter"); *ret_ret = DefaultRouter_as_Router(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_t __attribute__((export_name("TS_ChannelManager_as_Payer"))) TS_ChannelManager_as_Payer(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ChannelManager_as_Payer"))) TS_ChannelManager_as_Payer(uint64_t this_arg) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKPayer* ret_ret = MALLOC(sizeof(LDKPayer), "LDKPayer"); *ret_ret = ChannelManager_as_Payer(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_t __attribute__((export_name("TS_SiPrefix_from_str"))) TS_SiPrefix_from_str(jstring s) { +uint64_t __attribute__((export_name("TS_SiPrefix_from_str"))) TS_SiPrefix_from_str(jstring s) { LDKStr s_conv = str_ref_to_owned_c(s); LDKCResult_SiPrefixParseErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SiPrefixParseErrorZ), "LDKCResult_SiPrefixParseErrorZ"); *ret_conv = SiPrefix_from_str(s_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_Invoice_from_str"))) TS_Invoice_from_str(jstring s) { +uint64_t __attribute__((export_name("TS_Invoice_from_str"))) TS_Invoice_from_str(jstring s) { LDKStr s_conv = str_ref_to_owned_c(s); LDKCResult_InvoiceParseOrSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceParseOrSemanticErrorZ), "LDKCResult_InvoiceParseOrSemanticErrorZ"); *ret_conv = Invoice_from_str(s_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_SignedRawInvoice_from_str"))) TS_SignedRawInvoice_from_str(jstring s) { +uint64_t __attribute__((export_name("TS_SignedRawInvoice_from_str"))) TS_SignedRawInvoice_from_str(jstring s) { LDKStr s_conv = str_ref_to_owned_c(s); LDKCResult_SignedRawInvoiceParseErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SignedRawInvoiceParseErrorZ), "LDKCResult_SignedRawInvoiceParseErrorZ"); *ret_conv = SignedRawInvoice_from_str(s_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jstring __attribute__((export_name("TS_ParseError_to_str"))) TS_ParseError_to_str(uint32_t o) { - LDKParseError* o_conv = (LDKParseError*)o; +jstring __attribute__((export_name("TS_ParseError_to_str"))) TS_ParseError_to_str(uint64_t o) { + LDKParseError* o_conv = (LDKParseError*)untag_ptr(o); LDKStr ret_str = ParseError_to_str(o_conv); jstring ret_conv = str_ref_to_ts(ret_str.chars, ret_str.len); Str_free(ret_str); return ret_conv; } -jstring __attribute__((export_name("TS_ParseOrSemanticError_to_str"))) TS_ParseOrSemanticError_to_str(uint32_t o) { - LDKParseOrSemanticError* o_conv = (LDKParseOrSemanticError*)o; +jstring __attribute__((export_name("TS_ParseOrSemanticError_to_str"))) TS_ParseOrSemanticError_to_str(uint64_t o) { + LDKParseOrSemanticError* o_conv = (LDKParseOrSemanticError*)untag_ptr(o); LDKStr ret_str = ParseOrSemanticError_to_str(o_conv); jstring ret_conv = str_ref_to_ts(ret_str.chars, ret_str.len); Str_free(ret_str); return ret_conv; } -jstring __attribute__((export_name("TS_Invoice_to_str"))) TS_Invoice_to_str(uint32_t o) { +jstring __attribute__((export_name("TS_Invoice_to_str"))) TS_Invoice_to_str(uint64_t o) { LDKInvoice o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = false; + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); + o_conv.is_owned = false; LDKStr ret_str = Invoice_to_str(&o_conv); jstring ret_conv = str_ref_to_ts(ret_str.chars, ret_str.len); Str_free(ret_str); return ret_conv; } -jstring __attribute__((export_name("TS_SignedRawInvoice_to_str"))) TS_SignedRawInvoice_to_str(uint32_t o) { +jstring __attribute__((export_name("TS_SignedRawInvoice_to_str"))) TS_SignedRawInvoice_to_str(uint64_t o) { LDKSignedRawInvoice o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = false; + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); + o_conv.is_owned = false; LDKStr ret_str = SignedRawInvoice_to_str(&o_conv); jstring ret_conv = str_ref_to_ts(ret_str.chars, ret_str.len); Str_free(ret_str); return ret_conv; } -jstring __attribute__((export_name("TS_Currency_to_str"))) TS_Currency_to_str(uint32_t o) { - LDKCurrency* o_conv = (LDKCurrency*)(o & ~1); +jstring __attribute__((export_name("TS_Currency_to_str"))) TS_Currency_to_str(uint64_t o) { + LDKCurrency* o_conv = (LDKCurrency*)untag_ptr(o); LDKStr ret_str = Currency_to_str(o_conv); jstring ret_conv = str_ref_to_ts(ret_str.chars, ret_str.len); Str_free(ret_str); return ret_conv; } -jstring __attribute__((export_name("TS_SiPrefix_to_str"))) TS_SiPrefix_to_str(uint32_t o) { - LDKSiPrefix* o_conv = (LDKSiPrefix*)(o & ~1); +jstring __attribute__((export_name("TS_SiPrefix_to_str"))) TS_SiPrefix_to_str(uint64_t o) { + LDKSiPrefix* o_conv = (LDKSiPrefix*)untag_ptr(o); LDKStr ret_str = SiPrefix_to_str(o_conv); jstring ret_conv = str_ref_to_ts(ret_str.chars, ret_str.len); Str_free(ret_str); diff --git a/ts/bindings.c.body b/ts/bindings.c.body index 55cb8564..e89544d7 100644 --- a/ts/bindings.c.body +++ b/ts/bindings.c.body @@ -48,6 +48,7 @@ _Static_assert(sizeof(void*) == 4, "Pointers mut be 32 bits"); } DECL_ARR_TYPE(int64_t, int64_t); +DECL_ARR_TYPE(uint64_t, uint64_t); DECL_ARR_TYPE(int8_t, int8_t); DECL_ARR_TYPE(uint32_t, uint32_t); DECL_ARR_TYPE(void*, ptr); @@ -92,6 +93,62 @@ jstring __attribute__((export_name("TS_get_ldk_version"))) get_ldk_version() { } #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 void* untag_ptr(uint64_t ptr) { + if (ptr < 4096) return (void*)ptr; + if (sizeof(void*) == 4) { + // For 32-bit systems, store pointers as 64-bit ints and use the 31st bit + return (void*)(uintptr_t)ptr; + } else { + // For 64-bit systems, assume the top byte is used for tagging, then + // use bit 9 ^ bit 10. + uint64_t tenth_bit = (((uintptr_t)ptr) & (1ULL << 54)) >> 54; + uintptr_t p = (ptr & ~(1ULL << 55)) | (tenth_bit << 55); +#ifdef LDK_DEBUG_BUILD + // On debug builds we also use the 11th bit as a debug flag + uintptr_t eleventh_bit = (((uintptr_t)ptr) & (1ULL << 53)) >> 53; + CHECK(tenth_bit != eleventh_bit); + p ^= 1ULL << 53; +#endif + return (void*)p; + } +} +static inline bool ptr_is_owned(uint64_t ptr) { + if(ptr < 4096) return true; + if (sizeof(void*) == 4) { + return ptr & (1ULL << 32); + } else { + uintptr_t ninth_bit = (((uintptr_t)ptr) & (1ULL << 55)) >> 55; + uintptr_t tenth_bit = (((uintptr_t)ptr) & (1ULL << 54)) >> 54; +#ifdef LDK_DEBUG_BUILD + // On debug builds we also use the 11th bit as a debug flag + uintptr_t eleventh_bit = (((uintptr_t)ptr) & (1ULL << 53)) >> 53; + CHECK(tenth_bit != eleventh_bit); +#endif + return (ninth_bit ^ tenth_bit) ? true : false; + } +} +static inline uint64_t tag_ptr(const void* ptr, bool is_owned) { + if ((uintptr_t)ptr < 4096) return (uint64_t)ptr; + if (sizeof(void*) == 4) { + return (((uint64_t)ptr) | ((is_owned ? 1ULL : 0) << 32)); + } else { + CHECK(sizeof(uintptr_t) == 8); + uintptr_t tenth_bit = (((uintptr_t)ptr) & (1ULL << 54)) >> 54; + uintptr_t t = (((uintptr_t)ptr) | (((is_owned ? 1ULL : 0ULL) ^ tenth_bit) << 55)); +#ifdef LDK_DEBUG_BUILD + uintptr_t ninth_bit = (((uintptr_t)ptr) & (1ULL << 55)) >> 55; + uintptr_t eleventh_bit = (((uintptr_t)ptr) & (1ULL << 53)) >> 53; + CHECK(ninth_bit == tenth_bit); + CHECK(ninth_bit == eleventh_bit); + t ^= 1ULL << 53; +#endif + CHECK(ptr_is_owned(t) == is_owned); + CHECK(untag_ptr(t) == ptr); + return t; + } +} + static inline LDKAccessError LDKAccessError_from_js(int32_t ord) { switch (ord) { case 0: return LDKAccessError_UnknownChain; @@ -370,8 +427,8 @@ static inline int32_t LDKSiPrefix_to_js(LDKSiPrefix val) { default: abort(); } } -uint32_t __attribute__((export_name("TS_LDKBech32Error_ty_from_ptr"))) TS_LDKBech32Error_ty_from_ptr(uint32_t ptr) { - LDKBech32Error *obj = (LDKBech32Error*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKBech32Error_ty_from_ptr"))) TS_LDKBech32Error_ty_from_ptr(uint64_t ptr) { + LDKBech32Error *obj = (LDKBech32Error*)untag_ptr(ptr); switch(obj->tag) { case LDKBech32Error_MissingSeparator: return 0; case LDKBech32Error_InvalidChecksum: return 1; @@ -383,14 +440,14 @@ uint32_t __attribute__((export_name("TS_LDKBech32Error_ty_from_ptr"))) TS_LDKBec default: abort(); } } -int32_t __attribute__((export_name("TS_LDKBech32Error_InvalidChar_get_invalid_char"))) TS_LDKBech32Error_InvalidChar_get_invalid_char(uint32_t ptr) { - LDKBech32Error *obj = (LDKBech32Error*)(ptr & ~1); +int32_t __attribute__((export_name("TS_LDKBech32Error_InvalidChar_get_invalid_char"))) TS_LDKBech32Error_InvalidChar_get_invalid_char(uint64_t ptr) { + LDKBech32Error *obj = (LDKBech32Error*)untag_ptr(ptr); assert(obj->tag == LDKBech32Error_InvalidChar); int32_t invalid_char_conv = obj->invalid_char; return invalid_char_conv; } -int8_t __attribute__((export_name("TS_LDKBech32Error_InvalidData_get_invalid_data"))) TS_LDKBech32Error_InvalidData_get_invalid_data(uint32_t ptr) { - LDKBech32Error *obj = (LDKBech32Error*)(ptr & ~1); +int8_t __attribute__((export_name("TS_LDKBech32Error_InvalidData_get_invalid_data"))) TS_LDKBech32Error_InvalidData_get_invalid_data(uint64_t ptr) { + LDKBech32Error *obj = (LDKBech32Error*)untag_ptr(ptr); assert(obj->tag == LDKBech32Error_InvalidData); int8_t invalid_data_conv = obj->invalid_data; return invalid_data_conv; @@ -400,8 +457,8 @@ static inline LDKCVec_u8Z CVec_u8Z_clone(const LDKCVec_u8Z *orig) { memcpy(ret.data, orig->data, sizeof(int8_t) * ret.datalen); return ret; } -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); +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(uint64_t thing) { + LDKTxOut* thing_conv = (LDKTxOut*)untag_ptr(thing); LDKCVec_u8Z ret_var = TxOut_get_script_pubkey(thing_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -409,8 +466,8 @@ struct LDKCVec_u8Z TxOut_get_script_pubkey (struct LDKTxOut* thing) { return CVe return ret_arr; } -uint64_t TxOut_get_value (struct LDKTxOut* thing) { return thing->value;}int64_t __attribute__((export_name("TS_TxOut_get_value"))) TS_TxOut_get_value(uint32_t thing) { - LDKTxOut* thing_conv = (LDKTxOut*)(thing & ~1); +uint64_t TxOut_get_value (struct LDKTxOut* thing) { return thing->value;}int64_t __attribute__((export_name("TS_TxOut_get_value"))) TS_TxOut_get_value(uint64_t thing) { + LDKTxOut* thing_conv = (LDKTxOut*)untag_ptr(thing); int64_t ret_conv = TxOut_get_value(thing_conv); return ret_conv; } @@ -419,8 +476,8 @@ static inline void CResult_NoneNoneZ_get_ok(LDKCResult_NoneNoneZ *NONNULL_PTR ow CHECK(owner->result_ok); return *owner->contents.result; } -void __attribute__((export_name("TS_CResult_NoneNoneZ_get_ok"))) TS_CResult_NoneNoneZ_get_ok(uint32_t owner) { - LDKCResult_NoneNoneZ* owner_conv = (LDKCResult_NoneNoneZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_NoneNoneZ_get_ok"))) TS_CResult_NoneNoneZ_get_ok(uint64_t owner) { + LDKCResult_NoneNoneZ* owner_conv = (LDKCResult_NoneNoneZ*)untag_ptr(owner); CResult_NoneNoneZ_get_ok(owner_conv); } @@ -428,8 +485,8 @@ static inline void CResult_NoneNoneZ_get_err(LDKCResult_NoneNoneZ *NONNULL_PTR o CHECK(!owner->result_ok); return *owner->contents.err; } -void __attribute__((export_name("TS_CResult_NoneNoneZ_get_err"))) TS_CResult_NoneNoneZ_get_err(uint32_t owner) { - LDKCResult_NoneNoneZ* owner_conv = (LDKCResult_NoneNoneZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_NoneNoneZ_get_err"))) TS_CResult_NoneNoneZ_get_err(uint64_t owner) { + LDKCResult_NoneNoneZ* owner_conv = (LDKCResult_NoneNoneZ*)untag_ptr(owner); CResult_NoneNoneZ_get_err(owner_conv); } @@ -437,17 +494,12 @@ static inline struct LDKCounterpartyCommitmentSecrets CResult_CounterpartyCommit CHECK(owner->result_ok); return CounterpartyCommitmentSecrets_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_get_ok"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* owner_conv = (LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_get_ok"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* owner_conv = (LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ*)untag_ptr(owner); LDKCounterpartyCommitmentSecrets ret_var = CResult_CounterpartyCommitmentSecretsDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -455,17 +507,12 @@ static inline struct LDKDecodeError CResult_CounterpartyCommitmentSecretsDecodeE CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_get_err"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_get_err(uint32_t owner) { - LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* owner_conv = (LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_get_err"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* owner_conv = (LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_CounterpartyCommitmentSecretsDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -473,8 +520,8 @@ static inline struct LDKSecretKey CResult_SecretKeyErrorZ_get_ok(LDKCResult_Secr CHECK(owner->result_ok); return *owner->contents.result; } -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 __attribute__((export_name("TS_CResult_SecretKeyErrorZ_get_ok"))) TS_CResult_SecretKeyErrorZ_get_ok(uint64_t owner) { + LDKCResult_SecretKeyErrorZ* owner_conv = (LDKCResult_SecretKeyErrorZ*)untag_ptr(owner); int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, CResult_SecretKeyErrorZ_get_ok(owner_conv).bytes, 32); return ret_arr; @@ -484,8 +531,8 @@ static inline enum LDKSecp256k1Error CResult_SecretKeyErrorZ_get_err(LDKCResult_ CHECK(!owner->result_ok); return *owner->contents.err; } -uint32_t __attribute__((export_name("TS_CResult_SecretKeyErrorZ_get_err"))) TS_CResult_SecretKeyErrorZ_get_err(uint32_t owner) { - LDKCResult_SecretKeyErrorZ* owner_conv = (LDKCResult_SecretKeyErrorZ*)(owner & ~1); +uint32_t __attribute__((export_name("TS_CResult_SecretKeyErrorZ_get_err"))) TS_CResult_SecretKeyErrorZ_get_err(uint64_t owner) { + LDKCResult_SecretKeyErrorZ* owner_conv = (LDKCResult_SecretKeyErrorZ*)untag_ptr(owner); uint32_t ret_conv = LDKSecp256k1Error_to_js(CResult_SecretKeyErrorZ_get_err(owner_conv)); return ret_conv; } @@ -494,8 +541,8 @@ static inline struct LDKPublicKey CResult_PublicKeyErrorZ_get_ok(LDKCResult_Publ CHECK(owner->result_ok); return *owner->contents.result; } -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 __attribute__((export_name("TS_CResult_PublicKeyErrorZ_get_ok"))) TS_CResult_PublicKeyErrorZ_get_ok(uint64_t owner) { + LDKCResult_PublicKeyErrorZ* owner_conv = (LDKCResult_PublicKeyErrorZ*)untag_ptr(owner); 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; @@ -505,8 +552,8 @@ static inline enum LDKSecp256k1Error CResult_PublicKeyErrorZ_get_err(LDKCResult_ CHECK(!owner->result_ok); return *owner->contents.err; } -uint32_t __attribute__((export_name("TS_CResult_PublicKeyErrorZ_get_err"))) TS_CResult_PublicKeyErrorZ_get_err(uint32_t owner) { - LDKCResult_PublicKeyErrorZ* owner_conv = (LDKCResult_PublicKeyErrorZ*)(owner & ~1); +uint32_t __attribute__((export_name("TS_CResult_PublicKeyErrorZ_get_err"))) TS_CResult_PublicKeyErrorZ_get_err(uint64_t owner) { + LDKCResult_PublicKeyErrorZ* owner_conv = (LDKCResult_PublicKeyErrorZ*)untag_ptr(owner); uint32_t ret_conv = LDKSecp256k1Error_to_js(CResult_PublicKeyErrorZ_get_err(owner_conv)); return ret_conv; } @@ -515,17 +562,12 @@ static inline struct LDKTxCreationKeys CResult_TxCreationKeysDecodeErrorZ_get_ok CHECK(owner->result_ok); return TxCreationKeys_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_get_ok"))) TS_CResult_TxCreationKeysDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_TxCreationKeysDecodeErrorZ* owner_conv = (LDKCResult_TxCreationKeysDecodeErrorZ*)untag_ptr(owner); LDKTxCreationKeys ret_var = CResult_TxCreationKeysDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -533,17 +575,12 @@ static inline struct LDKDecodeError CResult_TxCreationKeysDecodeErrorZ_get_err(L CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_get_err"))) TS_CResult_TxCreationKeysDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_TxCreationKeysDecodeErrorZ* owner_conv = (LDKCResult_TxCreationKeysDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_TxCreationKeysDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -551,17 +588,12 @@ static inline struct LDKChannelPublicKeys CResult_ChannelPublicKeysDecodeErrorZ_ CHECK(owner->result_ok); return ChannelPublicKeys_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_get_ok"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ChannelPublicKeysDecodeErrorZ* owner_conv = (LDKCResult_ChannelPublicKeysDecodeErrorZ*)untag_ptr(owner); LDKChannelPublicKeys ret_var = CResult_ChannelPublicKeysDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -569,17 +601,12 @@ static inline struct LDKDecodeError CResult_ChannelPublicKeysDecodeErrorZ_get_er CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_get_err"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ChannelPublicKeysDecodeErrorZ* owner_conv = (LDKCResult_ChannelPublicKeysDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ChannelPublicKeysDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -587,17 +614,12 @@ static inline struct LDKTxCreationKeys CResult_TxCreationKeysErrorZ_get_ok(LDKCR CHECK(owner->result_ok); return TxCreationKeys_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_get_ok"))) TS_CResult_TxCreationKeysErrorZ_get_ok(uint64_t owner) { + LDKCResult_TxCreationKeysErrorZ* owner_conv = (LDKCResult_TxCreationKeysErrorZ*)untag_ptr(owner); LDKTxCreationKeys ret_var = CResult_TxCreationKeysErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -605,22 +627,22 @@ static inline enum LDKSecp256k1Error CResult_TxCreationKeysErrorZ_get_err(LDKCRe CHECK(!owner->result_ok); return *owner->contents.err; } -uint32_t __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_get_err"))) TS_CResult_TxCreationKeysErrorZ_get_err(uint32_t owner) { - LDKCResult_TxCreationKeysErrorZ* owner_conv = (LDKCResult_TxCreationKeysErrorZ*)(owner & ~1); +uint32_t __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_get_err"))) TS_CResult_TxCreationKeysErrorZ_get_err(uint64_t owner) { + LDKCResult_TxCreationKeysErrorZ* owner_conv = (LDKCResult_TxCreationKeysErrorZ*)untag_ptr(owner); uint32_t ret_conv = LDKSecp256k1Error_to_js(CResult_TxCreationKeysErrorZ_get_err(owner_conv)); return ret_conv; } -uint32_t __attribute__((export_name("TS_LDKCOption_u32Z_ty_from_ptr"))) TS_LDKCOption_u32Z_ty_from_ptr(uint32_t ptr) { - LDKCOption_u32Z *obj = (LDKCOption_u32Z*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKCOption_u32Z_ty_from_ptr"))) TS_LDKCOption_u32Z_ty_from_ptr(uint64_t ptr) { + LDKCOption_u32Z *obj = (LDKCOption_u32Z*)untag_ptr(ptr); switch(obj->tag) { case LDKCOption_u32Z_Some: return 0; case LDKCOption_u32Z_None: return 1; default: abort(); } } -int32_t __attribute__((export_name("TS_LDKCOption_u32Z_Some_get_some"))) TS_LDKCOption_u32Z_Some_get_some(uint32_t ptr) { - LDKCOption_u32Z *obj = (LDKCOption_u32Z*)(ptr & ~1); +int32_t __attribute__((export_name("TS_LDKCOption_u32Z_Some_get_some"))) TS_LDKCOption_u32Z_Some_get_some(uint64_t ptr) { + LDKCOption_u32Z *obj = (LDKCOption_u32Z*)untag_ptr(ptr); assert(obj->tag == LDKCOption_u32Z_Some); int32_t some_conv = obj->some; return some_conv; @@ -629,17 +651,12 @@ static inline struct LDKHTLCOutputInCommitment CResult_HTLCOutputInCommitmentDec CHECK(owner->result_ok); return HTLCOutputInCommitment_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_get_ok"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* owner_conv = (LDKCResult_HTLCOutputInCommitmentDecodeErrorZ*)untag_ptr(owner); LDKHTLCOutputInCommitment ret_var = CResult_HTLCOutputInCommitmentDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -647,17 +664,12 @@ static inline struct LDKDecodeError CResult_HTLCOutputInCommitmentDecodeErrorZ_g CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_get_err"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* owner_conv = (LDKCResult_HTLCOutputInCommitmentDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_HTLCOutputInCommitmentDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -665,17 +677,12 @@ static inline struct LDKCounterpartyChannelTransactionParameters CResult_Counter CHECK(owner->result_ok); return CounterpartyChannelTransactionParameters_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_get_ok"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* owner_conv = (LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ*)untag_ptr(owner); LDKCounterpartyChannelTransactionParameters ret_var = CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -683,17 +690,12 @@ static inline struct LDKDecodeError CResult_CounterpartyChannelTransactionParame CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_get_err"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* owner_conv = (LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -701,17 +703,12 @@ static inline struct LDKChannelTransactionParameters CResult_ChannelTransactionP CHECK(owner->result_ok); return ChannelTransactionParameters_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_get_ok"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ChannelTransactionParametersDecodeErrorZ* owner_conv = (LDKCResult_ChannelTransactionParametersDecodeErrorZ*)untag_ptr(owner); LDKChannelTransactionParameters ret_var = CResult_ChannelTransactionParametersDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -719,17 +716,12 @@ static inline struct LDKDecodeError CResult_ChannelTransactionParametersDecodeEr CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_get_err"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ChannelTransactionParametersDecodeErrorZ* owner_conv = (LDKCResult_ChannelTransactionParametersDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ChannelTransactionParametersDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -737,17 +729,12 @@ static inline struct LDKHolderCommitmentTransaction CResult_HolderCommitmentTran CHECK(owner->result_ok); return HolderCommitmentTransaction_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_get_ok"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_HolderCommitmentTransactionDecodeErrorZ* owner_conv = (LDKCResult_HolderCommitmentTransactionDecodeErrorZ*)untag_ptr(owner); LDKHolderCommitmentTransaction ret_var = CResult_HolderCommitmentTransactionDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -755,17 +742,12 @@ static inline struct LDKDecodeError CResult_HolderCommitmentTransactionDecodeErr CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_get_err"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_HolderCommitmentTransactionDecodeErrorZ* owner_conv = (LDKCResult_HolderCommitmentTransactionDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_HolderCommitmentTransactionDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -773,17 +755,12 @@ static inline struct LDKBuiltCommitmentTransaction CResult_BuiltCommitmentTransa CHECK(owner->result_ok); return BuiltCommitmentTransaction_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_get_ok"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* owner_conv = (LDKCResult_BuiltCommitmentTransactionDecodeErrorZ*)untag_ptr(owner); LDKBuiltCommitmentTransaction ret_var = CResult_BuiltCommitmentTransactionDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -791,17 +768,12 @@ static inline struct LDKDecodeError CResult_BuiltCommitmentTransactionDecodeErro CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_get_err"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* owner_conv = (LDKCResult_BuiltCommitmentTransactionDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_BuiltCommitmentTransactionDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -809,14 +781,12 @@ static inline struct LDKTrustedClosingTransaction *CResult_TrustedClosingTransac CHECK(owner->result_ok); return &*owner->contents.result; } -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); +uint64_t __attribute__((export_name("TS_CResult_TrustedClosingTransactionNoneZ_get_ok"))) TS_CResult_TrustedClosingTransactionNoneZ_get_ok(uint64_t owner) { + LDKCResult_TrustedClosingTransactionNoneZ* owner_conv = (LDKCResult_TrustedClosingTransactionNoneZ*)untag_ptr(owner); LDKTrustedClosingTransaction ret_var = *CResult_TrustedClosingTransactionNoneZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner & ~1; + ret_ref = tag_ptr(ret_var.inner, false); return ret_ref; } @@ -824,8 +794,8 @@ static inline void CResult_TrustedClosingTransactionNoneZ_get_err(LDKCResult_Tru CHECK(!owner->result_ok); return *owner->contents.err; } -void __attribute__((export_name("TS_CResult_TrustedClosingTransactionNoneZ_get_err"))) TS_CResult_TrustedClosingTransactionNoneZ_get_err(uint32_t owner) { - LDKCResult_TrustedClosingTransactionNoneZ* owner_conv = (LDKCResult_TrustedClosingTransactionNoneZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_TrustedClosingTransactionNoneZ_get_err"))) TS_CResult_TrustedClosingTransactionNoneZ_get_err(uint64_t owner) { + LDKCResult_TrustedClosingTransactionNoneZ* owner_conv = (LDKCResult_TrustedClosingTransactionNoneZ*)untag_ptr(owner); CResult_TrustedClosingTransactionNoneZ_get_err(owner_conv); } @@ -833,17 +803,12 @@ static inline struct LDKCommitmentTransaction CResult_CommitmentTransactionDecod CHECK(owner->result_ok); return CommitmentTransaction_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_get_ok"))) TS_CResult_CommitmentTransactionDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_CommitmentTransactionDecodeErrorZ* owner_conv = (LDKCResult_CommitmentTransactionDecodeErrorZ*)untag_ptr(owner); LDKCommitmentTransaction ret_var = CResult_CommitmentTransactionDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -851,17 +816,12 @@ static inline struct LDKDecodeError CResult_CommitmentTransactionDecodeErrorZ_ge CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_get_err"))) TS_CResult_CommitmentTransactionDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_CommitmentTransactionDecodeErrorZ* owner_conv = (LDKCResult_CommitmentTransactionDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_CommitmentTransactionDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -869,14 +829,12 @@ static inline struct LDKTrustedCommitmentTransaction *CResult_TrustedCommitmentT CHECK(owner->result_ok); return &*owner->contents.result; } -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); +uint64_t __attribute__((export_name("TS_CResult_TrustedCommitmentTransactionNoneZ_get_ok"))) TS_CResult_TrustedCommitmentTransactionNoneZ_get_ok(uint64_t owner) { + LDKCResult_TrustedCommitmentTransactionNoneZ* owner_conv = (LDKCResult_TrustedCommitmentTransactionNoneZ*)untag_ptr(owner); LDKTrustedCommitmentTransaction ret_var = *CResult_TrustedCommitmentTransactionNoneZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner & ~1; + ret_ref = tag_ptr(ret_var.inner, false); return ret_ref; } @@ -884,8 +842,8 @@ static inline void CResult_TrustedCommitmentTransactionNoneZ_get_err(LDKCResult_ CHECK(!owner->result_ok); return *owner->contents.err; } -void __attribute__((export_name("TS_CResult_TrustedCommitmentTransactionNoneZ_get_err"))) TS_CResult_TrustedCommitmentTransactionNoneZ_get_err(uint32_t owner) { - LDKCResult_TrustedCommitmentTransactionNoneZ* owner_conv = (LDKCResult_TrustedCommitmentTransactionNoneZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_TrustedCommitmentTransactionNoneZ_get_err"))) TS_CResult_TrustedCommitmentTransactionNoneZ_get_err(uint64_t owner) { + LDKCResult_TrustedCommitmentTransactionNoneZ* owner_conv = (LDKCResult_TrustedCommitmentTransactionNoneZ*)untag_ptr(owner); CResult_TrustedCommitmentTransactionNoneZ_get_err(owner_conv); } @@ -893,8 +851,8 @@ static inline struct LDKCVec_SignatureZ CResult_CVec_SignatureZNoneZ_get_ok(LDKC CHECK(owner->result_ok); return *owner->contents.result; } -ptrArray __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_get_ok"))) TS_CResult_CVec_SignatureZNoneZ_get_ok(uint32_t owner) { - LDKCResult_CVec_SignatureZNoneZ* owner_conv = (LDKCResult_CVec_SignatureZNoneZ*)(owner & ~1); +ptrArray __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_get_ok"))) TS_CResult_CVec_SignatureZNoneZ_get_ok(uint64_t owner) { + LDKCResult_CVec_SignatureZNoneZ* owner_conv = (LDKCResult_CVec_SignatureZNoneZ*)untag_ptr(owner); LDKCVec_SignatureZ ret_var = CResult_CVec_SignatureZNoneZ_get_ok(owner_conv); ptrArray ret_arr = NULL; ret_arr = init_ptrArray(ret_var.datalen, __LINE__); @@ -912,8 +870,8 @@ static inline void CResult_CVec_SignatureZNoneZ_get_err(LDKCResult_CVec_Signatur CHECK(!owner->result_ok); return *owner->contents.err; } -void __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_get_err"))) TS_CResult_CVec_SignatureZNoneZ_get_err(uint32_t owner) { - LDKCResult_CVec_SignatureZNoneZ* owner_conv = (LDKCResult_CVec_SignatureZNoneZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_get_err"))) TS_CResult_CVec_SignatureZNoneZ_get_err(uint64_t owner) { + LDKCResult_CVec_SignatureZNoneZ* owner_conv = (LDKCResult_CVec_SignatureZNoneZ*)untag_ptr(owner); CResult_CVec_SignatureZNoneZ_get_err(owner_conv); } @@ -921,17 +879,12 @@ static inline struct LDKShutdownScript CResult_ShutdownScriptDecodeErrorZ_get_ok CHECK(owner->result_ok); return ShutdownScript_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_get_ok"))) TS_CResult_ShutdownScriptDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ShutdownScriptDecodeErrorZ* owner_conv = (LDKCResult_ShutdownScriptDecodeErrorZ*)untag_ptr(owner); LDKShutdownScript ret_var = CResult_ShutdownScriptDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -939,17 +892,12 @@ static inline struct LDKDecodeError CResult_ShutdownScriptDecodeErrorZ_get_err(L CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_get_err"))) TS_CResult_ShutdownScriptDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ShutdownScriptDecodeErrorZ* owner_conv = (LDKCResult_ShutdownScriptDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ShutdownScriptDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -957,17 +905,12 @@ static inline struct LDKShutdownScript CResult_ShutdownScriptInvalidShutdownScri CHECK(owner->result_ok); return ShutdownScript_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_get_ok"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_get_ok(uint64_t owner) { + LDKCResult_ShutdownScriptInvalidShutdownScriptZ* owner_conv = (LDKCResult_ShutdownScriptInvalidShutdownScriptZ*)untag_ptr(owner); LDKShutdownScript ret_var = CResult_ShutdownScriptInvalidShutdownScriptZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -975,17 +918,12 @@ static inline struct LDKInvalidShutdownScript CResult_ShutdownScriptInvalidShutd CHECK(!owner->result_ok); return InvalidShutdownScript_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_get_err"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_get_err(uint64_t owner) { + LDKCResult_ShutdownScriptInvalidShutdownScriptZ* owner_conv = (LDKCResult_ShutdownScriptInvalidShutdownScriptZ*)untag_ptr(owner); LDKInvalidShutdownScript ret_var = CResult_ShutdownScriptInvalidShutdownScriptZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -993,17 +931,12 @@ static inline struct LDKRouteHop CResult_RouteHopDecodeErrorZ_get_ok(LDKCResult_ CHECK(owner->result_ok); return RouteHop_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_get_ok"))) TS_CResult_RouteHopDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_RouteHopDecodeErrorZ* owner_conv = (LDKCResult_RouteHopDecodeErrorZ*)untag_ptr(owner); LDKRouteHop ret_var = CResult_RouteHopDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -1011,17 +944,12 @@ static inline struct LDKDecodeError CResult_RouteHopDecodeErrorZ_get_err(LDKCRes CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_get_err"))) TS_CResult_RouteHopDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_RouteHopDecodeErrorZ* owner_conv = (LDKCResult_RouteHopDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_RouteHopDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -1043,17 +971,12 @@ static inline struct LDKRoute CResult_RouteDecodeErrorZ_get_ok(LDKCResult_RouteD CHECK(owner->result_ok); return Route_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_get_ok"))) TS_CResult_RouteDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_RouteDecodeErrorZ* owner_conv = (LDKCResult_RouteDecodeErrorZ*)untag_ptr(owner); LDKRoute ret_var = CResult_RouteDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -1061,17 +984,12 @@ static inline struct LDKDecodeError CResult_RouteDecodeErrorZ_get_err(LDKCResult CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_get_err"))) TS_CResult_RouteDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_RouteDecodeErrorZ* owner_conv = (LDKCResult_RouteDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_RouteDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -1079,17 +997,12 @@ static inline struct LDKRouteParameters CResult_RouteParametersDecodeErrorZ_get_ CHECK(owner->result_ok); return RouteParameters_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_get_ok"))) TS_CResult_RouteParametersDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_RouteParametersDecodeErrorZ* owner_conv = (LDKCResult_RouteParametersDecodeErrorZ*)untag_ptr(owner); LDKRouteParameters ret_var = CResult_RouteParametersDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -1097,17 +1010,12 @@ static inline struct LDKDecodeError CResult_RouteParametersDecodeErrorZ_get_err( CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_get_err"))) TS_CResult_RouteParametersDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_RouteParametersDecodeErrorZ* owner_conv = (LDKCResult_RouteParametersDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_RouteParametersDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -1118,16 +1026,16 @@ static inline LDKCVec_RouteHintZ CVec_RouteHintZ_clone(const LDKCVec_RouteHintZ } return ret; } -uint32_t __attribute__((export_name("TS_LDKCOption_u64Z_ty_from_ptr"))) TS_LDKCOption_u64Z_ty_from_ptr(uint32_t ptr) { - LDKCOption_u64Z *obj = (LDKCOption_u64Z*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKCOption_u64Z_ty_from_ptr"))) TS_LDKCOption_u64Z_ty_from_ptr(uint64_t ptr) { + LDKCOption_u64Z *obj = (LDKCOption_u64Z*)untag_ptr(ptr); switch(obj->tag) { case LDKCOption_u64Z_Some: return 0; case LDKCOption_u64Z_None: return 1; default: abort(); } } -int64_t __attribute__((export_name("TS_LDKCOption_u64Z_Some_get_some"))) TS_LDKCOption_u64Z_Some_get_some(uint32_t ptr) { - LDKCOption_u64Z *obj = (LDKCOption_u64Z*)(ptr & ~1); +int64_t __attribute__((export_name("TS_LDKCOption_u64Z_Some_get_some"))) TS_LDKCOption_u64Z_Some_get_some(uint64_t ptr) { + LDKCOption_u64Z *obj = (LDKCOption_u64Z*)untag_ptr(ptr); assert(obj->tag == LDKCOption_u64Z_Some); int64_t some_conv = obj->some; return some_conv; @@ -1141,17 +1049,12 @@ static inline struct LDKPaymentParameters CResult_PaymentParametersDecodeErrorZ_ CHECK(owner->result_ok); return PaymentParameters_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_get_ok"))) TS_CResult_PaymentParametersDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_PaymentParametersDecodeErrorZ* owner_conv = (LDKCResult_PaymentParametersDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_get_ok"))) TS_CResult_PaymentParametersDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_PaymentParametersDecodeErrorZ* owner_conv = (LDKCResult_PaymentParametersDecodeErrorZ*)untag_ptr(owner); LDKPaymentParameters ret_var = CResult_PaymentParametersDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -1159,17 +1062,12 @@ static inline struct LDKDecodeError CResult_PaymentParametersDecodeErrorZ_get_er CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_get_err"))) TS_CResult_PaymentParametersDecodeErrorZ_get_err(uint32_t owner) { - LDKCResult_PaymentParametersDecodeErrorZ* owner_conv = (LDKCResult_PaymentParametersDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_get_err"))) TS_CResult_PaymentParametersDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_PaymentParametersDecodeErrorZ* owner_conv = (LDKCResult_PaymentParametersDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_PaymentParametersDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -1184,17 +1082,12 @@ static inline struct LDKRouteHint CResult_RouteHintDecodeErrorZ_get_ok(LDKCResul CHECK(owner->result_ok); return RouteHint_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_get_ok"))) TS_CResult_RouteHintDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_RouteHintDecodeErrorZ* owner_conv = (LDKCResult_RouteHintDecodeErrorZ*)untag_ptr(owner); LDKRouteHint ret_var = CResult_RouteHintDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -1202,17 +1095,12 @@ static inline struct LDKDecodeError CResult_RouteHintDecodeErrorZ_get_err(LDKCRe CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_get_err"))) TS_CResult_RouteHintDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_RouteHintDecodeErrorZ* owner_conv = (LDKCResult_RouteHintDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_RouteHintDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -1220,17 +1108,12 @@ static inline struct LDKRouteHintHop CResult_RouteHintHopDecodeErrorZ_get_ok(LDK CHECK(owner->result_ok); return RouteHintHop_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_get_ok"))) TS_CResult_RouteHintHopDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_RouteHintHopDecodeErrorZ* owner_conv = (LDKCResult_RouteHintHopDecodeErrorZ*)untag_ptr(owner); LDKRouteHintHop ret_var = CResult_RouteHintHopDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -1238,17 +1121,12 @@ static inline struct LDKDecodeError CResult_RouteHintHopDecodeErrorZ_get_err(LDK CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_get_err"))) TS_CResult_RouteHintHopDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_RouteHintHopDecodeErrorZ* owner_conv = (LDKCResult_RouteHintHopDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_RouteHintHopDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -1263,17 +1141,12 @@ static inline struct LDKRoute CResult_RouteLightningErrorZ_get_ok(LDKCResult_Rou CHECK(owner->result_ok); return Route_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_RouteLightningErrorZ_get_ok"))) TS_CResult_RouteLightningErrorZ_get_ok(uint64_t owner) { + LDKCResult_RouteLightningErrorZ* owner_conv = (LDKCResult_RouteLightningErrorZ*)untag_ptr(owner); LDKRoute ret_var = CResult_RouteLightningErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -1281,44 +1154,39 @@ static inline struct LDKLightningError CResult_RouteLightningErrorZ_get_err(LDKC CHECK(!owner->result_ok); return LightningError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_RouteLightningErrorZ_get_err"))) TS_CResult_RouteLightningErrorZ_get_err(uint64_t owner) { + LDKCResult_RouteLightningErrorZ* owner_conv = (LDKCResult_RouteLightningErrorZ*)untag_ptr(owner); LDKLightningError ret_var = CResult_RouteLightningErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_LDKPaymentPurpose_ty_from_ptr"))) TS_LDKPaymentPurpose_ty_from_ptr(uint32_t ptr) { - LDKPaymentPurpose *obj = (LDKPaymentPurpose*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKPaymentPurpose_ty_from_ptr"))) TS_LDKPaymentPurpose_ty_from_ptr(uint64_t ptr) { + LDKPaymentPurpose *obj = (LDKPaymentPurpose*)untag_ptr(ptr); switch(obj->tag) { case LDKPaymentPurpose_InvoicePayment: return 0; case LDKPaymentPurpose_SpontaneousPayment: return 1; default: abort(); } } -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); +int8_tArray __attribute__((export_name("TS_LDKPaymentPurpose_InvoicePayment_get_payment_preimage"))) TS_LDKPaymentPurpose_InvoicePayment_get_payment_preimage(uint64_t ptr) { + LDKPaymentPurpose *obj = (LDKPaymentPurpose*)untag_ptr(ptr); assert(obj->tag == LDKPaymentPurpose_InvoicePayment); 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); +int8_tArray __attribute__((export_name("TS_LDKPaymentPurpose_InvoicePayment_get_payment_secret"))) TS_LDKPaymentPurpose_InvoicePayment_get_payment_secret(uint64_t ptr) { + LDKPaymentPurpose *obj = (LDKPaymentPurpose*)untag_ptr(ptr); assert(obj->tag == LDKPaymentPurpose_InvoicePayment); 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); +int8_tArray __attribute__((export_name("TS_LDKPaymentPurpose_SpontaneousPayment_get_spontaneous_payment"))) TS_LDKPaymentPurpose_SpontaneousPayment_get_spontaneous_payment(uint64_t ptr) { + LDKPaymentPurpose *obj = (LDKPaymentPurpose*)untag_ptr(ptr); assert(obj->tag == LDKPaymentPurpose_SpontaneousPayment); int8_tArray spontaneous_payment_arr = init_int8_tArray(32, __LINE__); memcpy(spontaneous_payment_arr->elems, obj->spontaneous_payment.data, 32); @@ -1328,11 +1196,11 @@ static inline struct LDKPaymentPurpose CResult_PaymentPurposeDecodeErrorZ_get_ok CHECK(owner->result_ok); return PaymentPurpose_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_PaymentPurposeDecodeErrorZ_get_ok"))) TS_CResult_PaymentPurposeDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_PaymentPurposeDecodeErrorZ* owner_conv = (LDKCResult_PaymentPurposeDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_PaymentPurposeDecodeErrorZ_get_ok"))) TS_CResult_PaymentPurposeDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_PaymentPurposeDecodeErrorZ* owner_conv = (LDKCResult_PaymentPurposeDecodeErrorZ*)untag_ptr(owner); LDKPaymentPurpose *ret_copy = MALLOC(sizeof(LDKPaymentPurpose), "LDKPaymentPurpose"); *ret_copy = CResult_PaymentPurposeDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } @@ -1340,22 +1208,17 @@ static inline struct LDKDecodeError CResult_PaymentPurposeDecodeErrorZ_get_err(L CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_PaymentPurposeDecodeErrorZ_get_err"))) TS_CResult_PaymentPurposeDecodeErrorZ_get_err(uint32_t owner) { - LDKCResult_PaymentPurposeDecodeErrorZ* owner_conv = (LDKCResult_PaymentPurposeDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_PaymentPurposeDecodeErrorZ_get_err"))) TS_CResult_PaymentPurposeDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_PaymentPurposeDecodeErrorZ* owner_conv = (LDKCResult_PaymentPurposeDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_PaymentPurposeDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_LDKClosureReason_ty_from_ptr"))) TS_LDKClosureReason_ty_from_ptr(uint32_t ptr) { - LDKClosureReason *obj = (LDKClosureReason*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKClosureReason_ty_from_ptr"))) TS_LDKClosureReason_ty_from_ptr(uint64_t ptr) { + LDKClosureReason *obj = (LDKClosureReason*)untag_ptr(ptr); switch(obj->tag) { case LDKClosureReason_CounterpartyForceClosed: return 0; case LDKClosureReason_HolderForceClosed: return 1; @@ -1368,43 +1231,43 @@ uint32_t __attribute__((export_name("TS_LDKClosureReason_ty_from_ptr"))) TS_LDKC default: abort(); } } -jstring __attribute__((export_name("TS_LDKClosureReason_CounterpartyForceClosed_get_peer_msg"))) TS_LDKClosureReason_CounterpartyForceClosed_get_peer_msg(uint32_t ptr) { - LDKClosureReason *obj = (LDKClosureReason*)(ptr & ~1); +jstring __attribute__((export_name("TS_LDKClosureReason_CounterpartyForceClosed_get_peer_msg"))) TS_LDKClosureReason_CounterpartyForceClosed_get_peer_msg(uint64_t ptr) { + LDKClosureReason *obj = (LDKClosureReason*)untag_ptr(ptr); assert(obj->tag == LDKClosureReason_CounterpartyForceClosed); LDKStr peer_msg_str = obj->counterparty_force_closed.peer_msg; jstring peer_msg_conv = str_ref_to_ts(peer_msg_str.chars, peer_msg_str.len); return peer_msg_conv; } -jstring __attribute__((export_name("TS_LDKClosureReason_ProcessingError_get_err"))) TS_LDKClosureReason_ProcessingError_get_err(uint32_t ptr) { - LDKClosureReason *obj = (LDKClosureReason*)(ptr & ~1); +jstring __attribute__((export_name("TS_LDKClosureReason_ProcessingError_get_err"))) TS_LDKClosureReason_ProcessingError_get_err(uint64_t ptr) { + LDKClosureReason *obj = (LDKClosureReason*)untag_ptr(ptr); assert(obj->tag == LDKClosureReason_ProcessingError); LDKStr err_str = obj->processing_error.err; jstring err_conv = str_ref_to_ts(err_str.chars, err_str.len); return err_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); +uint32_t __attribute__((export_name("TS_LDKCOption_ClosureReasonZ_ty_from_ptr"))) TS_LDKCOption_ClosureReasonZ_ty_from_ptr(uint64_t ptr) { + LDKCOption_ClosureReasonZ *obj = (LDKCOption_ClosureReasonZ*)untag_ptr(ptr); switch(obj->tag) { case LDKCOption_ClosureReasonZ_Some: return 0; case LDKCOption_ClosureReasonZ_None: return 1; default: abort(); } } -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); +uint64_t __attribute__((export_name("TS_LDKCOption_ClosureReasonZ_Some_get_some"))) TS_LDKCOption_ClosureReasonZ_Some_get_some(uint64_t ptr) { + LDKCOption_ClosureReasonZ *obj = (LDKCOption_ClosureReasonZ*)untag_ptr(ptr); assert(obj->tag == LDKCOption_ClosureReasonZ_Some); - uint32_t some_ref = ((uintptr_t)&obj->some) | 1; + uint64_t some_ref = tag_ptr(&obj->some, false); return some_ref; } static inline struct LDKCOption_ClosureReasonZ CResult_COption_ClosureReasonZDecodeErrorZ_get_ok(LDKCResult_COption_ClosureReasonZDecodeErrorZ *NONNULL_PTR owner){ CHECK(owner->result_ok); return COption_ClosureReasonZ_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErrorZ_get_ok"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_COption_ClosureReasonZDecodeErrorZ* owner_conv = (LDKCResult_COption_ClosureReasonZDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErrorZ_get_ok"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_COption_ClosureReasonZDecodeErrorZ* owner_conv = (LDKCResult_COption_ClosureReasonZDecodeErrorZ*)untag_ptr(owner); LDKCOption_ClosureReasonZ *ret_copy = MALLOC(sizeof(LDKCOption_ClosureReasonZ), "LDKCOption_ClosureReasonZ"); *ret_copy = CResult_COption_ClosureReasonZDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } @@ -1412,22 +1275,17 @@ static inline struct LDKDecodeError CResult_COption_ClosureReasonZDecodeErrorZ_g CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErrorZ_get_err"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_COption_ClosureReasonZDecodeErrorZ* owner_conv = (LDKCResult_COption_ClosureReasonZDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_COption_ClosureReasonZDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_LDKHTLCDestination_ty_from_ptr"))) TS_LDKHTLCDestination_ty_from_ptr(uint32_t ptr) { - LDKHTLCDestination *obj = (LDKHTLCDestination*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKHTLCDestination_ty_from_ptr"))) TS_LDKHTLCDestination_ty_from_ptr(uint64_t ptr) { + LDKHTLCDestination *obj = (LDKHTLCDestination*)untag_ptr(ptr); switch(obj->tag) { case LDKHTLCDestination_NextHopChannel: return 0; case LDKHTLCDestination_UnknownNextHop: return 1; @@ -1435,56 +1293,56 @@ uint32_t __attribute__((export_name("TS_LDKHTLCDestination_ty_from_ptr"))) TS_LD default: abort(); } } -int8_tArray __attribute__((export_name("TS_LDKHTLCDestination_NextHopChannel_get_node_id"))) TS_LDKHTLCDestination_NextHopChannel_get_node_id(uint32_t ptr) { - LDKHTLCDestination *obj = (LDKHTLCDestination*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKHTLCDestination_NextHopChannel_get_node_id"))) TS_LDKHTLCDestination_NextHopChannel_get_node_id(uint64_t ptr) { + LDKHTLCDestination *obj = (LDKHTLCDestination*)untag_ptr(ptr); assert(obj->tag == LDKHTLCDestination_NextHopChannel); int8_tArray node_id_arr = init_int8_tArray(33, __LINE__); memcpy(node_id_arr->elems, obj->next_hop_channel.node_id.compressed_form, 33); return node_id_arr; } -int8_tArray __attribute__((export_name("TS_LDKHTLCDestination_NextHopChannel_get_channel_id"))) TS_LDKHTLCDestination_NextHopChannel_get_channel_id(uint32_t ptr) { - LDKHTLCDestination *obj = (LDKHTLCDestination*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKHTLCDestination_NextHopChannel_get_channel_id"))) TS_LDKHTLCDestination_NextHopChannel_get_channel_id(uint64_t ptr) { + LDKHTLCDestination *obj = (LDKHTLCDestination*)untag_ptr(ptr); assert(obj->tag == LDKHTLCDestination_NextHopChannel); int8_tArray channel_id_arr = init_int8_tArray(32, __LINE__); memcpy(channel_id_arr->elems, obj->next_hop_channel.channel_id.data, 32); return channel_id_arr; } -int64_t __attribute__((export_name("TS_LDKHTLCDestination_UnknownNextHop_get_requested_forward_scid"))) TS_LDKHTLCDestination_UnknownNextHop_get_requested_forward_scid(uint32_t ptr) { - LDKHTLCDestination *obj = (LDKHTLCDestination*)(ptr & ~1); +int64_t __attribute__((export_name("TS_LDKHTLCDestination_UnknownNextHop_get_requested_forward_scid"))) TS_LDKHTLCDestination_UnknownNextHop_get_requested_forward_scid(uint64_t ptr) { + LDKHTLCDestination *obj = (LDKHTLCDestination*)untag_ptr(ptr); assert(obj->tag == LDKHTLCDestination_UnknownNextHop); int64_t requested_forward_scid_conv = obj->unknown_next_hop.requested_forward_scid; return requested_forward_scid_conv; } -int8_tArray __attribute__((export_name("TS_LDKHTLCDestination_FailedPayment_get_payment_hash"))) TS_LDKHTLCDestination_FailedPayment_get_payment_hash(uint32_t ptr) { - LDKHTLCDestination *obj = (LDKHTLCDestination*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKHTLCDestination_FailedPayment_get_payment_hash"))) TS_LDKHTLCDestination_FailedPayment_get_payment_hash(uint64_t ptr) { + LDKHTLCDestination *obj = (LDKHTLCDestination*)untag_ptr(ptr); assert(obj->tag == LDKHTLCDestination_FailedPayment); int8_tArray payment_hash_arr = init_int8_tArray(32, __LINE__); memcpy(payment_hash_arr->elems, obj->failed_payment.payment_hash.data, 32); return payment_hash_arr; } -uint32_t __attribute__((export_name("TS_LDKCOption_HTLCDestinationZ_ty_from_ptr"))) TS_LDKCOption_HTLCDestinationZ_ty_from_ptr(uint32_t ptr) { - LDKCOption_HTLCDestinationZ *obj = (LDKCOption_HTLCDestinationZ*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKCOption_HTLCDestinationZ_ty_from_ptr"))) TS_LDKCOption_HTLCDestinationZ_ty_from_ptr(uint64_t ptr) { + LDKCOption_HTLCDestinationZ *obj = (LDKCOption_HTLCDestinationZ*)untag_ptr(ptr); switch(obj->tag) { case LDKCOption_HTLCDestinationZ_Some: return 0; case LDKCOption_HTLCDestinationZ_None: return 1; default: abort(); } } -uint32_t __attribute__((export_name("TS_LDKCOption_HTLCDestinationZ_Some_get_some"))) TS_LDKCOption_HTLCDestinationZ_Some_get_some(uint32_t ptr) { - LDKCOption_HTLCDestinationZ *obj = (LDKCOption_HTLCDestinationZ*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKCOption_HTLCDestinationZ_Some_get_some"))) TS_LDKCOption_HTLCDestinationZ_Some_get_some(uint64_t ptr) { + LDKCOption_HTLCDestinationZ *obj = (LDKCOption_HTLCDestinationZ*)untag_ptr(ptr); assert(obj->tag == LDKCOption_HTLCDestinationZ_Some); - uint32_t some_ref = ((uintptr_t)&obj->some) | 1; + uint64_t some_ref = tag_ptr(&obj->some, false); return some_ref; } static inline struct LDKCOption_HTLCDestinationZ CResult_COption_HTLCDestinationZDecodeErrorZ_get_ok(LDKCResult_COption_HTLCDestinationZDecodeErrorZ *NONNULL_PTR owner){ CHECK(owner->result_ok); return COption_HTLCDestinationZ_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_COption_HTLCDestinationZDecodeErrorZ_get_ok"))) TS_CResult_COption_HTLCDestinationZDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_COption_HTLCDestinationZDecodeErrorZ* owner_conv = (LDKCResult_COption_HTLCDestinationZDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_COption_HTLCDestinationZDecodeErrorZ_get_ok"))) TS_CResult_COption_HTLCDestinationZDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_COption_HTLCDestinationZDecodeErrorZ* owner_conv = (LDKCResult_COption_HTLCDestinationZDecodeErrorZ*)untag_ptr(owner); LDKCOption_HTLCDestinationZ *ret_copy = MALLOC(sizeof(LDKCOption_HTLCDestinationZ), "LDKCOption_HTLCDestinationZ"); *ret_copy = CResult_COption_HTLCDestinationZDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } @@ -1492,22 +1350,17 @@ static inline struct LDKDecodeError CResult_COption_HTLCDestinationZDecodeErrorZ CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_COption_HTLCDestinationZDecodeErrorZ_get_err"))) TS_CResult_COption_HTLCDestinationZDecodeErrorZ_get_err(uint32_t owner) { - LDKCResult_COption_HTLCDestinationZDecodeErrorZ* owner_conv = (LDKCResult_COption_HTLCDestinationZDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_COption_HTLCDestinationZDecodeErrorZ_get_err"))) TS_CResult_COption_HTLCDestinationZDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_COption_HTLCDestinationZDecodeErrorZ* owner_conv = (LDKCResult_COption_HTLCDestinationZDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_COption_HTLCDestinationZDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_LDKNetworkUpdate_ty_from_ptr"))) TS_LDKNetworkUpdate_ty_from_ptr(uint32_t ptr) { - LDKNetworkUpdate *obj = (LDKNetworkUpdate*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKNetworkUpdate_ty_from_ptr"))) TS_LDKNetworkUpdate_ty_from_ptr(uint64_t ptr) { + LDKNetworkUpdate *obj = (LDKNetworkUpdate*)untag_ptr(ptr); switch(obj->tag) { case LDKNetworkUpdate_ChannelUpdateMessage: return 0; case LDKNetworkUpdate_ChannelFailure: return 1; @@ -1515,58 +1368,56 @@ uint32_t __attribute__((export_name("TS_LDKNetworkUpdate_ty_from_ptr"))) TS_LDKN default: abort(); } } -uint32_t __attribute__((export_name("TS_LDKNetworkUpdate_ChannelUpdateMessage_get_msg"))) TS_LDKNetworkUpdate_ChannelUpdateMessage_get_msg(uint32_t ptr) { - LDKNetworkUpdate *obj = (LDKNetworkUpdate*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKNetworkUpdate_ChannelUpdateMessage_get_msg"))) TS_LDKNetworkUpdate_ChannelUpdateMessage_get_msg(uint64_t ptr) { + LDKNetworkUpdate *obj = (LDKNetworkUpdate*)untag_ptr(ptr); assert(obj->tag == LDKNetworkUpdate_ChannelUpdateMessage); LDKChannelUpdate msg_var = obj->channel_update_message.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); return msg_ref; } -int64_t __attribute__((export_name("TS_LDKNetworkUpdate_ChannelFailure_get_short_channel_id"))) TS_LDKNetworkUpdate_ChannelFailure_get_short_channel_id(uint32_t ptr) { - LDKNetworkUpdate *obj = (LDKNetworkUpdate*)(ptr & ~1); +int64_t __attribute__((export_name("TS_LDKNetworkUpdate_ChannelFailure_get_short_channel_id"))) TS_LDKNetworkUpdate_ChannelFailure_get_short_channel_id(uint64_t ptr) { + LDKNetworkUpdate *obj = (LDKNetworkUpdate*)untag_ptr(ptr); assert(obj->tag == LDKNetworkUpdate_ChannelFailure); int64_t short_channel_id_conv = obj->channel_failure.short_channel_id; return short_channel_id_conv; } -jboolean __attribute__((export_name("TS_LDKNetworkUpdate_ChannelFailure_get_is_permanent"))) TS_LDKNetworkUpdate_ChannelFailure_get_is_permanent(uint32_t ptr) { - LDKNetworkUpdate *obj = (LDKNetworkUpdate*)(ptr & ~1); +jboolean __attribute__((export_name("TS_LDKNetworkUpdate_ChannelFailure_get_is_permanent"))) TS_LDKNetworkUpdate_ChannelFailure_get_is_permanent(uint64_t ptr) { + LDKNetworkUpdate *obj = (LDKNetworkUpdate*)untag_ptr(ptr); assert(obj->tag == LDKNetworkUpdate_ChannelFailure); jboolean is_permanent_conv = obj->channel_failure.is_permanent; return is_permanent_conv; } -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); +int8_tArray __attribute__((export_name("TS_LDKNetworkUpdate_NodeFailure_get_node_id"))) TS_LDKNetworkUpdate_NodeFailure_get_node_id(uint64_t ptr) { + LDKNetworkUpdate *obj = (LDKNetworkUpdate*)untag_ptr(ptr); assert(obj->tag == LDKNetworkUpdate_NodeFailure); 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; } -jboolean __attribute__((export_name("TS_LDKNetworkUpdate_NodeFailure_get_is_permanent"))) TS_LDKNetworkUpdate_NodeFailure_get_is_permanent(uint32_t ptr) { - LDKNetworkUpdate *obj = (LDKNetworkUpdate*)(ptr & ~1); +jboolean __attribute__((export_name("TS_LDKNetworkUpdate_NodeFailure_get_is_permanent"))) TS_LDKNetworkUpdate_NodeFailure_get_is_permanent(uint64_t ptr) { + LDKNetworkUpdate *obj = (LDKNetworkUpdate*)untag_ptr(ptr); assert(obj->tag == LDKNetworkUpdate_NodeFailure); jboolean is_permanent_conv = obj->node_failure.is_permanent; return is_permanent_conv; } -uint32_t __attribute__((export_name("TS_LDKCOption_NetworkUpdateZ_ty_from_ptr"))) TS_LDKCOption_NetworkUpdateZ_ty_from_ptr(uint32_t ptr) { - LDKCOption_NetworkUpdateZ *obj = (LDKCOption_NetworkUpdateZ*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKCOption_NetworkUpdateZ_ty_from_ptr"))) TS_LDKCOption_NetworkUpdateZ_ty_from_ptr(uint64_t ptr) { + LDKCOption_NetworkUpdateZ *obj = (LDKCOption_NetworkUpdateZ*)untag_ptr(ptr); switch(obj->tag) { case LDKCOption_NetworkUpdateZ_Some: return 0; case LDKCOption_NetworkUpdateZ_None: return 1; default: abort(); } } -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); +uint64_t __attribute__((export_name("TS_LDKCOption_NetworkUpdateZ_Some_get_some"))) TS_LDKCOption_NetworkUpdateZ_Some_get_some(uint64_t ptr) { + LDKCOption_NetworkUpdateZ *obj = (LDKCOption_NetworkUpdateZ*)untag_ptr(ptr); assert(obj->tag == LDKCOption_NetworkUpdateZ_Some); - uint32_t some_ref = ((uintptr_t)&obj->some) | 1; + uint64_t some_ref = tag_ptr(&obj->some, false); return some_ref; } -uint32_t __attribute__((export_name("TS_LDKSpendableOutputDescriptor_ty_from_ptr"))) TS_LDKSpendableOutputDescriptor_ty_from_ptr(uint32_t ptr) { - LDKSpendableOutputDescriptor *obj = (LDKSpendableOutputDescriptor*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKSpendableOutputDescriptor_ty_from_ptr"))) TS_LDKSpendableOutputDescriptor_ty_from_ptr(uint64_t ptr) { + LDKSpendableOutputDescriptor *obj = (LDKSpendableOutputDescriptor*)untag_ptr(ptr); switch(obj->tag) { case LDKSpendableOutputDescriptor_StaticOutput: return 0; case LDKSpendableOutputDescriptor_DelayedPaymentOutput: return 1; @@ -1574,43 +1425,37 @@ uint32_t __attribute__((export_name("TS_LDKSpendableOutputDescriptor_ty_from_ptr default: abort(); } } -uint32_t __attribute__((export_name("TS_LDKSpendableOutputDescriptor_StaticOutput_get_outpoint"))) TS_LDKSpendableOutputDescriptor_StaticOutput_get_outpoint(uint32_t ptr) { - LDKSpendableOutputDescriptor *obj = (LDKSpendableOutputDescriptor*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKSpendableOutputDescriptor_StaticOutput_get_outpoint"))) TS_LDKSpendableOutputDescriptor_StaticOutput_get_outpoint(uint64_t ptr) { + LDKSpendableOutputDescriptor *obj = (LDKSpendableOutputDescriptor*)untag_ptr(ptr); assert(obj->tag == LDKSpendableOutputDescriptor_StaticOutput); LDKOutPoint outpoint_var = obj->static_output.outpoint; - uint32_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. + uint64_t outpoint_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(outpoint_var); - outpoint_ref = (uintptr_t)outpoint_var.inner & ~1; + outpoint_ref = tag_ptr(outpoint_var.inner, false); 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); +uint64_t __attribute__((export_name("TS_LDKSpendableOutputDescriptor_StaticOutput_get_output"))) TS_LDKSpendableOutputDescriptor_StaticOutput_get_output(uint64_t ptr) { + LDKSpendableOutputDescriptor *obj = (LDKSpendableOutputDescriptor*)untag_ptr(ptr); assert(obj->tag == LDKSpendableOutputDescriptor_StaticOutput); - uint32_t output_ref = ((uintptr_t)&obj->static_output.output) | 1; - return (uint32_t)output_ref; + LDKTxOut* output_ref = &obj->static_output.output; + return tag_ptr(output_ref, false); } -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); +uint64_t __attribute__((export_name("TS_LDKSpendableOutputDescriptor_DelayedPaymentOutput_get_delayed_payment_output"))) TS_LDKSpendableOutputDescriptor_DelayedPaymentOutput_get_delayed_payment_output(uint64_t ptr) { + LDKSpendableOutputDescriptor *obj = (LDKSpendableOutputDescriptor*)untag_ptr(ptr); assert(obj->tag == LDKSpendableOutputDescriptor_DelayedPaymentOutput); LDKDelayedPaymentOutputDescriptor delayed_payment_output_var = obj->delayed_payment_output; - uint32_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. + uint64_t delayed_payment_output_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(delayed_payment_output_var); - delayed_payment_output_ref = (uintptr_t)delayed_payment_output_var.inner & ~1; + delayed_payment_output_ref = tag_ptr(delayed_payment_output_var.inner, false); 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); +uint64_t __attribute__((export_name("TS_LDKSpendableOutputDescriptor_StaticPaymentOutput_get_static_payment_output"))) TS_LDKSpendableOutputDescriptor_StaticPaymentOutput_get_static_payment_output(uint64_t ptr) { + LDKSpendableOutputDescriptor *obj = (LDKSpendableOutputDescriptor*)untag_ptr(ptr); assert(obj->tag == LDKSpendableOutputDescriptor_StaticPaymentOutput); LDKStaticPaymentOutputDescriptor static_payment_output_var = obj->static_payment_output; - uint32_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. + uint64_t static_payment_output_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(static_payment_output_var); - static_payment_output_ref = (uintptr_t)static_payment_output_var.inner & ~1; + static_payment_output_ref = tag_ptr(static_payment_output_var.inner, false); return static_payment_output_ref; } static inline LDKCVec_SpendableOutputDescriptorZ CVec_SpendableOutputDescriptorZ_clone(const LDKCVec_SpendableOutputDescriptorZ *orig) { @@ -1620,8 +1465,8 @@ static inline LDKCVec_SpendableOutputDescriptorZ CVec_SpendableOutputDescriptorZ } return ret; } -uint32_t __attribute__((export_name("TS_LDKEvent_ty_from_ptr"))) TS_LDKEvent_ty_from_ptr(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKEvent_ty_from_ptr"))) TS_LDKEvent_ty_from_ptr(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); switch(obj->tag) { case LDKEvent_FundingGenerationReady: return 0; case LDKEvent_PaymentReceived: return 1; @@ -1642,447 +1487,433 @@ uint32_t __attribute__((export_name("TS_LDKEvent_ty_from_ptr"))) TS_LDKEvent_ty_ default: abort(); } } -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); +int8_tArray __attribute__((export_name("TS_LDKEvent_FundingGenerationReady_get_temporary_channel_id"))) TS_LDKEvent_FundingGenerationReady_get_temporary_channel_id(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_FundingGenerationReady); 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; } -int8_tArray __attribute__((export_name("TS_LDKEvent_FundingGenerationReady_get_counterparty_node_id"))) TS_LDKEvent_FundingGenerationReady_get_counterparty_node_id(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKEvent_FundingGenerationReady_get_counterparty_node_id"))) TS_LDKEvent_FundingGenerationReady_get_counterparty_node_id(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_FundingGenerationReady); int8_tArray counterparty_node_id_arr = init_int8_tArray(33, __LINE__); memcpy(counterparty_node_id_arr->elems, obj->funding_generation_ready.counterparty_node_id.compressed_form, 33); return counterparty_node_id_arr; } -int64_t __attribute__((export_name("TS_LDKEvent_FundingGenerationReady_get_channel_value_satoshis"))) TS_LDKEvent_FundingGenerationReady_get_channel_value_satoshis(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int64_t __attribute__((export_name("TS_LDKEvent_FundingGenerationReady_get_channel_value_satoshis"))) TS_LDKEvent_FundingGenerationReady_get_channel_value_satoshis(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_FundingGenerationReady); int64_t channel_value_satoshis_conv = obj->funding_generation_ready.channel_value_satoshis; return channel_value_satoshis_conv; } -int8_tArray __attribute__((export_name("TS_LDKEvent_FundingGenerationReady_get_output_script"))) TS_LDKEvent_FundingGenerationReady_get_output_script(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKEvent_FundingGenerationReady_get_output_script"))) TS_LDKEvent_FundingGenerationReady_get_output_script(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); 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, __LINE__); memcpy(output_script_arr->elems, output_script_var.data, output_script_var.datalen); return output_script_arr; } -int64_t __attribute__((export_name("TS_LDKEvent_FundingGenerationReady_get_user_channel_id"))) TS_LDKEvent_FundingGenerationReady_get_user_channel_id(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int64_t __attribute__((export_name("TS_LDKEvent_FundingGenerationReady_get_user_channel_id"))) TS_LDKEvent_FundingGenerationReady_get_user_channel_id(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_FundingGenerationReady); int64_t user_channel_id_conv = obj->funding_generation_ready.user_channel_id; return user_channel_id_conv; } -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); +int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentReceived_get_payment_hash"))) TS_LDKEvent_PaymentReceived_get_payment_hash(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentReceived); 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; } -int64_t __attribute__((export_name("TS_LDKEvent_PaymentReceived_get_amount_msat"))) TS_LDKEvent_PaymentReceived_get_amount_msat(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int64_t __attribute__((export_name("TS_LDKEvent_PaymentReceived_get_amount_msat"))) TS_LDKEvent_PaymentReceived_get_amount_msat(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentReceived); int64_t amount_msat_conv = obj->payment_received.amount_msat; return amount_msat_conv; } -uint32_t __attribute__((export_name("TS_LDKEvent_PaymentReceived_get_purpose"))) TS_LDKEvent_PaymentReceived_get_purpose(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKEvent_PaymentReceived_get_purpose"))) TS_LDKEvent_PaymentReceived_get_purpose(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentReceived); - uint32_t purpose_ref = ((uintptr_t)&obj->payment_received.purpose) | 1; + uint64_t purpose_ref = tag_ptr(&obj->payment_received.purpose, false); return purpose_ref; } -int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentClaimed_get_payment_hash"))) TS_LDKEvent_PaymentClaimed_get_payment_hash(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentClaimed_get_payment_hash"))) TS_LDKEvent_PaymentClaimed_get_payment_hash(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentClaimed); int8_tArray payment_hash_arr = init_int8_tArray(32, __LINE__); memcpy(payment_hash_arr->elems, obj->payment_claimed.payment_hash.data, 32); return payment_hash_arr; } -int64_t __attribute__((export_name("TS_LDKEvent_PaymentClaimed_get_amount_msat"))) TS_LDKEvent_PaymentClaimed_get_amount_msat(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int64_t __attribute__((export_name("TS_LDKEvent_PaymentClaimed_get_amount_msat"))) TS_LDKEvent_PaymentClaimed_get_amount_msat(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentClaimed); int64_t amount_msat_conv = obj->payment_claimed.amount_msat; return amount_msat_conv; } -uint32_t __attribute__((export_name("TS_LDKEvent_PaymentClaimed_get_purpose"))) TS_LDKEvent_PaymentClaimed_get_purpose(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKEvent_PaymentClaimed_get_purpose"))) TS_LDKEvent_PaymentClaimed_get_purpose(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentClaimed); - uint32_t purpose_ref = ((uintptr_t)&obj->payment_claimed.purpose) | 1; + uint64_t purpose_ref = tag_ptr(&obj->payment_claimed.purpose, false); 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); +int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentSent_get_payment_id"))) TS_LDKEvent_PaymentSent_get_payment_id(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentSent); 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); +int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentSent_get_payment_preimage"))) TS_LDKEvent_PaymentSent_get_payment_preimage(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentSent); 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); +int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentSent_get_payment_hash"))) TS_LDKEvent_PaymentSent_get_payment_hash(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentSent); 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); +uint64_t __attribute__((export_name("TS_LDKEvent_PaymentSent_get_fee_paid_msat"))) TS_LDKEvent_PaymentSent_get_fee_paid_msat(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentSent); - uint32_t fee_paid_msat_ref = ((uintptr_t)&obj->payment_sent.fee_paid_msat) | 1; + uint64_t fee_paid_msat_ref = tag_ptr(&obj->payment_sent.fee_paid_msat, false); return fee_paid_msat_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); +int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentFailed_get_payment_id"))) TS_LDKEvent_PaymentFailed_get_payment_id(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentFailed); 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); +int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentFailed_get_payment_hash"))) TS_LDKEvent_PaymentFailed_get_payment_hash(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentFailed); 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; } -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); +int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentPathSuccessful_get_payment_id"))) TS_LDKEvent_PaymentPathSuccessful_get_payment_id(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentPathSuccessful); 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); +int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentPathSuccessful_get_payment_hash"))) TS_LDKEvent_PaymentPathSuccessful_get_payment_hash(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentPathSuccessful); 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; } -uint32_tArray __attribute__((export_name("TS_LDKEvent_PaymentPathSuccessful_get_path"))) TS_LDKEvent_PaymentPathSuccessful_get_path(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +uint64_tArray __attribute__((export_name("TS_LDKEvent_PaymentPathSuccessful_get_path"))) TS_LDKEvent_PaymentPathSuccessful_get_path(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); 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, __LINE__); - uint32_t *path_arr_ptr = (uint32_t*)(((uint8_t*)path_arr) + 8); + uint64_tArray path_arr = NULL; + path_arr = init_uint64_tArray(path_var.datalen, __LINE__); + uint64_t *path_arr_ptr = (uint64_t*)(((uint8_t*)path_arr) + 8); for (size_t k = 0; k < path_var.datalen; k++) { LDKRouteHop path_conv_10_var = path_var.data[k]; - uint32_t path_conv_10_ref = 0; - CHECK((((uintptr_t)path_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&path_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t path_conv_10_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_var); - path_conv_10_ref = (uintptr_t)path_conv_10_var.inner & ~1; + path_conv_10_ref = tag_ptr(path_conv_10_var.inner, false); path_arr_ptr[k] = path_conv_10_ref; } return path_arr; } -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); +int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_payment_id"))) TS_LDKEvent_PaymentPathFailed_get_payment_id(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentPathFailed); 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); +int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_payment_hash"))) TS_LDKEvent_PaymentPathFailed_get_payment_hash(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentPathFailed); 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; } -jboolean __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_rejected_by_dest"))) TS_LDKEvent_PaymentPathFailed_get_rejected_by_dest(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +jboolean __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_rejected_by_dest"))) TS_LDKEvent_PaymentPathFailed_get_rejected_by_dest(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentPathFailed); jboolean rejected_by_dest_conv = obj->payment_path_failed.rejected_by_dest; return rejected_by_dest_conv; } -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); +uint64_t __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_network_update"))) TS_LDKEvent_PaymentPathFailed_get_network_update(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentPathFailed); - uint32_t network_update_ref = ((uintptr_t)&obj->payment_path_failed.network_update) | 1; + uint64_t network_update_ref = tag_ptr(&obj->payment_path_failed.network_update, false); 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) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +jboolean __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_all_paths_failed"))) TS_LDKEvent_PaymentPathFailed_get_all_paths_failed(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentPathFailed); jboolean all_paths_failed_conv = obj->payment_path_failed.all_paths_failed; return all_paths_failed_conv; } -uint32_tArray __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_path"))) TS_LDKEvent_PaymentPathFailed_get_path(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +uint64_tArray __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_path"))) TS_LDKEvent_PaymentPathFailed_get_path(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); 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, __LINE__); - uint32_t *path_arr_ptr = (uint32_t*)(((uint8_t*)path_arr) + 8); + uint64_tArray path_arr = NULL; + path_arr = init_uint64_tArray(path_var.datalen, __LINE__); + uint64_t *path_arr_ptr = (uint64_t*)(((uint8_t*)path_arr) + 8); for (size_t k = 0; k < path_var.datalen; k++) { LDKRouteHop path_conv_10_var = path_var.data[k]; - uint32_t path_conv_10_ref = 0; - CHECK((((uintptr_t)path_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&path_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t path_conv_10_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_var); - path_conv_10_ref = (uintptr_t)path_conv_10_var.inner & ~1; + path_conv_10_ref = tag_ptr(path_conv_10_var.inner, false); path_arr_ptr[k] = path_conv_10_ref; } return path_arr; } -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); +uint64_t __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_short_channel_id"))) TS_LDKEvent_PaymentPathFailed_get_short_channel_id(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentPathFailed); - uint32_t short_channel_id_ref = ((uintptr_t)&obj->payment_path_failed.short_channel_id) | 1; + uint64_t short_channel_id_ref = tag_ptr(&obj->payment_path_failed.short_channel_id, false); 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); +uint64_t __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_retry"))) TS_LDKEvent_PaymentPathFailed_get_retry(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentPathFailed); LDKRouteParameters retry_var = obj->payment_path_failed.retry; - uint32_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. + uint64_t retry_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(retry_var); - retry_ref = (uintptr_t)retry_var.inner & ~1; - } + retry_ref = tag_ptr(retry_var.inner, false); return retry_ref; } -int8_tArray __attribute__((export_name("TS_LDKEvent_ProbeSuccessful_get_payment_id"))) TS_LDKEvent_ProbeSuccessful_get_payment_id(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKEvent_ProbeSuccessful_get_payment_id"))) TS_LDKEvent_ProbeSuccessful_get_payment_id(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_ProbeSuccessful); int8_tArray payment_id_arr = init_int8_tArray(32, __LINE__); memcpy(payment_id_arr->elems, obj->probe_successful.payment_id.data, 32); return payment_id_arr; } -int8_tArray __attribute__((export_name("TS_LDKEvent_ProbeSuccessful_get_payment_hash"))) TS_LDKEvent_ProbeSuccessful_get_payment_hash(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKEvent_ProbeSuccessful_get_payment_hash"))) TS_LDKEvent_ProbeSuccessful_get_payment_hash(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_ProbeSuccessful); int8_tArray payment_hash_arr = init_int8_tArray(32, __LINE__); memcpy(payment_hash_arr->elems, obj->probe_successful.payment_hash.data, 32); return payment_hash_arr; } -uint32_tArray __attribute__((export_name("TS_LDKEvent_ProbeSuccessful_get_path"))) TS_LDKEvent_ProbeSuccessful_get_path(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +uint64_tArray __attribute__((export_name("TS_LDKEvent_ProbeSuccessful_get_path"))) TS_LDKEvent_ProbeSuccessful_get_path(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_ProbeSuccessful); LDKCVec_RouteHopZ path_var = obj->probe_successful.path; - uint32_tArray path_arr = NULL; - path_arr = init_uint32_tArray(path_var.datalen, __LINE__); - uint32_t *path_arr_ptr = (uint32_t*)(((uint8_t*)path_arr) + 8); + uint64_tArray path_arr = NULL; + path_arr = init_uint64_tArray(path_var.datalen, __LINE__); + uint64_t *path_arr_ptr = (uint64_t*)(((uint8_t*)path_arr) + 8); for (size_t k = 0; k < path_var.datalen; k++) { LDKRouteHop path_conv_10_var = path_var.data[k]; - uint32_t path_conv_10_ref = 0; - CHECK((((uintptr_t)path_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&path_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t path_conv_10_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_var); - path_conv_10_ref = (uintptr_t)path_conv_10_var.inner & ~1; + path_conv_10_ref = tag_ptr(path_conv_10_var.inner, false); path_arr_ptr[k] = path_conv_10_ref; } return path_arr; } -int8_tArray __attribute__((export_name("TS_LDKEvent_ProbeFailed_get_payment_id"))) TS_LDKEvent_ProbeFailed_get_payment_id(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKEvent_ProbeFailed_get_payment_id"))) TS_LDKEvent_ProbeFailed_get_payment_id(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_ProbeFailed); int8_tArray payment_id_arr = init_int8_tArray(32, __LINE__); memcpy(payment_id_arr->elems, obj->probe_failed.payment_id.data, 32); return payment_id_arr; } -int8_tArray __attribute__((export_name("TS_LDKEvent_ProbeFailed_get_payment_hash"))) TS_LDKEvent_ProbeFailed_get_payment_hash(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKEvent_ProbeFailed_get_payment_hash"))) TS_LDKEvent_ProbeFailed_get_payment_hash(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_ProbeFailed); int8_tArray payment_hash_arr = init_int8_tArray(32, __LINE__); memcpy(payment_hash_arr->elems, obj->probe_failed.payment_hash.data, 32); return payment_hash_arr; } -uint32_tArray __attribute__((export_name("TS_LDKEvent_ProbeFailed_get_path"))) TS_LDKEvent_ProbeFailed_get_path(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +uint64_tArray __attribute__((export_name("TS_LDKEvent_ProbeFailed_get_path"))) TS_LDKEvent_ProbeFailed_get_path(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_ProbeFailed); LDKCVec_RouteHopZ path_var = obj->probe_failed.path; - uint32_tArray path_arr = NULL; - path_arr = init_uint32_tArray(path_var.datalen, __LINE__); - uint32_t *path_arr_ptr = (uint32_t*)(((uint8_t*)path_arr) + 8); + uint64_tArray path_arr = NULL; + path_arr = init_uint64_tArray(path_var.datalen, __LINE__); + uint64_t *path_arr_ptr = (uint64_t*)(((uint8_t*)path_arr) + 8); for (size_t k = 0; k < path_var.datalen; k++) { LDKRouteHop path_conv_10_var = path_var.data[k]; - uint32_t path_conv_10_ref = 0; - CHECK((((uintptr_t)path_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&path_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t path_conv_10_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_var); - path_conv_10_ref = (uintptr_t)path_conv_10_var.inner & ~1; + path_conv_10_ref = tag_ptr(path_conv_10_var.inner, false); path_arr_ptr[k] = path_conv_10_ref; } return path_arr; } -uint32_t __attribute__((export_name("TS_LDKEvent_ProbeFailed_get_short_channel_id"))) TS_LDKEvent_ProbeFailed_get_short_channel_id(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKEvent_ProbeFailed_get_short_channel_id"))) TS_LDKEvent_ProbeFailed_get_short_channel_id(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_ProbeFailed); - uint32_t short_channel_id_ref = ((uintptr_t)&obj->probe_failed.short_channel_id) | 1; + uint64_t short_channel_id_ref = tag_ptr(&obj->probe_failed.short_channel_id, false); return short_channel_id_ref; } -int64_t __attribute__((export_name("TS_LDKEvent_PendingHTLCsForwardable_get_time_forwardable"))) TS_LDKEvent_PendingHTLCsForwardable_get_time_forwardable(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int64_t __attribute__((export_name("TS_LDKEvent_PendingHTLCsForwardable_get_time_forwardable"))) TS_LDKEvent_PendingHTLCsForwardable_get_time_forwardable(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PendingHTLCsForwardable); int64_t time_forwardable_conv = obj->pending_htl_cs_forwardable.time_forwardable; return time_forwardable_conv; } -uint32_tArray __attribute__((export_name("TS_LDKEvent_SpendableOutputs_get_outputs"))) TS_LDKEvent_SpendableOutputs_get_outputs(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +uint64_tArray __attribute__((export_name("TS_LDKEvent_SpendableOutputs_get_outputs"))) TS_LDKEvent_SpendableOutputs_get_outputs(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); 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, __LINE__); - uint32_t *outputs_arr_ptr = (uint32_t*)(((uint8_t*)outputs_arr) + 8); + uint64_tArray outputs_arr = NULL; + outputs_arr = init_uint64_tArray(outputs_var.datalen, __LINE__); + uint64_t *outputs_arr_ptr = (uint64_t*)(((uint8_t*)outputs_arr) + 8); for (size_t b = 0; b < outputs_var.datalen; b++) { - uint32_t outputs_conv_27_ref = ((uintptr_t)&outputs_var.data[b]) | 1; + uint64_t outputs_conv_27_ref = tag_ptr(&outputs_var.data[b], false); outputs_arr_ptr[b] = outputs_conv_27_ref; } return outputs_arr; } -int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentForwarded_get_prev_channel_id"))) TS_LDKEvent_PaymentForwarded_get_prev_channel_id(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentForwarded_get_prev_channel_id"))) TS_LDKEvent_PaymentForwarded_get_prev_channel_id(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentForwarded); int8_tArray prev_channel_id_arr = init_int8_tArray(32, __LINE__); memcpy(prev_channel_id_arr->elems, obj->payment_forwarded.prev_channel_id.data, 32); return prev_channel_id_arr; } -int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentForwarded_get_next_channel_id"))) TS_LDKEvent_PaymentForwarded_get_next_channel_id(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentForwarded_get_next_channel_id"))) TS_LDKEvent_PaymentForwarded_get_next_channel_id(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentForwarded); int8_tArray next_channel_id_arr = init_int8_tArray(32, __LINE__); memcpy(next_channel_id_arr->elems, obj->payment_forwarded.next_channel_id.data, 32); return next_channel_id_arr; } -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); +uint64_t __attribute__((export_name("TS_LDKEvent_PaymentForwarded_get_fee_earned_msat"))) TS_LDKEvent_PaymentForwarded_get_fee_earned_msat(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentForwarded); - uint32_t fee_earned_msat_ref = ((uintptr_t)&obj->payment_forwarded.fee_earned_msat) | 1; + uint64_t fee_earned_msat_ref = tag_ptr(&obj->payment_forwarded.fee_earned_msat, false); 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) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +jboolean __attribute__((export_name("TS_LDKEvent_PaymentForwarded_get_claim_from_onchain_tx"))) TS_LDKEvent_PaymentForwarded_get_claim_from_onchain_tx(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_PaymentForwarded); jboolean claim_from_onchain_tx_conv = obj->payment_forwarded.claim_from_onchain_tx; return claim_from_onchain_tx_conv; } -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); +int8_tArray __attribute__((export_name("TS_LDKEvent_ChannelClosed_get_channel_id"))) TS_LDKEvent_ChannelClosed_get_channel_id(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_ChannelClosed); 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; } -int64_t __attribute__((export_name("TS_LDKEvent_ChannelClosed_get_user_channel_id"))) TS_LDKEvent_ChannelClosed_get_user_channel_id(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int64_t __attribute__((export_name("TS_LDKEvent_ChannelClosed_get_user_channel_id"))) TS_LDKEvent_ChannelClosed_get_user_channel_id(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_ChannelClosed); int64_t user_channel_id_conv = obj->channel_closed.user_channel_id; return user_channel_id_conv; } -uint32_t __attribute__((export_name("TS_LDKEvent_ChannelClosed_get_reason"))) TS_LDKEvent_ChannelClosed_get_reason(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKEvent_ChannelClosed_get_reason"))) TS_LDKEvent_ChannelClosed_get_reason(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_ChannelClosed); - uint32_t reason_ref = ((uintptr_t)&obj->channel_closed.reason) | 1; + uint64_t reason_ref = tag_ptr(&obj->channel_closed.reason, false); 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); +int8_tArray __attribute__((export_name("TS_LDKEvent_DiscardFunding_get_channel_id"))) TS_LDKEvent_DiscardFunding_get_channel_id(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_DiscardFunding); 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; } -int8_tArray __attribute__((export_name("TS_LDKEvent_DiscardFunding_get_transaction"))) TS_LDKEvent_DiscardFunding_get_transaction(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKEvent_DiscardFunding_get_transaction"))) TS_LDKEvent_DiscardFunding_get_transaction(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_DiscardFunding); LDKTransaction transaction_var = obj->discard_funding.transaction; 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_OpenChannelRequest_get_temporary_channel_id"))) TS_LDKEvent_OpenChannelRequest_get_temporary_channel_id(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKEvent_OpenChannelRequest_get_temporary_channel_id"))) TS_LDKEvent_OpenChannelRequest_get_temporary_channel_id(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_OpenChannelRequest); int8_tArray temporary_channel_id_arr = init_int8_tArray(32, __LINE__); memcpy(temporary_channel_id_arr->elems, obj->open_channel_request.temporary_channel_id.data, 32); return temporary_channel_id_arr; } -int8_tArray __attribute__((export_name("TS_LDKEvent_OpenChannelRequest_get_counterparty_node_id"))) TS_LDKEvent_OpenChannelRequest_get_counterparty_node_id(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKEvent_OpenChannelRequest_get_counterparty_node_id"))) TS_LDKEvent_OpenChannelRequest_get_counterparty_node_id(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_OpenChannelRequest); int8_tArray counterparty_node_id_arr = init_int8_tArray(33, __LINE__); memcpy(counterparty_node_id_arr->elems, obj->open_channel_request.counterparty_node_id.compressed_form, 33); return counterparty_node_id_arr; } -int64_t __attribute__((export_name("TS_LDKEvent_OpenChannelRequest_get_funding_satoshis"))) TS_LDKEvent_OpenChannelRequest_get_funding_satoshis(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int64_t __attribute__((export_name("TS_LDKEvent_OpenChannelRequest_get_funding_satoshis"))) TS_LDKEvent_OpenChannelRequest_get_funding_satoshis(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_OpenChannelRequest); int64_t funding_satoshis_conv = obj->open_channel_request.funding_satoshis; return funding_satoshis_conv; } -int64_t __attribute__((export_name("TS_LDKEvent_OpenChannelRequest_get_push_msat"))) TS_LDKEvent_OpenChannelRequest_get_push_msat(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int64_t __attribute__((export_name("TS_LDKEvent_OpenChannelRequest_get_push_msat"))) TS_LDKEvent_OpenChannelRequest_get_push_msat(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_OpenChannelRequest); int64_t push_msat_conv = obj->open_channel_request.push_msat; return push_msat_conv; } -uint32_t __attribute__((export_name("TS_LDKEvent_OpenChannelRequest_get_channel_type"))) TS_LDKEvent_OpenChannelRequest_get_channel_type(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKEvent_OpenChannelRequest_get_channel_type"))) TS_LDKEvent_OpenChannelRequest_get_channel_type(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_OpenChannelRequest); LDKChannelTypeFeatures channel_type_var = obj->open_channel_request.channel_type; - uint32_t channel_type_ref = 0; - CHECK((((uintptr_t)channel_type_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&channel_type_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t channel_type_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_type_var); - channel_type_ref = (uintptr_t)channel_type_var.inner & ~1; + channel_type_ref = tag_ptr(channel_type_var.inner, false); return channel_type_ref; } -int8_tArray __attribute__((export_name("TS_LDKEvent_HTLCHandlingFailed_get_prev_channel_id"))) TS_LDKEvent_HTLCHandlingFailed_get_prev_channel_id(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKEvent_HTLCHandlingFailed_get_prev_channel_id"))) TS_LDKEvent_HTLCHandlingFailed_get_prev_channel_id(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_HTLCHandlingFailed); int8_tArray prev_channel_id_arr = init_int8_tArray(32, __LINE__); memcpy(prev_channel_id_arr->elems, obj->htlc_handling_failed.prev_channel_id.data, 32); return prev_channel_id_arr; } -uint32_t __attribute__((export_name("TS_LDKEvent_HTLCHandlingFailed_get_failed_next_destination"))) TS_LDKEvent_HTLCHandlingFailed_get_failed_next_destination(uint32_t ptr) { - LDKEvent *obj = (LDKEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKEvent_HTLCHandlingFailed_get_failed_next_destination"))) TS_LDKEvent_HTLCHandlingFailed_get_failed_next_destination(uint64_t ptr) { + LDKEvent *obj = (LDKEvent*)untag_ptr(ptr); assert(obj->tag == LDKEvent_HTLCHandlingFailed); - uint32_t failed_next_destination_ref = ((uintptr_t)&obj->htlc_handling_failed.failed_next_destination) | 1; + uint64_t failed_next_destination_ref = tag_ptr(&obj->htlc_handling_failed.failed_next_destination, false); return failed_next_destination_ref; } -uint32_t __attribute__((export_name("TS_LDKCOption_EventZ_ty_from_ptr"))) TS_LDKCOption_EventZ_ty_from_ptr(uint32_t ptr) { - LDKCOption_EventZ *obj = (LDKCOption_EventZ*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKCOption_EventZ_ty_from_ptr"))) TS_LDKCOption_EventZ_ty_from_ptr(uint64_t ptr) { + LDKCOption_EventZ *obj = (LDKCOption_EventZ*)untag_ptr(ptr); switch(obj->tag) { case LDKCOption_EventZ_Some: return 0; case LDKCOption_EventZ_None: return 1; default: abort(); } } -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); +uint64_t __attribute__((export_name("TS_LDKCOption_EventZ_Some_get_some"))) TS_LDKCOption_EventZ_Some_get_some(uint64_t ptr) { + LDKCOption_EventZ *obj = (LDKCOption_EventZ*)untag_ptr(ptr); assert(obj->tag == LDKCOption_EventZ_Some); - uint32_t some_ref = ((uintptr_t)&obj->some) | 1; + uint64_t some_ref = tag_ptr(&obj->some, false); return some_ref; } static inline struct LDKCOption_EventZ CResult_COption_EventZDecodeErrorZ_get_ok(LDKCResult_COption_EventZDecodeErrorZ *NONNULL_PTR owner){ CHECK(owner->result_ok); return COption_EventZ_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_get_ok"))) TS_CResult_COption_EventZDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_COption_EventZDecodeErrorZ* owner_conv = (LDKCResult_COption_EventZDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_get_ok"))) TS_CResult_COption_EventZDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_COption_EventZDecodeErrorZ* owner_conv = (LDKCResult_COption_EventZDecodeErrorZ*)untag_ptr(owner); LDKCOption_EventZ *ret_copy = MALLOC(sizeof(LDKCOption_EventZ), "LDKCOption_EventZ"); *ret_copy = CResult_COption_EventZDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } @@ -2090,22 +1921,17 @@ static inline struct LDKDecodeError CResult_COption_EventZDecodeErrorZ_get_err(L CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_get_err"))) TS_CResult_COption_EventZDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_COption_EventZDecodeErrorZ* owner_conv = (LDKCResult_COption_EventZDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_COption_EventZDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_LDKErrorAction_ty_from_ptr"))) TS_LDKErrorAction_ty_from_ptr(uint32_t ptr) { - LDKErrorAction *obj = (LDKErrorAction*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKErrorAction_ty_from_ptr"))) TS_LDKErrorAction_ty_from_ptr(uint64_t ptr) { + LDKErrorAction *obj = (LDKErrorAction*)untag_ptr(ptr); switch(obj->tag) { case LDKErrorAction_DisconnectPeer: return 0; case LDKErrorAction_IgnoreError: return 1; @@ -2116,55 +1942,47 @@ uint32_t __attribute__((export_name("TS_LDKErrorAction_ty_from_ptr"))) TS_LDKErr default: abort(); } } -uint32_t __attribute__((export_name("TS_LDKErrorAction_DisconnectPeer_get_msg"))) TS_LDKErrorAction_DisconnectPeer_get_msg(uint32_t ptr) { - LDKErrorAction *obj = (LDKErrorAction*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKErrorAction_DisconnectPeer_get_msg"))) TS_LDKErrorAction_DisconnectPeer_get_msg(uint64_t ptr) { + LDKErrorAction *obj = (LDKErrorAction*)untag_ptr(ptr); assert(obj->tag == LDKErrorAction_DisconnectPeer); LDKErrorMessage msg_var = obj->disconnect_peer.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; - } + msg_ref = tag_ptr(msg_var.inner, false); return msg_ref; } -uint32_t __attribute__((export_name("TS_LDKErrorAction_IgnoreAndLog_get_ignore_and_log"))) TS_LDKErrorAction_IgnoreAndLog_get_ignore_and_log(uint32_t ptr) { - LDKErrorAction *obj = (LDKErrorAction*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKErrorAction_IgnoreAndLog_get_ignore_and_log"))) TS_LDKErrorAction_IgnoreAndLog_get_ignore_and_log(uint64_t ptr) { + LDKErrorAction *obj = (LDKErrorAction*)untag_ptr(ptr); assert(obj->tag == LDKErrorAction_IgnoreAndLog); uint32_t ignore_and_log_conv = LDKLevel_to_js(obj->ignore_and_log); return ignore_and_log_conv; } -uint32_t __attribute__((export_name("TS_LDKErrorAction_SendErrorMessage_get_msg"))) TS_LDKErrorAction_SendErrorMessage_get_msg(uint32_t ptr) { - LDKErrorAction *obj = (LDKErrorAction*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKErrorAction_SendErrorMessage_get_msg"))) TS_LDKErrorAction_SendErrorMessage_get_msg(uint64_t ptr) { + LDKErrorAction *obj = (LDKErrorAction*)untag_ptr(ptr); assert(obj->tag == LDKErrorAction_SendErrorMessage); LDKErrorMessage msg_var = obj->send_error_message.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); return msg_ref; } -uint32_t __attribute__((export_name("TS_LDKErrorAction_SendWarningMessage_get_msg"))) TS_LDKErrorAction_SendWarningMessage_get_msg(uint32_t ptr) { - LDKErrorAction *obj = (LDKErrorAction*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKErrorAction_SendWarningMessage_get_msg"))) TS_LDKErrorAction_SendWarningMessage_get_msg(uint64_t ptr) { + LDKErrorAction *obj = (LDKErrorAction*)untag_ptr(ptr); assert(obj->tag == LDKErrorAction_SendWarningMessage); LDKWarningMessage msg_var = obj->send_warning_message.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); return msg_ref; } -uint32_t __attribute__((export_name("TS_LDKErrorAction_SendWarningMessage_get_log_level"))) TS_LDKErrorAction_SendWarningMessage_get_log_level(uint32_t ptr) { - LDKErrorAction *obj = (LDKErrorAction*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKErrorAction_SendWarningMessage_get_log_level"))) TS_LDKErrorAction_SendWarningMessage_get_log_level(uint64_t ptr) { + LDKErrorAction *obj = (LDKErrorAction*)untag_ptr(ptr); assert(obj->tag == LDKErrorAction_SendWarningMessage); uint32_t log_level_conv = LDKLevel_to_js(obj->send_warning_message.log_level); return log_level_conv; } -uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_ty_from_ptr"))) TS_LDKMessageSendEvent_ty_from_ptr(uint32_t ptr) { - LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_ty_from_ptr"))) TS_LDKMessageSendEvent_ty_from_ptr(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); switch(obj->tag) { case LDKMessageSendEvent_SendAcceptChannel: return 0; case LDKMessageSendEvent_SendOpenChannel: return 1; @@ -2189,349 +2007,309 @@ uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_ty_from_ptr"))) TS_L default: abort(); } } -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); +int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendAcceptChannel_get_node_id"))) TS_LDKMessageSendEvent_SendAcceptChannel_get_node_id(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendAcceptChannel); 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; } -uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendAcceptChannel_get_msg"))) TS_LDKMessageSendEvent_SendAcceptChannel_get_msg(uint32_t ptr) { - LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_SendAcceptChannel_get_msg"))) TS_LDKMessageSendEvent_SendAcceptChannel_get_msg(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendAcceptChannel); LDKAcceptChannel msg_var = obj->send_accept_channel.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); 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); +int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendOpenChannel_get_node_id"))) TS_LDKMessageSendEvent_SendOpenChannel_get_node_id(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendOpenChannel); 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; } -uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendOpenChannel_get_msg"))) TS_LDKMessageSendEvent_SendOpenChannel_get_msg(uint32_t ptr) { - LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_SendOpenChannel_get_msg"))) TS_LDKMessageSendEvent_SendOpenChannel_get_msg(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendOpenChannel); LDKOpenChannel msg_var = obj->send_open_channel.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); 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); +int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendFundingCreated_get_node_id"))) TS_LDKMessageSendEvent_SendFundingCreated_get_node_id(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendFundingCreated); 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; } -uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendFundingCreated_get_msg"))) TS_LDKMessageSendEvent_SendFundingCreated_get_msg(uint32_t ptr) { - LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_SendFundingCreated_get_msg"))) TS_LDKMessageSendEvent_SendFundingCreated_get_msg(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendFundingCreated); LDKFundingCreated msg_var = obj->send_funding_created.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); 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); +int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendFundingSigned_get_node_id"))) TS_LDKMessageSendEvent_SendFundingSigned_get_node_id(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendFundingSigned); 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; } -uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendFundingSigned_get_msg"))) TS_LDKMessageSendEvent_SendFundingSigned_get_msg(uint32_t ptr) { - LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_SendFundingSigned_get_msg"))) TS_LDKMessageSendEvent_SendFundingSigned_get_msg(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendFundingSigned); LDKFundingSigned msg_var = obj->send_funding_signed.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); return msg_ref; } -int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendChannelReady_get_node_id"))) TS_LDKMessageSendEvent_SendChannelReady_get_node_id(uint32_t ptr) { - LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendChannelReady_get_node_id"))) TS_LDKMessageSendEvent_SendChannelReady_get_node_id(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendChannelReady); int8_tArray node_id_arr = init_int8_tArray(33, __LINE__); memcpy(node_id_arr->elems, obj->send_channel_ready.node_id.compressed_form, 33); return node_id_arr; } -uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendChannelReady_get_msg"))) TS_LDKMessageSendEvent_SendChannelReady_get_msg(uint32_t ptr) { - LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_SendChannelReady_get_msg"))) TS_LDKMessageSendEvent_SendChannelReady_get_msg(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendChannelReady); LDKChannelReady msg_var = obj->send_channel_ready.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); 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); +int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendAnnouncementSignatures_get_node_id"))) TS_LDKMessageSendEvent_SendAnnouncementSignatures_get_node_id(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendAnnouncementSignatures); 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; } -uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendAnnouncementSignatures_get_msg"))) TS_LDKMessageSendEvent_SendAnnouncementSignatures_get_msg(uint32_t ptr) { - LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_SendAnnouncementSignatures_get_msg"))) TS_LDKMessageSendEvent_SendAnnouncementSignatures_get_msg(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendAnnouncementSignatures); LDKAnnouncementSignatures msg_var = obj->send_announcement_signatures.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); 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); +int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_UpdateHTLCs_get_node_id"))) TS_LDKMessageSendEvent_UpdateHTLCs_get_node_id(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_UpdateHTLCs); 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; } -uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_UpdateHTLCs_get_updates"))) TS_LDKMessageSendEvent_UpdateHTLCs_get_updates(uint32_t ptr) { - LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_UpdateHTLCs_get_updates"))) TS_LDKMessageSendEvent_UpdateHTLCs_get_updates(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_UpdateHTLCs); LDKCommitmentUpdate updates_var = obj->update_htl_cs.updates; - uint32_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. + uint64_t updates_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(updates_var); - updates_ref = (uintptr_t)updates_var.inner & ~1; + updates_ref = tag_ptr(updates_var.inner, false); 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); +int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendRevokeAndACK_get_node_id"))) TS_LDKMessageSendEvent_SendRevokeAndACK_get_node_id(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendRevokeAndACK); 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; } -uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendRevokeAndACK_get_msg"))) TS_LDKMessageSendEvent_SendRevokeAndACK_get_msg(uint32_t ptr) { - LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_SendRevokeAndACK_get_msg"))) TS_LDKMessageSendEvent_SendRevokeAndACK_get_msg(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendRevokeAndACK); LDKRevokeAndACK msg_var = obj->send_revoke_and_ack.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); 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); +int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendClosingSigned_get_node_id"))) TS_LDKMessageSendEvent_SendClosingSigned_get_node_id(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendClosingSigned); 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; } -uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendClosingSigned_get_msg"))) TS_LDKMessageSendEvent_SendClosingSigned_get_msg(uint32_t ptr) { - LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_SendClosingSigned_get_msg"))) TS_LDKMessageSendEvent_SendClosingSigned_get_msg(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendClosingSigned); LDKClosingSigned msg_var = obj->send_closing_signed.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); 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); +int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendShutdown_get_node_id"))) TS_LDKMessageSendEvent_SendShutdown_get_node_id(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendShutdown); 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; } -uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendShutdown_get_msg"))) TS_LDKMessageSendEvent_SendShutdown_get_msg(uint32_t ptr) { - LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_SendShutdown_get_msg"))) TS_LDKMessageSendEvent_SendShutdown_get_msg(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendShutdown); LDKShutdown msg_var = obj->send_shutdown.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); 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); +int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendChannelReestablish_get_node_id"))) TS_LDKMessageSendEvent_SendChannelReestablish_get_node_id(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendChannelReestablish); 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; } -uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendChannelReestablish_get_msg"))) TS_LDKMessageSendEvent_SendChannelReestablish_get_msg(uint32_t ptr) { - LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_SendChannelReestablish_get_msg"))) TS_LDKMessageSendEvent_SendChannelReestablish_get_msg(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendChannelReestablish); LDKChannelReestablish msg_var = obj->send_channel_reestablish.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); 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); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_BroadcastChannelAnnouncement_get_msg"))) TS_LDKMessageSendEvent_BroadcastChannelAnnouncement_get_msg(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_BroadcastChannelAnnouncement); LDKChannelAnnouncement msg_var = obj->broadcast_channel_announcement.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); 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); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_BroadcastChannelAnnouncement_get_update_msg"))) TS_LDKMessageSendEvent_BroadcastChannelAnnouncement_get_update_msg(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_BroadcastChannelAnnouncement); LDKChannelUpdate update_msg_var = obj->broadcast_channel_announcement.update_msg; - uint32_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. + uint64_t update_msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(update_msg_var); - update_msg_ref = (uintptr_t)update_msg_var.inner & ~1; + update_msg_ref = tag_ptr(update_msg_var.inner, false); 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); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_BroadcastNodeAnnouncement_get_msg"))) TS_LDKMessageSendEvent_BroadcastNodeAnnouncement_get_msg(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_BroadcastNodeAnnouncement); LDKNodeAnnouncement msg_var = obj->broadcast_node_announcement.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); 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); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_BroadcastChannelUpdate_get_msg"))) TS_LDKMessageSendEvent_BroadcastChannelUpdate_get_msg(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_BroadcastChannelUpdate); LDKChannelUpdate msg_var = obj->broadcast_channel_update.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); 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); +int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendChannelUpdate_get_node_id"))) TS_LDKMessageSendEvent_SendChannelUpdate_get_node_id(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendChannelUpdate); 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; } -uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendChannelUpdate_get_msg"))) TS_LDKMessageSendEvent_SendChannelUpdate_get_msg(uint32_t ptr) { - LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_SendChannelUpdate_get_msg"))) TS_LDKMessageSendEvent_SendChannelUpdate_get_msg(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendChannelUpdate); LDKChannelUpdate msg_var = obj->send_channel_update.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); 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); +int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_HandleError_get_node_id"))) TS_LDKMessageSendEvent_HandleError_get_node_id(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_HandleError); 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); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_HandleError_get_action"))) TS_LDKMessageSendEvent_HandleError_get_action(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_HandleError); - uint32_t action_ref = ((uintptr_t)&obj->handle_error.action) | 1; + uint64_t action_ref = tag_ptr(&obj->handle_error.action, false); 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); +int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendChannelRangeQuery_get_node_id"))) TS_LDKMessageSendEvent_SendChannelRangeQuery_get_node_id(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendChannelRangeQuery); 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; } -uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendChannelRangeQuery_get_msg"))) TS_LDKMessageSendEvent_SendChannelRangeQuery_get_msg(uint32_t ptr) { - LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_SendChannelRangeQuery_get_msg"))) TS_LDKMessageSendEvent_SendChannelRangeQuery_get_msg(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendChannelRangeQuery); LDKQueryChannelRange msg_var = obj->send_channel_range_query.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); 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); +int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendShortIdsQuery_get_node_id"))) TS_LDKMessageSendEvent_SendShortIdsQuery_get_node_id(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendShortIdsQuery); 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; } -uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendShortIdsQuery_get_msg"))) TS_LDKMessageSendEvent_SendShortIdsQuery_get_msg(uint32_t ptr) { - LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_SendShortIdsQuery_get_msg"))) TS_LDKMessageSendEvent_SendShortIdsQuery_get_msg(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendShortIdsQuery); LDKQueryShortChannelIds msg_var = obj->send_short_ids_query.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); 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); +int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendReplyChannelRange_get_node_id"))) TS_LDKMessageSendEvent_SendReplyChannelRange_get_node_id(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendReplyChannelRange); 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; } -uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendReplyChannelRange_get_msg"))) TS_LDKMessageSendEvent_SendReplyChannelRange_get_msg(uint32_t ptr) { - LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_SendReplyChannelRange_get_msg"))) TS_LDKMessageSendEvent_SendReplyChannelRange_get_msg(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendReplyChannelRange); LDKReplyChannelRange msg_var = obj->send_reply_channel_range.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); return msg_ref; } -int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendGossipTimestampFilter_get_node_id"))) TS_LDKMessageSendEvent_SendGossipTimestampFilter_get_node_id(uint32_t ptr) { - LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendGossipTimestampFilter_get_node_id"))) TS_LDKMessageSendEvent_SendGossipTimestampFilter_get_node_id(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendGossipTimestampFilter); int8_tArray node_id_arr = init_int8_tArray(33, __LINE__); memcpy(node_id_arr->elems, obj->send_gossip_timestamp_filter.node_id.compressed_form, 33); return node_id_arr; } -uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendGossipTimestampFilter_get_msg"))) TS_LDKMessageSendEvent_SendGossipTimestampFilter_get_msg(uint32_t ptr) { - LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKMessageSendEvent_SendGossipTimestampFilter_get_msg"))) TS_LDKMessageSendEvent_SendGossipTimestampFilter_get_msg(uint64_t ptr) { + LDKMessageSendEvent *obj = (LDKMessageSendEvent*)untag_ptr(ptr); assert(obj->tag == LDKMessageSendEvent_SendGossipTimestampFilter); LDKGossipTimestampFilter msg_var = obj->send_gossip_timestamp_filter.msg; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner & ~1; + msg_ref = tag_ptr(msg_var.inner, false); return msg_ref; } static inline LDKCVec_MessageSendEventZ CVec_MessageSendEventZ_clone(const LDKCVec_MessageSendEventZ *orig) { @@ -2545,19 +2323,19 @@ static inline struct LDKTxOut CResult_TxOutAccessErrorZ_get_ok(LDKCResult_TxOutA CHECK(owner->result_ok); return TxOut_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_get_ok"))) TS_CResult_TxOutAccessErrorZ_get_ok(uint32_t owner) { - LDKCResult_TxOutAccessErrorZ* owner_conv = (LDKCResult_TxOutAccessErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_get_ok"))) TS_CResult_TxOutAccessErrorZ_get_ok(uint64_t owner) { + LDKCResult_TxOutAccessErrorZ* owner_conv = (LDKCResult_TxOutAccessErrorZ*)untag_ptr(owner); LDKTxOut* ret_ref = MALLOC(sizeof(LDKTxOut), "LDKTxOut"); *ret_ref = CResult_TxOutAccessErrorZ_get_ok(owner_conv); - return (uint32_t)ret_ref; + return tag_ptr(ret_ref, true); } static inline enum LDKAccessError CResult_TxOutAccessErrorZ_get_err(LDKCResult_TxOutAccessErrorZ *NONNULL_PTR owner){ CHECK(!owner->result_ok); return AccessError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_get_err"))) TS_CResult_TxOutAccessErrorZ_get_err(uint32_t owner) { - LDKCResult_TxOutAccessErrorZ* owner_conv = (LDKCResult_TxOutAccessErrorZ*)(owner & ~1); +uint32_t __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_get_err"))) TS_CResult_TxOutAccessErrorZ_get_err(uint64_t owner) { + LDKCResult_TxOutAccessErrorZ* owner_conv = (LDKCResult_TxOutAccessErrorZ*)untag_ptr(owner); uint32_t ret_conv = LDKAccessError_to_js(CResult_TxOutAccessErrorZ_get_err(owner_conv)); return ret_conv; } @@ -2565,8 +2343,8 @@ uint32_t __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_get_err"))) T static inline uintptr_t C2Tuple_usizeTransactionZ_get_a(LDKC2Tuple_usizeTransactionZ *NONNULL_PTR owner){ return owner->a; } -uint32_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); +uint32_t __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_get_a"))) TS_C2Tuple_usizeTransactionZ_get_a(uint64_t owner) { + LDKC2Tuple_usizeTransactionZ* owner_conv = (LDKC2Tuple_usizeTransactionZ*)untag_ptr(owner); uint32_t ret_conv = C2Tuple_usizeTransactionZ_get_a(owner_conv); return ret_conv; } @@ -2574,8 +2352,8 @@ uint32_t __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_get_a"))) TS_ static inline struct LDKTransaction C2Tuple_usizeTransactionZ_get_b(LDKC2Tuple_usizeTransactionZ *NONNULL_PTR owner){ return owner->b; } -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); +int8_tArray __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_get_b"))) TS_C2Tuple_usizeTransactionZ_get_b(uint64_t owner) { + LDKC2Tuple_usizeTransactionZ* owner_conv = (LDKC2Tuple_usizeTransactionZ*)untag_ptr(owner); LDKTransaction ret_var = C2Tuple_usizeTransactionZ_get_b(owner_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -2600,8 +2378,8 @@ static inline void CResult_NoneChannelMonitorUpdateErrZ_get_ok(LDKCResult_NoneCh CHECK(owner->result_ok); return *owner->contents.result; } -void __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_get_ok"))) TS_CResult_NoneChannelMonitorUpdateErrZ_get_ok(uint32_t owner) { - LDKCResult_NoneChannelMonitorUpdateErrZ* owner_conv = (LDKCResult_NoneChannelMonitorUpdateErrZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_get_ok"))) TS_CResult_NoneChannelMonitorUpdateErrZ_get_ok(uint64_t owner) { + LDKCResult_NoneChannelMonitorUpdateErrZ* owner_conv = (LDKCResult_NoneChannelMonitorUpdateErrZ*)untag_ptr(owner); CResult_NoneChannelMonitorUpdateErrZ_get_ok(owner_conv); } @@ -2609,14 +2387,14 @@ static inline enum LDKChannelMonitorUpdateErr CResult_NoneChannelMonitorUpdateEr CHECK(!owner->result_ok); return ChannelMonitorUpdateErr_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_get_err"))) TS_CResult_NoneChannelMonitorUpdateErrZ_get_err(uint32_t owner) { - LDKCResult_NoneChannelMonitorUpdateErrZ* owner_conv = (LDKCResult_NoneChannelMonitorUpdateErrZ*)(owner & ~1); +uint32_t __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_get_err"))) TS_CResult_NoneChannelMonitorUpdateErrZ_get_err(uint64_t owner) { + LDKCResult_NoneChannelMonitorUpdateErrZ* owner_conv = (LDKCResult_NoneChannelMonitorUpdateErrZ*)untag_ptr(owner); uint32_t ret_conv = LDKChannelMonitorUpdateErr_to_js(CResult_NoneChannelMonitorUpdateErrZ_get_err(owner_conv)); return ret_conv; } -uint32_t __attribute__((export_name("TS_LDKMonitorEvent_ty_from_ptr"))) TS_LDKMonitorEvent_ty_from_ptr(uint32_t ptr) { - LDKMonitorEvent *obj = (LDKMonitorEvent*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKMonitorEvent_ty_from_ptr"))) TS_LDKMonitorEvent_ty_from_ptr(uint64_t ptr) { + LDKMonitorEvent *obj = (LDKMonitorEvent*)untag_ptr(ptr); switch(obj->tag) { case LDKMonitorEvent_HTLCEvent: return 0; case LDKMonitorEvent_CommitmentTxConfirmed: return 1; @@ -2625,54 +2403,46 @@ uint32_t __attribute__((export_name("TS_LDKMonitorEvent_ty_from_ptr"))) TS_LDKMo default: abort(); } } -uint32_t __attribute__((export_name("TS_LDKMonitorEvent_HTLCEvent_get_htlc_event"))) TS_LDKMonitorEvent_HTLCEvent_get_htlc_event(uint32_t ptr) { - LDKMonitorEvent *obj = (LDKMonitorEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKMonitorEvent_HTLCEvent_get_htlc_event"))) TS_LDKMonitorEvent_HTLCEvent_get_htlc_event(uint64_t ptr) { + LDKMonitorEvent *obj = (LDKMonitorEvent*)untag_ptr(ptr); assert(obj->tag == LDKMonitorEvent_HTLCEvent); LDKHTLCUpdate htlc_event_var = obj->htlc_event; - uint32_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. + uint64_t htlc_event_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(htlc_event_var); - htlc_event_ref = (uintptr_t)htlc_event_var.inner & ~1; + htlc_event_ref = tag_ptr(htlc_event_var.inner, false); 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); +uint64_t __attribute__((export_name("TS_LDKMonitorEvent_CommitmentTxConfirmed_get_commitment_tx_confirmed"))) TS_LDKMonitorEvent_CommitmentTxConfirmed_get_commitment_tx_confirmed(uint64_t ptr) { + LDKMonitorEvent *obj = (LDKMonitorEvent*)untag_ptr(ptr); assert(obj->tag == LDKMonitorEvent_CommitmentTxConfirmed); LDKOutPoint commitment_tx_confirmed_var = obj->commitment_tx_confirmed; - uint32_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. + uint64_t commitment_tx_confirmed_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(commitment_tx_confirmed_var); - commitment_tx_confirmed_ref = (uintptr_t)commitment_tx_confirmed_var.inner & ~1; + commitment_tx_confirmed_ref = tag_ptr(commitment_tx_confirmed_var.inner, false); 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); +uint64_t __attribute__((export_name("TS_LDKMonitorEvent_UpdateCompleted_get_funding_txo"))) TS_LDKMonitorEvent_UpdateCompleted_get_funding_txo(uint64_t ptr) { + LDKMonitorEvent *obj = (LDKMonitorEvent*)untag_ptr(ptr); assert(obj->tag == LDKMonitorEvent_UpdateCompleted); LDKOutPoint funding_txo_var = obj->update_completed.funding_txo; - uint32_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. + uint64_t funding_txo_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_txo_var); - funding_txo_ref = (uintptr_t)funding_txo_var.inner & ~1; + funding_txo_ref = tag_ptr(funding_txo_var.inner, false); 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) { - LDKMonitorEvent *obj = (LDKMonitorEvent*)(ptr & ~1); +int64_t __attribute__((export_name("TS_LDKMonitorEvent_UpdateCompleted_get_monitor_update_id"))) TS_LDKMonitorEvent_UpdateCompleted_get_monitor_update_id(uint64_t ptr) { + LDKMonitorEvent *obj = (LDKMonitorEvent*)untag_ptr(ptr); assert(obj->tag == LDKMonitorEvent_UpdateCompleted); int64_t monitor_update_id_conv = obj->update_completed.monitor_update_id; return monitor_update_id_conv; } -uint32_t __attribute__((export_name("TS_LDKMonitorEvent_UpdateFailed_get_update_failed"))) TS_LDKMonitorEvent_UpdateFailed_get_update_failed(uint32_t ptr) { - LDKMonitorEvent *obj = (LDKMonitorEvent*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKMonitorEvent_UpdateFailed_get_update_failed"))) TS_LDKMonitorEvent_UpdateFailed_get_update_failed(uint64_t ptr) { + LDKMonitorEvent *obj = (LDKMonitorEvent*)untag_ptr(ptr); assert(obj->tag == LDKMonitorEvent_UpdateFailed); LDKOutPoint update_failed_var = obj->update_failed; - uint32_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. + uint64_t update_failed_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(update_failed_var); - update_failed_ref = (uintptr_t)update_failed_var.inner & ~1; + update_failed_ref = tag_ptr(update_failed_var.inner, false); return update_failed_ref; } static inline LDKCVec_MonitorEventZ CVec_MonitorEventZ_clone(const LDKCVec_MonitorEventZ *orig) { @@ -2685,33 +2455,28 @@ static inline LDKCVec_MonitorEventZ CVec_MonitorEventZ_clone(const LDKCVec_Monit static inline struct LDKOutPoint C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_a(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ *NONNULL_PTR owner){ return OutPoint_clone(&owner->a); } -uint32_t __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_a"))) TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_a(uint32_t owner) { - LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ* owner_conv = (LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_a"))) TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_a(uint64_t owner) { + LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ* owner_conv = (LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ*)untag_ptr(owner); LDKOutPoint ret_var = C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_a(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } static inline struct LDKCVec_MonitorEventZ C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_b(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ *NONNULL_PTR owner){ return CVec_MonitorEventZ_clone(&owner->b); } -uint32_tArray __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_b"))) TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_b(uint32_t owner) { - LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ* owner_conv = (LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ*)(owner & ~1); +uint64_tArray __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_b"))) TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_b(uint64_t owner) { + LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ* owner_conv = (LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ*)untag_ptr(owner); LDKCVec_MonitorEventZ ret_var = C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_b(owner_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t o = 0; o < ret_var.datalen; o++) { LDKMonitorEvent *ret_conv_14_copy = MALLOC(sizeof(LDKMonitorEvent), "LDKMonitorEvent"); *ret_conv_14_copy = ret_var.data[o]; - uint32_t ret_conv_14_ref = (uintptr_t)ret_conv_14_copy; + uint64_t ret_conv_14_ref = tag_ptr(ret_conv_14_copy, true); ret_arr_ptr[o] = ret_conv_14_ref; } @@ -2722,8 +2487,8 @@ uint32_tArray __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZ static inline struct LDKPublicKey C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_c(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ *NONNULL_PTR owner){ return owner->c; } -int8_tArray __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_c"))) TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_c(uint32_t owner) { - LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ* owner_conv = (LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ*)(owner & ~1); +int8_tArray __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_c"))) TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_c(uint64_t owner) { + LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ* owner_conv = (LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ*)untag_ptr(owner); int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_c(owner_conv).compressed_form, 33); return ret_arr; @@ -2736,37 +2501,32 @@ static inline LDKCVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ CVec_C3Tuple } return ret; } -uint32_t __attribute__((export_name("TS_LDKCOption_C2Tuple_usizeTransactionZZ_ty_from_ptr"))) TS_LDKCOption_C2Tuple_usizeTransactionZZ_ty_from_ptr(uint32_t ptr) { - LDKCOption_C2Tuple_usizeTransactionZZ *obj = (LDKCOption_C2Tuple_usizeTransactionZZ*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKCOption_C2Tuple_usizeTransactionZZ_ty_from_ptr"))) TS_LDKCOption_C2Tuple_usizeTransactionZZ_ty_from_ptr(uint64_t ptr) { + LDKCOption_C2Tuple_usizeTransactionZZ *obj = (LDKCOption_C2Tuple_usizeTransactionZZ*)untag_ptr(ptr); switch(obj->tag) { case LDKCOption_C2Tuple_usizeTransactionZZ_Some: return 0; case LDKCOption_C2Tuple_usizeTransactionZZ_None: return 1; default: abort(); } } -uint32_t __attribute__((export_name("TS_LDKCOption_C2Tuple_usizeTransactionZZ_Some_get_some"))) TS_LDKCOption_C2Tuple_usizeTransactionZZ_Some_get_some(uint32_t ptr) { - LDKCOption_C2Tuple_usizeTransactionZZ *obj = (LDKCOption_C2Tuple_usizeTransactionZZ*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKCOption_C2Tuple_usizeTransactionZZ_Some_get_some"))) TS_LDKCOption_C2Tuple_usizeTransactionZZ_Some_get_some(uint64_t ptr) { + LDKCOption_C2Tuple_usizeTransactionZZ *obj = (LDKCOption_C2Tuple_usizeTransactionZZ*)untag_ptr(ptr); assert(obj->tag == LDKCOption_C2Tuple_usizeTransactionZZ_Some); LDKC2Tuple_usizeTransactionZ* some_conv = MALLOC(sizeof(LDKC2Tuple_usizeTransactionZ), "LDKC2Tuple_usizeTransactionZ"); *some_conv = obj->some; *some_conv = C2Tuple_usizeTransactionZ_clone(some_conv); - return ((uint32_t)some_conv); + return tag_ptr(some_conv, true); } static inline struct LDKFixedPenaltyScorer CResult_FixedPenaltyScorerDecodeErrorZ_get_ok(LDKCResult_FixedPenaltyScorerDecodeErrorZ *NONNULL_PTR owner){ CHECK(owner->result_ok); return FixedPenaltyScorer_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_get_ok"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_FixedPenaltyScorerDecodeErrorZ* owner_conv = (LDKCResult_FixedPenaltyScorerDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_get_ok"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_FixedPenaltyScorerDecodeErrorZ* owner_conv = (LDKCResult_FixedPenaltyScorerDecodeErrorZ*)untag_ptr(owner); LDKFixedPenaltyScorer ret_var = CResult_FixedPenaltyScorerDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -2774,25 +2534,20 @@ static inline struct LDKDecodeError CResult_FixedPenaltyScorerDecodeErrorZ_get_e CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_get_err"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_get_err(uint32_t owner) { - LDKCResult_FixedPenaltyScorerDecodeErrorZ* owner_conv = (LDKCResult_FixedPenaltyScorerDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_get_err"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_FixedPenaltyScorerDecodeErrorZ* owner_conv = (LDKCResult_FixedPenaltyScorerDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_FixedPenaltyScorerDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } static inline uint64_t C2Tuple_u64u64Z_get_a(LDKC2Tuple_u64u64Z *NONNULL_PTR owner){ return owner->a; } -int64_t __attribute__((export_name("TS_C2Tuple_u64u64Z_get_a"))) TS_C2Tuple_u64u64Z_get_a(uint32_t owner) { - LDKC2Tuple_u64u64Z* owner_conv = (LDKC2Tuple_u64u64Z*)(owner & ~1); +int64_t __attribute__((export_name("TS_C2Tuple_u64u64Z_get_a"))) TS_C2Tuple_u64u64Z_get_a(uint64_t owner) { + LDKC2Tuple_u64u64Z* owner_conv = (LDKC2Tuple_u64u64Z*)untag_ptr(owner); int64_t ret_conv = C2Tuple_u64u64Z_get_a(owner_conv); return ret_conv; } @@ -2800,27 +2555,27 @@ int64_t __attribute__((export_name("TS_C2Tuple_u64u64Z_get_a"))) TS_C2Tuple_u64 static inline uint64_t C2Tuple_u64u64Z_get_b(LDKC2Tuple_u64u64Z *NONNULL_PTR owner){ return owner->b; } -int64_t __attribute__((export_name("TS_C2Tuple_u64u64Z_get_b"))) TS_C2Tuple_u64u64Z_get_b(uint32_t owner) { - LDKC2Tuple_u64u64Z* owner_conv = (LDKC2Tuple_u64u64Z*)(owner & ~1); +int64_t __attribute__((export_name("TS_C2Tuple_u64u64Z_get_b"))) TS_C2Tuple_u64u64Z_get_b(uint64_t owner) { + LDKC2Tuple_u64u64Z* owner_conv = (LDKC2Tuple_u64u64Z*)untag_ptr(owner); int64_t ret_conv = C2Tuple_u64u64Z_get_b(owner_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_LDKCOption_C2Tuple_u64u64ZZ_ty_from_ptr"))) TS_LDKCOption_C2Tuple_u64u64ZZ_ty_from_ptr(uint32_t ptr) { - LDKCOption_C2Tuple_u64u64ZZ *obj = (LDKCOption_C2Tuple_u64u64ZZ*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKCOption_C2Tuple_u64u64ZZ_ty_from_ptr"))) TS_LDKCOption_C2Tuple_u64u64ZZ_ty_from_ptr(uint64_t ptr) { + LDKCOption_C2Tuple_u64u64ZZ *obj = (LDKCOption_C2Tuple_u64u64ZZ*)untag_ptr(ptr); switch(obj->tag) { case LDKCOption_C2Tuple_u64u64ZZ_Some: return 0; case LDKCOption_C2Tuple_u64u64ZZ_None: return 1; default: abort(); } } -uint32_t __attribute__((export_name("TS_LDKCOption_C2Tuple_u64u64ZZ_Some_get_some"))) TS_LDKCOption_C2Tuple_u64u64ZZ_Some_get_some(uint32_t ptr) { - LDKCOption_C2Tuple_u64u64ZZ *obj = (LDKCOption_C2Tuple_u64u64ZZ*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKCOption_C2Tuple_u64u64ZZ_Some_get_some"))) TS_LDKCOption_C2Tuple_u64u64ZZ_Some_get_some(uint64_t ptr) { + LDKCOption_C2Tuple_u64u64ZZ *obj = (LDKCOption_C2Tuple_u64u64ZZ*)untag_ptr(ptr); assert(obj->tag == LDKCOption_C2Tuple_u64u64ZZ_Some); LDKC2Tuple_u64u64Z* some_conv = MALLOC(sizeof(LDKC2Tuple_u64u64Z), "LDKC2Tuple_u64u64Z"); *some_conv = obj->some; *some_conv = C2Tuple_u64u64Z_clone(some_conv); - return ((uint32_t)some_conv); + return tag_ptr(some_conv, true); } static inline LDKCVec_NodeIdZ CVec_NodeIdZ_clone(const LDKCVec_NodeIdZ *orig) { LDKCVec_NodeIdZ ret = { .data = MALLOC(sizeof(LDKNodeId) * orig->datalen, "LDKCVec_NodeIdZ clone bytes"), .datalen = orig->datalen }; @@ -2842,16 +2597,11 @@ 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; - uint32_t record_ref = 0; + uint64_t record_ref = 0; record_var = Record_clone(&record_var); - 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 = (uintptr_t)record_var.inner; - if (record_var.is_owned) { - record_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 0, (uint32_t)record_ref, 0, 0, 0, 0, 0); + record_ref = tag_ptr(record_var.inner, record_var.is_owned); + js_invoke_function_buuuuu(j_calls->instance_ptr, 0, record_ref, 0, 0, 0, 0, 0); } static void LDKLogger_JCalls_cloned(LDKLogger* new_obj) { LDKLogger_JCalls *j_calls = (LDKLogger_JCalls*) new_obj->this_arg; @@ -2869,23 +2619,21 @@ static inline LDKLogger LDKLogger_init (JSValue o) { }; return ret; } -long __attribute__((export_name("TS_LDKLogger_new"))) TS_LDKLogger_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKLogger_new"))) TS_LDKLogger_new(JSValue o) { LDKLogger *res_ptr = MALLOC(sizeof(LDKLogger), "LDKLogger"); *res_ptr = LDKLogger_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } static inline struct LDKProbabilisticScorer *CResult_ProbabilisticScorerDecodeErrorZ_get_ok(LDKCResult_ProbabilisticScorerDecodeErrorZ *NONNULL_PTR owner){ CHECK(owner->result_ok); return &*owner->contents.result; } -uint32_t __attribute__((export_name("TS_CResult_ProbabilisticScorerDecodeErrorZ_get_ok"))) TS_CResult_ProbabilisticScorerDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_ProbabilisticScorerDecodeErrorZ* owner_conv = (LDKCResult_ProbabilisticScorerDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_ProbabilisticScorerDecodeErrorZ_get_ok"))) TS_CResult_ProbabilisticScorerDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ProbabilisticScorerDecodeErrorZ* owner_conv = (LDKCResult_ProbabilisticScorerDecodeErrorZ*)untag_ptr(owner); LDKProbabilisticScorer ret_var = *CResult_ProbabilisticScorerDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner & ~1; + ret_ref = tag_ptr(ret_var.inner, false); return ret_ref; } @@ -2893,17 +2641,12 @@ static inline struct LDKDecodeError CResult_ProbabilisticScorerDecodeErrorZ_get_ CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_ProbabilisticScorerDecodeErrorZ_get_err"))) TS_CResult_ProbabilisticScorerDecodeErrorZ_get_err(uint32_t owner) { - LDKCResult_ProbabilisticScorerDecodeErrorZ* owner_conv = (LDKCResult_ProbabilisticScorerDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_ProbabilisticScorerDecodeErrorZ_get_err"))) TS_CResult_ProbabilisticScorerDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ProbabilisticScorerDecodeErrorZ* owner_conv = (LDKCResult_ProbabilisticScorerDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ProbabilisticScorerDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -2911,17 +2654,12 @@ static inline struct LDKInitFeatures CResult_InitFeaturesDecodeErrorZ_get_ok(LDK CHECK(owner->result_ok); return InitFeatures_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_get_ok"))) TS_CResult_InitFeaturesDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_InitFeaturesDecodeErrorZ* owner_conv = (LDKCResult_InitFeaturesDecodeErrorZ*)untag_ptr(owner); LDKInitFeatures ret_var = CResult_InitFeaturesDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -2929,17 +2667,12 @@ static inline struct LDKDecodeError CResult_InitFeaturesDecodeErrorZ_get_err(LDK CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_get_err"))) TS_CResult_InitFeaturesDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_InitFeaturesDecodeErrorZ* owner_conv = (LDKCResult_InitFeaturesDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_InitFeaturesDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -2947,17 +2680,12 @@ static inline struct LDKChannelFeatures CResult_ChannelFeaturesDecodeErrorZ_get_ CHECK(owner->result_ok); return ChannelFeatures_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_get_ok"))) TS_CResult_ChannelFeaturesDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ChannelFeaturesDecodeErrorZ* owner_conv = (LDKCResult_ChannelFeaturesDecodeErrorZ*)untag_ptr(owner); LDKChannelFeatures ret_var = CResult_ChannelFeaturesDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -2965,17 +2693,12 @@ static inline struct LDKDecodeError CResult_ChannelFeaturesDecodeErrorZ_get_err( CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_get_err"))) TS_CResult_ChannelFeaturesDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ChannelFeaturesDecodeErrorZ* owner_conv = (LDKCResult_ChannelFeaturesDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ChannelFeaturesDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -2983,17 +2706,12 @@ static inline struct LDKNodeFeatures CResult_NodeFeaturesDecodeErrorZ_get_ok(LDK CHECK(owner->result_ok); return NodeFeatures_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_get_ok"))) TS_CResult_NodeFeaturesDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_NodeFeaturesDecodeErrorZ* owner_conv = (LDKCResult_NodeFeaturesDecodeErrorZ*)untag_ptr(owner); LDKNodeFeatures ret_var = CResult_NodeFeaturesDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3001,17 +2719,12 @@ static inline struct LDKDecodeError CResult_NodeFeaturesDecodeErrorZ_get_err(LDK CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_get_err"))) TS_CResult_NodeFeaturesDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_NodeFeaturesDecodeErrorZ* owner_conv = (LDKCResult_NodeFeaturesDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_NodeFeaturesDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3019,17 +2732,12 @@ static inline struct LDKInvoiceFeatures CResult_InvoiceFeaturesDecodeErrorZ_get_ CHECK(owner->result_ok); return InvoiceFeatures_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_get_ok"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_InvoiceFeaturesDecodeErrorZ* owner_conv = (LDKCResult_InvoiceFeaturesDecodeErrorZ*)untag_ptr(owner); LDKInvoiceFeatures ret_var = CResult_InvoiceFeaturesDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3037,17 +2745,12 @@ static inline struct LDKDecodeError CResult_InvoiceFeaturesDecodeErrorZ_get_err( CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_get_err"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_InvoiceFeaturesDecodeErrorZ* owner_conv = (LDKCResult_InvoiceFeaturesDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_InvoiceFeaturesDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3055,17 +2758,12 @@ static inline struct LDKChannelTypeFeatures CResult_ChannelTypeFeaturesDecodeErr CHECK(owner->result_ok); return ChannelTypeFeatures_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_get_ok"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ChannelTypeFeaturesDecodeErrorZ* owner_conv = (LDKCResult_ChannelTypeFeaturesDecodeErrorZ*)untag_ptr(owner); LDKChannelTypeFeatures ret_var = CResult_ChannelTypeFeaturesDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3073,17 +2771,12 @@ static inline struct LDKDecodeError CResult_ChannelTypeFeaturesDecodeErrorZ_get_ CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_get_err"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ChannelTypeFeaturesDecodeErrorZ* owner_conv = (LDKCResult_ChannelTypeFeaturesDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ChannelTypeFeaturesDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3091,17 +2784,12 @@ static inline struct LDKNodeId CResult_NodeIdDecodeErrorZ_get_ok(LDKCResult_Node CHECK(owner->result_ok); return NodeId_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_get_ok"))) TS_CResult_NodeIdDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_NodeIdDecodeErrorZ* owner_conv = (LDKCResult_NodeIdDecodeErrorZ*)untag_ptr(owner); LDKNodeId ret_var = CResult_NodeIdDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3109,17 +2797,12 @@ static inline struct LDKDecodeError CResult_NodeIdDecodeErrorZ_get_err(LDKCResul CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_get_err"))) TS_CResult_NodeIdDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_NodeIdDecodeErrorZ* owner_conv = (LDKCResult_NodeIdDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_NodeIdDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3127,11 +2810,11 @@ static inline struct LDKCOption_NetworkUpdateZ CResult_COption_NetworkUpdateZDec CHECK(owner->result_ok); return COption_NetworkUpdateZ_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_get_ok"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_COption_NetworkUpdateZDecodeErrorZ* owner_conv = (LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_get_ok"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_COption_NetworkUpdateZDecodeErrorZ* owner_conv = (LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)untag_ptr(owner); LDKCOption_NetworkUpdateZ *ret_copy = MALLOC(sizeof(LDKCOption_NetworkUpdateZ), "LDKCOption_NetworkUpdateZ"); *ret_copy = CResult_COption_NetworkUpdateZDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } @@ -3139,17 +2822,12 @@ static inline struct LDKDecodeError CResult_COption_NetworkUpdateZDecodeErrorZ_g CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_get_err"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_COption_NetworkUpdateZDecodeErrorZ* owner_conv = (LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_COption_NetworkUpdateZDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3168,11 +2846,11 @@ LDKCResult_TxOutAccessErrorZ get_utxo_LDKAccess_jcall(const void* this_arg, cons int8_tArray genesis_hash_arr = init_int8_tArray(32, __LINE__); memcpy(genesis_hash_arr->elems, *genesis_hash, 32); int64_t short_channel_id_conv = short_channel_id; - uint32_t ret = js_invoke_function_ubuuuu(j_calls->instance_ptr, 1, (uint32_t)genesis_hash_arr, (uint32_t)short_channel_id_conv, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + uint32_t ret = js_invoke_function_ubuuuu(j_calls->instance_ptr, 1, (uint32_t)genesis_hash_arr, short_channel_id_conv, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_TxOutAccessErrorZ ret_conv = *(LDKCResult_TxOutAccessErrorZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } static void LDKAccess_JCalls_cloned(LDKAccess* new_obj) { @@ -3191,14 +2869,14 @@ static inline LDKAccess LDKAccess_init (JSValue o) { }; return ret; } -long __attribute__((export_name("TS_LDKAccess_new"))) TS_LDKAccess_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKAccess_new"))) TS_LDKAccess_new(JSValue o) { LDKAccess *res_ptr = MALLOC(sizeof(LDKAccess), "LDKAccess"); *res_ptr = LDKAccess_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_Access_get_utxo"))) TS_Access_get_utxo(uint64_t this_arg, int8_tArray genesis_hash, int64_t short_channel_id) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); @@ -3206,19 +2884,19 @@ uint32_t __attribute__((export_name("TS_Access_get_utxo"))) TS_Access_get_utxo( 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_LDKCOption_AccessZ_ty_from_ptr"))) TS_LDKCOption_AccessZ_ty_from_ptr(uint32_t ptr) { - LDKCOption_AccessZ *obj = (LDKCOption_AccessZ*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKCOption_AccessZ_ty_from_ptr"))) TS_LDKCOption_AccessZ_ty_from_ptr(uint64_t ptr) { + LDKCOption_AccessZ *obj = (LDKCOption_AccessZ*)untag_ptr(ptr); switch(obj->tag) { case LDKCOption_AccessZ_Some: return 0; case LDKCOption_AccessZ_None: return 1; default: abort(); } } -uint32_t __attribute__((export_name("TS_LDKCOption_AccessZ_Some_get_some"))) TS_LDKCOption_AccessZ_Some_get_some(uint32_t ptr) { - LDKCOption_AccessZ *obj = (LDKCOption_AccessZ*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKCOption_AccessZ_Some_get_some"))) TS_LDKCOption_AccessZ_Some_get_some(uint64_t ptr) { + LDKCOption_AccessZ *obj = (LDKCOption_AccessZ*)untag_ptr(ptr); assert(obj->tag == LDKCOption_AccessZ_Some); LDKAccess* some_ret = MALLOC(sizeof(LDKAccess), "LDKAccess"); *some_ret = obj->some; @@ -3227,14 +2905,14 @@ uint32_t __attribute__((export_name("TS_LDKCOption_AccessZ_Some_get_some"))) TS_ // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKAccess_JCalls_cloned(&(*some_ret)); } - return (uint32_t)some_ret; + return tag_ptr(some_ret, true); } static inline bool CResult_boolLightningErrorZ_get_ok(LDKCResult_boolLightningErrorZ *NONNULL_PTR owner){ CHECK(owner->result_ok); return *owner->contents.result; } -jboolean __attribute__((export_name("TS_CResult_boolLightningErrorZ_get_ok"))) TS_CResult_boolLightningErrorZ_get_ok(uint32_t owner) { - LDKCResult_boolLightningErrorZ* owner_conv = (LDKCResult_boolLightningErrorZ*)(owner & ~1); +jboolean __attribute__((export_name("TS_CResult_boolLightningErrorZ_get_ok"))) TS_CResult_boolLightningErrorZ_get_ok(uint64_t owner) { + LDKCResult_boolLightningErrorZ* owner_conv = (LDKCResult_boolLightningErrorZ*)untag_ptr(owner); jboolean ret_conv = CResult_boolLightningErrorZ_get_ok(owner_conv); return ret_conv; } @@ -3243,68 +2921,48 @@ static inline struct LDKLightningError CResult_boolLightningErrorZ_get_err(LDKCR CHECK(!owner->result_ok); return LightningError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_boolLightningErrorZ_get_err"))) TS_CResult_boolLightningErrorZ_get_err(uint64_t owner) { + LDKCResult_boolLightningErrorZ* owner_conv = (LDKCResult_boolLightningErrorZ*)untag_ptr(owner); LDKLightningError ret_var = CResult_boolLightningErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } static inline struct LDKChannelAnnouncement C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_a(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ *NONNULL_PTR owner){ return ChannelAnnouncement_clone(&owner->a); } -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); +uint64_t __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_a"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_a(uint64_t owner) { + LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* owner_conv = (LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)untag_ptr(owner); LDKChannelAnnouncement ret_var = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_a(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } static inline struct LDKChannelUpdate C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_b(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ *NONNULL_PTR owner){ return ChannelUpdate_clone(&owner->b); } -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); +uint64_t __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_b"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_b(uint64_t owner) { + LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* owner_conv = (LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)untag_ptr(owner); LDKChannelUpdate ret_var = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_b(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } static inline struct LDKChannelUpdate C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_c(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ *NONNULL_PTR owner){ return ChannelUpdate_clone(&owner->c); } -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); +uint64_t __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_c"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_c(uint64_t owner) { + LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* owner_conv = (LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)untag_ptr(owner); LDKChannelUpdate ret_var = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_c(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3326,8 +2984,8 @@ static inline void CResult_NoneLightningErrorZ_get_ok(LDKCResult_NoneLightningEr CHECK(owner->result_ok); return *owner->contents.result; } -void __attribute__((export_name("TS_CResult_NoneLightningErrorZ_get_ok"))) TS_CResult_NoneLightningErrorZ_get_ok(uint32_t owner) { - LDKCResult_NoneLightningErrorZ* owner_conv = (LDKCResult_NoneLightningErrorZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_NoneLightningErrorZ_get_ok"))) TS_CResult_NoneLightningErrorZ_get_ok(uint64_t owner) { + LDKCResult_NoneLightningErrorZ* owner_conv = (LDKCResult_NoneLightningErrorZ*)untag_ptr(owner); CResult_NoneLightningErrorZ_get_ok(owner_conv); } @@ -3335,17 +2993,12 @@ static inline struct LDKLightningError CResult_NoneLightningErrorZ_get_err(LDKCR CHECK(!owner->result_ok); return LightningError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_NoneLightningErrorZ_get_err"))) TS_CResult_NoneLightningErrorZ_get_err(uint64_t owner) { + LDKCResult_NoneLightningErrorZ* owner_conv = (LDKCResult_NoneLightningErrorZ*)untag_ptr(owner); LDKLightningError ret_var = CResult_NoneLightningErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3353,17 +3006,12 @@ static inline struct LDKChannelUpdateInfo CResult_ChannelUpdateInfoDecodeErrorZ_ CHECK(owner->result_ok); return ChannelUpdateInfo_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_get_ok"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_ChannelUpdateInfoDecodeErrorZ* owner_conv = (LDKCResult_ChannelUpdateInfoDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_get_ok"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ChannelUpdateInfoDecodeErrorZ* owner_conv = (LDKCResult_ChannelUpdateInfoDecodeErrorZ*)untag_ptr(owner); LDKChannelUpdateInfo ret_var = CResult_ChannelUpdateInfoDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3371,17 +3019,12 @@ static inline struct LDKDecodeError CResult_ChannelUpdateInfoDecodeErrorZ_get_er CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_get_err"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_get_err(uint32_t owner) { - LDKCResult_ChannelUpdateInfoDecodeErrorZ* owner_conv = (LDKCResult_ChannelUpdateInfoDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_get_err"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ChannelUpdateInfoDecodeErrorZ* owner_conv = (LDKCResult_ChannelUpdateInfoDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ChannelUpdateInfoDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3389,17 +3032,12 @@ static inline struct LDKChannelInfo CResult_ChannelInfoDecodeErrorZ_get_ok(LDKCR CHECK(owner->result_ok); return ChannelInfo_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_get_ok"))) TS_CResult_ChannelInfoDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ChannelInfoDecodeErrorZ* owner_conv = (LDKCResult_ChannelInfoDecodeErrorZ*)untag_ptr(owner); LDKChannelInfo ret_var = CResult_ChannelInfoDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3407,17 +3045,12 @@ static inline struct LDKDecodeError CResult_ChannelInfoDecodeErrorZ_get_err(LDKC CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_get_err"))) TS_CResult_ChannelInfoDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ChannelInfoDecodeErrorZ* owner_conv = (LDKCResult_ChannelInfoDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ChannelInfoDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3425,17 +3058,12 @@ static inline struct LDKRoutingFees CResult_RoutingFeesDecodeErrorZ_get_ok(LDKCR CHECK(owner->result_ok); return RoutingFees_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_get_ok"))) TS_CResult_RoutingFeesDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_RoutingFeesDecodeErrorZ* owner_conv = (LDKCResult_RoutingFeesDecodeErrorZ*)untag_ptr(owner); LDKRoutingFees ret_var = CResult_RoutingFeesDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3443,22 +3071,17 @@ static inline struct LDKDecodeError CResult_RoutingFeesDecodeErrorZ_get_err(LDKC CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_get_err"))) TS_CResult_RoutingFeesDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_RoutingFeesDecodeErrorZ* owner_conv = (LDKCResult_RoutingFeesDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_RoutingFeesDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_LDKNetAddress_ty_from_ptr"))) TS_LDKNetAddress_ty_from_ptr(uint32_t ptr) { - LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKNetAddress_ty_from_ptr"))) TS_LDKNetAddress_ty_from_ptr(uint64_t ptr) { + LDKNetAddress *obj = (LDKNetAddress*)untag_ptr(ptr); switch(obj->tag) { case LDKNetAddress_IPv4: return 0; case LDKNetAddress_IPv6: return 1; @@ -3468,77 +3091,75 @@ uint32_t __attribute__((export_name("TS_LDKNetAddress_ty_from_ptr"))) TS_LDKNetA default: abort(); } } -int8_tArray __attribute__((export_name("TS_LDKNetAddress_IPv4_get_addr"))) TS_LDKNetAddress_IPv4_get_addr(uint32_t ptr) { - LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKNetAddress_IPv4_get_addr"))) TS_LDKNetAddress_IPv4_get_addr(uint64_t ptr) { + LDKNetAddress *obj = (LDKNetAddress*)untag_ptr(ptr); assert(obj->tag == LDKNetAddress_IPv4); int8_tArray addr_arr = init_int8_tArray(4, __LINE__); memcpy(addr_arr->elems, obj->i_pv4.addr.data, 4); return addr_arr; } -int16_t __attribute__((export_name("TS_LDKNetAddress_IPv4_get_port"))) TS_LDKNetAddress_IPv4_get_port(uint32_t ptr) { - LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1); +int16_t __attribute__((export_name("TS_LDKNetAddress_IPv4_get_port"))) TS_LDKNetAddress_IPv4_get_port(uint64_t ptr) { + LDKNetAddress *obj = (LDKNetAddress*)untag_ptr(ptr); assert(obj->tag == LDKNetAddress_IPv4); int16_t port_conv = obj->i_pv4.port; return port_conv; } -int8_tArray __attribute__((export_name("TS_LDKNetAddress_IPv6_get_addr"))) TS_LDKNetAddress_IPv6_get_addr(uint32_t ptr) { - LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKNetAddress_IPv6_get_addr"))) TS_LDKNetAddress_IPv6_get_addr(uint64_t ptr) { + LDKNetAddress *obj = (LDKNetAddress*)untag_ptr(ptr); assert(obj->tag == LDKNetAddress_IPv6); int8_tArray addr_arr = init_int8_tArray(16, __LINE__); memcpy(addr_arr->elems, obj->i_pv6.addr.data, 16); return addr_arr; } -int16_t __attribute__((export_name("TS_LDKNetAddress_IPv6_get_port"))) TS_LDKNetAddress_IPv6_get_port(uint32_t ptr) { - LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1); +int16_t __attribute__((export_name("TS_LDKNetAddress_IPv6_get_port"))) TS_LDKNetAddress_IPv6_get_port(uint64_t ptr) { + LDKNetAddress *obj = (LDKNetAddress*)untag_ptr(ptr); assert(obj->tag == LDKNetAddress_IPv6); int16_t port_conv = obj->i_pv6.port; return port_conv; } -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); +int8_tArray __attribute__((export_name("TS_LDKNetAddress_OnionV2_get_onion_v2"))) TS_LDKNetAddress_OnionV2_get_onion_v2(uint64_t ptr) { + LDKNetAddress *obj = (LDKNetAddress*)untag_ptr(ptr); assert(obj->tag == LDKNetAddress_OnionV2); 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); +int8_tArray __attribute__((export_name("TS_LDKNetAddress_OnionV3_get_ed25519_pubkey"))) TS_LDKNetAddress_OnionV3_get_ed25519_pubkey(uint64_t ptr) { + LDKNetAddress *obj = (LDKNetAddress*)untag_ptr(ptr); assert(obj->tag == LDKNetAddress_OnionV3); 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; } -int16_t __attribute__((export_name("TS_LDKNetAddress_OnionV3_get_checksum"))) TS_LDKNetAddress_OnionV3_get_checksum(uint32_t ptr) { - LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1); +int16_t __attribute__((export_name("TS_LDKNetAddress_OnionV3_get_checksum"))) TS_LDKNetAddress_OnionV3_get_checksum(uint64_t ptr) { + LDKNetAddress *obj = (LDKNetAddress*)untag_ptr(ptr); assert(obj->tag == LDKNetAddress_OnionV3); int16_t checksum_conv = obj->onion_v3.checksum; return checksum_conv; } -int8_t __attribute__((export_name("TS_LDKNetAddress_OnionV3_get_version"))) TS_LDKNetAddress_OnionV3_get_version(uint32_t ptr) { - LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1); +int8_t __attribute__((export_name("TS_LDKNetAddress_OnionV3_get_version"))) TS_LDKNetAddress_OnionV3_get_version(uint64_t ptr) { + LDKNetAddress *obj = (LDKNetAddress*)untag_ptr(ptr); assert(obj->tag == LDKNetAddress_OnionV3); int8_t version_conv = obj->onion_v3.version; return version_conv; } -int16_t __attribute__((export_name("TS_LDKNetAddress_OnionV3_get_port"))) TS_LDKNetAddress_OnionV3_get_port(uint32_t ptr) { - LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1); +int16_t __attribute__((export_name("TS_LDKNetAddress_OnionV3_get_port"))) TS_LDKNetAddress_OnionV3_get_port(uint64_t ptr) { + LDKNetAddress *obj = (LDKNetAddress*)untag_ptr(ptr); assert(obj->tag == LDKNetAddress_OnionV3); int16_t port_conv = obj->onion_v3.port; return port_conv; } -uint32_t __attribute__((export_name("TS_LDKNetAddress_Hostname_get_hostname"))) TS_LDKNetAddress_Hostname_get_hostname(uint32_t ptr) { - LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKNetAddress_Hostname_get_hostname"))) TS_LDKNetAddress_Hostname_get_hostname(uint64_t ptr) { + LDKNetAddress *obj = (LDKNetAddress*)untag_ptr(ptr); assert(obj->tag == LDKNetAddress_Hostname); LDKHostname hostname_var = obj->hostname.hostname; - uint32_t hostname_ref = 0; - CHECK((((uintptr_t)hostname_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&hostname_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t hostname_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(hostname_var); - hostname_ref = (uintptr_t)hostname_var.inner & ~1; + hostname_ref = tag_ptr(hostname_var.inner, false); return hostname_ref; } -int16_t __attribute__((export_name("TS_LDKNetAddress_Hostname_get_port"))) TS_LDKNetAddress_Hostname_get_port(uint32_t ptr) { - LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1); +int16_t __attribute__((export_name("TS_LDKNetAddress_Hostname_get_port"))) TS_LDKNetAddress_Hostname_get_port(uint64_t ptr) { + LDKNetAddress *obj = (LDKNetAddress*)untag_ptr(ptr); assert(obj->tag == LDKNetAddress_Hostname); int16_t port_conv = obj->hostname.port; return port_conv; @@ -3554,17 +3175,12 @@ static inline struct LDKNodeAnnouncementInfo CResult_NodeAnnouncementInfoDecodeE CHECK(owner->result_ok); return NodeAnnouncementInfo_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_get_ok"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_NodeAnnouncementInfoDecodeErrorZ* owner_conv = (LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)untag_ptr(owner); LDKNodeAnnouncementInfo ret_var = CResult_NodeAnnouncementInfoDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3572,17 +3188,12 @@ static inline struct LDKDecodeError CResult_NodeAnnouncementInfoDecodeErrorZ_get CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_get_err"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_NodeAnnouncementInfoDecodeErrorZ* owner_conv = (LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_NodeAnnouncementInfoDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3590,17 +3201,12 @@ static inline struct LDKNodeAlias CResult_NodeAliasDecodeErrorZ_get_ok(LDKCResul CHECK(owner->result_ok); return NodeAlias_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_get_ok"))) TS_CResult_NodeAliasDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_NodeAliasDecodeErrorZ* owner_conv = (LDKCResult_NodeAliasDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_get_ok"))) TS_CResult_NodeAliasDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_NodeAliasDecodeErrorZ* owner_conv = (LDKCResult_NodeAliasDecodeErrorZ*)untag_ptr(owner); LDKNodeAlias ret_var = CResult_NodeAliasDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3608,17 +3214,12 @@ static inline struct LDKDecodeError CResult_NodeAliasDecodeErrorZ_get_err(LDKCRe CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_get_err"))) TS_CResult_NodeAliasDecodeErrorZ_get_err(uint32_t owner) { - LDKCResult_NodeAliasDecodeErrorZ* owner_conv = (LDKCResult_NodeAliasDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_get_err"))) TS_CResult_NodeAliasDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_NodeAliasDecodeErrorZ* owner_conv = (LDKCResult_NodeAliasDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_NodeAliasDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3626,17 +3227,12 @@ static inline struct LDKNodeInfo CResult_NodeInfoDecodeErrorZ_get_ok(LDKCResult_ CHECK(owner->result_ok); return NodeInfo_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_get_ok"))) TS_CResult_NodeInfoDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_NodeInfoDecodeErrorZ* owner_conv = (LDKCResult_NodeInfoDecodeErrorZ*)untag_ptr(owner); LDKNodeInfo ret_var = CResult_NodeInfoDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3644,17 +3240,12 @@ static inline struct LDKDecodeError CResult_NodeInfoDecodeErrorZ_get_err(LDKCRes CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_get_err"))) TS_CResult_NodeInfoDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_NodeInfoDecodeErrorZ* owner_conv = (LDKCResult_NodeInfoDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_NodeInfoDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3662,14 +3253,12 @@ static inline struct LDKNetworkGraph *CResult_NetworkGraphDecodeErrorZ_get_ok(LD CHECK(owner->result_ok); return &*owner->contents.result; } -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); +uint64_t __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_get_ok"))) TS_CResult_NetworkGraphDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_NetworkGraphDecodeErrorZ* owner_conv = (LDKCResult_NetworkGraphDecodeErrorZ*)untag_ptr(owner); LDKNetworkGraph ret_var = *CResult_NetworkGraphDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner & ~1; + ret_ref = tag_ptr(ret_var.inner, false); return ret_ref; } @@ -3677,37 +3266,32 @@ static inline struct LDKDecodeError CResult_NetworkGraphDecodeErrorZ_get_err(LDK CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_get_err"))) TS_CResult_NetworkGraphDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_NetworkGraphDecodeErrorZ* owner_conv = (LDKCResult_NetworkGraphDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_NetworkGraphDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_LDKCOption_CVec_NetAddressZZ_ty_from_ptr"))) TS_LDKCOption_CVec_NetAddressZZ_ty_from_ptr(uint32_t ptr) { - LDKCOption_CVec_NetAddressZZ *obj = (LDKCOption_CVec_NetAddressZZ*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKCOption_CVec_NetAddressZZ_ty_from_ptr"))) TS_LDKCOption_CVec_NetAddressZZ_ty_from_ptr(uint64_t ptr) { + LDKCOption_CVec_NetAddressZZ *obj = (LDKCOption_CVec_NetAddressZZ*)untag_ptr(ptr); switch(obj->tag) { case LDKCOption_CVec_NetAddressZZ_Some: return 0; case LDKCOption_CVec_NetAddressZZ_None: return 1; default: abort(); } } -uint32_tArray __attribute__((export_name("TS_LDKCOption_CVec_NetAddressZZ_Some_get_some"))) TS_LDKCOption_CVec_NetAddressZZ_Some_get_some(uint32_t ptr) { - LDKCOption_CVec_NetAddressZZ *obj = (LDKCOption_CVec_NetAddressZZ*)(ptr & ~1); +uint64_tArray __attribute__((export_name("TS_LDKCOption_CVec_NetAddressZZ_Some_get_some"))) TS_LDKCOption_CVec_NetAddressZZ_Some_get_some(uint64_t ptr) { + LDKCOption_CVec_NetAddressZZ *obj = (LDKCOption_CVec_NetAddressZZ*)untag_ptr(ptr); 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, __LINE__); - uint32_t *some_arr_ptr = (uint32_t*)(((uint8_t*)some_arr) + 8); + uint64_tArray some_arr = NULL; + some_arr = init_uint64_tArray(some_var.datalen, __LINE__); + uint64_t *some_arr_ptr = (uint64_t*)(((uint8_t*)some_arr) + 8); for (size_t m = 0; m < some_var.datalen; m++) { - uint32_t some_conv_12_ref = ((uintptr_t)&some_var.data[m]) | 1; + uint64_t some_conv_12_ref = tag_ptr(&some_var.data[m], false); some_arr_ptr[m] = some_conv_12_ref; } @@ -3717,17 +3301,12 @@ static inline struct LDKDelayedPaymentOutputDescriptor CResult_DelayedPaymentOut CHECK(owner->result_ok); return DelayedPaymentOutputDescriptor_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_ok"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* owner_conv = (LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ*)untag_ptr(owner); LDKDelayedPaymentOutputDescriptor ret_var = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3735,17 +3314,12 @@ static inline struct LDKDecodeError CResult_DelayedPaymentOutputDescriptorDecode CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_err"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* owner_conv = (LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3753,17 +3327,12 @@ static inline struct LDKStaticPaymentOutputDescriptor CResult_StaticPaymentOutpu CHECK(owner->result_ok); return StaticPaymentOutputDescriptor_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_ok"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* owner_conv = (LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ*)untag_ptr(owner); LDKStaticPaymentOutputDescriptor ret_var = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3771,17 +3340,12 @@ static inline struct LDKDecodeError CResult_StaticPaymentOutputDescriptorDecodeE CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_err"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* owner_conv = (LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3789,11 +3353,11 @@ static inline struct LDKSpendableOutputDescriptor CResult_SpendableOutputDescrip CHECK(owner->result_ok); return SpendableOutputDescriptor_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_get_ok"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_SpendableOutputDescriptorDecodeErrorZ* owner_conv = (LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_get_ok"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_SpendableOutputDescriptorDecodeErrorZ* owner_conv = (LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)untag_ptr(owner); LDKSpendableOutputDescriptor *ret_copy = MALLOC(sizeof(LDKSpendableOutputDescriptor), "LDKSpendableOutputDescriptor"); *ret_copy = CResult_SpendableOutputDescriptorDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } @@ -3801,17 +3365,12 @@ static inline struct LDKDecodeError CResult_SpendableOutputDescriptorDecodeError CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_get_err"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_SpendableOutputDescriptorDecodeErrorZ* owner_conv = (LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_SpendableOutputDescriptorDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -3825,8 +3384,8 @@ static inline LDKCVec_PaymentPreimageZ CVec_PaymentPreimageZ_clone(const LDKCVec static inline struct LDKSignature C2Tuple_SignatureCVec_SignatureZZ_get_a(LDKC2Tuple_SignatureCVec_SignatureZZ *NONNULL_PTR owner){ return owner->a; } -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 __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_get_a"))) TS_C2Tuple_SignatureCVec_SignatureZZ_get_a(uint64_t owner) { + LDKC2Tuple_SignatureCVec_SignatureZZ* owner_conv = (LDKC2Tuple_SignatureCVec_SignatureZZ*)untag_ptr(owner); 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; @@ -3835,8 +3394,8 @@ int8_tArray __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_ge static inline struct LDKCVec_SignatureZ C2Tuple_SignatureCVec_SignatureZZ_get_b(LDKC2Tuple_SignatureCVec_SignatureZZ *NONNULL_PTR owner){ return owner->b; } -ptrArray __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_get_b"))) TS_C2Tuple_SignatureCVec_SignatureZZ_get_b(uint32_t owner) { - LDKC2Tuple_SignatureCVec_SignatureZZ* owner_conv = (LDKC2Tuple_SignatureCVec_SignatureZZ*)(owner & ~1); +ptrArray __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_get_b"))) TS_C2Tuple_SignatureCVec_SignatureZZ_get_b(uint64_t owner) { + LDKC2Tuple_SignatureCVec_SignatureZZ* owner_conv = (LDKC2Tuple_SignatureCVec_SignatureZZ*)untag_ptr(owner); LDKCVec_SignatureZ ret_var = C2Tuple_SignatureCVec_SignatureZZ_get_b(owner_conv); ptrArray ret_arr = NULL; ret_arr = init_ptrArray(ret_var.datalen, __LINE__); @@ -3854,19 +3413,19 @@ static inline struct LDKC2Tuple_SignatureCVec_SignatureZZ CResult_C2Tuple_Signat CHECK(owner->result_ok); return C2Tuple_SignatureCVec_SignatureZZ_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_ok"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_ok(uint32_t owner) { - LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* owner_conv = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_ok"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_ok(uint64_t owner) { + LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* owner_conv = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)untag_ptr(owner); LDKC2Tuple_SignatureCVec_SignatureZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_SignatureCVec_SignatureZZ), "LDKC2Tuple_SignatureCVec_SignatureZZ"); *ret_conv = CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_ok(owner_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } static inline void CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_err(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ *NONNULL_PTR owner){ CHECK(!owner->result_ok); return *owner->contents.err; } -void __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_err"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_err(uint32_t owner) { - LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* owner_conv = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_err"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_err(uint64_t owner) { + LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* owner_conv = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)untag_ptr(owner); CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_err(owner_conv); } @@ -3874,8 +3433,8 @@ static inline struct LDKSignature CResult_SignatureNoneZ_get_ok(LDKCResult_Signa CHECK(owner->result_ok); return *owner->contents.result; } -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 __attribute__((export_name("TS_CResult_SignatureNoneZ_get_ok"))) TS_CResult_SignatureNoneZ_get_ok(uint64_t owner) { + LDKCResult_SignatureNoneZ* owner_conv = (LDKCResult_SignatureNoneZ*)untag_ptr(owner); 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; @@ -3885,16 +3444,16 @@ static inline void CResult_SignatureNoneZ_get_err(LDKCResult_SignatureNoneZ *NON CHECK(!owner->result_ok); return *owner->contents.err; } -void __attribute__((export_name("TS_CResult_SignatureNoneZ_get_err"))) TS_CResult_SignatureNoneZ_get_err(uint32_t owner) { - LDKCResult_SignatureNoneZ* owner_conv = (LDKCResult_SignatureNoneZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_SignatureNoneZ_get_err"))) TS_CResult_SignatureNoneZ_get_err(uint64_t owner) { + LDKCResult_SignatureNoneZ* owner_conv = (LDKCResult_SignatureNoneZ*)untag_ptr(owner); CResult_SignatureNoneZ_get_err(owner_conv); } static inline struct LDKSignature C2Tuple_SignatureSignatureZ_get_a(LDKC2Tuple_SignatureSignatureZ *NONNULL_PTR owner){ return owner->a; } -int8_tArray __attribute__((export_name("TS_C2Tuple_SignatureSignatureZ_get_a"))) TS_C2Tuple_SignatureSignatureZ_get_a(uint32_t owner) { - LDKC2Tuple_SignatureSignatureZ* owner_conv = (LDKC2Tuple_SignatureSignatureZ*)(owner & ~1); +int8_tArray __attribute__((export_name("TS_C2Tuple_SignatureSignatureZ_get_a"))) TS_C2Tuple_SignatureSignatureZ_get_a(uint64_t owner) { + LDKC2Tuple_SignatureSignatureZ* owner_conv = (LDKC2Tuple_SignatureSignatureZ*)untag_ptr(owner); int8_tArray ret_arr = init_int8_tArray(64, __LINE__); memcpy(ret_arr->elems, C2Tuple_SignatureSignatureZ_get_a(owner_conv).compact_form, 64); return ret_arr; @@ -3903,8 +3462,8 @@ int8_tArray __attribute__((export_name("TS_C2Tuple_SignatureSignatureZ_get_a")) static inline struct LDKSignature C2Tuple_SignatureSignatureZ_get_b(LDKC2Tuple_SignatureSignatureZ *NONNULL_PTR owner){ return owner->b; } -int8_tArray __attribute__((export_name("TS_C2Tuple_SignatureSignatureZ_get_b"))) TS_C2Tuple_SignatureSignatureZ_get_b(uint32_t owner) { - LDKC2Tuple_SignatureSignatureZ* owner_conv = (LDKC2Tuple_SignatureSignatureZ*)(owner & ~1); +int8_tArray __attribute__((export_name("TS_C2Tuple_SignatureSignatureZ_get_b"))) TS_C2Tuple_SignatureSignatureZ_get_b(uint64_t owner) { + LDKC2Tuple_SignatureSignatureZ* owner_conv = (LDKC2Tuple_SignatureSignatureZ*)untag_ptr(owner); int8_tArray ret_arr = init_int8_tArray(64, __LINE__); memcpy(ret_arr->elems, C2Tuple_SignatureSignatureZ_get_b(owner_conv).compact_form, 64); return ret_arr; @@ -3914,19 +3473,19 @@ static inline struct LDKC2Tuple_SignatureSignatureZ CResult_C2Tuple_SignatureSig CHECK(owner->result_ok); return C2Tuple_SignatureSignatureZ_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_get_ok"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_get_ok(uint32_t owner) { - LDKCResult_C2Tuple_SignatureSignatureZNoneZ* owner_conv = (LDKCResult_C2Tuple_SignatureSignatureZNoneZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_get_ok"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_get_ok(uint64_t owner) { + LDKCResult_C2Tuple_SignatureSignatureZNoneZ* owner_conv = (LDKCResult_C2Tuple_SignatureSignatureZNoneZ*)untag_ptr(owner); LDKC2Tuple_SignatureSignatureZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_SignatureSignatureZ), "LDKC2Tuple_SignatureSignatureZ"); *ret_conv = CResult_C2Tuple_SignatureSignatureZNoneZ_get_ok(owner_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } static inline void CResult_C2Tuple_SignatureSignatureZNoneZ_get_err(LDKCResult_C2Tuple_SignatureSignatureZNoneZ *NONNULL_PTR owner){ CHECK(!owner->result_ok); return *owner->contents.err; } -void __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_get_err"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_get_err(uint32_t owner) { - LDKCResult_C2Tuple_SignatureSignatureZNoneZ* owner_conv = (LDKCResult_C2Tuple_SignatureSignatureZNoneZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_get_err"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_get_err(uint64_t owner) { + LDKCResult_C2Tuple_SignatureSignatureZNoneZ* owner_conv = (LDKCResult_C2Tuple_SignatureSignatureZNoneZ*)untag_ptr(owner); CResult_C2Tuple_SignatureSignatureZNoneZ_get_err(owner_conv); } @@ -3934,8 +3493,8 @@ static inline struct LDKSecretKey CResult_SecretKeyNoneZ_get_ok(LDKCResult_Secre CHECK(owner->result_ok); return *owner->contents.result; } -int8_tArray __attribute__((export_name("TS_CResult_SecretKeyNoneZ_get_ok"))) TS_CResult_SecretKeyNoneZ_get_ok(uint32_t owner) { - LDKCResult_SecretKeyNoneZ* owner_conv = (LDKCResult_SecretKeyNoneZ*)(owner & ~1); +int8_tArray __attribute__((export_name("TS_CResult_SecretKeyNoneZ_get_ok"))) TS_CResult_SecretKeyNoneZ_get_ok(uint64_t owner) { + LDKCResult_SecretKeyNoneZ* owner_conv = (LDKCResult_SecretKeyNoneZ*)untag_ptr(owner); int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, CResult_SecretKeyNoneZ_get_ok(owner_conv).bytes, 32); return ret_arr; @@ -3945,8 +3504,8 @@ static inline void CResult_SecretKeyNoneZ_get_err(LDKCResult_SecretKeyNoneZ *NON CHECK(!owner->result_ok); return *owner->contents.err; } -void __attribute__((export_name("TS_CResult_SecretKeyNoneZ_get_err"))) TS_CResult_SecretKeyNoneZ_get_err(uint32_t owner) { - LDKCResult_SecretKeyNoneZ* owner_conv = (LDKCResult_SecretKeyNoneZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_SecretKeyNoneZ_get_err"))) TS_CResult_SecretKeyNoneZ_get_err(uint64_t owner) { + LDKCResult_SecretKeyNoneZ* owner_conv = (LDKCResult_SecretKeyNoneZ*)untag_ptr(owner); CResult_SecretKeyNoneZ_get_err(owner_conv); } @@ -3963,7 +3522,7 @@ static void LDKBaseSign_JCalls_free(void* this_arg) { LDKPublicKey get_per_commitment_point_LDKBaseSign_jcall(const void* this_arg, uint64_t idx) { LDKBaseSign_JCalls *j_calls = (LDKBaseSign_JCalls*) this_arg; int64_t idx_conv = idx; - int8_tArray ret = (int8_tArray)js_invoke_function_buuuuu(j_calls->instance_ptr, 2, (uint32_t)idx_conv, 0, 0, 0, 0, 0); + int8_tArray ret = (int8_tArray)js_invoke_function_buuuuu(j_calls->instance_ptr, 2, idx_conv, 0, 0, 0, 0, 0); LDKPublicKey ret_ref; CHECK(ret->arr_len == 33); memcpy(ret_ref.compressed_form, ret->elems, 33); FREE(ret); @@ -3972,7 +3531,7 @@ LDKPublicKey get_per_commitment_point_LDKBaseSign_jcall(const void* this_arg, ui LDKThirtyTwoBytes release_commitment_secret_LDKBaseSign_jcall(const void* this_arg, uint64_t idx) { LDKBaseSign_JCalls *j_calls = (LDKBaseSign_JCalls*) this_arg; int64_t idx_conv = idx; - int8_tArray ret = (int8_tArray)js_invoke_function_buuuuu(j_calls->instance_ptr, 3, (uint32_t)idx_conv, 0, 0, 0, 0, 0); + int8_tArray ret = (int8_tArray)js_invoke_function_buuuuu(j_calls->instance_ptr, 3, idx_conv, 0, 0, 0, 0, 0); LDKThirtyTwoBytes ret_ref; CHECK(ret->arr_len == 32); memcpy(ret_ref.data, ret->elems, 32); FREE(ret); @@ -3981,15 +3540,10 @@ LDKThirtyTwoBytes release_commitment_secret_LDKBaseSign_jcall(const void* this_a LDKCResult_NoneNoneZ validate_holder_commitment_LDKBaseSign_jcall(const void* this_arg, const LDKHolderCommitmentTransaction * holder_tx, LDKCVec_PaymentPreimageZ preimages) { LDKBaseSign_JCalls *j_calls = (LDKBaseSign_JCalls*) this_arg; LDKHolderCommitmentTransaction holder_tx_var = *holder_tx; - uint32_t holder_tx_ref = 0; + uint64_t holder_tx_ref = 0; holder_tx_var = HolderCommitmentTransaction_clone(&holder_tx_var); - 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 = (uintptr_t)holder_tx_var.inner; - if (holder_tx_var.is_owned) { - holder_tx_ref |= 1; - } + holder_tx_ref = tag_ptr(holder_tx_var.inner, holder_tx_var.is_owned); LDKCVec_PaymentPreimageZ preimages_var = preimages; ptrArray preimages_arr = NULL; preimages_arr = init_ptrArray(preimages_var.datalen, __LINE__); @@ -4001,11 +3555,11 @@ LDKCResult_NoneNoneZ validate_holder_commitment_LDKBaseSign_jcall(const void* th } FREE(preimages_var.data); - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 4, (uint32_t)holder_tx_ref, (uint32_t)preimages_arr, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + uint32_t ret = js_invoke_function_buuuuu(j_calls->instance_ptr, 4, holder_tx_ref, (uint32_t)preimages_arr, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_NoneNoneZ ret_conv = *(LDKCResult_NoneNoneZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } LDKThirtyTwoBytes channel_keys_id_LDKBaseSign_jcall(const void* this_arg) { @@ -4019,15 +3573,10 @@ LDKThirtyTwoBytes channel_keys_id_LDKBaseSign_jcall(const void* this_arg) { LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_counterparty_commitment_LDKBaseSign_jcall(const void* this_arg, const LDKCommitmentTransaction * commitment_tx, LDKCVec_PaymentPreimageZ preimages) { LDKBaseSign_JCalls *j_calls = (LDKBaseSign_JCalls*) this_arg; LDKCommitmentTransaction commitment_tx_var = *commitment_tx; - uint32_t commitment_tx_ref = 0; + uint64_t commitment_tx_ref = 0; commitment_tx_var = CommitmentTransaction_clone(&commitment_tx_var); - 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 = (uintptr_t)commitment_tx_var.inner; - if (commitment_tx_var.is_owned) { - commitment_tx_ref |= 1; - } + commitment_tx_ref = tag_ptr(commitment_tx_var.inner, commitment_tx_var.is_owned); LDKCVec_PaymentPreimageZ preimages_var = preimages; ptrArray preimages_arr = NULL; preimages_arr = init_ptrArray(preimages_var.datalen, __LINE__); @@ -4039,11 +3588,11 @@ LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_counterparty_commitment_L } FREE(preimages_var.data); - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 6, (uint32_t)commitment_tx_ref, (uint32_t)preimages_arr, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + uint32_t ret = js_invoke_function_buuuuu(j_calls->instance_ptr, 6, commitment_tx_ref, (uint32_t)preimages_arr, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ ret_conv = *(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } LDKCResult_NoneNoneZ validate_counterparty_revocation_LDKBaseSign_jcall(const void* this_arg, uint64_t idx, const uint8_t (* secret)[32]) { @@ -4051,30 +3600,25 @@ LDKCResult_NoneNoneZ validate_counterparty_revocation_LDKBaseSign_jcall(const vo int64_t idx_conv = idx; int8_tArray secret_arr = init_int8_tArray(32, __LINE__); memcpy(secret_arr->elems, *secret, 32); - uint32_t ret = js_invoke_function_buuuuu(j_calls->instance_ptr, 7, (uint32_t)idx_conv, (uint32_t)secret_arr, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + uint32_t ret = js_invoke_function_buuuuu(j_calls->instance_ptr, 7, idx_conv, (uint32_t)secret_arr, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_NoneNoneZ ret_conv = *(LDKCResult_NoneNoneZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } 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; - uint32_t commitment_tx_ref = 0; + uint64_t commitment_tx_ref = 0; commitment_tx_var = HolderCommitmentTransaction_clone(&commitment_tx_var); - 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 = (uintptr_t)commitment_tx_var.inner; - if (commitment_tx_var.is_owned) { - commitment_tx_ref |= 1; - } - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 8, (uint32_t)commitment_tx_ref, 0, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + commitment_tx_ref = tag_ptr(commitment_tx_var.inner, commitment_tx_var.is_owned); + uint32_t ret = js_invoke_function_buuuuu(j_calls->instance_ptr, 8, commitment_tx_ref, 0, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ ret_conv = *(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } 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]) { @@ -4087,11 +3631,11 @@ LDKCResult_SignatureNoneZ sign_justice_revoked_output_LDKBaseSign_jcall(const vo int64_t amount_conv = amount; int8_tArray per_commitment_key_arr = init_int8_tArray(32, __LINE__); memcpy(per_commitment_key_arr->elems, *per_commitment_key, 32); - uint32_t ret = js_invoke_function_uubuuu(j_calls->instance_ptr, 9, (uint32_t)justice_tx_arr, (uint32_t)input_conv, (uint32_t)amount_conv, (uint32_t)per_commitment_key_arr, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + uint32_t ret = js_invoke_function_uubuuu(j_calls->instance_ptr, 9, (uint32_t)justice_tx_arr, input_conv, amount_conv, (uint32_t)per_commitment_key_arr, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_SignatureNoneZ ret_conv = *(LDKCResult_SignatureNoneZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } 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) { @@ -4105,20 +3649,15 @@ LDKCResult_SignatureNoneZ sign_justice_revoked_htlc_LDKBaseSign_jcall(const void 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; - uint32_t htlc_ref = 0; + uint64_t htlc_ref = 0; htlc_var = HTLCOutputInCommitment_clone(&htlc_var); - 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 = (uintptr_t)htlc_var.inner; - if (htlc_var.is_owned) { - htlc_ref |= 1; - } - uint32_t ret = js_invoke_function_uubuuu(j_calls->instance_ptr, 10, (uint32_t)justice_tx_arr, (uint32_t)input_conv, (uint32_t)amount_conv, (uint32_t)per_commitment_key_arr, (uint32_t)htlc_ref, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + htlc_ref = tag_ptr(htlc_var.inner, htlc_var.is_owned); + uint32_t ret = js_invoke_function_uububu(j_calls->instance_ptr, 10, (uint32_t)justice_tx_arr, input_conv, amount_conv, (uint32_t)per_commitment_key_arr, htlc_ref, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_SignatureNoneZ ret_conv = *(LDKCResult_SignatureNoneZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } 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) { @@ -4132,86 +3671,66 @@ LDKCResult_SignatureNoneZ sign_counterparty_htlc_transaction_LDKBaseSign_jcall(c 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; - uint32_t htlc_ref = 0; + uint64_t htlc_ref = 0; htlc_var = HTLCOutputInCommitment_clone(&htlc_var); - 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 = (uintptr_t)htlc_var.inner; - if (htlc_var.is_owned) { - htlc_ref |= 1; - } - uint32_t ret = js_invoke_function_uubuuu(j_calls->instance_ptr, 11, (uint32_t)htlc_tx_arr, (uint32_t)input_conv, (uint32_t)amount_conv, (uint32_t)per_commitment_point_arr, (uint32_t)htlc_ref, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + htlc_ref = tag_ptr(htlc_var.inner, htlc_var.is_owned); + uint32_t ret = js_invoke_function_uububu(j_calls->instance_ptr, 11, (uint32_t)htlc_tx_arr, input_conv, amount_conv, (uint32_t)per_commitment_point_arr, htlc_ref, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_SignatureNoneZ ret_conv = *(LDKCResult_SignatureNoneZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } 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; - uint32_t closing_tx_ref = 0; + uint64_t closing_tx_ref = 0; closing_tx_var = ClosingTransaction_clone(&closing_tx_var); - 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 = (uintptr_t)closing_tx_var.inner; - if (closing_tx_var.is_owned) { - closing_tx_ref |= 1; - } - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 12, (uint32_t)closing_tx_ref, 0, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + closing_tx_ref = tag_ptr(closing_tx_var.inner, closing_tx_var.is_owned); + uint32_t ret = js_invoke_function_buuuuu(j_calls->instance_ptr, 12, closing_tx_ref, 0, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_SignatureNoneZ ret_conv = *(LDKCResult_SignatureNoneZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } LDKCResult_C2Tuple_SignatureSignatureZNoneZ sign_channel_announcement_LDKBaseSign_jcall(const void* this_arg, const LDKUnsignedChannelAnnouncement * msg) { LDKBaseSign_JCalls *j_calls = (LDKBaseSign_JCalls*) this_arg; LDKUnsignedChannelAnnouncement msg_var = *msg; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = UnsignedChannelAnnouncement_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 13, (uint32_t)msg_ref, 0, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + uint32_t ret = js_invoke_function_buuuuu(j_calls->instance_ptr, 13, msg_ref, 0, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_C2Tuple_SignatureSignatureZNoneZ ret_conv = *(LDKCResult_C2Tuple_SignatureSignatureZNoneZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } 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; - uint32_t channel_parameters_ref = 0; + uint64_t channel_parameters_ref = 0; channel_parameters_var = ChannelTransactionParameters_clone(&channel_parameters_var); - 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 = (uintptr_t)channel_parameters_var.inner; - if (channel_parameters_var.is_owned) { - channel_parameters_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 14, (uint32_t)channel_parameters_ref, 0, 0, 0, 0, 0); + channel_parameters_ref = tag_ptr(channel_parameters_var.inner, channel_parameters_var.is_owned); + js_invoke_function_buuuuu(j_calls->instance_ptr, 14, channel_parameters_ref, 0, 0, 0, 0, 0); } static void LDKBaseSign_JCalls_cloned(LDKBaseSign* new_obj) { LDKBaseSign_JCalls *j_calls = (LDKBaseSign_JCalls*) new_obj->this_arg; atomic_fetch_add_explicit(&j_calls->refcnt, 1, memory_order_release); } -static inline LDKBaseSign LDKBaseSign_init (JSValue o, uint32_t pubkeys) { +static inline LDKBaseSign LDKBaseSign_init (JSValue o, uint64_t pubkeys) { LDKBaseSign_JCalls *calls = MALLOC(sizeof(LDKBaseSign_JCalls), "LDKBaseSign_JCalls"); atomic_init(&calls->refcnt, 1); calls->instance_ptr = o; LDKChannelPublicKeys pubkeys_conv; - pubkeys_conv.inner = (void*)(pubkeys & (~1)); - pubkeys_conv.is_owned = (pubkeys & 1) || (pubkeys == 0); + pubkeys_conv.inner = untag_ptr(pubkeys); + pubkeys_conv.is_owned = ptr_is_owned(pubkeys); CHECK_INNER_FIELD_ACCESS_OR_NULL(pubkeys_conv); LDKBaseSign ret = { @@ -4235,37 +3754,38 @@ static inline LDKBaseSign LDKBaseSign_init (JSValue o, uint32_t pubkeys) { }; return ret; } -long __attribute__((export_name("TS_LDKBaseSign_new"))) TS_LDKBaseSign_new(JSValue o, uint32_t pubkeys) { +uint64_t __attribute__((export_name("TS_LDKBaseSign_new"))) TS_LDKBaseSign_new(JSValue o, uint64_t pubkeys) { LDKBaseSign *res_ptr = MALLOC(sizeof(LDKBaseSign), "LDKBaseSign"); *res_ptr = LDKBaseSign_init(o, pubkeys); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +int8_tArray __attribute__((export_name("TS_BaseSign_get_per_commitment_point"))) TS_BaseSign_get_per_commitment_point(uint64_t this_arg, int64_t idx) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKBaseSign* this_arg_conv = (LDKBaseSign*)this_arg_ptr; 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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +int8_tArray __attribute__((export_name("TS_BaseSign_release_commitment_secret"))) TS_BaseSign_release_commitment_secret(uint64_t this_arg, int64_t idx) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKBaseSign* this_arg_conv = (LDKBaseSign*)this_arg_ptr; 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, ptrArray preimages) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_BaseSign_validate_holder_commitment"))) TS_BaseSign_validate_holder_commitment(uint64_t this_arg, uint64_t holder_tx, ptrArray preimages) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKBaseSign* this_arg_conv = (LDKBaseSign*)this_arg_ptr; LDKHolderCommitmentTransaction holder_tx_conv; - holder_tx_conv.inner = (void*)(holder_tx & (~1)); - holder_tx_conv.is_owned = false; + holder_tx_conv.inner = untag_ptr(holder_tx); + holder_tx_conv.is_owned = ptr_is_owned(holder_tx); CHECK_INNER_FIELD_ACCESS_OR_NULL(holder_tx_conv); + holder_tx_conv.is_owned = false; LDKCVec_PaymentPreimageZ preimages_constr; preimages_constr.datalen = preimages->arr_len; if (preimages_constr.datalen > 0) @@ -4283,26 +3803,27 @@ uint32_t __attribute__((export_name("TS_BaseSign_validate_holder_commitment"))) FREE(preimages); LDKCResult_NoneNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneNoneZ), "LDKCResult_NoneNoneZ"); *ret_conv = (this_arg_conv->validate_holder_commitment)(this_arg_conv->this_arg, &holder_tx_conv, preimages_constr); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_BaseSign_channel_keys_id"))) TS_BaseSign_channel_keys_id(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +int8_tArray __attribute__((export_name("TS_BaseSign_channel_keys_id"))) TS_BaseSign_channel_keys_id(uint64_t this_arg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKBaseSign* this_arg_conv = (LDKBaseSign*)this_arg_ptr; 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, ptrArray preimages) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_BaseSign_sign_counterparty_commitment"))) TS_BaseSign_sign_counterparty_commitment(uint64_t this_arg, uint64_t commitment_tx, ptrArray preimages) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKBaseSign* this_arg_conv = (LDKBaseSign*)this_arg_ptr; LDKCommitmentTransaction commitment_tx_conv; - commitment_tx_conv.inner = (void*)(commitment_tx & (~1)); - commitment_tx_conv.is_owned = false; + commitment_tx_conv.inner = untag_ptr(commitment_tx); + commitment_tx_conv.is_owned = ptr_is_owned(commitment_tx); CHECK_INNER_FIELD_ACCESS_OR_NULL(commitment_tx_conv); + commitment_tx_conv.is_owned = false; LDKCVec_PaymentPreimageZ preimages_constr; preimages_constr.datalen = preimages->arr_len; if (preimages_constr.datalen > 0) @@ -4320,12 +3841,12 @@ uint32_t __attribute__((export_name("TS_BaseSign_sign_counterparty_commitment") FREE(preimages); LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ), "LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ"); *ret_conv = (this_arg_conv->sign_counterparty_commitment)(this_arg_conv->this_arg, &commitment_tx_conv, preimages_constr); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_BaseSign_validate_counterparty_revocation"))) TS_BaseSign_validate_counterparty_revocation(uint64_t this_arg, int64_t idx, int8_tArray secret) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKBaseSign* this_arg_conv = (LDKBaseSign*)this_arg_ptr; unsigned char secret_arr[32]; CHECK(secret->arr_len == 32); @@ -4333,25 +3854,26 @@ uint32_t __attribute__((export_name("TS_BaseSign_validate_counterparty_revocati 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_BaseSign_sign_holder_commitment_and_htlcs"))) TS_BaseSign_sign_holder_commitment_and_htlcs(uint64_t this_arg, uint64_t commitment_tx) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKBaseSign* this_arg_conv = (LDKBaseSign*)this_arg_ptr; LDKHolderCommitmentTransaction commitment_tx_conv; - commitment_tx_conv.inner = (void*)(commitment_tx & (~1)); - commitment_tx_conv.is_owned = false; + commitment_tx_conv.inner = untag_ptr(commitment_tx); + commitment_tx_conv.is_owned = ptr_is_owned(commitment_tx); CHECK_INNER_FIELD_ACCESS_OR_NULL(commitment_tx_conv); + commitment_tx_conv.is_owned = false; 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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, uint32_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); } +uint64_t __attribute__((export_name("TS_BaseSign_sign_justice_revoked_output"))) TS_BaseSign_sign_justice_revoked_output(uint64_t this_arg, int8_tArray justice_tx, uint32_t input, int64_t amount, int8_tArray per_commitment_key) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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; @@ -4364,12 +3886,12 @@ uint32_t __attribute__((export_name("TS_BaseSign_sign_justice_revoked_output")) 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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, uint32_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); } +uint64_t __attribute__((export_name("TS_BaseSign_sign_justice_revoked_htlc"))) TS_BaseSign_sign_justice_revoked_htlc(uint64_t this_arg, int8_tArray justice_tx, uint32_t input, int64_t amount, int8_tArray per_commitment_key, uint64_t htlc) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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; @@ -4381,17 +3903,18 @@ uint32_t __attribute__((export_name("TS_BaseSign_sign_justice_revoked_htlc"))) 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)); - htlc_conv.is_owned = false; + htlc_conv.inner = untag_ptr(htlc); + htlc_conv.is_owned = ptr_is_owned(htlc); CHECK_INNER_FIELD_ACCESS_OR_NULL(htlc_conv); + htlc_conv.is_owned = false; 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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, uint32_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); } +uint64_t __attribute__((export_name("TS_BaseSign_sign_counterparty_htlc_transaction"))) TS_BaseSign_sign_counterparty_htlc_transaction(uint64_t this_arg, int8_tArray htlc_tx, uint32_t input, int64_t amount, int8_tArray per_commitment_point, uint64_t htlc) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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; @@ -4402,48 +3925,52 @@ uint32_t __attribute__((export_name("TS_BaseSign_sign_counterparty_htlc_transac CHECK(per_commitment_point->arr_len == 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; + htlc_conv.inner = untag_ptr(htlc); + htlc_conv.is_owned = ptr_is_owned(htlc); CHECK_INNER_FIELD_ACCESS_OR_NULL(htlc_conv); + htlc_conv.is_owned = false; 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_BaseSign_sign_closing_transaction"))) TS_BaseSign_sign_closing_transaction(uint64_t this_arg, uint64_t closing_tx) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKBaseSign* this_arg_conv = (LDKBaseSign*)this_arg_ptr; LDKClosingTransaction closing_tx_conv; - closing_tx_conv.inner = (void*)(closing_tx & (~1)); - closing_tx_conv.is_owned = false; + closing_tx_conv.inner = untag_ptr(closing_tx); + closing_tx_conv.is_owned = ptr_is_owned(closing_tx); CHECK_INNER_FIELD_ACCESS_OR_NULL(closing_tx_conv); + closing_tx_conv.is_owned = false; 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_BaseSign_sign_channel_announcement"))) TS_BaseSign_sign_channel_announcement(uint64_t this_arg, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKBaseSign* this_arg_conv = (LDKBaseSign*)this_arg_ptr; LDKUnsignedChannelAnnouncement msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; LDKCResult_C2Tuple_SignatureSignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureSignatureZNoneZ), "LDKCResult_C2Tuple_SignatureSignatureZNoneZ"); *ret_conv = (this_arg_conv->sign_channel_announcement)(this_arg_conv->this_arg, &msg_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_BaseSign_ready_channel"))) TS_BaseSign_ready_channel(uint64_t this_arg, uint64_t channel_parameters) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKBaseSign* this_arg_conv = (LDKBaseSign*)this_arg_ptr; LDKChannelTransactionParameters channel_parameters_conv; - channel_parameters_conv.inner = (void*)(channel_parameters & (~1)); - channel_parameters_conv.is_owned = false; + channel_parameters_conv.inner = untag_ptr(channel_parameters); + channel_parameters_conv.is_owned = ptr_is_owned(channel_parameters); CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_parameters_conv); + channel_parameters_conv.is_owned = false; (this_arg_conv->ready_channel)(this_arg_conv->this_arg, &channel_parameters_conv); } @@ -4452,19 +3979,14 @@ LDKChannelPublicKeys LDKBaseSign_set_get_pubkeys(LDKBaseSign* this_arg) { this_arg->set_pubkeys(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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_BaseSign_get_pubkeys"))) TS_BaseSign_get_pubkeys(uint64_t this_arg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKBaseSign* this_arg_conv = (LDKBaseSign*)this_arg_ptr; LDKChannelPublicKeys ret_var = LDKBaseSign_set_get_pubkeys(this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -4493,14 +4015,14 @@ static void LDKSign_JCalls_cloned(LDKSign* new_obj) { atomic_fetch_add_explicit(&j_calls->refcnt, 1, memory_order_release); atomic_fetch_add_explicit(&j_calls->BaseSign->refcnt, 1, memory_order_release); } -static inline LDKSign LDKSign_init (JSValue o, JSValue BaseSign, uint32_t pubkeys) { +static inline LDKSign LDKSign_init (JSValue o, JSValue BaseSign, uint64_t pubkeys) { LDKSign_JCalls *calls = MALLOC(sizeof(LDKSign_JCalls), "LDKSign_JCalls"); atomic_init(&calls->refcnt, 1); calls->instance_ptr = o; LDKChannelPublicKeys pubkeys_conv; - pubkeys_conv.inner = (void*)(pubkeys & (~1)); - pubkeys_conv.is_owned = (pubkeys & 1) || (pubkeys == 0); + pubkeys_conv.inner = untag_ptr(pubkeys); + pubkeys_conv.is_owned = ptr_is_owned(pubkeys); CHECK_INNER_FIELD_ACCESS_OR_NULL(pubkeys_conv); LDKSign ret = { @@ -4513,14 +4035,14 @@ static inline LDKSign LDKSign_init (JSValue o, JSValue BaseSign, uint32_t pubkey calls->BaseSign = ret.BaseSign.this_arg; return ret; } -long __attribute__((export_name("TS_LDKSign_new"))) TS_LDKSign_new(JSValue o, JSValue BaseSign, uint32_t pubkeys) { +uint64_t __attribute__((export_name("TS_LDKSign_new"))) TS_LDKSign_new(JSValue o, JSValue BaseSign, uint64_t pubkeys) { LDKSign *res_ptr = MALLOC(sizeof(LDKSign), "LDKSign"); *res_ptr = LDKSign_init(o, BaseSign, pubkeys); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -int8_tArray __attribute__((export_name("TS_Sign_write"))) TS_Sign_write(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +int8_tArray __attribute__((export_name("TS_Sign_write"))) TS_Sign_write(uint64_t this_arg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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, __LINE__); @@ -4533,28 +4055,23 @@ static inline struct LDKSign CResult_SignDecodeErrorZ_get_ok(LDKCResult_SignDeco CHECK(owner->result_ok); return Sign_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_SignDecodeErrorZ_get_ok"))) TS_CResult_SignDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_SignDecodeErrorZ* owner_conv = (LDKCResult_SignDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_SignDecodeErrorZ_get_ok"))) TS_CResult_SignDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_SignDecodeErrorZ* owner_conv = (LDKCResult_SignDecodeErrorZ*)untag_ptr(owner); LDKSign* ret_ret = MALLOC(sizeof(LDKSign), "LDKSign"); *ret_ret = CResult_SignDecodeErrorZ_get_ok(owner_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } static inline struct LDKDecodeError CResult_SignDecodeErrorZ_get_err(LDKCResult_SignDecodeErrorZ *NONNULL_PTR owner){ CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_SignDecodeErrorZ_get_err"))) TS_CResult_SignDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_SignDecodeErrorZ* owner_conv = (LDKCResult_SignDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_SignDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -4562,8 +4079,8 @@ static inline struct LDKRecoverableSignature CResult_RecoverableSignatureNoneZ_g CHECK(owner->result_ok); return *owner->contents.result; } -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 __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_get_ok"))) TS_CResult_RecoverableSignatureNoneZ_get_ok(uint64_t owner) { + LDKCResult_RecoverableSignatureNoneZ* owner_conv = (LDKCResult_RecoverableSignatureNoneZ*)untag_ptr(owner); 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; @@ -4573,8 +4090,8 @@ static inline void CResult_RecoverableSignatureNoneZ_get_err(LDKCResult_Recovera CHECK(!owner->result_ok); return *owner->contents.err; } -void __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_get_err"))) TS_CResult_RecoverableSignatureNoneZ_get_err(uint32_t owner) { - LDKCResult_RecoverableSignatureNoneZ* owner_conv = (LDKCResult_RecoverableSignatureNoneZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_get_err"))) TS_CResult_RecoverableSignatureNoneZ_get_err(uint64_t owner) { + LDKCResult_RecoverableSignatureNoneZ* owner_conv = (LDKCResult_RecoverableSignatureNoneZ*)untag_ptr(owner); CResult_RecoverableSignatureNoneZ_get_err(owner_conv); } @@ -4589,8 +4106,8 @@ static inline struct LDKCVec_CVec_u8ZZ CResult_CVec_CVec_u8ZZNoneZ_get_ok(LDKCRe CHECK(owner->result_ok); return CVec_CVec_u8ZZ_clone(&*owner->contents.result); } -ptrArray __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_get_ok"))) TS_CResult_CVec_CVec_u8ZZNoneZ_get_ok(uint32_t owner) { - LDKCResult_CVec_CVec_u8ZZNoneZ* owner_conv = (LDKCResult_CVec_CVec_u8ZZNoneZ*)(owner & ~1); +ptrArray __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_get_ok"))) TS_CResult_CVec_CVec_u8ZZNoneZ_get_ok(uint64_t owner) { + LDKCResult_CVec_CVec_u8ZZNoneZ* owner_conv = (LDKCResult_CVec_CVec_u8ZZNoneZ*)untag_ptr(owner); LDKCVec_CVec_u8ZZ ret_var = CResult_CVec_CVec_u8ZZNoneZ_get_ok(owner_conv); ptrArray ret_arr = NULL; ret_arr = init_ptrArray(ret_var.datalen, __LINE__); @@ -4611,8 +4128,8 @@ static inline void CResult_CVec_CVec_u8ZZNoneZ_get_err(LDKCResult_CVec_CVec_u8ZZ CHECK(!owner->result_ok); return *owner->contents.err; } -void __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_get_err"))) TS_CResult_CVec_CVec_u8ZZNoneZ_get_err(uint32_t owner) { - LDKCResult_CVec_CVec_u8ZZNoneZ* owner_conv = (LDKCResult_CVec_CVec_u8ZZNoneZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_get_err"))) TS_CResult_CVec_CVec_u8ZZNoneZ_get_err(uint64_t owner) { + LDKCResult_CVec_CVec_u8ZZNoneZ* owner_conv = (LDKCResult_CVec_CVec_u8ZZNoneZ*)untag_ptr(owner); CResult_CVec_CVec_u8ZZNoneZ_get_err(owner_conv); } @@ -4620,17 +4137,12 @@ static inline struct LDKInMemorySigner CResult_InMemorySignerDecodeErrorZ_get_ok CHECK(owner->result_ok); return InMemorySigner_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_get_ok"))) TS_CResult_InMemorySignerDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_InMemorySignerDecodeErrorZ* owner_conv = (LDKCResult_InMemorySignerDecodeErrorZ*)untag_ptr(owner); LDKInMemorySigner ret_var = CResult_InMemorySignerDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -4638,17 +4150,12 @@ static inline struct LDKDecodeError CResult_InMemorySignerDecodeErrorZ_get_err(L CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_get_err"))) TS_CResult_InMemorySignerDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_InMemorySignerDecodeErrorZ* owner_conv = (LDKCResult_InMemorySignerDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_InMemorySignerDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -4663,8 +4170,8 @@ static inline struct LDKTransaction CResult_TransactionNoneZ_get_ok(LDKCResult_T CHECK(owner->result_ok); return *owner->contents.result; } -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); +int8_tArray __attribute__((export_name("TS_CResult_TransactionNoneZ_get_ok"))) TS_CResult_TransactionNoneZ_get_ok(uint64_t owner) { + LDKCResult_TransactionNoneZ* owner_conv = (LDKCResult_TransactionNoneZ*)untag_ptr(owner); LDKTransaction ret_var = CResult_TransactionNoneZ_get_ok(owner_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -4675,27 +4182,27 @@ static inline void CResult_TransactionNoneZ_get_err(LDKCResult_TransactionNoneZ CHECK(!owner->result_ok); return *owner->contents.err; } -void __attribute__((export_name("TS_CResult_TransactionNoneZ_get_err"))) TS_CResult_TransactionNoneZ_get_err(uint32_t owner) { - LDKCResult_TransactionNoneZ* owner_conv = (LDKCResult_TransactionNoneZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_TransactionNoneZ_get_err"))) TS_CResult_TransactionNoneZ_get_err(uint64_t owner) { + LDKCResult_TransactionNoneZ* owner_conv = (LDKCResult_TransactionNoneZ*)untag_ptr(owner); CResult_TransactionNoneZ_get_err(owner_conv); } -uint32_t __attribute__((export_name("TS_LDKCOption_u16Z_ty_from_ptr"))) TS_LDKCOption_u16Z_ty_from_ptr(uint32_t ptr) { - LDKCOption_u16Z *obj = (LDKCOption_u16Z*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKCOption_u16Z_ty_from_ptr"))) TS_LDKCOption_u16Z_ty_from_ptr(uint64_t ptr) { + LDKCOption_u16Z *obj = (LDKCOption_u16Z*)untag_ptr(ptr); switch(obj->tag) { case LDKCOption_u16Z_Some: return 0; case LDKCOption_u16Z_None: return 1; default: abort(); } } -int16_t __attribute__((export_name("TS_LDKCOption_u16Z_Some_get_some"))) TS_LDKCOption_u16Z_Some_get_some(uint32_t ptr) { - LDKCOption_u16Z *obj = (LDKCOption_u16Z*)(ptr & ~1); +int16_t __attribute__((export_name("TS_LDKCOption_u16Z_Some_get_some"))) TS_LDKCOption_u16Z_Some_get_some(uint64_t ptr) { + LDKCOption_u16Z *obj = (LDKCOption_u16Z*)untag_ptr(ptr); assert(obj->tag == LDKCOption_u16Z_Some); int16_t some_conv = obj->some; return some_conv; } -uint32_t __attribute__((export_name("TS_LDKAPIError_ty_from_ptr"))) TS_LDKAPIError_ty_from_ptr(uint32_t ptr) { - LDKAPIError *obj = (LDKAPIError*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKAPIError_ty_from_ptr"))) TS_LDKAPIError_ty_from_ptr(uint64_t ptr) { + LDKAPIError *obj = (LDKAPIError*)untag_ptr(ptr); switch(obj->tag) { case LDKAPIError_APIMisuseError: return 0; case LDKAPIError_FeeRateTooHigh: return 1; @@ -4706,57 +4213,55 @@ uint32_t __attribute__((export_name("TS_LDKAPIError_ty_from_ptr"))) TS_LDKAPIErr default: abort(); } } -jstring __attribute__((export_name("TS_LDKAPIError_APIMisuseError_get_err"))) TS_LDKAPIError_APIMisuseError_get_err(uint32_t ptr) { - LDKAPIError *obj = (LDKAPIError*)(ptr & ~1); +jstring __attribute__((export_name("TS_LDKAPIError_APIMisuseError_get_err"))) TS_LDKAPIError_APIMisuseError_get_err(uint64_t ptr) { + LDKAPIError *obj = (LDKAPIError*)untag_ptr(ptr); assert(obj->tag == LDKAPIError_APIMisuseError); LDKStr err_str = obj->api_misuse_error.err; jstring err_conv = str_ref_to_ts(err_str.chars, err_str.len); return err_conv; } -jstring __attribute__((export_name("TS_LDKAPIError_FeeRateTooHigh_get_err"))) TS_LDKAPIError_FeeRateTooHigh_get_err(uint32_t ptr) { - LDKAPIError *obj = (LDKAPIError*)(ptr & ~1); +jstring __attribute__((export_name("TS_LDKAPIError_FeeRateTooHigh_get_err"))) TS_LDKAPIError_FeeRateTooHigh_get_err(uint64_t ptr) { + LDKAPIError *obj = (LDKAPIError*)untag_ptr(ptr); assert(obj->tag == LDKAPIError_FeeRateTooHigh); LDKStr err_str = obj->fee_rate_too_high.err; jstring err_conv = str_ref_to_ts(err_str.chars, err_str.len); return err_conv; } -int32_t __attribute__((export_name("TS_LDKAPIError_FeeRateTooHigh_get_feerate"))) TS_LDKAPIError_FeeRateTooHigh_get_feerate(uint32_t ptr) { - LDKAPIError *obj = (LDKAPIError*)(ptr & ~1); +int32_t __attribute__((export_name("TS_LDKAPIError_FeeRateTooHigh_get_feerate"))) TS_LDKAPIError_FeeRateTooHigh_get_feerate(uint64_t ptr) { + LDKAPIError *obj = (LDKAPIError*)untag_ptr(ptr); assert(obj->tag == LDKAPIError_FeeRateTooHigh); int32_t feerate_conv = obj->fee_rate_too_high.feerate; return feerate_conv; } -jstring __attribute__((export_name("TS_LDKAPIError_RouteError_get_err"))) TS_LDKAPIError_RouteError_get_err(uint32_t ptr) { - LDKAPIError *obj = (LDKAPIError*)(ptr & ~1); +jstring __attribute__((export_name("TS_LDKAPIError_RouteError_get_err"))) TS_LDKAPIError_RouteError_get_err(uint64_t ptr) { + LDKAPIError *obj = (LDKAPIError*)untag_ptr(ptr); assert(obj->tag == LDKAPIError_RouteError); LDKStr err_str = obj->route_error.err; jstring err_conv = str_ref_to_ts(err_str.chars, err_str.len); return err_conv; } -jstring __attribute__((export_name("TS_LDKAPIError_ChannelUnavailable_get_err"))) TS_LDKAPIError_ChannelUnavailable_get_err(uint32_t ptr) { - LDKAPIError *obj = (LDKAPIError*)(ptr & ~1); +jstring __attribute__((export_name("TS_LDKAPIError_ChannelUnavailable_get_err"))) TS_LDKAPIError_ChannelUnavailable_get_err(uint64_t ptr) { + LDKAPIError *obj = (LDKAPIError*)untag_ptr(ptr); assert(obj->tag == LDKAPIError_ChannelUnavailable); LDKStr err_str = obj->channel_unavailable.err; jstring err_conv = str_ref_to_ts(err_str.chars, err_str.len); return err_conv; } -uint32_t __attribute__((export_name("TS_LDKAPIError_IncompatibleShutdownScript_get_script"))) TS_LDKAPIError_IncompatibleShutdownScript_get_script(uint32_t ptr) { - LDKAPIError *obj = (LDKAPIError*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKAPIError_IncompatibleShutdownScript_get_script"))) TS_LDKAPIError_IncompatibleShutdownScript_get_script(uint64_t ptr) { + LDKAPIError *obj = (LDKAPIError*)untag_ptr(ptr); assert(obj->tag == LDKAPIError_IncompatibleShutdownScript); LDKShutdownScript script_var = obj->incompatible_shutdown_script.script; - uint32_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. + uint64_t script_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(script_var); - script_ref = (uintptr_t)script_var.inner & ~1; + script_ref = tag_ptr(script_var.inner, false); return script_ref; } static inline void CResult_NoneAPIErrorZ_get_ok(LDKCResult_NoneAPIErrorZ *NONNULL_PTR owner){ CHECK(owner->result_ok); return *owner->contents.result; } -void __attribute__((export_name("TS_CResult_NoneAPIErrorZ_get_ok"))) TS_CResult_NoneAPIErrorZ_get_ok(uint32_t owner) { - LDKCResult_NoneAPIErrorZ* owner_conv = (LDKCResult_NoneAPIErrorZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_NoneAPIErrorZ_get_ok"))) TS_CResult_NoneAPIErrorZ_get_ok(uint64_t owner) { + LDKCResult_NoneAPIErrorZ* owner_conv = (LDKCResult_NoneAPIErrorZ*)untag_ptr(owner); CResult_NoneAPIErrorZ_get_ok(owner_conv); } @@ -4764,11 +4269,11 @@ static inline struct LDKAPIError CResult_NoneAPIErrorZ_get_err(LDKCResult_NoneAP CHECK(!owner->result_ok); return APIError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_NoneAPIErrorZ_get_err"))) TS_CResult_NoneAPIErrorZ_get_err(uint32_t owner) { - LDKCResult_NoneAPIErrorZ* owner_conv = (LDKCResult_NoneAPIErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_NoneAPIErrorZ_get_err"))) TS_CResult_NoneAPIErrorZ_get_err(uint64_t owner) { + LDKCResult_NoneAPIErrorZ* owner_conv = (LDKCResult_NoneAPIErrorZ*)untag_ptr(owner); LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError"); *ret_copy = CResult_NoneAPIErrorZ_get_err(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } @@ -4790,8 +4295,8 @@ static inline struct LDKThirtyTwoBytes CResult__u832APIErrorZ_get_ok(LDKCResult_ CHECK(owner->result_ok); return ThirtyTwoBytes_clone(&*owner->contents.result); } -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 __attribute__((export_name("TS_CResult__u832APIErrorZ_get_ok"))) TS_CResult__u832APIErrorZ_get_ok(uint64_t owner) { + LDKCResult__u832APIErrorZ* owner_conv = (LDKCResult__u832APIErrorZ*)untag_ptr(owner); int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, CResult__u832APIErrorZ_get_ok(owner_conv).data, 32); return ret_arr; @@ -4801,16 +4306,16 @@ static inline struct LDKAPIError CResult__u832APIErrorZ_get_err(LDKCResult__u832 CHECK(!owner->result_ok); return APIError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult__u832APIErrorZ_get_err"))) TS_CResult__u832APIErrorZ_get_err(uint32_t owner) { - LDKCResult__u832APIErrorZ* owner_conv = (LDKCResult__u832APIErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult__u832APIErrorZ_get_err"))) TS_CResult__u832APIErrorZ_get_err(uint64_t owner) { + LDKCResult__u832APIErrorZ* owner_conv = (LDKCResult__u832APIErrorZ*)untag_ptr(owner); LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError"); *ret_copy = CResult__u832APIErrorZ_get_err(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_LDKPaymentSendFailure_ty_from_ptr"))) TS_LDKPaymentSendFailure_ty_from_ptr(uint32_t ptr) { - LDKPaymentSendFailure *obj = (LDKPaymentSendFailure*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKPaymentSendFailure_ty_from_ptr"))) TS_LDKPaymentSendFailure_ty_from_ptr(uint64_t ptr) { + LDKPaymentSendFailure *obj = (LDKPaymentSendFailure*)untag_ptr(ptr); switch(obj->tag) { case LDKPaymentSendFailure_ParameterError: return 0; case LDKPaymentSendFailure_PathParameterError: return 1; @@ -4819,73 +4324,69 @@ uint32_t __attribute__((export_name("TS_LDKPaymentSendFailure_ty_from_ptr"))) TS default: abort(); } } -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); +uint64_t __attribute__((export_name("TS_LDKPaymentSendFailure_ParameterError_get_parameter_error"))) TS_LDKPaymentSendFailure_ParameterError_get_parameter_error(uint64_t ptr) { + LDKPaymentSendFailure *obj = (LDKPaymentSendFailure*)untag_ptr(ptr); assert(obj->tag == LDKPaymentSendFailure_ParameterError); - uint32_t parameter_error_ref = ((uintptr_t)&obj->parameter_error) | 1; + uint64_t parameter_error_ref = tag_ptr(&obj->parameter_error, false); 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) { - LDKPaymentSendFailure *obj = (LDKPaymentSendFailure*)(ptr & ~1); +uint64_tArray __attribute__((export_name("TS_LDKPaymentSendFailure_PathParameterError_get_path_parameter_error"))) TS_LDKPaymentSendFailure_PathParameterError_get_path_parameter_error(uint64_t ptr) { + LDKPaymentSendFailure *obj = (LDKPaymentSendFailure*)untag_ptr(ptr); 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, __LINE__); - uint32_t *path_parameter_error_arr_ptr = (uint32_t*)(((uint8_t*)path_parameter_error_arr) + 8); + uint64_tArray path_parameter_error_arr = NULL; + path_parameter_error_arr = init_uint64_tArray(path_parameter_error_var.datalen, __LINE__); + uint64_t *path_parameter_error_arr_ptr = (uint64_t*)(((uint8_t*)path_parameter_error_arr) + 8); for (size_t w = 0; w < path_parameter_error_var.datalen; w++) { LDKCResult_NoneAPIErrorZ* path_parameter_error_conv_22_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); *path_parameter_error_conv_22_conv = path_parameter_error_var.data[w]; *path_parameter_error_conv_22_conv = CResult_NoneAPIErrorZ_clone(path_parameter_error_conv_22_conv); - path_parameter_error_arr_ptr[w] = (uint32_t)path_parameter_error_conv_22_conv; + path_parameter_error_arr_ptr[w] = tag_ptr(path_parameter_error_conv_22_conv, true); } return path_parameter_error_arr; } -uint32_tArray __attribute__((export_name("TS_LDKPaymentSendFailure_AllFailedRetrySafe_get_all_failed_retry_safe"))) TS_LDKPaymentSendFailure_AllFailedRetrySafe_get_all_failed_retry_safe(uint32_t ptr) { - LDKPaymentSendFailure *obj = (LDKPaymentSendFailure*)(ptr & ~1); +uint64_tArray __attribute__((export_name("TS_LDKPaymentSendFailure_AllFailedRetrySafe_get_all_failed_retry_safe"))) TS_LDKPaymentSendFailure_AllFailedRetrySafe_get_all_failed_retry_safe(uint64_t ptr) { + LDKPaymentSendFailure *obj = (LDKPaymentSendFailure*)untag_ptr(ptr); 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, __LINE__); - uint32_t *all_failed_retry_safe_arr_ptr = (uint32_t*)(((uint8_t*)all_failed_retry_safe_arr) + 8); + uint64_tArray all_failed_retry_safe_arr = NULL; + all_failed_retry_safe_arr = init_uint64_tArray(all_failed_retry_safe_var.datalen, __LINE__); + uint64_t *all_failed_retry_safe_arr_ptr = (uint64_t*)(((uint8_t*)all_failed_retry_safe_arr) + 8); for (size_t k = 0; k < all_failed_retry_safe_var.datalen; k++) { - uint32_t all_failed_retry_safe_conv_10_ref = ((uintptr_t)&all_failed_retry_safe_var.data[k]) | 1; + uint64_t all_failed_retry_safe_conv_10_ref = tag_ptr(&all_failed_retry_safe_var.data[k], false); all_failed_retry_safe_arr_ptr[k] = all_failed_retry_safe_conv_10_ref; } return all_failed_retry_safe_arr; } -uint32_tArray __attribute__((export_name("TS_LDKPaymentSendFailure_PartialFailure_get_results"))) TS_LDKPaymentSendFailure_PartialFailure_get_results(uint32_t ptr) { - LDKPaymentSendFailure *obj = (LDKPaymentSendFailure*)(ptr & ~1); +uint64_tArray __attribute__((export_name("TS_LDKPaymentSendFailure_PartialFailure_get_results"))) TS_LDKPaymentSendFailure_PartialFailure_get_results(uint64_t ptr) { + LDKPaymentSendFailure *obj = (LDKPaymentSendFailure*)untag_ptr(ptr); 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, __LINE__); - uint32_t *results_arr_ptr = (uint32_t*)(((uint8_t*)results_arr) + 8); + uint64_tArray results_arr = NULL; + results_arr = init_uint64_tArray(results_var.datalen, __LINE__); + uint64_t *results_arr_ptr = (uint64_t*)(((uint8_t*)results_arr) + 8); for (size_t w = 0; w < results_var.datalen; w++) { LDKCResult_NoneAPIErrorZ* results_conv_22_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); *results_conv_22_conv = results_var.data[w]; *results_conv_22_conv = CResult_NoneAPIErrorZ_clone(results_conv_22_conv); - results_arr_ptr[w] = (uint32_t)results_conv_22_conv; + results_arr_ptr[w] = tag_ptr(results_conv_22_conv, true); } return results_arr; } -uint32_t __attribute__((export_name("TS_LDKPaymentSendFailure_PartialFailure_get_failed_paths_retry"))) TS_LDKPaymentSendFailure_PartialFailure_get_failed_paths_retry(uint32_t ptr) { - LDKPaymentSendFailure *obj = (LDKPaymentSendFailure*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKPaymentSendFailure_PartialFailure_get_failed_paths_retry"))) TS_LDKPaymentSendFailure_PartialFailure_get_failed_paths_retry(uint64_t ptr) { + LDKPaymentSendFailure *obj = (LDKPaymentSendFailure*)untag_ptr(ptr); assert(obj->tag == LDKPaymentSendFailure_PartialFailure); LDKRouteParameters failed_paths_retry_var = obj->partial_failure.failed_paths_retry; - uint32_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. + uint64_t failed_paths_retry_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(failed_paths_retry_var); - failed_paths_retry_ref = (uintptr_t)failed_paths_retry_var.inner & ~1; - } + failed_paths_retry_ref = tag_ptr(failed_paths_retry_var.inner, false); 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); +int8_tArray __attribute__((export_name("TS_LDKPaymentSendFailure_PartialFailure_get_payment_id"))) TS_LDKPaymentSendFailure_PartialFailure_get_payment_id(uint64_t ptr) { + LDKPaymentSendFailure *obj = (LDKPaymentSendFailure*)untag_ptr(ptr); assert(obj->tag == LDKPaymentSendFailure_PartialFailure); int8_tArray payment_id_arr = init_int8_tArray(32, __LINE__); memcpy(payment_id_arr->elems, obj->partial_failure.payment_id.data, 32); @@ -4895,8 +4396,8 @@ static inline struct LDKThirtyTwoBytes CResult_PaymentIdPaymentSendFailureZ_get_ CHECK(owner->result_ok); return ThirtyTwoBytes_clone(&*owner->contents.result); } -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 __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_get_ok"))) TS_CResult_PaymentIdPaymentSendFailureZ_get_ok(uint64_t owner) { + LDKCResult_PaymentIdPaymentSendFailureZ* owner_conv = (LDKCResult_PaymentIdPaymentSendFailureZ*)untag_ptr(owner); int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, CResult_PaymentIdPaymentSendFailureZ_get_ok(owner_conv).data, 32); return ret_arr; @@ -4906,11 +4407,11 @@ static inline struct LDKPaymentSendFailure CResult_PaymentIdPaymentSendFailureZ_ CHECK(!owner->result_ok); return PaymentSendFailure_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_get_err"))) TS_CResult_PaymentIdPaymentSendFailureZ_get_err(uint32_t owner) { - LDKCResult_PaymentIdPaymentSendFailureZ* owner_conv = (LDKCResult_PaymentIdPaymentSendFailureZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_get_err"))) TS_CResult_PaymentIdPaymentSendFailureZ_get_err(uint64_t owner) { + LDKCResult_PaymentIdPaymentSendFailureZ* owner_conv = (LDKCResult_PaymentIdPaymentSendFailureZ*)untag_ptr(owner); LDKPaymentSendFailure *ret_copy = MALLOC(sizeof(LDKPaymentSendFailure), "LDKPaymentSendFailure"); *ret_copy = CResult_PaymentIdPaymentSendFailureZ_get_err(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } @@ -4918,8 +4419,8 @@ static inline void CResult_NonePaymentSendFailureZ_get_ok(LDKCResult_NonePayment CHECK(owner->result_ok); return *owner->contents.result; } -void __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_get_ok"))) TS_CResult_NonePaymentSendFailureZ_get_ok(uint32_t owner) { - LDKCResult_NonePaymentSendFailureZ* owner_conv = (LDKCResult_NonePaymentSendFailureZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_get_ok"))) TS_CResult_NonePaymentSendFailureZ_get_ok(uint64_t owner) { + LDKCResult_NonePaymentSendFailureZ* owner_conv = (LDKCResult_NonePaymentSendFailureZ*)untag_ptr(owner); CResult_NonePaymentSendFailureZ_get_ok(owner_conv); } @@ -4927,19 +4428,19 @@ static inline struct LDKPaymentSendFailure CResult_NonePaymentSendFailureZ_get_e CHECK(!owner->result_ok); return PaymentSendFailure_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_get_err"))) TS_CResult_NonePaymentSendFailureZ_get_err(uint32_t owner) { - LDKCResult_NonePaymentSendFailureZ* owner_conv = (LDKCResult_NonePaymentSendFailureZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_get_err"))) TS_CResult_NonePaymentSendFailureZ_get_err(uint64_t owner) { + LDKCResult_NonePaymentSendFailureZ* owner_conv = (LDKCResult_NonePaymentSendFailureZ*)untag_ptr(owner); LDKPaymentSendFailure *ret_copy = MALLOC(sizeof(LDKPaymentSendFailure), "LDKPaymentSendFailure"); *ret_copy = CResult_NonePaymentSendFailureZ_get_err(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } static inline struct LDKThirtyTwoBytes C2Tuple_PaymentHashPaymentIdZ_get_a(LDKC2Tuple_PaymentHashPaymentIdZ *NONNULL_PTR owner){ return ThirtyTwoBytes_clone(&owner->a); } -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 __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentIdZ_get_a"))) TS_C2Tuple_PaymentHashPaymentIdZ_get_a(uint64_t owner) { + LDKC2Tuple_PaymentHashPaymentIdZ* owner_conv = (LDKC2Tuple_PaymentHashPaymentIdZ*)untag_ptr(owner); int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, C2Tuple_PaymentHashPaymentIdZ_get_a(owner_conv).data, 32); return ret_arr; @@ -4948,8 +4449,8 @@ int8_tArray __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentIdZ_get_a" static inline struct LDKThirtyTwoBytes C2Tuple_PaymentHashPaymentIdZ_get_b(LDKC2Tuple_PaymentHashPaymentIdZ *NONNULL_PTR owner){ return ThirtyTwoBytes_clone(&owner->b); } -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 __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentIdZ_get_b"))) TS_C2Tuple_PaymentHashPaymentIdZ_get_b(uint64_t owner) { + LDKC2Tuple_PaymentHashPaymentIdZ* owner_conv = (LDKC2Tuple_PaymentHashPaymentIdZ*)untag_ptr(owner); int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, C2Tuple_PaymentHashPaymentIdZ_get_b(owner_conv).data, 32); return ret_arr; @@ -4959,22 +4460,22 @@ static inline struct LDKC2Tuple_PaymentHashPaymentIdZ CResult_C2Tuple_PaymentHas CHECK(owner->result_ok); return C2Tuple_PaymentHashPaymentIdZ_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_ok(uint32_t owner) { - LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* owner_conv = (LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_ok(uint64_t owner) { + LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* owner_conv = (LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ*)untag_ptr(owner); LDKC2Tuple_PaymentHashPaymentIdZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PaymentHashPaymentIdZ), "LDKC2Tuple_PaymentHashPaymentIdZ"); *ret_conv = CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_ok(owner_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } static inline struct LDKPaymentSendFailure CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_err(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ *NONNULL_PTR owner){ CHECK(!owner->result_ok); return PaymentSendFailure_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_err"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_err(uint32_t owner) { - LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* owner_conv = (LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_err"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_err(uint64_t owner) { + LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* owner_conv = (LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ*)untag_ptr(owner); LDKPaymentSendFailure *ret_copy = MALLOC(sizeof(LDKPaymentSendFailure), "LDKPaymentSendFailure"); *ret_copy = CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_err(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } @@ -4988,8 +4489,8 @@ static inline LDKCVec_ThirtyTwoBytesZ CVec_ThirtyTwoBytesZ_clone(const LDKCVec_T static inline struct LDKThirtyTwoBytes C2Tuple_PaymentHashPaymentSecretZ_get_a(LDKC2Tuple_PaymentHashPaymentSecretZ *NONNULL_PTR owner){ return ThirtyTwoBytes_clone(&owner->a); } -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 __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentSecretZ_get_a"))) TS_C2Tuple_PaymentHashPaymentSecretZ_get_a(uint64_t owner) { + LDKC2Tuple_PaymentHashPaymentSecretZ* owner_conv = (LDKC2Tuple_PaymentHashPaymentSecretZ*)untag_ptr(owner); int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, C2Tuple_PaymentHashPaymentSecretZ_get_a(owner_conv).data, 32); return ret_arr; @@ -4998,8 +4499,8 @@ int8_tArray __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentSecretZ_ge static inline struct LDKThirtyTwoBytes C2Tuple_PaymentHashPaymentSecretZ_get_b(LDKC2Tuple_PaymentHashPaymentSecretZ *NONNULL_PTR owner){ return ThirtyTwoBytes_clone(&owner->b); } -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 __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentSecretZ_get_b"))) TS_C2Tuple_PaymentHashPaymentSecretZ_get_b(uint64_t owner) { + LDKC2Tuple_PaymentHashPaymentSecretZ* owner_conv = (LDKC2Tuple_PaymentHashPaymentSecretZ*)untag_ptr(owner); int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, C2Tuple_PaymentHashPaymentSecretZ_get_b(owner_conv).data, 32); return ret_arr; @@ -5009,19 +4510,19 @@ static inline struct LDKC2Tuple_PaymentHashPaymentSecretZ CResult_C2Tuple_Paymen CHECK(owner->result_ok); return C2Tuple_PaymentHashPaymentSecretZ_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_ok(uint32_t owner) { - LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* owner_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_ok(uint64_t owner) { + LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* owner_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ*)untag_ptr(owner); LDKC2Tuple_PaymentHashPaymentSecretZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PaymentHashPaymentSecretZ), "LDKC2Tuple_PaymentHashPaymentSecretZ"); *ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_ok(owner_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } static inline void CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_err(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ *NONNULL_PTR owner){ CHECK(!owner->result_ok); return *owner->contents.err; } -void __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_err"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_err(uint32_t owner) { - LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* owner_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_err"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_err(uint64_t owner) { + LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* owner_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ*)untag_ptr(owner); CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_err(owner_conv); } @@ -5029,22 +4530,22 @@ static inline struct LDKC2Tuple_PaymentHashPaymentSecretZ CResult_C2Tuple_Paymen CHECK(owner->result_ok); return C2Tuple_PaymentHashPaymentSecretZ_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_ok(uint32_t owner) { - LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* owner_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_ok(uint64_t owner) { + LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* owner_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)untag_ptr(owner); LDKC2Tuple_PaymentHashPaymentSecretZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PaymentHashPaymentSecretZ), "LDKC2Tuple_PaymentHashPaymentSecretZ"); *ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_ok(owner_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } static inline struct LDKAPIError CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_err(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ *NONNULL_PTR owner){ CHECK(!owner->result_ok); return APIError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_err"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_err(uint32_t owner) { - LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* owner_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_err"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_err(uint64_t owner) { + LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* owner_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)untag_ptr(owner); LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError"); *ret_copy = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_err(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } @@ -5052,8 +4553,8 @@ static inline struct LDKThirtyTwoBytes CResult_PaymentSecretNoneZ_get_ok(LDKCRes CHECK(owner->result_ok); return ThirtyTwoBytes_clone(&*owner->contents.result); } -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 __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_get_ok"))) TS_CResult_PaymentSecretNoneZ_get_ok(uint64_t owner) { + LDKCResult_PaymentSecretNoneZ* owner_conv = (LDKCResult_PaymentSecretNoneZ*)untag_ptr(owner); int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, CResult_PaymentSecretNoneZ_get_ok(owner_conv).data, 32); return ret_arr; @@ -5063,8 +4564,8 @@ static inline void CResult_PaymentSecretNoneZ_get_err(LDKCResult_PaymentSecretNo CHECK(!owner->result_ok); return *owner->contents.err; } -void __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_get_err"))) TS_CResult_PaymentSecretNoneZ_get_err(uint32_t owner) { - LDKCResult_PaymentSecretNoneZ* owner_conv = (LDKCResult_PaymentSecretNoneZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_get_err"))) TS_CResult_PaymentSecretNoneZ_get_err(uint64_t owner) { + LDKCResult_PaymentSecretNoneZ* owner_conv = (LDKCResult_PaymentSecretNoneZ*)untag_ptr(owner); CResult_PaymentSecretNoneZ_get_err(owner_conv); } @@ -5072,8 +4573,8 @@ static inline struct LDKThirtyTwoBytes CResult_PaymentSecretAPIErrorZ_get_ok(LDK CHECK(owner->result_ok); return ThirtyTwoBytes_clone(&*owner->contents.result); } -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 __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_get_ok"))) TS_CResult_PaymentSecretAPIErrorZ_get_ok(uint64_t owner) { + LDKCResult_PaymentSecretAPIErrorZ* owner_conv = (LDKCResult_PaymentSecretAPIErrorZ*)untag_ptr(owner); int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, CResult_PaymentSecretAPIErrorZ_get_ok(owner_conv).data, 32); return ret_arr; @@ -5083,11 +4584,11 @@ static inline struct LDKAPIError CResult_PaymentSecretAPIErrorZ_get_err(LDKCResu CHECK(!owner->result_ok); return APIError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_get_err"))) TS_CResult_PaymentSecretAPIErrorZ_get_err(uint32_t owner) { - LDKCResult_PaymentSecretAPIErrorZ* owner_conv = (LDKCResult_PaymentSecretAPIErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_get_err"))) TS_CResult_PaymentSecretAPIErrorZ_get_err(uint64_t owner) { + LDKCResult_PaymentSecretAPIErrorZ* owner_conv = (LDKCResult_PaymentSecretAPIErrorZ*)untag_ptr(owner); LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError"); *ret_copy = CResult_PaymentSecretAPIErrorZ_get_err(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } @@ -5095,8 +4596,8 @@ static inline struct LDKThirtyTwoBytes CResult_PaymentPreimageAPIErrorZ_get_ok(L CHECK(owner->result_ok); return ThirtyTwoBytes_clone(&*owner->contents.result); } -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 __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_get_ok"))) TS_CResult_PaymentPreimageAPIErrorZ_get_ok(uint64_t owner) { + LDKCResult_PaymentPreimageAPIErrorZ* owner_conv = (LDKCResult_PaymentPreimageAPIErrorZ*)untag_ptr(owner); int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, CResult_PaymentPreimageAPIErrorZ_get_ok(owner_conv).data, 32); return ret_arr; @@ -5106,11 +4607,11 @@ static inline struct LDKAPIError CResult_PaymentPreimageAPIErrorZ_get_err(LDKCRe CHECK(!owner->result_ok); return APIError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_get_err"))) TS_CResult_PaymentPreimageAPIErrorZ_get_err(uint32_t owner) { - LDKCResult_PaymentPreimageAPIErrorZ* owner_conv = (LDKCResult_PaymentPreimageAPIErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_get_err"))) TS_CResult_PaymentPreimageAPIErrorZ_get_err(uint64_t owner) { + LDKCResult_PaymentPreimageAPIErrorZ* owner_conv = (LDKCResult_PaymentPreimageAPIErrorZ*)untag_ptr(owner); LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError"); *ret_copy = CResult_PaymentPreimageAPIErrorZ_get_err(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } @@ -5118,17 +4619,12 @@ static inline struct LDKCounterpartyForwardingInfo CResult_CounterpartyForwardin CHECK(owner->result_ok); return CounterpartyForwardingInfo_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_get_ok"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* owner_conv = (LDKCResult_CounterpartyForwardingInfoDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_get_ok"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* owner_conv = (LDKCResult_CounterpartyForwardingInfoDecodeErrorZ*)untag_ptr(owner); LDKCounterpartyForwardingInfo ret_var = CResult_CounterpartyForwardingInfoDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -5136,17 +4632,12 @@ static inline struct LDKDecodeError CResult_CounterpartyForwardingInfoDecodeErro CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_get_err"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_get_err(uint32_t owner) { - LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* owner_conv = (LDKCResult_CounterpartyForwardingInfoDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_get_err"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* owner_conv = (LDKCResult_CounterpartyForwardingInfoDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_CounterpartyForwardingInfoDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -5154,17 +4645,12 @@ static inline struct LDKChannelCounterparty CResult_ChannelCounterpartyDecodeErr CHECK(owner->result_ok); return ChannelCounterparty_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_get_ok"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_ChannelCounterpartyDecodeErrorZ* owner_conv = (LDKCResult_ChannelCounterpartyDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_get_ok"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ChannelCounterpartyDecodeErrorZ* owner_conv = (LDKCResult_ChannelCounterpartyDecodeErrorZ*)untag_ptr(owner); LDKChannelCounterparty ret_var = CResult_ChannelCounterpartyDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -5172,17 +4658,12 @@ static inline struct LDKDecodeError CResult_ChannelCounterpartyDecodeErrorZ_get_ CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_get_err"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_get_err(uint32_t owner) { - LDKCResult_ChannelCounterpartyDecodeErrorZ* owner_conv = (LDKCResult_ChannelCounterpartyDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_get_err"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ChannelCounterpartyDecodeErrorZ* owner_conv = (LDKCResult_ChannelCounterpartyDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ChannelCounterpartyDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -5190,17 +4671,12 @@ static inline struct LDKChannelDetails CResult_ChannelDetailsDecodeErrorZ_get_ok CHECK(owner->result_ok); return ChannelDetails_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_get_ok"))) TS_CResult_ChannelDetailsDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_ChannelDetailsDecodeErrorZ* owner_conv = (LDKCResult_ChannelDetailsDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_get_ok"))) TS_CResult_ChannelDetailsDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ChannelDetailsDecodeErrorZ* owner_conv = (LDKCResult_ChannelDetailsDecodeErrorZ*)untag_ptr(owner); LDKChannelDetails ret_var = CResult_ChannelDetailsDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -5208,17 +4684,12 @@ static inline struct LDKDecodeError CResult_ChannelDetailsDecodeErrorZ_get_err(L CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_get_err"))) TS_CResult_ChannelDetailsDecodeErrorZ_get_err(uint32_t owner) { - LDKCResult_ChannelDetailsDecodeErrorZ* owner_conv = (LDKCResult_ChannelDetailsDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_get_err"))) TS_CResult_ChannelDetailsDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ChannelDetailsDecodeErrorZ* owner_conv = (LDKCResult_ChannelDetailsDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ChannelDetailsDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -5226,17 +4697,12 @@ static inline struct LDKPhantomRouteHints CResult_PhantomRouteHintsDecodeErrorZ_ CHECK(owner->result_ok); return PhantomRouteHints_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_get_ok"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_PhantomRouteHintsDecodeErrorZ* owner_conv = (LDKCResult_PhantomRouteHintsDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_get_ok"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_PhantomRouteHintsDecodeErrorZ* owner_conv = (LDKCResult_PhantomRouteHintsDecodeErrorZ*)untag_ptr(owner); LDKPhantomRouteHints ret_var = CResult_PhantomRouteHintsDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -5244,17 +4710,12 @@ static inline struct LDKDecodeError CResult_PhantomRouteHintsDecodeErrorZ_get_er CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_get_err"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_get_err(uint32_t owner) { - LDKCResult_PhantomRouteHintsDecodeErrorZ* owner_conv = (LDKCResult_PhantomRouteHintsDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_get_err"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_PhantomRouteHintsDecodeErrorZ* owner_conv = (LDKCResult_PhantomRouteHintsDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_PhantomRouteHintsDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -5278,73 +4739,53 @@ 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; - uint32_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. + uint64_t funding_txo_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_txo_var); - funding_txo_ref = (uintptr_t)funding_txo_var.inner; - if (funding_txo_var.is_owned) { - funding_txo_ref |= 1; - } + funding_txo_ref = tag_ptr(funding_txo_var.inner, funding_txo_var.is_owned); LDKChannelMonitor monitor_var = monitor; - uint32_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. + uint64_t monitor_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(monitor_var); - monitor_ref = (uintptr_t)monitor_var.inner; - if (monitor_var.is_owned) { - monitor_ref |= 1; - } - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 16, (uint32_t)funding_txo_ref, (uint32_t)monitor_ref, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + monitor_ref = tag_ptr(monitor_var.inner, monitor_var.is_owned); + uint32_t ret = js_invoke_function_bbuuuu(j_calls->instance_ptr, 16, funding_txo_ref, monitor_ref, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_NoneChannelMonitorUpdateErrZ ret_conv = *(LDKCResult_NoneChannelMonitorUpdateErrZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } 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; - uint32_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. + uint64_t funding_txo_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_txo_var); - funding_txo_ref = (uintptr_t)funding_txo_var.inner; - if (funding_txo_var.is_owned) { - funding_txo_ref |= 1; - } + funding_txo_ref = tag_ptr(funding_txo_var.inner, funding_txo_var.is_owned); LDKChannelMonitorUpdate update_var = update; - uint32_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. + uint64_t update_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(update_var); - update_ref = (uintptr_t)update_var.inner; - if (update_var.is_owned) { - update_ref |= 1; - } - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 17, (uint32_t)funding_txo_ref, (uint32_t)update_ref, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + update_ref = tag_ptr(update_var.inner, update_var.is_owned); + uint32_t ret = js_invoke_function_bbuuuu(j_calls->instance_ptr, 17, funding_txo_ref, update_ref, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_NoneChannelMonitorUpdateErrZ ret_conv = *(LDKCResult_NoneChannelMonitorUpdateErrZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } LDKCVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ release_pending_monitor_events_LDKWatch_jcall(const void* this_arg) { LDKWatch_JCalls *j_calls = (LDKWatch_JCalls*) this_arg; - uint32_tArray ret = (uint32_tArray)js_invoke_function_uuuuuu(j_calls->instance_ptr, 18, 0, 0, 0, 0, 0, 0); + uint64_tArray ret = (uint64_tArray)js_invoke_function_uuuuuu(j_calls->instance_ptr, 18, 0, 0, 0, 0, 0, 0); LDKCVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ ret_constr; ret_constr.datalen = ret->arr_len; if (ret_constr.datalen > 0) ret_constr.data = MALLOC(ret_constr.datalen * sizeof(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ), "LDKCVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ Elements"); else ret_constr.data = NULL; - uint32_t* ret_vals = ret->elems; + uint64_t* ret_vals = ret->elems; for (size_t x = 0; x < ret_constr.datalen; x++) { - uint32_t ret_conv_49 = ret_vals[x]; - void* ret_conv_49_ptr = (void*)(((uintptr_t)ret_conv_49) & ~1); + uint64_t ret_conv_49 = ret_vals[x]; + void* ret_conv_49_ptr = untag_ptr(ret_conv_49); CHECK_ACCESS(ret_conv_49_ptr); LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ ret_conv_49_conv = *(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ*)(ret_conv_49_ptr); - FREE((void*)ret_conv_49); + FREE(untag_ptr(ret_conv_49)); ret_constr.data[x] = ret_conv_49_conv; } FREE(ret); @@ -5368,61 +4809,61 @@ static inline LDKWatch LDKWatch_init (JSValue o) { }; return ret; } -long __attribute__((export_name("TS_LDKWatch_new"))) TS_LDKWatch_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKWatch_new"))) TS_LDKWatch_new(JSValue o) { LDKWatch *res_ptr = MALLOC(sizeof(LDKWatch), "LDKWatch"); *res_ptr = LDKWatch_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_Watch_watch_channel"))) TS_Watch_watch_channel(uint64_t this_arg, uint64_t funding_txo, uint64_t monitor) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKWatch* this_arg_conv = (LDKWatch*)this_arg_ptr; LDKOutPoint funding_txo_conv; - funding_txo_conv.inner = (void*)(funding_txo & (~1)); - funding_txo_conv.is_owned = (funding_txo & 1) || (funding_txo == 0); + funding_txo_conv.inner = untag_ptr(funding_txo); + funding_txo_conv.is_owned = ptr_is_owned(funding_txo); CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_txo_conv); funding_txo_conv = OutPoint_clone(&funding_txo_conv); LDKChannelMonitor monitor_conv; - monitor_conv.inner = (void*)(monitor & (~1)); - monitor_conv.is_owned = (monitor & 1) || (monitor == 0); + monitor_conv.inner = untag_ptr(monitor); + monitor_conv.is_owned = ptr_is_owned(monitor); CHECK_INNER_FIELD_ACCESS_OR_NULL(monitor_conv); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_Watch_update_channel"))) TS_Watch_update_channel(uint64_t this_arg, uint64_t funding_txo, uint64_t update) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKWatch* this_arg_conv = (LDKWatch*)this_arg_ptr; LDKOutPoint funding_txo_conv; - funding_txo_conv.inner = (void*)(funding_txo & (~1)); - funding_txo_conv.is_owned = (funding_txo & 1) || (funding_txo == 0); + funding_txo_conv.inner = untag_ptr(funding_txo); + funding_txo_conv.is_owned = ptr_is_owned(funding_txo); CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_txo_conv); funding_txo_conv = OutPoint_clone(&funding_txo_conv); LDKChannelMonitorUpdate update_conv; - update_conv.inner = (void*)(update & (~1)); - update_conv.is_owned = (update & 1) || (update == 0); + update_conv.inner = untag_ptr(update); + update_conv.is_owned = ptr_is_owned(update); CHECK_INNER_FIELD_ACCESS_OR_NULL(update_conv); update_conv = ChannelMonitorUpdate_clone(&update_conv); LDKCResult_NoneChannelMonitorUpdateErrZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneChannelMonitorUpdateErrZ), "LDKCResult_NoneChannelMonitorUpdateErrZ"); *ret_conv = (this_arg_conv->update_channel)(this_arg_conv->this_arg, funding_txo_conv, update_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_tArray __attribute__((export_name("TS_Watch_release_pending_monitor_events"))) TS_Watch_release_pending_monitor_events(uint64_t this_arg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKWatch* this_arg_conv = (LDKWatch*)this_arg_ptr; LDKCVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ ret_var = (this_arg_conv->release_pending_monitor_events)(this_arg_conv->this_arg); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t x = 0; x < ret_var.datalen; x++) { LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ* ret_conv_49_conv = MALLOC(sizeof(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ), "LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ"); *ret_conv_49_conv = ret_var.data[x]; - ret_arr_ptr[x] = ((uint32_t)ret_conv_49_conv); + ret_arr_ptr[x] = tag_ptr(ret_conv_49_conv, true); } FREE(ret_var.data); @@ -5463,14 +4904,14 @@ static inline LDKBroadcasterInterface LDKBroadcasterInterface_init (JSValue o) { }; return ret; } -long __attribute__((export_name("TS_LDKBroadcasterInterface_new"))) TS_LDKBroadcasterInterface_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKBroadcasterInterface_new"))) TS_LDKBroadcasterInterface_new(JSValue o) { LDKBroadcasterInterface *res_ptr = MALLOC(sizeof(LDKBroadcasterInterface), "LDKBroadcasterInterface"); *res_ptr = LDKBroadcasterInterface_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -void __attribute__((export_name("TS_BroadcasterInterface_broadcast_transaction"))) TS_BroadcasterInterface_broadcast_transaction(uint32_t this_arg, int8_tArray tx) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_BroadcasterInterface_broadcast_transaction"))) TS_BroadcasterInterface_broadcast_transaction(uint64_t this_arg, int8_tArray tx) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKBroadcasterInterface* this_arg_conv = (LDKBroadcasterInterface*)this_arg_ptr; LDKTransaction tx_ref; tx_ref.datalen = tx->arr_len; @@ -5493,11 +4934,11 @@ static void LDKKeysInterface_JCalls_free(void* this_arg) { LDKCResult_SecretKeyNoneZ get_node_secret_LDKKeysInterface_jcall(const void* this_arg, LDKRecipient recipient) { LDKKeysInterface_JCalls *j_calls = (LDKKeysInterface_JCalls*) this_arg; uint32_t recipient_conv = LDKRecipient_to_js(recipient); - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 20, (uint32_t)recipient_conv, 0, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 20, recipient_conv, 0, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_SecretKeyNoneZ ret_conv = *(LDKCResult_SecretKeyNoneZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } LDKCVec_u8Z get_destination_script_LDKKeysInterface_jcall(const void* this_arg) { @@ -5513,8 +4954,8 @@ LDKShutdownScript get_shutdown_scriptpubkey_LDKKeysInterface_jcall(const void* t LDKKeysInterface_JCalls *j_calls = (LDKKeysInterface_JCalls*) this_arg; uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 22, 0, 0, 0, 0, 0, 0); LDKShutdownScript ret_conv; - ret_conv.inner = (void*)(ret & (~1)); - ret_conv.is_owned = (ret & 1) || (ret == 0); + ret_conv.inner = untag_ptr(ret); + ret_conv.is_owned = ptr_is_owned(ret); CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv); return ret_conv; } @@ -5522,11 +4963,11 @@ LDKSign get_channel_signer_LDKKeysInterface_jcall(const void* this_arg, bool inb LDKKeysInterface_JCalls *j_calls = (LDKKeysInterface_JCalls*) this_arg; jboolean inbound_conv = inbound; int64_t channel_value_satoshis_conv = channel_value_satoshis; - uint32_t ret = js_invoke_function_ubuuuu(j_calls->instance_ptr, 23, (uint32_t)inbound_conv, (uint32_t)channel_value_satoshis_conv, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + uint32_t ret = js_invoke_function_ubuuuu(j_calls->instance_ptr, 23, inbound_conv, channel_value_satoshis_conv, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKSign ret_conv = *(LDKSign*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } LDKThirtyTwoBytes get_secure_random_bytes_LDKKeysInterface_jcall(const void* this_arg) { @@ -5543,10 +4984,10 @@ LDKCResult_SignDecodeErrorZ read_chan_signer_LDKKeysInterface_jcall(const void* 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_uuuuuu(j_calls->instance_ptr, 25, (uint32_t)reader_arr, 0, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_SignDecodeErrorZ ret_conv = *(LDKCResult_SignDecodeErrorZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } LDKCResult_RecoverableSignatureNoneZ sign_invoice_LDKKeysInterface_jcall(const void* this_arg, LDKu8slice hrp_bytes, LDKCVec_u5Z invoice_data, LDKRecipient receipient) { @@ -5565,11 +5006,11 @@ LDKCResult_RecoverableSignatureNoneZ sign_invoice_LDKKeysInterface_jcall(const v FREE(invoice_data_var.data); uint32_t receipient_conv = LDKRecipient_to_js(receipient); - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 26, (uint32_t)hrp_bytes_arr, (uint32_t)invoice_data_arr, (uint32_t)receipient_conv, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 26, (uint32_t)hrp_bytes_arr, (uint32_t)invoice_data_arr, receipient_conv, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_RecoverableSignatureNoneZ ret_conv = *(LDKCResult_RecoverableSignatureNoneZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } LDKThirtyTwoBytes get_inbound_payment_key_material_LDKKeysInterface_jcall(const void* this_arg) { @@ -5603,24 +5044,24 @@ static inline LDKKeysInterface LDKKeysInterface_init (JSValue o) { }; return ret; } -long __attribute__((export_name("TS_LDKKeysInterface_new"))) TS_LDKKeysInterface_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKKeysInterface_new"))) TS_LDKKeysInterface_new(JSValue o) { LDKKeysInterface *res_ptr = MALLOC(sizeof(LDKKeysInterface), "LDKKeysInterface"); *res_ptr = LDKKeysInterface_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -uint32_t __attribute__((export_name("TS_KeysInterface_get_node_secret"))) TS_KeysInterface_get_node_secret(uint32_t this_arg, uint32_t recipient) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_KeysInterface_get_node_secret"))) TS_KeysInterface_get_node_secret(uint64_t this_arg, uint32_t recipient) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKKeysInterface* this_arg_conv = (LDKKeysInterface*)this_arg_ptr; LDKRecipient recipient_conv = LDKRecipient_from_js(recipient); LDKCResult_SecretKeyNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SecretKeyNoneZ), "LDKCResult_SecretKeyNoneZ"); *ret_conv = (this_arg_conv->get_node_secret)(this_arg_conv->this_arg, recipient_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_KeysInterface_get_destination_script"))) TS_KeysInterface_get_destination_script(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +int8_tArray __attribute__((export_name("TS_KeysInterface_get_destination_script"))) TS_KeysInterface_get_destination_script(uint64_t this_arg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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, __LINE__); @@ -5629,43 +5070,38 @@ int8_tArray __attribute__((export_name("TS_KeysInterface_get_destination_script 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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_KeysInterface_get_shutdown_scriptpubkey"))) TS_KeysInterface_get_shutdown_scriptpubkey(uint64_t this_arg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_KeysInterface_get_channel_signer"))) TS_KeysInterface_get_channel_signer(uint64_t this_arg, jboolean inbound, int64_t channel_value_satoshis) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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 (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +int8_tArray __attribute__((export_name("TS_KeysInterface_get_secure_random_bytes"))) TS_KeysInterface_get_secure_random_bytes(uint64_t this_arg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKKeysInterface* this_arg_conv = (LDKKeysInterface*)this_arg_ptr; 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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_KeysInterface_read_chan_signer"))) TS_KeysInterface_read_chan_signer(uint64_t this_arg, int8_tArray reader) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKKeysInterface* this_arg_conv = (LDKKeysInterface*)this_arg_ptr; LDKu8slice reader_ref; reader_ref.datalen = reader->arr_len; @@ -5673,12 +5109,12 @@ uint32_t __attribute__((export_name("TS_KeysInterface_read_chan_signer"))) TS_K LDKCResult_SignDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SignDecodeErrorZ), "LDKCResult_SignDecodeErrorZ"); *ret_conv = (this_arg_conv->read_chan_signer)(this_arg_conv->this_arg, reader_ref); FREE(reader); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_KeysInterface_sign_invoice"))) TS_KeysInterface_sign_invoice(uint32_t this_arg, int8_tArray hrp_bytes, ptrArray invoice_data, uint32_t receipient) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_KeysInterface_sign_invoice"))) TS_KeysInterface_sign_invoice(uint64_t this_arg, int8_tArray hrp_bytes, ptrArray invoice_data, uint32_t receipient) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKKeysInterface* this_arg_conv = (LDKKeysInterface*)this_arg_ptr; LDKu8slice hrp_bytes_ref; hrp_bytes_ref.datalen = hrp_bytes->arr_len; @@ -5700,12 +5136,12 @@ uint32_t __attribute__((export_name("TS_KeysInterface_sign_invoice"))) TS_KeysI LDKCResult_RecoverableSignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_RecoverableSignatureNoneZ), "LDKCResult_RecoverableSignatureNoneZ"); *ret_conv = (this_arg_conv->sign_invoice)(this_arg_conv->this_arg, hrp_bytes_ref, invoice_data_constr, receipient_conv); FREE(hrp_bytes); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +int8_tArray __attribute__((export_name("TS_KeysInterface_get_inbound_payment_key_material"))) TS_KeysInterface_get_inbound_payment_key_material(uint64_t this_arg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKKeysInterface* this_arg_conv = (LDKKeysInterface*)this_arg_ptr; 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); @@ -5725,7 +5161,7 @@ static void LDKFeeEstimator_JCalls_free(void* this_arg) { uint32_t get_est_sat_per_1000_weight_LDKFeeEstimator_jcall(const void* this_arg, LDKConfirmationTarget confirmation_target) { LDKFeeEstimator_JCalls *j_calls = (LDKFeeEstimator_JCalls*) this_arg; uint32_t confirmation_target_conv = LDKConfirmationTarget_to_js(confirmation_target); - return js_invoke_function_uuuuuu(j_calls->instance_ptr, 28, (uint32_t)confirmation_target_conv, 0, 0, 0, 0, 0); + return js_invoke_function_uuuuuu(j_calls->instance_ptr, 28, confirmation_target_conv, 0, 0, 0, 0, 0); } static void LDKFeeEstimator_JCalls_cloned(LDKFeeEstimator* new_obj) { LDKFeeEstimator_JCalls *j_calls = (LDKFeeEstimator_JCalls*) new_obj->this_arg; @@ -5743,14 +5179,14 @@ static inline LDKFeeEstimator LDKFeeEstimator_init (JSValue o) { }; return ret; } -long __attribute__((export_name("TS_LDKFeeEstimator_new"))) TS_LDKFeeEstimator_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKFeeEstimator_new"))) TS_LDKFeeEstimator_new(JSValue o) { LDKFeeEstimator *res_ptr = MALLOC(sizeof(LDKFeeEstimator), "LDKFeeEstimator"); *res_ptr = LDKFeeEstimator_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +int32_t __attribute__((export_name("TS_FeeEstimator_get_est_sat_per_1000_weight"))) TS_FeeEstimator_get_est_sat_per_1000_weight(uint64_t this_arg, uint32_t confirmation_target) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKFeeEstimator* this_arg_conv = (LDKFeeEstimator*)this_arg_ptr; LDKConfirmationTarget confirmation_target_conv = LDKConfirmationTarget_from_js(confirmation_target); int32_t ret_conv = (this_arg_conv->get_est_sat_per_1000_weight)(this_arg_conv->this_arg, confirmation_target_conv); @@ -5760,8 +5196,8 @@ int32_t __attribute__((export_name("TS_FeeEstimator_get_est_sat_per_1000_weight static inline struct LDKThirtyTwoBytes C2Tuple_BlockHashChannelManagerZ_get_a(LDKC2Tuple_BlockHashChannelManagerZ *NONNULL_PTR owner){ return ThirtyTwoBytes_clone(&owner->a); } -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 __attribute__((export_name("TS_C2Tuple_BlockHashChannelManagerZ_get_a"))) TS_C2Tuple_BlockHashChannelManagerZ_get_a(uint64_t owner) { + LDKC2Tuple_BlockHashChannelManagerZ* owner_conv = (LDKC2Tuple_BlockHashChannelManagerZ*)untag_ptr(owner); int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, C2Tuple_BlockHashChannelManagerZ_get_a(owner_conv).data, 32); return ret_arr; @@ -5770,14 +5206,12 @@ int8_tArray __attribute__((export_name("TS_C2Tuple_BlockHashChannelManagerZ_get static inline struct LDKChannelManager *C2Tuple_BlockHashChannelManagerZ_get_b(LDKC2Tuple_BlockHashChannelManagerZ *NONNULL_PTR owner){ return &owner->b; } -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); +uint64_t __attribute__((export_name("TS_C2Tuple_BlockHashChannelManagerZ_get_b"))) TS_C2Tuple_BlockHashChannelManagerZ_get_b(uint64_t owner) { + LDKC2Tuple_BlockHashChannelManagerZ* owner_conv = (LDKC2Tuple_BlockHashChannelManagerZ*)untag_ptr(owner); LDKChannelManager ret_var = *C2Tuple_BlockHashChannelManagerZ_get_b(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner & ~1; + ret_ref = tag_ptr(ret_var.inner, false); return ret_ref; } @@ -5785,9 +5219,9 @@ static inline struct LDKC2Tuple_BlockHashChannelManagerZ *CResult_C2Tuple_BlockH CHECK(owner->result_ok); return &*owner->contents.result; } -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); - uint32_t ret_ret = (uintptr_t)CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_ok(owner_conv) | 1; +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_ok"))) TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ* owner_conv = (LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ*)untag_ptr(owner); + uint64_t ret_ret = tag_ptr(CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_ok(owner_conv), false); return ret_ret; } @@ -5795,17 +5229,12 @@ static inline struct LDKDecodeError CResult_C2Tuple_BlockHashChannelManagerZDeco CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_err"))) TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ* owner_conv = (LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -5813,17 +5242,12 @@ static inline struct LDKChannelConfig CResult_ChannelConfigDecodeErrorZ_get_ok(L CHECK(owner->result_ok); return ChannelConfig_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_get_ok"))) TS_CResult_ChannelConfigDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ChannelConfigDecodeErrorZ* owner_conv = (LDKCResult_ChannelConfigDecodeErrorZ*)untag_ptr(owner); LDKChannelConfig ret_var = CResult_ChannelConfigDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -5831,17 +5255,12 @@ static inline struct LDKDecodeError CResult_ChannelConfigDecodeErrorZ_get_err(LD CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_get_err"))) TS_CResult_ChannelConfigDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ChannelConfigDecodeErrorZ* owner_conv = (LDKCResult_ChannelConfigDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ChannelConfigDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -5849,17 +5268,12 @@ static inline struct LDKOutPoint CResult_OutPointDecodeErrorZ_get_ok(LDKCResult_ CHECK(owner->result_ok); return OutPoint_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_get_ok"))) TS_CResult_OutPointDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_OutPointDecodeErrorZ* owner_conv = (LDKCResult_OutPointDecodeErrorZ*)untag_ptr(owner); LDKOutPoint ret_var = CResult_OutPointDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -5867,17 +5281,12 @@ static inline struct LDKDecodeError CResult_OutPointDecodeErrorZ_get_err(LDKCRes CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_get_err"))) TS_CResult_OutPointDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_OutPointDecodeErrorZ* owner_conv = (LDKCResult_OutPointDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_OutPointDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -5929,22 +5338,22 @@ static inline LDKType LDKType_init (JSValue o) { }; return ret; } -long __attribute__((export_name("TS_LDKType_new"))) TS_LDKType_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKType_new"))) TS_LDKType_new(JSValue o) { LDKType *res_ptr = MALLOC(sizeof(LDKType), "LDKType"); *res_ptr = LDKType_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -int16_t __attribute__((export_name("TS_Type_type_id"))) TS_Type_type_id(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +int16_t __attribute__((export_name("TS_Type_type_id"))) TS_Type_type_id(uint64_t this_arg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKType* this_arg_conv = (LDKType*)this_arg_ptr; int16_t ret_conv = (this_arg_conv->type_id)(this_arg_conv->this_arg); return ret_conv; } -jstring __attribute__((export_name("TS_Type_debug_str"))) TS_Type_debug_str(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +jstring __attribute__((export_name("TS_Type_debug_str"))) TS_Type_debug_str(uint64_t this_arg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); jstring ret_conv = str_ref_to_ts(ret_str.chars, ret_str.len); @@ -5952,9 +5361,9 @@ jstring __attribute__((export_name("TS_Type_debug_str"))) TS_Type_debug_str(uin return ret_conv; } -int8_tArray __attribute__((export_name("TS_Type_write"))) TS_Type_write(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +int8_tArray __attribute__((export_name("TS_Type_write"))) TS_Type_write(uint64_t this_arg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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, __LINE__); @@ -5963,30 +5372,30 @@ int8_tArray __attribute__((export_name("TS_Type_write"))) TS_Type_write(uint32_ return ret_arr; } -uint32_t __attribute__((export_name("TS_LDKCOption_TypeZ_ty_from_ptr"))) TS_LDKCOption_TypeZ_ty_from_ptr(uint32_t ptr) { - LDKCOption_TypeZ *obj = (LDKCOption_TypeZ*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKCOption_TypeZ_ty_from_ptr"))) TS_LDKCOption_TypeZ_ty_from_ptr(uint64_t ptr) { + LDKCOption_TypeZ *obj = (LDKCOption_TypeZ*)untag_ptr(ptr); switch(obj->tag) { case LDKCOption_TypeZ_Some: return 0; case LDKCOption_TypeZ_None: return 1; default: abort(); } } -uint32_t __attribute__((export_name("TS_LDKCOption_TypeZ_Some_get_some"))) TS_LDKCOption_TypeZ_Some_get_some(uint32_t ptr) { - LDKCOption_TypeZ *obj = (LDKCOption_TypeZ*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKCOption_TypeZ_Some_get_some"))) TS_LDKCOption_TypeZ_Some_get_some(uint64_t ptr) { + LDKCOption_TypeZ *obj = (LDKCOption_TypeZ*)untag_ptr(ptr); assert(obj->tag == LDKCOption_TypeZ_Some); LDKType* some_ret = MALLOC(sizeof(LDKType), "LDKType"); *some_ret = Type_clone(&obj->some); - return (uint32_t)some_ret; + return tag_ptr(some_ret, true); } static inline struct LDKCOption_TypeZ CResult_COption_TypeZDecodeErrorZ_get_ok(LDKCResult_COption_TypeZDecodeErrorZ *NONNULL_PTR owner){ CHECK(owner->result_ok); return COption_TypeZ_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_get_ok"))) TS_CResult_COption_TypeZDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_COption_TypeZDecodeErrorZ* owner_conv = (LDKCResult_COption_TypeZDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_get_ok"))) TS_CResult_COption_TypeZDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_COption_TypeZDecodeErrorZ* owner_conv = (LDKCResult_COption_TypeZDecodeErrorZ*)untag_ptr(owner); LDKCOption_TypeZ *ret_copy = MALLOC(sizeof(LDKCOption_TypeZ), "LDKCOption_TypeZ"); *ret_copy = CResult_COption_TypeZDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } @@ -5994,22 +5403,17 @@ static inline struct LDKDecodeError CResult_COption_TypeZDecodeErrorZ_get_err(LD CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_get_err"))) TS_CResult_COption_TypeZDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_COption_TypeZDecodeErrorZ* owner_conv = (LDKCResult_COption_TypeZDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_COption_TypeZDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_LDKPaymentError_ty_from_ptr"))) TS_LDKPaymentError_ty_from_ptr(uint32_t ptr) { - LDKPaymentError *obj = (LDKPaymentError*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKPaymentError_ty_from_ptr"))) TS_LDKPaymentError_ty_from_ptr(uint64_t ptr) { + LDKPaymentError *obj = (LDKPaymentError*)untag_ptr(ptr); switch(obj->tag) { case LDKPaymentError_Invoice: return 0; case LDKPaymentError_Routing: return 1; @@ -6017,36 +5421,34 @@ uint32_t __attribute__((export_name("TS_LDKPaymentError_ty_from_ptr"))) TS_LDKPa default: abort(); } } -jstring __attribute__((export_name("TS_LDKPaymentError_Invoice_get_invoice"))) TS_LDKPaymentError_Invoice_get_invoice(uint32_t ptr) { - LDKPaymentError *obj = (LDKPaymentError*)(ptr & ~1); +jstring __attribute__((export_name("TS_LDKPaymentError_Invoice_get_invoice"))) TS_LDKPaymentError_Invoice_get_invoice(uint64_t ptr) { + LDKPaymentError *obj = (LDKPaymentError*)untag_ptr(ptr); assert(obj->tag == LDKPaymentError_Invoice); LDKStr invoice_str = obj->invoice; jstring invoice_conv = str_ref_to_ts(invoice_str.chars, invoice_str.len); return invoice_conv; } -uint32_t __attribute__((export_name("TS_LDKPaymentError_Routing_get_routing"))) TS_LDKPaymentError_Routing_get_routing(uint32_t ptr) { - LDKPaymentError *obj = (LDKPaymentError*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKPaymentError_Routing_get_routing"))) TS_LDKPaymentError_Routing_get_routing(uint64_t ptr) { + LDKPaymentError *obj = (LDKPaymentError*)untag_ptr(ptr); assert(obj->tag == LDKPaymentError_Routing); LDKLightningError routing_var = obj->routing; - uint32_t routing_ref = 0; - CHECK((((uintptr_t)routing_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&routing_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t routing_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(routing_var); - routing_ref = (uintptr_t)routing_var.inner & ~1; + routing_ref = tag_ptr(routing_var.inner, false); return routing_ref; } -uint32_t __attribute__((export_name("TS_LDKPaymentError_Sending_get_sending"))) TS_LDKPaymentError_Sending_get_sending(uint32_t ptr) { - LDKPaymentError *obj = (LDKPaymentError*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKPaymentError_Sending_get_sending"))) TS_LDKPaymentError_Sending_get_sending(uint64_t ptr) { + LDKPaymentError *obj = (LDKPaymentError*)untag_ptr(ptr); assert(obj->tag == LDKPaymentError_Sending); - uint32_t sending_ref = ((uintptr_t)&obj->sending) | 1; + uint64_t sending_ref = tag_ptr(&obj->sending, false); return sending_ref; } static inline struct LDKThirtyTwoBytes CResult_PaymentIdPaymentErrorZ_get_ok(LDKCResult_PaymentIdPaymentErrorZ *NONNULL_PTR owner){ CHECK(owner->result_ok); return ThirtyTwoBytes_clone(&*owner->contents.result); } -int8_tArray __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_get_ok"))) TS_CResult_PaymentIdPaymentErrorZ_get_ok(uint32_t owner) { - LDKCResult_PaymentIdPaymentErrorZ* owner_conv = (LDKCResult_PaymentIdPaymentErrorZ*)(owner & ~1); +int8_tArray __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_get_ok"))) TS_CResult_PaymentIdPaymentErrorZ_get_ok(uint64_t owner) { + LDKCResult_PaymentIdPaymentErrorZ* owner_conv = (LDKCResult_PaymentIdPaymentErrorZ*)untag_ptr(owner); int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, CResult_PaymentIdPaymentErrorZ_get_ok(owner_conv).data, 32); return ret_arr; @@ -6056,16 +5458,16 @@ static inline struct LDKPaymentError CResult_PaymentIdPaymentErrorZ_get_err(LDKC CHECK(!owner->result_ok); return PaymentError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_get_err"))) TS_CResult_PaymentIdPaymentErrorZ_get_err(uint32_t owner) { - LDKCResult_PaymentIdPaymentErrorZ* owner_conv = (LDKCResult_PaymentIdPaymentErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_get_err"))) TS_CResult_PaymentIdPaymentErrorZ_get_err(uint64_t owner) { + LDKCResult_PaymentIdPaymentErrorZ* owner_conv = (LDKCResult_PaymentIdPaymentErrorZ*)untag_ptr(owner); LDKPaymentError *ret_copy = MALLOC(sizeof(LDKPaymentError), "LDKPaymentError"); *ret_copy = CResult_PaymentIdPaymentErrorZ_get_err(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_LDKParseError_ty_from_ptr"))) TS_LDKParseError_ty_from_ptr(uint32_t ptr) { - LDKParseError *obj = (LDKParseError*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKParseError_ty_from_ptr"))) TS_LDKParseError_ty_from_ptr(uint64_t ptr) { + LDKParseError *obj = (LDKParseError*)untag_ptr(ptr); switch(obj->tag) { case LDKParseError_Bech32Error: return 0; case LDKParseError_ParseAmountError: return 1; @@ -6088,32 +5490,32 @@ uint32_t __attribute__((export_name("TS_LDKParseError_ty_from_ptr"))) TS_LDKPars default: abort(); } } -uint32_t __attribute__((export_name("TS_LDKParseError_Bech32Error_get_bech32_error"))) TS_LDKParseError_Bech32Error_get_bech32_error(uint32_t ptr) { - LDKParseError *obj = (LDKParseError*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKParseError_Bech32Error_get_bech32_error"))) TS_LDKParseError_Bech32Error_get_bech32_error(uint64_t ptr) { + LDKParseError *obj = (LDKParseError*)untag_ptr(ptr); assert(obj->tag == LDKParseError_Bech32Error); - uint32_t bech32_error_ref = ((uintptr_t)&obj->bech32_error) | 1; + uint64_t bech32_error_ref = tag_ptr(&obj->bech32_error, false); return bech32_error_ref; } -int32_t __attribute__((export_name("TS_LDKParseError_ParseAmountError_get_parse_amount_error"))) TS_LDKParseError_ParseAmountError_get_parse_amount_error(uint32_t ptr) { - LDKParseError *obj = (LDKParseError*)(ptr & ~1); +int32_t __attribute__((export_name("TS_LDKParseError_ParseAmountError_get_parse_amount_error"))) TS_LDKParseError_ParseAmountError_get_parse_amount_error(uint64_t ptr) { + LDKParseError *obj = (LDKParseError*)untag_ptr(ptr); assert(obj->tag == LDKParseError_ParseAmountError); /*obj->parse_amount_error*/ return 0; } -uint32_t __attribute__((export_name("TS_LDKParseError_MalformedSignature_get_malformed_signature"))) TS_LDKParseError_MalformedSignature_get_malformed_signature(uint32_t ptr) { - LDKParseError *obj = (LDKParseError*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKParseError_MalformedSignature_get_malformed_signature"))) TS_LDKParseError_MalformedSignature_get_malformed_signature(uint64_t ptr) { + LDKParseError *obj = (LDKParseError*)untag_ptr(ptr); assert(obj->tag == LDKParseError_MalformedSignature); uint32_t malformed_signature_conv = LDKSecp256k1Error_to_js(obj->malformed_signature); return malformed_signature_conv; } -int32_t __attribute__((export_name("TS_LDKParseError_DescriptionDecodeError_get_description_decode_error"))) TS_LDKParseError_DescriptionDecodeError_get_description_decode_error(uint32_t ptr) { - LDKParseError *obj = (LDKParseError*)(ptr & ~1); +int32_t __attribute__((export_name("TS_LDKParseError_DescriptionDecodeError_get_description_decode_error"))) TS_LDKParseError_DescriptionDecodeError_get_description_decode_error(uint64_t ptr) { + LDKParseError *obj = (LDKParseError*)untag_ptr(ptr); assert(obj->tag == LDKParseError_DescriptionDecodeError); /*obj->description_decode_error*/ return 0; } -jstring __attribute__((export_name("TS_LDKParseError_InvalidSliceLength_get_invalid_slice_length"))) TS_LDKParseError_InvalidSliceLength_get_invalid_slice_length(uint32_t ptr) { - LDKParseError *obj = (LDKParseError*)(ptr & ~1); +jstring __attribute__((export_name("TS_LDKParseError_InvalidSliceLength_get_invalid_slice_length"))) TS_LDKParseError_InvalidSliceLength_get_invalid_slice_length(uint64_t ptr) { + LDKParseError *obj = (LDKParseError*)untag_ptr(ptr); assert(obj->tag == LDKParseError_InvalidSliceLength); LDKStr invalid_slice_length_str = obj->invalid_slice_length; jstring invalid_slice_length_conv = str_ref_to_ts(invalid_slice_length_str.chars, invalid_slice_length_str.len); @@ -6123,8 +5525,8 @@ static inline enum LDKSiPrefix CResult_SiPrefixParseErrorZ_get_ok(LDKCResult_SiP CHECK(owner->result_ok); return SiPrefix_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_SiPrefixParseErrorZ_get_ok"))) TS_CResult_SiPrefixParseErrorZ_get_ok(uint32_t owner) { - LDKCResult_SiPrefixParseErrorZ* owner_conv = (LDKCResult_SiPrefixParseErrorZ*)(owner & ~1); +uint32_t __attribute__((export_name("TS_CResult_SiPrefixParseErrorZ_get_ok"))) TS_CResult_SiPrefixParseErrorZ_get_ok(uint64_t owner) { + LDKCResult_SiPrefixParseErrorZ* owner_conv = (LDKCResult_SiPrefixParseErrorZ*)untag_ptr(owner); uint32_t ret_conv = LDKSiPrefix_to_js(CResult_SiPrefixParseErrorZ_get_ok(owner_conv)); return ret_conv; } @@ -6133,30 +5535,30 @@ static inline struct LDKParseError CResult_SiPrefixParseErrorZ_get_err(LDKCResul CHECK(!owner->result_ok); return ParseError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_SiPrefixParseErrorZ_get_err"))) TS_CResult_SiPrefixParseErrorZ_get_err(uint32_t owner) { - LDKCResult_SiPrefixParseErrorZ* owner_conv = (LDKCResult_SiPrefixParseErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_SiPrefixParseErrorZ_get_err"))) TS_CResult_SiPrefixParseErrorZ_get_err(uint64_t owner) { + LDKCResult_SiPrefixParseErrorZ* owner_conv = (LDKCResult_SiPrefixParseErrorZ*)untag_ptr(owner); LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = CResult_SiPrefixParseErrorZ_get_err(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_LDKParseOrSemanticError_ty_from_ptr"))) TS_LDKParseOrSemanticError_ty_from_ptr(uint32_t ptr) { - LDKParseOrSemanticError *obj = (LDKParseOrSemanticError*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKParseOrSemanticError_ty_from_ptr"))) TS_LDKParseOrSemanticError_ty_from_ptr(uint64_t ptr) { + LDKParseOrSemanticError *obj = (LDKParseOrSemanticError*)untag_ptr(ptr); switch(obj->tag) { case LDKParseOrSemanticError_ParseError: return 0; case LDKParseOrSemanticError_SemanticError: return 1; default: abort(); } } -uint32_t __attribute__((export_name("TS_LDKParseOrSemanticError_ParseError_get_parse_error"))) TS_LDKParseOrSemanticError_ParseError_get_parse_error(uint32_t ptr) { - LDKParseOrSemanticError *obj = (LDKParseOrSemanticError*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKParseOrSemanticError_ParseError_get_parse_error"))) TS_LDKParseOrSemanticError_ParseError_get_parse_error(uint64_t ptr) { + LDKParseOrSemanticError *obj = (LDKParseOrSemanticError*)untag_ptr(ptr); assert(obj->tag == LDKParseOrSemanticError_ParseError); - uint32_t parse_error_ref = ((uintptr_t)&obj->parse_error) | 1; + uint64_t parse_error_ref = tag_ptr(&obj->parse_error, false); return parse_error_ref; } -uint32_t __attribute__((export_name("TS_LDKParseOrSemanticError_SemanticError_get_semantic_error"))) TS_LDKParseOrSemanticError_SemanticError_get_semantic_error(uint32_t ptr) { - LDKParseOrSemanticError *obj = (LDKParseOrSemanticError*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKParseOrSemanticError_SemanticError_get_semantic_error"))) TS_LDKParseOrSemanticError_SemanticError_get_semantic_error(uint64_t ptr) { + LDKParseOrSemanticError *obj = (LDKParseOrSemanticError*)untag_ptr(ptr); assert(obj->tag == LDKParseOrSemanticError_SemanticError); uint32_t semantic_error_conv = LDKSemanticError_to_js(obj->semantic_error); return semantic_error_conv; @@ -6165,17 +5567,12 @@ static inline struct LDKInvoice CResult_InvoiceParseOrSemanticErrorZ_get_ok(LDKC CHECK(owner->result_ok); return Invoice_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_InvoiceParseOrSemanticErrorZ_get_ok"))) TS_CResult_InvoiceParseOrSemanticErrorZ_get_ok(uint32_t owner) { - LDKCResult_InvoiceParseOrSemanticErrorZ* owner_conv = (LDKCResult_InvoiceParseOrSemanticErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_InvoiceParseOrSemanticErrorZ_get_ok"))) TS_CResult_InvoiceParseOrSemanticErrorZ_get_ok(uint64_t owner) { + LDKCResult_InvoiceParseOrSemanticErrorZ* owner_conv = (LDKCResult_InvoiceParseOrSemanticErrorZ*)untag_ptr(owner); LDKInvoice ret_var = CResult_InvoiceParseOrSemanticErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -6183,11 +5580,11 @@ static inline struct LDKParseOrSemanticError CResult_InvoiceParseOrSemanticError CHECK(!owner->result_ok); return ParseOrSemanticError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_InvoiceParseOrSemanticErrorZ_get_err"))) TS_CResult_InvoiceParseOrSemanticErrorZ_get_err(uint32_t owner) { - LDKCResult_InvoiceParseOrSemanticErrorZ* owner_conv = (LDKCResult_InvoiceParseOrSemanticErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_InvoiceParseOrSemanticErrorZ_get_err"))) TS_CResult_InvoiceParseOrSemanticErrorZ_get_err(uint64_t owner) { + LDKCResult_InvoiceParseOrSemanticErrorZ* owner_conv = (LDKCResult_InvoiceParseOrSemanticErrorZ*)untag_ptr(owner); LDKParseOrSemanticError *ret_copy = MALLOC(sizeof(LDKParseOrSemanticError), "LDKParseOrSemanticError"); *ret_copy = CResult_InvoiceParseOrSemanticErrorZ_get_err(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } @@ -6195,17 +5592,12 @@ static inline struct LDKSignedRawInvoice CResult_SignedRawInvoiceParseErrorZ_get CHECK(owner->result_ok); return SignedRawInvoice_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_SignedRawInvoiceParseErrorZ_get_ok"))) TS_CResult_SignedRawInvoiceParseErrorZ_get_ok(uint32_t owner) { - LDKCResult_SignedRawInvoiceParseErrorZ* owner_conv = (LDKCResult_SignedRawInvoiceParseErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_SignedRawInvoiceParseErrorZ_get_ok"))) TS_CResult_SignedRawInvoiceParseErrorZ_get_ok(uint64_t owner) { + LDKCResult_SignedRawInvoiceParseErrorZ* owner_conv = (LDKCResult_SignedRawInvoiceParseErrorZ*)untag_ptr(owner); LDKSignedRawInvoice ret_var = CResult_SignedRawInvoiceParseErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -6213,36 +5605,31 @@ static inline struct LDKParseError CResult_SignedRawInvoiceParseErrorZ_get_err(L CHECK(!owner->result_ok); return ParseError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_SignedRawInvoiceParseErrorZ_get_err"))) TS_CResult_SignedRawInvoiceParseErrorZ_get_err(uint32_t owner) { - LDKCResult_SignedRawInvoiceParseErrorZ* owner_conv = (LDKCResult_SignedRawInvoiceParseErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_SignedRawInvoiceParseErrorZ_get_err"))) TS_CResult_SignedRawInvoiceParseErrorZ_get_err(uint64_t owner) { + LDKCResult_SignedRawInvoiceParseErrorZ* owner_conv = (LDKCResult_SignedRawInvoiceParseErrorZ*)untag_ptr(owner); LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = CResult_SignedRawInvoiceParseErrorZ_get_err(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } static inline struct LDKRawInvoice C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_a(LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ *NONNULL_PTR owner){ return RawInvoice_clone(&owner->a); } -uint32_t __attribute__((export_name("TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_a"))) TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_a(uint32_t owner) { - LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* owner_conv = (LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_a"))) TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_a(uint64_t owner) { + LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* owner_conv = (LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ*)untag_ptr(owner); LDKRawInvoice ret_var = C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_a(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } static inline struct LDKThirtyTwoBytes C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_b(LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ *NONNULL_PTR owner){ return ThirtyTwoBytes_clone(&owner->b); } -int8_tArray __attribute__((export_name("TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_b"))) TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_b(uint32_t owner) { - LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* owner_conv = (LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ*)(owner & ~1); +int8_tArray __attribute__((export_name("TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_b"))) TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_b(uint64_t owner) { + LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* owner_conv = (LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ*)untag_ptr(owner); int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_b(owner_conv).data, 32); return ret_arr; @@ -6251,17 +5638,12 @@ int8_tArray __attribute__((export_name("TS_C3Tuple_RawInvoice_u832InvoiceSignat static inline struct LDKInvoiceSignature C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_c(LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ *NONNULL_PTR owner){ return InvoiceSignature_clone(&owner->c); } -uint32_t __attribute__((export_name("TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_c"))) TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_c(uint32_t owner) { - LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* owner_conv = (LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_c"))) TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_c(uint64_t owner) { + LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* owner_conv = (LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ*)untag_ptr(owner); LDKInvoiceSignature ret_var = C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_c(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -6269,17 +5651,12 @@ static inline struct LDKPayeePubKey CResult_PayeePubKeyErrorZ_get_ok(LDKCResult_ CHECK(owner->result_ok); return PayeePubKey_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_get_ok"))) TS_CResult_PayeePubKeyErrorZ_get_ok(uint32_t owner) { - LDKCResult_PayeePubKeyErrorZ* owner_conv = (LDKCResult_PayeePubKeyErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_get_ok"))) TS_CResult_PayeePubKeyErrorZ_get_ok(uint64_t owner) { + LDKCResult_PayeePubKeyErrorZ* owner_conv = (LDKCResult_PayeePubKeyErrorZ*)untag_ptr(owner); LDKPayeePubKey ret_var = CResult_PayeePubKeyErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -6287,8 +5664,8 @@ static inline enum LDKSecp256k1Error CResult_PayeePubKeyErrorZ_get_err(LDKCResul CHECK(!owner->result_ok); return *owner->contents.err; } -uint32_t __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_get_err"))) TS_CResult_PayeePubKeyErrorZ_get_err(uint32_t owner) { - LDKCResult_PayeePubKeyErrorZ* owner_conv = (LDKCResult_PayeePubKeyErrorZ*)(owner & ~1); +uint32_t __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_get_err"))) TS_CResult_PayeePubKeyErrorZ_get_err(uint64_t owner) { + LDKCResult_PayeePubKeyErrorZ* owner_conv = (LDKCResult_PayeePubKeyErrorZ*)untag_ptr(owner); uint32_t ret_conv = LDKSecp256k1Error_to_js(CResult_PayeePubKeyErrorZ_get_err(owner_conv)); return ret_conv; } @@ -6304,17 +5681,12 @@ static inline struct LDKPositiveTimestamp CResult_PositiveTimestampCreationError CHECK(owner->result_ok); return PositiveTimestamp_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_get_ok"))) TS_CResult_PositiveTimestampCreationErrorZ_get_ok(uint32_t owner) { - LDKCResult_PositiveTimestampCreationErrorZ* owner_conv = (LDKCResult_PositiveTimestampCreationErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_get_ok"))) TS_CResult_PositiveTimestampCreationErrorZ_get_ok(uint64_t owner) { + LDKCResult_PositiveTimestampCreationErrorZ* owner_conv = (LDKCResult_PositiveTimestampCreationErrorZ*)untag_ptr(owner); LDKPositiveTimestamp ret_var = CResult_PositiveTimestampCreationErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -6322,8 +5694,8 @@ static inline enum LDKCreationError CResult_PositiveTimestampCreationErrorZ_get_ CHECK(!owner->result_ok); return CreationError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_get_err"))) TS_CResult_PositiveTimestampCreationErrorZ_get_err(uint32_t owner) { - LDKCResult_PositiveTimestampCreationErrorZ* owner_conv = (LDKCResult_PositiveTimestampCreationErrorZ*)(owner & ~1); +uint32_t __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_get_err"))) TS_CResult_PositiveTimestampCreationErrorZ_get_err(uint64_t owner) { + LDKCResult_PositiveTimestampCreationErrorZ* owner_conv = (LDKCResult_PositiveTimestampCreationErrorZ*)untag_ptr(owner); uint32_t ret_conv = LDKCreationError_to_js(CResult_PositiveTimestampCreationErrorZ_get_err(owner_conv)); return ret_conv; } @@ -6332,8 +5704,8 @@ static inline void CResult_NoneSemanticErrorZ_get_ok(LDKCResult_NoneSemanticErro CHECK(owner->result_ok); return *owner->contents.result; } -void __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_get_ok"))) TS_CResult_NoneSemanticErrorZ_get_ok(uint32_t owner) { - LDKCResult_NoneSemanticErrorZ* owner_conv = (LDKCResult_NoneSemanticErrorZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_get_ok"))) TS_CResult_NoneSemanticErrorZ_get_ok(uint64_t owner) { + LDKCResult_NoneSemanticErrorZ* owner_conv = (LDKCResult_NoneSemanticErrorZ*)untag_ptr(owner); CResult_NoneSemanticErrorZ_get_ok(owner_conv); } @@ -6341,8 +5713,8 @@ static inline enum LDKSemanticError CResult_NoneSemanticErrorZ_get_err(LDKCResul CHECK(!owner->result_ok); return SemanticError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_get_err"))) TS_CResult_NoneSemanticErrorZ_get_err(uint32_t owner) { - LDKCResult_NoneSemanticErrorZ* owner_conv = (LDKCResult_NoneSemanticErrorZ*)(owner & ~1); +uint32_t __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_get_err"))) TS_CResult_NoneSemanticErrorZ_get_err(uint64_t owner) { + LDKCResult_NoneSemanticErrorZ* owner_conv = (LDKCResult_NoneSemanticErrorZ*)untag_ptr(owner); uint32_t ret_conv = LDKSemanticError_to_js(CResult_NoneSemanticErrorZ_get_err(owner_conv)); return ret_conv; } @@ -6351,17 +5723,12 @@ static inline struct LDKInvoice CResult_InvoiceSemanticErrorZ_get_ok(LDKCResult_ CHECK(owner->result_ok); return Invoice_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_get_ok"))) TS_CResult_InvoiceSemanticErrorZ_get_ok(uint32_t owner) { - LDKCResult_InvoiceSemanticErrorZ* owner_conv = (LDKCResult_InvoiceSemanticErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_get_ok"))) TS_CResult_InvoiceSemanticErrorZ_get_ok(uint64_t owner) { + LDKCResult_InvoiceSemanticErrorZ* owner_conv = (LDKCResult_InvoiceSemanticErrorZ*)untag_ptr(owner); LDKInvoice ret_var = CResult_InvoiceSemanticErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -6369,8 +5736,8 @@ static inline enum LDKSemanticError CResult_InvoiceSemanticErrorZ_get_err(LDKCRe CHECK(!owner->result_ok); return SemanticError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_get_err"))) TS_CResult_InvoiceSemanticErrorZ_get_err(uint32_t owner) { - LDKCResult_InvoiceSemanticErrorZ* owner_conv = (LDKCResult_InvoiceSemanticErrorZ*)(owner & ~1); +uint32_t __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_get_err"))) TS_CResult_InvoiceSemanticErrorZ_get_err(uint64_t owner) { + LDKCResult_InvoiceSemanticErrorZ* owner_conv = (LDKCResult_InvoiceSemanticErrorZ*)untag_ptr(owner); uint32_t ret_conv = LDKSemanticError_to_js(CResult_InvoiceSemanticErrorZ_get_err(owner_conv)); return ret_conv; } @@ -6379,17 +5746,12 @@ static inline struct LDKDescription CResult_DescriptionCreationErrorZ_get_ok(LDK CHECK(owner->result_ok); return Description_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_get_ok"))) TS_CResult_DescriptionCreationErrorZ_get_ok(uint32_t owner) { - LDKCResult_DescriptionCreationErrorZ* owner_conv = (LDKCResult_DescriptionCreationErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_get_ok"))) TS_CResult_DescriptionCreationErrorZ_get_ok(uint64_t owner) { + LDKCResult_DescriptionCreationErrorZ* owner_conv = (LDKCResult_DescriptionCreationErrorZ*)untag_ptr(owner); LDKDescription ret_var = CResult_DescriptionCreationErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -6397,8 +5759,8 @@ static inline enum LDKCreationError CResult_DescriptionCreationErrorZ_get_err(LD CHECK(!owner->result_ok); return CreationError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_get_err"))) TS_CResult_DescriptionCreationErrorZ_get_err(uint32_t owner) { - LDKCResult_DescriptionCreationErrorZ* owner_conv = (LDKCResult_DescriptionCreationErrorZ*)(owner & ~1); +uint32_t __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_get_err"))) TS_CResult_DescriptionCreationErrorZ_get_err(uint64_t owner) { + LDKCResult_DescriptionCreationErrorZ* owner_conv = (LDKCResult_DescriptionCreationErrorZ*)untag_ptr(owner); uint32_t ret_conv = LDKCreationError_to_js(CResult_DescriptionCreationErrorZ_get_err(owner_conv)); return ret_conv; } @@ -6407,17 +5769,12 @@ static inline struct LDKPrivateRoute CResult_PrivateRouteCreationErrorZ_get_ok(L CHECK(owner->result_ok); return PrivateRoute_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_get_ok"))) TS_CResult_PrivateRouteCreationErrorZ_get_ok(uint32_t owner) { - LDKCResult_PrivateRouteCreationErrorZ* owner_conv = (LDKCResult_PrivateRouteCreationErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_get_ok"))) TS_CResult_PrivateRouteCreationErrorZ_get_ok(uint64_t owner) { + LDKCResult_PrivateRouteCreationErrorZ* owner_conv = (LDKCResult_PrivateRouteCreationErrorZ*)untag_ptr(owner); LDKPrivateRoute ret_var = CResult_PrivateRouteCreationErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -6425,8 +5782,8 @@ static inline enum LDKCreationError CResult_PrivateRouteCreationErrorZ_get_err(L CHECK(!owner->result_ok); return CreationError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_get_err"))) TS_CResult_PrivateRouteCreationErrorZ_get_err(uint32_t owner) { - LDKCResult_PrivateRouteCreationErrorZ* owner_conv = (LDKCResult_PrivateRouteCreationErrorZ*)(owner & ~1); +uint32_t __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_get_err"))) TS_CResult_PrivateRouteCreationErrorZ_get_err(uint64_t owner) { + LDKCResult_PrivateRouteCreationErrorZ* owner_conv = (LDKCResult_PrivateRouteCreationErrorZ*)untag_ptr(owner); uint32_t ret_conv = LDKCreationError_to_js(CResult_PrivateRouteCreationErrorZ_get_err(owner_conv)); return ret_conv; } @@ -6435,8 +5792,8 @@ static inline struct LDKStr CResult_StringErrorZ_get_ok(LDKCResult_StringErrorZ CHECK(owner->result_ok); return *owner->contents.result; } -jstring __attribute__((export_name("TS_CResult_StringErrorZ_get_ok"))) TS_CResult_StringErrorZ_get_ok(uint32_t owner) { - LDKCResult_StringErrorZ* owner_conv = (LDKCResult_StringErrorZ*)(owner & ~1); +jstring __attribute__((export_name("TS_CResult_StringErrorZ_get_ok"))) TS_CResult_StringErrorZ_get_ok(uint64_t owner) { + LDKCResult_StringErrorZ* owner_conv = (LDKCResult_StringErrorZ*)untag_ptr(owner); LDKStr ret_str = CResult_StringErrorZ_get_ok(owner_conv); jstring ret_conv = str_ref_to_ts(ret_str.chars, ret_str.len); return ret_conv; @@ -6446,8 +5803,8 @@ static inline enum LDKSecp256k1Error CResult_StringErrorZ_get_err(LDKCResult_Str CHECK(!owner->result_ok); return *owner->contents.err; } -uint32_t __attribute__((export_name("TS_CResult_StringErrorZ_get_err"))) TS_CResult_StringErrorZ_get_err(uint32_t owner) { - LDKCResult_StringErrorZ* owner_conv = (LDKCResult_StringErrorZ*)(owner & ~1); +uint32_t __attribute__((export_name("TS_CResult_StringErrorZ_get_err"))) TS_CResult_StringErrorZ_get_err(uint64_t owner) { + LDKCResult_StringErrorZ* owner_conv = (LDKCResult_StringErrorZ*)untag_ptr(owner); uint32_t ret_conv = LDKSecp256k1Error_to_js(CResult_StringErrorZ_get_err(owner_conv)); return ret_conv; } @@ -6456,17 +5813,12 @@ static inline struct LDKChannelMonitorUpdate CResult_ChannelMonitorUpdateDecodeE CHECK(owner->result_ok); return ChannelMonitorUpdate_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_get_ok"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ChannelMonitorUpdateDecodeErrorZ* owner_conv = (LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)untag_ptr(owner); LDKChannelMonitorUpdate ret_var = CResult_ChannelMonitorUpdateDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -6474,43 +5826,38 @@ static inline struct LDKDecodeError CResult_ChannelMonitorUpdateDecodeErrorZ_get CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_get_err"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ChannelMonitorUpdateDecodeErrorZ* owner_conv = (LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ChannelMonitorUpdateDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_LDKCOption_MonitorEventZ_ty_from_ptr"))) TS_LDKCOption_MonitorEventZ_ty_from_ptr(uint32_t ptr) { - LDKCOption_MonitorEventZ *obj = (LDKCOption_MonitorEventZ*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKCOption_MonitorEventZ_ty_from_ptr"))) TS_LDKCOption_MonitorEventZ_ty_from_ptr(uint64_t ptr) { + LDKCOption_MonitorEventZ *obj = (LDKCOption_MonitorEventZ*)untag_ptr(ptr); switch(obj->tag) { case LDKCOption_MonitorEventZ_Some: return 0; case LDKCOption_MonitorEventZ_None: return 1; default: abort(); } } -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); +uint64_t __attribute__((export_name("TS_LDKCOption_MonitorEventZ_Some_get_some"))) TS_LDKCOption_MonitorEventZ_Some_get_some(uint64_t ptr) { + LDKCOption_MonitorEventZ *obj = (LDKCOption_MonitorEventZ*)untag_ptr(ptr); assert(obj->tag == LDKCOption_MonitorEventZ_Some); - uint32_t some_ref = ((uintptr_t)&obj->some) | 1; + uint64_t some_ref = tag_ptr(&obj->some, false); return some_ref; } static inline struct LDKCOption_MonitorEventZ CResult_COption_MonitorEventZDecodeErrorZ_get_ok(LDKCResult_COption_MonitorEventZDecodeErrorZ *NONNULL_PTR owner){ CHECK(owner->result_ok); return COption_MonitorEventZ_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_get_ok"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_COption_MonitorEventZDecodeErrorZ* owner_conv = (LDKCResult_COption_MonitorEventZDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_get_ok"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_COption_MonitorEventZDecodeErrorZ* owner_conv = (LDKCResult_COption_MonitorEventZDecodeErrorZ*)untag_ptr(owner); LDKCOption_MonitorEventZ *ret_copy = MALLOC(sizeof(LDKCOption_MonitorEventZ), "LDKCOption_MonitorEventZ"); *ret_copy = CResult_COption_MonitorEventZDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } @@ -6518,17 +5865,12 @@ static inline struct LDKDecodeError CResult_COption_MonitorEventZDecodeErrorZ_ge CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_get_err"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_COption_MonitorEventZDecodeErrorZ* owner_conv = (LDKCResult_COption_MonitorEventZDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_COption_MonitorEventZDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -6536,17 +5878,12 @@ static inline struct LDKHTLCUpdate CResult_HTLCUpdateDecodeErrorZ_get_ok(LDKCRes CHECK(owner->result_ok); return HTLCUpdate_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_get_ok"))) TS_CResult_HTLCUpdateDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_HTLCUpdateDecodeErrorZ* owner_conv = (LDKCResult_HTLCUpdateDecodeErrorZ*)untag_ptr(owner); LDKHTLCUpdate ret_var = CResult_HTLCUpdateDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -6554,42 +5891,32 @@ static inline struct LDKDecodeError CResult_HTLCUpdateDecodeErrorZ_get_err(LDKCR CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_get_err"))) TS_CResult_HTLCUpdateDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_HTLCUpdateDecodeErrorZ* owner_conv = (LDKCResult_HTLCUpdateDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_HTLCUpdateDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } static inline struct LDKOutPoint C2Tuple_OutPointScriptZ_get_a(LDKC2Tuple_OutPointScriptZ *NONNULL_PTR owner){ return OutPoint_clone(&owner->a); } -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); +uint64_t __attribute__((export_name("TS_C2Tuple_OutPointScriptZ_get_a"))) TS_C2Tuple_OutPointScriptZ_get_a(uint64_t owner) { + LDKC2Tuple_OutPointScriptZ* owner_conv = (LDKC2Tuple_OutPointScriptZ*)untag_ptr(owner); LDKOutPoint ret_var = C2Tuple_OutPointScriptZ_get_a(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } static inline struct LDKCVec_u8Z C2Tuple_OutPointScriptZ_get_b(LDKC2Tuple_OutPointScriptZ *NONNULL_PTR owner){ return CVec_u8Z_clone(&owner->b); } -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); +int8_tArray __attribute__((export_name("TS_C2Tuple_OutPointScriptZ_get_b"))) TS_C2Tuple_OutPointScriptZ_get_b(uint64_t owner) { + LDKC2Tuple_OutPointScriptZ* owner_conv = (LDKC2Tuple_OutPointScriptZ*)untag_ptr(owner); LDKCVec_u8Z ret_var = C2Tuple_OutPointScriptZ_get_b(owner_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -6600,8 +5927,8 @@ int8_tArray __attribute__((export_name("TS_C2Tuple_OutPointScriptZ_get_b"))) TS static inline uint32_t C2Tuple_u32ScriptZ_get_a(LDKC2Tuple_u32ScriptZ *NONNULL_PTR owner){ return owner->a; } -int32_t __attribute__((export_name("TS_C2Tuple_u32ScriptZ_get_a"))) TS_C2Tuple_u32ScriptZ_get_a(uint32_t owner) { - LDKC2Tuple_u32ScriptZ* owner_conv = (LDKC2Tuple_u32ScriptZ*)(owner & ~1); +int32_t __attribute__((export_name("TS_C2Tuple_u32ScriptZ_get_a"))) TS_C2Tuple_u32ScriptZ_get_a(uint64_t owner) { + LDKC2Tuple_u32ScriptZ* owner_conv = (LDKC2Tuple_u32ScriptZ*)untag_ptr(owner); int32_t ret_conv = C2Tuple_u32ScriptZ_get_a(owner_conv); return ret_conv; } @@ -6609,8 +5936,8 @@ int32_t __attribute__((export_name("TS_C2Tuple_u32ScriptZ_get_a"))) TS_C2Tuple_ static inline struct LDKCVec_u8Z C2Tuple_u32ScriptZ_get_b(LDKC2Tuple_u32ScriptZ *NONNULL_PTR owner){ return CVec_u8Z_clone(&owner->b); } -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); +int8_tArray __attribute__((export_name("TS_C2Tuple_u32ScriptZ_get_b"))) TS_C2Tuple_u32ScriptZ_get_b(uint64_t owner) { + LDKC2Tuple_u32ScriptZ* owner_conv = (LDKC2Tuple_u32ScriptZ*)untag_ptr(owner); LDKCVec_u8Z ret_var = C2Tuple_u32ScriptZ_get_b(owner_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -6628,8 +5955,8 @@ static inline LDKCVec_C2Tuple_u32ScriptZZ CVec_C2Tuple_u32ScriptZZ_clone(const L static inline struct LDKThirtyTwoBytes C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_get_a(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ *NONNULL_PTR owner){ return ThirtyTwoBytes_clone(&owner->a); } -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 __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_get_a"))) TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_get_a(uint64_t owner) { + LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ* owner_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ*)untag_ptr(owner); 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; @@ -6638,16 +5965,16 @@ int8_tArray __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZ static inline struct LDKCVec_C2Tuple_u32ScriptZZ C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_get_b(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ *NONNULL_PTR owner){ return CVec_C2Tuple_u32ScriptZZ_clone(&owner->b); } -uint32_tArray __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_get_b"))) TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_get_b(uint32_t owner) { - LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ* owner_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ*)(owner & ~1); +uint64_tArray __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_get_b"))) TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_get_b(uint64_t owner) { + LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ* owner_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ*)untag_ptr(owner); LDKCVec_C2Tuple_u32ScriptZZ ret_var = C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_get_b(owner_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t v = 0; v < ret_var.datalen; v++) { LDKC2Tuple_u32ScriptZ* ret_conv_21_conv = MALLOC(sizeof(LDKC2Tuple_u32ScriptZ), "LDKC2Tuple_u32ScriptZ"); *ret_conv_21_conv = ret_var.data[v]; - ret_arr_ptr[v] = ((uint32_t)ret_conv_21_conv); + ret_arr_ptr[v] = tag_ptr(ret_conv_21_conv, true); } FREE(ret_var.data); @@ -6671,8 +5998,8 @@ static inline LDKCVec_EventZ CVec_EventZ_clone(const LDKCVec_EventZ *orig) { static inline uint32_t C2Tuple_u32TxOutZ_get_a(LDKC2Tuple_u32TxOutZ *NONNULL_PTR owner){ return owner->a; } -int32_t __attribute__((export_name("TS_C2Tuple_u32TxOutZ_get_a"))) TS_C2Tuple_u32TxOutZ_get_a(uint32_t owner) { - LDKC2Tuple_u32TxOutZ* owner_conv = (LDKC2Tuple_u32TxOutZ*)(owner & ~1); +int32_t __attribute__((export_name("TS_C2Tuple_u32TxOutZ_get_a"))) TS_C2Tuple_u32TxOutZ_get_a(uint64_t owner) { + LDKC2Tuple_u32TxOutZ* owner_conv = (LDKC2Tuple_u32TxOutZ*)untag_ptr(owner); int32_t ret_conv = C2Tuple_u32TxOutZ_get_a(owner_conv); return ret_conv; } @@ -6680,11 +6007,11 @@ int32_t __attribute__((export_name("TS_C2Tuple_u32TxOutZ_get_a"))) TS_C2Tuple_u static inline struct LDKTxOut C2Tuple_u32TxOutZ_get_b(LDKC2Tuple_u32TxOutZ *NONNULL_PTR owner){ return TxOut_clone(&owner->b); } -uint32_t __attribute__((export_name("TS_C2Tuple_u32TxOutZ_get_b"))) TS_C2Tuple_u32TxOutZ_get_b(uint32_t owner) { - LDKC2Tuple_u32TxOutZ* owner_conv = (LDKC2Tuple_u32TxOutZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_C2Tuple_u32TxOutZ_get_b"))) TS_C2Tuple_u32TxOutZ_get_b(uint64_t owner) { + LDKC2Tuple_u32TxOutZ* owner_conv = (LDKC2Tuple_u32TxOutZ*)untag_ptr(owner); LDKTxOut* ret_ref = MALLOC(sizeof(LDKTxOut), "LDKTxOut"); *ret_ref = C2Tuple_u32TxOutZ_get_b(owner_conv); - return (uint32_t)ret_ref; + return tag_ptr(ret_ref, true); } static inline LDKCVec_C2Tuple_u32TxOutZZ CVec_C2Tuple_u32TxOutZZ_clone(const LDKCVec_C2Tuple_u32TxOutZZ *orig) { @@ -6697,8 +6024,8 @@ static inline LDKCVec_C2Tuple_u32TxOutZZ CVec_C2Tuple_u32TxOutZZ_clone(const LDK static inline struct LDKThirtyTwoBytes C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_a(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ *NONNULL_PTR owner){ return ThirtyTwoBytes_clone(&owner->a); } -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 __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_a"))) TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_a(uint64_t owner) { + LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* owner_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)untag_ptr(owner); 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; @@ -6707,16 +6034,16 @@ int8_tArray __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ static inline struct LDKCVec_C2Tuple_u32TxOutZZ C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_b(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ *NONNULL_PTR owner){ return CVec_C2Tuple_u32TxOutZZ_clone(&owner->b); } -uint32_tArray __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_b"))) TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_b(uint32_t owner) { - LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* owner_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)(owner & ~1); +uint64_tArray __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_b"))) TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_b(uint64_t owner) { + LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* owner_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)untag_ptr(owner); LDKCVec_C2Tuple_u32TxOutZZ ret_var = C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_b(owner_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t u = 0; u < ret_var.datalen; u++) { LDKC2Tuple_u32TxOutZ* ret_conv_20_conv = MALLOC(sizeof(LDKC2Tuple_u32TxOutZ), "LDKC2Tuple_u32TxOutZ"); *ret_conv_20_conv = ret_var.data[u]; - ret_arr_ptr[u] = ((uint32_t)ret_conv_20_conv); + ret_arr_ptr[u] = tag_ptr(ret_conv_20_conv, true); } FREE(ret_var.data); @@ -6730,8 +6057,8 @@ static inline LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ CVec_C2Tuple_TxidCVe } return ret; } -uint32_t __attribute__((export_name("TS_LDKBalance_ty_from_ptr"))) TS_LDKBalance_ty_from_ptr(uint32_t ptr) { - LDKBalance *obj = (LDKBalance*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKBalance_ty_from_ptr"))) TS_LDKBalance_ty_from_ptr(uint64_t ptr) { + LDKBalance *obj = (LDKBalance*)untag_ptr(ptr); switch(obj->tag) { case LDKBalance_ClaimableOnChannelClose: return 0; case LDKBalance_ClaimableAwaitingConfirmations: return 1; @@ -6740,44 +6067,44 @@ uint32_t __attribute__((export_name("TS_LDKBalance_ty_from_ptr"))) TS_LDKBalance default: abort(); } } -int64_t __attribute__((export_name("TS_LDKBalance_ClaimableOnChannelClose_get_claimable_amount_satoshis"))) TS_LDKBalance_ClaimableOnChannelClose_get_claimable_amount_satoshis(uint32_t ptr) { - LDKBalance *obj = (LDKBalance*)(ptr & ~1); +int64_t __attribute__((export_name("TS_LDKBalance_ClaimableOnChannelClose_get_claimable_amount_satoshis"))) TS_LDKBalance_ClaimableOnChannelClose_get_claimable_amount_satoshis(uint64_t ptr) { + LDKBalance *obj = (LDKBalance*)untag_ptr(ptr); assert(obj->tag == LDKBalance_ClaimableOnChannelClose); int64_t claimable_amount_satoshis_conv = obj->claimable_on_channel_close.claimable_amount_satoshis; return claimable_amount_satoshis_conv; } -int64_t __attribute__((export_name("TS_LDKBalance_ClaimableAwaitingConfirmations_get_claimable_amount_satoshis"))) TS_LDKBalance_ClaimableAwaitingConfirmations_get_claimable_amount_satoshis(uint32_t ptr) { - LDKBalance *obj = (LDKBalance*)(ptr & ~1); +int64_t __attribute__((export_name("TS_LDKBalance_ClaimableAwaitingConfirmations_get_claimable_amount_satoshis"))) TS_LDKBalance_ClaimableAwaitingConfirmations_get_claimable_amount_satoshis(uint64_t ptr) { + LDKBalance *obj = (LDKBalance*)untag_ptr(ptr); assert(obj->tag == LDKBalance_ClaimableAwaitingConfirmations); int64_t claimable_amount_satoshis_conv = obj->claimable_awaiting_confirmations.claimable_amount_satoshis; return claimable_amount_satoshis_conv; } -int32_t __attribute__((export_name("TS_LDKBalance_ClaimableAwaitingConfirmations_get_confirmation_height"))) TS_LDKBalance_ClaimableAwaitingConfirmations_get_confirmation_height(uint32_t ptr) { - LDKBalance *obj = (LDKBalance*)(ptr & ~1); +int32_t __attribute__((export_name("TS_LDKBalance_ClaimableAwaitingConfirmations_get_confirmation_height"))) TS_LDKBalance_ClaimableAwaitingConfirmations_get_confirmation_height(uint64_t ptr) { + LDKBalance *obj = (LDKBalance*)untag_ptr(ptr); assert(obj->tag == LDKBalance_ClaimableAwaitingConfirmations); int32_t confirmation_height_conv = obj->claimable_awaiting_confirmations.confirmation_height; return confirmation_height_conv; } -int64_t __attribute__((export_name("TS_LDKBalance_ContentiousClaimable_get_claimable_amount_satoshis"))) TS_LDKBalance_ContentiousClaimable_get_claimable_amount_satoshis(uint32_t ptr) { - LDKBalance *obj = (LDKBalance*)(ptr & ~1); +int64_t __attribute__((export_name("TS_LDKBalance_ContentiousClaimable_get_claimable_amount_satoshis"))) TS_LDKBalance_ContentiousClaimable_get_claimable_amount_satoshis(uint64_t ptr) { + LDKBalance *obj = (LDKBalance*)untag_ptr(ptr); assert(obj->tag == LDKBalance_ContentiousClaimable); int64_t claimable_amount_satoshis_conv = obj->contentious_claimable.claimable_amount_satoshis; return claimable_amount_satoshis_conv; } -int32_t __attribute__((export_name("TS_LDKBalance_ContentiousClaimable_get_timeout_height"))) TS_LDKBalance_ContentiousClaimable_get_timeout_height(uint32_t ptr) { - LDKBalance *obj = (LDKBalance*)(ptr & ~1); +int32_t __attribute__((export_name("TS_LDKBalance_ContentiousClaimable_get_timeout_height"))) TS_LDKBalance_ContentiousClaimable_get_timeout_height(uint64_t ptr) { + LDKBalance *obj = (LDKBalance*)untag_ptr(ptr); assert(obj->tag == LDKBalance_ContentiousClaimable); int32_t timeout_height_conv = obj->contentious_claimable.timeout_height; return timeout_height_conv; } -int64_t __attribute__((export_name("TS_LDKBalance_MaybeClaimableHTLCAwaitingTimeout_get_claimable_amount_satoshis"))) TS_LDKBalance_MaybeClaimableHTLCAwaitingTimeout_get_claimable_amount_satoshis(uint32_t ptr) { - LDKBalance *obj = (LDKBalance*)(ptr & ~1); +int64_t __attribute__((export_name("TS_LDKBalance_MaybeClaimableHTLCAwaitingTimeout_get_claimable_amount_satoshis"))) TS_LDKBalance_MaybeClaimableHTLCAwaitingTimeout_get_claimable_amount_satoshis(uint64_t ptr) { + LDKBalance *obj = (LDKBalance*)untag_ptr(ptr); assert(obj->tag == LDKBalance_MaybeClaimableHTLCAwaitingTimeout); int64_t claimable_amount_satoshis_conv = obj->maybe_claimable_htlc_awaiting_timeout.claimable_amount_satoshis; return claimable_amount_satoshis_conv; } -int32_t __attribute__((export_name("TS_LDKBalance_MaybeClaimableHTLCAwaitingTimeout_get_claimable_height"))) TS_LDKBalance_MaybeClaimableHTLCAwaitingTimeout_get_claimable_height(uint32_t ptr) { - LDKBalance *obj = (LDKBalance*)(ptr & ~1); +int32_t __attribute__((export_name("TS_LDKBalance_MaybeClaimableHTLCAwaitingTimeout_get_claimable_height"))) TS_LDKBalance_MaybeClaimableHTLCAwaitingTimeout_get_claimable_height(uint64_t ptr) { + LDKBalance *obj = (LDKBalance*)untag_ptr(ptr); assert(obj->tag == LDKBalance_MaybeClaimableHTLCAwaitingTimeout); int32_t claimable_height_conv = obj->maybe_claimable_htlc_awaiting_timeout.claimable_height; return claimable_height_conv; @@ -6792,8 +6119,8 @@ static inline LDKCVec_BalanceZ CVec_BalanceZ_clone(const LDKCVec_BalanceZ *orig) static inline struct LDKThirtyTwoBytes C2Tuple_BlockHashChannelMonitorZ_get_a(LDKC2Tuple_BlockHashChannelMonitorZ *NONNULL_PTR owner){ return ThirtyTwoBytes_clone(&owner->a); } -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 __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_get_a"))) TS_C2Tuple_BlockHashChannelMonitorZ_get_a(uint64_t owner) { + LDKC2Tuple_BlockHashChannelMonitorZ* owner_conv = (LDKC2Tuple_BlockHashChannelMonitorZ*)untag_ptr(owner); int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, C2Tuple_BlockHashChannelMonitorZ_get_a(owner_conv).data, 32); return ret_arr; @@ -6802,17 +6129,12 @@ int8_tArray __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_get static inline struct LDKChannelMonitor C2Tuple_BlockHashChannelMonitorZ_get_b(LDKC2Tuple_BlockHashChannelMonitorZ *NONNULL_PTR owner){ return ChannelMonitor_clone(&owner->b); } -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); +uint64_t __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_get_b"))) TS_C2Tuple_BlockHashChannelMonitorZ_get_b(uint64_t owner) { + LDKC2Tuple_BlockHashChannelMonitorZ* owner_conv = (LDKC2Tuple_BlockHashChannelMonitorZ*)untag_ptr(owner); LDKChannelMonitor ret_var = C2Tuple_BlockHashChannelMonitorZ_get_b(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -6820,36 +6142,31 @@ static inline struct LDKC2Tuple_BlockHashChannelMonitorZ CResult_C2Tuple_BlockHa CHECK(owner->result_ok); return C2Tuple_BlockHashChannelMonitorZ_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_ok"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* owner_conv = (LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_ok"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* owner_conv = (LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)untag_ptr(owner); LDKC2Tuple_BlockHashChannelMonitorZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_BlockHashChannelMonitorZ), "LDKC2Tuple_BlockHashChannelMonitorZ"); *ret_conv = CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_ok(owner_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } static inline struct LDKDecodeError CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_err(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ *NONNULL_PTR owner){ CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_err"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* owner_conv = (LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } static inline struct LDKPublicKey C2Tuple_PublicKeyTypeZ_get_a(LDKC2Tuple_PublicKeyTypeZ *NONNULL_PTR owner){ return owner->a; } -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 __attribute__((export_name("TS_C2Tuple_PublicKeyTypeZ_get_a"))) TS_C2Tuple_PublicKeyTypeZ_get_a(uint64_t owner) { + LDKC2Tuple_PublicKeyTypeZ* owner_conv = (LDKC2Tuple_PublicKeyTypeZ*)untag_ptr(owner); 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; @@ -6858,11 +6175,11 @@ int8_tArray __attribute__((export_name("TS_C2Tuple_PublicKeyTypeZ_get_a"))) TS_ static inline struct LDKType C2Tuple_PublicKeyTypeZ_get_b(LDKC2Tuple_PublicKeyTypeZ *NONNULL_PTR owner){ return Type_clone(&owner->b); } -uint32_t __attribute__((export_name("TS_C2Tuple_PublicKeyTypeZ_get_b"))) TS_C2Tuple_PublicKeyTypeZ_get_b(uint32_t owner) { - LDKC2Tuple_PublicKeyTypeZ* owner_conv = (LDKC2Tuple_PublicKeyTypeZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_C2Tuple_PublicKeyTypeZ_get_b"))) TS_C2Tuple_PublicKeyTypeZ_get_b(uint64_t owner) { + LDKC2Tuple_PublicKeyTypeZ* owner_conv = (LDKC2Tuple_PublicKeyTypeZ*)untag_ptr(owner); LDKType* ret_ret = MALLOC(sizeof(LDKType), "LDKType"); *ret_ret = C2Tuple_PublicKeyTypeZ_get_b(owner_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } static inline LDKCVec_C2Tuple_PublicKeyTypeZZ CVec_C2Tuple_PublicKeyTypeZZ_clone(const LDKCVec_C2Tuple_PublicKeyTypeZZ *orig) { @@ -6872,26 +6189,26 @@ static inline LDKCVec_C2Tuple_PublicKeyTypeZZ CVec_C2Tuple_PublicKeyTypeZZ_clone } return ret; } -uint32_t __attribute__((export_name("TS_LDKCOption_NetAddressZ_ty_from_ptr"))) TS_LDKCOption_NetAddressZ_ty_from_ptr(uint32_t ptr) { - LDKCOption_NetAddressZ *obj = (LDKCOption_NetAddressZ*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKCOption_NetAddressZ_ty_from_ptr"))) TS_LDKCOption_NetAddressZ_ty_from_ptr(uint64_t ptr) { + LDKCOption_NetAddressZ *obj = (LDKCOption_NetAddressZ*)untag_ptr(ptr); switch(obj->tag) { case LDKCOption_NetAddressZ_Some: return 0; case LDKCOption_NetAddressZ_None: return 1; default: abort(); } } -uint32_t __attribute__((export_name("TS_LDKCOption_NetAddressZ_Some_get_some"))) TS_LDKCOption_NetAddressZ_Some_get_some(uint32_t ptr) { - LDKCOption_NetAddressZ *obj = (LDKCOption_NetAddressZ*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKCOption_NetAddressZ_Some_get_some"))) TS_LDKCOption_NetAddressZ_Some_get_some(uint64_t ptr) { + LDKCOption_NetAddressZ *obj = (LDKCOption_NetAddressZ*)untag_ptr(ptr); assert(obj->tag == LDKCOption_NetAddressZ_Some); - uint32_t some_ref = ((uintptr_t)&obj->some) | 1; + uint64_t some_ref = tag_ptr(&obj->some, false); return some_ref; } static inline struct LDKCVec_u8Z CResult_CVec_u8ZPeerHandleErrorZ_get_ok(LDKCResult_CVec_u8ZPeerHandleErrorZ *NONNULL_PTR owner){ CHECK(owner->result_ok); return CVec_u8Z_clone(&*owner->contents.result); } -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); +int8_tArray __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_get_ok"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_get_ok(uint64_t owner) { + LDKCResult_CVec_u8ZPeerHandleErrorZ* owner_conv = (LDKCResult_CVec_u8ZPeerHandleErrorZ*)untag_ptr(owner); LDKCVec_u8Z ret_var = CResult_CVec_u8ZPeerHandleErrorZ_get_ok(owner_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -6903,17 +6220,12 @@ static inline struct LDKPeerHandleError CResult_CVec_u8ZPeerHandleErrorZ_get_err CHECK(!owner->result_ok); return PeerHandleError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_get_err"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_get_err(uint64_t owner) { + LDKCResult_CVec_u8ZPeerHandleErrorZ* owner_conv = (LDKCResult_CVec_u8ZPeerHandleErrorZ*)untag_ptr(owner); LDKPeerHandleError ret_var = CResult_CVec_u8ZPeerHandleErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -6921,8 +6233,8 @@ static inline void CResult_NonePeerHandleErrorZ_get_ok(LDKCResult_NonePeerHandle CHECK(owner->result_ok); return *owner->contents.result; } -void __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_get_ok"))) TS_CResult_NonePeerHandleErrorZ_get_ok(uint32_t owner) { - LDKCResult_NonePeerHandleErrorZ* owner_conv = (LDKCResult_NonePeerHandleErrorZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_get_ok"))) TS_CResult_NonePeerHandleErrorZ_get_ok(uint64_t owner) { + LDKCResult_NonePeerHandleErrorZ* owner_conv = (LDKCResult_NonePeerHandleErrorZ*)untag_ptr(owner); CResult_NonePeerHandleErrorZ_get_ok(owner_conv); } @@ -6930,17 +6242,12 @@ static inline struct LDKPeerHandleError CResult_NonePeerHandleErrorZ_get_err(LDK CHECK(!owner->result_ok); return PeerHandleError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_get_err"))) TS_CResult_NonePeerHandleErrorZ_get_err(uint64_t owner) { + LDKCResult_NonePeerHandleErrorZ* owner_conv = (LDKCResult_NonePeerHandleErrorZ*)untag_ptr(owner); LDKPeerHandleError ret_var = CResult_NonePeerHandleErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -6948,8 +6255,8 @@ static inline bool CResult_boolPeerHandleErrorZ_get_ok(LDKCResult_boolPeerHandle CHECK(owner->result_ok); return *owner->contents.result; } -jboolean __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_get_ok"))) TS_CResult_boolPeerHandleErrorZ_get_ok(uint32_t owner) { - LDKCResult_boolPeerHandleErrorZ* owner_conv = (LDKCResult_boolPeerHandleErrorZ*)(owner & ~1); +jboolean __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_get_ok"))) TS_CResult_boolPeerHandleErrorZ_get_ok(uint64_t owner) { + LDKCResult_boolPeerHandleErrorZ* owner_conv = (LDKCResult_boolPeerHandleErrorZ*)untag_ptr(owner); jboolean ret_conv = CResult_boolPeerHandleErrorZ_get_ok(owner_conv); return ret_conv; } @@ -6958,17 +6265,12 @@ static inline struct LDKPeerHandleError CResult_boolPeerHandleErrorZ_get_err(LDK CHECK(!owner->result_ok); return PeerHandleError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_get_err"))) TS_CResult_boolPeerHandleErrorZ_get_err(uint64_t owner) { + LDKCResult_boolPeerHandleErrorZ* owner_conv = (LDKCResult_boolPeerHandleErrorZ*)untag_ptr(owner); LDKPeerHandleError ret_var = CResult_boolPeerHandleErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -6976,8 +6278,8 @@ static inline void CResult_NoneErrorZ_get_ok(LDKCResult_NoneErrorZ *NONNULL_PTR CHECK(owner->result_ok); return *owner->contents.result; } -void __attribute__((export_name("TS_CResult_NoneErrorZ_get_ok"))) TS_CResult_NoneErrorZ_get_ok(uint32_t owner) { - LDKCResult_NoneErrorZ* owner_conv = (LDKCResult_NoneErrorZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_NoneErrorZ_get_ok"))) TS_CResult_NoneErrorZ_get_ok(uint64_t owner) { + LDKCResult_NoneErrorZ* owner_conv = (LDKCResult_NoneErrorZ*)untag_ptr(owner); CResult_NoneErrorZ_get_ok(owner_conv); } @@ -6985,8 +6287,8 @@ static inline enum LDKIOError CResult_NoneErrorZ_get_err(LDKCResult_NoneErrorZ * CHECK(!owner->result_ok); return *owner->contents.err; } -uint32_t __attribute__((export_name("TS_CResult_NoneErrorZ_get_err"))) TS_CResult_NoneErrorZ_get_err(uint32_t owner) { - LDKCResult_NoneErrorZ* owner_conv = (LDKCResult_NoneErrorZ*)(owner & ~1); +uint32_t __attribute__((export_name("TS_CResult_NoneErrorZ_get_err"))) TS_CResult_NoneErrorZ_get_err(uint64_t owner) { + LDKCResult_NoneErrorZ* owner_conv = (LDKCResult_NoneErrorZ*)untag_ptr(owner); uint32_t ret_conv = LDKIOError_to_js(CResult_NoneErrorZ_get_err(owner_conv)); return ret_conv; } @@ -6995,11 +6297,11 @@ static inline struct LDKNetAddress CResult_NetAddressDecodeErrorZ_get_ok(LDKCRes CHECK(owner->result_ok); return NetAddress_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_get_ok"))) TS_CResult_NetAddressDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_NetAddressDecodeErrorZ* owner_conv = (LDKCResult_NetAddressDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_get_ok"))) TS_CResult_NetAddressDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_NetAddressDecodeErrorZ* owner_conv = (LDKCResult_NetAddressDecodeErrorZ*)untag_ptr(owner); LDKNetAddress *ret_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress"); *ret_copy = CResult_NetAddressDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } @@ -7007,17 +6309,12 @@ static inline struct LDKDecodeError CResult_NetAddressDecodeErrorZ_get_err(LDKCR CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_get_err"))) TS_CResult_NetAddressDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_NetAddressDecodeErrorZ* owner_conv = (LDKCResult_NetAddressDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_NetAddressDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7053,17 +6350,12 @@ static inline struct LDKAcceptChannel CResult_AcceptChannelDecodeErrorZ_get_ok(L CHECK(owner->result_ok); return AcceptChannel_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_get_ok"))) TS_CResult_AcceptChannelDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_AcceptChannelDecodeErrorZ* owner_conv = (LDKCResult_AcceptChannelDecodeErrorZ*)untag_ptr(owner); LDKAcceptChannel ret_var = CResult_AcceptChannelDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7071,17 +6363,12 @@ static inline struct LDKDecodeError CResult_AcceptChannelDecodeErrorZ_get_err(LD CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_get_err"))) TS_CResult_AcceptChannelDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_AcceptChannelDecodeErrorZ* owner_conv = (LDKCResult_AcceptChannelDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_AcceptChannelDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7089,17 +6376,12 @@ static inline struct LDKAnnouncementSignatures CResult_AnnouncementSignaturesDec CHECK(owner->result_ok); return AnnouncementSignatures_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_get_ok"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_AnnouncementSignaturesDecodeErrorZ* owner_conv = (LDKCResult_AnnouncementSignaturesDecodeErrorZ*)untag_ptr(owner); LDKAnnouncementSignatures ret_var = CResult_AnnouncementSignaturesDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7107,17 +6389,12 @@ static inline struct LDKDecodeError CResult_AnnouncementSignaturesDecodeErrorZ_g CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_get_err"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_AnnouncementSignaturesDecodeErrorZ* owner_conv = (LDKCResult_AnnouncementSignaturesDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_AnnouncementSignaturesDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7125,17 +6402,12 @@ static inline struct LDKChannelReestablish CResult_ChannelReestablishDecodeError CHECK(owner->result_ok); return ChannelReestablish_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_get_ok"))) TS_CResult_ChannelReestablishDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ChannelReestablishDecodeErrorZ* owner_conv = (LDKCResult_ChannelReestablishDecodeErrorZ*)untag_ptr(owner); LDKChannelReestablish ret_var = CResult_ChannelReestablishDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7143,17 +6415,12 @@ static inline struct LDKDecodeError CResult_ChannelReestablishDecodeErrorZ_get_e CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_get_err"))) TS_CResult_ChannelReestablishDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ChannelReestablishDecodeErrorZ* owner_conv = (LDKCResult_ChannelReestablishDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ChannelReestablishDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7161,17 +6428,12 @@ static inline struct LDKClosingSigned CResult_ClosingSignedDecodeErrorZ_get_ok(L CHECK(owner->result_ok); return ClosingSigned_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_get_ok"))) TS_CResult_ClosingSignedDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ClosingSignedDecodeErrorZ* owner_conv = (LDKCResult_ClosingSignedDecodeErrorZ*)untag_ptr(owner); LDKClosingSigned ret_var = CResult_ClosingSignedDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7179,17 +6441,12 @@ static inline struct LDKDecodeError CResult_ClosingSignedDecodeErrorZ_get_err(LD CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_get_err"))) TS_CResult_ClosingSignedDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ClosingSignedDecodeErrorZ* owner_conv = (LDKCResult_ClosingSignedDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ClosingSignedDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7197,17 +6454,12 @@ static inline struct LDKClosingSignedFeeRange CResult_ClosingSignedFeeRangeDecod CHECK(owner->result_ok); return ClosingSignedFeeRange_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_get_ok"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* owner_conv = (LDKCResult_ClosingSignedFeeRangeDecodeErrorZ*)untag_ptr(owner); LDKClosingSignedFeeRange ret_var = CResult_ClosingSignedFeeRangeDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7215,17 +6467,12 @@ static inline struct LDKDecodeError CResult_ClosingSignedFeeRangeDecodeErrorZ_ge CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_get_err"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* owner_conv = (LDKCResult_ClosingSignedFeeRangeDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ClosingSignedFeeRangeDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7233,17 +6480,12 @@ static inline struct LDKCommitmentSigned CResult_CommitmentSignedDecodeErrorZ_ge CHECK(owner->result_ok); return CommitmentSigned_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_get_ok"))) TS_CResult_CommitmentSignedDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_CommitmentSignedDecodeErrorZ* owner_conv = (LDKCResult_CommitmentSignedDecodeErrorZ*)untag_ptr(owner); LDKCommitmentSigned ret_var = CResult_CommitmentSignedDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7251,17 +6493,12 @@ static inline struct LDKDecodeError CResult_CommitmentSignedDecodeErrorZ_get_err CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_get_err"))) TS_CResult_CommitmentSignedDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_CommitmentSignedDecodeErrorZ* owner_conv = (LDKCResult_CommitmentSignedDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_CommitmentSignedDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7269,17 +6506,12 @@ static inline struct LDKFundingCreated CResult_FundingCreatedDecodeErrorZ_get_ok CHECK(owner->result_ok); return FundingCreated_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_get_ok"))) TS_CResult_FundingCreatedDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_FundingCreatedDecodeErrorZ* owner_conv = (LDKCResult_FundingCreatedDecodeErrorZ*)untag_ptr(owner); LDKFundingCreated ret_var = CResult_FundingCreatedDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7287,17 +6519,12 @@ static inline struct LDKDecodeError CResult_FundingCreatedDecodeErrorZ_get_err(L CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_get_err"))) TS_CResult_FundingCreatedDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_FundingCreatedDecodeErrorZ* owner_conv = (LDKCResult_FundingCreatedDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_FundingCreatedDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7305,17 +6532,12 @@ static inline struct LDKFundingSigned CResult_FundingSignedDecodeErrorZ_get_ok(L CHECK(owner->result_ok); return FundingSigned_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_get_ok"))) TS_CResult_FundingSignedDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_FundingSignedDecodeErrorZ* owner_conv = (LDKCResult_FundingSignedDecodeErrorZ*)untag_ptr(owner); LDKFundingSigned ret_var = CResult_FundingSignedDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7323,17 +6545,12 @@ static inline struct LDKDecodeError CResult_FundingSignedDecodeErrorZ_get_err(LD CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_get_err"))) TS_CResult_FundingSignedDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_FundingSignedDecodeErrorZ* owner_conv = (LDKCResult_FundingSignedDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_FundingSignedDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7341,17 +6558,12 @@ static inline struct LDKChannelReady CResult_ChannelReadyDecodeErrorZ_get_ok(LDK CHECK(owner->result_ok); return ChannelReady_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_ChannelReadyDecodeErrorZ_get_ok"))) TS_CResult_ChannelReadyDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_ChannelReadyDecodeErrorZ* owner_conv = (LDKCResult_ChannelReadyDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelReadyDecodeErrorZ_get_ok"))) TS_CResult_ChannelReadyDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ChannelReadyDecodeErrorZ* owner_conv = (LDKCResult_ChannelReadyDecodeErrorZ*)untag_ptr(owner); LDKChannelReady ret_var = CResult_ChannelReadyDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7359,17 +6571,12 @@ static inline struct LDKDecodeError CResult_ChannelReadyDecodeErrorZ_get_err(LDK CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_ChannelReadyDecodeErrorZ_get_err"))) TS_CResult_ChannelReadyDecodeErrorZ_get_err(uint32_t owner) { - LDKCResult_ChannelReadyDecodeErrorZ* owner_conv = (LDKCResult_ChannelReadyDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelReadyDecodeErrorZ_get_err"))) TS_CResult_ChannelReadyDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ChannelReadyDecodeErrorZ* owner_conv = (LDKCResult_ChannelReadyDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ChannelReadyDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7377,17 +6584,12 @@ static inline struct LDKInit CResult_InitDecodeErrorZ_get_ok(LDKCResult_InitDeco CHECK(owner->result_ok); return Init_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_InitDecodeErrorZ_get_ok"))) TS_CResult_InitDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_InitDecodeErrorZ* owner_conv = (LDKCResult_InitDecodeErrorZ*)untag_ptr(owner); LDKInit ret_var = CResult_InitDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7395,17 +6597,12 @@ static inline struct LDKDecodeError CResult_InitDecodeErrorZ_get_err(LDKCResult_ CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_InitDecodeErrorZ_get_err"))) TS_CResult_InitDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_InitDecodeErrorZ* owner_conv = (LDKCResult_InitDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_InitDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7413,17 +6610,12 @@ static inline struct LDKOpenChannel CResult_OpenChannelDecodeErrorZ_get_ok(LDKCR CHECK(owner->result_ok); return OpenChannel_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_get_ok"))) TS_CResult_OpenChannelDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_OpenChannelDecodeErrorZ* owner_conv = (LDKCResult_OpenChannelDecodeErrorZ*)untag_ptr(owner); LDKOpenChannel ret_var = CResult_OpenChannelDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7431,17 +6623,12 @@ static inline struct LDKDecodeError CResult_OpenChannelDecodeErrorZ_get_err(LDKC CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_get_err"))) TS_CResult_OpenChannelDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_OpenChannelDecodeErrorZ* owner_conv = (LDKCResult_OpenChannelDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_OpenChannelDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7449,17 +6636,12 @@ static inline struct LDKRevokeAndACK CResult_RevokeAndACKDecodeErrorZ_get_ok(LDK CHECK(owner->result_ok); return RevokeAndACK_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_get_ok"))) TS_CResult_RevokeAndACKDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_RevokeAndACKDecodeErrorZ* owner_conv = (LDKCResult_RevokeAndACKDecodeErrorZ*)untag_ptr(owner); LDKRevokeAndACK ret_var = CResult_RevokeAndACKDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7467,17 +6649,12 @@ static inline struct LDKDecodeError CResult_RevokeAndACKDecodeErrorZ_get_err(LDK CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_get_err"))) TS_CResult_RevokeAndACKDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_RevokeAndACKDecodeErrorZ* owner_conv = (LDKCResult_RevokeAndACKDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_RevokeAndACKDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7485,17 +6662,12 @@ static inline struct LDKShutdown CResult_ShutdownDecodeErrorZ_get_ok(LDKCResult_ CHECK(owner->result_ok); return Shutdown_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_get_ok"))) TS_CResult_ShutdownDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ShutdownDecodeErrorZ* owner_conv = (LDKCResult_ShutdownDecodeErrorZ*)untag_ptr(owner); LDKShutdown ret_var = CResult_ShutdownDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7503,17 +6675,12 @@ static inline struct LDKDecodeError CResult_ShutdownDecodeErrorZ_get_err(LDKCRes CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_get_err"))) TS_CResult_ShutdownDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ShutdownDecodeErrorZ* owner_conv = (LDKCResult_ShutdownDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ShutdownDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7521,17 +6688,12 @@ static inline struct LDKUpdateFailHTLC CResult_UpdateFailHTLCDecodeErrorZ_get_ok CHECK(owner->result_ok); return UpdateFailHTLC_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_get_ok"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_UpdateFailHTLCDecodeErrorZ* owner_conv = (LDKCResult_UpdateFailHTLCDecodeErrorZ*)untag_ptr(owner); LDKUpdateFailHTLC ret_var = CResult_UpdateFailHTLCDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7539,17 +6701,12 @@ static inline struct LDKDecodeError CResult_UpdateFailHTLCDecodeErrorZ_get_err(L CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_get_err"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_UpdateFailHTLCDecodeErrorZ* owner_conv = (LDKCResult_UpdateFailHTLCDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_UpdateFailHTLCDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7557,17 +6714,12 @@ static inline struct LDKUpdateFailMalformedHTLC CResult_UpdateFailMalformedHTLCD CHECK(owner->result_ok); return UpdateFailMalformedHTLC_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_get_ok"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* owner_conv = (LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ*)untag_ptr(owner); LDKUpdateFailMalformedHTLC ret_var = CResult_UpdateFailMalformedHTLCDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7575,17 +6727,12 @@ static inline struct LDKDecodeError CResult_UpdateFailMalformedHTLCDecodeErrorZ_ CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_get_err"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* owner_conv = (LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_UpdateFailMalformedHTLCDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7593,17 +6740,12 @@ static inline struct LDKUpdateFee CResult_UpdateFeeDecodeErrorZ_get_ok(LDKCResul CHECK(owner->result_ok); return UpdateFee_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_get_ok"))) TS_CResult_UpdateFeeDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_UpdateFeeDecodeErrorZ* owner_conv = (LDKCResult_UpdateFeeDecodeErrorZ*)untag_ptr(owner); LDKUpdateFee ret_var = CResult_UpdateFeeDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7611,17 +6753,12 @@ static inline struct LDKDecodeError CResult_UpdateFeeDecodeErrorZ_get_err(LDKCRe CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_get_err"))) TS_CResult_UpdateFeeDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_UpdateFeeDecodeErrorZ* owner_conv = (LDKCResult_UpdateFeeDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_UpdateFeeDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7629,17 +6766,12 @@ static inline struct LDKUpdateFulfillHTLC CResult_UpdateFulfillHTLCDecodeErrorZ_ CHECK(owner->result_ok); return UpdateFulfillHTLC_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_get_ok"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_UpdateFulfillHTLCDecodeErrorZ* owner_conv = (LDKCResult_UpdateFulfillHTLCDecodeErrorZ*)untag_ptr(owner); LDKUpdateFulfillHTLC ret_var = CResult_UpdateFulfillHTLCDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7647,17 +6779,12 @@ static inline struct LDKDecodeError CResult_UpdateFulfillHTLCDecodeErrorZ_get_er CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_get_err"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_UpdateFulfillHTLCDecodeErrorZ* owner_conv = (LDKCResult_UpdateFulfillHTLCDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_UpdateFulfillHTLCDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7665,17 +6792,12 @@ static inline struct LDKUpdateAddHTLC CResult_UpdateAddHTLCDecodeErrorZ_get_ok(L CHECK(owner->result_ok); return UpdateAddHTLC_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_get_ok"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_UpdateAddHTLCDecodeErrorZ* owner_conv = (LDKCResult_UpdateAddHTLCDecodeErrorZ*)untag_ptr(owner); LDKUpdateAddHTLC ret_var = CResult_UpdateAddHTLCDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7683,17 +6805,12 @@ static inline struct LDKDecodeError CResult_UpdateAddHTLCDecodeErrorZ_get_err(LD CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_get_err"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_UpdateAddHTLCDecodeErrorZ* owner_conv = (LDKCResult_UpdateAddHTLCDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_UpdateAddHTLCDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7701,17 +6818,12 @@ static inline struct LDKPing CResult_PingDecodeErrorZ_get_ok(LDKCResult_PingDeco CHECK(owner->result_ok); return Ping_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_PingDecodeErrorZ_get_ok"))) TS_CResult_PingDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_PingDecodeErrorZ* owner_conv = (LDKCResult_PingDecodeErrorZ*)untag_ptr(owner); LDKPing ret_var = CResult_PingDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7719,17 +6831,12 @@ static inline struct LDKDecodeError CResult_PingDecodeErrorZ_get_err(LDKCResult_ CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_PingDecodeErrorZ_get_err"))) TS_CResult_PingDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_PingDecodeErrorZ* owner_conv = (LDKCResult_PingDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_PingDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7737,17 +6844,12 @@ static inline struct LDKPong CResult_PongDecodeErrorZ_get_ok(LDKCResult_PongDeco CHECK(owner->result_ok); return Pong_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_PongDecodeErrorZ_get_ok"))) TS_CResult_PongDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_PongDecodeErrorZ* owner_conv = (LDKCResult_PongDecodeErrorZ*)untag_ptr(owner); LDKPong ret_var = CResult_PongDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7755,17 +6857,12 @@ static inline struct LDKDecodeError CResult_PongDecodeErrorZ_get_err(LDKCResult_ CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_PongDecodeErrorZ_get_err"))) TS_CResult_PongDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_PongDecodeErrorZ* owner_conv = (LDKCResult_PongDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_PongDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7773,17 +6870,12 @@ static inline struct LDKUnsignedChannelAnnouncement CResult_UnsignedChannelAnnou CHECK(owner->result_ok); return UnsignedChannelAnnouncement_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_get_ok"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* owner_conv = (LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ*)untag_ptr(owner); LDKUnsignedChannelAnnouncement ret_var = CResult_UnsignedChannelAnnouncementDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7791,17 +6883,12 @@ static inline struct LDKDecodeError CResult_UnsignedChannelAnnouncementDecodeErr CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_get_err"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* owner_conv = (LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_UnsignedChannelAnnouncementDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7809,17 +6896,12 @@ static inline struct LDKChannelAnnouncement CResult_ChannelAnnouncementDecodeErr CHECK(owner->result_ok); return ChannelAnnouncement_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_get_ok"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ChannelAnnouncementDecodeErrorZ* owner_conv = (LDKCResult_ChannelAnnouncementDecodeErrorZ*)untag_ptr(owner); LDKChannelAnnouncement ret_var = CResult_ChannelAnnouncementDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7827,17 +6909,12 @@ static inline struct LDKDecodeError CResult_ChannelAnnouncementDecodeErrorZ_get_ CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_get_err"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ChannelAnnouncementDecodeErrorZ* owner_conv = (LDKCResult_ChannelAnnouncementDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ChannelAnnouncementDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7845,17 +6922,12 @@ static inline struct LDKUnsignedChannelUpdate CResult_UnsignedChannelUpdateDecod CHECK(owner->result_ok); return UnsignedChannelUpdate_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_get_ok"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_UnsignedChannelUpdateDecodeErrorZ* owner_conv = (LDKCResult_UnsignedChannelUpdateDecodeErrorZ*)untag_ptr(owner); LDKUnsignedChannelUpdate ret_var = CResult_UnsignedChannelUpdateDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7863,17 +6935,12 @@ static inline struct LDKDecodeError CResult_UnsignedChannelUpdateDecodeErrorZ_ge CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_get_err"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_UnsignedChannelUpdateDecodeErrorZ* owner_conv = (LDKCResult_UnsignedChannelUpdateDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_UnsignedChannelUpdateDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7881,17 +6948,12 @@ static inline struct LDKChannelUpdate CResult_ChannelUpdateDecodeErrorZ_get_ok(L CHECK(owner->result_ok); return ChannelUpdate_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_get_ok"))) TS_CResult_ChannelUpdateDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ChannelUpdateDecodeErrorZ* owner_conv = (LDKCResult_ChannelUpdateDecodeErrorZ*)untag_ptr(owner); LDKChannelUpdate ret_var = CResult_ChannelUpdateDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7899,17 +6961,12 @@ static inline struct LDKDecodeError CResult_ChannelUpdateDecodeErrorZ_get_err(LD CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_get_err"))) TS_CResult_ChannelUpdateDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ChannelUpdateDecodeErrorZ* owner_conv = (LDKCResult_ChannelUpdateDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ChannelUpdateDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7917,17 +6974,12 @@ static inline struct LDKErrorMessage CResult_ErrorMessageDecodeErrorZ_get_ok(LDK CHECK(owner->result_ok); return ErrorMessage_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_get_ok"))) TS_CResult_ErrorMessageDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ErrorMessageDecodeErrorZ* owner_conv = (LDKCResult_ErrorMessageDecodeErrorZ*)untag_ptr(owner); LDKErrorMessage ret_var = CResult_ErrorMessageDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7935,17 +6987,12 @@ static inline struct LDKDecodeError CResult_ErrorMessageDecodeErrorZ_get_err(LDK CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_get_err"))) TS_CResult_ErrorMessageDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ErrorMessageDecodeErrorZ* owner_conv = (LDKCResult_ErrorMessageDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ErrorMessageDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7953,17 +7000,12 @@ static inline struct LDKWarningMessage CResult_WarningMessageDecodeErrorZ_get_ok CHECK(owner->result_ok); return WarningMessage_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_get_ok"))) TS_CResult_WarningMessageDecodeErrorZ_get_ok(uint32_t owner) { - LDKCResult_WarningMessageDecodeErrorZ* owner_conv = (LDKCResult_WarningMessageDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_get_ok"))) TS_CResult_WarningMessageDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_WarningMessageDecodeErrorZ* owner_conv = (LDKCResult_WarningMessageDecodeErrorZ*)untag_ptr(owner); LDKWarningMessage ret_var = CResult_WarningMessageDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7971,17 +7013,12 @@ static inline struct LDKDecodeError CResult_WarningMessageDecodeErrorZ_get_err(L CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_get_err"))) TS_CResult_WarningMessageDecodeErrorZ_get_err(uint32_t owner) { - LDKCResult_WarningMessageDecodeErrorZ* owner_conv = (LDKCResult_WarningMessageDecodeErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_get_err"))) TS_CResult_WarningMessageDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_WarningMessageDecodeErrorZ* owner_conv = (LDKCResult_WarningMessageDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_WarningMessageDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -7989,17 +7026,12 @@ static inline struct LDKUnsignedNodeAnnouncement CResult_UnsignedNodeAnnouncemen CHECK(owner->result_ok); return UnsignedNodeAnnouncement_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_get_ok"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* owner_conv = (LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ*)untag_ptr(owner); LDKUnsignedNodeAnnouncement ret_var = CResult_UnsignedNodeAnnouncementDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -8007,17 +7039,12 @@ static inline struct LDKDecodeError CResult_UnsignedNodeAnnouncementDecodeErrorZ CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_get_err"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* owner_conv = (LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_UnsignedNodeAnnouncementDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -8025,17 +7052,12 @@ static inline struct LDKNodeAnnouncement CResult_NodeAnnouncementDecodeErrorZ_ge CHECK(owner->result_ok); return NodeAnnouncement_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_get_ok"))) TS_CResult_NodeAnnouncementDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_NodeAnnouncementDecodeErrorZ* owner_conv = (LDKCResult_NodeAnnouncementDecodeErrorZ*)untag_ptr(owner); LDKNodeAnnouncement ret_var = CResult_NodeAnnouncementDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -8043,17 +7065,12 @@ static inline struct LDKDecodeError CResult_NodeAnnouncementDecodeErrorZ_get_err CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_get_err"))) TS_CResult_NodeAnnouncementDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_NodeAnnouncementDecodeErrorZ* owner_conv = (LDKCResult_NodeAnnouncementDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_NodeAnnouncementDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -8061,17 +7078,12 @@ static inline struct LDKQueryShortChannelIds CResult_QueryShortChannelIdsDecodeE CHECK(owner->result_ok); return QueryShortChannelIds_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_get_ok"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_QueryShortChannelIdsDecodeErrorZ* owner_conv = (LDKCResult_QueryShortChannelIdsDecodeErrorZ*)untag_ptr(owner); LDKQueryShortChannelIds ret_var = CResult_QueryShortChannelIdsDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -8079,17 +7091,12 @@ static inline struct LDKDecodeError CResult_QueryShortChannelIdsDecodeErrorZ_get CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_get_err"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_QueryShortChannelIdsDecodeErrorZ* owner_conv = (LDKCResult_QueryShortChannelIdsDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_QueryShortChannelIdsDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -8097,17 +7104,12 @@ static inline struct LDKReplyShortChannelIdsEnd CResult_ReplyShortChannelIdsEndD CHECK(owner->result_ok); return ReplyShortChannelIdsEnd_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_get_ok"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* owner_conv = (LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ*)untag_ptr(owner); LDKReplyShortChannelIdsEnd ret_var = CResult_ReplyShortChannelIdsEndDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -8115,17 +7117,12 @@ static inline struct LDKDecodeError CResult_ReplyShortChannelIdsEndDecodeErrorZ_ CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_get_err"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* owner_conv = (LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ReplyShortChannelIdsEndDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -8133,17 +7130,12 @@ static inline struct LDKQueryChannelRange CResult_QueryChannelRangeDecodeErrorZ_ CHECK(owner->result_ok); return QueryChannelRange_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_get_ok"))) TS_CResult_QueryChannelRangeDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_QueryChannelRangeDecodeErrorZ* owner_conv = (LDKCResult_QueryChannelRangeDecodeErrorZ*)untag_ptr(owner); LDKQueryChannelRange ret_var = CResult_QueryChannelRangeDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -8151,17 +7143,12 @@ static inline struct LDKDecodeError CResult_QueryChannelRangeDecodeErrorZ_get_er CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_get_err"))) TS_CResult_QueryChannelRangeDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_QueryChannelRangeDecodeErrorZ* owner_conv = (LDKCResult_QueryChannelRangeDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_QueryChannelRangeDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -8169,17 +7156,12 @@ static inline struct LDKReplyChannelRange CResult_ReplyChannelRangeDecodeErrorZ_ CHECK(owner->result_ok); return ReplyChannelRange_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_get_ok"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_ReplyChannelRangeDecodeErrorZ* owner_conv = (LDKCResult_ReplyChannelRangeDecodeErrorZ*)untag_ptr(owner); LDKReplyChannelRange ret_var = CResult_ReplyChannelRangeDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -8187,17 +7169,12 @@ static inline struct LDKDecodeError CResult_ReplyChannelRangeDecodeErrorZ_get_er CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_get_err"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_ReplyChannelRangeDecodeErrorZ* owner_conv = (LDKCResult_ReplyChannelRangeDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_ReplyChannelRangeDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -8205,17 +7182,12 @@ static inline struct LDKGossipTimestampFilter CResult_GossipTimestampFilterDecod CHECK(owner->result_ok); return GossipTimestampFilter_clone(&*owner->contents.result); } -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); +uint64_t __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_get_ok"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_get_ok(uint64_t owner) { + LDKCResult_GossipTimestampFilterDecodeErrorZ* owner_conv = (LDKCResult_GossipTimestampFilterDecodeErrorZ*)untag_ptr(owner); LDKGossipTimestampFilter ret_var = CResult_GossipTimestampFilterDecodeErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -8223,30 +7195,25 @@ static inline struct LDKDecodeError CResult_GossipTimestampFilterDecodeErrorZ_ge CHECK(!owner->result_ok); return DecodeError_clone(&*owner->contents.err); } -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); +uint64_t __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_get_err"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_get_err(uint64_t owner) { + LDKCResult_GossipTimestampFilterDecodeErrorZ* owner_conv = (LDKCResult_GossipTimestampFilterDecodeErrorZ*)untag_ptr(owner); LDKDecodeError ret_var = CResult_GossipTimestampFilterDecodeErrorZ_get_err(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_LDKSignOrCreationError_ty_from_ptr"))) TS_LDKSignOrCreationError_ty_from_ptr(uint32_t ptr) { - LDKSignOrCreationError *obj = (LDKSignOrCreationError*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKSignOrCreationError_ty_from_ptr"))) TS_LDKSignOrCreationError_ty_from_ptr(uint64_t ptr) { + LDKSignOrCreationError *obj = (LDKSignOrCreationError*)untag_ptr(ptr); switch(obj->tag) { case LDKSignOrCreationError_SignError: return 0; case LDKSignOrCreationError_CreationError: return 1; default: abort(); } } -uint32_t __attribute__((export_name("TS_LDKSignOrCreationError_CreationError_get_creation_error"))) TS_LDKSignOrCreationError_CreationError_get_creation_error(uint32_t ptr) { - LDKSignOrCreationError *obj = (LDKSignOrCreationError*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKSignOrCreationError_CreationError_get_creation_error"))) TS_LDKSignOrCreationError_CreationError_get_creation_error(uint64_t ptr) { + LDKSignOrCreationError *obj = (LDKSignOrCreationError*)untag_ptr(ptr); assert(obj->tag == LDKSignOrCreationError_CreationError); uint32_t creation_error_conv = LDKCreationError_to_js(obj->creation_error); return creation_error_conv; @@ -8255,17 +7222,12 @@ static inline struct LDKInvoice CResult_InvoiceSignOrCreationErrorZ_get_ok(LDKCR CHECK(owner->result_ok); return Invoice_clone(&*owner->contents.result); } -uint32_t __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_get_ok"))) TS_CResult_InvoiceSignOrCreationErrorZ_get_ok(uint32_t owner) { - LDKCResult_InvoiceSignOrCreationErrorZ* owner_conv = (LDKCResult_InvoiceSignOrCreationErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_get_ok"))) TS_CResult_InvoiceSignOrCreationErrorZ_get_ok(uint64_t owner) { + LDKCResult_InvoiceSignOrCreationErrorZ* owner_conv = (LDKCResult_InvoiceSignOrCreationErrorZ*)untag_ptr(owner); LDKInvoice ret_var = CResult_InvoiceSignOrCreationErrorZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } @@ -8273,11 +7235,11 @@ static inline struct LDKSignOrCreationError CResult_InvoiceSignOrCreationErrorZ_ CHECK(!owner->result_ok); return SignOrCreationError_clone(&*owner->contents.err); } -uint32_t __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_get_err"))) TS_CResult_InvoiceSignOrCreationErrorZ_get_err(uint32_t owner) { - LDKCResult_InvoiceSignOrCreationErrorZ* owner_conv = (LDKCResult_InvoiceSignOrCreationErrorZ*)(owner & ~1); +uint64_t __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_get_err"))) TS_CResult_InvoiceSignOrCreationErrorZ_get_err(uint64_t owner) { + LDKCResult_InvoiceSignOrCreationErrorZ* owner_conv = (LDKCResult_InvoiceSignOrCreationErrorZ*)untag_ptr(owner); LDKSignOrCreationError *ret_copy = MALLOC(sizeof(LDKSignOrCreationError), "LDKSignOrCreationError"); *ret_copy = CResult_InvoiceSignOrCreationErrorZ_get_err(owner_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } @@ -8303,19 +7265,14 @@ void register_tx_LDKFilter_jcall(const void* this_arg, const uint8_t (* txid)[32 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; - uint32_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. + uint64_t output_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(output_var); - output_ref = (uintptr_t)output_var.inner; - if (output_var.is_owned) { - output_ref |= 1; - } - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 33, (uint32_t)output_ref, 0, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + output_ref = tag_ptr(output_var.inner, output_var.is_owned); + uint32_t ret = js_invoke_function_buuuuu(j_calls->instance_ptr, 33, output_ref, 0, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCOption_C2Tuple_usizeTransactionZZ ret_conv = *(LDKCOption_C2Tuple_usizeTransactionZZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } static void LDKFilter_JCalls_cloned(LDKFilter* new_obj) { @@ -8335,14 +7292,14 @@ static inline LDKFilter LDKFilter_init (JSValue o) { }; return ret; } -long __attribute__((export_name("TS_LDKFilter_new"))) TS_LDKFilter_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKFilter_new"))) TS_LDKFilter_new(JSValue o) { LDKFilter *res_ptr = MALLOC(sizeof(LDKFilter), "LDKFilter"); *res_ptr = LDKFilter_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_Filter_register_tx"))) TS_Filter_register_tx(uint64_t this_arg, int8_tArray txid, int8_tArray script_pubkey) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKFilter* this_arg_conv = (LDKFilter*)this_arg_ptr; unsigned char txid_arr[32]; CHECK(txid->arr_len == 32); @@ -8355,31 +7312,31 @@ void __attribute__((export_name("TS_Filter_register_tx"))) TS_Filter_register_t FREE(script_pubkey); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_Filter_register_output"))) TS_Filter_register_output(uint64_t this_arg, uint64_t output) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKFilter* this_arg_conv = (LDKFilter*)this_arg_ptr; LDKWatchedOutput output_conv; - output_conv.inner = (void*)(output & (~1)); - output_conv.is_owned = (output & 1) || (output == 0); + output_conv.inner = untag_ptr(output); + output_conv.is_owned = ptr_is_owned(output); CHECK_INNER_FIELD_ACCESS_OR_NULL(output_conv); 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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_LDKCOption_FilterZ_ty_from_ptr"))) TS_LDKCOption_FilterZ_ty_from_ptr(uint32_t ptr) { - LDKCOption_FilterZ *obj = (LDKCOption_FilterZ*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKCOption_FilterZ_ty_from_ptr"))) TS_LDKCOption_FilterZ_ty_from_ptr(uint64_t ptr) { + LDKCOption_FilterZ *obj = (LDKCOption_FilterZ*)untag_ptr(ptr); switch(obj->tag) { case LDKCOption_FilterZ_Some: return 0; case LDKCOption_FilterZ_None: return 1; default: abort(); } } -uint32_t __attribute__((export_name("TS_LDKCOption_FilterZ_Some_get_some"))) TS_LDKCOption_FilterZ_Some_get_some(uint32_t ptr) { - LDKCOption_FilterZ *obj = (LDKCOption_FilterZ*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKCOption_FilterZ_Some_get_some"))) TS_LDKCOption_FilterZ_Some_get_some(uint64_t ptr) { + LDKCOption_FilterZ *obj = (LDKCOption_FilterZ*)untag_ptr(ptr); assert(obj->tag == LDKCOption_FilterZ_Some); LDKFilter* some_ret = MALLOC(sizeof(LDKFilter), "LDKFilter"); *some_ret = obj->some; @@ -8388,20 +7345,18 @@ uint32_t __attribute__((export_name("TS_LDKCOption_FilterZ_Some_get_some"))) TS_ // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKFilter_JCalls_cloned(&(*some_ret)); } - return (uint32_t)some_ret; + return tag_ptr(some_ret, true); } static inline struct LDKLockedChannelMonitor *CResult_LockedChannelMonitorNoneZ_get_ok(LDKCResult_LockedChannelMonitorNoneZ *NONNULL_PTR owner){ CHECK(owner->result_ok); return &*owner->contents.result; } -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); +uint64_t __attribute__((export_name("TS_CResult_LockedChannelMonitorNoneZ_get_ok"))) TS_CResult_LockedChannelMonitorNoneZ_get_ok(uint64_t owner) { + LDKCResult_LockedChannelMonitorNoneZ* owner_conv = (LDKCResult_LockedChannelMonitorNoneZ*)untag_ptr(owner); LDKLockedChannelMonitor ret_var = *CResult_LockedChannelMonitorNoneZ_get_ok(owner_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner & ~1; + ret_ref = tag_ptr(ret_var.inner, false); return ret_ref; } @@ -8409,8 +7364,8 @@ static inline void CResult_LockedChannelMonitorNoneZ_get_err(LDKCResult_LockedCh CHECK(!owner->result_ok); return *owner->contents.err; } -void __attribute__((export_name("TS_CResult_LockedChannelMonitorNoneZ_get_err"))) TS_CResult_LockedChannelMonitorNoneZ_get_err(uint32_t owner) { - LDKCResult_LockedChannelMonitorNoneZ* owner_conv = (LDKCResult_LockedChannelMonitorNoneZ*)(owner & ~1); +void __attribute__((export_name("TS_CResult_LockedChannelMonitorNoneZ_get_err"))) TS_CResult_LockedChannelMonitorNoneZ_get_err(uint64_t owner) { + LDKCResult_LockedChannelMonitorNoneZ* owner_conv = (LDKCResult_LockedChannelMonitorNoneZ*)untag_ptr(owner); CResult_LockedChannelMonitorNoneZ_get_err(owner_conv); } @@ -8433,20 +7388,20 @@ static void LDKMessageSendEventsProvider_JCalls_free(void* this_arg) { } LDKCVec_MessageSendEventZ get_and_clear_pending_msg_events_LDKMessageSendEventsProvider_jcall(const void* this_arg) { LDKMessageSendEventsProvider_JCalls *j_calls = (LDKMessageSendEventsProvider_JCalls*) this_arg; - uint32_tArray ret = (uint32_tArray)js_invoke_function_uuuuuu(j_calls->instance_ptr, 34, 0, 0, 0, 0, 0, 0); + uint64_tArray ret = (uint64_tArray)js_invoke_function_uuuuuu(j_calls->instance_ptr, 34, 0, 0, 0, 0, 0, 0); LDKCVec_MessageSendEventZ ret_constr; ret_constr.datalen = ret->arr_len; if (ret_constr.datalen > 0) ret_constr.data = MALLOC(ret_constr.datalen * sizeof(LDKMessageSendEvent), "LDKCVec_MessageSendEventZ Elements"); else ret_constr.data = NULL; - uint32_t* ret_vals = ret->elems; + uint64_t* ret_vals = ret->elems; for (size_t s = 0; s < ret_constr.datalen; s++) { - uint32_t ret_conv_18 = ret_vals[s]; - void* ret_conv_18_ptr = (void*)(((uintptr_t)ret_conv_18) & ~1); + uint64_t ret_conv_18 = ret_vals[s]; + void* ret_conv_18_ptr = untag_ptr(ret_conv_18); CHECK_ACCESS(ret_conv_18_ptr); LDKMessageSendEvent ret_conv_18_conv = *(LDKMessageSendEvent*)(ret_conv_18_ptr); - FREE((void*)ret_conv_18); + FREE(untag_ptr(ret_conv_18)); ret_constr.data[s] = ret_conv_18_conv; } FREE(ret); @@ -8468,23 +7423,23 @@ static inline LDKMessageSendEventsProvider LDKMessageSendEventsProvider_init (JS }; return ret; } -long __attribute__((export_name("TS_LDKMessageSendEventsProvider_new"))) TS_LDKMessageSendEventsProvider_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKMessageSendEventsProvider_new"))) TS_LDKMessageSendEventsProvider_new(JSValue o) { LDKMessageSendEventsProvider *res_ptr = MALLOC(sizeof(LDKMessageSendEventsProvider), "LDKMessageSendEventsProvider"); *res_ptr = LDKMessageSendEventsProvider_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_tArray __attribute__((export_name("TS_MessageSendEventsProvider_get_and_clear_pending_msg_events"))) TS_MessageSendEventsProvider_get_and_clear_pending_msg_events(uint64_t this_arg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t s = 0; s < ret_var.datalen; s++) { LDKMessageSendEvent *ret_conv_18_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_conv_18_copy = ret_var.data[s]; - uint32_t ret_conv_18_ref = (uintptr_t)ret_conv_18_copy; + uint64_t ret_conv_18_ref = tag_ptr(ret_conv_18_copy, true); ret_arr_ptr[s] = ret_conv_18_ref; } @@ -8506,7 +7461,8 @@ 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_uuuuuu(j_calls->instance_ptr, 35, (uint32_t)(uint32_t)ret_event, 0, 0, 0, 0, 0); + uint64_t ref_event = tag_ptr(ret_event, true); + js_invoke_function_buuuuu(j_calls->instance_ptr, 35, ref_event, 0, 0, 0, 0, 0); } static void LDKEventHandler_JCalls_cloned(LDKEventHandler* new_obj) { LDKEventHandler_JCalls *j_calls = (LDKEventHandler_JCalls*) new_obj->this_arg; @@ -8524,16 +7480,16 @@ static inline LDKEventHandler LDKEventHandler_init (JSValue o) { }; return ret; } -long __attribute__((export_name("TS_LDKEventHandler_new"))) TS_LDKEventHandler_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKEventHandler_new"))) TS_LDKEventHandler_new(JSValue o) { LDKEventHandler *res_ptr = MALLOC(sizeof(LDKEventHandler), "LDKEventHandler"); *res_ptr = LDKEventHandler_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -void __attribute__((export_name("TS_EventHandler_handle_event"))) TS_EventHandler_handle_event(uint32_t this_arg, uint32_t event) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_EventHandler_handle_event"))) TS_EventHandler_handle_event(uint64_t this_arg, uint64_t event) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKEventHandler* this_arg_conv = (LDKEventHandler*)this_arg_ptr; - LDKEvent* event_conv = (LDKEvent*)event; + LDKEvent* event_conv = (LDKEvent*)untag_ptr(event); (this_arg_conv->handle_event)(this_arg_conv->this_arg, event_conv); } @@ -8551,7 +7507,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_uuuuuu(j_calls->instance_ptr, 36, (uint32_t)(uint32_t)handler_ret, 0, 0, 0, 0, 0); + js_invoke_function_buuuuu(j_calls->instance_ptr, 36, tag_ptr(handler_ret, true), 0, 0, 0, 0, 0); } static void LDKEventsProvider_JCalls_cloned(LDKEventsProvider* new_obj) { LDKEventsProvider_JCalls *j_calls = (LDKEventsProvider_JCalls*) new_obj->this_arg; @@ -8569,16 +7525,16 @@ static inline LDKEventsProvider LDKEventsProvider_init (JSValue o) { }; return ret; } -long __attribute__((export_name("TS_LDKEventsProvider_new"))) TS_LDKEventsProvider_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKEventsProvider_new"))) TS_LDKEventsProvider_new(JSValue o) { LDKEventsProvider *res_ptr = MALLOC(sizeof(LDKEventsProvider), "LDKEventsProvider"); *res_ptr = LDKEventsProvider_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_EventsProvider_process_pending_events"))) TS_EventsProvider_process_pending_events(uint64_t this_arg, uint64_t handler) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKEventsProvider* this_arg_conv = (LDKEventsProvider*)this_arg_ptr; - void* handler_ptr = (void*)(((uintptr_t)handler) & ~1); + void* handler_ptr = untag_ptr(handler); CHECK_ACCESS(handler_ptr); LDKEventHandler handler_conv = *(LDKEventHandler*)(handler_ptr); if (handler_conv.free == LDKEventHandler_JCalls_free) { @@ -8602,75 +7558,50 @@ uint64_t channel_penalty_msat_LDKScore_jcall(const void* this_arg, uint64_t shor LDKScore_JCalls *j_calls = (LDKScore_JCalls*) this_arg; int64_t short_channel_id_conv = short_channel_id; LDKNodeId source_var = *source; - uint32_t source_ref = 0; + uint64_t source_ref = 0; source_var = NodeId_clone(&source_var); - 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 = (uintptr_t)source_var.inner; - if (source_var.is_owned) { - source_ref |= 1; - } + source_ref = tag_ptr(source_var.inner, source_var.is_owned); LDKNodeId target_var = *target; - uint32_t target_ref = 0; + uint64_t target_ref = 0; target_var = NodeId_clone(&target_var); - 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 = (uintptr_t)target_var.inner; - if (target_var.is_owned) { - target_ref |= 1; - } + target_ref = tag_ptr(target_var.inner, target_var.is_owned); LDKChannelUsage usage_var = usage; - uint32_t usage_ref = 0; - CHECK((((uintptr_t)usage_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&usage_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t usage_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(usage_var); - usage_ref = (uintptr_t)usage_var.inner; - if (usage_var.is_owned) { - usage_ref |= 1; - } - return js_invoke_function_buuuuu(j_calls->instance_ptr, 37, (uint32_t)short_channel_id_conv, (uint32_t)source_ref, (uint32_t)target_ref, (uint32_t)usage_ref, 0, 0); + usage_ref = tag_ptr(usage_var.inner, usage_var.is_owned); + return js_invoke_function_bbbbuu(j_calls->instance_ptr, 37, short_channel_id_conv, source_ref, target_ref, usage_ref, 0, 0); } void payment_path_failed_LDKScore_jcall(void* this_arg, LDKCVec_RouteHopZ path, uint64_t short_channel_id) { LDKScore_JCalls *j_calls = (LDKScore_JCalls*) this_arg; LDKCVec_RouteHopZ path_var = path; - uint32_tArray path_arr = NULL; - path_arr = init_uint32_tArray(path_var.datalen, __LINE__); - uint32_t *path_arr_ptr = (uint32_t*)(((uint8_t*)path_arr) + 8); + uint64_tArray path_arr = NULL; + path_arr = init_uint64_tArray(path_var.datalen, __LINE__); + uint64_t *path_arr_ptr = (uint64_t*)(((uint8_t*)path_arr) + 8); for (size_t k = 0; k < path_var.datalen; k++) { LDKRouteHop path_conv_10_var = path_var.data[k]; - uint32_t path_conv_10_ref = 0; - CHECK((((uintptr_t)path_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&path_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t path_conv_10_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_var); - path_conv_10_ref = (uintptr_t)path_conv_10_var.inner; - if (path_conv_10_var.is_owned) { - path_conv_10_ref |= 1; - } + path_conv_10_ref = tag_ptr(path_conv_10_var.inner, path_conv_10_var.is_owned); path_arr_ptr[k] = path_conv_10_ref; } FREE(path_var.data); int64_t short_channel_id_conv = short_channel_id; - js_invoke_function_ubuuuu(j_calls->instance_ptr, 38, (uint32_t)path_arr, (uint32_t)short_channel_id_conv, 0, 0, 0, 0); + js_invoke_function_ubuuuu(j_calls->instance_ptr, 38, (uint32_t)path_arr, short_channel_id_conv, 0, 0, 0, 0); } void payment_path_successful_LDKScore_jcall(void* this_arg, LDKCVec_RouteHopZ path) { LDKScore_JCalls *j_calls = (LDKScore_JCalls*) this_arg; LDKCVec_RouteHopZ path_var = path; - uint32_tArray path_arr = NULL; - path_arr = init_uint32_tArray(path_var.datalen, __LINE__); - uint32_t *path_arr_ptr = (uint32_t*)(((uint8_t*)path_arr) + 8); + uint64_tArray path_arr = NULL; + path_arr = init_uint64_tArray(path_var.datalen, __LINE__); + uint64_t *path_arr_ptr = (uint64_t*)(((uint8_t*)path_arr) + 8); for (size_t k = 0; k < path_var.datalen; k++) { LDKRouteHop path_conv_10_var = path_var.data[k]; - uint32_t path_conv_10_ref = 0; - CHECK((((uintptr_t)path_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&path_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t path_conv_10_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_var); - path_conv_10_ref = (uintptr_t)path_conv_10_var.inner; - if (path_conv_10_var.is_owned) { - path_conv_10_ref |= 1; - } + path_conv_10_ref = tag_ptr(path_conv_10_var.inner, path_conv_10_var.is_owned); path_arr_ptr[k] = path_conv_10_ref; } @@ -8680,42 +7611,32 @@ void payment_path_successful_LDKScore_jcall(void* this_arg, LDKCVec_RouteHopZ pa void probe_failed_LDKScore_jcall(void* this_arg, LDKCVec_RouteHopZ path, uint64_t short_channel_id) { LDKScore_JCalls *j_calls = (LDKScore_JCalls*) this_arg; LDKCVec_RouteHopZ path_var = path; - uint32_tArray path_arr = NULL; - path_arr = init_uint32_tArray(path_var.datalen, __LINE__); - uint32_t *path_arr_ptr = (uint32_t*)(((uint8_t*)path_arr) + 8); + uint64_tArray path_arr = NULL; + path_arr = init_uint64_tArray(path_var.datalen, __LINE__); + uint64_t *path_arr_ptr = (uint64_t*)(((uint8_t*)path_arr) + 8); for (size_t k = 0; k < path_var.datalen; k++) { LDKRouteHop path_conv_10_var = path_var.data[k]; - uint32_t path_conv_10_ref = 0; - CHECK((((uintptr_t)path_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&path_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t path_conv_10_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_var); - path_conv_10_ref = (uintptr_t)path_conv_10_var.inner; - if (path_conv_10_var.is_owned) { - path_conv_10_ref |= 1; - } + path_conv_10_ref = tag_ptr(path_conv_10_var.inner, path_conv_10_var.is_owned); path_arr_ptr[k] = path_conv_10_ref; } FREE(path_var.data); int64_t short_channel_id_conv = short_channel_id; - js_invoke_function_ubuuuu(j_calls->instance_ptr, 40, (uint32_t)path_arr, (uint32_t)short_channel_id_conv, 0, 0, 0, 0); + js_invoke_function_ubuuuu(j_calls->instance_ptr, 40, (uint32_t)path_arr, short_channel_id_conv, 0, 0, 0, 0); } void probe_successful_LDKScore_jcall(void* this_arg, LDKCVec_RouteHopZ path) { LDKScore_JCalls *j_calls = (LDKScore_JCalls*) this_arg; LDKCVec_RouteHopZ path_var = path; - uint32_tArray path_arr = NULL; - path_arr = init_uint32_tArray(path_var.datalen, __LINE__); - uint32_t *path_arr_ptr = (uint32_t*)(((uint8_t*)path_arr) + 8); + uint64_tArray path_arr = NULL; + path_arr = init_uint64_tArray(path_var.datalen, __LINE__); + uint64_t *path_arr_ptr = (uint64_t*)(((uint8_t*)path_arr) + 8); for (size_t k = 0; k < path_var.datalen; k++) { LDKRouteHop path_conv_10_var = path_var.data[k]; - uint32_t path_conv_10_ref = 0; - CHECK((((uintptr_t)path_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&path_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t path_conv_10_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_var); - path_conv_10_ref = (uintptr_t)path_conv_10_var.inner; - if (path_conv_10_var.is_owned) { - path_conv_10_ref |= 1; - } + path_conv_10_ref = tag_ptr(path_conv_10_var.inner, path_conv_10_var.is_owned); path_arr_ptr[k] = path_conv_10_ref; } @@ -8752,35 +7673,37 @@ static inline LDKScore LDKScore_init (JSValue o) { }; return ret; } -long __attribute__((export_name("TS_LDKScore_new"))) TS_LDKScore_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKScore_new"))) TS_LDKScore_new(JSValue o) { LDKScore *res_ptr = MALLOC(sizeof(LDKScore), "LDKScore"); *res_ptr = LDKScore_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -int64_t __attribute__((export_name("TS_Score_channel_penalty_msat"))) TS_Score_channel_penalty_msat(uint32_t this_arg, int64_t short_channel_id, uint32_t source, uint32_t target, uint32_t usage) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +int64_t __attribute__((export_name("TS_Score_channel_penalty_msat"))) TS_Score_channel_penalty_msat(uint64_t this_arg, int64_t short_channel_id, uint64_t source, uint64_t target, uint64_t usage) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKScore* this_arg_conv = (LDKScore*)this_arg_ptr; LDKNodeId source_conv; - source_conv.inner = (void*)(source & (~1)); - source_conv.is_owned = false; + source_conv.inner = untag_ptr(source); + source_conv.is_owned = ptr_is_owned(source); CHECK_INNER_FIELD_ACCESS_OR_NULL(source_conv); + source_conv.is_owned = false; LDKNodeId target_conv; - target_conv.inner = (void*)(target & (~1)); - target_conv.is_owned = false; + target_conv.inner = untag_ptr(target); + target_conv.is_owned = ptr_is_owned(target); CHECK_INNER_FIELD_ACCESS_OR_NULL(target_conv); + target_conv.is_owned = false; LDKChannelUsage usage_conv; - usage_conv.inner = (void*)(usage & (~1)); - usage_conv.is_owned = (usage & 1) || (usage == 0); + usage_conv.inner = untag_ptr(usage); + usage_conv.is_owned = ptr_is_owned(usage); CHECK_INNER_FIELD_ACCESS_OR_NULL(usage_conv); usage_conv = ChannelUsage_clone(&usage_conv); int64_t ret_conv = (this_arg_conv->channel_penalty_msat)(this_arg_conv->this_arg, short_channel_id, &source_conv, &target_conv, usage_conv); return ret_conv; } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_Score_payment_path_failed"))) TS_Score_payment_path_failed(uint64_t this_arg, uint64_tArray path, int64_t short_channel_id) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKScore* this_arg_conv = (LDKScore*)this_arg_ptr; LDKCVec_RouteHopZ path_constr; path_constr.datalen = path->arr_len; @@ -8788,12 +7711,12 @@ 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; + uint64_t* path_vals = path->elems; for (size_t k = 0; k < path_constr.datalen; k++) { - uint32_t path_conv_10 = path_vals[k]; + uint64_t path_conv_10 = path_vals[k]; LDKRouteHop path_conv_10_conv; - path_conv_10_conv.inner = (void*)(path_conv_10 & (~1)); - path_conv_10_conv.is_owned = (path_conv_10 & 1) || (path_conv_10 == 0); + path_conv_10_conv.inner = untag_ptr(path_conv_10); + path_conv_10_conv.is_owned = ptr_is_owned(path_conv_10); CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_conv); path_conv_10_conv = RouteHop_clone(&path_conv_10_conv); path_constr.data[k] = path_conv_10_conv; @@ -8802,9 +7725,9 @@ void __attribute__((export_name("TS_Score_payment_path_failed"))) TS_Score_paym (this_arg_conv->payment_path_failed)(this_arg_conv->this_arg, path_constr, short_channel_id); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_Score_payment_path_successful"))) TS_Score_payment_path_successful(uint64_t this_arg, uint64_tArray path) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKScore* this_arg_conv = (LDKScore*)this_arg_ptr; LDKCVec_RouteHopZ path_constr; path_constr.datalen = path->arr_len; @@ -8812,12 +7735,12 @@ 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; + uint64_t* path_vals = path->elems; for (size_t k = 0; k < path_constr.datalen; k++) { - uint32_t path_conv_10 = path_vals[k]; + uint64_t path_conv_10 = path_vals[k]; LDKRouteHop path_conv_10_conv; - path_conv_10_conv.inner = (void*)(path_conv_10 & (~1)); - path_conv_10_conv.is_owned = (path_conv_10 & 1) || (path_conv_10 == 0); + path_conv_10_conv.inner = untag_ptr(path_conv_10); + path_conv_10_conv.is_owned = ptr_is_owned(path_conv_10); CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_conv); path_conv_10_conv = RouteHop_clone(&path_conv_10_conv); path_constr.data[k] = path_conv_10_conv; @@ -8826,9 +7749,9 @@ void __attribute__((export_name("TS_Score_payment_path_successful"))) TS_Score_ (this_arg_conv->payment_path_successful)(this_arg_conv->this_arg, path_constr); } -void __attribute__((export_name("TS_Score_probe_failed"))) TS_Score_probe_failed(uint32_t this_arg, uint32_tArray path, int64_t short_channel_id) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_Score_probe_failed"))) TS_Score_probe_failed(uint64_t this_arg, uint64_tArray path, int64_t short_channel_id) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKScore* this_arg_conv = (LDKScore*)this_arg_ptr; LDKCVec_RouteHopZ path_constr; path_constr.datalen = path->arr_len; @@ -8836,12 +7759,12 @@ void __attribute__((export_name("TS_Score_probe_failed"))) TS_Score_probe_faile path_constr.data = MALLOC(path_constr.datalen * sizeof(LDKRouteHop), "LDKCVec_RouteHopZ Elements"); else path_constr.data = NULL; - uint32_t* path_vals = path->elems; + uint64_t* path_vals = path->elems; for (size_t k = 0; k < path_constr.datalen; k++) { - uint32_t path_conv_10 = path_vals[k]; + uint64_t path_conv_10 = path_vals[k]; LDKRouteHop path_conv_10_conv; - path_conv_10_conv.inner = (void*)(path_conv_10 & (~1)); - path_conv_10_conv.is_owned = (path_conv_10 & 1) || (path_conv_10 == 0); + path_conv_10_conv.inner = untag_ptr(path_conv_10); + path_conv_10_conv.is_owned = ptr_is_owned(path_conv_10); CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_conv); path_conv_10_conv = RouteHop_clone(&path_conv_10_conv); path_constr.data[k] = path_conv_10_conv; @@ -8850,9 +7773,9 @@ void __attribute__((export_name("TS_Score_probe_failed"))) TS_Score_probe_faile (this_arg_conv->probe_failed)(this_arg_conv->this_arg, path_constr, short_channel_id); } -void __attribute__((export_name("TS_Score_probe_successful"))) TS_Score_probe_successful(uint32_t this_arg, uint32_tArray path) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_Score_probe_successful"))) TS_Score_probe_successful(uint64_t this_arg, uint64_tArray path) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKScore* this_arg_conv = (LDKScore*)this_arg_ptr; LDKCVec_RouteHopZ path_constr; path_constr.datalen = path->arr_len; @@ -8860,12 +7783,12 @@ void __attribute__((export_name("TS_Score_probe_successful"))) TS_Score_probe_s path_constr.data = MALLOC(path_constr.datalen * sizeof(LDKRouteHop), "LDKCVec_RouteHopZ Elements"); else path_constr.data = NULL; - uint32_t* path_vals = path->elems; + uint64_t* path_vals = path->elems; for (size_t k = 0; k < path_constr.datalen; k++) { - uint32_t path_conv_10 = path_vals[k]; + uint64_t path_conv_10 = path_vals[k]; LDKRouteHop path_conv_10_conv; - path_conv_10_conv.inner = (void*)(path_conv_10 & (~1)); - path_conv_10_conv.is_owned = (path_conv_10 & 1) || (path_conv_10 == 0); + path_conv_10_conv.inner = untag_ptr(path_conv_10); + path_conv_10_conv.is_owned = ptr_is_owned(path_conv_10); CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_conv); path_conv_10_conv = RouteHop_clone(&path_conv_10_conv); path_constr.data[k] = path_conv_10_conv; @@ -8874,9 +7797,9 @@ void __attribute__((export_name("TS_Score_probe_successful"))) TS_Score_probe_s (this_arg_conv->probe_successful)(this_arg_conv->this_arg, path_constr); } -int8_tArray __attribute__((export_name("TS_Score_write"))) TS_Score_write(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +int8_tArray __attribute__((export_name("TS_Score_write"))) TS_Score_write(uint64_t this_arg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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, __LINE__); @@ -8898,58 +7821,43 @@ static void LDKPersister_JCalls_free(void* this_arg) { LDKCResult_NoneErrorZ persist_manager_LDKPersister_jcall(const void* this_arg, const LDKChannelManager * channel_manager) { LDKPersister_JCalls *j_calls = (LDKPersister_JCalls*) this_arg; LDKChannelManager channel_manager_var = *channel_manager; - uint32_t channel_manager_ref = 0; + uint64_t channel_manager_ref = 0; // WARNING: we may need a move here but no clone is available for LDKChannelManager - CHECK((((uintptr_t)channel_manager_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&channel_manager_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_manager_var); - channel_manager_ref = (uintptr_t)channel_manager_var.inner; - if (channel_manager_var.is_owned) { - channel_manager_ref |= 1; - } - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 43, (uint32_t)channel_manager_ref, 0, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + channel_manager_ref = tag_ptr(channel_manager_var.inner, channel_manager_var.is_owned); + uint32_t ret = js_invoke_function_buuuuu(j_calls->instance_ptr, 43, channel_manager_ref, 0, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_NoneErrorZ ret_conv = *(LDKCResult_NoneErrorZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } LDKCResult_NoneErrorZ persist_graph_LDKPersister_jcall(const void* this_arg, const LDKNetworkGraph * network_graph) { LDKPersister_JCalls *j_calls = (LDKPersister_JCalls*) this_arg; LDKNetworkGraph network_graph_var = *network_graph; - uint32_t network_graph_ref = 0; + uint64_t network_graph_ref = 0; // WARNING: we may need a move here but no clone is available for LDKNetworkGraph - CHECK((((uintptr_t)network_graph_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&network_graph_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(network_graph_var); - network_graph_ref = (uintptr_t)network_graph_var.inner; - if (network_graph_var.is_owned) { - network_graph_ref |= 1; - } - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 44, (uint32_t)network_graph_ref, 0, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + network_graph_ref = tag_ptr(network_graph_var.inner, network_graph_var.is_owned); + uint32_t ret = js_invoke_function_buuuuu(j_calls->instance_ptr, 44, network_graph_ref, 0, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_NoneErrorZ ret_conv = *(LDKCResult_NoneErrorZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } LDKCResult_NoneErrorZ persist_scorer_LDKPersister_jcall(const void* this_arg, const LDKMultiThreadedLockableScore * scorer) { LDKPersister_JCalls *j_calls = (LDKPersister_JCalls*) this_arg; LDKMultiThreadedLockableScore scorer_var = *scorer; - uint32_t scorer_ref = 0; + uint64_t scorer_ref = 0; // WARNING: we may need a move here but no clone is available for LDKMultiThreadedLockableScore - CHECK((((uintptr_t)scorer_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&scorer_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(scorer_var); - scorer_ref = (uintptr_t)scorer_var.inner; - if (scorer_var.is_owned) { - scorer_ref |= 1; - } - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 45, (uint32_t)scorer_ref, 0, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + scorer_ref = tag_ptr(scorer_var.inner, scorer_var.is_owned); + uint32_t ret = js_invoke_function_buuuuu(j_calls->instance_ptr, 45, scorer_ref, 0, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_NoneErrorZ ret_conv = *(LDKCResult_NoneErrorZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } static void LDKPersister_JCalls_cloned(LDKPersister* new_obj) { @@ -8970,48 +7878,51 @@ static inline LDKPersister LDKPersister_init (JSValue o) { }; return ret; } -long __attribute__((export_name("TS_LDKPersister_new"))) TS_LDKPersister_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKPersister_new"))) TS_LDKPersister_new(JSValue o) { LDKPersister *res_ptr = MALLOC(sizeof(LDKPersister), "LDKPersister"); *res_ptr = LDKPersister_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -uint32_t __attribute__((export_name("TS_Persister_persist_manager"))) TS_Persister_persist_manager(uint32_t this_arg, uint32_t channel_manager) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_Persister_persist_manager"))) TS_Persister_persist_manager(uint64_t this_arg, uint64_t channel_manager) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKPersister* this_arg_conv = (LDKPersister*)this_arg_ptr; LDKChannelManager channel_manager_conv; - channel_manager_conv.inner = (void*)(channel_manager & (~1)); - channel_manager_conv.is_owned = false; + channel_manager_conv.inner = untag_ptr(channel_manager); + channel_manager_conv.is_owned = ptr_is_owned(channel_manager); CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_manager_conv); + channel_manager_conv.is_owned = false; LDKCResult_NoneErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneErrorZ), "LDKCResult_NoneErrorZ"); *ret_conv = (this_arg_conv->persist_manager)(this_arg_conv->this_arg, &channel_manager_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_Persister_persist_graph"))) TS_Persister_persist_graph(uint32_t this_arg, uint32_t network_graph) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_Persister_persist_graph"))) TS_Persister_persist_graph(uint64_t this_arg, uint64_t network_graph) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKPersister* this_arg_conv = (LDKPersister*)this_arg_ptr; LDKNetworkGraph network_graph_conv; - network_graph_conv.inner = (void*)(network_graph & (~1)); - network_graph_conv.is_owned = false; + network_graph_conv.inner = untag_ptr(network_graph); + network_graph_conv.is_owned = ptr_is_owned(network_graph); CHECK_INNER_FIELD_ACCESS_OR_NULL(network_graph_conv); + network_graph_conv.is_owned = false; LDKCResult_NoneErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneErrorZ), "LDKCResult_NoneErrorZ"); *ret_conv = (this_arg_conv->persist_graph)(this_arg_conv->this_arg, &network_graph_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_Persister_persist_scorer"))) TS_Persister_persist_scorer(uint32_t this_arg, uint32_t scorer) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_Persister_persist_scorer"))) TS_Persister_persist_scorer(uint64_t this_arg, uint64_t scorer) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKPersister* this_arg_conv = (LDKPersister*)this_arg_ptr; LDKMultiThreadedLockableScore scorer_conv; - scorer_conv.inner = (void*)(scorer & (~1)); - scorer_conv.is_owned = false; + scorer_conv.inner = untag_ptr(scorer); + scorer_conv.is_owned = ptr_is_owned(scorer); CHECK_INNER_FIELD_ACCESS_OR_NULL(scorer_conv); + scorer_conv.is_owned = false; LDKCResult_NoneErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneErrorZ), "LDKCResult_NoneErrorZ"); *ret_conv = (this_arg_conv->persist_scorer)(this_arg_conv->this_arg, &scorer_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } typedef struct LDKListen_JCalls { @@ -9029,18 +7940,18 @@ void filtered_block_connected_LDKListen_jcall(const void* this_arg, const uint8_ 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, __LINE__); - uint32_t *txdata_arr_ptr = (uint32_t*)(((uint8_t*)txdata_arr) + 8); + uint64_tArray txdata_arr = NULL; + txdata_arr = init_uint64_tArray(txdata_var.datalen, __LINE__); + uint64_t *txdata_arr_ptr = (uint64_t*)(((uint8_t*)txdata_arr) + 8); for (size_t c = 0; c < txdata_var.datalen; c++) { LDKC2Tuple_usizeTransactionZ* txdata_conv_28_conv = MALLOC(sizeof(LDKC2Tuple_usizeTransactionZ), "LDKC2Tuple_usizeTransactionZ"); *txdata_conv_28_conv = txdata_var.data[c]; - txdata_arr_ptr[c] = ((uint32_t)txdata_conv_28_conv); + txdata_arr_ptr[c] = tag_ptr(txdata_conv_28_conv, true); } FREE(txdata_var.data); int32_t height_conv = height; - js_invoke_function_uuuuuu(j_calls->instance_ptr, 46, (uint32_t)header_arr, (uint32_t)txdata_arr, (uint32_t)height_conv, 0, 0, 0); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 46, (uint32_t)header_arr, (uint32_t)txdata_arr, height_conv, 0, 0, 0); } void block_connected_LDKListen_jcall(const void* this_arg, LDKu8slice block, uint32_t height) { LDKListen_JCalls *j_calls = (LDKListen_JCalls*) this_arg; @@ -9048,14 +7959,14 @@ void block_connected_LDKListen_jcall(const void* this_arg, LDKu8slice block, uin int8_tArray block_arr = init_int8_tArray(block_var.datalen, __LINE__); memcpy(block_arr->elems, block_var.data, block_var.datalen); int32_t height_conv = height; - js_invoke_function_uuuuuu(j_calls->instance_ptr, 47, (uint32_t)block_arr, (uint32_t)height_conv, 0, 0, 0, 0); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 47, (uint32_t)block_arr, height_conv, 0, 0, 0, 0); } void block_disconnected_LDKListen_jcall(const void* this_arg, const uint8_t (* header)[80], uint32_t height) { LDKListen_JCalls *j_calls = (LDKListen_JCalls*) this_arg; int8_tArray header_arr = init_int8_tArray(80, __LINE__); memcpy(header_arr->elems, *header, 80); int32_t height_conv = height; - js_invoke_function_uuuuuu(j_calls->instance_ptr, 48, (uint32_t)header_arr, (uint32_t)height_conv, 0, 0, 0, 0); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 48, (uint32_t)header_arr, height_conv, 0, 0, 0, 0); } static void LDKListen_JCalls_cloned(LDKListen* new_obj) { LDKListen_JCalls *j_calls = (LDKListen_JCalls*) new_obj->this_arg; @@ -9075,14 +7986,14 @@ static inline LDKListen LDKListen_init (JSValue o) { }; return ret; } -long __attribute__((export_name("TS_LDKListen_new"))) TS_LDKListen_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKListen_new"))) TS_LDKListen_new(JSValue o) { LDKListen *res_ptr = MALLOC(sizeof(LDKListen), "LDKListen"); *res_ptr = LDKListen_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -void __attribute__((export_name("TS_Listen_filtered_block_connected"))) TS_Listen_filtered_block_connected(uint32_t this_arg, int8_tArray header, uint32_tArray txdata, int32_t height) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_Listen_filtered_block_connected"))) TS_Listen_filtered_block_connected(uint64_t this_arg, int8_tArray header, uint64_tArray txdata, int32_t height) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKListen* this_arg_conv = (LDKListen*)this_arg_ptr; unsigned char header_arr[80]; CHECK(header->arr_len == 80); @@ -9094,22 +8005,22 @@ void __attribute__((export_name("TS_Listen_filtered_block_connected"))) TS_List txdata_constr.data = MALLOC(txdata_constr.datalen * sizeof(LDKC2Tuple_usizeTransactionZ), "LDKCVec_C2Tuple_usizeTransactionZZ Elements"); else txdata_constr.data = NULL; - uint32_t* txdata_vals = txdata->elems; + uint64_t* txdata_vals = txdata->elems; for (size_t c = 0; c < txdata_constr.datalen; c++) { - uint32_t txdata_conv_28 = txdata_vals[c]; - void* txdata_conv_28_ptr = (void*)(((uintptr_t)txdata_conv_28) & ~1); + uint64_t txdata_conv_28 = txdata_vals[c]; + void* txdata_conv_28_ptr = untag_ptr(txdata_conv_28); 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*)(((uintptr_t)txdata_conv_28) & ~1)); + txdata_conv_28_conv = C2Tuple_usizeTransactionZ_clone((LDKC2Tuple_usizeTransactionZ*)untag_ptr(txdata_conv_28)); txdata_constr.data[c] = txdata_conv_28_conv; } FREE(txdata); (this_arg_conv->filtered_block_connected)(this_arg_conv->this_arg, header_ref, txdata_constr, height); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_Listen_block_connected"))) TS_Listen_block_connected(uint64_t this_arg, int8_tArray block, int32_t height) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKListen* this_arg_conv = (LDKListen*)this_arg_ptr; LDKu8slice block_ref; block_ref.datalen = block->arr_len; @@ -9118,9 +8029,9 @@ void __attribute__((export_name("TS_Listen_block_connected"))) TS_Listen_block_ FREE(block); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_Listen_block_disconnected"))) TS_Listen_block_disconnected(uint64_t this_arg, int8_tArray header, int32_t height) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKListen* this_arg_conv = (LDKListen*)this_arg_ptr; unsigned char header_arr[80]; CHECK(header->arr_len == 80); @@ -9144,18 +8055,18 @@ void transactions_confirmed_LDKConfirm_jcall(const void* this_arg, const uint8_t 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, __LINE__); - uint32_t *txdata_arr_ptr = (uint32_t*)(((uint8_t*)txdata_arr) + 8); + uint64_tArray txdata_arr = NULL; + txdata_arr = init_uint64_tArray(txdata_var.datalen, __LINE__); + uint64_t *txdata_arr_ptr = (uint64_t*)(((uint8_t*)txdata_arr) + 8); for (size_t c = 0; c < txdata_var.datalen; c++) { LDKC2Tuple_usizeTransactionZ* txdata_conv_28_conv = MALLOC(sizeof(LDKC2Tuple_usizeTransactionZ), "LDKC2Tuple_usizeTransactionZ"); *txdata_conv_28_conv = txdata_var.data[c]; - txdata_arr_ptr[c] = ((uint32_t)txdata_conv_28_conv); + txdata_arr_ptr[c] = tag_ptr(txdata_conv_28_conv, true); } FREE(txdata_var.data); int32_t height_conv = height; - js_invoke_function_uuuuuu(j_calls->instance_ptr, 49, (uint32_t)header_arr, (uint32_t)txdata_arr, (uint32_t)height_conv, 0, 0, 0); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 49, (uint32_t)header_arr, (uint32_t)txdata_arr, height_conv, 0, 0, 0); } void transaction_unconfirmed_LDKConfirm_jcall(const void* this_arg, const uint8_t (* txid)[32]) { LDKConfirm_JCalls *j_calls = (LDKConfirm_JCalls*) this_arg; @@ -9168,7 +8079,7 @@ void best_block_updated_LDKConfirm_jcall(const void* this_arg, const uint8_t (* int8_tArray header_arr = init_int8_tArray(80, __LINE__); memcpy(header_arr->elems, *header, 80); int32_t height_conv = height; - js_invoke_function_uuuuuu(j_calls->instance_ptr, 51, (uint32_t)header_arr, (uint32_t)height_conv, 0, 0, 0, 0); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 51, (uint32_t)header_arr, height_conv, 0, 0, 0, 0); } LDKCVec_TxidZ get_relevant_txids_LDKConfirm_jcall(const void* this_arg) { LDKConfirm_JCalls *j_calls = (LDKConfirm_JCalls*) this_arg; @@ -9209,14 +8120,14 @@ static inline LDKConfirm LDKConfirm_init (JSValue o) { }; return ret; } -long __attribute__((export_name("TS_LDKConfirm_new"))) TS_LDKConfirm_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKConfirm_new"))) TS_LDKConfirm_new(JSValue o) { LDKConfirm *res_ptr = MALLOC(sizeof(LDKConfirm), "LDKConfirm"); *res_ptr = LDKConfirm_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_Confirm_transactions_confirmed"))) TS_Confirm_transactions_confirmed(uint64_t this_arg, int8_tArray header, uint64_tArray txdata, int32_t height) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKConfirm* this_arg_conv = (LDKConfirm*)this_arg_ptr; unsigned char header_arr[80]; CHECK(header->arr_len == 80); @@ -9228,22 +8139,22 @@ 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; + uint64_t* txdata_vals = txdata->elems; for (size_t c = 0; c < txdata_constr.datalen; c++) { - uint32_t txdata_conv_28 = txdata_vals[c]; - void* txdata_conv_28_ptr = (void*)(((uintptr_t)txdata_conv_28) & ~1); + uint64_t txdata_conv_28 = txdata_vals[c]; + void* txdata_conv_28_ptr = untag_ptr(txdata_conv_28); 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*)(((uintptr_t)txdata_conv_28) & ~1)); + txdata_conv_28_conv = C2Tuple_usizeTransactionZ_clone((LDKC2Tuple_usizeTransactionZ*)untag_ptr(txdata_conv_28)); txdata_constr.data[c] = txdata_conv_28_conv; } FREE(txdata); (this_arg_conv->transactions_confirmed)(this_arg_conv->this_arg, header_ref, txdata_constr, height); } -void __attribute__((export_name("TS_Confirm_transaction_unconfirmed"))) TS_Confirm_transaction_unconfirmed(uint32_t this_arg, int8_tArray txid) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_Confirm_transaction_unconfirmed"))) TS_Confirm_transaction_unconfirmed(uint64_t this_arg, int8_tArray txid) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKConfirm* this_arg_conv = (LDKConfirm*)this_arg_ptr; unsigned char txid_arr[32]; CHECK(txid->arr_len == 32); @@ -9252,9 +8163,9 @@ void __attribute__((export_name("TS_Confirm_transaction_unconfirmed"))) TS_Conf (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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_Confirm_best_block_updated"))) TS_Confirm_best_block_updated(uint64_t this_arg, int8_tArray header, int32_t height) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKConfirm* this_arg_conv = (LDKConfirm*)this_arg_ptr; unsigned char header_arr[80]; CHECK(header->arr_len == 80); @@ -9263,9 +8174,9 @@ void __attribute__((export_name("TS_Confirm_best_block_updated"))) TS_Confirm_b (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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +ptrArray __attribute__((export_name("TS_Confirm_get_relevant_txids"))) TS_Confirm_get_relevant_txids(uint64_t this_arg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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; @@ -9294,87 +8205,50 @@ 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; - uint32_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. + uint64_t channel_id_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_id_var); - channel_id_ref = (uintptr_t)channel_id_var.inner; - if (channel_id_var.is_owned) { - channel_id_ref |= 1; - } + channel_id_ref = tag_ptr(channel_id_var.inner, channel_id_var.is_owned); LDKChannelMonitor data_var = *data; - uint32_t data_ref = 0; + uint64_t data_ref = 0; data_var = ChannelMonitor_clone(&data_var); - 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 = (uintptr_t)data_var.inner; - if (data_var.is_owned) { - data_ref |= 1; - } + data_ref = tag_ptr(data_var.inner, data_var.is_owned); LDKMonitorUpdateId update_id_var = update_id; - uint32_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. + uint64_t update_id_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(update_id_var); - 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_uuuuuu(j_calls->instance_ptr, 53, (uint32_t)channel_id_ref, (uint32_t)data_ref, (uint32_t)update_id_ref, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + update_id_ref = tag_ptr(update_id_var.inner, update_id_var.is_owned); + uint32_t ret = js_invoke_function_bbbuuu(j_calls->instance_ptr, 53, channel_id_ref, data_ref, update_id_ref, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_NoneChannelMonitorUpdateErrZ ret_conv = *(LDKCResult_NoneChannelMonitorUpdateErrZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } 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; - uint32_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. + uint64_t channel_id_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_id_var); - channel_id_ref = (uintptr_t)channel_id_var.inner; - if (channel_id_var.is_owned) { - channel_id_ref |= 1; - } + channel_id_ref = tag_ptr(channel_id_var.inner, channel_id_var.is_owned); LDKChannelMonitorUpdate update_var = *update; - uint32_t update_ref = 0; - if ((uintptr_t)update_var.inner > 4096) { - update_var = ChannelMonitorUpdate_clone(&update_var); - 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. + uint64_t update_ref = 0; + update_var = ChannelMonitorUpdate_clone(&update_var); CHECK_INNER_FIELD_ACCESS_OR_NULL(update_var); - update_ref = (uintptr_t)update_var.inner; - if (update_var.is_owned) { - update_ref |= 1; - } - } + update_ref = tag_ptr(update_var.inner, update_var.is_owned); LDKChannelMonitor data_var = *data; - uint32_t data_ref = 0; + uint64_t data_ref = 0; data_var = ChannelMonitor_clone(&data_var); - 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 = (uintptr_t)data_var.inner; - if (data_var.is_owned) { - data_ref |= 1; - } + data_ref = tag_ptr(data_var.inner, data_var.is_owned); LDKMonitorUpdateId update_id_var = update_id; - uint32_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. + uint64_t update_id_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(update_id_var); - 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_uuuuuu(j_calls->instance_ptr, 54, (uint32_t)channel_id_ref, (uint32_t)update_ref, (uint32_t)data_ref, (uint32_t)update_id_ref, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + update_id_ref = tag_ptr(update_id_var.inner, update_id_var.is_owned); + uint32_t ret = js_invoke_function_bbbbuu(j_calls->instance_ptr, 54, channel_id_ref, update_ref, data_ref, update_id_ref, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_NoneChannelMonitorUpdateErrZ ret_conv = *(LDKCResult_NoneChannelMonitorUpdateErrZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } static void LDKPersist_JCalls_cloned(LDKPersist* new_obj) { @@ -9394,59 +8268,62 @@ static inline LDKPersist LDKPersist_init (JSValue o) { }; return ret; } -long __attribute__((export_name("TS_LDKPersist_new"))) TS_LDKPersist_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKPersist_new"))) TS_LDKPersist_new(JSValue o) { LDKPersist *res_ptr = MALLOC(sizeof(LDKPersist), "LDKPersist"); *res_ptr = LDKPersist_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_Persist_persist_new_channel"))) TS_Persist_persist_new_channel(uint64_t this_arg, uint64_t channel_id, uint64_t data, uint64_t update_id) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKPersist* this_arg_conv = (LDKPersist*)this_arg_ptr; LDKOutPoint channel_id_conv; - channel_id_conv.inner = (void*)(channel_id & (~1)); - channel_id_conv.is_owned = (channel_id & 1) || (channel_id == 0); + channel_id_conv.inner = untag_ptr(channel_id); + channel_id_conv.is_owned = ptr_is_owned(channel_id); CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_id_conv); channel_id_conv = OutPoint_clone(&channel_id_conv); LDKChannelMonitor data_conv; - data_conv.inner = (void*)(data & (~1)); - data_conv.is_owned = false; + data_conv.inner = untag_ptr(data); + data_conv.is_owned = ptr_is_owned(data); CHECK_INNER_FIELD_ACCESS_OR_NULL(data_conv); + data_conv.is_owned = false; LDKMonitorUpdateId update_id_conv; - update_id_conv.inner = (void*)(update_id & (~1)); - update_id_conv.is_owned = (update_id & 1) || (update_id == 0); + update_id_conv.inner = untag_ptr(update_id); + update_id_conv.is_owned = ptr_is_owned(update_id); CHECK_INNER_FIELD_ACCESS_OR_NULL(update_id_conv); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_Persist_update_persisted_channel"))) TS_Persist_update_persisted_channel(uint64_t this_arg, uint64_t channel_id, uint64_t update, uint64_t data, uint64_t update_id) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKPersist* this_arg_conv = (LDKPersist*)this_arg_ptr; LDKOutPoint channel_id_conv; - channel_id_conv.inner = (void*)(channel_id & (~1)); - channel_id_conv.is_owned = (channel_id & 1) || (channel_id == 0); + channel_id_conv.inner = untag_ptr(channel_id); + channel_id_conv.is_owned = ptr_is_owned(channel_id); CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_id_conv); channel_id_conv = OutPoint_clone(&channel_id_conv); LDKChannelMonitorUpdate update_conv; - update_conv.inner = (void*)(update & (~1)); - update_conv.is_owned = false; + update_conv.inner = untag_ptr(update); + update_conv.is_owned = ptr_is_owned(update); CHECK_INNER_FIELD_ACCESS_OR_NULL(update_conv); + update_conv.is_owned = false; LDKChannelMonitor data_conv; - data_conv.inner = (void*)(data & (~1)); - data_conv.is_owned = false; + data_conv.inner = untag_ptr(data); + data_conv.is_owned = ptr_is_owned(data); CHECK_INNER_FIELD_ACCESS_OR_NULL(data_conv); + data_conv.is_owned = false; LDKMonitorUpdateId update_id_conv; - update_id_conv.inner = (void*)(update_id & (~1)); - update_id_conv.is_owned = (update_id & 1) || (update_id == 0); + update_id_conv.inner = untag_ptr(update_id); + update_id_conv.is_owned = ptr_is_owned(update_id); CHECK_INNER_FIELD_ACCESS_OR_NULL(update_id_conv); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } typedef struct LDKChannelMessageHandler_JCalls { @@ -9465,339 +8342,229 @@ void handle_open_channel_LDKChannelMessageHandler_jcall(const void* this_arg, LD 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; - uint32_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. + uint64_t their_features_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(their_features_var); - their_features_ref = (uintptr_t)their_features_var.inner; - if (their_features_var.is_owned) { - their_features_ref |= 1; - } + their_features_ref = tag_ptr(their_features_var.inner, their_features_var.is_owned); LDKOpenChannel msg_var = *msg; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = OpenChannel_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 55, (uint32_t)their_node_id_arr, (uint32_t)their_features_ref, (uint32_t)msg_ref, 0, 0, 0); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + js_invoke_function_ubbuuu(j_calls->instance_ptr, 55, (uint32_t)their_node_id_arr, their_features_ref, msg_ref, 0, 0, 0); } void handle_accept_channel_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, LDKInitFeatures their_features, const LDKAcceptChannel * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; 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; - uint32_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. + uint64_t their_features_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(their_features_var); - their_features_ref = (uintptr_t)their_features_var.inner; - if (their_features_var.is_owned) { - their_features_ref |= 1; - } + their_features_ref = tag_ptr(their_features_var.inner, their_features_var.is_owned); LDKAcceptChannel msg_var = *msg; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = AcceptChannel_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 56, (uint32_t)their_node_id_arr, (uint32_t)their_features_ref, (uint32_t)msg_ref, 0, 0, 0); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + js_invoke_function_ubbuuu(j_calls->instance_ptr, 56, (uint32_t)their_node_id_arr, their_features_ref, msg_ref, 0, 0, 0); } void handle_funding_created_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKFundingCreated * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; 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; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = FundingCreated_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 57, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + js_invoke_function_ubuuuu(j_calls->instance_ptr, 57, (uint32_t)their_node_id_arr, msg_ref, 0, 0, 0, 0); } void handle_funding_signed_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKFundingSigned * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; 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; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = FundingSigned_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 58, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + js_invoke_function_ubuuuu(j_calls->instance_ptr, 58, (uint32_t)their_node_id_arr, msg_ref, 0, 0, 0, 0); } void handle_channel_ready_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKChannelReady * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__); memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33); LDKChannelReady msg_var = *msg; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = ChannelReady_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 59, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + js_invoke_function_ubuuuu(j_calls->instance_ptr, 59, (uint32_t)their_node_id_arr, msg_ref, 0, 0, 0, 0); } void handle_shutdown_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKInitFeatures * their_features, const LDKShutdown * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; 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; - uint32_t their_features_ref = 0; + uint64_t their_features_ref = 0; their_features_var = InitFeatures_clone(&their_features_var); - 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 = (uintptr_t)their_features_var.inner; - if (their_features_var.is_owned) { - their_features_ref |= 1; - } + their_features_ref = tag_ptr(their_features_var.inner, their_features_var.is_owned); LDKShutdown msg_var = *msg; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = Shutdown_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 60, (uint32_t)their_node_id_arr, (uint32_t)their_features_ref, (uint32_t)msg_ref, 0, 0, 0); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + js_invoke_function_ubbuuu(j_calls->instance_ptr, 60, (uint32_t)their_node_id_arr, their_features_ref, msg_ref, 0, 0, 0); } void handle_closing_signed_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKClosingSigned * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; 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; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = ClosingSigned_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 61, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + js_invoke_function_ubuuuu(j_calls->instance_ptr, 61, (uint32_t)their_node_id_arr, msg_ref, 0, 0, 0, 0); } void handle_update_add_htlc_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKUpdateAddHTLC * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; 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; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = UpdateAddHTLC_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 62, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + js_invoke_function_ubuuuu(j_calls->instance_ptr, 62, (uint32_t)their_node_id_arr, msg_ref, 0, 0, 0, 0); } void handle_update_fulfill_htlc_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKUpdateFulfillHTLC * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; 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; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = UpdateFulfillHTLC_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 63, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + js_invoke_function_ubuuuu(j_calls->instance_ptr, 63, (uint32_t)their_node_id_arr, msg_ref, 0, 0, 0, 0); } void handle_update_fail_htlc_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKUpdateFailHTLC * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; 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; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = UpdateFailHTLC_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 64, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + js_invoke_function_ubuuuu(j_calls->instance_ptr, 64, (uint32_t)their_node_id_arr, msg_ref, 0, 0, 0, 0); } void handle_update_fail_malformed_htlc_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKUpdateFailMalformedHTLC * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; 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; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = UpdateFailMalformedHTLC_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 65, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + js_invoke_function_ubuuuu(j_calls->instance_ptr, 65, (uint32_t)their_node_id_arr, msg_ref, 0, 0, 0, 0); } void handle_commitment_signed_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKCommitmentSigned * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; 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; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = CommitmentSigned_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 66, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + js_invoke_function_ubuuuu(j_calls->instance_ptr, 66, (uint32_t)their_node_id_arr, msg_ref, 0, 0, 0, 0); } void handle_revoke_and_ack_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKRevokeAndACK * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; 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; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = RevokeAndACK_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 67, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + js_invoke_function_ubuuuu(j_calls->instance_ptr, 67, (uint32_t)their_node_id_arr, msg_ref, 0, 0, 0, 0); } void handle_update_fee_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKUpdateFee * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; 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; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = UpdateFee_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 68, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + js_invoke_function_ubuuuu(j_calls->instance_ptr, 68, (uint32_t)their_node_id_arr, msg_ref, 0, 0, 0, 0); } void handle_announcement_signatures_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKAnnouncementSignatures * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; 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; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = AnnouncementSignatures_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 69, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + js_invoke_function_ubuuuu(j_calls->instance_ptr, 69, (uint32_t)their_node_id_arr, msg_ref, 0, 0, 0, 0); } void peer_disconnected_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, bool no_connection_possible) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__); memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33); jboolean no_connection_possible_conv = no_connection_possible; - js_invoke_function_uuuuuu(j_calls->instance_ptr, 70, (uint32_t)their_node_id_arr, (uint32_t)no_connection_possible_conv, 0, 0, 0, 0); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 70, (uint32_t)their_node_id_arr, no_connection_possible_conv, 0, 0, 0, 0); } void peer_connected_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKInit * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; 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; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = Init_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 71, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + js_invoke_function_ubuuuu(j_calls->instance_ptr, 71, (uint32_t)their_node_id_arr, msg_ref, 0, 0, 0, 0); } void handle_channel_reestablish_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKChannelReestablish * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; 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; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = ChannelReestablish_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 72, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + js_invoke_function_ubuuuu(j_calls->instance_ptr, 72, (uint32_t)their_node_id_arr, msg_ref, 0, 0, 0, 0); } void handle_channel_update_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKChannelUpdate * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; 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; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = ChannelUpdate_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 73, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + js_invoke_function_ubuuuu(j_calls->instance_ptr, 73, (uint32_t)their_node_id_arr, msg_ref, 0, 0, 0, 0); } void handle_error_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKErrorMessage * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; 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; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = ErrorMessage_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 74, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + js_invoke_function_ubuuuu(j_calls->instance_ptr, 74, (uint32_t)their_node_id_arr, msg_ref, 0, 0, 0, 0); } static void LDKChannelMessageHandler_JCalls_cloned(LDKChannelMessageHandler* new_obj) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) new_obj->this_arg; @@ -9837,238 +8604,254 @@ static inline LDKChannelMessageHandler LDKChannelMessageHandler_init (JSValue o, calls->MessageSendEventsProvider = ret.MessageSendEventsProvider.this_arg; return ret; } -long __attribute__((export_name("TS_LDKChannelMessageHandler_new"))) TS_LDKChannelMessageHandler_new(JSValue o, JSValue MessageSendEventsProvider) { +uint64_t __attribute__((export_name("TS_LDKChannelMessageHandler_new"))) TS_LDKChannelMessageHandler_new(JSValue o, JSValue MessageSendEventsProvider) { LDKChannelMessageHandler *res_ptr = MALLOC(sizeof(LDKChannelMessageHandler), "LDKChannelMessageHandler"); *res_ptr = LDKChannelMessageHandler_init(o, MessageSendEventsProvider); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_ChannelMessageHandler_handle_open_channel"))) TS_ChannelMessageHandler_handle_open_channel(uint64_t this_arg, int8_tArray their_node_id, uint64_t their_features, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); 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); + their_features_conv.inner = untag_ptr(their_features); + their_features_conv.is_owned = ptr_is_owned(their_features); CHECK_INNER_FIELD_ACCESS_OR_NULL(their_features_conv); their_features_conv = InitFeatures_clone(&their_features_conv); LDKOpenChannel msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; (this_arg_conv->handle_open_channel)(this_arg_conv->this_arg, their_node_id_ref, their_features_conv, &msg_conv); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_ChannelMessageHandler_handle_accept_channel"))) TS_ChannelMessageHandler_handle_accept_channel(uint64_t this_arg, int8_tArray their_node_id, uint64_t their_features, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); 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); + their_features_conv.inner = untag_ptr(their_features); + their_features_conv.is_owned = ptr_is_owned(their_features); CHECK_INNER_FIELD_ACCESS_OR_NULL(their_features_conv); their_features_conv = InitFeatures_clone(&their_features_conv); LDKAcceptChannel msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; (this_arg_conv->handle_accept_channel)(this_arg_conv->this_arg, their_node_id_ref, their_features_conv, &msg_conv); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_ChannelMessageHandler_handle_funding_created"))) TS_ChannelMessageHandler_handle_funding_created(uint64_t this_arg, int8_tArray their_node_id, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKFundingCreated msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; (this_arg_conv->handle_funding_created)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_ChannelMessageHandler_handle_funding_signed"))) TS_ChannelMessageHandler_handle_funding_signed(uint64_t this_arg, int8_tArray their_node_id, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKFundingSigned msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; (this_arg_conv->handle_funding_signed)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv); } -void __attribute__((export_name("TS_ChannelMessageHandler_handle_channel_ready"))) TS_ChannelMessageHandler_handle_channel_ready(uint32_t this_arg, int8_tArray their_node_id, uint32_t msg) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_ChannelMessageHandler_handle_channel_ready"))) TS_ChannelMessageHandler_handle_channel_ready(uint64_t this_arg, int8_tArray their_node_id, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKChannelReady msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; (this_arg_conv->handle_channel_ready)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_ChannelMessageHandler_handle_shutdown"))) TS_ChannelMessageHandler_handle_shutdown(uint64_t this_arg, int8_tArray their_node_id, uint64_t their_features, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKInitFeatures their_features_conv; - their_features_conv.inner = (void*)(their_features & (~1)); - their_features_conv.is_owned = false; + their_features_conv.inner = untag_ptr(their_features); + their_features_conv.is_owned = ptr_is_owned(their_features); CHECK_INNER_FIELD_ACCESS_OR_NULL(their_features_conv); + their_features_conv.is_owned = false; LDKShutdown msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; (this_arg_conv->handle_shutdown)(this_arg_conv->this_arg, their_node_id_ref, &their_features_conv, &msg_conv); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_ChannelMessageHandler_handle_closing_signed"))) TS_ChannelMessageHandler_handle_closing_signed(uint64_t this_arg, int8_tArray their_node_id, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKClosingSigned msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; (this_arg_conv->handle_closing_signed)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_ChannelMessageHandler_handle_update_add_htlc"))) TS_ChannelMessageHandler_handle_update_add_htlc(uint64_t this_arg, int8_tArray their_node_id, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKUpdateAddHTLC msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; (this_arg_conv->handle_update_add_htlc)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_ChannelMessageHandler_handle_update_fulfill_htlc"))) TS_ChannelMessageHandler_handle_update_fulfill_htlc(uint64_t this_arg, int8_tArray their_node_id, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKUpdateFulfillHTLC msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; (this_arg_conv->handle_update_fulfill_htlc)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_ChannelMessageHandler_handle_update_fail_htlc"))) TS_ChannelMessageHandler_handle_update_fail_htlc(uint64_t this_arg, int8_tArray their_node_id, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKUpdateFailHTLC msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; (this_arg_conv->handle_update_fail_htlc)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_ChannelMessageHandler_handle_update_fail_malformed_htlc"))) TS_ChannelMessageHandler_handle_update_fail_malformed_htlc(uint64_t this_arg, int8_tArray their_node_id, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKUpdateFailMalformedHTLC msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; (this_arg_conv->handle_update_fail_malformed_htlc)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_ChannelMessageHandler_handle_commitment_signed"))) TS_ChannelMessageHandler_handle_commitment_signed(uint64_t this_arg, int8_tArray their_node_id, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKCommitmentSigned msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; (this_arg_conv->handle_commitment_signed)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_ChannelMessageHandler_handle_revoke_and_ack"))) TS_ChannelMessageHandler_handle_revoke_and_ack(uint64_t this_arg, int8_tArray their_node_id, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKRevokeAndACK msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; (this_arg_conv->handle_revoke_and_ack)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_ChannelMessageHandler_handle_update_fee"))) TS_ChannelMessageHandler_handle_update_fee(uint64_t this_arg, int8_tArray their_node_id, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKUpdateFee msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; (this_arg_conv->handle_update_fee)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_ChannelMessageHandler_handle_announcement_signatures"))) TS_ChannelMessageHandler_handle_announcement_signatures(uint64_t this_arg, int8_tArray their_node_id, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKAnnouncementSignatures msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; (this_arg_conv->handle_announcement_signatures)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_ChannelMessageHandler_peer_disconnected"))) TS_ChannelMessageHandler_peer_disconnected(uint64_t this_arg, int8_tArray their_node_id, jboolean no_connection_possible) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); @@ -10076,59 +8859,63 @@ void __attribute__((export_name("TS_ChannelMessageHandler_peer_disconnected"))) (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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_ChannelMessageHandler_peer_connected"))) TS_ChannelMessageHandler_peer_connected(uint64_t this_arg, int8_tArray their_node_id, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKInit msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; (this_arg_conv->peer_connected)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_ChannelMessageHandler_handle_channel_reestablish"))) TS_ChannelMessageHandler_handle_channel_reestablish(uint64_t this_arg, int8_tArray their_node_id, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKChannelReestablish msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; (this_arg_conv->handle_channel_reestablish)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_ChannelMessageHandler_handle_channel_update"))) TS_ChannelMessageHandler_handle_channel_update(uint64_t this_arg, int8_tArray their_node_id, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKChannelUpdate msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; (this_arg_conv->handle_channel_update)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_ChannelMessageHandler_handle_error"))) TS_ChannelMessageHandler_handle_error(uint64_t this_arg, int8_tArray their_node_id, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKErrorMessage msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; (this_arg_conv->handle_error)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv); } @@ -10146,78 +8933,63 @@ 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; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = NodeAnnouncement_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 75, (uint32_t)msg_ref, 0, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + uint32_t ret = js_invoke_function_buuuuu(j_calls->instance_ptr, 75, msg_ref, 0, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_boolLightningErrorZ ret_conv = *(LDKCResult_boolLightningErrorZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } 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; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = ChannelAnnouncement_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 76, (uint32_t)msg_ref, 0, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + uint32_t ret = js_invoke_function_buuuuu(j_calls->instance_ptr, 76, msg_ref, 0, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_boolLightningErrorZ ret_conv = *(LDKCResult_boolLightningErrorZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } 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; - uint32_t msg_ref = 0; + uint64_t msg_ref = 0; msg_var = ChannelUpdate_clone(&msg_var); - 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 = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 77, (uint32_t)msg_ref, 0, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + uint32_t ret = js_invoke_function_buuuuu(j_calls->instance_ptr, 77, msg_ref, 0, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_boolLightningErrorZ ret_conv = *(LDKCResult_boolLightningErrorZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ get_next_channel_announcements_LDKRoutingMessageHandler_jcall(const void* this_arg, uint64_t starting_point, uint8_t batch_amount) { LDKRoutingMessageHandler_JCalls *j_calls = (LDKRoutingMessageHandler_JCalls*) this_arg; int64_t starting_point_conv = starting_point; int8_t batch_amount_conv = batch_amount; - uint32_tArray ret = (uint32_tArray)js_invoke_function_buuuuu(j_calls->instance_ptr, 78, (uint32_t)starting_point_conv, (uint32_t)batch_amount_conv, 0, 0, 0, 0); + uint64_tArray ret = (uint64_tArray)js_invoke_function_buuuuu(j_calls->instance_ptr, 78, starting_point_conv, batch_amount_conv, 0, 0, 0, 0); LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ ret_constr; ret_constr.datalen = ret->arr_len; if (ret_constr.datalen > 0) ret_constr.data = MALLOC(ret_constr.datalen * sizeof(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ), "LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ Elements"); else ret_constr.data = NULL; - uint32_t* ret_vals = ret->elems; + uint64_t* ret_vals = ret->elems; for (size_t h = 0; h < ret_constr.datalen; h++) { - uint32_t ret_conv_59 = ret_vals[h]; - void* ret_conv_59_ptr = (void*)(((uintptr_t)ret_conv_59) & ~1); + uint64_t ret_conv_59 = ret_vals[h]; + void* ret_conv_59_ptr = untag_ptr(ret_conv_59); CHECK_ACCESS(ret_conv_59_ptr); LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ ret_conv_59_conv = *(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(ret_conv_59_ptr); - FREE((void*)ret_conv_59); + FREE(untag_ptr(ret_conv_59)); ret_constr.data[h] = ret_conv_59_conv; } FREE(ret); @@ -10228,19 +9000,19 @@ LDKCVec_NodeAnnouncementZ get_next_node_announcements_LDKRoutingMessageHandler_j int8_tArray starting_point_arr = init_int8_tArray(33, __LINE__); memcpy(starting_point_arr->elems, starting_point.compressed_form, 33); int8_t batch_amount_conv = batch_amount; - uint32_tArray ret = (uint32_tArray)js_invoke_function_uuuuuu(j_calls->instance_ptr, 79, (uint32_t)starting_point_arr, (uint32_t)batch_amount_conv, 0, 0, 0, 0); + uint64_tArray ret = (uint64_tArray)js_invoke_function_uuuuuu(j_calls->instance_ptr, 79, (uint32_t)starting_point_arr, batch_amount_conv, 0, 0, 0, 0); LDKCVec_NodeAnnouncementZ ret_constr; ret_constr.datalen = ret->arr_len; if (ret_constr.datalen > 0) ret_constr.data = MALLOC(ret_constr.datalen * sizeof(LDKNodeAnnouncement), "LDKCVec_NodeAnnouncementZ Elements"); else ret_constr.data = NULL; - uint32_t* ret_vals = ret->elems; + uint64_t* ret_vals = ret->elems; for (size_t s = 0; s < ret_constr.datalen; s++) { - uint32_t ret_conv_18 = ret_vals[s]; + uint64_t ret_conv_18 = ret_vals[s]; LDKNodeAnnouncement ret_conv_18_conv; - ret_conv_18_conv.inner = (void*)(ret_conv_18 & (~1)); - ret_conv_18_conv.is_owned = (ret_conv_18 & 1) || (ret_conv_18 == 0); + ret_conv_18_conv.inner = untag_ptr(ret_conv_18); + ret_conv_18_conv.is_owned = ptr_is_owned(ret_conv_18); CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_18_conv); ret_constr.data[s] = ret_conv_18_conv; } @@ -10252,35 +9024,25 @@ void peer_connected_LDKRoutingMessageHandler_jcall(const void* this_arg, LDKPubl 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; - uint32_t init_ref = 0; + uint64_t init_ref = 0; init_var = Init_clone(&init_var); - 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 = (uintptr_t)init_var.inner; - if (init_var.is_owned) { - init_ref |= 1; - } - js_invoke_function_uuuuuu(j_calls->instance_ptr, 80, (uint32_t)their_node_id_arr, (uint32_t)init_ref, 0, 0, 0, 0); + init_ref = tag_ptr(init_var.inner, init_var.is_owned); + js_invoke_function_ubuuuu(j_calls->instance_ptr, 80, (uint32_t)their_node_id_arr, init_ref, 0, 0, 0, 0); } LDKCResult_NoneLightningErrorZ handle_reply_channel_range_LDKRoutingMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, LDKReplyChannelRange msg) { LDKRoutingMessageHandler_JCalls *j_calls = (LDKRoutingMessageHandler_JCalls*) this_arg; 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; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 81, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + uint32_t ret = js_invoke_function_ubuuuu(j_calls->instance_ptr, 81, (uint32_t)their_node_id_arr, msg_ref, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_NoneLightningErrorZ ret_conv = *(LDKCResult_NoneLightningErrorZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } LDKCResult_NoneLightningErrorZ handle_reply_short_channel_ids_end_LDKRoutingMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, LDKReplyShortChannelIdsEnd msg) { @@ -10288,19 +9050,14 @@ LDKCResult_NoneLightningErrorZ handle_reply_short_channel_ids_end_LDKRoutingMess 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; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 82, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + uint32_t ret = js_invoke_function_ubuuuu(j_calls->instance_ptr, 82, (uint32_t)their_node_id_arr, msg_ref, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_NoneLightningErrorZ ret_conv = *(LDKCResult_NoneLightningErrorZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } LDKCResult_NoneLightningErrorZ handle_query_channel_range_LDKRoutingMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, LDKQueryChannelRange msg) { @@ -10308,19 +9065,14 @@ LDKCResult_NoneLightningErrorZ handle_query_channel_range_LDKRoutingMessageHandl 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; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 83, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + uint32_t ret = js_invoke_function_ubuuuu(j_calls->instance_ptr, 83, (uint32_t)their_node_id_arr, msg_ref, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_NoneLightningErrorZ ret_conv = *(LDKCResult_NoneLightningErrorZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } LDKCResult_NoneLightningErrorZ handle_query_short_channel_ids_LDKRoutingMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, LDKQueryShortChannelIds msg) { @@ -10328,19 +9080,14 @@ LDKCResult_NoneLightningErrorZ handle_query_short_channel_ids_LDKRoutingMessageH 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; - uint32_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. + uint64_t msg_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uintptr_t)msg_var.inner; - if (msg_var.is_owned) { - msg_ref |= 1; - } - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 84, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + msg_ref = tag_ptr(msg_var.inner, msg_var.is_owned); + uint32_t ret = js_invoke_function_ubuuuu(j_calls->instance_ptr, 84, (uint32_t)their_node_id_arr, msg_ref, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_NoneLightningErrorZ ret_conv = *(LDKCResult_NoneLightningErrorZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } static void LDKRoutingMessageHandler_JCalls_cloned(LDKRoutingMessageHandler* new_obj) { @@ -10371,89 +9118,87 @@ static inline LDKRoutingMessageHandler LDKRoutingMessageHandler_init (JSValue o, calls->MessageSendEventsProvider = ret.MessageSendEventsProvider.this_arg; return ret; } -long __attribute__((export_name("TS_LDKRoutingMessageHandler_new"))) TS_LDKRoutingMessageHandler_new(JSValue o, JSValue MessageSendEventsProvider) { +uint64_t __attribute__((export_name("TS_LDKRoutingMessageHandler_new"))) TS_LDKRoutingMessageHandler_new(JSValue o, JSValue MessageSendEventsProvider) { LDKRoutingMessageHandler *res_ptr = MALLOC(sizeof(LDKRoutingMessageHandler), "LDKRoutingMessageHandler"); *res_ptr = LDKRoutingMessageHandler_init(o, MessageSendEventsProvider); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_RoutingMessageHandler_handle_node_announcement"))) TS_RoutingMessageHandler_handle_node_announcement(uint64_t this_arg, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKRoutingMessageHandler* this_arg_conv = (LDKRoutingMessageHandler*)this_arg_ptr; LDKNodeAnnouncement msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_RoutingMessageHandler_handle_channel_announcement"))) TS_RoutingMessageHandler_handle_channel_announcement(uint64_t this_arg, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKRoutingMessageHandler* this_arg_conv = (LDKRoutingMessageHandler*)this_arg_ptr; LDKChannelAnnouncement msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_RoutingMessageHandler_handle_channel_update"))) TS_RoutingMessageHandler_handle_channel_update(uint64_t this_arg, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKRoutingMessageHandler* this_arg_conv = (LDKRoutingMessageHandler*)this_arg_ptr; LDKChannelUpdate msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_tArray __attribute__((export_name("TS_RoutingMessageHandler_get_next_channel_announcements"))) TS_RoutingMessageHandler_get_next_channel_announcements(uint64_t this_arg, int64_t starting_point, int8_t batch_amount) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t h = 0; h < ret_var.datalen; h++) { LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* ret_conv_59_conv = MALLOC(sizeof(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ), "LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ"); *ret_conv_59_conv = ret_var.data[h]; - ret_arr_ptr[h] = ((uint32_t)ret_conv_59_conv); + ret_arr_ptr[h] = tag_ptr(ret_conv_59_conv, true); } FREE(ret_var.data); return ret_arr; } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_tArray __attribute__((export_name("TS_RoutingMessageHandler_get_next_node_announcements"))) TS_RoutingMessageHandler_get_next_node_announcements(uint64_t this_arg, int8_tArray starting_point, int8_t batch_amount) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); 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, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t s = 0; s < ret_var.datalen; s++) { LDKNodeAnnouncement ret_conv_18_var = ret_var.data[s]; - uint32_t ret_conv_18_ref = 0; - 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. + uint64_t ret_conv_18_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_18_var); - ret_conv_18_ref = (uintptr_t)ret_conv_18_var.inner; - if (ret_conv_18_var.is_owned) { - ret_conv_18_ref |= 1; - } + ret_conv_18_ref = tag_ptr(ret_conv_18_var.inner, ret_conv_18_var.is_owned); ret_arr_ptr[s] = ret_conv_18_ref; } @@ -10461,86 +9206,87 @@ uint32_tArray __attribute__((export_name("TS_RoutingMessageHandler_get_next_nod return ret_arr; } -void __attribute__((export_name("TS_RoutingMessageHandler_peer_connected"))) TS_RoutingMessageHandler_peer_connected(uint32_t this_arg, int8_tArray their_node_id, uint32_t init) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_RoutingMessageHandler_peer_connected"))) TS_RoutingMessageHandler_peer_connected(uint64_t this_arg, int8_tArray their_node_id, uint64_t init) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKInit init_conv; - init_conv.inner = (void*)(init & (~1)); - init_conv.is_owned = false; + init_conv.inner = untag_ptr(init); + init_conv.is_owned = ptr_is_owned(init); CHECK_INNER_FIELD_ACCESS_OR_NULL(init_conv); + init_conv.is_owned = false; (this_arg_conv->peer_connected)(this_arg_conv->this_arg, their_node_id_ref, &init_conv); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_RoutingMessageHandler_handle_reply_channel_range"))) TS_RoutingMessageHandler_handle_reply_channel_range(uint64_t this_arg, int8_tArray their_node_id, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKReplyChannelRange msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = (msg & 1) || (msg == 0); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = ReplyChannelRange_clone(&msg_conv); LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = (this_arg_conv->handle_reply_channel_range)(this_arg_conv->this_arg, their_node_id_ref, msg_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_RoutingMessageHandler_handle_reply_short_channel_ids_end"))) TS_RoutingMessageHandler_handle_reply_short_channel_ids_end(uint64_t this_arg, int8_tArray their_node_id, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKReplyShortChannelIdsEnd msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = (msg & 1) || (msg == 0); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = ReplyShortChannelIdsEnd_clone(&msg_conv); LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = (this_arg_conv->handle_reply_short_channel_ids_end)(this_arg_conv->this_arg, their_node_id_ref, msg_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_RoutingMessageHandler_handle_query_channel_range"))) TS_RoutingMessageHandler_handle_query_channel_range(uint64_t this_arg, int8_tArray their_node_id, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKQueryChannelRange msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = (msg & 1) || (msg == 0); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = QueryChannelRange_clone(&msg_conv); LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = (this_arg_conv->handle_query_channel_range)(this_arg_conv->this_arg, their_node_id_ref, msg_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_RoutingMessageHandler_handle_query_short_channel_ids"))) TS_RoutingMessageHandler_handle_query_short_channel_ids(uint64_t this_arg, int8_tArray their_node_id, uint64_t msg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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); FREE(their_node_id); LDKQueryShortChannelIds msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = (msg & 1) || (msg == 0); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = QueryShortChannelIds_clone(&msg_conv); LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = (this_arg_conv->handle_query_short_channel_ids)(this_arg_conv->this_arg, their_node_id_ref, msg_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } typedef struct LDKCustomMessageReader_JCalls { @@ -10559,11 +9305,11 @@ LDKCResult_COption_TypeZDecodeErrorZ read_LDKCustomMessageReader_jcall(const voi LDKu8slice buffer_var = buffer; int8_tArray buffer_arr = init_int8_tArray(buffer_var.datalen, __LINE__); memcpy(buffer_arr->elems, buffer_var.data, buffer_var.datalen); - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 85, (uint32_t)message_type_conv, (uint32_t)buffer_arr, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 85, message_type_conv, (uint32_t)buffer_arr, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_COption_TypeZDecodeErrorZ ret_conv = *(LDKCResult_COption_TypeZDecodeErrorZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } static void LDKCustomMessageReader_JCalls_cloned(LDKCustomMessageReader* new_obj) { @@ -10582,14 +9328,14 @@ static inline LDKCustomMessageReader LDKCustomMessageReader_init (JSValue o) { }; return ret; } -long __attribute__((export_name("TS_LDKCustomMessageReader_new"))) TS_LDKCustomMessageReader_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKCustomMessageReader_new"))) TS_LDKCustomMessageReader_new(JSValue o) { LDKCustomMessageReader *res_ptr = MALLOC(sizeof(LDKCustomMessageReader), "LDKCustomMessageReader"); *res_ptr = LDKCustomMessageReader_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_CustomMessageReader_read"))) TS_CustomMessageReader_read(uint64_t this_arg, int16_t message_type, int8_tArray buffer) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKCustomMessageReader* this_arg_conv = (LDKCustomMessageReader*)this_arg_ptr; LDKu8slice buffer_ref; buffer_ref.datalen = buffer->arr_len; @@ -10597,7 +9343,7 @@ uint32_t __attribute__((export_name("TS_CustomMessageReader_read"))) TS_CustomM LDKCResult_COption_TypeZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_TypeZDecodeErrorZ), "LDKCResult_COption_TypeZDecodeErrorZ"); *ret_conv = (this_arg_conv->read)(this_arg_conv->this_arg, message_type, buffer_ref); FREE(buffer); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } typedef struct LDKCustomMessageHandler_JCalls { @@ -10617,29 +9363,29 @@ LDKCResult_NoneLightningErrorZ handle_custom_message_LDKCustomMessageHandler_jca *msg_ret = msg; int8_tArray sender_node_id_arr = init_int8_tArray(33, __LINE__); memcpy(sender_node_id_arr->elems, sender_node_id.compressed_form, 33); - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 86, (uint32_t)(uint32_t)msg_ret, (uint32_t)sender_node_id_arr, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + uint32_t ret = js_invoke_function_buuuuu(j_calls->instance_ptr, 86, tag_ptr(msg_ret, true), (uint32_t)sender_node_id_arr, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_NoneLightningErrorZ ret_conv = *(LDKCResult_NoneLightningErrorZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } LDKCVec_C2Tuple_PublicKeyTypeZZ get_and_clear_pending_msg_LDKCustomMessageHandler_jcall(const void* this_arg) { LDKCustomMessageHandler_JCalls *j_calls = (LDKCustomMessageHandler_JCalls*) this_arg; - uint32_tArray ret = (uint32_tArray)js_invoke_function_uuuuuu(j_calls->instance_ptr, 87, 0, 0, 0, 0, 0, 0); + uint64_tArray ret = (uint64_tArray)js_invoke_function_uuuuuu(j_calls->instance_ptr, 87, 0, 0, 0, 0, 0, 0); LDKCVec_C2Tuple_PublicKeyTypeZZ ret_constr; ret_constr.datalen = ret->arr_len; if (ret_constr.datalen > 0) ret_constr.data = MALLOC(ret_constr.datalen * sizeof(LDKC2Tuple_PublicKeyTypeZ), "LDKCVec_C2Tuple_PublicKeyTypeZZ Elements"); else ret_constr.data = NULL; - uint32_t* ret_vals = ret->elems; + uint64_t* ret_vals = ret->elems; for (size_t z = 0; z < ret_constr.datalen; z++) { - uint32_t ret_conv_25 = ret_vals[z]; - void* ret_conv_25_ptr = (void*)(((uintptr_t)ret_conv_25) & ~1); + uint64_t ret_conv_25 = ret_vals[z]; + void* ret_conv_25_ptr = untag_ptr(ret_conv_25); CHECK_ACCESS(ret_conv_25_ptr); LDKC2Tuple_PublicKeyTypeZ ret_conv_25_conv = *(LDKC2Tuple_PublicKeyTypeZ*)(ret_conv_25_ptr); - FREE((void*)ret_conv_25); + FREE(untag_ptr(ret_conv_25)); ret_constr.data[z] = ret_conv_25_conv; } FREE(ret); @@ -10665,16 +9411,16 @@ static inline LDKCustomMessageHandler LDKCustomMessageHandler_init (JSValue o, J calls->CustomMessageReader = ret.CustomMessageReader.this_arg; return ret; } -long __attribute__((export_name("TS_LDKCustomMessageHandler_new"))) TS_LDKCustomMessageHandler_new(JSValue o, JSValue CustomMessageReader) { +uint64_t __attribute__((export_name("TS_LDKCustomMessageHandler_new"))) TS_LDKCustomMessageHandler_new(JSValue o, JSValue CustomMessageReader) { LDKCustomMessageHandler *res_ptr = MALLOC(sizeof(LDKCustomMessageHandler), "LDKCustomMessageHandler"); *res_ptr = LDKCustomMessageHandler_init(o, CustomMessageReader); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_CustomMessageHandler_handle_custom_message"))) TS_CustomMessageHandler_handle_custom_message(uint64_t this_arg, uint64_t msg, int8_tArray sender_node_id) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKCustomMessageHandler* this_arg_conv = (LDKCustomMessageHandler*)this_arg_ptr; - void* msg_ptr = (void*)(((uintptr_t)msg) & ~1); + void* msg_ptr = untag_ptr(msg); CHECK_ACCESS(msg_ptr); LDKType msg_conv = *(LDKType*)(msg_ptr); if (msg_conv.free == LDKType_JCalls_free) { @@ -10686,21 +9432,21 @@ uint32_t __attribute__((export_name("TS_CustomMessageHandler_handle_custom_mess 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_tArray __attribute__((export_name("TS_CustomMessageHandler_get_and_clear_pending_msg"))) TS_CustomMessageHandler_get_and_clear_pending_msg(uint64_t this_arg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t z = 0; z < ret_var.datalen; z++) { LDKC2Tuple_PublicKeyTypeZ* ret_conv_25_conv = MALLOC(sizeof(LDKC2Tuple_PublicKeyTypeZ), "LDKC2Tuple_PublicKeyTypeZ"); *ret_conv_25_conv = ret_var.data[z]; - ret_arr_ptr[z] = ((uint32_t)ret_conv_25_conv); + ret_arr_ptr[z] = tag_ptr(ret_conv_25_conv, true); } FREE(ret_var.data); @@ -10723,7 +9469,7 @@ uintptr_t send_data_LDKSocketDescriptor_jcall(void* this_arg, LDKu8slice data, b int8_tArray data_arr = init_int8_tArray(data_var.datalen, __LINE__); memcpy(data_arr->elems, data_var.data, data_var.datalen); jboolean resume_read_conv = resume_read; - return js_invoke_function_uuuuuu(j_calls->instance_ptr, 88, (uint32_t)data_arr, (uint32_t)resume_read_conv, 0, 0, 0, 0); + return js_invoke_function_uuuuuu(j_calls->instance_ptr, 88, (uint32_t)data_arr, resume_read_conv, 0, 0, 0, 0); } void disconnect_socket_LDKSocketDescriptor_jcall(void* this_arg) { LDKSocketDescriptor_JCalls *j_calls = (LDKSocketDescriptor_JCalls*) this_arg; @@ -10733,7 +9479,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_uuuuuu(j_calls->instance_ptr, 90, (uint32_t)(uint32_t)other_arg_clone, 0, 0, 0, 0, 0); + return js_invoke_function_buuuuu(j_calls->instance_ptr, 90, tag_ptr(other_arg_clone, true), 0, 0, 0, 0, 0); } uint64_t hash_LDKSocketDescriptor_jcall(const void* this_arg) { LDKSocketDescriptor_JCalls *j_calls = (LDKSocketDescriptor_JCalls*) this_arg; @@ -10759,14 +9505,14 @@ static inline LDKSocketDescriptor LDKSocketDescriptor_init (JSValue o) { }; return ret; } -long __attribute__((export_name("TS_LDKSocketDescriptor_new"))) TS_LDKSocketDescriptor_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKSocketDescriptor_new"))) TS_LDKSocketDescriptor_new(JSValue o) { LDKSocketDescriptor *res_ptr = MALLOC(sizeof(LDKSocketDescriptor), "LDKSocketDescriptor"); *res_ptr = LDKSocketDescriptor_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -uint32_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); } +uint32_t __attribute__((export_name("TS_SocketDescriptor_send_data"))) TS_SocketDescriptor_send_data(uint64_t this_arg, int8_tArray data, jboolean resume_read) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKSocketDescriptor* this_arg_conv = (LDKSocketDescriptor*)this_arg_ptr; LDKu8slice data_ref; data_ref.datalen = data->arr_len; @@ -10776,23 +9522,23 @@ uint32_t __attribute__((export_name("TS_SocketDescriptor_send_data"))) TS_Socke return ret_conv; } -void __attribute__((export_name("TS_SocketDescriptor_disconnect_socket"))) TS_SocketDescriptor_disconnect_socket(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_SocketDescriptor_disconnect_socket"))) TS_SocketDescriptor_disconnect_socket(uint64_t this_arg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +int64_t __attribute__((export_name("TS_SocketDescriptor_hash"))) TS_SocketDescriptor_hash(uint64_t this_arg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKSocketDescriptor* this_arg_conv = (LDKSocketDescriptor*)this_arg_ptr; int64_t ret_conv = (this_arg_conv->hash)(this_arg_conv->this_arg); return ret_conv; } -uint32_t __attribute__((export_name("TS_LDKEffectiveCapacity_ty_from_ptr"))) TS_LDKEffectiveCapacity_ty_from_ptr(uint32_t ptr) { - LDKEffectiveCapacity *obj = (LDKEffectiveCapacity*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKEffectiveCapacity_ty_from_ptr"))) TS_LDKEffectiveCapacity_ty_from_ptr(uint64_t ptr) { + LDKEffectiveCapacity *obj = (LDKEffectiveCapacity*)untag_ptr(ptr); switch(obj->tag) { case LDKEffectiveCapacity_ExactLiquidity: return 0; case LDKEffectiveCapacity_MaximumHTLC: return 1; @@ -10802,28 +9548,28 @@ uint32_t __attribute__((export_name("TS_LDKEffectiveCapacity_ty_from_ptr"))) TS_ default: abort(); } } -int64_t __attribute__((export_name("TS_LDKEffectiveCapacity_ExactLiquidity_get_liquidity_msat"))) TS_LDKEffectiveCapacity_ExactLiquidity_get_liquidity_msat(uint32_t ptr) { - LDKEffectiveCapacity *obj = (LDKEffectiveCapacity*)(ptr & ~1); +int64_t __attribute__((export_name("TS_LDKEffectiveCapacity_ExactLiquidity_get_liquidity_msat"))) TS_LDKEffectiveCapacity_ExactLiquidity_get_liquidity_msat(uint64_t ptr) { + LDKEffectiveCapacity *obj = (LDKEffectiveCapacity*)untag_ptr(ptr); assert(obj->tag == LDKEffectiveCapacity_ExactLiquidity); int64_t liquidity_msat_conv = obj->exact_liquidity.liquidity_msat; return liquidity_msat_conv; } -int64_t __attribute__((export_name("TS_LDKEffectiveCapacity_MaximumHTLC_get_amount_msat"))) TS_LDKEffectiveCapacity_MaximumHTLC_get_amount_msat(uint32_t ptr) { - LDKEffectiveCapacity *obj = (LDKEffectiveCapacity*)(ptr & ~1); +int64_t __attribute__((export_name("TS_LDKEffectiveCapacity_MaximumHTLC_get_amount_msat"))) TS_LDKEffectiveCapacity_MaximumHTLC_get_amount_msat(uint64_t ptr) { + LDKEffectiveCapacity *obj = (LDKEffectiveCapacity*)untag_ptr(ptr); assert(obj->tag == LDKEffectiveCapacity_MaximumHTLC); int64_t amount_msat_conv = obj->maximum_htlc.amount_msat; return amount_msat_conv; } -int64_t __attribute__((export_name("TS_LDKEffectiveCapacity_Total_get_capacity_msat"))) TS_LDKEffectiveCapacity_Total_get_capacity_msat(uint32_t ptr) { - LDKEffectiveCapacity *obj = (LDKEffectiveCapacity*)(ptr & ~1); +int64_t __attribute__((export_name("TS_LDKEffectiveCapacity_Total_get_capacity_msat"))) TS_LDKEffectiveCapacity_Total_get_capacity_msat(uint64_t ptr) { + LDKEffectiveCapacity *obj = (LDKEffectiveCapacity*)untag_ptr(ptr); assert(obj->tag == LDKEffectiveCapacity_Total); int64_t capacity_msat_conv = obj->total.capacity_msat; return capacity_msat_conv; } -uint32_t __attribute__((export_name("TS_LDKEffectiveCapacity_Total_get_htlc_maximum_msat"))) TS_LDKEffectiveCapacity_Total_get_htlc_maximum_msat(uint32_t ptr) { - LDKEffectiveCapacity *obj = (LDKEffectiveCapacity*)(ptr & ~1); +uint64_t __attribute__((export_name("TS_LDKEffectiveCapacity_Total_get_htlc_maximum_msat"))) TS_LDKEffectiveCapacity_Total_get_htlc_maximum_msat(uint64_t ptr) { + LDKEffectiveCapacity *obj = (LDKEffectiveCapacity*)untag_ptr(ptr); assert(obj->tag == LDKEffectiveCapacity_Total); - uint32_t htlc_maximum_msat_ref = ((uintptr_t)&obj->total.htlc_maximum_msat) | 1; + uint64_t htlc_maximum_msat_ref = tag_ptr(&obj->total.htlc_maximum_msat, false); return htlc_maximum_msat_ref; } typedef struct LDKLockableScore_JCalls { @@ -10839,7 +9585,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_uuuuuu(j_calls->instance_ptr, 92, 0, 0, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKScore ret_conv = *(LDKScore*)(ret_ptr); if (ret_conv.free == LDKScore_JCalls_free) { @@ -10865,22 +9611,22 @@ static inline LDKLockableScore LDKLockableScore_init (JSValue o) { }; return ret; } -long __attribute__((export_name("TS_LDKLockableScore_new"))) TS_LDKLockableScore_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKLockableScore_new"))) TS_LDKLockableScore_new(JSValue o) { LDKLockableScore *res_ptr = MALLOC(sizeof(LDKLockableScore), "LDKLockableScore"); *res_ptr = LDKLockableScore_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -uint32_t __attribute__((export_name("TS_LockableScore_lock"))) TS_LockableScore_lock(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_LockableScore_lock"))) TS_LockableScore_lock(uint64_t this_arg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { 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 (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_t __attribute__((export_name("TS_LDKFallback_ty_from_ptr"))) TS_LDKFallback_ty_from_ptr(uint32_t ptr) { - LDKFallback *obj = (LDKFallback*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKFallback_ty_from_ptr"))) TS_LDKFallback_ty_from_ptr(uint64_t ptr) { + LDKFallback *obj = (LDKFallback*)untag_ptr(ptr); switch(obj->tag) { case LDKFallback_SegWitProgram: return 0; case LDKFallback_PubKeyHash: return 1; @@ -10888,29 +9634,29 @@ uint32_t __attribute__((export_name("TS_LDKFallback_ty_from_ptr"))) TS_LDKFallba default: abort(); } } -int8_t __attribute__((export_name("TS_LDKFallback_SegWitProgram_get_version"))) TS_LDKFallback_SegWitProgram_get_version(uint32_t ptr) { - LDKFallback *obj = (LDKFallback*)(ptr & ~1); +int8_t __attribute__((export_name("TS_LDKFallback_SegWitProgram_get_version"))) TS_LDKFallback_SegWitProgram_get_version(uint64_t ptr) { + LDKFallback *obj = (LDKFallback*)untag_ptr(ptr); assert(obj->tag == LDKFallback_SegWitProgram); uint8_t version_val = obj->seg_wit_program.version._0; return version_val; } -int8_tArray __attribute__((export_name("TS_LDKFallback_SegWitProgram_get_program"))) TS_LDKFallback_SegWitProgram_get_program(uint32_t ptr) { - LDKFallback *obj = (LDKFallback*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKFallback_SegWitProgram_get_program"))) TS_LDKFallback_SegWitProgram_get_program(uint64_t ptr) { + LDKFallback *obj = (LDKFallback*)untag_ptr(ptr); assert(obj->tag == LDKFallback_SegWitProgram); LDKCVec_u8Z program_var = obj->seg_wit_program.program; int8_tArray program_arr = init_int8_tArray(program_var.datalen, __LINE__); memcpy(program_arr->elems, program_var.data, program_var.datalen); return program_arr; } -int8_tArray __attribute__((export_name("TS_LDKFallback_PubKeyHash_get_pub_key_hash"))) TS_LDKFallback_PubKeyHash_get_pub_key_hash(uint32_t ptr) { - LDKFallback *obj = (LDKFallback*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKFallback_PubKeyHash_get_pub_key_hash"))) TS_LDKFallback_PubKeyHash_get_pub_key_hash(uint64_t ptr) { + LDKFallback *obj = (LDKFallback*)untag_ptr(ptr); assert(obj->tag == LDKFallback_PubKeyHash); int8_tArray pub_key_hash_arr = init_int8_tArray(20, __LINE__); memcpy(pub_key_hash_arr->elems, obj->pub_key_hash.data, 20); return pub_key_hash_arr; } -int8_tArray __attribute__((export_name("TS_LDKFallback_ScriptHash_get_script_hash"))) TS_LDKFallback_ScriptHash_get_script_hash(uint32_t ptr) { - LDKFallback *obj = (LDKFallback*)(ptr & ~1); +int8_tArray __attribute__((export_name("TS_LDKFallback_ScriptHash_get_script_hash"))) TS_LDKFallback_ScriptHash_get_script_hash(uint64_t ptr) { + LDKFallback *obj = (LDKFallback*)untag_ptr(ptr); assert(obj->tag == LDKFallback_ScriptHash); int8_tArray script_hash_arr = init_int8_tArray(20, __LINE__); memcpy(script_hash_arr->elems, obj->script_hash.data, 20); @@ -10936,19 +9682,19 @@ LDKPublicKey node_id_LDKPayer_jcall(const void* this_arg) { } LDKCVec_ChannelDetailsZ first_hops_LDKPayer_jcall(const void* this_arg) { LDKPayer_JCalls *j_calls = (LDKPayer_JCalls*) this_arg; - uint32_tArray ret = (uint32_tArray)js_invoke_function_uuuuuu(j_calls->instance_ptr, 94, 0, 0, 0, 0, 0, 0); + uint64_tArray ret = (uint64_tArray)js_invoke_function_uuuuuu(j_calls->instance_ptr, 94, 0, 0, 0, 0, 0, 0); LDKCVec_ChannelDetailsZ ret_constr; ret_constr.datalen = ret->arr_len; if (ret_constr.datalen > 0) ret_constr.data = MALLOC(ret_constr.datalen * sizeof(LDKChannelDetails), "LDKCVec_ChannelDetailsZ Elements"); else ret_constr.data = NULL; - uint32_t* ret_vals = ret->elems; + uint64_t* ret_vals = ret->elems; for (size_t q = 0; q < ret_constr.datalen; q++) { - uint32_t ret_conv_16 = ret_vals[q]; + uint64_t ret_conv_16 = ret_vals[q]; LDKChannelDetails ret_conv_16_conv; - ret_conv_16_conv.inner = (void*)(ret_conv_16 & (~1)); - ret_conv_16_conv.is_owned = (ret_conv_16 & 1) || (ret_conv_16 == 0); + ret_conv_16_conv.inner = untag_ptr(ret_conv_16); + ret_conv_16_conv.is_owned = ptr_is_owned(ret_conv_16); CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_16_conv); ret_constr.data[q] = ret_conv_16_conv; } @@ -10958,66 +9704,51 @@ LDKCVec_ChannelDetailsZ first_hops_LDKPayer_jcall(const void* this_arg) { LDKCResult_PaymentIdPaymentSendFailureZ send_payment_LDKPayer_jcall(const void* this_arg, const LDKRoute * route, LDKThirtyTwoBytes payment_hash, LDKThirtyTwoBytes payment_secret) { LDKPayer_JCalls *j_calls = (LDKPayer_JCalls*) this_arg; LDKRoute route_var = *route; - uint32_t route_ref = 0; + uint64_t route_ref = 0; route_var = Route_clone(&route_var); - CHECK((((uintptr_t)route_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&route_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(route_var); - route_ref = (uintptr_t)route_var.inner; - if (route_var.is_owned) { - route_ref |= 1; - } + route_ref = tag_ptr(route_var.inner, route_var.is_owned); int8_tArray payment_hash_arr = init_int8_tArray(32, __LINE__); memcpy(payment_hash_arr->elems, payment_hash.data, 32); int8_tArray payment_secret_arr = init_int8_tArray(32, __LINE__); memcpy(payment_secret_arr->elems, payment_secret.data, 32); - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 95, (uint32_t)route_ref, (uint32_t)payment_hash_arr, (uint32_t)payment_secret_arr, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + uint32_t ret = js_invoke_function_buuuuu(j_calls->instance_ptr, 95, route_ref, (uint32_t)payment_hash_arr, (uint32_t)payment_secret_arr, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_PaymentIdPaymentSendFailureZ ret_conv = *(LDKCResult_PaymentIdPaymentSendFailureZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } LDKCResult_PaymentIdPaymentSendFailureZ send_spontaneous_payment_LDKPayer_jcall(const void* this_arg, const LDKRoute * route, LDKThirtyTwoBytes payment_preimage) { LDKPayer_JCalls *j_calls = (LDKPayer_JCalls*) this_arg; LDKRoute route_var = *route; - uint32_t route_ref = 0; + uint64_t route_ref = 0; route_var = Route_clone(&route_var); - CHECK((((uintptr_t)route_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&route_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(route_var); - route_ref = (uintptr_t)route_var.inner; - if (route_var.is_owned) { - route_ref |= 1; - } + route_ref = tag_ptr(route_var.inner, route_var.is_owned); int8_tArray payment_preimage_arr = init_int8_tArray(32, __LINE__); memcpy(payment_preimage_arr->elems, payment_preimage.data, 32); - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 96, (uint32_t)route_ref, (uint32_t)payment_preimage_arr, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + uint32_t ret = js_invoke_function_buuuuu(j_calls->instance_ptr, 96, route_ref, (uint32_t)payment_preimage_arr, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_PaymentIdPaymentSendFailureZ ret_conv = *(LDKCResult_PaymentIdPaymentSendFailureZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } LDKCResult_NonePaymentSendFailureZ retry_payment_LDKPayer_jcall(const void* this_arg, const LDKRoute * route, LDKThirtyTwoBytes payment_id) { LDKPayer_JCalls *j_calls = (LDKPayer_JCalls*) this_arg; LDKRoute route_var = *route; - uint32_t route_ref = 0; + uint64_t route_ref = 0; route_var = Route_clone(&route_var); - CHECK((((uintptr_t)route_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&route_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(route_var); - route_ref = (uintptr_t)route_var.inner; - if (route_var.is_owned) { - route_ref |= 1; - } + route_ref = tag_ptr(route_var.inner, route_var.is_owned); int8_tArray payment_id_arr = init_int8_tArray(32, __LINE__); memcpy(payment_id_arr->elems, payment_id.data, 32); - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 97, (uint32_t)route_ref, (uint32_t)payment_id_arr, 0, 0, 0, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + uint32_t ret = js_invoke_function_buuuuu(j_calls->instance_ptr, 97, route_ref, (uint32_t)payment_id_arr, 0, 0, 0, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_NonePaymentSendFailureZ ret_conv = *(LDKCResult_NonePaymentSendFailureZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } void abandon_payment_LDKPayer_jcall(const void* this_arg, LDKThirtyTwoBytes payment_id) { @@ -11047,38 +9778,33 @@ static inline LDKPayer LDKPayer_init (JSValue o) { }; return ret; } -long __attribute__((export_name("TS_LDKPayer_new"))) TS_LDKPayer_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKPayer_new"))) TS_LDKPayer_new(JSValue o) { LDKPayer *res_ptr = MALLOC(sizeof(LDKPayer), "LDKPayer"); *res_ptr = LDKPayer_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -int8_tArray __attribute__((export_name("TS_Payer_node_id"))) TS_Payer_node_id(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +int8_tArray __attribute__((export_name("TS_Payer_node_id"))) TS_Payer_node_id(uint64_t this_arg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKPayer* this_arg_conv = (LDKPayer*)this_arg_ptr; int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, (this_arg_conv->node_id)(this_arg_conv->this_arg).compressed_form, 33); return ret_arr; } -uint32_tArray __attribute__((export_name("TS_Payer_first_hops"))) TS_Payer_first_hops(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_tArray __attribute__((export_name("TS_Payer_first_hops"))) TS_Payer_first_hops(uint64_t this_arg) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKPayer* this_arg_conv = (LDKPayer*)this_arg_ptr; LDKCVec_ChannelDetailsZ ret_var = (this_arg_conv->first_hops)(this_arg_conv->this_arg); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t q = 0; q < ret_var.datalen; q++) { LDKChannelDetails ret_conv_16_var = ret_var.data[q]; - uint32_t ret_conv_16_ref = 0; - 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. + uint64_t ret_conv_16_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_16_var); - ret_conv_16_ref = (uintptr_t)ret_conv_16_var.inner; - if (ret_conv_16_var.is_owned) { - ret_conv_16_ref |= 1; - } + ret_conv_16_ref = tag_ptr(ret_conv_16_var.inner, ret_conv_16_var.is_owned); ret_arr_ptr[q] = ret_conv_16_ref; } @@ -11086,14 +9812,15 @@ uint32_tArray __attribute__((export_name("TS_Payer_first_hops"))) TS_Payer_firs return ret_arr; } -uint32_t __attribute__((export_name("TS_Payer_send_payment"))) TS_Payer_send_payment(uint32_t this_arg, uint32_t route, int8_tArray payment_hash, int8_tArray payment_secret) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_Payer_send_payment"))) TS_Payer_send_payment(uint64_t this_arg, uint64_t route, int8_tArray payment_hash, int8_tArray payment_secret) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKPayer* this_arg_conv = (LDKPayer*)this_arg_ptr; LDKRoute route_conv; - route_conv.inner = (void*)(route & (~1)); - route_conv.is_owned = false; + route_conv.inner = untag_ptr(route); + route_conv.is_owned = ptr_is_owned(route); CHECK_INNER_FIELD_ACCESS_OR_NULL(route_conv); + route_conv.is_owned = false; LDKThirtyTwoBytes payment_hash_ref; CHECK(payment_hash->arr_len == 32); memcpy(payment_hash_ref.data, payment_hash->elems, 32); FREE(payment_hash); @@ -11102,44 +9829,46 @@ uint32_t __attribute__((export_name("TS_Payer_send_payment"))) TS_Payer_send_pa memcpy(payment_secret_ref.data, payment_secret->elems, 32); FREE(payment_secret); LDKCResult_PaymentIdPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentSendFailureZ), "LDKCResult_PaymentIdPaymentSendFailureZ"); *ret_conv = (this_arg_conv->send_payment)(this_arg_conv->this_arg, &route_conv, payment_hash_ref, payment_secret_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_Payer_send_spontaneous_payment"))) TS_Payer_send_spontaneous_payment(uint32_t this_arg, uint32_t route, int8_tArray payment_preimage) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_Payer_send_spontaneous_payment"))) TS_Payer_send_spontaneous_payment(uint64_t this_arg, uint64_t route, int8_tArray payment_preimage) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKPayer* this_arg_conv = (LDKPayer*)this_arg_ptr; LDKRoute route_conv; - route_conv.inner = (void*)(route & (~1)); - route_conv.is_owned = false; + route_conv.inner = untag_ptr(route); + route_conv.is_owned = ptr_is_owned(route); CHECK_INNER_FIELD_ACCESS_OR_NULL(route_conv); + route_conv.is_owned = false; LDKThirtyTwoBytes payment_preimage_ref; CHECK(payment_preimage->arr_len == 32); memcpy(payment_preimage_ref.data, payment_preimage->elems, 32); FREE(payment_preimage); LDKCResult_PaymentIdPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentSendFailureZ), "LDKCResult_PaymentIdPaymentSendFailureZ"); *ret_conv = (this_arg_conv->send_spontaneous_payment)(this_arg_conv->this_arg, &route_conv, payment_preimage_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_Payer_retry_payment"))) TS_Payer_retry_payment(uint32_t this_arg, uint32_t route, int8_tArray payment_id) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_Payer_retry_payment"))) TS_Payer_retry_payment(uint64_t this_arg, uint64_t route, int8_tArray payment_id) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKPayer* this_arg_conv = (LDKPayer*)this_arg_ptr; LDKRoute route_conv; - route_conv.inner = (void*)(route & (~1)); - route_conv.is_owned = false; + route_conv.inner = untag_ptr(route); + route_conv.is_owned = ptr_is_owned(route); CHECK_INNER_FIELD_ACCESS_OR_NULL(route_conv); + route_conv.is_owned = false; LDKThirtyTwoBytes payment_id_ref; CHECK(payment_id->arr_len == 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 = (this_arg_conv->retry_payment)(this_arg_conv->this_arg, &route_conv, payment_id_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_Payer_abandon_payment"))) TS_Payer_abandon_payment(uint32_t this_arg, int8_tArray payment_id) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +void __attribute__((export_name("TS_Payer_abandon_payment"))) TS_Payer_abandon_payment(uint64_t this_arg, int8_tArray payment_id) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKPayer* this_arg_conv = (LDKPayer*)this_arg_ptr; LDKThirtyTwoBytes payment_id_ref; CHECK(payment_id->arr_len == 32); @@ -11162,44 +9891,34 @@ LDKCResult_RouteLightningErrorZ find_route_LDKRouter_jcall(const void* this_arg, int8_tArray payer_arr = init_int8_tArray(33, __LINE__); memcpy(payer_arr->elems, payer.compressed_form, 33); LDKRouteParameters route_params_var = *route_params; - uint32_t route_params_ref = 0; + uint64_t route_params_ref = 0; route_params_var = RouteParameters_clone(&route_params_var); - CHECK((((uintptr_t)route_params_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&route_params_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(route_params_var); - route_params_ref = (uintptr_t)route_params_var.inner; - if (route_params_var.is_owned) { - route_params_ref |= 1; - } + route_params_ref = tag_ptr(route_params_var.inner, route_params_var.is_owned); int8_tArray payment_hash_arr = init_int8_tArray(32, __LINE__); memcpy(payment_hash_arr->elems, *payment_hash, 32); LDKCVec_ChannelDetailsZ *first_hops_var_ptr = first_hops; - uint32_tArray first_hops_arr = NULL; + uint64_tArray first_hops_arr = NULL; if (first_hops != NULL) { LDKCVec_ChannelDetailsZ first_hops_var = *first_hops_var_ptr; - first_hops_arr = init_uint32_tArray(first_hops_var.datalen, __LINE__); - uint32_t *first_hops_arr_ptr = (uint32_t*)(((uint8_t*)first_hops_arr) + 8); + first_hops_arr = init_uint64_tArray(first_hops_var.datalen, __LINE__); + uint64_t *first_hops_arr_ptr = (uint64_t*)(((uint8_t*)first_hops_arr) + 8); for (size_t q = 0; q < first_hops_var.datalen; q++) { LDKChannelDetails first_hops_conv_16_var = first_hops_var.data[q]; - uint32_t first_hops_conv_16_ref = 0; - CHECK((((uintptr_t)first_hops_conv_16_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&first_hops_conv_16_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t first_hops_conv_16_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(first_hops_conv_16_var); - first_hops_conv_16_ref = (uintptr_t)first_hops_conv_16_var.inner; - if (first_hops_conv_16_var.is_owned) { - first_hops_conv_16_ref |= 1; - } + first_hops_conv_16_ref = tag_ptr(first_hops_conv_16_var.inner, first_hops_conv_16_var.is_owned); first_hops_arr_ptr[q] = first_hops_conv_16_ref; } } // WARNING: This object doesn't live past this scope, needs clone! - uint32_t ret_scorer = ((uintptr_t)scorer) | 1; - uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 99, (uint32_t)payer_arr, (uint32_t)route_params_ref, (uint32_t)payment_hash_arr, (uint32_t)first_hops_arr, (uint32_t)ret_scorer, 0); - void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); + uint64_t ret_scorer = tag_ptr(scorer, false); + uint32_t ret = js_invoke_function_ubuubu(j_calls->instance_ptr, 99, (uint32_t)payer_arr, route_params_ref, (uint32_t)payment_hash_arr, (uint32_t)first_hops_arr, ret_scorer, 0); + void* ret_ptr = untag_ptr(ret); CHECK_ACCESS(ret_ptr); LDKCResult_RouteLightningErrorZ ret_conv = *(LDKCResult_RouteLightningErrorZ*)(ret_ptr); - FREE((void*)ret); + FREE(untag_ptr(ret)); return ret_conv; } static void LDKRouter_JCalls_cloned(LDKRouter* new_obj) { @@ -11218,22 +9937,23 @@ static inline LDKRouter LDKRouter_init (JSValue o) { }; return ret; } -long __attribute__((export_name("TS_LDKRouter_new"))) TS_LDKRouter_new(JSValue o) { +uint64_t __attribute__((export_name("TS_LDKRouter_new"))) TS_LDKRouter_new(JSValue o) { LDKRouter *res_ptr = MALLOC(sizeof(LDKRouter), "LDKRouter"); *res_ptr = LDKRouter_init(o); - return (long)res_ptr; + return tag_ptr(res_ptr, true); } -uint32_t __attribute__((export_name("TS_Router_find_route"))) TS_Router_find_route(uint32_t this_arg, int8_tArray payer, uint32_t route_params, int8_tArray payment_hash, uint32_tArray first_hops, uint32_t scorer) { - void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); - if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } +uint64_t __attribute__((export_name("TS_Router_find_route"))) TS_Router_find_route(uint64_t this_arg, int8_tArray payer, uint64_t route_params, int8_tArray payment_hash, uint64_tArray first_hops, uint64_t scorer) { + void* this_arg_ptr = untag_ptr(this_arg); + if (ptr_is_owned(this_arg)) { CHECK_ACCESS(this_arg_ptr); } LDKRouter* this_arg_conv = (LDKRouter*)this_arg_ptr; LDKPublicKey payer_ref; CHECK(payer->arr_len == 33); memcpy(payer_ref.compressed_form, payer->elems, 33); FREE(payer); LDKRouteParameters route_params_conv; - route_params_conv.inner = (void*)(route_params & (~1)); - route_params_conv.is_owned = false; + route_params_conv.inner = untag_ptr(route_params); + route_params_conv.is_owned = ptr_is_owned(route_params); CHECK_INNER_FIELD_ACCESS_OR_NULL(route_params_conv); + route_params_conv.is_owned = false; unsigned char payment_hash_arr[32]; CHECK(payment_hash->arr_len == 32); memcpy(payment_hash_arr, payment_hash->elems, 32); FREE(payment_hash); @@ -11246,36 +9966,37 @@ uint32_t __attribute__((export_name("TS_Router_find_route"))) TS_Router_find_ro first_hops_constr.data = MALLOC(first_hops_constr.datalen * sizeof(LDKChannelDetails), "LDKCVec_ChannelDetailsZ Elements"); else first_hops_constr.data = NULL; - uint32_t* first_hops_vals = first_hops->elems; + uint64_t* first_hops_vals = first_hops->elems; for (size_t q = 0; q < first_hops_constr.datalen; q++) { - uint32_t first_hops_conv_16 = first_hops_vals[q]; + uint64_t first_hops_conv_16 = first_hops_vals[q]; LDKChannelDetails first_hops_conv_16_conv; - first_hops_conv_16_conv.inner = (void*)(first_hops_conv_16 & (~1)); - first_hops_conv_16_conv.is_owned = (first_hops_conv_16 & 1) || (first_hops_conv_16 == 0); + first_hops_conv_16_conv.inner = untag_ptr(first_hops_conv_16); + first_hops_conv_16_conv.is_owned = ptr_is_owned(first_hops_conv_16); CHECK_INNER_FIELD_ACCESS_OR_NULL(first_hops_conv_16_conv); + first_hops_conv_16_conv.is_owned = false; first_hops_constr.data[q] = first_hops_conv_16_conv; } FREE(first_hops); first_hops_ptr = &first_hops_constr; } - void* scorer_ptr = (void*)(((uintptr_t)scorer) & ~1); - if (!(scorer & 1)) { CHECK_ACCESS(scorer_ptr); } + void* scorer_ptr = untag_ptr(scorer); + if (ptr_is_owned(scorer)) { CHECK_ACCESS(scorer_ptr); } LDKScore* scorer_conv = (LDKScore*)scorer_ptr; LDKCResult_RouteLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteLightningErrorZ), "LDKCResult_RouteLightningErrorZ"); *ret_conv = (this_arg_conv->find_route)(this_arg_conv->this_arg, payer_ref, &route_params_conv, payment_hash_ref, first_hops_ptr, scorer_conv); if (first_hops_ptr != NULL) { FREE(first_hops_constr.data); } - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_LDKRetry_ty_from_ptr"))) TS_LDKRetry_ty_from_ptr(uint32_t ptr) { - LDKRetry *obj = (LDKRetry*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKRetry_ty_from_ptr"))) TS_LDKRetry_ty_from_ptr(uint64_t ptr) { + LDKRetry *obj = (LDKRetry*)untag_ptr(ptr); switch(obj->tag) { case LDKRetry_Attempts: return 0; default: abort(); } } -uint32_t __attribute__((export_name("TS_LDKRetry_Attempts_get_attempts"))) TS_LDKRetry_Attempts_get_attempts(uint32_t ptr) { - LDKRetry *obj = (LDKRetry*)(ptr & ~1); +uint32_t __attribute__((export_name("TS_LDKRetry_Attempts_get_attempts"))) TS_LDKRetry_Attempts_get_attempts(uint64_t ptr) { + LDKRetry *obj = (LDKRetry*)untag_ptr(ptr); assert(obj->tag == LDKRetry_Attempts); uint32_t attempts_conv = obj->attempts; return attempts_conv; @@ -11294,32 +10015,32 @@ jstring __attribute__((export_name("TS__ldk_c_bindings_get_compiled_version"))) return ret_conv; } -static inline uintptr_t Bech32Error_clone_ptr(LDKBech32Error *NONNULL_PTR arg) { +static inline uint64_t Bech32Error_clone_ptr(LDKBech32Error *NONNULL_PTR arg) { LDKBech32Error *ret_copy = MALLOC(sizeof(LDKBech32Error), "LDKBech32Error"); *ret_copy = Bech32Error_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Bech32Error_clone_ptr"))) TS_Bech32Error_clone_ptr(uint32_t arg) { - LDKBech32Error* arg_conv = (LDKBech32Error*)arg; - uint32_t ret_conv = Bech32Error_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_Bech32Error_clone_ptr"))) TS_Bech32Error_clone_ptr(uint64_t arg) { + LDKBech32Error* arg_conv = (LDKBech32Error*)untag_ptr(arg); + int64_t ret_conv = Bech32Error_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_Bech32Error_clone"))) TS_Bech32Error_clone(uint32_t orig) { - LDKBech32Error* orig_conv = (LDKBech32Error*)orig; +uint64_t __attribute__((export_name("TS_Bech32Error_clone"))) TS_Bech32Error_clone(uint64_t orig) { + LDKBech32Error* orig_conv = (LDKBech32Error*)untag_ptr(orig); LDKBech32Error *ret_copy = MALLOC(sizeof(LDKBech32Error), "LDKBech32Error"); *ret_copy = Bech32Error_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_Bech32Error_free"))) TS_Bech32Error_free(uint32_t o) { - if ((o & 1) != 0) return; - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +void __attribute__((export_name("TS_Bech32Error_free"))) TS_Bech32Error_free(uint64_t o) { + if (!ptr_is_owned(o)) return; + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKBech32Error o_conv = *(LDKBech32Error*)(o_ptr); - FREE((void*)o); + FREE(untag_ptr(o)); Bech32Error_free(o_conv); } @@ -11332,41 +10053,41 @@ void __attribute__((export_name("TS_Transaction_free"))) TS_Transaction_free(in Transaction_free(_res_ref); } -uint32_t __attribute__((export_name("TS_TxOut_new"))) TS_TxOut_new(int8_tArray script_pubkey, int64_t value) { +uint64_t __attribute__((export_name("TS_TxOut_new"))) TS_TxOut_new(int8_tArray script_pubkey, int64_t value) { 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); FREE(script_pubkey); LDKTxOut* ret_ref = MALLOC(sizeof(LDKTxOut), "LDKTxOut"); *ret_ref = TxOut_new(script_pubkey_ref, value); - return (uint32_t)ret_ref; + return tag_ptr(ret_ref, true); } -void __attribute__((export_name("TS_TxOut_free"))) TS_TxOut_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_TxOut_free"))) TS_TxOut_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKTxOut _res_conv = *(LDKTxOut*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); TxOut_free(_res_conv); } -static inline uintptr_t TxOut_clone_ptr(LDKTxOut *NONNULL_PTR arg) { +static inline uint64_t TxOut_clone_ptr(LDKTxOut *NONNULL_PTR arg) { LDKTxOut* ret_ref = MALLOC(sizeof(LDKTxOut), "LDKTxOut"); *ret_ref = TxOut_clone(arg); - return (uint32_t)ret_ref; + return tag_ptr(ret_ref, true); } -uint32_t __attribute__((export_name("TS_TxOut_clone_ptr"))) TS_TxOut_clone_ptr(uint32_t arg) { - LDKTxOut* arg_conv = (LDKTxOut*)(arg & ~1); - uint32_t ret_conv = TxOut_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_TxOut_clone_ptr"))) TS_TxOut_clone_ptr(uint64_t arg) { + LDKTxOut* arg_conv = (LDKTxOut*)untag_ptr(arg); + int64_t ret_conv = TxOut_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_TxOut_clone"))) TS_TxOut_clone(uint32_t orig) { - LDKTxOut* orig_conv = (LDKTxOut*)(orig & ~1); +uint64_t __attribute__((export_name("TS_TxOut_clone"))) TS_TxOut_clone(uint64_t orig) { + LDKTxOut* orig_conv = (LDKTxOut*)untag_ptr(orig); LDKTxOut* ret_ref = MALLOC(sizeof(LDKTxOut), "LDKTxOut"); *ret_ref = TxOut_clone(orig_conv); - return (uint32_t)ret_ref; + return tag_ptr(ret_ref, true); } void __attribute__((export_name("TS_Str_free"))) TS_Str_free(jstring _res) { @@ -11374,461 +10095,461 @@ void __attribute__((export_name("TS_Str_free"))) TS_Str_free(jstring _res) { Str_free(dummy); } -uint32_t __attribute__((export_name("TS_CResult_NoneNoneZ_ok"))) TS_CResult_NoneNoneZ_ok() { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NoneNoneZ_err"))) TS_CResult_NoneNoneZ_err() { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_NoneNoneZ_is_ok"))) TS_CResult_NoneNoneZ_is_ok(uint32_t o) { - LDKCResult_NoneNoneZ* o_conv = (LDKCResult_NoneNoneZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_NoneNoneZ_is_ok"))) TS_CResult_NoneNoneZ_is_ok(uint64_t o) { + LDKCResult_NoneNoneZ* o_conv = (LDKCResult_NoneNoneZ*)untag_ptr(o); jboolean ret_conv = CResult_NoneNoneZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_NoneNoneZ_free"))) TS_CResult_NoneNoneZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_NoneNoneZ_free"))) TS_CResult_NoneNoneZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_NoneNoneZ _res_conv = *(LDKCResult_NoneNoneZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_NoneNoneZ_free(_res_conv); } -static inline uintptr_t CResult_NoneNoneZ_clone_ptr(LDKCResult_NoneNoneZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_NoneNoneZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_NoneNoneZ_clone_ptr"))) TS_CResult_NoneNoneZ_clone_ptr(uint64_t arg) { + LDKCResult_NoneNoneZ* arg_conv = (LDKCResult_NoneNoneZ*)untag_ptr(arg); + int64_t ret_conv = CResult_NoneNoneZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_NoneNoneZ_clone"))) TS_CResult_NoneNoneZ_clone(uint32_t orig) { - LDKCResult_NoneNoneZ* orig_conv = (LDKCResult_NoneNoneZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_NoneNoneZ_clone"))) TS_CResult_NoneNoneZ_clone(uint64_t orig) { + LDKCResult_NoneNoneZ* orig_conv = (LDKCResult_NoneNoneZ*)untag_ptr(orig); LDKCResult_NoneNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneNoneZ), "LDKCResult_NoneNoneZ"); *ret_conv = CResult_NoneNoneZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_ok"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_ok"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_ok(uint64_t o) { LDKCounterpartyCommitmentSecrets o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = CounterpartyCommitmentSecrets_clone(&o_conv); LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ), "LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ"); *ret_conv = CResult_CounterpartyCommitmentSecretsDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_err"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_err"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ), "LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ"); *ret_conv = CResult_CounterpartyCommitmentSecretsDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_is_ok"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* o_conv = (LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_is_ok"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* o_conv = (LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_CounterpartyCommitmentSecretsDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_free"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_free"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ _res_conv = *(LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_CounterpartyCommitmentSecretsDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone_ptr(LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone_ptr(LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ), "LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ"); *ret_conv = CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone_ptr"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* arg_conv = (LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone_ptr"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* arg_conv = (LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* orig_conv = (LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* orig_conv = (LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ*)untag_ptr(orig); LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ), "LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ"); *ret_conv = CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_SecretKeyErrorZ_ok"))) TS_CResult_SecretKeyErrorZ_ok(int8_tArray o) { +uint64_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); FREE(o); LDKCResult_SecretKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SecretKeyErrorZ), "LDKCResult_SecretKeyErrorZ"); *ret_conv = CResult_SecretKeyErrorZ_ok(o_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_SecretKeyErrorZ_err"))) TS_CResult_SecretKeyErrorZ_err(uint32_t e) { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_SecretKeyErrorZ_is_ok"))) TS_CResult_SecretKeyErrorZ_is_ok(uint32_t o) { - LDKCResult_SecretKeyErrorZ* o_conv = (LDKCResult_SecretKeyErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_SecretKeyErrorZ_is_ok"))) TS_CResult_SecretKeyErrorZ_is_ok(uint64_t o) { + LDKCResult_SecretKeyErrorZ* o_conv = (LDKCResult_SecretKeyErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_SecretKeyErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_SecretKeyErrorZ_free"))) TS_CResult_SecretKeyErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_SecretKeyErrorZ_free"))) TS_CResult_SecretKeyErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_SecretKeyErrorZ _res_conv = *(LDKCResult_SecretKeyErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_SecretKeyErrorZ_free(_res_conv); } -static inline uintptr_t CResult_SecretKeyErrorZ_clone_ptr(LDKCResult_SecretKeyErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_SecretKeyErrorZ_clone_ptr(LDKCResult_SecretKeyErrorZ *NONNULL_PTR arg) { LDKCResult_SecretKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SecretKeyErrorZ), "LDKCResult_SecretKeyErrorZ"); *ret_conv = CResult_SecretKeyErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_SecretKeyErrorZ_clone_ptr"))) TS_CResult_SecretKeyErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_SecretKeyErrorZ* arg_conv = (LDKCResult_SecretKeyErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_SecretKeyErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_SecretKeyErrorZ_clone_ptr"))) TS_CResult_SecretKeyErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_SecretKeyErrorZ* arg_conv = (LDKCResult_SecretKeyErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_SecretKeyErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_SecretKeyErrorZ_clone"))) TS_CResult_SecretKeyErrorZ_clone(uint32_t orig) { - LDKCResult_SecretKeyErrorZ* orig_conv = (LDKCResult_SecretKeyErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_SecretKeyErrorZ_clone"))) TS_CResult_SecretKeyErrorZ_clone(uint64_t orig) { + LDKCResult_SecretKeyErrorZ* orig_conv = (LDKCResult_SecretKeyErrorZ*)untag_ptr(orig); LDKCResult_SecretKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SecretKeyErrorZ), "LDKCResult_SecretKeyErrorZ"); *ret_conv = CResult_SecretKeyErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PublicKeyErrorZ_ok"))) TS_CResult_PublicKeyErrorZ_ok(int8_tArray o) { +uint64_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); FREE(o); LDKCResult_PublicKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PublicKeyErrorZ), "LDKCResult_PublicKeyErrorZ"); *ret_conv = CResult_PublicKeyErrorZ_ok(o_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PublicKeyErrorZ_err"))) TS_CResult_PublicKeyErrorZ_err(uint32_t e) { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_PublicKeyErrorZ_is_ok"))) TS_CResult_PublicKeyErrorZ_is_ok(uint32_t o) { - LDKCResult_PublicKeyErrorZ* o_conv = (LDKCResult_PublicKeyErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_PublicKeyErrorZ_is_ok"))) TS_CResult_PublicKeyErrorZ_is_ok(uint64_t o) { + LDKCResult_PublicKeyErrorZ* o_conv = (LDKCResult_PublicKeyErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_PublicKeyErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_PublicKeyErrorZ_free"))) TS_CResult_PublicKeyErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_PublicKeyErrorZ_free"))) TS_CResult_PublicKeyErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_PublicKeyErrorZ _res_conv = *(LDKCResult_PublicKeyErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_PublicKeyErrorZ_free(_res_conv); } -static inline uintptr_t CResult_PublicKeyErrorZ_clone_ptr(LDKCResult_PublicKeyErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_PublicKeyErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_PublicKeyErrorZ_clone_ptr"))) TS_CResult_PublicKeyErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_PublicKeyErrorZ* arg_conv = (LDKCResult_PublicKeyErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_PublicKeyErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_PublicKeyErrorZ_clone"))) TS_CResult_PublicKeyErrorZ_clone(uint32_t orig) { - LDKCResult_PublicKeyErrorZ* orig_conv = (LDKCResult_PublicKeyErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_PublicKeyErrorZ_clone"))) TS_CResult_PublicKeyErrorZ_clone(uint64_t orig) { + LDKCResult_PublicKeyErrorZ* orig_conv = (LDKCResult_PublicKeyErrorZ*)untag_ptr(orig); LDKCResult_PublicKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PublicKeyErrorZ), "LDKCResult_PublicKeyErrorZ"); *ret_conv = CResult_PublicKeyErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_ok"))) TS_CResult_TxCreationKeysDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_ok"))) TS_CResult_TxCreationKeysDecodeErrorZ_ok(uint64_t o) { LDKTxCreationKeys o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = TxCreationKeys_clone(&o_conv); LDKCResult_TxCreationKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysDecodeErrorZ), "LDKCResult_TxCreationKeysDecodeErrorZ"); *ret_conv = CResult_TxCreationKeysDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_err"))) TS_CResult_TxCreationKeysDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_err"))) TS_CResult_TxCreationKeysDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_TxCreationKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysDecodeErrorZ), "LDKCResult_TxCreationKeysDecodeErrorZ"); *ret_conv = CResult_TxCreationKeysDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_is_ok"))) TS_CResult_TxCreationKeysDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_TxCreationKeysDecodeErrorZ* o_conv = (LDKCResult_TxCreationKeysDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_is_ok"))) TS_CResult_TxCreationKeysDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_TxCreationKeysDecodeErrorZ* o_conv = (LDKCResult_TxCreationKeysDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_TxCreationKeysDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_free"))) TS_CResult_TxCreationKeysDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_free"))) TS_CResult_TxCreationKeysDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_TxCreationKeysDecodeErrorZ _res_conv = *(LDKCResult_TxCreationKeysDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_TxCreationKeysDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_TxCreationKeysDecodeErrorZ_clone_ptr(LDKCResult_TxCreationKeysDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_TxCreationKeysDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_clone_ptr"))) TS_CResult_TxCreationKeysDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_TxCreationKeysDecodeErrorZ* arg_conv = (LDKCResult_TxCreationKeysDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_TxCreationKeysDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_clone"))) TS_CResult_TxCreationKeysDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_TxCreationKeysDecodeErrorZ* orig_conv = (LDKCResult_TxCreationKeysDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_clone"))) TS_CResult_TxCreationKeysDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_TxCreationKeysDecodeErrorZ* orig_conv = (LDKCResult_TxCreationKeysDecodeErrorZ*)untag_ptr(orig); LDKCResult_TxCreationKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysDecodeErrorZ), "LDKCResult_TxCreationKeysDecodeErrorZ"); *ret_conv = CResult_TxCreationKeysDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_ok"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_ok"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_ok(uint64_t o) { LDKChannelPublicKeys o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ChannelPublicKeys_clone(&o_conv); LDKCResult_ChannelPublicKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelPublicKeysDecodeErrorZ), "LDKCResult_ChannelPublicKeysDecodeErrorZ"); *ret_conv = CResult_ChannelPublicKeysDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_err"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_err"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ChannelPublicKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelPublicKeysDecodeErrorZ), "LDKCResult_ChannelPublicKeysDecodeErrorZ"); *ret_conv = CResult_ChannelPublicKeysDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_is_ok"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ChannelPublicKeysDecodeErrorZ* o_conv = (LDKCResult_ChannelPublicKeysDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_is_ok"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ChannelPublicKeysDecodeErrorZ* o_conv = (LDKCResult_ChannelPublicKeysDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ChannelPublicKeysDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_free"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_free"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ChannelPublicKeysDecodeErrorZ _res_conv = *(LDKCResult_ChannelPublicKeysDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ChannelPublicKeysDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ChannelPublicKeysDecodeErrorZ_clone_ptr(LDKCResult_ChannelPublicKeysDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_ChannelPublicKeysDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ChannelPublicKeysDecodeErrorZ* arg_conv = (LDKCResult_ChannelPublicKeysDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ChannelPublicKeysDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_clone"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ChannelPublicKeysDecodeErrorZ* orig_conv = (LDKCResult_ChannelPublicKeysDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_clone"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ChannelPublicKeysDecodeErrorZ* orig_conv = (LDKCResult_ChannelPublicKeysDecodeErrorZ*)untag_ptr(orig); LDKCResult_ChannelPublicKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelPublicKeysDecodeErrorZ), "LDKCResult_ChannelPublicKeysDecodeErrorZ"); *ret_conv = CResult_ChannelPublicKeysDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_ok"))) TS_CResult_TxCreationKeysErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_ok"))) TS_CResult_TxCreationKeysErrorZ_ok(uint64_t o) { LDKTxCreationKeys o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = TxCreationKeys_clone(&o_conv); LDKCResult_TxCreationKeysErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysErrorZ), "LDKCResult_TxCreationKeysErrorZ"); *ret_conv = CResult_TxCreationKeysErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_err"))) TS_CResult_TxCreationKeysErrorZ_err(uint32_t e) { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_is_ok"))) TS_CResult_TxCreationKeysErrorZ_is_ok(uint32_t o) { - LDKCResult_TxCreationKeysErrorZ* o_conv = (LDKCResult_TxCreationKeysErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_is_ok"))) TS_CResult_TxCreationKeysErrorZ_is_ok(uint64_t o) { + LDKCResult_TxCreationKeysErrorZ* o_conv = (LDKCResult_TxCreationKeysErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_TxCreationKeysErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_free"))) TS_CResult_TxCreationKeysErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_free"))) TS_CResult_TxCreationKeysErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_TxCreationKeysErrorZ _res_conv = *(LDKCResult_TxCreationKeysErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_TxCreationKeysErrorZ_free(_res_conv); } -static inline uintptr_t CResult_TxCreationKeysErrorZ_clone_ptr(LDKCResult_TxCreationKeysErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_TxCreationKeysErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_clone_ptr"))) TS_CResult_TxCreationKeysErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_TxCreationKeysErrorZ* arg_conv = (LDKCResult_TxCreationKeysErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_TxCreationKeysErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_clone"))) TS_CResult_TxCreationKeysErrorZ_clone(uint32_t orig) { - LDKCResult_TxCreationKeysErrorZ* orig_conv = (LDKCResult_TxCreationKeysErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_clone"))) TS_CResult_TxCreationKeysErrorZ_clone(uint64_t orig) { + LDKCResult_TxCreationKeysErrorZ* orig_conv = (LDKCResult_TxCreationKeysErrorZ*)untag_ptr(orig); LDKCResult_TxCreationKeysErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysErrorZ), "LDKCResult_TxCreationKeysErrorZ"); *ret_conv = CResult_TxCreationKeysErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_COption_u32Z_some"))) TS_COption_u32Z_some(int32_t o) { +uint64_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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_u32Z_none"))) TS_COption_u32Z_none() { +uint64_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(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_COption_u32Z_free"))) TS_COption_u32Z_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCOption_u32Z _res_conv = *(LDKCOption_u32Z*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); COption_u32Z_free(_res_conv); } -static inline uintptr_t COption_u32Z_clone_ptr(LDKCOption_u32Z *NONNULL_PTR arg) { +static inline uint64_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); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_u32Z_clone_ptr"))) TS_COption_u32Z_clone_ptr(uint32_t arg) { - LDKCOption_u32Z* arg_conv = (LDKCOption_u32Z*)arg; - uint32_t ret_conv = COption_u32Z_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_COption_u32Z_clone_ptr"))) TS_COption_u32Z_clone_ptr(uint64_t arg) { + LDKCOption_u32Z* arg_conv = (LDKCOption_u32Z*)untag_ptr(arg); + int64_t ret_conv = COption_u32Z_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_COption_u32Z_clone"))) TS_COption_u32Z_clone(uint32_t orig) { - LDKCOption_u32Z* orig_conv = (LDKCOption_u32Z*)orig; +uint64_t __attribute__((export_name("TS_COption_u32Z_clone"))) TS_COption_u32Z_clone(uint64_t orig) { + LDKCOption_u32Z* orig_conv = (LDKCOption_u32Z*)untag_ptr(orig); LDKCOption_u32Z *ret_copy = MALLOC(sizeof(LDKCOption_u32Z), "LDKCOption_u32Z"); *ret_copy = COption_u32Z_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_ok"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_ok"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_ok(uint64_t o) { LDKHTLCOutputInCommitment o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = HTLCOutputInCommitment_clone(&o_conv); LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCOutputInCommitmentDecodeErrorZ), "LDKCResult_HTLCOutputInCommitmentDecodeErrorZ"); *ret_conv = CResult_HTLCOutputInCommitmentDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_err"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_err"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCOutputInCommitmentDecodeErrorZ), "LDKCResult_HTLCOutputInCommitmentDecodeErrorZ"); *ret_conv = CResult_HTLCOutputInCommitmentDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_is_ok"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* o_conv = (LDKCResult_HTLCOutputInCommitmentDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_is_ok"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* o_conv = (LDKCResult_HTLCOutputInCommitmentDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_HTLCOutputInCommitmentDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_free"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_free"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_HTLCOutputInCommitmentDecodeErrorZ _res_conv = *(LDKCResult_HTLCOutputInCommitmentDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_HTLCOutputInCommitmentDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_HTLCOutputInCommitmentDecodeErrorZ_clone_ptr(LDKCResult_HTLCOutputInCommitmentDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_HTLCOutputInCommitmentDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_clone_ptr"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* arg_conv = (LDKCResult_HTLCOutputInCommitmentDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_HTLCOutputInCommitmentDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_clone"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* orig_conv = (LDKCResult_HTLCOutputInCommitmentDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_clone"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* orig_conv = (LDKCResult_HTLCOutputInCommitmentDecodeErrorZ*)untag_ptr(orig); LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCOutputInCommitmentDecodeErrorZ), "LDKCResult_HTLCOutputInCommitmentDecodeErrorZ"); *ret_conv = CResult_HTLCOutputInCommitmentDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } uint32_t __attribute__((export_name("TS_COption_NoneZ_some"))) TS_COption_NoneZ_some() { @@ -11846,114 +10567,114 @@ void __attribute__((export_name("TS_COption_NoneZ_free"))) TS_COption_NoneZ_fre COption_NoneZ_free(_res_conv); } -uint32_t __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_ok"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_ok"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_ok(uint64_t o) { LDKCounterpartyChannelTransactionParameters o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = CounterpartyChannelTransactionParameters_clone(&o_conv); LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ), "LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ"); *ret_conv = CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_err"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_err"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ), "LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ"); *ret_conv = CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_is_ok"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* o_conv = (LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_is_ok"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* o_conv = (LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_free"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_free"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ _res_conv = *(LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone_ptr(LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone_ptr"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* arg_conv = (LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* orig_conv = (LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* orig_conv = (LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ*)untag_ptr(orig); LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ), "LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ"); *ret_conv = CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_ok"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_ok"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_ok(uint64_t o) { LDKChannelTransactionParameters o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ChannelTransactionParameters_clone(&o_conv); LDKCResult_ChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTransactionParametersDecodeErrorZ), "LDKCResult_ChannelTransactionParametersDecodeErrorZ"); *ret_conv = CResult_ChannelTransactionParametersDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_err"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_err"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTransactionParametersDecodeErrorZ), "LDKCResult_ChannelTransactionParametersDecodeErrorZ"); *ret_conv = CResult_ChannelTransactionParametersDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_is_ok"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ChannelTransactionParametersDecodeErrorZ* o_conv = (LDKCResult_ChannelTransactionParametersDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_is_ok"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ChannelTransactionParametersDecodeErrorZ* o_conv = (LDKCResult_ChannelTransactionParametersDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ChannelTransactionParametersDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_free"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_free"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ChannelTransactionParametersDecodeErrorZ _res_conv = *(LDKCResult_ChannelTransactionParametersDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ChannelTransactionParametersDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ChannelTransactionParametersDecodeErrorZ_clone_ptr(LDKCResult_ChannelTransactionParametersDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_ChannelTransactionParametersDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ChannelTransactionParametersDecodeErrorZ* arg_conv = (LDKCResult_ChannelTransactionParametersDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ChannelTransactionParametersDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_clone"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ChannelTransactionParametersDecodeErrorZ* orig_conv = (LDKCResult_ChannelTransactionParametersDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_clone"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ChannelTransactionParametersDecodeErrorZ* orig_conv = (LDKCResult_ChannelTransactionParametersDecodeErrorZ*)untag_ptr(orig); LDKCResult_ChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTransactionParametersDecodeErrorZ), "LDKCResult_ChannelTransactionParametersDecodeErrorZ"); *ret_conv = CResult_ChannelTransactionParametersDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } void __attribute__((export_name("TS_CVec_SignatureZ_free"))) TS_CVec_SignatureZ_free(ptrArray _res) { @@ -11975,236 +10696,238 @@ void __attribute__((export_name("TS_CVec_SignatureZ_free"))) TS_CVec_SignatureZ CVec_SignatureZ_free(_res_constr); } -uint32_t __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_ok"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_ok"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_ok(uint64_t o) { LDKHolderCommitmentTransaction o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = HolderCommitmentTransaction_clone(&o_conv); LDKCResult_HolderCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HolderCommitmentTransactionDecodeErrorZ), "LDKCResult_HolderCommitmentTransactionDecodeErrorZ"); *ret_conv = CResult_HolderCommitmentTransactionDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_err"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_err"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_HolderCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HolderCommitmentTransactionDecodeErrorZ), "LDKCResult_HolderCommitmentTransactionDecodeErrorZ"); *ret_conv = CResult_HolderCommitmentTransactionDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_is_ok"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_HolderCommitmentTransactionDecodeErrorZ* o_conv = (LDKCResult_HolderCommitmentTransactionDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_is_ok"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_HolderCommitmentTransactionDecodeErrorZ* o_conv = (LDKCResult_HolderCommitmentTransactionDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_HolderCommitmentTransactionDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_free"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_free"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_HolderCommitmentTransactionDecodeErrorZ _res_conv = *(LDKCResult_HolderCommitmentTransactionDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_HolderCommitmentTransactionDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_HolderCommitmentTransactionDecodeErrorZ_clone_ptr(LDKCResult_HolderCommitmentTransactionDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_HolderCommitmentTransactionDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_clone_ptr"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_HolderCommitmentTransactionDecodeErrorZ* arg_conv = (LDKCResult_HolderCommitmentTransactionDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_HolderCommitmentTransactionDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_clone"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_HolderCommitmentTransactionDecodeErrorZ* orig_conv = (LDKCResult_HolderCommitmentTransactionDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_clone"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_HolderCommitmentTransactionDecodeErrorZ* orig_conv = (LDKCResult_HolderCommitmentTransactionDecodeErrorZ*)untag_ptr(orig); LDKCResult_HolderCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HolderCommitmentTransactionDecodeErrorZ), "LDKCResult_HolderCommitmentTransactionDecodeErrorZ"); *ret_conv = CResult_HolderCommitmentTransactionDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_ok"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_ok"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_ok(uint64_t o) { LDKBuiltCommitmentTransaction o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = BuiltCommitmentTransaction_clone(&o_conv); LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_BuiltCommitmentTransactionDecodeErrorZ), "LDKCResult_BuiltCommitmentTransactionDecodeErrorZ"); *ret_conv = CResult_BuiltCommitmentTransactionDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_err"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_err"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_BuiltCommitmentTransactionDecodeErrorZ), "LDKCResult_BuiltCommitmentTransactionDecodeErrorZ"); *ret_conv = CResult_BuiltCommitmentTransactionDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_is_ok"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* o_conv = (LDKCResult_BuiltCommitmentTransactionDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_is_ok"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* o_conv = (LDKCResult_BuiltCommitmentTransactionDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_BuiltCommitmentTransactionDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_free"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_free"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_BuiltCommitmentTransactionDecodeErrorZ _res_conv = *(LDKCResult_BuiltCommitmentTransactionDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_BuiltCommitmentTransactionDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_BuiltCommitmentTransactionDecodeErrorZ_clone_ptr(LDKCResult_BuiltCommitmentTransactionDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_BuiltCommitmentTransactionDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_clone_ptr"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* arg_conv = (LDKCResult_BuiltCommitmentTransactionDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_BuiltCommitmentTransactionDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_clone"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* orig_conv = (LDKCResult_BuiltCommitmentTransactionDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_clone"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* orig_conv = (LDKCResult_BuiltCommitmentTransactionDecodeErrorZ*)untag_ptr(orig); LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_BuiltCommitmentTransactionDecodeErrorZ), "LDKCResult_BuiltCommitmentTransactionDecodeErrorZ"); *ret_conv = CResult_BuiltCommitmentTransactionDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_TrustedClosingTransactionNoneZ_ok"))) TS_CResult_TrustedClosingTransactionNoneZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_TrustedClosingTransactionNoneZ_ok"))) TS_CResult_TrustedClosingTransactionNoneZ_ok(uint64_t o) { LDKTrustedClosingTransaction o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); // 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_TrustedClosingTransactionNoneZ_err"))) TS_CResult_TrustedClosingTransactionNoneZ_err() { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_TrustedClosingTransactionNoneZ_is_ok"))) TS_CResult_TrustedClosingTransactionNoneZ_is_ok(uint32_t o) { - LDKCResult_TrustedClosingTransactionNoneZ* o_conv = (LDKCResult_TrustedClosingTransactionNoneZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_TrustedClosingTransactionNoneZ_is_ok"))) TS_CResult_TrustedClosingTransactionNoneZ_is_ok(uint64_t o) { + LDKCResult_TrustedClosingTransactionNoneZ* o_conv = (LDKCResult_TrustedClosingTransactionNoneZ*)untag_ptr(o); jboolean ret_conv = CResult_TrustedClosingTransactionNoneZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_TrustedClosingTransactionNoneZ_free"))) TS_CResult_TrustedClosingTransactionNoneZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_TrustedClosingTransactionNoneZ_free"))) TS_CResult_TrustedClosingTransactionNoneZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_TrustedClosingTransactionNoneZ _res_conv = *(LDKCResult_TrustedClosingTransactionNoneZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_TrustedClosingTransactionNoneZ_free(_res_conv); } -uint32_t __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_ok"))) TS_CResult_CommitmentTransactionDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_ok"))) TS_CResult_CommitmentTransactionDecodeErrorZ_ok(uint64_t o) { LDKCommitmentTransaction o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = CommitmentTransaction_clone(&o_conv); LDKCResult_CommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentTransactionDecodeErrorZ), "LDKCResult_CommitmentTransactionDecodeErrorZ"); *ret_conv = CResult_CommitmentTransactionDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_err"))) TS_CResult_CommitmentTransactionDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_err"))) TS_CResult_CommitmentTransactionDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_CommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentTransactionDecodeErrorZ), "LDKCResult_CommitmentTransactionDecodeErrorZ"); *ret_conv = CResult_CommitmentTransactionDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_is_ok"))) TS_CResult_CommitmentTransactionDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_CommitmentTransactionDecodeErrorZ* o_conv = (LDKCResult_CommitmentTransactionDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_is_ok"))) TS_CResult_CommitmentTransactionDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_CommitmentTransactionDecodeErrorZ* o_conv = (LDKCResult_CommitmentTransactionDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_CommitmentTransactionDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_free"))) TS_CResult_CommitmentTransactionDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_free"))) TS_CResult_CommitmentTransactionDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_CommitmentTransactionDecodeErrorZ _res_conv = *(LDKCResult_CommitmentTransactionDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_CommitmentTransactionDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_CommitmentTransactionDecodeErrorZ_clone_ptr(LDKCResult_CommitmentTransactionDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_CommitmentTransactionDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_clone_ptr"))) TS_CResult_CommitmentTransactionDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_CommitmentTransactionDecodeErrorZ* arg_conv = (LDKCResult_CommitmentTransactionDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_CommitmentTransactionDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_clone"))) TS_CResult_CommitmentTransactionDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_CommitmentTransactionDecodeErrorZ* orig_conv = (LDKCResult_CommitmentTransactionDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_clone"))) TS_CResult_CommitmentTransactionDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_CommitmentTransactionDecodeErrorZ* orig_conv = (LDKCResult_CommitmentTransactionDecodeErrorZ*)untag_ptr(orig); LDKCResult_CommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentTransactionDecodeErrorZ), "LDKCResult_CommitmentTransactionDecodeErrorZ"); *ret_conv = CResult_CommitmentTransactionDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_TrustedCommitmentTransactionNoneZ_ok"))) TS_CResult_TrustedCommitmentTransactionNoneZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_TrustedCommitmentTransactionNoneZ_ok"))) TS_CResult_TrustedCommitmentTransactionNoneZ_ok(uint64_t o) { LDKTrustedCommitmentTransaction o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); // 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_TrustedCommitmentTransactionNoneZ_err"))) TS_CResult_TrustedCommitmentTransactionNoneZ_err() { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_TrustedCommitmentTransactionNoneZ_is_ok"))) TS_CResult_TrustedCommitmentTransactionNoneZ_is_ok(uint32_t o) { - LDKCResult_TrustedCommitmentTransactionNoneZ* o_conv = (LDKCResult_TrustedCommitmentTransactionNoneZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_TrustedCommitmentTransactionNoneZ_is_ok"))) TS_CResult_TrustedCommitmentTransactionNoneZ_is_ok(uint64_t o) { + LDKCResult_TrustedCommitmentTransactionNoneZ* o_conv = (LDKCResult_TrustedCommitmentTransactionNoneZ*)untag_ptr(o); jboolean ret_conv = CResult_TrustedCommitmentTransactionNoneZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_TrustedCommitmentTransactionNoneZ_free"))) TS_CResult_TrustedCommitmentTransactionNoneZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_TrustedCommitmentTransactionNoneZ_free"))) TS_CResult_TrustedCommitmentTransactionNoneZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_TrustedCommitmentTransactionNoneZ _res_conv = *(LDKCResult_TrustedCommitmentTransactionNoneZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_TrustedCommitmentTransactionNoneZ_free(_res_conv); } -uint32_t __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_ok"))) TS_CResult_CVec_SignatureZNoneZ_ok(ptrArray o) { +uint64_t __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_ok"))) TS_CResult_CVec_SignatureZNoneZ_ok(ptrArray o) { LDKCVec_SignatureZ o_constr; o_constr.datalen = o->arr_len; if (o_constr.datalen > 0) @@ -12222,226 +10945,226 @@ uint32_t __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_ok"))) TS_ FREE(o); LDKCResult_CVec_SignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_SignatureZNoneZ), "LDKCResult_CVec_SignatureZNoneZ"); *ret_conv = CResult_CVec_SignatureZNoneZ_ok(o_constr); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_err"))) TS_CResult_CVec_SignatureZNoneZ_err() { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_is_ok"))) TS_CResult_CVec_SignatureZNoneZ_is_ok(uint32_t o) { - LDKCResult_CVec_SignatureZNoneZ* o_conv = (LDKCResult_CVec_SignatureZNoneZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_is_ok"))) TS_CResult_CVec_SignatureZNoneZ_is_ok(uint64_t o) { + LDKCResult_CVec_SignatureZNoneZ* o_conv = (LDKCResult_CVec_SignatureZNoneZ*)untag_ptr(o); jboolean ret_conv = CResult_CVec_SignatureZNoneZ_is_ok(o_conv); return ret_conv; } -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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_free"))) TS_CResult_CVec_SignatureZNoneZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_CVec_SignatureZNoneZ _res_conv = *(LDKCResult_CVec_SignatureZNoneZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_CVec_SignatureZNoneZ_free(_res_conv); } -static inline uintptr_t CResult_CVec_SignatureZNoneZ_clone_ptr(LDKCResult_CVec_SignatureZNoneZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_CVec_SignatureZNoneZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_clone_ptr"))) TS_CResult_CVec_SignatureZNoneZ_clone_ptr(uint64_t arg) { + LDKCResult_CVec_SignatureZNoneZ* arg_conv = (LDKCResult_CVec_SignatureZNoneZ*)untag_ptr(arg); + int64_t ret_conv = CResult_CVec_SignatureZNoneZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_clone"))) TS_CResult_CVec_SignatureZNoneZ_clone(uint32_t orig) { - LDKCResult_CVec_SignatureZNoneZ* orig_conv = (LDKCResult_CVec_SignatureZNoneZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_clone"))) TS_CResult_CVec_SignatureZNoneZ_clone(uint64_t orig) { + LDKCResult_CVec_SignatureZNoneZ* orig_conv = (LDKCResult_CVec_SignatureZNoneZ*)untag_ptr(orig); LDKCResult_CVec_SignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_SignatureZNoneZ), "LDKCResult_CVec_SignatureZNoneZ"); *ret_conv = CResult_CVec_SignatureZNoneZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_ok"))) TS_CResult_ShutdownScriptDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_ok"))) TS_CResult_ShutdownScriptDecodeErrorZ_ok(uint64_t o) { LDKShutdownScript o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ShutdownScript_clone(&o_conv); LDKCResult_ShutdownScriptDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptDecodeErrorZ), "LDKCResult_ShutdownScriptDecodeErrorZ"); *ret_conv = CResult_ShutdownScriptDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_err"))) TS_CResult_ShutdownScriptDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_err"))) TS_CResult_ShutdownScriptDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ShutdownScriptDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptDecodeErrorZ), "LDKCResult_ShutdownScriptDecodeErrorZ"); *ret_conv = CResult_ShutdownScriptDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_is_ok"))) TS_CResult_ShutdownScriptDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ShutdownScriptDecodeErrorZ* o_conv = (LDKCResult_ShutdownScriptDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_is_ok"))) TS_CResult_ShutdownScriptDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ShutdownScriptDecodeErrorZ* o_conv = (LDKCResult_ShutdownScriptDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ShutdownScriptDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_free"))) TS_CResult_ShutdownScriptDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_free"))) TS_CResult_ShutdownScriptDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ShutdownScriptDecodeErrorZ _res_conv = *(LDKCResult_ShutdownScriptDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ShutdownScriptDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ShutdownScriptDecodeErrorZ_clone_ptr(LDKCResult_ShutdownScriptDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_ShutdownScriptDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_clone_ptr"))) TS_CResult_ShutdownScriptDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ShutdownScriptDecodeErrorZ* arg_conv = (LDKCResult_ShutdownScriptDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ShutdownScriptDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_clone"))) TS_CResult_ShutdownScriptDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ShutdownScriptDecodeErrorZ* orig_conv = (LDKCResult_ShutdownScriptDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_clone"))) TS_CResult_ShutdownScriptDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ShutdownScriptDecodeErrorZ* orig_conv = (LDKCResult_ShutdownScriptDecodeErrorZ*)untag_ptr(orig); LDKCResult_ShutdownScriptDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptDecodeErrorZ), "LDKCResult_ShutdownScriptDecodeErrorZ"); *ret_conv = CResult_ShutdownScriptDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_ok"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_ok"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_ok(uint64_t o) { LDKShutdownScript o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ShutdownScript_clone(&o_conv); LDKCResult_ShutdownScriptInvalidShutdownScriptZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptInvalidShutdownScriptZ), "LDKCResult_ShutdownScriptInvalidShutdownScriptZ"); *ret_conv = CResult_ShutdownScriptInvalidShutdownScriptZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_err"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_err"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_err(uint64_t e) { LDKInvalidShutdownScript e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = InvalidShutdownScript_clone(&e_conv); LDKCResult_ShutdownScriptInvalidShutdownScriptZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptInvalidShutdownScriptZ), "LDKCResult_ShutdownScriptInvalidShutdownScriptZ"); *ret_conv = CResult_ShutdownScriptInvalidShutdownScriptZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_is_ok"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_is_ok(uint32_t o) { - LDKCResult_ShutdownScriptInvalidShutdownScriptZ* o_conv = (LDKCResult_ShutdownScriptInvalidShutdownScriptZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_is_ok"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_is_ok(uint64_t o) { + LDKCResult_ShutdownScriptInvalidShutdownScriptZ* o_conv = (LDKCResult_ShutdownScriptInvalidShutdownScriptZ*)untag_ptr(o); jboolean ret_conv = CResult_ShutdownScriptInvalidShutdownScriptZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_free"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_free"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ShutdownScriptInvalidShutdownScriptZ _res_conv = *(LDKCResult_ShutdownScriptInvalidShutdownScriptZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ShutdownScriptInvalidShutdownScriptZ_free(_res_conv); } -static inline uintptr_t CResult_ShutdownScriptInvalidShutdownScriptZ_clone_ptr(LDKCResult_ShutdownScriptInvalidShutdownScriptZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_ShutdownScriptInvalidShutdownScriptZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_clone_ptr"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_clone_ptr(uint64_t arg) { + LDKCResult_ShutdownScriptInvalidShutdownScriptZ* arg_conv = (LDKCResult_ShutdownScriptInvalidShutdownScriptZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ShutdownScriptInvalidShutdownScriptZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_clone"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_clone(uint32_t orig) { - LDKCResult_ShutdownScriptInvalidShutdownScriptZ* orig_conv = (LDKCResult_ShutdownScriptInvalidShutdownScriptZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_clone"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_clone(uint64_t orig) { + LDKCResult_ShutdownScriptInvalidShutdownScriptZ* orig_conv = (LDKCResult_ShutdownScriptInvalidShutdownScriptZ*)untag_ptr(orig); LDKCResult_ShutdownScriptInvalidShutdownScriptZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptInvalidShutdownScriptZ), "LDKCResult_ShutdownScriptInvalidShutdownScriptZ"); *ret_conv = CResult_ShutdownScriptInvalidShutdownScriptZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_ok"))) TS_CResult_RouteHopDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_ok"))) TS_CResult_RouteHopDecodeErrorZ_ok(uint64_t o) { LDKRouteHop o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = RouteHop_clone(&o_conv); LDKCResult_RouteHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHopDecodeErrorZ), "LDKCResult_RouteHopDecodeErrorZ"); *ret_conv = CResult_RouteHopDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_err"))) TS_CResult_RouteHopDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_err"))) TS_CResult_RouteHopDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_RouteHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHopDecodeErrorZ), "LDKCResult_RouteHopDecodeErrorZ"); *ret_conv = CResult_RouteHopDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_is_ok"))) TS_CResult_RouteHopDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_RouteHopDecodeErrorZ* o_conv = (LDKCResult_RouteHopDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_is_ok"))) TS_CResult_RouteHopDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_RouteHopDecodeErrorZ* o_conv = (LDKCResult_RouteHopDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_RouteHopDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_free"))) TS_CResult_RouteHopDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_free"))) TS_CResult_RouteHopDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_RouteHopDecodeErrorZ _res_conv = *(LDKCResult_RouteHopDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_RouteHopDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_RouteHopDecodeErrorZ_clone_ptr(LDKCResult_RouteHopDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_RouteHopDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_clone_ptr"))) TS_CResult_RouteHopDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_RouteHopDecodeErrorZ* arg_conv = (LDKCResult_RouteHopDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_RouteHopDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_clone"))) TS_CResult_RouteHopDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_RouteHopDecodeErrorZ* orig_conv = (LDKCResult_RouteHopDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_clone"))) TS_CResult_RouteHopDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_RouteHopDecodeErrorZ* orig_conv = (LDKCResult_RouteHopDecodeErrorZ*)untag_ptr(orig); LDKCResult_RouteHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHopDecodeErrorZ), "LDKCResult_RouteHopDecodeErrorZ"); *ret_conv = CResult_RouteHopDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_CVec_RouteHopZ_free"))) TS_CVec_RouteHopZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_RouteHopZ_free"))) TS_CVec_RouteHopZ_free(uint64_tArray _res) { LDKCVec_RouteHopZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKRouteHop), "LDKCVec_RouteHopZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t k = 0; k < _res_constr.datalen; k++) { - uint32_t _res_conv_10 = _res_vals[k]; + uint64_t _res_conv_10 = _res_vals[k]; LDKRouteHop _res_conv_10_conv; - _res_conv_10_conv.inner = (void*)(_res_conv_10 & (~1)); - _res_conv_10_conv.is_owned = (_res_conv_10 & 1) || (_res_conv_10 == 0); + _res_conv_10_conv.inner = untag_ptr(_res_conv_10); + _res_conv_10_conv.is_owned = ptr_is_owned(_res_conv_10); CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_10_conv); _res_constr.data[k] = _res_conv_10_conv; } @@ -12456,21 +11179,21 @@ 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; + uint64_tArray* _res_vals = (void*) _res->elems; for (size_t m = 0; m < _res_constr.datalen; m++) { - uint32_tArray _res_conv_12 = _res_vals[m]; + uint64_tArray _res_conv_12 = _res_vals[m]; LDKCVec_RouteHopZ _res_conv_12_constr; _res_conv_12_constr.datalen = _res_conv_12->arr_len; if (_res_conv_12_constr.datalen > 0) _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; + uint64_t* _res_conv_12_vals = _res_conv_12->elems; for (size_t k = 0; k < _res_conv_12_constr.datalen; k++) { - uint32_t _res_conv_12_conv_10 = _res_conv_12_vals[k]; + uint64_t _res_conv_12_conv_10 = _res_conv_12_vals[k]; LDKRouteHop _res_conv_12_conv_10_conv; - _res_conv_12_conv_10_conv.inner = (void*)(_res_conv_12_conv_10 & (~1)); - _res_conv_12_conv_10_conv.is_owned = (_res_conv_12_conv_10 & 1) || (_res_conv_12_conv_10 == 0); + _res_conv_12_conv_10_conv.inner = untag_ptr(_res_conv_12_conv_10); + _res_conv_12_conv_10_conv.is_owned = ptr_is_owned(_res_conv_12_conv_10); CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_12_conv_10_conv); _res_conv_12_constr.data[k] = _res_conv_12_conv_10_conv; } @@ -12481,129 +11204,129 @@ void __attribute__((export_name("TS_CVec_CVec_RouteHopZZ_free"))) TS_CVec_CVec_ CVec_CVec_RouteHopZZ_free(_res_constr); } -uint32_t __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_ok"))) TS_CResult_RouteDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_ok"))) TS_CResult_RouteDecodeErrorZ_ok(uint64_t o) { LDKRoute o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = Route_clone(&o_conv); LDKCResult_RouteDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteDecodeErrorZ), "LDKCResult_RouteDecodeErrorZ"); *ret_conv = CResult_RouteDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_err"))) TS_CResult_RouteDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_err"))) TS_CResult_RouteDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_RouteDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteDecodeErrorZ), "LDKCResult_RouteDecodeErrorZ"); *ret_conv = CResult_RouteDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_is_ok"))) TS_CResult_RouteDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_RouteDecodeErrorZ* o_conv = (LDKCResult_RouteDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_is_ok"))) TS_CResult_RouteDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_RouteDecodeErrorZ* o_conv = (LDKCResult_RouteDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_RouteDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_free"))) TS_CResult_RouteDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_free"))) TS_CResult_RouteDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_RouteDecodeErrorZ _res_conv = *(LDKCResult_RouteDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_RouteDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_RouteDecodeErrorZ_clone_ptr(LDKCResult_RouteDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_RouteDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_clone_ptr"))) TS_CResult_RouteDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_RouteDecodeErrorZ* arg_conv = (LDKCResult_RouteDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_RouteDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_clone"))) TS_CResult_RouteDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_RouteDecodeErrorZ* orig_conv = (LDKCResult_RouteDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_clone"))) TS_CResult_RouteDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_RouteDecodeErrorZ* orig_conv = (LDKCResult_RouteDecodeErrorZ*)untag_ptr(orig); LDKCResult_RouteDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteDecodeErrorZ), "LDKCResult_RouteDecodeErrorZ"); *ret_conv = CResult_RouteDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_ok"))) TS_CResult_RouteParametersDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_ok"))) TS_CResult_RouteParametersDecodeErrorZ_ok(uint64_t o) { LDKRouteParameters o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = RouteParameters_clone(&o_conv); LDKCResult_RouteParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteParametersDecodeErrorZ), "LDKCResult_RouteParametersDecodeErrorZ"); *ret_conv = CResult_RouteParametersDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_err"))) TS_CResult_RouteParametersDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_err"))) TS_CResult_RouteParametersDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_RouteParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteParametersDecodeErrorZ), "LDKCResult_RouteParametersDecodeErrorZ"); *ret_conv = CResult_RouteParametersDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_is_ok"))) TS_CResult_RouteParametersDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_RouteParametersDecodeErrorZ* o_conv = (LDKCResult_RouteParametersDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_is_ok"))) TS_CResult_RouteParametersDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_RouteParametersDecodeErrorZ* o_conv = (LDKCResult_RouteParametersDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_RouteParametersDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_free"))) TS_CResult_RouteParametersDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_free"))) TS_CResult_RouteParametersDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_RouteParametersDecodeErrorZ _res_conv = *(LDKCResult_RouteParametersDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_RouteParametersDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_RouteParametersDecodeErrorZ_clone_ptr(LDKCResult_RouteParametersDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_RouteParametersDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_clone_ptr"))) TS_CResult_RouteParametersDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_RouteParametersDecodeErrorZ* arg_conv = (LDKCResult_RouteParametersDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_RouteParametersDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_clone"))) TS_CResult_RouteParametersDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_RouteParametersDecodeErrorZ* orig_conv = (LDKCResult_RouteParametersDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_clone"))) TS_CResult_RouteParametersDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_RouteParametersDecodeErrorZ* orig_conv = (LDKCResult_RouteParametersDecodeErrorZ*)untag_ptr(orig); LDKCResult_RouteParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteParametersDecodeErrorZ), "LDKCResult_RouteParametersDecodeErrorZ"); *ret_conv = CResult_RouteParametersDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_CVec_RouteHintZ_free"))) TS_CVec_RouteHintZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_RouteHintZ_free"))) TS_CVec_RouteHintZ_free(uint64_tArray _res) { LDKCVec_RouteHintZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKRouteHint), "LDKCVec_RouteHintZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t l = 0; l < _res_constr.datalen; l++) { - uint32_t _res_conv_11 = _res_vals[l]; + uint64_t _res_conv_11 = _res_vals[l]; LDKRouteHint _res_conv_11_conv; - _res_conv_11_conv.inner = (void*)(_res_conv_11 & (~1)); - _res_conv_11_conv.is_owned = (_res_conv_11 & 1) || (_res_conv_11 == 0); + _res_conv_11_conv.inner = untag_ptr(_res_conv_11); + _res_conv_11_conv.is_owned = ptr_is_owned(_res_conv_11); CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_11_conv); _res_constr.data[l] = _res_conv_11_conv; } @@ -12611,46 +11334,46 @@ void __attribute__((export_name("TS_CVec_RouteHintZ_free"))) TS_CVec_RouteHintZ CVec_RouteHintZ_free(_res_constr); } -uint32_t __attribute__((export_name("TS_COption_u64Z_some"))) TS_COption_u64Z_some(int64_t o) { +uint64_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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_u64Z_none"))) TS_COption_u64Z_none() { +uint64_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(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_COption_u64Z_free"))) TS_COption_u64Z_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCOption_u64Z _res_conv = *(LDKCOption_u64Z*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); COption_u64Z_free(_res_conv); } -static inline uintptr_t COption_u64Z_clone_ptr(LDKCOption_u64Z *NONNULL_PTR arg) { +static inline uint64_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); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_u64Z_clone_ptr"))) TS_COption_u64Z_clone_ptr(uint32_t arg) { - LDKCOption_u64Z* arg_conv = (LDKCOption_u64Z*)arg; - uint32_t ret_conv = COption_u64Z_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_COption_u64Z_clone_ptr"))) TS_COption_u64Z_clone_ptr(uint64_t arg) { + LDKCOption_u64Z* arg_conv = (LDKCOption_u64Z*)untag_ptr(arg); + int64_t ret_conv = COption_u64Z_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_COption_u64Z_clone"))) TS_COption_u64Z_clone(uint32_t orig) { - LDKCOption_u64Z* orig_conv = (LDKCOption_u64Z*)orig; +uint64_t __attribute__((export_name("TS_COption_u64Z_clone"))) TS_COption_u64Z_clone(uint64_t orig) { + LDKCOption_u64Z* orig_conv = (LDKCOption_u64Z*)untag_ptr(orig); LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = COption_u64Z_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } @@ -12670,74 +11393,74 @@ void __attribute__((export_name("TS_CVec_u64Z_free"))) TS_CVec_u64Z_free(int64_ CVec_u64Z_free(_res_constr); } -uint32_t __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_ok"))) TS_CResult_PaymentParametersDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_ok"))) TS_CResult_PaymentParametersDecodeErrorZ_ok(uint64_t o) { LDKPaymentParameters o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = PaymentParameters_clone(&o_conv); LDKCResult_PaymentParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentParametersDecodeErrorZ), "LDKCResult_PaymentParametersDecodeErrorZ"); *ret_conv = CResult_PaymentParametersDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_err"))) TS_CResult_PaymentParametersDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_err"))) TS_CResult_PaymentParametersDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_PaymentParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentParametersDecodeErrorZ), "LDKCResult_PaymentParametersDecodeErrorZ"); *ret_conv = CResult_PaymentParametersDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_is_ok"))) TS_CResult_PaymentParametersDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_PaymentParametersDecodeErrorZ* o_conv = (LDKCResult_PaymentParametersDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_is_ok"))) TS_CResult_PaymentParametersDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_PaymentParametersDecodeErrorZ* o_conv = (LDKCResult_PaymentParametersDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_PaymentParametersDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_free"))) TS_CResult_PaymentParametersDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_free"))) TS_CResult_PaymentParametersDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_PaymentParametersDecodeErrorZ _res_conv = *(LDKCResult_PaymentParametersDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_PaymentParametersDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_PaymentParametersDecodeErrorZ_clone_ptr(LDKCResult_PaymentParametersDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_PaymentParametersDecodeErrorZ_clone_ptr(LDKCResult_PaymentParametersDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_PaymentParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentParametersDecodeErrorZ), "LDKCResult_PaymentParametersDecodeErrorZ"); *ret_conv = CResult_PaymentParametersDecodeErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_clone_ptr"))) TS_CResult_PaymentParametersDecodeErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_PaymentParametersDecodeErrorZ* arg_conv = (LDKCResult_PaymentParametersDecodeErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_PaymentParametersDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_clone_ptr"))) TS_CResult_PaymentParametersDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_PaymentParametersDecodeErrorZ* arg_conv = (LDKCResult_PaymentParametersDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_PaymentParametersDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_clone"))) TS_CResult_PaymentParametersDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_PaymentParametersDecodeErrorZ* orig_conv = (LDKCResult_PaymentParametersDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_clone"))) TS_CResult_PaymentParametersDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_PaymentParametersDecodeErrorZ* orig_conv = (LDKCResult_PaymentParametersDecodeErrorZ*)untag_ptr(orig); LDKCResult_PaymentParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentParametersDecodeErrorZ), "LDKCResult_PaymentParametersDecodeErrorZ"); *ret_conv = CResult_PaymentParametersDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_CVec_RouteHintHopZ_free"))) TS_CVec_RouteHintHopZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_RouteHintHopZ_free"))) TS_CVec_RouteHintHopZ_free(uint64_tArray _res) { LDKCVec_RouteHintHopZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKRouteHintHop), "LDKCVec_RouteHintHopZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t o = 0; o < _res_constr.datalen; o++) { - uint32_t _res_conv_14 = _res_vals[o]; + uint64_t _res_conv_14 = _res_vals[o]; LDKRouteHintHop _res_conv_14_conv; - _res_conv_14_conv.inner = (void*)(_res_conv_14 & (~1)); - _res_conv_14_conv.is_owned = (_res_conv_14 & 1) || (_res_conv_14 == 0); + _res_conv_14_conv.inner = untag_ptr(_res_conv_14); + _res_conv_14_conv.is_owned = ptr_is_owned(_res_conv_14); CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_14_conv); _res_constr.data[o] = _res_conv_14_conv; } @@ -12745,129 +11468,129 @@ void __attribute__((export_name("TS_CVec_RouteHintHopZ_free"))) TS_CVec_RouteHi CVec_RouteHintHopZ_free(_res_constr); } -uint32_t __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_ok"))) TS_CResult_RouteHintDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_ok"))) TS_CResult_RouteHintDecodeErrorZ_ok(uint64_t o) { LDKRouteHint o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = RouteHint_clone(&o_conv); LDKCResult_RouteHintDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintDecodeErrorZ), "LDKCResult_RouteHintDecodeErrorZ"); *ret_conv = CResult_RouteHintDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_err"))) TS_CResult_RouteHintDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_err"))) TS_CResult_RouteHintDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_RouteHintDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintDecodeErrorZ), "LDKCResult_RouteHintDecodeErrorZ"); *ret_conv = CResult_RouteHintDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_is_ok"))) TS_CResult_RouteHintDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_RouteHintDecodeErrorZ* o_conv = (LDKCResult_RouteHintDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_is_ok"))) TS_CResult_RouteHintDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_RouteHintDecodeErrorZ* o_conv = (LDKCResult_RouteHintDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_RouteHintDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_free"))) TS_CResult_RouteHintDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_free"))) TS_CResult_RouteHintDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_RouteHintDecodeErrorZ _res_conv = *(LDKCResult_RouteHintDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_RouteHintDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_RouteHintDecodeErrorZ_clone_ptr(LDKCResult_RouteHintDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_RouteHintDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_clone_ptr"))) TS_CResult_RouteHintDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_RouteHintDecodeErrorZ* arg_conv = (LDKCResult_RouteHintDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_RouteHintDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_clone"))) TS_CResult_RouteHintDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_RouteHintDecodeErrorZ* orig_conv = (LDKCResult_RouteHintDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_clone"))) TS_CResult_RouteHintDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_RouteHintDecodeErrorZ* orig_conv = (LDKCResult_RouteHintDecodeErrorZ*)untag_ptr(orig); LDKCResult_RouteHintDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintDecodeErrorZ), "LDKCResult_RouteHintDecodeErrorZ"); *ret_conv = CResult_RouteHintDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_ok"))) TS_CResult_RouteHintHopDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_ok"))) TS_CResult_RouteHintHopDecodeErrorZ_ok(uint64_t o) { LDKRouteHintHop o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = RouteHintHop_clone(&o_conv); LDKCResult_RouteHintHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintHopDecodeErrorZ), "LDKCResult_RouteHintHopDecodeErrorZ"); *ret_conv = CResult_RouteHintHopDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_err"))) TS_CResult_RouteHintHopDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_err"))) TS_CResult_RouteHintHopDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_RouteHintHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintHopDecodeErrorZ), "LDKCResult_RouteHintHopDecodeErrorZ"); *ret_conv = CResult_RouteHintHopDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_is_ok"))) TS_CResult_RouteHintHopDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_RouteHintHopDecodeErrorZ* o_conv = (LDKCResult_RouteHintHopDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_is_ok"))) TS_CResult_RouteHintHopDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_RouteHintHopDecodeErrorZ* o_conv = (LDKCResult_RouteHintHopDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_RouteHintHopDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_free"))) TS_CResult_RouteHintHopDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_free"))) TS_CResult_RouteHintHopDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_RouteHintHopDecodeErrorZ _res_conv = *(LDKCResult_RouteHintHopDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_RouteHintHopDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_RouteHintHopDecodeErrorZ_clone_ptr(LDKCResult_RouteHintHopDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_RouteHintHopDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_clone_ptr"))) TS_CResult_RouteHintHopDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_RouteHintHopDecodeErrorZ* arg_conv = (LDKCResult_RouteHintHopDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_RouteHintHopDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_clone"))) TS_CResult_RouteHintHopDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_RouteHintHopDecodeErrorZ* orig_conv = (LDKCResult_RouteHintHopDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_clone"))) TS_CResult_RouteHintHopDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_RouteHintHopDecodeErrorZ* orig_conv = (LDKCResult_RouteHintHopDecodeErrorZ*)untag_ptr(orig); LDKCResult_RouteHintHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintHopDecodeErrorZ), "LDKCResult_RouteHintHopDecodeErrorZ"); *ret_conv = CResult_RouteHintHopDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_CVec_ChannelDetailsZ_free"))) TS_CVec_ChannelDetailsZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_ChannelDetailsZ_free"))) TS_CVec_ChannelDetailsZ_free(uint64_tArray _res) { LDKCVec_ChannelDetailsZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKChannelDetails), "LDKCVec_ChannelDetailsZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t q = 0; q < _res_constr.datalen; q++) { - uint32_t _res_conv_16 = _res_vals[q]; + uint64_t _res_conv_16 = _res_vals[q]; LDKChannelDetails _res_conv_16_conv; - _res_conv_16_conv.inner = (void*)(_res_conv_16 & (~1)); - _res_conv_16_conv.is_owned = (_res_conv_16 & 1) || (_res_conv_16 == 0); + _res_conv_16_conv.inner = untag_ptr(_res_conv_16); + _res_conv_16_conv.is_owned = ptr_is_owned(_res_conv_16); CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_16_conv); _res_constr.data[q] = _res_conv_16_conv; } @@ -12875,59 +11598,59 @@ void __attribute__((export_name("TS_CVec_ChannelDetailsZ_free"))) TS_CVec_Chann CVec_ChannelDetailsZ_free(_res_constr); } -uint32_t __attribute__((export_name("TS_CResult_RouteLightningErrorZ_ok"))) TS_CResult_RouteLightningErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_RouteLightningErrorZ_ok"))) TS_CResult_RouteLightningErrorZ_ok(uint64_t o) { LDKRoute o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = Route_clone(&o_conv); LDKCResult_RouteLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteLightningErrorZ), "LDKCResult_RouteLightningErrorZ"); *ret_conv = CResult_RouteLightningErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_RouteLightningErrorZ_err"))) TS_CResult_RouteLightningErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_RouteLightningErrorZ_err"))) TS_CResult_RouteLightningErrorZ_err(uint64_t e) { LDKLightningError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = LightningError_clone(&e_conv); LDKCResult_RouteLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteLightningErrorZ), "LDKCResult_RouteLightningErrorZ"); *ret_conv = CResult_RouteLightningErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_RouteLightningErrorZ_is_ok"))) TS_CResult_RouteLightningErrorZ_is_ok(uint32_t o) { - LDKCResult_RouteLightningErrorZ* o_conv = (LDKCResult_RouteLightningErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_RouteLightningErrorZ_is_ok"))) TS_CResult_RouteLightningErrorZ_is_ok(uint64_t o) { + LDKCResult_RouteLightningErrorZ* o_conv = (LDKCResult_RouteLightningErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_RouteLightningErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_RouteLightningErrorZ_free"))) TS_CResult_RouteLightningErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_RouteLightningErrorZ_free"))) TS_CResult_RouteLightningErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_RouteLightningErrorZ _res_conv = *(LDKCResult_RouteLightningErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_RouteLightningErrorZ_free(_res_conv); } -static inline uintptr_t CResult_RouteLightningErrorZ_clone_ptr(LDKCResult_RouteLightningErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_RouteLightningErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_RouteLightningErrorZ_clone_ptr"))) TS_CResult_RouteLightningErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_RouteLightningErrorZ* arg_conv = (LDKCResult_RouteLightningErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_RouteLightningErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_RouteLightningErrorZ_clone"))) TS_CResult_RouteLightningErrorZ_clone(uint32_t orig) { - LDKCResult_RouteLightningErrorZ* orig_conv = (LDKCResult_RouteLightningErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_RouteLightningErrorZ_clone"))) TS_CResult_RouteLightningErrorZ_clone(uint64_t orig) { + LDKCResult_RouteLightningErrorZ* orig_conv = (LDKCResult_RouteLightningErrorZ*)untag_ptr(orig); LDKCResult_RouteLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteLightningErrorZ), "LDKCResult_RouteLightningErrorZ"); *ret_conv = CResult_RouteLightningErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } void __attribute__((export_name("TS_CVec_PublicKeyZ_free"))) TS_CVec_PublicKeyZ_free(ptrArray _res) { @@ -12949,519 +11672,519 @@ void __attribute__((export_name("TS_CVec_PublicKeyZ_free"))) TS_CVec_PublicKeyZ CVec_PublicKeyZ_free(_res_constr); } -uint32_t __attribute__((export_name("TS_CResult_PaymentPurposeDecodeErrorZ_ok"))) TS_CResult_PaymentPurposeDecodeErrorZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_CResult_PaymentPurposeDecodeErrorZ_ok"))) TS_CResult_PaymentPurposeDecodeErrorZ_ok(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKPaymentPurpose o_conv = *(LDKPaymentPurpose*)(o_ptr); - o_conv = PaymentPurpose_clone((LDKPaymentPurpose*)(((uintptr_t)o) & ~1)); + o_conv = PaymentPurpose_clone((LDKPaymentPurpose*)untag_ptr(o)); LDKCResult_PaymentPurposeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentPurposeDecodeErrorZ), "LDKCResult_PaymentPurposeDecodeErrorZ"); *ret_conv = CResult_PaymentPurposeDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PaymentPurposeDecodeErrorZ_err"))) TS_CResult_PaymentPurposeDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_PaymentPurposeDecodeErrorZ_err"))) TS_CResult_PaymentPurposeDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_PaymentPurposeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentPurposeDecodeErrorZ), "LDKCResult_PaymentPurposeDecodeErrorZ"); *ret_conv = CResult_PaymentPurposeDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_PaymentPurposeDecodeErrorZ_is_ok"))) TS_CResult_PaymentPurposeDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_PaymentPurposeDecodeErrorZ* o_conv = (LDKCResult_PaymentPurposeDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_PaymentPurposeDecodeErrorZ_is_ok"))) TS_CResult_PaymentPurposeDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_PaymentPurposeDecodeErrorZ* o_conv = (LDKCResult_PaymentPurposeDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_PaymentPurposeDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_PaymentPurposeDecodeErrorZ_free"))) TS_CResult_PaymentPurposeDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_PaymentPurposeDecodeErrorZ_free"))) TS_CResult_PaymentPurposeDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_PaymentPurposeDecodeErrorZ _res_conv = *(LDKCResult_PaymentPurposeDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_PaymentPurposeDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_PaymentPurposeDecodeErrorZ_clone_ptr(LDKCResult_PaymentPurposeDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_PaymentPurposeDecodeErrorZ_clone_ptr(LDKCResult_PaymentPurposeDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_PaymentPurposeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentPurposeDecodeErrorZ), "LDKCResult_PaymentPurposeDecodeErrorZ"); *ret_conv = CResult_PaymentPurposeDecodeErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PaymentPurposeDecodeErrorZ_clone_ptr"))) TS_CResult_PaymentPurposeDecodeErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_PaymentPurposeDecodeErrorZ* arg_conv = (LDKCResult_PaymentPurposeDecodeErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_PaymentPurposeDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_PaymentPurposeDecodeErrorZ_clone_ptr"))) TS_CResult_PaymentPurposeDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_PaymentPurposeDecodeErrorZ* arg_conv = (LDKCResult_PaymentPurposeDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_PaymentPurposeDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_PaymentPurposeDecodeErrorZ_clone"))) TS_CResult_PaymentPurposeDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_PaymentPurposeDecodeErrorZ* orig_conv = (LDKCResult_PaymentPurposeDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_PaymentPurposeDecodeErrorZ_clone"))) TS_CResult_PaymentPurposeDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_PaymentPurposeDecodeErrorZ* orig_conv = (LDKCResult_PaymentPurposeDecodeErrorZ*)untag_ptr(orig); LDKCResult_PaymentPurposeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentPurposeDecodeErrorZ), "LDKCResult_PaymentPurposeDecodeErrorZ"); *ret_conv = CResult_PaymentPurposeDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_COption_ClosureReasonZ_some"))) TS_COption_ClosureReasonZ_some(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_COption_ClosureReasonZ_some"))) TS_COption_ClosureReasonZ_some(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKClosureReason o_conv = *(LDKClosureReason*)(o_ptr); - o_conv = ClosureReason_clone((LDKClosureReason*)(((uintptr_t)o) & ~1)); + o_conv = ClosureReason_clone((LDKClosureReason*)untag_ptr(o)); LDKCOption_ClosureReasonZ *ret_copy = MALLOC(sizeof(LDKCOption_ClosureReasonZ), "LDKCOption_ClosureReasonZ"); *ret_copy = COption_ClosureReasonZ_some(o_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_ClosureReasonZ_none"))) TS_COption_ClosureReasonZ_none() { +uint64_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(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_COption_ClosureReasonZ_free"))) TS_COption_ClosureReasonZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCOption_ClosureReasonZ _res_conv = *(LDKCOption_ClosureReasonZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); COption_ClosureReasonZ_free(_res_conv); } -static inline uintptr_t COption_ClosureReasonZ_clone_ptr(LDKCOption_ClosureReasonZ *NONNULL_PTR arg) { +static inline uint64_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); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_ClosureReasonZ_clone_ptr"))) TS_COption_ClosureReasonZ_clone_ptr(uint32_t arg) { - LDKCOption_ClosureReasonZ* arg_conv = (LDKCOption_ClosureReasonZ*)arg; - uint32_t ret_conv = COption_ClosureReasonZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_COption_ClosureReasonZ_clone_ptr"))) TS_COption_ClosureReasonZ_clone_ptr(uint64_t arg) { + LDKCOption_ClosureReasonZ* arg_conv = (LDKCOption_ClosureReasonZ*)untag_ptr(arg); + int64_t ret_conv = COption_ClosureReasonZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_COption_ClosureReasonZ_clone"))) TS_COption_ClosureReasonZ_clone(uint32_t orig) { - LDKCOption_ClosureReasonZ* orig_conv = (LDKCOption_ClosureReasonZ*)orig; +uint64_t __attribute__((export_name("TS_COption_ClosureReasonZ_clone"))) TS_COption_ClosureReasonZ_clone(uint64_t orig) { + LDKCOption_ClosureReasonZ* orig_conv = (LDKCOption_ClosureReasonZ*)untag_ptr(orig); LDKCOption_ClosureReasonZ *ret_copy = MALLOC(sizeof(LDKCOption_ClosureReasonZ), "LDKCOption_ClosureReasonZ"); *ret_copy = COption_ClosureReasonZ_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErrorZ_ok"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_ok(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKCOption_ClosureReasonZ o_conv = *(LDKCOption_ClosureReasonZ*)(o_ptr); - o_conv = COption_ClosureReasonZ_clone((LDKCOption_ClosureReasonZ*)(((uintptr_t)o) & ~1)); + o_conv = COption_ClosureReasonZ_clone((LDKCOption_ClosureReasonZ*)untag_ptr(o)); LDKCResult_COption_ClosureReasonZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_ClosureReasonZDecodeErrorZ), "LDKCResult_COption_ClosureReasonZDecodeErrorZ"); *ret_conv = CResult_COption_ClosureReasonZDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErrorZ_err"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErrorZ_err"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErrorZ_is_ok"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_COption_ClosureReasonZDecodeErrorZ* o_conv = (LDKCResult_COption_ClosureReasonZDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErrorZ_is_ok"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_COption_ClosureReasonZDecodeErrorZ* o_conv = (LDKCResult_COption_ClosureReasonZDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_COption_ClosureReasonZDecodeErrorZ_is_ok(o_conv); return ret_conv; } -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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErrorZ_free"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_COption_ClosureReasonZDecodeErrorZ _res_conv = *(LDKCResult_COption_ClosureReasonZDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_COption_ClosureReasonZDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_COption_ClosureReasonZDecodeErrorZ_clone_ptr(LDKCResult_COption_ClosureReasonZDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_COption_ClosureReasonZDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErrorZ_clone_ptr"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_COption_ClosureReasonZDecodeErrorZ* arg_conv = (LDKCResult_COption_ClosureReasonZDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_COption_ClosureReasonZDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErrorZ_clone"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_COption_ClosureReasonZDecodeErrorZ* orig_conv = (LDKCResult_COption_ClosureReasonZDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErrorZ_clone"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_COption_ClosureReasonZDecodeErrorZ* orig_conv = (LDKCResult_COption_ClosureReasonZDecodeErrorZ*)untag_ptr(orig); LDKCResult_COption_ClosureReasonZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_ClosureReasonZDecodeErrorZ), "LDKCResult_COption_ClosureReasonZDecodeErrorZ"); *ret_conv = CResult_COption_ClosureReasonZDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_COption_HTLCDestinationZ_some"))) TS_COption_HTLCDestinationZ_some(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_COption_HTLCDestinationZ_some"))) TS_COption_HTLCDestinationZ_some(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKHTLCDestination o_conv = *(LDKHTLCDestination*)(o_ptr); - o_conv = HTLCDestination_clone((LDKHTLCDestination*)(((uintptr_t)o) & ~1)); + o_conv = HTLCDestination_clone((LDKHTLCDestination*)untag_ptr(o)); LDKCOption_HTLCDestinationZ *ret_copy = MALLOC(sizeof(LDKCOption_HTLCDestinationZ), "LDKCOption_HTLCDestinationZ"); *ret_copy = COption_HTLCDestinationZ_some(o_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_HTLCDestinationZ_none"))) TS_COption_HTLCDestinationZ_none() { +uint64_t __attribute__((export_name("TS_COption_HTLCDestinationZ_none"))) TS_COption_HTLCDestinationZ_none() { LDKCOption_HTLCDestinationZ *ret_copy = MALLOC(sizeof(LDKCOption_HTLCDestinationZ), "LDKCOption_HTLCDestinationZ"); *ret_copy = COption_HTLCDestinationZ_none(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_COption_HTLCDestinationZ_free"))) TS_COption_HTLCDestinationZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_COption_HTLCDestinationZ_free"))) TS_COption_HTLCDestinationZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCOption_HTLCDestinationZ _res_conv = *(LDKCOption_HTLCDestinationZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); COption_HTLCDestinationZ_free(_res_conv); } -static inline uintptr_t COption_HTLCDestinationZ_clone_ptr(LDKCOption_HTLCDestinationZ *NONNULL_PTR arg) { +static inline uint64_t COption_HTLCDestinationZ_clone_ptr(LDKCOption_HTLCDestinationZ *NONNULL_PTR arg) { LDKCOption_HTLCDestinationZ *ret_copy = MALLOC(sizeof(LDKCOption_HTLCDestinationZ), "LDKCOption_HTLCDestinationZ"); *ret_copy = COption_HTLCDestinationZ_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_HTLCDestinationZ_clone_ptr"))) TS_COption_HTLCDestinationZ_clone_ptr(uint32_t arg) { - LDKCOption_HTLCDestinationZ* arg_conv = (LDKCOption_HTLCDestinationZ*)arg; - uint32_t ret_conv = COption_HTLCDestinationZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_COption_HTLCDestinationZ_clone_ptr"))) TS_COption_HTLCDestinationZ_clone_ptr(uint64_t arg) { + LDKCOption_HTLCDestinationZ* arg_conv = (LDKCOption_HTLCDestinationZ*)untag_ptr(arg); + int64_t ret_conv = COption_HTLCDestinationZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_COption_HTLCDestinationZ_clone"))) TS_COption_HTLCDestinationZ_clone(uint32_t orig) { - LDKCOption_HTLCDestinationZ* orig_conv = (LDKCOption_HTLCDestinationZ*)orig; +uint64_t __attribute__((export_name("TS_COption_HTLCDestinationZ_clone"))) TS_COption_HTLCDestinationZ_clone(uint64_t orig) { + LDKCOption_HTLCDestinationZ* orig_conv = (LDKCOption_HTLCDestinationZ*)untag_ptr(orig); LDKCOption_HTLCDestinationZ *ret_copy = MALLOC(sizeof(LDKCOption_HTLCDestinationZ), "LDKCOption_HTLCDestinationZ"); *ret_copy = COption_HTLCDestinationZ_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_CResult_COption_HTLCDestinationZDecodeErrorZ_ok"))) TS_CResult_COption_HTLCDestinationZDecodeErrorZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_CResult_COption_HTLCDestinationZDecodeErrorZ_ok"))) TS_CResult_COption_HTLCDestinationZDecodeErrorZ_ok(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKCOption_HTLCDestinationZ o_conv = *(LDKCOption_HTLCDestinationZ*)(o_ptr); - o_conv = COption_HTLCDestinationZ_clone((LDKCOption_HTLCDestinationZ*)(((uintptr_t)o) & ~1)); + o_conv = COption_HTLCDestinationZ_clone((LDKCOption_HTLCDestinationZ*)untag_ptr(o)); LDKCResult_COption_HTLCDestinationZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_HTLCDestinationZDecodeErrorZ), "LDKCResult_COption_HTLCDestinationZDecodeErrorZ"); *ret_conv = CResult_COption_HTLCDestinationZDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_COption_HTLCDestinationZDecodeErrorZ_err"))) TS_CResult_COption_HTLCDestinationZDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_COption_HTLCDestinationZDecodeErrorZ_err"))) TS_CResult_COption_HTLCDestinationZDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_COption_HTLCDestinationZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_HTLCDestinationZDecodeErrorZ), "LDKCResult_COption_HTLCDestinationZDecodeErrorZ"); *ret_conv = CResult_COption_HTLCDestinationZDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_COption_HTLCDestinationZDecodeErrorZ_is_ok"))) TS_CResult_COption_HTLCDestinationZDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_COption_HTLCDestinationZDecodeErrorZ* o_conv = (LDKCResult_COption_HTLCDestinationZDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_COption_HTLCDestinationZDecodeErrorZ_is_ok"))) TS_CResult_COption_HTLCDestinationZDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_COption_HTLCDestinationZDecodeErrorZ* o_conv = (LDKCResult_COption_HTLCDestinationZDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_COption_HTLCDestinationZDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_COption_HTLCDestinationZDecodeErrorZ_free"))) TS_CResult_COption_HTLCDestinationZDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_COption_HTLCDestinationZDecodeErrorZ_free"))) TS_CResult_COption_HTLCDestinationZDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_COption_HTLCDestinationZDecodeErrorZ _res_conv = *(LDKCResult_COption_HTLCDestinationZDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_COption_HTLCDestinationZDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_COption_HTLCDestinationZDecodeErrorZ_clone_ptr(LDKCResult_COption_HTLCDestinationZDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_COption_HTLCDestinationZDecodeErrorZ_clone_ptr(LDKCResult_COption_HTLCDestinationZDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_COption_HTLCDestinationZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_HTLCDestinationZDecodeErrorZ), "LDKCResult_COption_HTLCDestinationZDecodeErrorZ"); *ret_conv = CResult_COption_HTLCDestinationZDecodeErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_COption_HTLCDestinationZDecodeErrorZ_clone_ptr"))) TS_CResult_COption_HTLCDestinationZDecodeErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_COption_HTLCDestinationZDecodeErrorZ* arg_conv = (LDKCResult_COption_HTLCDestinationZDecodeErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_COption_HTLCDestinationZDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_COption_HTLCDestinationZDecodeErrorZ_clone_ptr"))) TS_CResult_COption_HTLCDestinationZDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_COption_HTLCDestinationZDecodeErrorZ* arg_conv = (LDKCResult_COption_HTLCDestinationZDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_COption_HTLCDestinationZDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_COption_HTLCDestinationZDecodeErrorZ_clone"))) TS_CResult_COption_HTLCDestinationZDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_COption_HTLCDestinationZDecodeErrorZ* orig_conv = (LDKCResult_COption_HTLCDestinationZDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_COption_HTLCDestinationZDecodeErrorZ_clone"))) TS_CResult_COption_HTLCDestinationZDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_COption_HTLCDestinationZDecodeErrorZ* orig_conv = (LDKCResult_COption_HTLCDestinationZDecodeErrorZ*)untag_ptr(orig); LDKCResult_COption_HTLCDestinationZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_HTLCDestinationZDecodeErrorZ), "LDKCResult_COption_HTLCDestinationZDecodeErrorZ"); *ret_conv = CResult_COption_HTLCDestinationZDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_COption_NetworkUpdateZ_some"))) TS_COption_NetworkUpdateZ_some(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_COption_NetworkUpdateZ_some"))) TS_COption_NetworkUpdateZ_some(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKNetworkUpdate o_conv = *(LDKNetworkUpdate*)(o_ptr); - o_conv = NetworkUpdate_clone((LDKNetworkUpdate*)(((uintptr_t)o) & ~1)); + o_conv = NetworkUpdate_clone((LDKNetworkUpdate*)untag_ptr(o)); LDKCOption_NetworkUpdateZ *ret_copy = MALLOC(sizeof(LDKCOption_NetworkUpdateZ), "LDKCOption_NetworkUpdateZ"); *ret_copy = COption_NetworkUpdateZ_some(o_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_NetworkUpdateZ_none"))) TS_COption_NetworkUpdateZ_none() { +uint64_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(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_COption_NetworkUpdateZ_free"))) TS_COption_NetworkUpdateZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCOption_NetworkUpdateZ _res_conv = *(LDKCOption_NetworkUpdateZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); COption_NetworkUpdateZ_free(_res_conv); } -static inline uintptr_t COption_NetworkUpdateZ_clone_ptr(LDKCOption_NetworkUpdateZ *NONNULL_PTR arg) { +static inline uint64_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); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_NetworkUpdateZ_clone_ptr"))) TS_COption_NetworkUpdateZ_clone_ptr(uint32_t arg) { - LDKCOption_NetworkUpdateZ* arg_conv = (LDKCOption_NetworkUpdateZ*)arg; - uint32_t ret_conv = COption_NetworkUpdateZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_COption_NetworkUpdateZ_clone_ptr"))) TS_COption_NetworkUpdateZ_clone_ptr(uint64_t arg) { + LDKCOption_NetworkUpdateZ* arg_conv = (LDKCOption_NetworkUpdateZ*)untag_ptr(arg); + int64_t ret_conv = COption_NetworkUpdateZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_COption_NetworkUpdateZ_clone"))) TS_COption_NetworkUpdateZ_clone(uint32_t orig) { - LDKCOption_NetworkUpdateZ* orig_conv = (LDKCOption_NetworkUpdateZ*)orig; +uint64_t __attribute__((export_name("TS_COption_NetworkUpdateZ_clone"))) TS_COption_NetworkUpdateZ_clone(uint64_t orig) { + LDKCOption_NetworkUpdateZ* orig_conv = (LDKCOption_NetworkUpdateZ*)untag_ptr(orig); LDKCOption_NetworkUpdateZ *ret_copy = MALLOC(sizeof(LDKCOption_NetworkUpdateZ), "LDKCOption_NetworkUpdateZ"); *ret_copy = COption_NetworkUpdateZ_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_CVec_SpendableOutputDescriptorZ_free"))) TS_CVec_SpendableOutputDescriptorZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_SpendableOutputDescriptorZ_free"))) TS_CVec_SpendableOutputDescriptorZ_free(uint64_tArray _res) { LDKCVec_SpendableOutputDescriptorZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKSpendableOutputDescriptor), "LDKCVec_SpendableOutputDescriptorZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t b = 0; b < _res_constr.datalen; b++) { - uint32_t _res_conv_27 = _res_vals[b]; - void* _res_conv_27_ptr = (void*)(((uintptr_t)_res_conv_27) & ~1); + uint64_t _res_conv_27 = _res_vals[b]; + void* _res_conv_27_ptr = untag_ptr(_res_conv_27); CHECK_ACCESS(_res_conv_27_ptr); LDKSpendableOutputDescriptor _res_conv_27_conv = *(LDKSpendableOutputDescriptor*)(_res_conv_27_ptr); - FREE((void*)_res_conv_27); + FREE(untag_ptr(_res_conv_27)); _res_constr.data[b] = _res_conv_27_conv; } FREE(_res); CVec_SpendableOutputDescriptorZ_free(_res_constr); } -uint32_t __attribute__((export_name("TS_COption_EventZ_some"))) TS_COption_EventZ_some(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_COption_EventZ_some"))) TS_COption_EventZ_some(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKEvent o_conv = *(LDKEvent*)(o_ptr); - o_conv = Event_clone((LDKEvent*)(((uintptr_t)o) & ~1)); + o_conv = Event_clone((LDKEvent*)untag_ptr(o)); LDKCOption_EventZ *ret_copy = MALLOC(sizeof(LDKCOption_EventZ), "LDKCOption_EventZ"); *ret_copy = COption_EventZ_some(o_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_EventZ_none"))) TS_COption_EventZ_none() { +uint64_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(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_COption_EventZ_free"))) TS_COption_EventZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCOption_EventZ _res_conv = *(LDKCOption_EventZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); COption_EventZ_free(_res_conv); } -static inline uintptr_t COption_EventZ_clone_ptr(LDKCOption_EventZ *NONNULL_PTR arg) { +static inline uint64_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); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_EventZ_clone_ptr"))) TS_COption_EventZ_clone_ptr(uint32_t arg) { - LDKCOption_EventZ* arg_conv = (LDKCOption_EventZ*)arg; - uint32_t ret_conv = COption_EventZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_COption_EventZ_clone_ptr"))) TS_COption_EventZ_clone_ptr(uint64_t arg) { + LDKCOption_EventZ* arg_conv = (LDKCOption_EventZ*)untag_ptr(arg); + int64_t ret_conv = COption_EventZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_COption_EventZ_clone"))) TS_COption_EventZ_clone(uint32_t orig) { - LDKCOption_EventZ* orig_conv = (LDKCOption_EventZ*)orig; +uint64_t __attribute__((export_name("TS_COption_EventZ_clone"))) TS_COption_EventZ_clone(uint64_t orig) { + LDKCOption_EventZ* orig_conv = (LDKCOption_EventZ*)untag_ptr(orig); LDKCOption_EventZ *ret_copy = MALLOC(sizeof(LDKCOption_EventZ), "LDKCOption_EventZ"); *ret_copy = COption_EventZ_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_ok"))) TS_CResult_COption_EventZDecodeErrorZ_ok(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKCOption_EventZ o_conv = *(LDKCOption_EventZ*)(o_ptr); - o_conv = COption_EventZ_clone((LDKCOption_EventZ*)(((uintptr_t)o) & ~1)); + o_conv = COption_EventZ_clone((LDKCOption_EventZ*)untag_ptr(o)); LDKCResult_COption_EventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_EventZDecodeErrorZ), "LDKCResult_COption_EventZDecodeErrorZ"); *ret_conv = CResult_COption_EventZDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_err"))) TS_CResult_COption_EventZDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_err"))) TS_CResult_COption_EventZDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_is_ok"))) TS_CResult_COption_EventZDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_COption_EventZDecodeErrorZ* o_conv = (LDKCResult_COption_EventZDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_is_ok"))) TS_CResult_COption_EventZDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_COption_EventZDecodeErrorZ* o_conv = (LDKCResult_COption_EventZDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_COption_EventZDecodeErrorZ_is_ok(o_conv); return ret_conv; } -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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_free"))) TS_CResult_COption_EventZDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_COption_EventZDecodeErrorZ _res_conv = *(LDKCResult_COption_EventZDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_COption_EventZDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_COption_EventZDecodeErrorZ_clone_ptr(LDKCResult_COption_EventZDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_COption_EventZDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_clone_ptr"))) TS_CResult_COption_EventZDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_COption_EventZDecodeErrorZ* arg_conv = (LDKCResult_COption_EventZDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_COption_EventZDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_clone"))) TS_CResult_COption_EventZDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_COption_EventZDecodeErrorZ* orig_conv = (LDKCResult_COption_EventZDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_clone"))) TS_CResult_COption_EventZDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_COption_EventZDecodeErrorZ* orig_conv = (LDKCResult_COption_EventZDecodeErrorZ*)untag_ptr(orig); LDKCResult_COption_EventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_EventZDecodeErrorZ), "LDKCResult_COption_EventZDecodeErrorZ"); *ret_conv = CResult_COption_EventZDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_CVec_MessageSendEventZ_free"))) TS_CVec_MessageSendEventZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_MessageSendEventZ_free"))) TS_CVec_MessageSendEventZ_free(uint64_tArray _res) { LDKCVec_MessageSendEventZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKMessageSendEvent), "LDKCVec_MessageSendEventZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t s = 0; s < _res_constr.datalen; s++) { - uint32_t _res_conv_18 = _res_vals[s]; - void* _res_conv_18_ptr = (void*)(((uintptr_t)_res_conv_18) & ~1); + uint64_t _res_conv_18 = _res_vals[s]; + void* _res_conv_18_ptr = untag_ptr(_res_conv_18); CHECK_ACCESS(_res_conv_18_ptr); LDKMessageSendEvent _res_conv_18_conv = *(LDKMessageSendEvent*)(_res_conv_18_ptr); - FREE((void*)_res_conv_18); + FREE(untag_ptr(_res_conv_18)); _res_constr.data[s] = _res_conv_18_conv; } FREE(_res); CVec_MessageSendEventZ_free(_res_constr); } -uint32_t __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_ok"))) TS_CResult_TxOutAccessErrorZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_ok"))) TS_CResult_TxOutAccessErrorZ_ok(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKTxOut o_conv = *(LDKTxOut*)(o_ptr); - o_conv = TxOut_clone((LDKTxOut*)(((uintptr_t)o) & ~1)); + o_conv = TxOut_clone((LDKTxOut*)untag_ptr(o)); LDKCResult_TxOutAccessErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxOutAccessErrorZ), "LDKCResult_TxOutAccessErrorZ"); *ret_conv = CResult_TxOutAccessErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_err"))) TS_CResult_TxOutAccessErrorZ_err(uint32_t e) { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_is_ok"))) TS_CResult_TxOutAccessErrorZ_is_ok(uint32_t o) { - LDKCResult_TxOutAccessErrorZ* o_conv = (LDKCResult_TxOutAccessErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_is_ok"))) TS_CResult_TxOutAccessErrorZ_is_ok(uint64_t o) { + LDKCResult_TxOutAccessErrorZ* o_conv = (LDKCResult_TxOutAccessErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_TxOutAccessErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_free"))) TS_CResult_TxOutAccessErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_free"))) TS_CResult_TxOutAccessErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_TxOutAccessErrorZ _res_conv = *(LDKCResult_TxOutAccessErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_TxOutAccessErrorZ_free(_res_conv); } -static inline uintptr_t CResult_TxOutAccessErrorZ_clone_ptr(LDKCResult_TxOutAccessErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_TxOutAccessErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_clone_ptr"))) TS_CResult_TxOutAccessErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_TxOutAccessErrorZ* arg_conv = (LDKCResult_TxOutAccessErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_TxOutAccessErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_clone"))) TS_CResult_TxOutAccessErrorZ_clone(uint32_t orig) { - LDKCResult_TxOutAccessErrorZ* orig_conv = (LDKCResult_TxOutAccessErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_clone"))) TS_CResult_TxOutAccessErrorZ_clone(uint64_t orig) { + LDKCResult_TxOutAccessErrorZ* orig_conv = (LDKCResult_TxOutAccessErrorZ*)untag_ptr(orig); LDKCResult_TxOutAccessErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxOutAccessErrorZ), "LDKCResult_TxOutAccessErrorZ"); *ret_conv = CResult_TxOutAccessErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -static inline uintptr_t C2Tuple_usizeTransactionZ_clone_ptr(LDKC2Tuple_usizeTransactionZ *NONNULL_PTR arg) { +static inline uint64_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 ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = C2Tuple_usizeTransactionZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_clone_ptr"))) TS_C2Tuple_usizeTransactionZ_clone_ptr(uint64_t arg) { + LDKC2Tuple_usizeTransactionZ* arg_conv = (LDKC2Tuple_usizeTransactionZ*)untag_ptr(arg); + int64_t ret_conv = C2Tuple_usizeTransactionZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_clone"))) TS_C2Tuple_usizeTransactionZ_clone(uint32_t orig) { - LDKC2Tuple_usizeTransactionZ* orig_conv = (LDKC2Tuple_usizeTransactionZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_clone"))) TS_C2Tuple_usizeTransactionZ_clone(uint64_t orig) { + LDKC2Tuple_usizeTransactionZ* orig_conv = (LDKC2Tuple_usizeTransactionZ*)untag_ptr(orig); LDKC2Tuple_usizeTransactionZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_usizeTransactionZ), "LDKC2Tuple_usizeTransactionZ"); *ret_conv = C2Tuple_usizeTransactionZ_clone(orig_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_new"))) TS_C2Tuple_usizeTransactionZ_new(uint32_t a, int8_tArray b) { +uint64_t __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_new"))) TS_C2Tuple_usizeTransactionZ_new(uint32_t a, int8_tArray b) { LDKTransaction b_ref; b_ref.datalen = b->arr_len; b_ref.data = MALLOC(b_ref.datalen, "LDKTransaction Bytes"); @@ -13469,32 +12192,32 @@ uint32_t __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_new"))) TS_C2 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 ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_free"))) TS_C2Tuple_usizeTransactionZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_free"))) TS_C2Tuple_usizeTransactionZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKC2Tuple_usizeTransactionZ _res_conv = *(LDKC2Tuple_usizeTransactionZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); C2Tuple_usizeTransactionZ_free(_res_conv); } -void __attribute__((export_name("TS_CVec_C2Tuple_usizeTransactionZZ_free"))) TS_CVec_C2Tuple_usizeTransactionZZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_C2Tuple_usizeTransactionZZ_free"))) TS_CVec_C2Tuple_usizeTransactionZZ_free(uint64_tArray _res) { LDKCVec_C2Tuple_usizeTransactionZZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _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; + uint64_t* _res_vals = _res->elems; for (size_t c = 0; c < _res_constr.datalen; c++) { - uint32_t _res_conv_28 = _res_vals[c]; - void* _res_conv_28_ptr = (void*)(((uintptr_t)_res_conv_28) & ~1); + uint64_t _res_conv_28 = _res_vals[c]; + void* _res_conv_28_ptr = untag_ptr(_res_conv_28); CHECK_ACCESS(_res_conv_28_ptr); LDKC2Tuple_usizeTransactionZ _res_conv_28_conv = *(LDKC2Tuple_usizeTransactionZ*)(_res_conv_28_ptr); - FREE((void*)_res_conv_28); + FREE(untag_ptr(_res_conv_28)); _res_constr.data[c] = _res_conv_28_conv; } FREE(_res); @@ -13520,94 +12243,94 @@ void __attribute__((export_name("TS_CVec_TxidZ_free"))) TS_CVec_TxidZ_free(ptrA CVec_TxidZ_free(_res_constr); } -uint32_t __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_ok"))) TS_CResult_NoneChannelMonitorUpdateErrZ_ok() { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_err"))) TS_CResult_NoneChannelMonitorUpdateErrZ_err(uint32_t e) { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_is_ok"))) TS_CResult_NoneChannelMonitorUpdateErrZ_is_ok(uint32_t o) { - LDKCResult_NoneChannelMonitorUpdateErrZ* o_conv = (LDKCResult_NoneChannelMonitorUpdateErrZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_is_ok"))) TS_CResult_NoneChannelMonitorUpdateErrZ_is_ok(uint64_t o) { + LDKCResult_NoneChannelMonitorUpdateErrZ* o_conv = (LDKCResult_NoneChannelMonitorUpdateErrZ*)untag_ptr(o); jboolean ret_conv = CResult_NoneChannelMonitorUpdateErrZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_free"))) TS_CResult_NoneChannelMonitorUpdateErrZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_free"))) TS_CResult_NoneChannelMonitorUpdateErrZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_NoneChannelMonitorUpdateErrZ _res_conv = *(LDKCResult_NoneChannelMonitorUpdateErrZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_NoneChannelMonitorUpdateErrZ_free(_res_conv); } -static inline uintptr_t CResult_NoneChannelMonitorUpdateErrZ_clone_ptr(LDKCResult_NoneChannelMonitorUpdateErrZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_NoneChannelMonitorUpdateErrZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_clone_ptr"))) TS_CResult_NoneChannelMonitorUpdateErrZ_clone_ptr(uint64_t arg) { + LDKCResult_NoneChannelMonitorUpdateErrZ* arg_conv = (LDKCResult_NoneChannelMonitorUpdateErrZ*)untag_ptr(arg); + int64_t ret_conv = CResult_NoneChannelMonitorUpdateErrZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_clone"))) TS_CResult_NoneChannelMonitorUpdateErrZ_clone(uint32_t orig) { - LDKCResult_NoneChannelMonitorUpdateErrZ* orig_conv = (LDKCResult_NoneChannelMonitorUpdateErrZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_clone"))) TS_CResult_NoneChannelMonitorUpdateErrZ_clone(uint64_t orig) { + LDKCResult_NoneChannelMonitorUpdateErrZ* orig_conv = (LDKCResult_NoneChannelMonitorUpdateErrZ*)untag_ptr(orig); LDKCResult_NoneChannelMonitorUpdateErrZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneChannelMonitorUpdateErrZ), "LDKCResult_NoneChannelMonitorUpdateErrZ"); *ret_conv = CResult_NoneChannelMonitorUpdateErrZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_CVec_MonitorEventZ_free"))) TS_CVec_MonitorEventZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_MonitorEventZ_free"))) TS_CVec_MonitorEventZ_free(uint64_tArray _res) { LDKCVec_MonitorEventZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKMonitorEvent), "LDKCVec_MonitorEventZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t o = 0; o < _res_constr.datalen; o++) { - uint32_t _res_conv_14 = _res_vals[o]; - void* _res_conv_14_ptr = (void*)(((uintptr_t)_res_conv_14) & ~1); + uint64_t _res_conv_14 = _res_vals[o]; + void* _res_conv_14_ptr = untag_ptr(_res_conv_14); CHECK_ACCESS(_res_conv_14_ptr); LDKMonitorEvent _res_conv_14_conv = *(LDKMonitorEvent*)(_res_conv_14_ptr); - FREE((void*)_res_conv_14); + FREE(untag_ptr(_res_conv_14)); _res_constr.data[o] = _res_conv_14_conv; } FREE(_res); CVec_MonitorEventZ_free(_res_constr); } -static inline uintptr_t C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone_ptr(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ *NONNULL_PTR arg) { +static inline uint64_t C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone_ptr(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ *NONNULL_PTR arg) { LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ* ret_conv = MALLOC(sizeof(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ), "LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ"); *ret_conv = C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone(arg); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone_ptr"))) TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone_ptr(uint32_t arg) { - LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ* arg_conv = (LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ*)(arg & ~1); - uint32_t ret_conv = C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone_ptr"))) TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone_ptr(uint64_t arg) { + LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ* arg_conv = (LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ*)untag_ptr(arg); + int64_t ret_conv = C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone"))) TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone(uint32_t orig) { - LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ* orig_conv = (LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone"))) TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone(uint64_t orig) { + LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ* orig_conv = (LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ*)untag_ptr(orig); LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ* ret_conv = MALLOC(sizeof(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ), "LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ"); *ret_conv = C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone(orig_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_new"))) TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_new(uint32_t a, uint32_tArray b, int8_tArray c) { +uint64_t __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_new"))) TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_new(uint64_t a, uint64_tArray b, int8_tArray c) { LDKOutPoint a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = (a & 1) || (a == 0); + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); a_conv = OutPoint_clone(&a_conv); LDKCVec_MonitorEventZ b_constr; @@ -13616,13 +12339,13 @@ uint32_t __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZPubli b_constr.data = MALLOC(b_constr.datalen * sizeof(LDKMonitorEvent), "LDKCVec_MonitorEventZ Elements"); else b_constr.data = NULL; - uint32_t* b_vals = b->elems; + uint64_t* b_vals = b->elems; for (size_t o = 0; o < b_constr.datalen; o++) { - uint32_t b_conv_14 = b_vals[o]; - void* b_conv_14_ptr = (void*)(((uintptr_t)b_conv_14) & ~1); + uint64_t b_conv_14 = b_vals[o]; + void* b_conv_14_ptr = untag_ptr(b_conv_14); CHECK_ACCESS(b_conv_14_ptr); LDKMonitorEvent b_conv_14_conv = *(LDKMonitorEvent*)(b_conv_14_ptr); - b_conv_14_conv = MonitorEvent_clone((LDKMonitorEvent*)(((uintptr_t)b_conv_14) & ~1)); + b_conv_14_conv = MonitorEvent_clone((LDKMonitorEvent*)untag_ptr(b_conv_14)); b_constr.data[o] = b_conv_14_conv; } FREE(b); @@ -13631,233 +12354,233 @@ uint32_t __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZPubli memcpy(c_ref.compressed_form, c->elems, 33); FREE(c); LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ* ret_conv = MALLOC(sizeof(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ), "LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ"); *ret_conv = C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_new(a_conv, b_constr, c_ref); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_free"))) TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_free"))) TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ _res_conv = *(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_free(_res_conv); } -void __attribute__((export_name("TS_CVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ_free"))) TS_CVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ_free"))) TS_CVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ_free(uint64_tArray _res) { LDKCVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ), "LDKCVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t x = 0; x < _res_constr.datalen; x++) { - uint32_t _res_conv_49 = _res_vals[x]; - void* _res_conv_49_ptr = (void*)(((uintptr_t)_res_conv_49) & ~1); + uint64_t _res_conv_49 = _res_vals[x]; + void* _res_conv_49_ptr = untag_ptr(_res_conv_49); CHECK_ACCESS(_res_conv_49_ptr); LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ _res_conv_49_conv = *(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ*)(_res_conv_49_ptr); - FREE((void*)_res_conv_49); + FREE(untag_ptr(_res_conv_49)); _res_constr.data[x] = _res_conv_49_conv; } FREE(_res); CVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ_free(_res_constr); } -uint32_t __attribute__((export_name("TS_COption_C2Tuple_usizeTransactionZZ_some"))) TS_COption_C2Tuple_usizeTransactionZZ_some(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_COption_C2Tuple_usizeTransactionZZ_some"))) TS_COption_C2Tuple_usizeTransactionZZ_some(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKC2Tuple_usizeTransactionZ o_conv = *(LDKC2Tuple_usizeTransactionZ*)(o_ptr); - o_conv = C2Tuple_usizeTransactionZ_clone((LDKC2Tuple_usizeTransactionZ*)(((uintptr_t)o) & ~1)); + o_conv = C2Tuple_usizeTransactionZ_clone((LDKC2Tuple_usizeTransactionZ*)untag_ptr(o)); LDKCOption_C2Tuple_usizeTransactionZZ *ret_copy = MALLOC(sizeof(LDKCOption_C2Tuple_usizeTransactionZZ), "LDKCOption_C2Tuple_usizeTransactionZZ"); *ret_copy = COption_C2Tuple_usizeTransactionZZ_some(o_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_C2Tuple_usizeTransactionZZ_none"))) TS_COption_C2Tuple_usizeTransactionZZ_none() { +uint64_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(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_COption_C2Tuple_usizeTransactionZZ_free"))) TS_COption_C2Tuple_usizeTransactionZZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCOption_C2Tuple_usizeTransactionZZ _res_conv = *(LDKCOption_C2Tuple_usizeTransactionZZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); COption_C2Tuple_usizeTransactionZZ_free(_res_conv); } -static inline uintptr_t COption_C2Tuple_usizeTransactionZZ_clone_ptr(LDKCOption_C2Tuple_usizeTransactionZZ *NONNULL_PTR arg) { +static inline uint64_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); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_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; - uint32_t ret_conv = COption_C2Tuple_usizeTransactionZZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_COption_C2Tuple_usizeTransactionZZ_clone_ptr"))) TS_COption_C2Tuple_usizeTransactionZZ_clone_ptr(uint64_t arg) { + LDKCOption_C2Tuple_usizeTransactionZZ* arg_conv = (LDKCOption_C2Tuple_usizeTransactionZZ*)untag_ptr(arg); + int64_t ret_conv = COption_C2Tuple_usizeTransactionZZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_COption_C2Tuple_usizeTransactionZZ_clone"))) TS_COption_C2Tuple_usizeTransactionZZ_clone(uint32_t orig) { - LDKCOption_C2Tuple_usizeTransactionZZ* orig_conv = (LDKCOption_C2Tuple_usizeTransactionZZ*)orig; +uint64_t __attribute__((export_name("TS_COption_C2Tuple_usizeTransactionZZ_clone"))) TS_COption_C2Tuple_usizeTransactionZZ_clone(uint64_t orig) { + LDKCOption_C2Tuple_usizeTransactionZZ* orig_conv = (LDKCOption_C2Tuple_usizeTransactionZZ*)untag_ptr(orig); LDKCOption_C2Tuple_usizeTransactionZZ *ret_copy = MALLOC(sizeof(LDKCOption_C2Tuple_usizeTransactionZZ), "LDKCOption_C2Tuple_usizeTransactionZZ"); *ret_copy = COption_C2Tuple_usizeTransactionZZ_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_ok"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_ok"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_ok(uint64_t o) { LDKFixedPenaltyScorer o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = FixedPenaltyScorer_clone(&o_conv); LDKCResult_FixedPenaltyScorerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FixedPenaltyScorerDecodeErrorZ), "LDKCResult_FixedPenaltyScorerDecodeErrorZ"); *ret_conv = CResult_FixedPenaltyScorerDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_err"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_err"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_FixedPenaltyScorerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FixedPenaltyScorerDecodeErrorZ), "LDKCResult_FixedPenaltyScorerDecodeErrorZ"); *ret_conv = CResult_FixedPenaltyScorerDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_is_ok"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_FixedPenaltyScorerDecodeErrorZ* o_conv = (LDKCResult_FixedPenaltyScorerDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_is_ok"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_FixedPenaltyScorerDecodeErrorZ* o_conv = (LDKCResult_FixedPenaltyScorerDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_FixedPenaltyScorerDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_free"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_free"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_FixedPenaltyScorerDecodeErrorZ _res_conv = *(LDKCResult_FixedPenaltyScorerDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_FixedPenaltyScorerDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_FixedPenaltyScorerDecodeErrorZ_clone_ptr(LDKCResult_FixedPenaltyScorerDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_FixedPenaltyScorerDecodeErrorZ_clone_ptr(LDKCResult_FixedPenaltyScorerDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_FixedPenaltyScorerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FixedPenaltyScorerDecodeErrorZ), "LDKCResult_FixedPenaltyScorerDecodeErrorZ"); *ret_conv = CResult_FixedPenaltyScorerDecodeErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_clone_ptr"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_FixedPenaltyScorerDecodeErrorZ* arg_conv = (LDKCResult_FixedPenaltyScorerDecodeErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_FixedPenaltyScorerDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_clone_ptr"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_FixedPenaltyScorerDecodeErrorZ* arg_conv = (LDKCResult_FixedPenaltyScorerDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_FixedPenaltyScorerDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_clone"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_FixedPenaltyScorerDecodeErrorZ* orig_conv = (LDKCResult_FixedPenaltyScorerDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_clone"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_FixedPenaltyScorerDecodeErrorZ* orig_conv = (LDKCResult_FixedPenaltyScorerDecodeErrorZ*)untag_ptr(orig); LDKCResult_FixedPenaltyScorerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FixedPenaltyScorerDecodeErrorZ), "LDKCResult_FixedPenaltyScorerDecodeErrorZ"); *ret_conv = CResult_FixedPenaltyScorerDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -static inline uintptr_t C2Tuple_u64u64Z_clone_ptr(LDKC2Tuple_u64u64Z *NONNULL_PTR arg) { +static inline uint64_t C2Tuple_u64u64Z_clone_ptr(LDKC2Tuple_u64u64Z *NONNULL_PTR arg) { LDKC2Tuple_u64u64Z* ret_conv = MALLOC(sizeof(LDKC2Tuple_u64u64Z), "LDKC2Tuple_u64u64Z"); *ret_conv = C2Tuple_u64u64Z_clone(arg); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C2Tuple_u64u64Z_clone_ptr"))) TS_C2Tuple_u64u64Z_clone_ptr(uint32_t arg) { - LDKC2Tuple_u64u64Z* arg_conv = (LDKC2Tuple_u64u64Z*)(arg & ~1); - uint32_t ret_conv = C2Tuple_u64u64Z_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_C2Tuple_u64u64Z_clone_ptr"))) TS_C2Tuple_u64u64Z_clone_ptr(uint64_t arg) { + LDKC2Tuple_u64u64Z* arg_conv = (LDKC2Tuple_u64u64Z*)untag_ptr(arg); + int64_t ret_conv = C2Tuple_u64u64Z_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_C2Tuple_u64u64Z_clone"))) TS_C2Tuple_u64u64Z_clone(uint32_t orig) { - LDKC2Tuple_u64u64Z* orig_conv = (LDKC2Tuple_u64u64Z*)(orig & ~1); +uint64_t __attribute__((export_name("TS_C2Tuple_u64u64Z_clone"))) TS_C2Tuple_u64u64Z_clone(uint64_t orig) { + LDKC2Tuple_u64u64Z* orig_conv = (LDKC2Tuple_u64u64Z*)untag_ptr(orig); LDKC2Tuple_u64u64Z* ret_conv = MALLOC(sizeof(LDKC2Tuple_u64u64Z), "LDKC2Tuple_u64u64Z"); *ret_conv = C2Tuple_u64u64Z_clone(orig_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C2Tuple_u64u64Z_new"))) TS_C2Tuple_u64u64Z_new(int64_t a, int64_t b) { +uint64_t __attribute__((export_name("TS_C2Tuple_u64u64Z_new"))) TS_C2Tuple_u64u64Z_new(int64_t a, int64_t b) { LDKC2Tuple_u64u64Z* ret_conv = MALLOC(sizeof(LDKC2Tuple_u64u64Z), "LDKC2Tuple_u64u64Z"); *ret_conv = C2Tuple_u64u64Z_new(a, b); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_C2Tuple_u64u64Z_free"))) TS_C2Tuple_u64u64Z_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_C2Tuple_u64u64Z_free"))) TS_C2Tuple_u64u64Z_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKC2Tuple_u64u64Z _res_conv = *(LDKC2Tuple_u64u64Z*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); C2Tuple_u64u64Z_free(_res_conv); } -uint32_t __attribute__((export_name("TS_COption_C2Tuple_u64u64ZZ_some"))) TS_COption_C2Tuple_u64u64ZZ_some(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_COption_C2Tuple_u64u64ZZ_some"))) TS_COption_C2Tuple_u64u64ZZ_some(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKC2Tuple_u64u64Z o_conv = *(LDKC2Tuple_u64u64Z*)(o_ptr); - o_conv = C2Tuple_u64u64Z_clone((LDKC2Tuple_u64u64Z*)(((uintptr_t)o) & ~1)); + o_conv = C2Tuple_u64u64Z_clone((LDKC2Tuple_u64u64Z*)untag_ptr(o)); LDKCOption_C2Tuple_u64u64ZZ *ret_copy = MALLOC(sizeof(LDKCOption_C2Tuple_u64u64ZZ), "LDKCOption_C2Tuple_u64u64ZZ"); *ret_copy = COption_C2Tuple_u64u64ZZ_some(o_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_C2Tuple_u64u64ZZ_none"))) TS_COption_C2Tuple_u64u64ZZ_none() { +uint64_t __attribute__((export_name("TS_COption_C2Tuple_u64u64ZZ_none"))) TS_COption_C2Tuple_u64u64ZZ_none() { LDKCOption_C2Tuple_u64u64ZZ *ret_copy = MALLOC(sizeof(LDKCOption_C2Tuple_u64u64ZZ), "LDKCOption_C2Tuple_u64u64ZZ"); *ret_copy = COption_C2Tuple_u64u64ZZ_none(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_COption_C2Tuple_u64u64ZZ_free"))) TS_COption_C2Tuple_u64u64ZZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_COption_C2Tuple_u64u64ZZ_free"))) TS_COption_C2Tuple_u64u64ZZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCOption_C2Tuple_u64u64ZZ _res_conv = *(LDKCOption_C2Tuple_u64u64ZZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); COption_C2Tuple_u64u64ZZ_free(_res_conv); } -static inline uintptr_t COption_C2Tuple_u64u64ZZ_clone_ptr(LDKCOption_C2Tuple_u64u64ZZ *NONNULL_PTR arg) { +static inline uint64_t COption_C2Tuple_u64u64ZZ_clone_ptr(LDKCOption_C2Tuple_u64u64ZZ *NONNULL_PTR arg) { LDKCOption_C2Tuple_u64u64ZZ *ret_copy = MALLOC(sizeof(LDKCOption_C2Tuple_u64u64ZZ), "LDKCOption_C2Tuple_u64u64ZZ"); *ret_copy = COption_C2Tuple_u64u64ZZ_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_C2Tuple_u64u64ZZ_clone_ptr"))) TS_COption_C2Tuple_u64u64ZZ_clone_ptr(uint32_t arg) { - LDKCOption_C2Tuple_u64u64ZZ* arg_conv = (LDKCOption_C2Tuple_u64u64ZZ*)arg; - uint32_t ret_conv = COption_C2Tuple_u64u64ZZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_COption_C2Tuple_u64u64ZZ_clone_ptr"))) TS_COption_C2Tuple_u64u64ZZ_clone_ptr(uint64_t arg) { + LDKCOption_C2Tuple_u64u64ZZ* arg_conv = (LDKCOption_C2Tuple_u64u64ZZ*)untag_ptr(arg); + int64_t ret_conv = COption_C2Tuple_u64u64ZZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_COption_C2Tuple_u64u64ZZ_clone"))) TS_COption_C2Tuple_u64u64ZZ_clone(uint32_t orig) { - LDKCOption_C2Tuple_u64u64ZZ* orig_conv = (LDKCOption_C2Tuple_u64u64ZZ*)orig; +uint64_t __attribute__((export_name("TS_COption_C2Tuple_u64u64ZZ_clone"))) TS_COption_C2Tuple_u64u64ZZ_clone(uint64_t orig) { + LDKCOption_C2Tuple_u64u64ZZ* orig_conv = (LDKCOption_C2Tuple_u64u64ZZ*)untag_ptr(orig); LDKCOption_C2Tuple_u64u64ZZ *ret_copy = MALLOC(sizeof(LDKCOption_C2Tuple_u64u64ZZ), "LDKCOption_C2Tuple_u64u64ZZ"); *ret_copy = COption_C2Tuple_u64u64ZZ_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_CVec_NodeIdZ_free"))) TS_CVec_NodeIdZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_NodeIdZ_free"))) TS_CVec_NodeIdZ_free(uint64_tArray _res) { LDKCVec_NodeIdZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKNodeId), "LDKCVec_NodeIdZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t i = 0; i < _res_constr.datalen; i++) { - uint32_t _res_conv_8 = _res_vals[i]; + uint64_t _res_conv_8 = _res_vals[i]; LDKNodeId _res_conv_8_conv; - _res_conv_8_conv.inner = (void*)(_res_conv_8 & (~1)); - _res_conv_8_conv.is_owned = (_res_conv_8 & 1) || (_res_conv_8 == 0); + _res_conv_8_conv.inner = untag_ptr(_res_conv_8); + _res_conv_8_conv.is_owned = ptr_is_owned(_res_conv_8); CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_8_conv); _res_constr.data[i] = _res_conv_8_conv; } @@ -13865,429 +12588,430 @@ void __attribute__((export_name("TS_CVec_NodeIdZ_free"))) TS_CVec_NodeIdZ_free( CVec_NodeIdZ_free(_res_constr); } -uint32_t __attribute__((export_name("TS_CResult_ProbabilisticScorerDecodeErrorZ_ok"))) TS_CResult_ProbabilisticScorerDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ProbabilisticScorerDecodeErrorZ_ok"))) TS_CResult_ProbabilisticScorerDecodeErrorZ_ok(uint64_t o) { LDKProbabilisticScorer o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); // WARNING: we need a move here but no clone is available for LDKProbabilisticScorer + LDKCResult_ProbabilisticScorerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ProbabilisticScorerDecodeErrorZ), "LDKCResult_ProbabilisticScorerDecodeErrorZ"); *ret_conv = CResult_ProbabilisticScorerDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ProbabilisticScorerDecodeErrorZ_err"))) TS_CResult_ProbabilisticScorerDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ProbabilisticScorerDecodeErrorZ_err"))) TS_CResult_ProbabilisticScorerDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ProbabilisticScorerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ProbabilisticScorerDecodeErrorZ), "LDKCResult_ProbabilisticScorerDecodeErrorZ"); *ret_conv = CResult_ProbabilisticScorerDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ProbabilisticScorerDecodeErrorZ_is_ok"))) TS_CResult_ProbabilisticScorerDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ProbabilisticScorerDecodeErrorZ* o_conv = (LDKCResult_ProbabilisticScorerDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ProbabilisticScorerDecodeErrorZ_is_ok"))) TS_CResult_ProbabilisticScorerDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ProbabilisticScorerDecodeErrorZ* o_conv = (LDKCResult_ProbabilisticScorerDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ProbabilisticScorerDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ProbabilisticScorerDecodeErrorZ_free"))) TS_CResult_ProbabilisticScorerDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ProbabilisticScorerDecodeErrorZ_free"))) TS_CResult_ProbabilisticScorerDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ProbabilisticScorerDecodeErrorZ _res_conv = *(LDKCResult_ProbabilisticScorerDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ProbabilisticScorerDecodeErrorZ_free(_res_conv); } -uint32_t __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_ok"))) TS_CResult_InitFeaturesDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_ok"))) TS_CResult_InitFeaturesDecodeErrorZ_ok(uint64_t o) { LDKInitFeatures o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = InitFeatures_clone(&o_conv); LDKCResult_InitFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitFeaturesDecodeErrorZ), "LDKCResult_InitFeaturesDecodeErrorZ"); *ret_conv = CResult_InitFeaturesDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_err"))) TS_CResult_InitFeaturesDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_err"))) TS_CResult_InitFeaturesDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_InitFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitFeaturesDecodeErrorZ), "LDKCResult_InitFeaturesDecodeErrorZ"); *ret_conv = CResult_InitFeaturesDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_is_ok"))) TS_CResult_InitFeaturesDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_InitFeaturesDecodeErrorZ* o_conv = (LDKCResult_InitFeaturesDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_is_ok"))) TS_CResult_InitFeaturesDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_InitFeaturesDecodeErrorZ* o_conv = (LDKCResult_InitFeaturesDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_InitFeaturesDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_free"))) TS_CResult_InitFeaturesDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_free"))) TS_CResult_InitFeaturesDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_InitFeaturesDecodeErrorZ _res_conv = *(LDKCResult_InitFeaturesDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_InitFeaturesDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_InitFeaturesDecodeErrorZ_clone_ptr(LDKCResult_InitFeaturesDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_InitFeaturesDecodeErrorZ_clone_ptr(LDKCResult_InitFeaturesDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_InitFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitFeaturesDecodeErrorZ), "LDKCResult_InitFeaturesDecodeErrorZ"); *ret_conv = CResult_InitFeaturesDecodeErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_clone_ptr"))) TS_CResult_InitFeaturesDecodeErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_InitFeaturesDecodeErrorZ* arg_conv = (LDKCResult_InitFeaturesDecodeErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_InitFeaturesDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_clone_ptr"))) TS_CResult_InitFeaturesDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_InitFeaturesDecodeErrorZ* arg_conv = (LDKCResult_InitFeaturesDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_InitFeaturesDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_clone"))) TS_CResult_InitFeaturesDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_InitFeaturesDecodeErrorZ* orig_conv = (LDKCResult_InitFeaturesDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_clone"))) TS_CResult_InitFeaturesDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_InitFeaturesDecodeErrorZ* orig_conv = (LDKCResult_InitFeaturesDecodeErrorZ*)untag_ptr(orig); LDKCResult_InitFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitFeaturesDecodeErrorZ), "LDKCResult_InitFeaturesDecodeErrorZ"); *ret_conv = CResult_InitFeaturesDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_ok"))) TS_CResult_ChannelFeaturesDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_ok"))) TS_CResult_ChannelFeaturesDecodeErrorZ_ok(uint64_t o) { LDKChannelFeatures o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ChannelFeatures_clone(&o_conv); LDKCResult_ChannelFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelFeaturesDecodeErrorZ), "LDKCResult_ChannelFeaturesDecodeErrorZ"); *ret_conv = CResult_ChannelFeaturesDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_err"))) TS_CResult_ChannelFeaturesDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_err"))) TS_CResult_ChannelFeaturesDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ChannelFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelFeaturesDecodeErrorZ), "LDKCResult_ChannelFeaturesDecodeErrorZ"); *ret_conv = CResult_ChannelFeaturesDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_is_ok"))) TS_CResult_ChannelFeaturesDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ChannelFeaturesDecodeErrorZ* o_conv = (LDKCResult_ChannelFeaturesDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_is_ok"))) TS_CResult_ChannelFeaturesDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ChannelFeaturesDecodeErrorZ* o_conv = (LDKCResult_ChannelFeaturesDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ChannelFeaturesDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_free"))) TS_CResult_ChannelFeaturesDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_free"))) TS_CResult_ChannelFeaturesDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ChannelFeaturesDecodeErrorZ _res_conv = *(LDKCResult_ChannelFeaturesDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ChannelFeaturesDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ChannelFeaturesDecodeErrorZ_clone_ptr(LDKCResult_ChannelFeaturesDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_ChannelFeaturesDecodeErrorZ_clone_ptr(LDKCResult_ChannelFeaturesDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_ChannelFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelFeaturesDecodeErrorZ), "LDKCResult_ChannelFeaturesDecodeErrorZ"); *ret_conv = CResult_ChannelFeaturesDecodeErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelFeaturesDecodeErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_ChannelFeaturesDecodeErrorZ* arg_conv = (LDKCResult_ChannelFeaturesDecodeErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_ChannelFeaturesDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelFeaturesDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ChannelFeaturesDecodeErrorZ* arg_conv = (LDKCResult_ChannelFeaturesDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ChannelFeaturesDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_clone"))) TS_CResult_ChannelFeaturesDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ChannelFeaturesDecodeErrorZ* orig_conv = (LDKCResult_ChannelFeaturesDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_clone"))) TS_CResult_ChannelFeaturesDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ChannelFeaturesDecodeErrorZ* orig_conv = (LDKCResult_ChannelFeaturesDecodeErrorZ*)untag_ptr(orig); LDKCResult_ChannelFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelFeaturesDecodeErrorZ), "LDKCResult_ChannelFeaturesDecodeErrorZ"); *ret_conv = CResult_ChannelFeaturesDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_ok"))) TS_CResult_NodeFeaturesDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_ok"))) TS_CResult_NodeFeaturesDecodeErrorZ_ok(uint64_t o) { LDKNodeFeatures o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = NodeFeatures_clone(&o_conv); LDKCResult_NodeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeFeaturesDecodeErrorZ), "LDKCResult_NodeFeaturesDecodeErrorZ"); *ret_conv = CResult_NodeFeaturesDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_err"))) TS_CResult_NodeFeaturesDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_err"))) TS_CResult_NodeFeaturesDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_NodeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeFeaturesDecodeErrorZ), "LDKCResult_NodeFeaturesDecodeErrorZ"); *ret_conv = CResult_NodeFeaturesDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_is_ok"))) TS_CResult_NodeFeaturesDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_NodeFeaturesDecodeErrorZ* o_conv = (LDKCResult_NodeFeaturesDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_is_ok"))) TS_CResult_NodeFeaturesDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_NodeFeaturesDecodeErrorZ* o_conv = (LDKCResult_NodeFeaturesDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_NodeFeaturesDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_free"))) TS_CResult_NodeFeaturesDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_free"))) TS_CResult_NodeFeaturesDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_NodeFeaturesDecodeErrorZ _res_conv = *(LDKCResult_NodeFeaturesDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_NodeFeaturesDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_NodeFeaturesDecodeErrorZ_clone_ptr(LDKCResult_NodeFeaturesDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_NodeFeaturesDecodeErrorZ_clone_ptr(LDKCResult_NodeFeaturesDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_NodeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeFeaturesDecodeErrorZ), "LDKCResult_NodeFeaturesDecodeErrorZ"); *ret_conv = CResult_NodeFeaturesDecodeErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_clone_ptr"))) TS_CResult_NodeFeaturesDecodeErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_NodeFeaturesDecodeErrorZ* arg_conv = (LDKCResult_NodeFeaturesDecodeErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_NodeFeaturesDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_clone_ptr"))) TS_CResult_NodeFeaturesDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_NodeFeaturesDecodeErrorZ* arg_conv = (LDKCResult_NodeFeaturesDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_NodeFeaturesDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_clone"))) TS_CResult_NodeFeaturesDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_NodeFeaturesDecodeErrorZ* orig_conv = (LDKCResult_NodeFeaturesDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_clone"))) TS_CResult_NodeFeaturesDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_NodeFeaturesDecodeErrorZ* orig_conv = (LDKCResult_NodeFeaturesDecodeErrorZ*)untag_ptr(orig); LDKCResult_NodeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeFeaturesDecodeErrorZ), "LDKCResult_NodeFeaturesDecodeErrorZ"); *ret_conv = CResult_NodeFeaturesDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_ok"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_ok"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_ok(uint64_t o) { LDKInvoiceFeatures o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = InvoiceFeatures_clone(&o_conv); LDKCResult_InvoiceFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceFeaturesDecodeErrorZ), "LDKCResult_InvoiceFeaturesDecodeErrorZ"); *ret_conv = CResult_InvoiceFeaturesDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_err"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_err"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_InvoiceFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceFeaturesDecodeErrorZ), "LDKCResult_InvoiceFeaturesDecodeErrorZ"); *ret_conv = CResult_InvoiceFeaturesDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_is_ok"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_InvoiceFeaturesDecodeErrorZ* o_conv = (LDKCResult_InvoiceFeaturesDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_is_ok"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_InvoiceFeaturesDecodeErrorZ* o_conv = (LDKCResult_InvoiceFeaturesDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_InvoiceFeaturesDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_free"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_free"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_InvoiceFeaturesDecodeErrorZ _res_conv = *(LDKCResult_InvoiceFeaturesDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_InvoiceFeaturesDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_InvoiceFeaturesDecodeErrorZ_clone_ptr(LDKCResult_InvoiceFeaturesDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_InvoiceFeaturesDecodeErrorZ_clone_ptr(LDKCResult_InvoiceFeaturesDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_InvoiceFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceFeaturesDecodeErrorZ), "LDKCResult_InvoiceFeaturesDecodeErrorZ"); *ret_conv = CResult_InvoiceFeaturesDecodeErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_clone_ptr"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_InvoiceFeaturesDecodeErrorZ* arg_conv = (LDKCResult_InvoiceFeaturesDecodeErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_InvoiceFeaturesDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_clone_ptr"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_InvoiceFeaturesDecodeErrorZ* arg_conv = (LDKCResult_InvoiceFeaturesDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_InvoiceFeaturesDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_clone"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_InvoiceFeaturesDecodeErrorZ* orig_conv = (LDKCResult_InvoiceFeaturesDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_clone"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_InvoiceFeaturesDecodeErrorZ* orig_conv = (LDKCResult_InvoiceFeaturesDecodeErrorZ*)untag_ptr(orig); LDKCResult_InvoiceFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceFeaturesDecodeErrorZ), "LDKCResult_InvoiceFeaturesDecodeErrorZ"); *ret_conv = CResult_InvoiceFeaturesDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_ok"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_ok"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_ok(uint64_t o) { LDKChannelTypeFeatures o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ChannelTypeFeatures_clone(&o_conv); LDKCResult_ChannelTypeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTypeFeaturesDecodeErrorZ), "LDKCResult_ChannelTypeFeaturesDecodeErrorZ"); *ret_conv = CResult_ChannelTypeFeaturesDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_err"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_err"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ChannelTypeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTypeFeaturesDecodeErrorZ), "LDKCResult_ChannelTypeFeaturesDecodeErrorZ"); *ret_conv = CResult_ChannelTypeFeaturesDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_is_ok"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ChannelTypeFeaturesDecodeErrorZ* o_conv = (LDKCResult_ChannelTypeFeaturesDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_is_ok"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ChannelTypeFeaturesDecodeErrorZ* o_conv = (LDKCResult_ChannelTypeFeaturesDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ChannelTypeFeaturesDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_free"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_free"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ChannelTypeFeaturesDecodeErrorZ _res_conv = *(LDKCResult_ChannelTypeFeaturesDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ChannelTypeFeaturesDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ChannelTypeFeaturesDecodeErrorZ_clone_ptr(LDKCResult_ChannelTypeFeaturesDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_ChannelTypeFeaturesDecodeErrorZ_clone_ptr(LDKCResult_ChannelTypeFeaturesDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_ChannelTypeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTypeFeaturesDecodeErrorZ), "LDKCResult_ChannelTypeFeaturesDecodeErrorZ"); *ret_conv = CResult_ChannelTypeFeaturesDecodeErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_ChannelTypeFeaturesDecodeErrorZ* arg_conv = (LDKCResult_ChannelTypeFeaturesDecodeErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_ChannelTypeFeaturesDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ChannelTypeFeaturesDecodeErrorZ* arg_conv = (LDKCResult_ChannelTypeFeaturesDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ChannelTypeFeaturesDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_clone"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ChannelTypeFeaturesDecodeErrorZ* orig_conv = (LDKCResult_ChannelTypeFeaturesDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_clone"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ChannelTypeFeaturesDecodeErrorZ* orig_conv = (LDKCResult_ChannelTypeFeaturesDecodeErrorZ*)untag_ptr(orig); LDKCResult_ChannelTypeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTypeFeaturesDecodeErrorZ), "LDKCResult_ChannelTypeFeaturesDecodeErrorZ"); *ret_conv = CResult_ChannelTypeFeaturesDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_ok"))) TS_CResult_NodeIdDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_ok"))) TS_CResult_NodeIdDecodeErrorZ_ok(uint64_t o) { LDKNodeId o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = NodeId_clone(&o_conv); LDKCResult_NodeIdDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeIdDecodeErrorZ), "LDKCResult_NodeIdDecodeErrorZ"); *ret_conv = CResult_NodeIdDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_err"))) TS_CResult_NodeIdDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_err"))) TS_CResult_NodeIdDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_NodeIdDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeIdDecodeErrorZ), "LDKCResult_NodeIdDecodeErrorZ"); *ret_conv = CResult_NodeIdDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_is_ok"))) TS_CResult_NodeIdDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_NodeIdDecodeErrorZ* o_conv = (LDKCResult_NodeIdDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_is_ok"))) TS_CResult_NodeIdDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_NodeIdDecodeErrorZ* o_conv = (LDKCResult_NodeIdDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_NodeIdDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_free"))) TS_CResult_NodeIdDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_free"))) TS_CResult_NodeIdDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_NodeIdDecodeErrorZ _res_conv = *(LDKCResult_NodeIdDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_NodeIdDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_NodeIdDecodeErrorZ_clone_ptr(LDKCResult_NodeIdDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_NodeIdDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_clone_ptr"))) TS_CResult_NodeIdDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_NodeIdDecodeErrorZ* arg_conv = (LDKCResult_NodeIdDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_NodeIdDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_clone"))) TS_CResult_NodeIdDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_NodeIdDecodeErrorZ* orig_conv = (LDKCResult_NodeIdDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_clone"))) TS_CResult_NodeIdDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_NodeIdDecodeErrorZ* orig_conv = (LDKCResult_NodeIdDecodeErrorZ*)untag_ptr(orig); LDKCResult_NodeIdDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeIdDecodeErrorZ), "LDKCResult_NodeIdDecodeErrorZ"); *ret_conv = CResult_NodeIdDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_ok"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_ok"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_ok(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKCOption_NetworkUpdateZ o_conv = *(LDKCOption_NetworkUpdateZ*)(o_ptr); - o_conv = COption_NetworkUpdateZ_clone((LDKCOption_NetworkUpdateZ*)(((uintptr_t)o) & ~1)); + o_conv = COption_NetworkUpdateZ_clone((LDKCOption_NetworkUpdateZ*)untag_ptr(o)); LDKCResult_COption_NetworkUpdateZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_NetworkUpdateZDecodeErrorZ), "LDKCResult_COption_NetworkUpdateZDecodeErrorZ"); *ret_conv = CResult_COption_NetworkUpdateZDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_err"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_err"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_is_ok"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_COption_NetworkUpdateZDecodeErrorZ* o_conv = (LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_is_ok"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_COption_NetworkUpdateZDecodeErrorZ* o_conv = (LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_COption_NetworkUpdateZDecodeErrorZ_is_ok(o_conv); return ret_conv; } -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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_free"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_COption_NetworkUpdateZDecodeErrorZ _res_conv = *(LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_COption_NetworkUpdateZDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_COption_NetworkUpdateZDecodeErrorZ_clone_ptr(LDKCResult_COption_NetworkUpdateZDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_COption_NetworkUpdateZDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_clone_ptr"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_COption_NetworkUpdateZDecodeErrorZ* arg_conv = (LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_COption_NetworkUpdateZDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_clone"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_COption_NetworkUpdateZDecodeErrorZ* orig_conv = (LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_clone"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_COption_NetworkUpdateZDecodeErrorZ* orig_conv = (LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)untag_ptr(orig); LDKCResult_COption_NetworkUpdateZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_NetworkUpdateZDecodeErrorZ), "LDKCResult_COption_NetworkUpdateZDecodeErrorZ"); *ret_conv = CResult_COption_NetworkUpdateZDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_COption_AccessZ_some"))) TS_COption_AccessZ_some(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_COption_AccessZ_some"))) TS_COption_AccessZ_some(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKAccess o_conv = *(LDKAccess*)(o_ptr); if (o_conv.free == LDKAccess_JCalls_free) { @@ -14296,157 +13020,157 @@ uint32_t __attribute__((export_name("TS_COption_AccessZ_some"))) TS_COption_Acc } LDKCOption_AccessZ *ret_copy = MALLOC(sizeof(LDKCOption_AccessZ), "LDKCOption_AccessZ"); *ret_copy = COption_AccessZ_some(o_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_AccessZ_none"))) TS_COption_AccessZ_none() { +uint64_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(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_COption_AccessZ_free"))) TS_COption_AccessZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCOption_AccessZ _res_conv = *(LDKCOption_AccessZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); COption_AccessZ_free(_res_conv); } -uint32_t __attribute__((export_name("TS_CResult_boolLightningErrorZ_ok"))) TS_CResult_boolLightningErrorZ_ok(jboolean o) { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_boolLightningErrorZ_err"))) TS_CResult_boolLightningErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_boolLightningErrorZ_err"))) TS_CResult_boolLightningErrorZ_err(uint64_t e) { LDKLightningError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = LightningError_clone(&e_conv); LDKCResult_boolLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolLightningErrorZ), "LDKCResult_boolLightningErrorZ"); *ret_conv = CResult_boolLightningErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_boolLightningErrorZ_is_ok"))) TS_CResult_boolLightningErrorZ_is_ok(uint32_t o) { - LDKCResult_boolLightningErrorZ* o_conv = (LDKCResult_boolLightningErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_boolLightningErrorZ_is_ok"))) TS_CResult_boolLightningErrorZ_is_ok(uint64_t o) { + LDKCResult_boolLightningErrorZ* o_conv = (LDKCResult_boolLightningErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_boolLightningErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_boolLightningErrorZ_free"))) TS_CResult_boolLightningErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_boolLightningErrorZ_free"))) TS_CResult_boolLightningErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_boolLightningErrorZ _res_conv = *(LDKCResult_boolLightningErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_boolLightningErrorZ_free(_res_conv); } -static inline uintptr_t CResult_boolLightningErrorZ_clone_ptr(LDKCResult_boolLightningErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_boolLightningErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_boolLightningErrorZ_clone_ptr"))) TS_CResult_boolLightningErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_boolLightningErrorZ* arg_conv = (LDKCResult_boolLightningErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_boolLightningErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_boolLightningErrorZ_clone"))) TS_CResult_boolLightningErrorZ_clone(uint32_t orig) { - LDKCResult_boolLightningErrorZ* orig_conv = (LDKCResult_boolLightningErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_boolLightningErrorZ_clone"))) TS_CResult_boolLightningErrorZ_clone(uint64_t orig) { + LDKCResult_boolLightningErrorZ* orig_conv = (LDKCResult_boolLightningErrorZ*)untag_ptr(orig); LDKCResult_boolLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolLightningErrorZ), "LDKCResult_boolLightningErrorZ"); *ret_conv = CResult_boolLightningErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -static inline uintptr_t C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone_ptr(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ *NONNULL_PTR arg) { +static inline uint64_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 ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone_ptr"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone_ptr(uint64_t arg) { + LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* arg_conv = (LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)untag_ptr(arg); + int64_t ret_conv = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone(uint32_t orig) { - LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* orig_conv = (LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone(uint64_t orig) { + LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* orig_conv = (LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)untag_ptr(orig); LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* ret_conv = MALLOC(sizeof(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ), "LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ"); *ret_conv = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone(orig_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_new"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_new(uint32_t a, uint32_t b, uint32_t c) { +uint64_t __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_new"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_new(uint64_t a, uint64_t b, uint64_t c) { LDKChannelAnnouncement a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = (a & 1) || (a == 0); + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); a_conv = ChannelAnnouncement_clone(&a_conv); LDKChannelUpdate b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = (b & 1) || (b == 0); + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); b_conv = ChannelUpdate_clone(&b_conv); LDKChannelUpdate c_conv; - c_conv.inner = (void*)(c & (~1)); - c_conv.is_owned = (c & 1) || (c == 0); + c_conv.inner = untag_ptr(c); + c_conv.is_owned = ptr_is_owned(c); CHECK_INNER_FIELD_ACCESS_OR_NULL(c_conv); 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 ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_free"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_free"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ _res_conv = *(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_free(_res_conv); } -void __attribute__((export_name("TS_CVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ_free"))) TS_CVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ_free"))) TS_CVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ_free(uint64_tArray _res) { LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _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; + uint64_t* _res_vals = _res->elems; for (size_t h = 0; h < _res_constr.datalen; h++) { - uint32_t _res_conv_59 = _res_vals[h]; - void* _res_conv_59_ptr = (void*)(((uintptr_t)_res_conv_59) & ~1); + uint64_t _res_conv_59 = _res_vals[h]; + void* _res_conv_59_ptr = untag_ptr(_res_conv_59); CHECK_ACCESS(_res_conv_59_ptr); LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ _res_conv_59_conv = *(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(_res_conv_59_ptr); - FREE((void*)_res_conv_59); + FREE(untag_ptr(_res_conv_59)); _res_constr.data[h] = _res_conv_59_conv; } FREE(_res); CVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ_free(_res_constr); } -void __attribute__((export_name("TS_CVec_NodeAnnouncementZ_free"))) TS_CVec_NodeAnnouncementZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_NodeAnnouncementZ_free"))) TS_CVec_NodeAnnouncementZ_free(uint64_tArray _res) { LDKCVec_NodeAnnouncementZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKNodeAnnouncement), "LDKCVec_NodeAnnouncementZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t s = 0; s < _res_constr.datalen; s++) { - uint32_t _res_conv_18 = _res_vals[s]; + uint64_t _res_conv_18 = _res_vals[s]; LDKNodeAnnouncement _res_conv_18_conv; - _res_conv_18_conv.inner = (void*)(_res_conv_18 & (~1)); - _res_conv_18_conv.is_owned = (_res_conv_18 & 1) || (_res_conv_18 == 0); + _res_conv_18_conv.inner = untag_ptr(_res_conv_18); + _res_conv_18_conv.is_owned = ptr_is_owned(_res_conv_18); CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_18_conv); _res_constr.data[s] = _res_conv_18_conv; } @@ -14454,664 +13178,665 @@ void __attribute__((export_name("TS_CVec_NodeAnnouncementZ_free"))) TS_CVec_Nod CVec_NodeAnnouncementZ_free(_res_constr); } -uint32_t __attribute__((export_name("TS_CResult_NoneLightningErrorZ_ok"))) TS_CResult_NoneLightningErrorZ_ok() { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NoneLightningErrorZ_err"))) TS_CResult_NoneLightningErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_NoneLightningErrorZ_err"))) TS_CResult_NoneLightningErrorZ_err(uint64_t e) { LDKLightningError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = LightningError_clone(&e_conv); LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = CResult_NoneLightningErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_NoneLightningErrorZ_is_ok"))) TS_CResult_NoneLightningErrorZ_is_ok(uint32_t o) { - LDKCResult_NoneLightningErrorZ* o_conv = (LDKCResult_NoneLightningErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_NoneLightningErrorZ_is_ok"))) TS_CResult_NoneLightningErrorZ_is_ok(uint64_t o) { + LDKCResult_NoneLightningErrorZ* o_conv = (LDKCResult_NoneLightningErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_NoneLightningErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_NoneLightningErrorZ_free"))) TS_CResult_NoneLightningErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_NoneLightningErrorZ_free"))) TS_CResult_NoneLightningErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_NoneLightningErrorZ _res_conv = *(LDKCResult_NoneLightningErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_NoneLightningErrorZ_free(_res_conv); } -static inline uintptr_t CResult_NoneLightningErrorZ_clone_ptr(LDKCResult_NoneLightningErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_NoneLightningErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_NoneLightningErrorZ_clone_ptr"))) TS_CResult_NoneLightningErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_NoneLightningErrorZ* arg_conv = (LDKCResult_NoneLightningErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_NoneLightningErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_NoneLightningErrorZ_clone"))) TS_CResult_NoneLightningErrorZ_clone(uint32_t orig) { - LDKCResult_NoneLightningErrorZ* orig_conv = (LDKCResult_NoneLightningErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_NoneLightningErrorZ_clone"))) TS_CResult_NoneLightningErrorZ_clone(uint64_t orig) { + LDKCResult_NoneLightningErrorZ* orig_conv = (LDKCResult_NoneLightningErrorZ*)untag_ptr(orig); LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = CResult_NoneLightningErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_ok"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_ok"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_ok(uint64_t o) { LDKChannelUpdateInfo o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ChannelUpdateInfo_clone(&o_conv); LDKCResult_ChannelUpdateInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateInfoDecodeErrorZ), "LDKCResult_ChannelUpdateInfoDecodeErrorZ"); *ret_conv = CResult_ChannelUpdateInfoDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_err"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_err"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ChannelUpdateInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateInfoDecodeErrorZ), "LDKCResult_ChannelUpdateInfoDecodeErrorZ"); *ret_conv = CResult_ChannelUpdateInfoDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_is_ok"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ChannelUpdateInfoDecodeErrorZ* o_conv = (LDKCResult_ChannelUpdateInfoDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_is_ok"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ChannelUpdateInfoDecodeErrorZ* o_conv = (LDKCResult_ChannelUpdateInfoDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ChannelUpdateInfoDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_free"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_free"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ChannelUpdateInfoDecodeErrorZ _res_conv = *(LDKCResult_ChannelUpdateInfoDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ChannelUpdateInfoDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ChannelUpdateInfoDecodeErrorZ_clone_ptr(LDKCResult_ChannelUpdateInfoDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_ChannelUpdateInfoDecodeErrorZ_clone_ptr(LDKCResult_ChannelUpdateInfoDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_ChannelUpdateInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateInfoDecodeErrorZ), "LDKCResult_ChannelUpdateInfoDecodeErrorZ"); *ret_conv = CResult_ChannelUpdateInfoDecodeErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_ChannelUpdateInfoDecodeErrorZ* arg_conv = (LDKCResult_ChannelUpdateInfoDecodeErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_ChannelUpdateInfoDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ChannelUpdateInfoDecodeErrorZ* arg_conv = (LDKCResult_ChannelUpdateInfoDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ChannelUpdateInfoDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_clone"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ChannelUpdateInfoDecodeErrorZ* orig_conv = (LDKCResult_ChannelUpdateInfoDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_clone"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ChannelUpdateInfoDecodeErrorZ* orig_conv = (LDKCResult_ChannelUpdateInfoDecodeErrorZ*)untag_ptr(orig); LDKCResult_ChannelUpdateInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateInfoDecodeErrorZ), "LDKCResult_ChannelUpdateInfoDecodeErrorZ"); *ret_conv = CResult_ChannelUpdateInfoDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_ok"))) TS_CResult_ChannelInfoDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_ok"))) TS_CResult_ChannelInfoDecodeErrorZ_ok(uint64_t o) { LDKChannelInfo o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ChannelInfo_clone(&o_conv); LDKCResult_ChannelInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelInfoDecodeErrorZ), "LDKCResult_ChannelInfoDecodeErrorZ"); *ret_conv = CResult_ChannelInfoDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_err"))) TS_CResult_ChannelInfoDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_err"))) TS_CResult_ChannelInfoDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ChannelInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelInfoDecodeErrorZ), "LDKCResult_ChannelInfoDecodeErrorZ"); *ret_conv = CResult_ChannelInfoDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_is_ok"))) TS_CResult_ChannelInfoDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ChannelInfoDecodeErrorZ* o_conv = (LDKCResult_ChannelInfoDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_is_ok"))) TS_CResult_ChannelInfoDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ChannelInfoDecodeErrorZ* o_conv = (LDKCResult_ChannelInfoDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ChannelInfoDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_free"))) TS_CResult_ChannelInfoDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_free"))) TS_CResult_ChannelInfoDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ChannelInfoDecodeErrorZ _res_conv = *(LDKCResult_ChannelInfoDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ChannelInfoDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ChannelInfoDecodeErrorZ_clone_ptr(LDKCResult_ChannelInfoDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_ChannelInfoDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelInfoDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ChannelInfoDecodeErrorZ* arg_conv = (LDKCResult_ChannelInfoDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ChannelInfoDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_clone"))) TS_CResult_ChannelInfoDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ChannelInfoDecodeErrorZ* orig_conv = (LDKCResult_ChannelInfoDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_clone"))) TS_CResult_ChannelInfoDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ChannelInfoDecodeErrorZ* orig_conv = (LDKCResult_ChannelInfoDecodeErrorZ*)untag_ptr(orig); LDKCResult_ChannelInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelInfoDecodeErrorZ), "LDKCResult_ChannelInfoDecodeErrorZ"); *ret_conv = CResult_ChannelInfoDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_ok"))) TS_CResult_RoutingFeesDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_ok"))) TS_CResult_RoutingFeesDecodeErrorZ_ok(uint64_t o) { LDKRoutingFees o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = RoutingFees_clone(&o_conv); LDKCResult_RoutingFeesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RoutingFeesDecodeErrorZ), "LDKCResult_RoutingFeesDecodeErrorZ"); *ret_conv = CResult_RoutingFeesDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_err"))) TS_CResult_RoutingFeesDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_err"))) TS_CResult_RoutingFeesDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_RoutingFeesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RoutingFeesDecodeErrorZ), "LDKCResult_RoutingFeesDecodeErrorZ"); *ret_conv = CResult_RoutingFeesDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_is_ok"))) TS_CResult_RoutingFeesDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_RoutingFeesDecodeErrorZ* o_conv = (LDKCResult_RoutingFeesDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_is_ok"))) TS_CResult_RoutingFeesDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_RoutingFeesDecodeErrorZ* o_conv = (LDKCResult_RoutingFeesDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_RoutingFeesDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_free"))) TS_CResult_RoutingFeesDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_free"))) TS_CResult_RoutingFeesDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_RoutingFeesDecodeErrorZ _res_conv = *(LDKCResult_RoutingFeesDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_RoutingFeesDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_RoutingFeesDecodeErrorZ_clone_ptr(LDKCResult_RoutingFeesDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_RoutingFeesDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_clone_ptr"))) TS_CResult_RoutingFeesDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_RoutingFeesDecodeErrorZ* arg_conv = (LDKCResult_RoutingFeesDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_RoutingFeesDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_clone"))) TS_CResult_RoutingFeesDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_RoutingFeesDecodeErrorZ* orig_conv = (LDKCResult_RoutingFeesDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_clone"))) TS_CResult_RoutingFeesDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_RoutingFeesDecodeErrorZ* orig_conv = (LDKCResult_RoutingFeesDecodeErrorZ*)untag_ptr(orig); LDKCResult_RoutingFeesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RoutingFeesDecodeErrorZ), "LDKCResult_RoutingFeesDecodeErrorZ"); *ret_conv = CResult_RoutingFeesDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_CVec_NetAddressZ_free"))) TS_CVec_NetAddressZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_NetAddressZ_free"))) TS_CVec_NetAddressZ_free(uint64_tArray _res) { LDKCVec_NetAddressZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKNetAddress), "LDKCVec_NetAddressZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t m = 0; m < _res_constr.datalen; m++) { - uint32_t _res_conv_12 = _res_vals[m]; - void* _res_conv_12_ptr = (void*)(((uintptr_t)_res_conv_12) & ~1); + uint64_t _res_conv_12 = _res_vals[m]; + void* _res_conv_12_ptr = untag_ptr(_res_conv_12); CHECK_ACCESS(_res_conv_12_ptr); LDKNetAddress _res_conv_12_conv = *(LDKNetAddress*)(_res_conv_12_ptr); - FREE((void*)_res_conv_12); + FREE(untag_ptr(_res_conv_12)); _res_constr.data[m] = _res_conv_12_conv; } FREE(_res); CVec_NetAddressZ_free(_res_constr); } -uint32_t __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_ok"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_ok"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_ok(uint64_t o) { LDKNodeAnnouncementInfo o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = NodeAnnouncementInfo_clone(&o_conv); LDKCResult_NodeAnnouncementInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementInfoDecodeErrorZ), "LDKCResult_NodeAnnouncementInfoDecodeErrorZ"); *ret_conv = CResult_NodeAnnouncementInfoDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_err"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_err"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_NodeAnnouncementInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementInfoDecodeErrorZ), "LDKCResult_NodeAnnouncementInfoDecodeErrorZ"); *ret_conv = CResult_NodeAnnouncementInfoDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_is_ok"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_NodeAnnouncementInfoDecodeErrorZ* o_conv = (LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_is_ok"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_NodeAnnouncementInfoDecodeErrorZ* o_conv = (LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_NodeAnnouncementInfoDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_free"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_free"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_NodeAnnouncementInfoDecodeErrorZ _res_conv = *(LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_NodeAnnouncementInfoDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_NodeAnnouncementInfoDecodeErrorZ_clone_ptr(LDKCResult_NodeAnnouncementInfoDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_NodeAnnouncementInfoDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_clone_ptr"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_NodeAnnouncementInfoDecodeErrorZ* arg_conv = (LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_NodeAnnouncementInfoDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_clone"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_NodeAnnouncementInfoDecodeErrorZ* orig_conv = (LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_clone"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_NodeAnnouncementInfoDecodeErrorZ* orig_conv = (LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)untag_ptr(orig); LDKCResult_NodeAnnouncementInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementInfoDecodeErrorZ), "LDKCResult_NodeAnnouncementInfoDecodeErrorZ"); *ret_conv = CResult_NodeAnnouncementInfoDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_ok"))) TS_CResult_NodeAliasDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_ok"))) TS_CResult_NodeAliasDecodeErrorZ_ok(uint64_t o) { LDKNodeAlias o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = NodeAlias_clone(&o_conv); LDKCResult_NodeAliasDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAliasDecodeErrorZ), "LDKCResult_NodeAliasDecodeErrorZ"); *ret_conv = CResult_NodeAliasDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_err"))) TS_CResult_NodeAliasDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_err"))) TS_CResult_NodeAliasDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_NodeAliasDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAliasDecodeErrorZ), "LDKCResult_NodeAliasDecodeErrorZ"); *ret_conv = CResult_NodeAliasDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_is_ok"))) TS_CResult_NodeAliasDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_NodeAliasDecodeErrorZ* o_conv = (LDKCResult_NodeAliasDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_is_ok"))) TS_CResult_NodeAliasDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_NodeAliasDecodeErrorZ* o_conv = (LDKCResult_NodeAliasDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_NodeAliasDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_free"))) TS_CResult_NodeAliasDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_free"))) TS_CResult_NodeAliasDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_NodeAliasDecodeErrorZ _res_conv = *(LDKCResult_NodeAliasDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_NodeAliasDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_NodeAliasDecodeErrorZ_clone_ptr(LDKCResult_NodeAliasDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_NodeAliasDecodeErrorZ_clone_ptr(LDKCResult_NodeAliasDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_NodeAliasDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAliasDecodeErrorZ), "LDKCResult_NodeAliasDecodeErrorZ"); *ret_conv = CResult_NodeAliasDecodeErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_clone_ptr"))) TS_CResult_NodeAliasDecodeErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_NodeAliasDecodeErrorZ* arg_conv = (LDKCResult_NodeAliasDecodeErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_NodeAliasDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_clone_ptr"))) TS_CResult_NodeAliasDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_NodeAliasDecodeErrorZ* arg_conv = (LDKCResult_NodeAliasDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_NodeAliasDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_clone"))) TS_CResult_NodeAliasDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_NodeAliasDecodeErrorZ* orig_conv = (LDKCResult_NodeAliasDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_clone"))) TS_CResult_NodeAliasDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_NodeAliasDecodeErrorZ* orig_conv = (LDKCResult_NodeAliasDecodeErrorZ*)untag_ptr(orig); LDKCResult_NodeAliasDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAliasDecodeErrorZ), "LDKCResult_NodeAliasDecodeErrorZ"); *ret_conv = CResult_NodeAliasDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_ok"))) TS_CResult_NodeInfoDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_ok"))) TS_CResult_NodeInfoDecodeErrorZ_ok(uint64_t o) { LDKNodeInfo o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = NodeInfo_clone(&o_conv); LDKCResult_NodeInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeInfoDecodeErrorZ), "LDKCResult_NodeInfoDecodeErrorZ"); *ret_conv = CResult_NodeInfoDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_err"))) TS_CResult_NodeInfoDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_err"))) TS_CResult_NodeInfoDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_NodeInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeInfoDecodeErrorZ), "LDKCResult_NodeInfoDecodeErrorZ"); *ret_conv = CResult_NodeInfoDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_is_ok"))) TS_CResult_NodeInfoDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_NodeInfoDecodeErrorZ* o_conv = (LDKCResult_NodeInfoDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_is_ok"))) TS_CResult_NodeInfoDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_NodeInfoDecodeErrorZ* o_conv = (LDKCResult_NodeInfoDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_NodeInfoDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_free"))) TS_CResult_NodeInfoDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_free"))) TS_CResult_NodeInfoDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_NodeInfoDecodeErrorZ _res_conv = *(LDKCResult_NodeInfoDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_NodeInfoDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_NodeInfoDecodeErrorZ_clone_ptr(LDKCResult_NodeInfoDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_NodeInfoDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_clone_ptr"))) TS_CResult_NodeInfoDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_NodeInfoDecodeErrorZ* arg_conv = (LDKCResult_NodeInfoDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_NodeInfoDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_clone"))) TS_CResult_NodeInfoDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_NodeInfoDecodeErrorZ* orig_conv = (LDKCResult_NodeInfoDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_clone"))) TS_CResult_NodeInfoDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_NodeInfoDecodeErrorZ* orig_conv = (LDKCResult_NodeInfoDecodeErrorZ*)untag_ptr(orig); LDKCResult_NodeInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeInfoDecodeErrorZ), "LDKCResult_NodeInfoDecodeErrorZ"); *ret_conv = CResult_NodeInfoDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_ok"))) TS_CResult_NetworkGraphDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_ok"))) TS_CResult_NetworkGraphDecodeErrorZ_ok(uint64_t o) { LDKNetworkGraph o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); // WARNING: we need a move here but no clone is available for LDKNetworkGraph + LDKCResult_NetworkGraphDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetworkGraphDecodeErrorZ), "LDKCResult_NetworkGraphDecodeErrorZ"); *ret_conv = CResult_NetworkGraphDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_err"))) TS_CResult_NetworkGraphDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_err"))) TS_CResult_NetworkGraphDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_NetworkGraphDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetworkGraphDecodeErrorZ), "LDKCResult_NetworkGraphDecodeErrorZ"); *ret_conv = CResult_NetworkGraphDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_is_ok"))) TS_CResult_NetworkGraphDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_NetworkGraphDecodeErrorZ* o_conv = (LDKCResult_NetworkGraphDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_is_ok"))) TS_CResult_NetworkGraphDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_NetworkGraphDecodeErrorZ* o_conv = (LDKCResult_NetworkGraphDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_NetworkGraphDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_free"))) TS_CResult_NetworkGraphDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_free"))) TS_CResult_NetworkGraphDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_NetworkGraphDecodeErrorZ _res_conv = *(LDKCResult_NetworkGraphDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_NetworkGraphDecodeErrorZ_free(_res_conv); } -uint32_t __attribute__((export_name("TS_COption_CVec_NetAddressZZ_some"))) TS_COption_CVec_NetAddressZZ_some(uint32_tArray o) { +uint64_t __attribute__((export_name("TS_COption_CVec_NetAddressZZ_some"))) TS_COption_CVec_NetAddressZZ_some(uint64_tArray o) { LDKCVec_NetAddressZ o_constr; o_constr.datalen = o->arr_len; if (o_constr.datalen > 0) o_constr.data = MALLOC(o_constr.datalen * sizeof(LDKNetAddress), "LDKCVec_NetAddressZ Elements"); else o_constr.data = NULL; - uint32_t* o_vals = o->elems; + uint64_t* o_vals = o->elems; for (size_t m = 0; m < o_constr.datalen; m++) { - uint32_t o_conv_12 = o_vals[m]; - void* o_conv_12_ptr = (void*)(((uintptr_t)o_conv_12) & ~1); + uint64_t o_conv_12 = o_vals[m]; + void* o_conv_12_ptr = untag_ptr(o_conv_12); CHECK_ACCESS(o_conv_12_ptr); LDKNetAddress o_conv_12_conv = *(LDKNetAddress*)(o_conv_12_ptr); - o_conv_12_conv = NetAddress_clone((LDKNetAddress*)(((uintptr_t)o_conv_12) & ~1)); + o_conv_12_conv = NetAddress_clone((LDKNetAddress*)untag_ptr(o_conv_12)); o_constr.data[m] = o_conv_12_conv; } FREE(o); LDKCOption_CVec_NetAddressZZ *ret_copy = MALLOC(sizeof(LDKCOption_CVec_NetAddressZZ), "LDKCOption_CVec_NetAddressZZ"); *ret_copy = COption_CVec_NetAddressZZ_some(o_constr); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_CVec_NetAddressZZ_none"))) TS_COption_CVec_NetAddressZZ_none() { +uint64_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(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_COption_CVec_NetAddressZZ_free"))) TS_COption_CVec_NetAddressZZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCOption_CVec_NetAddressZZ _res_conv = *(LDKCOption_CVec_NetAddressZZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); COption_CVec_NetAddressZZ_free(_res_conv); } -static inline uintptr_t COption_CVec_NetAddressZZ_clone_ptr(LDKCOption_CVec_NetAddressZZ *NONNULL_PTR arg) { +static inline uint64_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); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_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; - uint32_t ret_conv = COption_CVec_NetAddressZZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_COption_CVec_NetAddressZZ_clone_ptr"))) TS_COption_CVec_NetAddressZZ_clone_ptr(uint64_t arg) { + LDKCOption_CVec_NetAddressZZ* arg_conv = (LDKCOption_CVec_NetAddressZZ*)untag_ptr(arg); + int64_t ret_conv = COption_CVec_NetAddressZZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_COption_CVec_NetAddressZZ_clone"))) TS_COption_CVec_NetAddressZZ_clone(uint32_t orig) { - LDKCOption_CVec_NetAddressZZ* orig_conv = (LDKCOption_CVec_NetAddressZZ*)orig; +uint64_t __attribute__((export_name("TS_COption_CVec_NetAddressZZ_clone"))) TS_COption_CVec_NetAddressZZ_clone(uint64_t orig) { + LDKCOption_CVec_NetAddressZZ* orig_conv = (LDKCOption_CVec_NetAddressZZ*)untag_ptr(orig); LDKCOption_CVec_NetAddressZZ *ret_copy = MALLOC(sizeof(LDKCOption_CVec_NetAddressZZ), "LDKCOption_CVec_NetAddressZZ"); *ret_copy = COption_CVec_NetAddressZZ_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_ok"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_ok"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_ok(uint64_t o) { LDKDelayedPaymentOutputDescriptor o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = DelayedPaymentOutputDescriptor_clone(&o_conv); LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ"); *ret_conv = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_err"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_err"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ"); *ret_conv = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_is_ok"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* o_conv = (LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_is_ok"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* o_conv = (LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_free"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_free"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ _res_conv = *(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone_ptr(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone_ptr"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* arg_conv = (LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* orig_conv = (LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* orig_conv = (LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ*)untag_ptr(orig); LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ"); *ret_conv = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_ok"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_ok"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_ok(uint64_t o) { LDKStaticPaymentOutputDescriptor o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = StaticPaymentOutputDescriptor_clone(&o_conv); LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ"); *ret_conv = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_err"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_err"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ"); *ret_conv = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_is_ok"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* o_conv = (LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_is_ok"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* o_conv = (LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_free"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_free"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ _res_conv = *(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_StaticPaymentOutputDescriptorDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone_ptr(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone_ptr"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* arg_conv = (LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* orig_conv = (LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* orig_conv = (LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ*)untag_ptr(orig); LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ"); *ret_conv = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_ok"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_ok"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_ok(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKSpendableOutputDescriptor o_conv = *(LDKSpendableOutputDescriptor*)(o_ptr); - o_conv = SpendableOutputDescriptor_clone((LDKSpendableOutputDescriptor*)(((uintptr_t)o) & ~1)); + o_conv = SpendableOutputDescriptor_clone((LDKSpendableOutputDescriptor*)untag_ptr(o)); LDKCResult_SpendableOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SpendableOutputDescriptorDecodeErrorZ), "LDKCResult_SpendableOutputDescriptorDecodeErrorZ"); *ret_conv = CResult_SpendableOutputDescriptorDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_err"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_err"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_SpendableOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SpendableOutputDescriptorDecodeErrorZ), "LDKCResult_SpendableOutputDescriptorDecodeErrorZ"); *ret_conv = CResult_SpendableOutputDescriptorDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_is_ok"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_SpendableOutputDescriptorDecodeErrorZ* o_conv = (LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_is_ok"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_SpendableOutputDescriptorDecodeErrorZ* o_conv = (LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_SpendableOutputDescriptorDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_free"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_free"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_SpendableOutputDescriptorDecodeErrorZ _res_conv = *(LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_SpendableOutputDescriptorDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_SpendableOutputDescriptorDecodeErrorZ_clone_ptr(LDKCResult_SpendableOutputDescriptorDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_SpendableOutputDescriptorDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_clone_ptr"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_SpendableOutputDescriptorDecodeErrorZ* arg_conv = (LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_SpendableOutputDescriptorDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_clone"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_SpendableOutputDescriptorDecodeErrorZ* orig_conv = (LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_clone"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_SpendableOutputDescriptorDecodeErrorZ* orig_conv = (LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)untag_ptr(orig); LDKCResult_SpendableOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SpendableOutputDescriptorDecodeErrorZ), "LDKCResult_SpendableOutputDescriptorDecodeErrorZ"); *ret_conv = CResult_SpendableOutputDescriptorDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } void __attribute__((export_name("TS_CVec_PaymentPreimageZ_free"))) TS_CVec_PaymentPreimageZ_free(ptrArray _res) { @@ -15133,25 +13858,25 @@ void __attribute__((export_name("TS_CVec_PaymentPreimageZ_free"))) TS_CVec_Paym CVec_PaymentPreimageZ_free(_res_constr); } -static inline uintptr_t C2Tuple_SignatureCVec_SignatureZZ_clone_ptr(LDKC2Tuple_SignatureCVec_SignatureZZ *NONNULL_PTR arg) { +static inline uint64_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 ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = C2Tuple_SignatureCVec_SignatureZZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_clone_ptr"))) TS_C2Tuple_SignatureCVec_SignatureZZ_clone_ptr(uint64_t arg) { + LDKC2Tuple_SignatureCVec_SignatureZZ* arg_conv = (LDKC2Tuple_SignatureCVec_SignatureZZ*)untag_ptr(arg); + int64_t ret_conv = C2Tuple_SignatureCVec_SignatureZZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_clone"))) TS_C2Tuple_SignatureCVec_SignatureZZ_clone(uint32_t orig) { - LDKC2Tuple_SignatureCVec_SignatureZZ* orig_conv = (LDKC2Tuple_SignatureCVec_SignatureZZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_clone"))) TS_C2Tuple_SignatureCVec_SignatureZZ_clone(uint64_t orig) { + LDKC2Tuple_SignatureCVec_SignatureZZ* orig_conv = (LDKC2Tuple_SignatureCVec_SignatureZZ*)untag_ptr(orig); LDKC2Tuple_SignatureCVec_SignatureZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_SignatureCVec_SignatureZZ), "LDKC2Tuple_SignatureCVec_SignatureZZ"); *ret_conv = C2Tuple_SignatureCVec_SignatureZZ_clone(orig_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_new"))) TS_C2Tuple_SignatureCVec_SignatureZZ_new(int8_tArray a, ptrArray b) { +uint64_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); FREE(a); @@ -15172,134 +13897,134 @@ uint32_t __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_new") FREE(b); LDKC2Tuple_SignatureCVec_SignatureZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_SignatureCVec_SignatureZZ), "LDKC2Tuple_SignatureCVec_SignatureZZ"); *ret_conv = C2Tuple_SignatureCVec_SignatureZZ_new(a_ref, b_constr); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_free"))) TS_C2Tuple_SignatureCVec_SignatureZZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKC2Tuple_SignatureCVec_SignatureZZ _res_conv = *(LDKC2Tuple_SignatureCVec_SignatureZZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); C2Tuple_SignatureCVec_SignatureZZ_free(_res_conv); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_ok"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_ok"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_ok(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKC2Tuple_SignatureCVec_SignatureZZ o_conv = *(LDKC2Tuple_SignatureCVec_SignatureZZ*)(o_ptr); - o_conv = C2Tuple_SignatureCVec_SignatureZZ_clone((LDKC2Tuple_SignatureCVec_SignatureZZ*)(((uintptr_t)o) & ~1)); + o_conv = C2Tuple_SignatureCVec_SignatureZZ_clone((LDKC2Tuple_SignatureCVec_SignatureZZ*)untag_ptr(o)); LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ), "LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ"); *ret_conv = CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_err"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_err() { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_is_ok"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_is_ok(uint32_t o) { - LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* o_conv = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_is_ok"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_is_ok(uint64_t o) { + LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* o_conv = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)untag_ptr(o); jboolean ret_conv = CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_is_ok(o_conv); return ret_conv; } -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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_free"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ _res_conv = *(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_free(_res_conv); } -static inline uintptr_t CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone_ptr(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone_ptr"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone_ptr(uint64_t arg) { + LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* arg_conv = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)untag_ptr(arg); + int64_t ret_conv = CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone(uint32_t orig) { - LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* orig_conv = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone(uint64_t orig) { + LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* orig_conv = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)untag_ptr(orig); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_SignatureNoneZ_ok"))) TS_CResult_SignatureNoneZ_ok(int8_tArray o) { +uint64_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); FREE(o); LDKCResult_SignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SignatureNoneZ), "LDKCResult_SignatureNoneZ"); *ret_conv = CResult_SignatureNoneZ_ok(o_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_SignatureNoneZ_err"))) TS_CResult_SignatureNoneZ_err() { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_SignatureNoneZ_is_ok"))) TS_CResult_SignatureNoneZ_is_ok(uint32_t o) { - LDKCResult_SignatureNoneZ* o_conv = (LDKCResult_SignatureNoneZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_SignatureNoneZ_is_ok"))) TS_CResult_SignatureNoneZ_is_ok(uint64_t o) { + LDKCResult_SignatureNoneZ* o_conv = (LDKCResult_SignatureNoneZ*)untag_ptr(o); jboolean ret_conv = CResult_SignatureNoneZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_SignatureNoneZ_free"))) TS_CResult_SignatureNoneZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_SignatureNoneZ_free"))) TS_CResult_SignatureNoneZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_SignatureNoneZ _res_conv = *(LDKCResult_SignatureNoneZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_SignatureNoneZ_free(_res_conv); } -static inline uintptr_t CResult_SignatureNoneZ_clone_ptr(LDKCResult_SignatureNoneZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_SignatureNoneZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_SignatureNoneZ_clone_ptr"))) TS_CResult_SignatureNoneZ_clone_ptr(uint64_t arg) { + LDKCResult_SignatureNoneZ* arg_conv = (LDKCResult_SignatureNoneZ*)untag_ptr(arg); + int64_t ret_conv = CResult_SignatureNoneZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_SignatureNoneZ_clone"))) TS_CResult_SignatureNoneZ_clone(uint32_t orig) { - LDKCResult_SignatureNoneZ* orig_conv = (LDKCResult_SignatureNoneZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_SignatureNoneZ_clone"))) TS_CResult_SignatureNoneZ_clone(uint64_t orig) { + LDKCResult_SignatureNoneZ* orig_conv = (LDKCResult_SignatureNoneZ*)untag_ptr(orig); LDKCResult_SignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SignatureNoneZ), "LDKCResult_SignatureNoneZ"); *ret_conv = CResult_SignatureNoneZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -static inline uintptr_t C2Tuple_SignatureSignatureZ_clone_ptr(LDKC2Tuple_SignatureSignatureZ *NONNULL_PTR arg) { +static inline uint64_t C2Tuple_SignatureSignatureZ_clone_ptr(LDKC2Tuple_SignatureSignatureZ *NONNULL_PTR arg) { LDKC2Tuple_SignatureSignatureZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_SignatureSignatureZ), "LDKC2Tuple_SignatureSignatureZ"); *ret_conv = C2Tuple_SignatureSignatureZ_clone(arg); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C2Tuple_SignatureSignatureZ_clone_ptr"))) TS_C2Tuple_SignatureSignatureZ_clone_ptr(uint32_t arg) { - LDKC2Tuple_SignatureSignatureZ* arg_conv = (LDKC2Tuple_SignatureSignatureZ*)(arg & ~1); - uint32_t ret_conv = C2Tuple_SignatureSignatureZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_C2Tuple_SignatureSignatureZ_clone_ptr"))) TS_C2Tuple_SignatureSignatureZ_clone_ptr(uint64_t arg) { + LDKC2Tuple_SignatureSignatureZ* arg_conv = (LDKC2Tuple_SignatureSignatureZ*)untag_ptr(arg); + int64_t ret_conv = C2Tuple_SignatureSignatureZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_C2Tuple_SignatureSignatureZ_clone"))) TS_C2Tuple_SignatureSignatureZ_clone(uint32_t orig) { - LDKC2Tuple_SignatureSignatureZ* orig_conv = (LDKC2Tuple_SignatureSignatureZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_C2Tuple_SignatureSignatureZ_clone"))) TS_C2Tuple_SignatureSignatureZ_clone(uint64_t orig) { + LDKC2Tuple_SignatureSignatureZ* orig_conv = (LDKC2Tuple_SignatureSignatureZ*)untag_ptr(orig); LDKC2Tuple_SignatureSignatureZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_SignatureSignatureZ), "LDKC2Tuple_SignatureSignatureZ"); *ret_conv = C2Tuple_SignatureSignatureZ_clone(orig_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C2Tuple_SignatureSignatureZ_new"))) TS_C2Tuple_SignatureSignatureZ_new(int8_tArray a, int8_tArray b) { +uint64_t __attribute__((export_name("TS_C2Tuple_SignatureSignatureZ_new"))) TS_C2Tuple_SignatureSignatureZ_new(int8_tArray a, int8_tArray b) { LDKSignature a_ref; CHECK(a->arr_len == 64); memcpy(a_ref.compact_form, a->elems, 64); FREE(a); @@ -15308,117 +14033,117 @@ uint32_t __attribute__((export_name("TS_C2Tuple_SignatureSignatureZ_new"))) TS_ memcpy(b_ref.compact_form, b->elems, 64); FREE(b); LDKC2Tuple_SignatureSignatureZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_SignatureSignatureZ), "LDKC2Tuple_SignatureSignatureZ"); *ret_conv = C2Tuple_SignatureSignatureZ_new(a_ref, b_ref); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_C2Tuple_SignatureSignatureZ_free"))) TS_C2Tuple_SignatureSignatureZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_C2Tuple_SignatureSignatureZ_free"))) TS_C2Tuple_SignatureSignatureZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKC2Tuple_SignatureSignatureZ _res_conv = *(LDKC2Tuple_SignatureSignatureZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); C2Tuple_SignatureSignatureZ_free(_res_conv); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_ok"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_ok"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_ok(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKC2Tuple_SignatureSignatureZ o_conv = *(LDKC2Tuple_SignatureSignatureZ*)(o_ptr); - o_conv = C2Tuple_SignatureSignatureZ_clone((LDKC2Tuple_SignatureSignatureZ*)(((uintptr_t)o) & ~1)); + o_conv = C2Tuple_SignatureSignatureZ_clone((LDKC2Tuple_SignatureSignatureZ*)untag_ptr(o)); LDKCResult_C2Tuple_SignatureSignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureSignatureZNoneZ), "LDKCResult_C2Tuple_SignatureSignatureZNoneZ"); *ret_conv = CResult_C2Tuple_SignatureSignatureZNoneZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_err"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_err() { +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_err"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_err() { LDKCResult_C2Tuple_SignatureSignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureSignatureZNoneZ), "LDKCResult_C2Tuple_SignatureSignatureZNoneZ"); *ret_conv = CResult_C2Tuple_SignatureSignatureZNoneZ_err(); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_is_ok"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_is_ok(uint32_t o) { - LDKCResult_C2Tuple_SignatureSignatureZNoneZ* o_conv = (LDKCResult_C2Tuple_SignatureSignatureZNoneZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_is_ok"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_is_ok(uint64_t o) { + LDKCResult_C2Tuple_SignatureSignatureZNoneZ* o_conv = (LDKCResult_C2Tuple_SignatureSignatureZNoneZ*)untag_ptr(o); jboolean ret_conv = CResult_C2Tuple_SignatureSignatureZNoneZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_free"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_free"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_C2Tuple_SignatureSignatureZNoneZ _res_conv = *(LDKCResult_C2Tuple_SignatureSignatureZNoneZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_C2Tuple_SignatureSignatureZNoneZ_free(_res_conv); } -static inline uintptr_t CResult_C2Tuple_SignatureSignatureZNoneZ_clone_ptr(LDKCResult_C2Tuple_SignatureSignatureZNoneZ *NONNULL_PTR arg) { +static inline uint64_t CResult_C2Tuple_SignatureSignatureZNoneZ_clone_ptr(LDKCResult_C2Tuple_SignatureSignatureZNoneZ *NONNULL_PTR arg) { LDKCResult_C2Tuple_SignatureSignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureSignatureZNoneZ), "LDKCResult_C2Tuple_SignatureSignatureZNoneZ"); *ret_conv = CResult_C2Tuple_SignatureSignatureZNoneZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_clone_ptr"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_clone_ptr(uint32_t arg) { - LDKCResult_C2Tuple_SignatureSignatureZNoneZ* arg_conv = (LDKCResult_C2Tuple_SignatureSignatureZNoneZ*)(arg & ~1); - uint32_t ret_conv = CResult_C2Tuple_SignatureSignatureZNoneZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_clone_ptr"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_clone_ptr(uint64_t arg) { + LDKCResult_C2Tuple_SignatureSignatureZNoneZ* arg_conv = (LDKCResult_C2Tuple_SignatureSignatureZNoneZ*)untag_ptr(arg); + int64_t ret_conv = CResult_C2Tuple_SignatureSignatureZNoneZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_clone"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_clone(uint32_t orig) { - LDKCResult_C2Tuple_SignatureSignatureZNoneZ* orig_conv = (LDKCResult_C2Tuple_SignatureSignatureZNoneZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_clone"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_clone(uint64_t orig) { + LDKCResult_C2Tuple_SignatureSignatureZNoneZ* orig_conv = (LDKCResult_C2Tuple_SignatureSignatureZNoneZ*)untag_ptr(orig); LDKCResult_C2Tuple_SignatureSignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureSignatureZNoneZ), "LDKCResult_C2Tuple_SignatureSignatureZNoneZ"); *ret_conv = CResult_C2Tuple_SignatureSignatureZNoneZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_SecretKeyNoneZ_ok"))) TS_CResult_SecretKeyNoneZ_ok(int8_tArray o) { +uint64_t __attribute__((export_name("TS_CResult_SecretKeyNoneZ_ok"))) TS_CResult_SecretKeyNoneZ_ok(int8_tArray o) { LDKSecretKey o_ref; CHECK(o->arr_len == 32); memcpy(o_ref.bytes, o->elems, 32); FREE(o); LDKCResult_SecretKeyNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SecretKeyNoneZ), "LDKCResult_SecretKeyNoneZ"); *ret_conv = CResult_SecretKeyNoneZ_ok(o_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_SecretKeyNoneZ_err"))) TS_CResult_SecretKeyNoneZ_err() { +uint64_t __attribute__((export_name("TS_CResult_SecretKeyNoneZ_err"))) TS_CResult_SecretKeyNoneZ_err() { LDKCResult_SecretKeyNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SecretKeyNoneZ), "LDKCResult_SecretKeyNoneZ"); *ret_conv = CResult_SecretKeyNoneZ_err(); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_SecretKeyNoneZ_is_ok"))) TS_CResult_SecretKeyNoneZ_is_ok(uint32_t o) { - LDKCResult_SecretKeyNoneZ* o_conv = (LDKCResult_SecretKeyNoneZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_SecretKeyNoneZ_is_ok"))) TS_CResult_SecretKeyNoneZ_is_ok(uint64_t o) { + LDKCResult_SecretKeyNoneZ* o_conv = (LDKCResult_SecretKeyNoneZ*)untag_ptr(o); jboolean ret_conv = CResult_SecretKeyNoneZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_SecretKeyNoneZ_free"))) TS_CResult_SecretKeyNoneZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_SecretKeyNoneZ_free"))) TS_CResult_SecretKeyNoneZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_SecretKeyNoneZ _res_conv = *(LDKCResult_SecretKeyNoneZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_SecretKeyNoneZ_free(_res_conv); } -static inline uintptr_t CResult_SecretKeyNoneZ_clone_ptr(LDKCResult_SecretKeyNoneZ *NONNULL_PTR arg) { +static inline uint64_t CResult_SecretKeyNoneZ_clone_ptr(LDKCResult_SecretKeyNoneZ *NONNULL_PTR arg) { LDKCResult_SecretKeyNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SecretKeyNoneZ), "LDKCResult_SecretKeyNoneZ"); *ret_conv = CResult_SecretKeyNoneZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_SecretKeyNoneZ_clone_ptr"))) TS_CResult_SecretKeyNoneZ_clone_ptr(uint32_t arg) { - LDKCResult_SecretKeyNoneZ* arg_conv = (LDKCResult_SecretKeyNoneZ*)(arg & ~1); - uint32_t ret_conv = CResult_SecretKeyNoneZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_SecretKeyNoneZ_clone_ptr"))) TS_CResult_SecretKeyNoneZ_clone_ptr(uint64_t arg) { + LDKCResult_SecretKeyNoneZ* arg_conv = (LDKCResult_SecretKeyNoneZ*)untag_ptr(arg); + int64_t ret_conv = CResult_SecretKeyNoneZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_SecretKeyNoneZ_clone"))) TS_CResult_SecretKeyNoneZ_clone(uint32_t orig) { - LDKCResult_SecretKeyNoneZ* orig_conv = (LDKCResult_SecretKeyNoneZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_SecretKeyNoneZ_clone"))) TS_CResult_SecretKeyNoneZ_clone(uint64_t orig) { + LDKCResult_SecretKeyNoneZ* orig_conv = (LDKCResult_SecretKeyNoneZ*)untag_ptr(orig); LDKCResult_SecretKeyNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SecretKeyNoneZ), "LDKCResult_SecretKeyNoneZ"); *ret_conv = CResult_SecretKeyNoneZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_SignDecodeErrorZ_ok"))) TS_CResult_SignDecodeErrorZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_CResult_SignDecodeErrorZ_ok"))) TS_CResult_SignDecodeErrorZ_ok(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKSign o_conv = *(LDKSign*)(o_ptr); if (o_conv.free == LDKSign_JCalls_free) { @@ -15427,51 +14152,51 @@ uint32_t __attribute__((export_name("TS_CResult_SignDecodeErrorZ_ok"))) TS_CRes } LDKCResult_SignDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SignDecodeErrorZ), "LDKCResult_SignDecodeErrorZ"); *ret_conv = CResult_SignDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_SignDecodeErrorZ_err"))) TS_CResult_SignDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_SignDecodeErrorZ_err"))) TS_CResult_SignDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_SignDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SignDecodeErrorZ), "LDKCResult_SignDecodeErrorZ"); *ret_conv = CResult_SignDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_SignDecodeErrorZ_is_ok"))) TS_CResult_SignDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_SignDecodeErrorZ* o_conv = (LDKCResult_SignDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_SignDecodeErrorZ_is_ok"))) TS_CResult_SignDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_SignDecodeErrorZ* o_conv = (LDKCResult_SignDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_SignDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_SignDecodeErrorZ_free"))) TS_CResult_SignDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_SignDecodeErrorZ_free"))) TS_CResult_SignDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_SignDecodeErrorZ _res_conv = *(LDKCResult_SignDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_SignDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_SignDecodeErrorZ_clone_ptr(LDKCResult_SignDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_SignDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_SignDecodeErrorZ_clone_ptr"))) TS_CResult_SignDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_SignDecodeErrorZ* arg_conv = (LDKCResult_SignDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_SignDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_SignDecodeErrorZ_clone"))) TS_CResult_SignDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_SignDecodeErrorZ* orig_conv = (LDKCResult_SignDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_SignDecodeErrorZ_clone"))) TS_CResult_SignDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_SignDecodeErrorZ* orig_conv = (LDKCResult_SignDecodeErrorZ*)untag_ptr(orig); LDKCResult_SignDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SignDecodeErrorZ), "LDKCResult_SignDecodeErrorZ"); *ret_conv = CResult_SignDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } void __attribute__((export_name("TS_CVec_u5Z_free"))) TS_CVec_u5Z_free(ptrArray _res) { @@ -15491,52 +14216,52 @@ void __attribute__((export_name("TS_CVec_u5Z_free"))) TS_CVec_u5Z_free(ptrArray CVec_u5Z_free(_res_constr); } -uint32_t __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_ok"))) TS_CResult_RecoverableSignatureNoneZ_ok(int8_tArray o) { +uint64_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); FREE(o); LDKCResult_RecoverableSignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_RecoverableSignatureNoneZ), "LDKCResult_RecoverableSignatureNoneZ"); *ret_conv = CResult_RecoverableSignatureNoneZ_ok(o_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_err"))) TS_CResult_RecoverableSignatureNoneZ_err() { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_is_ok"))) TS_CResult_RecoverableSignatureNoneZ_is_ok(uint32_t o) { - LDKCResult_RecoverableSignatureNoneZ* o_conv = (LDKCResult_RecoverableSignatureNoneZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_is_ok"))) TS_CResult_RecoverableSignatureNoneZ_is_ok(uint64_t o) { + LDKCResult_RecoverableSignatureNoneZ* o_conv = (LDKCResult_RecoverableSignatureNoneZ*)untag_ptr(o); jboolean ret_conv = CResult_RecoverableSignatureNoneZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_free"))) TS_CResult_RecoverableSignatureNoneZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_free"))) TS_CResult_RecoverableSignatureNoneZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_RecoverableSignatureNoneZ _res_conv = *(LDKCResult_RecoverableSignatureNoneZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_RecoverableSignatureNoneZ_free(_res_conv); } -static inline uintptr_t CResult_RecoverableSignatureNoneZ_clone_ptr(LDKCResult_RecoverableSignatureNoneZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_RecoverableSignatureNoneZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_clone_ptr"))) TS_CResult_RecoverableSignatureNoneZ_clone_ptr(uint64_t arg) { + LDKCResult_RecoverableSignatureNoneZ* arg_conv = (LDKCResult_RecoverableSignatureNoneZ*)untag_ptr(arg); + int64_t ret_conv = CResult_RecoverableSignatureNoneZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_clone"))) TS_CResult_RecoverableSignatureNoneZ_clone(uint32_t orig) { - LDKCResult_RecoverableSignatureNoneZ* orig_conv = (LDKCResult_RecoverableSignatureNoneZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_clone"))) TS_CResult_RecoverableSignatureNoneZ_clone(uint64_t orig) { + LDKCResult_RecoverableSignatureNoneZ* orig_conv = (LDKCResult_RecoverableSignatureNoneZ*)untag_ptr(orig); LDKCResult_RecoverableSignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_RecoverableSignatureNoneZ), "LDKCResult_RecoverableSignatureNoneZ"); *ret_conv = CResult_RecoverableSignatureNoneZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } void __attribute__((export_name("TS_CVec_u8Z_free"))) TS_CVec_u8Z_free(int8_tArray _res) { @@ -15567,7 +14292,7 @@ void __attribute__((export_name("TS_CVec_CVec_u8ZZ_free"))) TS_CVec_CVec_u8ZZ_f CVec_CVec_u8ZZ_free(_res_constr); } -uint32_t __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_ok"))) TS_CResult_CVec_CVec_u8ZZNoneZ_ok(ptrArray o) { +uint64_t __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_ok"))) TS_CResult_CVec_CVec_u8ZZNoneZ_ok(ptrArray o) { LDKCVec_CVec_u8ZZ o_constr; o_constr.datalen = o->arr_len; if (o_constr.datalen > 0) @@ -15586,124 +14311,124 @@ uint32_t __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_ok"))) TS_C FREE(o); LDKCResult_CVec_CVec_u8ZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_CVec_u8ZZNoneZ), "LDKCResult_CVec_CVec_u8ZZNoneZ"); *ret_conv = CResult_CVec_CVec_u8ZZNoneZ_ok(o_constr); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_err"))) TS_CResult_CVec_CVec_u8ZZNoneZ_err() { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_is_ok"))) TS_CResult_CVec_CVec_u8ZZNoneZ_is_ok(uint32_t o) { - LDKCResult_CVec_CVec_u8ZZNoneZ* o_conv = (LDKCResult_CVec_CVec_u8ZZNoneZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_is_ok"))) TS_CResult_CVec_CVec_u8ZZNoneZ_is_ok(uint64_t o) { + LDKCResult_CVec_CVec_u8ZZNoneZ* o_conv = (LDKCResult_CVec_CVec_u8ZZNoneZ*)untag_ptr(o); jboolean ret_conv = CResult_CVec_CVec_u8ZZNoneZ_is_ok(o_conv); return ret_conv; } -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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_free"))) TS_CResult_CVec_CVec_u8ZZNoneZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_CVec_CVec_u8ZZNoneZ _res_conv = *(LDKCResult_CVec_CVec_u8ZZNoneZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_CVec_CVec_u8ZZNoneZ_free(_res_conv); } -static inline uintptr_t CResult_CVec_CVec_u8ZZNoneZ_clone_ptr(LDKCResult_CVec_CVec_u8ZZNoneZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_CVec_CVec_u8ZZNoneZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_clone_ptr"))) TS_CResult_CVec_CVec_u8ZZNoneZ_clone_ptr(uint64_t arg) { + LDKCResult_CVec_CVec_u8ZZNoneZ* arg_conv = (LDKCResult_CVec_CVec_u8ZZNoneZ*)untag_ptr(arg); + int64_t ret_conv = CResult_CVec_CVec_u8ZZNoneZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_clone"))) TS_CResult_CVec_CVec_u8ZZNoneZ_clone(uint32_t orig) { - LDKCResult_CVec_CVec_u8ZZNoneZ* orig_conv = (LDKCResult_CVec_CVec_u8ZZNoneZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_clone"))) TS_CResult_CVec_CVec_u8ZZNoneZ_clone(uint64_t orig) { + LDKCResult_CVec_CVec_u8ZZNoneZ* orig_conv = (LDKCResult_CVec_CVec_u8ZZNoneZ*)untag_ptr(orig); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_ok"))) TS_CResult_InMemorySignerDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_ok"))) TS_CResult_InMemorySignerDecodeErrorZ_ok(uint64_t o) { LDKInMemorySigner o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = InMemorySigner_clone(&o_conv); LDKCResult_InMemorySignerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InMemorySignerDecodeErrorZ), "LDKCResult_InMemorySignerDecodeErrorZ"); *ret_conv = CResult_InMemorySignerDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_err"))) TS_CResult_InMemorySignerDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_err"))) TS_CResult_InMemorySignerDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_InMemorySignerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InMemorySignerDecodeErrorZ), "LDKCResult_InMemorySignerDecodeErrorZ"); *ret_conv = CResult_InMemorySignerDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_is_ok"))) TS_CResult_InMemorySignerDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_InMemorySignerDecodeErrorZ* o_conv = (LDKCResult_InMemorySignerDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_is_ok"))) TS_CResult_InMemorySignerDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_InMemorySignerDecodeErrorZ* o_conv = (LDKCResult_InMemorySignerDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_InMemorySignerDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_free"))) TS_CResult_InMemorySignerDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_free"))) TS_CResult_InMemorySignerDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_InMemorySignerDecodeErrorZ _res_conv = *(LDKCResult_InMemorySignerDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_InMemorySignerDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_InMemorySignerDecodeErrorZ_clone_ptr(LDKCResult_InMemorySignerDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_InMemorySignerDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_clone_ptr"))) TS_CResult_InMemorySignerDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_InMemorySignerDecodeErrorZ* arg_conv = (LDKCResult_InMemorySignerDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_InMemorySignerDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_clone"))) TS_CResult_InMemorySignerDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_InMemorySignerDecodeErrorZ* orig_conv = (LDKCResult_InMemorySignerDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_clone"))) TS_CResult_InMemorySignerDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_InMemorySignerDecodeErrorZ* orig_conv = (LDKCResult_InMemorySignerDecodeErrorZ*)untag_ptr(orig); LDKCResult_InMemorySignerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InMemorySignerDecodeErrorZ), "LDKCResult_InMemorySignerDecodeErrorZ"); *ret_conv = CResult_InMemorySignerDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_CVec_TxOutZ_free"))) TS_CVec_TxOutZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_TxOutZ_free"))) TS_CVec_TxOutZ_free(uint64_tArray _res) { LDKCVec_TxOutZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKTxOut), "LDKCVec_TxOutZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t h = 0; h < _res_constr.datalen; h++) { - uint32_t _res_conv_7 = _res_vals[h]; - void* _res_conv_7_ptr = (void*)(((uintptr_t)_res_conv_7) & ~1); + uint64_t _res_conv_7 = _res_vals[h]; + void* _res_conv_7_ptr = untag_ptr(_res_conv_7); CHECK_ACCESS(_res_conv_7_ptr); LDKTxOut _res_conv_7_conv = *(LDKTxOut*)(_res_conv_7_ptr); - FREE((void*)_res_conv_7); + FREE(untag_ptr(_res_conv_7)); _res_constr.data[h] = _res_conv_7_conv; } FREE(_res); CVec_TxOutZ_free(_res_constr); } -uint32_t __attribute__((export_name("TS_CResult_TransactionNoneZ_ok"))) TS_CResult_TransactionNoneZ_ok(int8_tArray o) { +uint64_t __attribute__((export_name("TS_CResult_TransactionNoneZ_ok"))) TS_CResult_TransactionNoneZ_ok(int8_tArray o) { LDKTransaction o_ref; o_ref.datalen = o->arr_len; o_ref.data = MALLOC(o_ref.datalen, "LDKTransaction Bytes"); @@ -15711,352 +14436,352 @@ uint32_t __attribute__((export_name("TS_CResult_TransactionNoneZ_ok"))) TS_CRes o_ref.data_is_owned = true; LDKCResult_TransactionNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_TransactionNoneZ), "LDKCResult_TransactionNoneZ"); *ret_conv = CResult_TransactionNoneZ_ok(o_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_TransactionNoneZ_err"))) TS_CResult_TransactionNoneZ_err() { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_TransactionNoneZ_is_ok"))) TS_CResult_TransactionNoneZ_is_ok(uint32_t o) { - LDKCResult_TransactionNoneZ* o_conv = (LDKCResult_TransactionNoneZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_TransactionNoneZ_is_ok"))) TS_CResult_TransactionNoneZ_is_ok(uint64_t o) { + LDKCResult_TransactionNoneZ* o_conv = (LDKCResult_TransactionNoneZ*)untag_ptr(o); jboolean ret_conv = CResult_TransactionNoneZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_TransactionNoneZ_free"))) TS_CResult_TransactionNoneZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_TransactionNoneZ_free"))) TS_CResult_TransactionNoneZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_TransactionNoneZ _res_conv = *(LDKCResult_TransactionNoneZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_TransactionNoneZ_free(_res_conv); } -static inline uintptr_t CResult_TransactionNoneZ_clone_ptr(LDKCResult_TransactionNoneZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_TransactionNoneZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_TransactionNoneZ_clone_ptr"))) TS_CResult_TransactionNoneZ_clone_ptr(uint64_t arg) { + LDKCResult_TransactionNoneZ* arg_conv = (LDKCResult_TransactionNoneZ*)untag_ptr(arg); + int64_t ret_conv = CResult_TransactionNoneZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_TransactionNoneZ_clone"))) TS_CResult_TransactionNoneZ_clone(uint32_t orig) { - LDKCResult_TransactionNoneZ* orig_conv = (LDKCResult_TransactionNoneZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_TransactionNoneZ_clone"))) TS_CResult_TransactionNoneZ_clone(uint64_t orig) { + LDKCResult_TransactionNoneZ* orig_conv = (LDKCResult_TransactionNoneZ*)untag_ptr(orig); LDKCResult_TransactionNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_TransactionNoneZ), "LDKCResult_TransactionNoneZ"); *ret_conv = CResult_TransactionNoneZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_COption_u16Z_some"))) TS_COption_u16Z_some(int16_t o) { +uint64_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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_u16Z_none"))) TS_COption_u16Z_none() { +uint64_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(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_COption_u16Z_free"))) TS_COption_u16Z_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCOption_u16Z _res_conv = *(LDKCOption_u16Z*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); COption_u16Z_free(_res_conv); } -static inline uintptr_t COption_u16Z_clone_ptr(LDKCOption_u16Z *NONNULL_PTR arg) { +static inline uint64_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); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_u16Z_clone_ptr"))) TS_COption_u16Z_clone_ptr(uint32_t arg) { - LDKCOption_u16Z* arg_conv = (LDKCOption_u16Z*)arg; - uint32_t ret_conv = COption_u16Z_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_COption_u16Z_clone_ptr"))) TS_COption_u16Z_clone_ptr(uint64_t arg) { + LDKCOption_u16Z* arg_conv = (LDKCOption_u16Z*)untag_ptr(arg); + int64_t ret_conv = COption_u16Z_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_COption_u16Z_clone"))) TS_COption_u16Z_clone(uint32_t orig) { - LDKCOption_u16Z* orig_conv = (LDKCOption_u16Z*)orig; +uint64_t __attribute__((export_name("TS_COption_u16Z_clone"))) TS_COption_u16Z_clone(uint64_t orig) { + LDKCOption_u16Z* orig_conv = (LDKCOption_u16Z*)untag_ptr(orig); LDKCOption_u16Z *ret_copy = MALLOC(sizeof(LDKCOption_u16Z), "LDKCOption_u16Z"); *ret_copy = COption_u16Z_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_CResult_NoneAPIErrorZ_ok"))) TS_CResult_NoneAPIErrorZ_ok() { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NoneAPIErrorZ_err"))) TS_CResult_NoneAPIErrorZ_err(uint32_t e) { - void* e_ptr = (void*)(((uintptr_t)e) & ~1); +uint64_t __attribute__((export_name("TS_CResult_NoneAPIErrorZ_err"))) TS_CResult_NoneAPIErrorZ_err(uint64_t e) { + void* e_ptr = untag_ptr(e); CHECK_ACCESS(e_ptr); LDKAPIError e_conv = *(LDKAPIError*)(e_ptr); - e_conv = APIError_clone((LDKAPIError*)(((uintptr_t)e) & ~1)); + e_conv = APIError_clone((LDKAPIError*)untag_ptr(e)); LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); *ret_conv = CResult_NoneAPIErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_NoneAPIErrorZ_is_ok"))) TS_CResult_NoneAPIErrorZ_is_ok(uint32_t o) { - LDKCResult_NoneAPIErrorZ* o_conv = (LDKCResult_NoneAPIErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_NoneAPIErrorZ_is_ok"))) TS_CResult_NoneAPIErrorZ_is_ok(uint64_t o) { + LDKCResult_NoneAPIErrorZ* o_conv = (LDKCResult_NoneAPIErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_NoneAPIErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_NoneAPIErrorZ_free"))) TS_CResult_NoneAPIErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_NoneAPIErrorZ_free"))) TS_CResult_NoneAPIErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_NoneAPIErrorZ _res_conv = *(LDKCResult_NoneAPIErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_NoneAPIErrorZ_free(_res_conv); } -static inline uintptr_t CResult_NoneAPIErrorZ_clone_ptr(LDKCResult_NoneAPIErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_NoneAPIErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_NoneAPIErrorZ_clone_ptr"))) TS_CResult_NoneAPIErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_NoneAPIErrorZ* arg_conv = (LDKCResult_NoneAPIErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_NoneAPIErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_NoneAPIErrorZ_clone"))) TS_CResult_NoneAPIErrorZ_clone(uint32_t orig) { - LDKCResult_NoneAPIErrorZ* orig_conv = (LDKCResult_NoneAPIErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_NoneAPIErrorZ_clone"))) TS_CResult_NoneAPIErrorZ_clone(uint64_t orig) { + LDKCResult_NoneAPIErrorZ* orig_conv = (LDKCResult_NoneAPIErrorZ*)untag_ptr(orig); LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); *ret_conv = CResult_NoneAPIErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_CVec_CResult_NoneAPIErrorZZ_free"))) TS_CVec_CResult_NoneAPIErrorZZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_CResult_NoneAPIErrorZZ_free"))) TS_CVec_CResult_NoneAPIErrorZZ_free(uint64_tArray _res) { LDKCVec_CResult_NoneAPIErrorZZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _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; + uint64_t* _res_vals = _res->elems; for (size_t w = 0; w < _res_constr.datalen; w++) { - uint32_t _res_conv_22 = _res_vals[w]; - void* _res_conv_22_ptr = (void*)(((uintptr_t)_res_conv_22) & ~1); + uint64_t _res_conv_22 = _res_vals[w]; + void* _res_conv_22_ptr = untag_ptr(_res_conv_22); CHECK_ACCESS(_res_conv_22_ptr); LDKCResult_NoneAPIErrorZ _res_conv_22_conv = *(LDKCResult_NoneAPIErrorZ*)(_res_conv_22_ptr); - FREE((void*)_res_conv_22); + FREE(untag_ptr(_res_conv_22)); _res_constr.data[w] = _res_conv_22_conv; } FREE(_res); CVec_CResult_NoneAPIErrorZZ_free(_res_constr); } -void __attribute__((export_name("TS_CVec_APIErrorZ_free"))) TS_CVec_APIErrorZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_APIErrorZ_free"))) TS_CVec_APIErrorZ_free(uint64_tArray _res) { LDKCVec_APIErrorZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKAPIError), "LDKCVec_APIErrorZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t k = 0; k < _res_constr.datalen; k++) { - uint32_t _res_conv_10 = _res_vals[k]; - void* _res_conv_10_ptr = (void*)(((uintptr_t)_res_conv_10) & ~1); + uint64_t _res_conv_10 = _res_vals[k]; + void* _res_conv_10_ptr = untag_ptr(_res_conv_10); CHECK_ACCESS(_res_conv_10_ptr); LDKAPIError _res_conv_10_conv = *(LDKAPIError*)(_res_conv_10_ptr); - FREE((void*)_res_conv_10); + FREE(untag_ptr(_res_conv_10)); _res_constr.data[k] = _res_conv_10_conv; } FREE(_res); CVec_APIErrorZ_free(_res_constr); } -uint32_t __attribute__((export_name("TS_CResult__u832APIErrorZ_ok"))) TS_CResult__u832APIErrorZ_ok(int8_tArray o) { +uint64_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); FREE(o); LDKCResult__u832APIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult__u832APIErrorZ), "LDKCResult__u832APIErrorZ"); *ret_conv = CResult__u832APIErrorZ_ok(o_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult__u832APIErrorZ_err"))) TS_CResult__u832APIErrorZ_err(uint32_t e) { - void* e_ptr = (void*)(((uintptr_t)e) & ~1); +uint64_t __attribute__((export_name("TS_CResult__u832APIErrorZ_err"))) TS_CResult__u832APIErrorZ_err(uint64_t e) { + void* e_ptr = untag_ptr(e); CHECK_ACCESS(e_ptr); LDKAPIError e_conv = *(LDKAPIError*)(e_ptr); - e_conv = APIError_clone((LDKAPIError*)(((uintptr_t)e) & ~1)); + e_conv = APIError_clone((LDKAPIError*)untag_ptr(e)); LDKCResult__u832APIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult__u832APIErrorZ), "LDKCResult__u832APIErrorZ"); *ret_conv = CResult__u832APIErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult__u832APIErrorZ_is_ok"))) TS_CResult__u832APIErrorZ_is_ok(uint32_t o) { - LDKCResult__u832APIErrorZ* o_conv = (LDKCResult__u832APIErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult__u832APIErrorZ_is_ok"))) TS_CResult__u832APIErrorZ_is_ok(uint64_t o) { + LDKCResult__u832APIErrorZ* o_conv = (LDKCResult__u832APIErrorZ*)untag_ptr(o); jboolean ret_conv = CResult__u832APIErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult__u832APIErrorZ_free"))) TS_CResult__u832APIErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult__u832APIErrorZ_free"))) TS_CResult__u832APIErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult__u832APIErrorZ _res_conv = *(LDKCResult__u832APIErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult__u832APIErrorZ_free(_res_conv); } -static inline uintptr_t CResult__u832APIErrorZ_clone_ptr(LDKCResult__u832APIErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult__u832APIErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult__u832APIErrorZ_clone_ptr"))) TS_CResult__u832APIErrorZ_clone_ptr(uint64_t arg) { + LDKCResult__u832APIErrorZ* arg_conv = (LDKCResult__u832APIErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult__u832APIErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult__u832APIErrorZ_clone"))) TS_CResult__u832APIErrorZ_clone(uint32_t orig) { - LDKCResult__u832APIErrorZ* orig_conv = (LDKCResult__u832APIErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult__u832APIErrorZ_clone"))) TS_CResult__u832APIErrorZ_clone(uint64_t orig) { + LDKCResult__u832APIErrorZ* orig_conv = (LDKCResult__u832APIErrorZ*)untag_ptr(orig); LDKCResult__u832APIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult__u832APIErrorZ), "LDKCResult__u832APIErrorZ"); *ret_conv = CResult__u832APIErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_ok"))) TS_CResult_PaymentIdPaymentSendFailureZ_ok(int8_tArray o) { +uint64_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); FREE(o); LDKCResult_PaymentIdPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentSendFailureZ), "LDKCResult_PaymentIdPaymentSendFailureZ"); *ret_conv = CResult_PaymentIdPaymentSendFailureZ_ok(o_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_err"))) TS_CResult_PaymentIdPaymentSendFailureZ_err(uint32_t e) { - void* e_ptr = (void*)(((uintptr_t)e) & ~1); +uint64_t __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_err"))) TS_CResult_PaymentIdPaymentSendFailureZ_err(uint64_t e) { + void* e_ptr = untag_ptr(e); CHECK_ACCESS(e_ptr); LDKPaymentSendFailure e_conv = *(LDKPaymentSendFailure*)(e_ptr); - e_conv = PaymentSendFailure_clone((LDKPaymentSendFailure*)(((uintptr_t)e) & ~1)); + e_conv = PaymentSendFailure_clone((LDKPaymentSendFailure*)untag_ptr(e)); LDKCResult_PaymentIdPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentSendFailureZ), "LDKCResult_PaymentIdPaymentSendFailureZ"); *ret_conv = CResult_PaymentIdPaymentSendFailureZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_is_ok"))) TS_CResult_PaymentIdPaymentSendFailureZ_is_ok(uint32_t o) { - LDKCResult_PaymentIdPaymentSendFailureZ* o_conv = (LDKCResult_PaymentIdPaymentSendFailureZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_is_ok"))) TS_CResult_PaymentIdPaymentSendFailureZ_is_ok(uint64_t o) { + LDKCResult_PaymentIdPaymentSendFailureZ* o_conv = (LDKCResult_PaymentIdPaymentSendFailureZ*)untag_ptr(o); jboolean ret_conv = CResult_PaymentIdPaymentSendFailureZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_free"))) TS_CResult_PaymentIdPaymentSendFailureZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_free"))) TS_CResult_PaymentIdPaymentSendFailureZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_PaymentIdPaymentSendFailureZ _res_conv = *(LDKCResult_PaymentIdPaymentSendFailureZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_PaymentIdPaymentSendFailureZ_free(_res_conv); } -static inline uintptr_t CResult_PaymentIdPaymentSendFailureZ_clone_ptr(LDKCResult_PaymentIdPaymentSendFailureZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_PaymentIdPaymentSendFailureZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_clone_ptr"))) TS_CResult_PaymentIdPaymentSendFailureZ_clone_ptr(uint64_t arg) { + LDKCResult_PaymentIdPaymentSendFailureZ* arg_conv = (LDKCResult_PaymentIdPaymentSendFailureZ*)untag_ptr(arg); + int64_t ret_conv = CResult_PaymentIdPaymentSendFailureZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_clone"))) TS_CResult_PaymentIdPaymentSendFailureZ_clone(uint32_t orig) { - LDKCResult_PaymentIdPaymentSendFailureZ* orig_conv = (LDKCResult_PaymentIdPaymentSendFailureZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_clone"))) TS_CResult_PaymentIdPaymentSendFailureZ_clone(uint64_t orig) { + LDKCResult_PaymentIdPaymentSendFailureZ* orig_conv = (LDKCResult_PaymentIdPaymentSendFailureZ*)untag_ptr(orig); LDKCResult_PaymentIdPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentSendFailureZ), "LDKCResult_PaymentIdPaymentSendFailureZ"); *ret_conv = CResult_PaymentIdPaymentSendFailureZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_ok"))) TS_CResult_NonePaymentSendFailureZ_ok() { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_err"))) TS_CResult_NonePaymentSendFailureZ_err(uint32_t e) { - void* e_ptr = (void*)(((uintptr_t)e) & ~1); +uint64_t __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_err"))) TS_CResult_NonePaymentSendFailureZ_err(uint64_t e) { + void* e_ptr = untag_ptr(e); CHECK_ACCESS(e_ptr); LDKPaymentSendFailure e_conv = *(LDKPaymentSendFailure*)(e_ptr); - e_conv = PaymentSendFailure_clone((LDKPaymentSendFailure*)(((uintptr_t)e) & ~1)); + e_conv = PaymentSendFailure_clone((LDKPaymentSendFailure*)untag_ptr(e)); LDKCResult_NonePaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePaymentSendFailureZ), "LDKCResult_NonePaymentSendFailureZ"); *ret_conv = CResult_NonePaymentSendFailureZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_is_ok"))) TS_CResult_NonePaymentSendFailureZ_is_ok(uint32_t o) { - LDKCResult_NonePaymentSendFailureZ* o_conv = (LDKCResult_NonePaymentSendFailureZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_is_ok"))) TS_CResult_NonePaymentSendFailureZ_is_ok(uint64_t o) { + LDKCResult_NonePaymentSendFailureZ* o_conv = (LDKCResult_NonePaymentSendFailureZ*)untag_ptr(o); jboolean ret_conv = CResult_NonePaymentSendFailureZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_free"))) TS_CResult_NonePaymentSendFailureZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_free"))) TS_CResult_NonePaymentSendFailureZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_NonePaymentSendFailureZ _res_conv = *(LDKCResult_NonePaymentSendFailureZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_NonePaymentSendFailureZ_free(_res_conv); } -static inline uintptr_t CResult_NonePaymentSendFailureZ_clone_ptr(LDKCResult_NonePaymentSendFailureZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_NonePaymentSendFailureZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_clone_ptr"))) TS_CResult_NonePaymentSendFailureZ_clone_ptr(uint64_t arg) { + LDKCResult_NonePaymentSendFailureZ* arg_conv = (LDKCResult_NonePaymentSendFailureZ*)untag_ptr(arg); + int64_t ret_conv = CResult_NonePaymentSendFailureZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_clone"))) TS_CResult_NonePaymentSendFailureZ_clone(uint32_t orig) { - LDKCResult_NonePaymentSendFailureZ* orig_conv = (LDKCResult_NonePaymentSendFailureZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_clone"))) TS_CResult_NonePaymentSendFailureZ_clone(uint64_t orig) { + LDKCResult_NonePaymentSendFailureZ* orig_conv = (LDKCResult_NonePaymentSendFailureZ*)untag_ptr(orig); LDKCResult_NonePaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePaymentSendFailureZ), "LDKCResult_NonePaymentSendFailureZ"); *ret_conv = CResult_NonePaymentSendFailureZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -static inline uintptr_t C2Tuple_PaymentHashPaymentIdZ_clone_ptr(LDKC2Tuple_PaymentHashPaymentIdZ *NONNULL_PTR arg) { +static inline uint64_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 ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = C2Tuple_PaymentHashPaymentIdZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentIdZ_clone_ptr"))) TS_C2Tuple_PaymentHashPaymentIdZ_clone_ptr(uint64_t arg) { + LDKC2Tuple_PaymentHashPaymentIdZ* arg_conv = (LDKC2Tuple_PaymentHashPaymentIdZ*)untag_ptr(arg); + int64_t ret_conv = C2Tuple_PaymentHashPaymentIdZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentIdZ_clone"))) TS_C2Tuple_PaymentHashPaymentIdZ_clone(uint32_t orig) { - LDKC2Tuple_PaymentHashPaymentIdZ* orig_conv = (LDKC2Tuple_PaymentHashPaymentIdZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentIdZ_clone"))) TS_C2Tuple_PaymentHashPaymentIdZ_clone(uint64_t orig) { + LDKC2Tuple_PaymentHashPaymentIdZ* orig_conv = (LDKC2Tuple_PaymentHashPaymentIdZ*)untag_ptr(orig); LDKC2Tuple_PaymentHashPaymentIdZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PaymentHashPaymentIdZ), "LDKC2Tuple_PaymentHashPaymentIdZ"); *ret_conv = C2Tuple_PaymentHashPaymentIdZ_clone(orig_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentIdZ_new"))) TS_C2Tuple_PaymentHashPaymentIdZ_new(int8_tArray a, int8_tArray b) { +uint64_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); FREE(a); @@ -16065,69 +14790,69 @@ uint32_t __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentIdZ_new"))) T 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 ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentIdZ_free"))) TS_C2Tuple_PaymentHashPaymentIdZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentIdZ_free"))) TS_C2Tuple_PaymentHashPaymentIdZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKC2Tuple_PaymentHashPaymentIdZ _res_conv = *(LDKC2Tuple_PaymentHashPaymentIdZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); C2Tuple_PaymentHashPaymentIdZ_free(_res_conv); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_ok(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKC2Tuple_PaymentHashPaymentIdZ o_conv = *(LDKC2Tuple_PaymentHashPaymentIdZ*)(o_ptr); - o_conv = C2Tuple_PaymentHashPaymentIdZ_clone((LDKC2Tuple_PaymentHashPaymentIdZ*)(((uintptr_t)o) & ~1)); + o_conv = C2Tuple_PaymentHashPaymentIdZ_clone((LDKC2Tuple_PaymentHashPaymentIdZ*)untag_ptr(o)); LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ), "LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ"); *ret_conv = CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_err"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_err(uint32_t e) { - void* e_ptr = (void*)(((uintptr_t)e) & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_err"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_err(uint64_t e) { + void* e_ptr = untag_ptr(e); CHECK_ACCESS(e_ptr); LDKPaymentSendFailure e_conv = *(LDKPaymentSendFailure*)(e_ptr); - e_conv = PaymentSendFailure_clone((LDKPaymentSendFailure*)(((uintptr_t)e) & ~1)); + e_conv = PaymentSendFailure_clone((LDKPaymentSendFailure*)untag_ptr(e)); LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ), "LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ"); *ret_conv = CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_is_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_is_ok(uint32_t o) { - LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* o_conv = (LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_is_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_is_ok(uint64_t o) { + LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* o_conv = (LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ*)untag_ptr(o); jboolean ret_conv = CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_is_ok(o_conv); return ret_conv; } -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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_free"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ _res_conv = *(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_free(_res_conv); } -static inline uintptr_t CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone_ptr(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone_ptr"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone_ptr(uint64_t arg) { + LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* arg_conv = (LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ*)untag_ptr(arg); + int64_t ret_conv = CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone(uint32_t orig) { - LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* orig_conv = (LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone(uint64_t orig) { + LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* orig_conv = (LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ*)untag_ptr(orig); LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ), "LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ"); *ret_conv = CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } void __attribute__((export_name("TS_CVec_ThirtyTwoBytesZ_free"))) TS_CVec_ThirtyTwoBytesZ_free(ptrArray _res) { @@ -16149,25 +14874,25 @@ void __attribute__((export_name("TS_CVec_ThirtyTwoBytesZ_free"))) TS_CVec_Thirt CVec_ThirtyTwoBytesZ_free(_res_constr); } -static inline uintptr_t C2Tuple_PaymentHashPaymentSecretZ_clone_ptr(LDKC2Tuple_PaymentHashPaymentSecretZ *NONNULL_PTR arg) { +static inline uint64_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 ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = C2Tuple_PaymentHashPaymentSecretZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentSecretZ_clone_ptr"))) TS_C2Tuple_PaymentHashPaymentSecretZ_clone_ptr(uint64_t arg) { + LDKC2Tuple_PaymentHashPaymentSecretZ* arg_conv = (LDKC2Tuple_PaymentHashPaymentSecretZ*)untag_ptr(arg); + int64_t ret_conv = C2Tuple_PaymentHashPaymentSecretZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentSecretZ_clone"))) TS_C2Tuple_PaymentHashPaymentSecretZ_clone(uint32_t orig) { - LDKC2Tuple_PaymentHashPaymentSecretZ* orig_conv = (LDKC2Tuple_PaymentHashPaymentSecretZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentSecretZ_clone"))) TS_C2Tuple_PaymentHashPaymentSecretZ_clone(uint64_t orig) { + LDKC2Tuple_PaymentHashPaymentSecretZ* orig_conv = (LDKC2Tuple_PaymentHashPaymentSecretZ*)untag_ptr(orig); LDKC2Tuple_PaymentHashPaymentSecretZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PaymentHashPaymentSecretZ), "LDKC2Tuple_PaymentHashPaymentSecretZ"); *ret_conv = C2Tuple_PaymentHashPaymentSecretZ_clone(orig_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentSecretZ_new"))) TS_C2Tuple_PaymentHashPaymentSecretZ_new(int8_tArray a, int8_tArray b) { +uint64_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); FREE(a); @@ -16176,505 +14901,505 @@ uint32_t __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentSecretZ_new") 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 ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentSecretZ_free"))) TS_C2Tuple_PaymentHashPaymentSecretZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentSecretZ_free"))) TS_C2Tuple_PaymentHashPaymentSecretZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKC2Tuple_PaymentHashPaymentSecretZ _res_conv = *(LDKC2Tuple_PaymentHashPaymentSecretZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); C2Tuple_PaymentHashPaymentSecretZ_free(_res_conv); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_ok(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKC2Tuple_PaymentHashPaymentSecretZ o_conv = *(LDKC2Tuple_PaymentHashPaymentSecretZ*)(o_ptr); - o_conv = C2Tuple_PaymentHashPaymentSecretZ_clone((LDKC2Tuple_PaymentHashPaymentSecretZ*)(((uintptr_t)o) & ~1)); + o_conv = C2Tuple_PaymentHashPaymentSecretZ_clone((LDKC2Tuple_PaymentHashPaymentSecretZ*)untag_ptr(o)); LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ"); *ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_err"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_err() { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_is_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_is_ok(uint32_t o) { - LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* o_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_is_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_is_ok(uint64_t o) { + LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* o_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ*)untag_ptr(o); jboolean ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_is_ok(o_conv); return ret_conv; } -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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_free"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ _res_conv = *(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_free(_res_conv); } -static inline uintptr_t CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone_ptr(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone_ptr"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone_ptr(uint64_t arg) { + LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* arg_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ*)untag_ptr(arg); + int64_t ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone(uint32_t orig) { - LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* orig_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone(uint64_t orig) { + LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* orig_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ*)untag_ptr(orig); LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ"); *ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_ok(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKC2Tuple_PaymentHashPaymentSecretZ o_conv = *(LDKC2Tuple_PaymentHashPaymentSecretZ*)(o_ptr); - o_conv = C2Tuple_PaymentHashPaymentSecretZ_clone((LDKC2Tuple_PaymentHashPaymentSecretZ*)(((uintptr_t)o) & ~1)); + o_conv = C2Tuple_PaymentHashPaymentSecretZ_clone((LDKC2Tuple_PaymentHashPaymentSecretZ*)untag_ptr(o)); LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ"); *ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_err"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_err(uint32_t e) { - void* e_ptr = (void*)(((uintptr_t)e) & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_err"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_err(uint64_t e) { + void* e_ptr = untag_ptr(e); CHECK_ACCESS(e_ptr); LDKAPIError e_conv = *(LDKAPIError*)(e_ptr); - e_conv = APIError_clone((LDKAPIError*)(((uintptr_t)e) & ~1)); + e_conv = APIError_clone((LDKAPIError*)untag_ptr(e)); LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ"); *ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_is_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_is_ok(uint32_t o) { - LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* o_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_is_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_is_ok(uint64_t o) { + LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* o_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_is_ok(o_conv); return ret_conv; } -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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_free"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ _res_conv = *(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_free(_res_conv); } -static inline uintptr_t CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone_ptr(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone_ptr"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* arg_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone(uint32_t orig) { - LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* orig_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone(uint64_t orig) { + LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* orig_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)untag_ptr(orig); LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ"); *ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_ok"))) TS_CResult_PaymentSecretNoneZ_ok(int8_tArray o) { +uint64_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); FREE(o); LDKCResult_PaymentSecretNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretNoneZ), "LDKCResult_PaymentSecretNoneZ"); *ret_conv = CResult_PaymentSecretNoneZ_ok(o_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_err"))) TS_CResult_PaymentSecretNoneZ_err() { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_is_ok"))) TS_CResult_PaymentSecretNoneZ_is_ok(uint32_t o) { - LDKCResult_PaymentSecretNoneZ* o_conv = (LDKCResult_PaymentSecretNoneZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_is_ok"))) TS_CResult_PaymentSecretNoneZ_is_ok(uint64_t o) { + LDKCResult_PaymentSecretNoneZ* o_conv = (LDKCResult_PaymentSecretNoneZ*)untag_ptr(o); jboolean ret_conv = CResult_PaymentSecretNoneZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_free"))) TS_CResult_PaymentSecretNoneZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_free"))) TS_CResult_PaymentSecretNoneZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_PaymentSecretNoneZ _res_conv = *(LDKCResult_PaymentSecretNoneZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_PaymentSecretNoneZ_free(_res_conv); } -static inline uintptr_t CResult_PaymentSecretNoneZ_clone_ptr(LDKCResult_PaymentSecretNoneZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_PaymentSecretNoneZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_clone_ptr"))) TS_CResult_PaymentSecretNoneZ_clone_ptr(uint64_t arg) { + LDKCResult_PaymentSecretNoneZ* arg_conv = (LDKCResult_PaymentSecretNoneZ*)untag_ptr(arg); + int64_t ret_conv = CResult_PaymentSecretNoneZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_clone"))) TS_CResult_PaymentSecretNoneZ_clone(uint32_t orig) { - LDKCResult_PaymentSecretNoneZ* orig_conv = (LDKCResult_PaymentSecretNoneZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_clone"))) TS_CResult_PaymentSecretNoneZ_clone(uint64_t orig) { + LDKCResult_PaymentSecretNoneZ* orig_conv = (LDKCResult_PaymentSecretNoneZ*)untag_ptr(orig); LDKCResult_PaymentSecretNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretNoneZ), "LDKCResult_PaymentSecretNoneZ"); *ret_conv = CResult_PaymentSecretNoneZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_ok"))) TS_CResult_PaymentSecretAPIErrorZ_ok(int8_tArray o) { +uint64_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); FREE(o); LDKCResult_PaymentSecretAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretAPIErrorZ), "LDKCResult_PaymentSecretAPIErrorZ"); *ret_conv = CResult_PaymentSecretAPIErrorZ_ok(o_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_err"))) TS_CResult_PaymentSecretAPIErrorZ_err(uint32_t e) { - void* e_ptr = (void*)(((uintptr_t)e) & ~1); +uint64_t __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_err"))) TS_CResult_PaymentSecretAPIErrorZ_err(uint64_t e) { + void* e_ptr = untag_ptr(e); CHECK_ACCESS(e_ptr); LDKAPIError e_conv = *(LDKAPIError*)(e_ptr); - e_conv = APIError_clone((LDKAPIError*)(((uintptr_t)e) & ~1)); + e_conv = APIError_clone((LDKAPIError*)untag_ptr(e)); LDKCResult_PaymentSecretAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretAPIErrorZ), "LDKCResult_PaymentSecretAPIErrorZ"); *ret_conv = CResult_PaymentSecretAPIErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_is_ok"))) TS_CResult_PaymentSecretAPIErrorZ_is_ok(uint32_t o) { - LDKCResult_PaymentSecretAPIErrorZ* o_conv = (LDKCResult_PaymentSecretAPIErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_is_ok"))) TS_CResult_PaymentSecretAPIErrorZ_is_ok(uint64_t o) { + LDKCResult_PaymentSecretAPIErrorZ* o_conv = (LDKCResult_PaymentSecretAPIErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_PaymentSecretAPIErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_free"))) TS_CResult_PaymentSecretAPIErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_free"))) TS_CResult_PaymentSecretAPIErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_PaymentSecretAPIErrorZ _res_conv = *(LDKCResult_PaymentSecretAPIErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_PaymentSecretAPIErrorZ_free(_res_conv); } -static inline uintptr_t CResult_PaymentSecretAPIErrorZ_clone_ptr(LDKCResult_PaymentSecretAPIErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_PaymentSecretAPIErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_clone_ptr"))) TS_CResult_PaymentSecretAPIErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_PaymentSecretAPIErrorZ* arg_conv = (LDKCResult_PaymentSecretAPIErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_PaymentSecretAPIErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_clone"))) TS_CResult_PaymentSecretAPIErrorZ_clone(uint32_t orig) { - LDKCResult_PaymentSecretAPIErrorZ* orig_conv = (LDKCResult_PaymentSecretAPIErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_clone"))) TS_CResult_PaymentSecretAPIErrorZ_clone(uint64_t orig) { + LDKCResult_PaymentSecretAPIErrorZ* orig_conv = (LDKCResult_PaymentSecretAPIErrorZ*)untag_ptr(orig); LDKCResult_PaymentSecretAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretAPIErrorZ), "LDKCResult_PaymentSecretAPIErrorZ"); *ret_conv = CResult_PaymentSecretAPIErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_ok"))) TS_CResult_PaymentPreimageAPIErrorZ_ok(int8_tArray o) { +uint64_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); FREE(o); LDKCResult_PaymentPreimageAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentPreimageAPIErrorZ), "LDKCResult_PaymentPreimageAPIErrorZ"); *ret_conv = CResult_PaymentPreimageAPIErrorZ_ok(o_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_err"))) TS_CResult_PaymentPreimageAPIErrorZ_err(uint32_t e) { - void* e_ptr = (void*)(((uintptr_t)e) & ~1); +uint64_t __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_err"))) TS_CResult_PaymentPreimageAPIErrorZ_err(uint64_t e) { + void* e_ptr = untag_ptr(e); CHECK_ACCESS(e_ptr); LDKAPIError e_conv = *(LDKAPIError*)(e_ptr); - e_conv = APIError_clone((LDKAPIError*)(((uintptr_t)e) & ~1)); + e_conv = APIError_clone((LDKAPIError*)untag_ptr(e)); LDKCResult_PaymentPreimageAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentPreimageAPIErrorZ), "LDKCResult_PaymentPreimageAPIErrorZ"); *ret_conv = CResult_PaymentPreimageAPIErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_is_ok"))) TS_CResult_PaymentPreimageAPIErrorZ_is_ok(uint32_t o) { - LDKCResult_PaymentPreimageAPIErrorZ* o_conv = (LDKCResult_PaymentPreimageAPIErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_is_ok"))) TS_CResult_PaymentPreimageAPIErrorZ_is_ok(uint64_t o) { + LDKCResult_PaymentPreimageAPIErrorZ* o_conv = (LDKCResult_PaymentPreimageAPIErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_PaymentPreimageAPIErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_free"))) TS_CResult_PaymentPreimageAPIErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_free"))) TS_CResult_PaymentPreimageAPIErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_PaymentPreimageAPIErrorZ _res_conv = *(LDKCResult_PaymentPreimageAPIErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_PaymentPreimageAPIErrorZ_free(_res_conv); } -static inline uintptr_t CResult_PaymentPreimageAPIErrorZ_clone_ptr(LDKCResult_PaymentPreimageAPIErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_PaymentPreimageAPIErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_clone_ptr"))) TS_CResult_PaymentPreimageAPIErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_PaymentPreimageAPIErrorZ* arg_conv = (LDKCResult_PaymentPreimageAPIErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_PaymentPreimageAPIErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_clone"))) TS_CResult_PaymentPreimageAPIErrorZ_clone(uint32_t orig) { - LDKCResult_PaymentPreimageAPIErrorZ* orig_conv = (LDKCResult_PaymentPreimageAPIErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_clone"))) TS_CResult_PaymentPreimageAPIErrorZ_clone(uint64_t orig) { + LDKCResult_PaymentPreimageAPIErrorZ* orig_conv = (LDKCResult_PaymentPreimageAPIErrorZ*)untag_ptr(orig); LDKCResult_PaymentPreimageAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentPreimageAPIErrorZ), "LDKCResult_PaymentPreimageAPIErrorZ"); *ret_conv = CResult_PaymentPreimageAPIErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_ok"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_ok"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_ok(uint64_t o) { LDKCounterpartyForwardingInfo o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = CounterpartyForwardingInfo_clone(&o_conv); LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyForwardingInfoDecodeErrorZ), "LDKCResult_CounterpartyForwardingInfoDecodeErrorZ"); *ret_conv = CResult_CounterpartyForwardingInfoDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_err"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_err"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyForwardingInfoDecodeErrorZ), "LDKCResult_CounterpartyForwardingInfoDecodeErrorZ"); *ret_conv = CResult_CounterpartyForwardingInfoDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_is_ok"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* o_conv = (LDKCResult_CounterpartyForwardingInfoDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_is_ok"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* o_conv = (LDKCResult_CounterpartyForwardingInfoDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_CounterpartyForwardingInfoDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_free"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_free"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_CounterpartyForwardingInfoDecodeErrorZ _res_conv = *(LDKCResult_CounterpartyForwardingInfoDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_CounterpartyForwardingInfoDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_CounterpartyForwardingInfoDecodeErrorZ_clone_ptr(LDKCResult_CounterpartyForwardingInfoDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_CounterpartyForwardingInfoDecodeErrorZ_clone_ptr(LDKCResult_CounterpartyForwardingInfoDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyForwardingInfoDecodeErrorZ), "LDKCResult_CounterpartyForwardingInfoDecodeErrorZ"); *ret_conv = CResult_CounterpartyForwardingInfoDecodeErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_clone_ptr"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* arg_conv = (LDKCResult_CounterpartyForwardingInfoDecodeErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_CounterpartyForwardingInfoDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_clone_ptr"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* arg_conv = (LDKCResult_CounterpartyForwardingInfoDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_CounterpartyForwardingInfoDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_clone"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* orig_conv = (LDKCResult_CounterpartyForwardingInfoDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_clone"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* orig_conv = (LDKCResult_CounterpartyForwardingInfoDecodeErrorZ*)untag_ptr(orig); LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyForwardingInfoDecodeErrorZ), "LDKCResult_CounterpartyForwardingInfoDecodeErrorZ"); *ret_conv = CResult_CounterpartyForwardingInfoDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_ok"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_ok"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_ok(uint64_t o) { LDKChannelCounterparty o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ChannelCounterparty_clone(&o_conv); LDKCResult_ChannelCounterpartyDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelCounterpartyDecodeErrorZ), "LDKCResult_ChannelCounterpartyDecodeErrorZ"); *ret_conv = CResult_ChannelCounterpartyDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_err"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_err"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ChannelCounterpartyDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelCounterpartyDecodeErrorZ), "LDKCResult_ChannelCounterpartyDecodeErrorZ"); *ret_conv = CResult_ChannelCounterpartyDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_is_ok"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ChannelCounterpartyDecodeErrorZ* o_conv = (LDKCResult_ChannelCounterpartyDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_is_ok"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ChannelCounterpartyDecodeErrorZ* o_conv = (LDKCResult_ChannelCounterpartyDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ChannelCounterpartyDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_free"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_free"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ChannelCounterpartyDecodeErrorZ _res_conv = *(LDKCResult_ChannelCounterpartyDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ChannelCounterpartyDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ChannelCounterpartyDecodeErrorZ_clone_ptr(LDKCResult_ChannelCounterpartyDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_ChannelCounterpartyDecodeErrorZ_clone_ptr(LDKCResult_ChannelCounterpartyDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_ChannelCounterpartyDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelCounterpartyDecodeErrorZ), "LDKCResult_ChannelCounterpartyDecodeErrorZ"); *ret_conv = CResult_ChannelCounterpartyDecodeErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_ChannelCounterpartyDecodeErrorZ* arg_conv = (LDKCResult_ChannelCounterpartyDecodeErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_ChannelCounterpartyDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ChannelCounterpartyDecodeErrorZ* arg_conv = (LDKCResult_ChannelCounterpartyDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ChannelCounterpartyDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_clone"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ChannelCounterpartyDecodeErrorZ* orig_conv = (LDKCResult_ChannelCounterpartyDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_clone"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ChannelCounterpartyDecodeErrorZ* orig_conv = (LDKCResult_ChannelCounterpartyDecodeErrorZ*)untag_ptr(orig); LDKCResult_ChannelCounterpartyDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelCounterpartyDecodeErrorZ), "LDKCResult_ChannelCounterpartyDecodeErrorZ"); *ret_conv = CResult_ChannelCounterpartyDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_ok"))) TS_CResult_ChannelDetailsDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_ok"))) TS_CResult_ChannelDetailsDecodeErrorZ_ok(uint64_t o) { LDKChannelDetails o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ChannelDetails_clone(&o_conv); LDKCResult_ChannelDetailsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelDetailsDecodeErrorZ), "LDKCResult_ChannelDetailsDecodeErrorZ"); *ret_conv = CResult_ChannelDetailsDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_err"))) TS_CResult_ChannelDetailsDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_err"))) TS_CResult_ChannelDetailsDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ChannelDetailsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelDetailsDecodeErrorZ), "LDKCResult_ChannelDetailsDecodeErrorZ"); *ret_conv = CResult_ChannelDetailsDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_is_ok"))) TS_CResult_ChannelDetailsDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ChannelDetailsDecodeErrorZ* o_conv = (LDKCResult_ChannelDetailsDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_is_ok"))) TS_CResult_ChannelDetailsDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ChannelDetailsDecodeErrorZ* o_conv = (LDKCResult_ChannelDetailsDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ChannelDetailsDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_free"))) TS_CResult_ChannelDetailsDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_free"))) TS_CResult_ChannelDetailsDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ChannelDetailsDecodeErrorZ _res_conv = *(LDKCResult_ChannelDetailsDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ChannelDetailsDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ChannelDetailsDecodeErrorZ_clone_ptr(LDKCResult_ChannelDetailsDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_ChannelDetailsDecodeErrorZ_clone_ptr(LDKCResult_ChannelDetailsDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_ChannelDetailsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelDetailsDecodeErrorZ), "LDKCResult_ChannelDetailsDecodeErrorZ"); *ret_conv = CResult_ChannelDetailsDecodeErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelDetailsDecodeErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_ChannelDetailsDecodeErrorZ* arg_conv = (LDKCResult_ChannelDetailsDecodeErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_ChannelDetailsDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelDetailsDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ChannelDetailsDecodeErrorZ* arg_conv = (LDKCResult_ChannelDetailsDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ChannelDetailsDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_clone"))) TS_CResult_ChannelDetailsDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ChannelDetailsDecodeErrorZ* orig_conv = (LDKCResult_ChannelDetailsDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_clone"))) TS_CResult_ChannelDetailsDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ChannelDetailsDecodeErrorZ* orig_conv = (LDKCResult_ChannelDetailsDecodeErrorZ*)untag_ptr(orig); LDKCResult_ChannelDetailsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelDetailsDecodeErrorZ), "LDKCResult_ChannelDetailsDecodeErrorZ"); *ret_conv = CResult_ChannelDetailsDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_ok"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_ok"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_ok(uint64_t o) { LDKPhantomRouteHints o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = PhantomRouteHints_clone(&o_conv); LDKCResult_PhantomRouteHintsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PhantomRouteHintsDecodeErrorZ), "LDKCResult_PhantomRouteHintsDecodeErrorZ"); *ret_conv = CResult_PhantomRouteHintsDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_err"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_err"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_PhantomRouteHintsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PhantomRouteHintsDecodeErrorZ), "LDKCResult_PhantomRouteHintsDecodeErrorZ"); *ret_conv = CResult_PhantomRouteHintsDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_is_ok"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_PhantomRouteHintsDecodeErrorZ* o_conv = (LDKCResult_PhantomRouteHintsDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_is_ok"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_PhantomRouteHintsDecodeErrorZ* o_conv = (LDKCResult_PhantomRouteHintsDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_PhantomRouteHintsDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_free"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_free"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_PhantomRouteHintsDecodeErrorZ _res_conv = *(LDKCResult_PhantomRouteHintsDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_PhantomRouteHintsDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_PhantomRouteHintsDecodeErrorZ_clone_ptr(LDKCResult_PhantomRouteHintsDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_PhantomRouteHintsDecodeErrorZ_clone_ptr(LDKCResult_PhantomRouteHintsDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_PhantomRouteHintsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PhantomRouteHintsDecodeErrorZ), "LDKCResult_PhantomRouteHintsDecodeErrorZ"); *ret_conv = CResult_PhantomRouteHintsDecodeErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_clone_ptr"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_PhantomRouteHintsDecodeErrorZ* arg_conv = (LDKCResult_PhantomRouteHintsDecodeErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_PhantomRouteHintsDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_clone_ptr"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_PhantomRouteHintsDecodeErrorZ* arg_conv = (LDKCResult_PhantomRouteHintsDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_PhantomRouteHintsDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_clone"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_PhantomRouteHintsDecodeErrorZ* orig_conv = (LDKCResult_PhantomRouteHintsDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_clone"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_PhantomRouteHintsDecodeErrorZ* orig_conv = (LDKCResult_PhantomRouteHintsDecodeErrorZ*)untag_ptr(orig); LDKCResult_PhantomRouteHintsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PhantomRouteHintsDecodeErrorZ), "LDKCResult_PhantomRouteHintsDecodeErrorZ"); *ret_conv = CResult_PhantomRouteHintsDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_CVec_ChannelMonitorZ_free"))) TS_CVec_ChannelMonitorZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_ChannelMonitorZ_free"))) TS_CVec_ChannelMonitorZ_free(uint64_tArray _res) { LDKCVec_ChannelMonitorZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKChannelMonitor), "LDKCVec_ChannelMonitorZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t q = 0; q < _res_constr.datalen; q++) { - uint32_t _res_conv_16 = _res_vals[q]; + uint64_t _res_conv_16 = _res_vals[q]; LDKChannelMonitor _res_conv_16_conv; - _res_conv_16_conv.inner = (void*)(_res_conv_16 & (~1)); - _res_conv_16_conv.is_owned = (_res_conv_16 & 1) || (_res_conv_16 == 0); + _res_conv_16_conv.inner = untag_ptr(_res_conv_16); + _res_conv_16_conv.is_owned = ptr_is_owned(_res_conv_16); CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_16_conv); _res_constr.data[q] = _res_conv_16_conv; } @@ -16682,177 +15407,178 @@ void __attribute__((export_name("TS_CVec_ChannelMonitorZ_free"))) TS_CVec_Chann CVec_ChannelMonitorZ_free(_res_constr); } -uint32_t __attribute__((export_name("TS_C2Tuple_BlockHashChannelManagerZ_new"))) TS_C2Tuple_BlockHashChannelManagerZ_new(int8_tArray a, uint32_t b) { +uint64_t __attribute__((export_name("TS_C2Tuple_BlockHashChannelManagerZ_new"))) TS_C2Tuple_BlockHashChannelManagerZ_new(int8_tArray a, uint64_t b) { LDKThirtyTwoBytes a_ref; CHECK(a->arr_len == 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); + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); // 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 ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_C2Tuple_BlockHashChannelManagerZ_free"))) TS_C2Tuple_BlockHashChannelManagerZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_C2Tuple_BlockHashChannelManagerZ_free"))) TS_C2Tuple_BlockHashChannelManagerZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKC2Tuple_BlockHashChannelManagerZ _res_conv = *(LDKC2Tuple_BlockHashChannelManagerZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); C2Tuple_BlockHashChannelManagerZ_free(_res_conv); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_ok"))) TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_ok"))) TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_ok(uint64_t o) { + void* o_ptr = untag_ptr(o); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_err"))) TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_err"))) TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_is_ok"))) TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ* o_conv = (LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_is_ok"))) TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ* o_conv = (LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_is_ok(o_conv); return ret_conv; } -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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_free"))) TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ _res_conv = *(LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_free(_res_conv); } -uint32_t __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_ok"))) TS_CResult_ChannelConfigDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_ok"))) TS_CResult_ChannelConfigDecodeErrorZ_ok(uint64_t o) { LDKChannelConfig o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ChannelConfig_clone(&o_conv); LDKCResult_ChannelConfigDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelConfigDecodeErrorZ), "LDKCResult_ChannelConfigDecodeErrorZ"); *ret_conv = CResult_ChannelConfigDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_err"))) TS_CResult_ChannelConfigDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_err"))) TS_CResult_ChannelConfigDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ChannelConfigDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelConfigDecodeErrorZ), "LDKCResult_ChannelConfigDecodeErrorZ"); *ret_conv = CResult_ChannelConfigDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_is_ok"))) TS_CResult_ChannelConfigDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ChannelConfigDecodeErrorZ* o_conv = (LDKCResult_ChannelConfigDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_is_ok"))) TS_CResult_ChannelConfigDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ChannelConfigDecodeErrorZ* o_conv = (LDKCResult_ChannelConfigDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ChannelConfigDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_free"))) TS_CResult_ChannelConfigDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_free"))) TS_CResult_ChannelConfigDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ChannelConfigDecodeErrorZ _res_conv = *(LDKCResult_ChannelConfigDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ChannelConfigDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ChannelConfigDecodeErrorZ_clone_ptr(LDKCResult_ChannelConfigDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_ChannelConfigDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelConfigDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ChannelConfigDecodeErrorZ* arg_conv = (LDKCResult_ChannelConfigDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ChannelConfigDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_clone"))) TS_CResult_ChannelConfigDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ChannelConfigDecodeErrorZ* orig_conv = (LDKCResult_ChannelConfigDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_clone"))) TS_CResult_ChannelConfigDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ChannelConfigDecodeErrorZ* orig_conv = (LDKCResult_ChannelConfigDecodeErrorZ*)untag_ptr(orig); LDKCResult_ChannelConfigDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelConfigDecodeErrorZ), "LDKCResult_ChannelConfigDecodeErrorZ"); *ret_conv = CResult_ChannelConfigDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_ok"))) TS_CResult_OutPointDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_ok"))) TS_CResult_OutPointDecodeErrorZ_ok(uint64_t o) { LDKOutPoint o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = OutPoint_clone(&o_conv); LDKCResult_OutPointDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OutPointDecodeErrorZ), "LDKCResult_OutPointDecodeErrorZ"); *ret_conv = CResult_OutPointDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_err"))) TS_CResult_OutPointDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_err"))) TS_CResult_OutPointDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_OutPointDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OutPointDecodeErrorZ), "LDKCResult_OutPointDecodeErrorZ"); *ret_conv = CResult_OutPointDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_is_ok"))) TS_CResult_OutPointDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_OutPointDecodeErrorZ* o_conv = (LDKCResult_OutPointDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_is_ok"))) TS_CResult_OutPointDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_OutPointDecodeErrorZ* o_conv = (LDKCResult_OutPointDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_OutPointDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_free"))) TS_CResult_OutPointDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_free"))) TS_CResult_OutPointDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_OutPointDecodeErrorZ _res_conv = *(LDKCResult_OutPointDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_OutPointDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_OutPointDecodeErrorZ_clone_ptr(LDKCResult_OutPointDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_OutPointDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_clone_ptr"))) TS_CResult_OutPointDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_OutPointDecodeErrorZ* arg_conv = (LDKCResult_OutPointDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_OutPointDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_clone"))) TS_CResult_OutPointDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_OutPointDecodeErrorZ* orig_conv = (LDKCResult_OutPointDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_clone"))) TS_CResult_OutPointDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_OutPointDecodeErrorZ* orig_conv = (LDKCResult_OutPointDecodeErrorZ*)untag_ptr(orig); LDKCResult_OutPointDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OutPointDecodeErrorZ), "LDKCResult_OutPointDecodeErrorZ"); *ret_conv = CResult_OutPointDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_COption_TypeZ_some"))) TS_COption_TypeZ_some(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_COption_TypeZ_some"))) TS_COption_TypeZ_some(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKType o_conv = *(LDKType*)(o_ptr); if (o_conv.free == LDKType_JCalls_free) { @@ -16861,420 +15587,420 @@ uint32_t __attribute__((export_name("TS_COption_TypeZ_some"))) TS_COption_TypeZ } LDKCOption_TypeZ *ret_copy = MALLOC(sizeof(LDKCOption_TypeZ), "LDKCOption_TypeZ"); *ret_copy = COption_TypeZ_some(o_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_TypeZ_none"))) TS_COption_TypeZ_none() { +uint64_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(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_COption_TypeZ_free"))) TS_COption_TypeZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCOption_TypeZ _res_conv = *(LDKCOption_TypeZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); COption_TypeZ_free(_res_conv); } -static inline uintptr_t COption_TypeZ_clone_ptr(LDKCOption_TypeZ *NONNULL_PTR arg) { +static inline uint64_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); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_TypeZ_clone_ptr"))) TS_COption_TypeZ_clone_ptr(uint32_t arg) { - LDKCOption_TypeZ* arg_conv = (LDKCOption_TypeZ*)arg; - uint32_t ret_conv = COption_TypeZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_COption_TypeZ_clone_ptr"))) TS_COption_TypeZ_clone_ptr(uint64_t arg) { + LDKCOption_TypeZ* arg_conv = (LDKCOption_TypeZ*)untag_ptr(arg); + int64_t ret_conv = COption_TypeZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_COption_TypeZ_clone"))) TS_COption_TypeZ_clone(uint32_t orig) { - LDKCOption_TypeZ* orig_conv = (LDKCOption_TypeZ*)orig; +uint64_t __attribute__((export_name("TS_COption_TypeZ_clone"))) TS_COption_TypeZ_clone(uint64_t orig) { + LDKCOption_TypeZ* orig_conv = (LDKCOption_TypeZ*)untag_ptr(orig); LDKCOption_TypeZ *ret_copy = MALLOC(sizeof(LDKCOption_TypeZ), "LDKCOption_TypeZ"); *ret_copy = COption_TypeZ_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_ok"))) TS_CResult_COption_TypeZDecodeErrorZ_ok(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKCOption_TypeZ o_conv = *(LDKCOption_TypeZ*)(o_ptr); - o_conv = COption_TypeZ_clone((LDKCOption_TypeZ*)(((uintptr_t)o) & ~1)); + o_conv = COption_TypeZ_clone((LDKCOption_TypeZ*)untag_ptr(o)); LDKCResult_COption_TypeZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_TypeZDecodeErrorZ), "LDKCResult_COption_TypeZDecodeErrorZ"); *ret_conv = CResult_COption_TypeZDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_err"))) TS_CResult_COption_TypeZDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_err"))) TS_CResult_COption_TypeZDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_is_ok"))) TS_CResult_COption_TypeZDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_COption_TypeZDecodeErrorZ* o_conv = (LDKCResult_COption_TypeZDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_is_ok"))) TS_CResult_COption_TypeZDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_COption_TypeZDecodeErrorZ* o_conv = (LDKCResult_COption_TypeZDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_COption_TypeZDecodeErrorZ_is_ok(o_conv); return ret_conv; } -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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_free"))) TS_CResult_COption_TypeZDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_COption_TypeZDecodeErrorZ _res_conv = *(LDKCResult_COption_TypeZDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_COption_TypeZDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_COption_TypeZDecodeErrorZ_clone_ptr(LDKCResult_COption_TypeZDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_COption_TypeZDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_clone_ptr"))) TS_CResult_COption_TypeZDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_COption_TypeZDecodeErrorZ* arg_conv = (LDKCResult_COption_TypeZDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_COption_TypeZDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_clone"))) TS_CResult_COption_TypeZDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_COption_TypeZDecodeErrorZ* orig_conv = (LDKCResult_COption_TypeZDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_clone"))) TS_CResult_COption_TypeZDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_COption_TypeZDecodeErrorZ* orig_conv = (LDKCResult_COption_TypeZDecodeErrorZ*)untag_ptr(orig); LDKCResult_COption_TypeZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_TypeZDecodeErrorZ), "LDKCResult_COption_TypeZDecodeErrorZ"); *ret_conv = CResult_COption_TypeZDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_ok"))) TS_CResult_PaymentIdPaymentErrorZ_ok(int8_tArray o) { +uint64_t __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_ok"))) TS_CResult_PaymentIdPaymentErrorZ_ok(int8_tArray o) { LDKThirtyTwoBytes o_ref; CHECK(o->arr_len == 32); memcpy(o_ref.data, o->elems, 32); FREE(o); LDKCResult_PaymentIdPaymentErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentErrorZ), "LDKCResult_PaymentIdPaymentErrorZ"); *ret_conv = CResult_PaymentIdPaymentErrorZ_ok(o_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_err"))) TS_CResult_PaymentIdPaymentErrorZ_err(uint32_t e) { - void* e_ptr = (void*)(((uintptr_t)e) & ~1); +uint64_t __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_err"))) TS_CResult_PaymentIdPaymentErrorZ_err(uint64_t e) { + void* e_ptr = untag_ptr(e); CHECK_ACCESS(e_ptr); LDKPaymentError e_conv = *(LDKPaymentError*)(e_ptr); - e_conv = PaymentError_clone((LDKPaymentError*)(((uintptr_t)e) & ~1)); + e_conv = PaymentError_clone((LDKPaymentError*)untag_ptr(e)); LDKCResult_PaymentIdPaymentErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentErrorZ), "LDKCResult_PaymentIdPaymentErrorZ"); *ret_conv = CResult_PaymentIdPaymentErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_is_ok"))) TS_CResult_PaymentIdPaymentErrorZ_is_ok(uint32_t o) { - LDKCResult_PaymentIdPaymentErrorZ* o_conv = (LDKCResult_PaymentIdPaymentErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_is_ok"))) TS_CResult_PaymentIdPaymentErrorZ_is_ok(uint64_t o) { + LDKCResult_PaymentIdPaymentErrorZ* o_conv = (LDKCResult_PaymentIdPaymentErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_PaymentIdPaymentErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_free"))) TS_CResult_PaymentIdPaymentErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_free"))) TS_CResult_PaymentIdPaymentErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_PaymentIdPaymentErrorZ _res_conv = *(LDKCResult_PaymentIdPaymentErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_PaymentIdPaymentErrorZ_free(_res_conv); } -static inline uintptr_t CResult_PaymentIdPaymentErrorZ_clone_ptr(LDKCResult_PaymentIdPaymentErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_PaymentIdPaymentErrorZ_clone_ptr(LDKCResult_PaymentIdPaymentErrorZ *NONNULL_PTR arg) { LDKCResult_PaymentIdPaymentErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentErrorZ), "LDKCResult_PaymentIdPaymentErrorZ"); *ret_conv = CResult_PaymentIdPaymentErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_clone_ptr"))) TS_CResult_PaymentIdPaymentErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_PaymentIdPaymentErrorZ* arg_conv = (LDKCResult_PaymentIdPaymentErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_PaymentIdPaymentErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_clone_ptr"))) TS_CResult_PaymentIdPaymentErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_PaymentIdPaymentErrorZ* arg_conv = (LDKCResult_PaymentIdPaymentErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_PaymentIdPaymentErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_clone"))) TS_CResult_PaymentIdPaymentErrorZ_clone(uint32_t orig) { - LDKCResult_PaymentIdPaymentErrorZ* orig_conv = (LDKCResult_PaymentIdPaymentErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_clone"))) TS_CResult_PaymentIdPaymentErrorZ_clone(uint64_t orig) { + LDKCResult_PaymentIdPaymentErrorZ* orig_conv = (LDKCResult_PaymentIdPaymentErrorZ*)untag_ptr(orig); LDKCResult_PaymentIdPaymentErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentErrorZ), "LDKCResult_PaymentIdPaymentErrorZ"); *ret_conv = CResult_PaymentIdPaymentErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_SiPrefixParseErrorZ_ok"))) TS_CResult_SiPrefixParseErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_SiPrefixParseErrorZ_ok"))) TS_CResult_SiPrefixParseErrorZ_ok(uint32_t o) { LDKSiPrefix o_conv = LDKSiPrefix_from_js(o); LDKCResult_SiPrefixParseErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SiPrefixParseErrorZ), "LDKCResult_SiPrefixParseErrorZ"); *ret_conv = CResult_SiPrefixParseErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_SiPrefixParseErrorZ_err"))) TS_CResult_SiPrefixParseErrorZ_err(uint32_t e) { - void* e_ptr = (void*)(((uintptr_t)e) & ~1); +uint64_t __attribute__((export_name("TS_CResult_SiPrefixParseErrorZ_err"))) TS_CResult_SiPrefixParseErrorZ_err(uint64_t e) { + void* e_ptr = untag_ptr(e); CHECK_ACCESS(e_ptr); LDKParseError e_conv = *(LDKParseError*)(e_ptr); - e_conv = ParseError_clone((LDKParseError*)(((uintptr_t)e) & ~1)); + e_conv = ParseError_clone((LDKParseError*)untag_ptr(e)); LDKCResult_SiPrefixParseErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SiPrefixParseErrorZ), "LDKCResult_SiPrefixParseErrorZ"); *ret_conv = CResult_SiPrefixParseErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_SiPrefixParseErrorZ_is_ok"))) TS_CResult_SiPrefixParseErrorZ_is_ok(uint32_t o) { - LDKCResult_SiPrefixParseErrorZ* o_conv = (LDKCResult_SiPrefixParseErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_SiPrefixParseErrorZ_is_ok"))) TS_CResult_SiPrefixParseErrorZ_is_ok(uint64_t o) { + LDKCResult_SiPrefixParseErrorZ* o_conv = (LDKCResult_SiPrefixParseErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_SiPrefixParseErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_SiPrefixParseErrorZ_free"))) TS_CResult_SiPrefixParseErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_SiPrefixParseErrorZ_free"))) TS_CResult_SiPrefixParseErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_SiPrefixParseErrorZ _res_conv = *(LDKCResult_SiPrefixParseErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_SiPrefixParseErrorZ_free(_res_conv); } -static inline uintptr_t CResult_SiPrefixParseErrorZ_clone_ptr(LDKCResult_SiPrefixParseErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_SiPrefixParseErrorZ_clone_ptr(LDKCResult_SiPrefixParseErrorZ *NONNULL_PTR arg) { LDKCResult_SiPrefixParseErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SiPrefixParseErrorZ), "LDKCResult_SiPrefixParseErrorZ"); *ret_conv = CResult_SiPrefixParseErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_SiPrefixParseErrorZ_clone_ptr"))) TS_CResult_SiPrefixParseErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_SiPrefixParseErrorZ* arg_conv = (LDKCResult_SiPrefixParseErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_SiPrefixParseErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_SiPrefixParseErrorZ_clone_ptr"))) TS_CResult_SiPrefixParseErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_SiPrefixParseErrorZ* arg_conv = (LDKCResult_SiPrefixParseErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_SiPrefixParseErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_SiPrefixParseErrorZ_clone"))) TS_CResult_SiPrefixParseErrorZ_clone(uint32_t orig) { - LDKCResult_SiPrefixParseErrorZ* orig_conv = (LDKCResult_SiPrefixParseErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_SiPrefixParseErrorZ_clone"))) TS_CResult_SiPrefixParseErrorZ_clone(uint64_t orig) { + LDKCResult_SiPrefixParseErrorZ* orig_conv = (LDKCResult_SiPrefixParseErrorZ*)untag_ptr(orig); LDKCResult_SiPrefixParseErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SiPrefixParseErrorZ), "LDKCResult_SiPrefixParseErrorZ"); *ret_conv = CResult_SiPrefixParseErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_InvoiceParseOrSemanticErrorZ_ok"))) TS_CResult_InvoiceParseOrSemanticErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_InvoiceParseOrSemanticErrorZ_ok"))) TS_CResult_InvoiceParseOrSemanticErrorZ_ok(uint64_t o) { LDKInvoice o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = Invoice_clone(&o_conv); LDKCResult_InvoiceParseOrSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceParseOrSemanticErrorZ), "LDKCResult_InvoiceParseOrSemanticErrorZ"); *ret_conv = CResult_InvoiceParseOrSemanticErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_InvoiceParseOrSemanticErrorZ_err"))) TS_CResult_InvoiceParseOrSemanticErrorZ_err(uint32_t e) { - void* e_ptr = (void*)(((uintptr_t)e) & ~1); +uint64_t __attribute__((export_name("TS_CResult_InvoiceParseOrSemanticErrorZ_err"))) TS_CResult_InvoiceParseOrSemanticErrorZ_err(uint64_t e) { + void* e_ptr = untag_ptr(e); CHECK_ACCESS(e_ptr); LDKParseOrSemanticError e_conv = *(LDKParseOrSemanticError*)(e_ptr); - e_conv = ParseOrSemanticError_clone((LDKParseOrSemanticError*)(((uintptr_t)e) & ~1)); + e_conv = ParseOrSemanticError_clone((LDKParseOrSemanticError*)untag_ptr(e)); LDKCResult_InvoiceParseOrSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceParseOrSemanticErrorZ), "LDKCResult_InvoiceParseOrSemanticErrorZ"); *ret_conv = CResult_InvoiceParseOrSemanticErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_InvoiceParseOrSemanticErrorZ_is_ok"))) TS_CResult_InvoiceParseOrSemanticErrorZ_is_ok(uint32_t o) { - LDKCResult_InvoiceParseOrSemanticErrorZ* o_conv = (LDKCResult_InvoiceParseOrSemanticErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_InvoiceParseOrSemanticErrorZ_is_ok"))) TS_CResult_InvoiceParseOrSemanticErrorZ_is_ok(uint64_t o) { + LDKCResult_InvoiceParseOrSemanticErrorZ* o_conv = (LDKCResult_InvoiceParseOrSemanticErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_InvoiceParseOrSemanticErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_InvoiceParseOrSemanticErrorZ_free"))) TS_CResult_InvoiceParseOrSemanticErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_InvoiceParseOrSemanticErrorZ_free"))) TS_CResult_InvoiceParseOrSemanticErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_InvoiceParseOrSemanticErrorZ _res_conv = *(LDKCResult_InvoiceParseOrSemanticErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_InvoiceParseOrSemanticErrorZ_free(_res_conv); } -static inline uintptr_t CResult_InvoiceParseOrSemanticErrorZ_clone_ptr(LDKCResult_InvoiceParseOrSemanticErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_InvoiceParseOrSemanticErrorZ_clone_ptr(LDKCResult_InvoiceParseOrSemanticErrorZ *NONNULL_PTR arg) { LDKCResult_InvoiceParseOrSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceParseOrSemanticErrorZ), "LDKCResult_InvoiceParseOrSemanticErrorZ"); *ret_conv = CResult_InvoiceParseOrSemanticErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_InvoiceParseOrSemanticErrorZ_clone_ptr"))) TS_CResult_InvoiceParseOrSemanticErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_InvoiceParseOrSemanticErrorZ* arg_conv = (LDKCResult_InvoiceParseOrSemanticErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_InvoiceParseOrSemanticErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_InvoiceParseOrSemanticErrorZ_clone_ptr"))) TS_CResult_InvoiceParseOrSemanticErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_InvoiceParseOrSemanticErrorZ* arg_conv = (LDKCResult_InvoiceParseOrSemanticErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_InvoiceParseOrSemanticErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_InvoiceParseOrSemanticErrorZ_clone"))) TS_CResult_InvoiceParseOrSemanticErrorZ_clone(uint32_t orig) { - LDKCResult_InvoiceParseOrSemanticErrorZ* orig_conv = (LDKCResult_InvoiceParseOrSemanticErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_InvoiceParseOrSemanticErrorZ_clone"))) TS_CResult_InvoiceParseOrSemanticErrorZ_clone(uint64_t orig) { + LDKCResult_InvoiceParseOrSemanticErrorZ* orig_conv = (LDKCResult_InvoiceParseOrSemanticErrorZ*)untag_ptr(orig); LDKCResult_InvoiceParseOrSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceParseOrSemanticErrorZ), "LDKCResult_InvoiceParseOrSemanticErrorZ"); *ret_conv = CResult_InvoiceParseOrSemanticErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_SignedRawInvoiceParseErrorZ_ok"))) TS_CResult_SignedRawInvoiceParseErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_SignedRawInvoiceParseErrorZ_ok"))) TS_CResult_SignedRawInvoiceParseErrorZ_ok(uint64_t o) { LDKSignedRawInvoice o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = SignedRawInvoice_clone(&o_conv); LDKCResult_SignedRawInvoiceParseErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SignedRawInvoiceParseErrorZ), "LDKCResult_SignedRawInvoiceParseErrorZ"); *ret_conv = CResult_SignedRawInvoiceParseErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_SignedRawInvoiceParseErrorZ_err"))) TS_CResult_SignedRawInvoiceParseErrorZ_err(uint32_t e) { - void* e_ptr = (void*)(((uintptr_t)e) & ~1); +uint64_t __attribute__((export_name("TS_CResult_SignedRawInvoiceParseErrorZ_err"))) TS_CResult_SignedRawInvoiceParseErrorZ_err(uint64_t e) { + void* e_ptr = untag_ptr(e); CHECK_ACCESS(e_ptr); LDKParseError e_conv = *(LDKParseError*)(e_ptr); - e_conv = ParseError_clone((LDKParseError*)(((uintptr_t)e) & ~1)); + e_conv = ParseError_clone((LDKParseError*)untag_ptr(e)); LDKCResult_SignedRawInvoiceParseErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SignedRawInvoiceParseErrorZ), "LDKCResult_SignedRawInvoiceParseErrorZ"); *ret_conv = CResult_SignedRawInvoiceParseErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_SignedRawInvoiceParseErrorZ_is_ok"))) TS_CResult_SignedRawInvoiceParseErrorZ_is_ok(uint32_t o) { - LDKCResult_SignedRawInvoiceParseErrorZ* o_conv = (LDKCResult_SignedRawInvoiceParseErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_SignedRawInvoiceParseErrorZ_is_ok"))) TS_CResult_SignedRawInvoiceParseErrorZ_is_ok(uint64_t o) { + LDKCResult_SignedRawInvoiceParseErrorZ* o_conv = (LDKCResult_SignedRawInvoiceParseErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_SignedRawInvoiceParseErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_SignedRawInvoiceParseErrorZ_free"))) TS_CResult_SignedRawInvoiceParseErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_SignedRawInvoiceParseErrorZ_free"))) TS_CResult_SignedRawInvoiceParseErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_SignedRawInvoiceParseErrorZ _res_conv = *(LDKCResult_SignedRawInvoiceParseErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_SignedRawInvoiceParseErrorZ_free(_res_conv); } -static inline uintptr_t CResult_SignedRawInvoiceParseErrorZ_clone_ptr(LDKCResult_SignedRawInvoiceParseErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_SignedRawInvoiceParseErrorZ_clone_ptr(LDKCResult_SignedRawInvoiceParseErrorZ *NONNULL_PTR arg) { LDKCResult_SignedRawInvoiceParseErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SignedRawInvoiceParseErrorZ), "LDKCResult_SignedRawInvoiceParseErrorZ"); *ret_conv = CResult_SignedRawInvoiceParseErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_SignedRawInvoiceParseErrorZ_clone_ptr"))) TS_CResult_SignedRawInvoiceParseErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_SignedRawInvoiceParseErrorZ* arg_conv = (LDKCResult_SignedRawInvoiceParseErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_SignedRawInvoiceParseErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_SignedRawInvoiceParseErrorZ_clone_ptr"))) TS_CResult_SignedRawInvoiceParseErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_SignedRawInvoiceParseErrorZ* arg_conv = (LDKCResult_SignedRawInvoiceParseErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_SignedRawInvoiceParseErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_SignedRawInvoiceParseErrorZ_clone"))) TS_CResult_SignedRawInvoiceParseErrorZ_clone(uint32_t orig) { - LDKCResult_SignedRawInvoiceParseErrorZ* orig_conv = (LDKCResult_SignedRawInvoiceParseErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_SignedRawInvoiceParseErrorZ_clone"))) TS_CResult_SignedRawInvoiceParseErrorZ_clone(uint64_t orig) { + LDKCResult_SignedRawInvoiceParseErrorZ* orig_conv = (LDKCResult_SignedRawInvoiceParseErrorZ*)untag_ptr(orig); LDKCResult_SignedRawInvoiceParseErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SignedRawInvoiceParseErrorZ), "LDKCResult_SignedRawInvoiceParseErrorZ"); *ret_conv = CResult_SignedRawInvoiceParseErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -static inline uintptr_t C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone_ptr(LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ *NONNULL_PTR arg) { +static inline uint64_t C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone_ptr(LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ *NONNULL_PTR arg) { LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* ret_conv = MALLOC(sizeof(LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ), "LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ"); *ret_conv = C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone(arg); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone_ptr"))) TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone_ptr(uint32_t arg) { - LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* arg_conv = (LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ*)(arg & ~1); - uint32_t ret_conv = C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone_ptr"))) TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone_ptr(uint64_t arg) { + LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* arg_conv = (LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ*)untag_ptr(arg); + int64_t ret_conv = C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone"))) TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone(uint32_t orig) { - LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* orig_conv = (LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone"))) TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone(uint64_t orig) { + LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* orig_conv = (LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ*)untag_ptr(orig); LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* ret_conv = MALLOC(sizeof(LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ), "LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ"); *ret_conv = C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone(orig_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_new"))) TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_new(uint32_t a, int8_tArray b, uint32_t c) { +uint64_t __attribute__((export_name("TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_new"))) TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_new(uint64_t a, int8_tArray b, uint64_t c) { LDKRawInvoice a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = (a & 1) || (a == 0); + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); a_conv = RawInvoice_clone(&a_conv); LDKThirtyTwoBytes b_ref; CHECK(b->arr_len == 32); memcpy(b_ref.data, b->elems, 32); FREE(b); LDKInvoiceSignature c_conv; - c_conv.inner = (void*)(c & (~1)); - c_conv.is_owned = (c & 1) || (c == 0); + c_conv.inner = untag_ptr(c); + c_conv.is_owned = ptr_is_owned(c); CHECK_INNER_FIELD_ACCESS_OR_NULL(c_conv); c_conv = InvoiceSignature_clone(&c_conv); LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* ret_conv = MALLOC(sizeof(LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ), "LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ"); *ret_conv = C3Tuple_RawInvoice_u832InvoiceSignatureZ_new(a_conv, b_ref, c_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_free"))) TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_free"))) TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ _res_conv = *(LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); C3Tuple_RawInvoice_u832InvoiceSignatureZ_free(_res_conv); } -uint32_t __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_ok"))) TS_CResult_PayeePubKeyErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_ok"))) TS_CResult_PayeePubKeyErrorZ_ok(uint64_t o) { LDKPayeePubKey o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = PayeePubKey_clone(&o_conv); LDKCResult_PayeePubKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PayeePubKeyErrorZ), "LDKCResult_PayeePubKeyErrorZ"); *ret_conv = CResult_PayeePubKeyErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_err"))) TS_CResult_PayeePubKeyErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_err"))) TS_CResult_PayeePubKeyErrorZ_err(uint32_t e) { LDKSecp256k1Error e_conv = LDKSecp256k1Error_from_js(e); LDKCResult_PayeePubKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PayeePubKeyErrorZ), "LDKCResult_PayeePubKeyErrorZ"); *ret_conv = CResult_PayeePubKeyErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_is_ok"))) TS_CResult_PayeePubKeyErrorZ_is_ok(uint32_t o) { - LDKCResult_PayeePubKeyErrorZ* o_conv = (LDKCResult_PayeePubKeyErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_is_ok"))) TS_CResult_PayeePubKeyErrorZ_is_ok(uint64_t o) { + LDKCResult_PayeePubKeyErrorZ* o_conv = (LDKCResult_PayeePubKeyErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_PayeePubKeyErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_free"))) TS_CResult_PayeePubKeyErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_free"))) TS_CResult_PayeePubKeyErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_PayeePubKeyErrorZ _res_conv = *(LDKCResult_PayeePubKeyErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_PayeePubKeyErrorZ_free(_res_conv); } -static inline uintptr_t CResult_PayeePubKeyErrorZ_clone_ptr(LDKCResult_PayeePubKeyErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_PayeePubKeyErrorZ_clone_ptr(LDKCResult_PayeePubKeyErrorZ *NONNULL_PTR arg) { LDKCResult_PayeePubKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PayeePubKeyErrorZ), "LDKCResult_PayeePubKeyErrorZ"); *ret_conv = CResult_PayeePubKeyErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_clone_ptr"))) TS_CResult_PayeePubKeyErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_PayeePubKeyErrorZ* arg_conv = (LDKCResult_PayeePubKeyErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_PayeePubKeyErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_clone_ptr"))) TS_CResult_PayeePubKeyErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_PayeePubKeyErrorZ* arg_conv = (LDKCResult_PayeePubKeyErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_PayeePubKeyErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_clone"))) TS_CResult_PayeePubKeyErrorZ_clone(uint32_t orig) { - LDKCResult_PayeePubKeyErrorZ* orig_conv = (LDKCResult_PayeePubKeyErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_clone"))) TS_CResult_PayeePubKeyErrorZ_clone(uint64_t orig) { + LDKCResult_PayeePubKeyErrorZ* orig_conv = (LDKCResult_PayeePubKeyErrorZ*)untag_ptr(orig); LDKCResult_PayeePubKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PayeePubKeyErrorZ), "LDKCResult_PayeePubKeyErrorZ"); *ret_conv = CResult_PayeePubKeyErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_CVec_PrivateRouteZ_free"))) TS_CVec_PrivateRouteZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_PrivateRouteZ_free"))) TS_CVec_PrivateRouteZ_free(uint64_tArray _res) { LDKCVec_PrivateRouteZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKPrivateRoute), "LDKCVec_PrivateRouteZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t o = 0; o < _res_constr.datalen; o++) { - uint32_t _res_conv_14 = _res_vals[o]; + uint64_t _res_conv_14 = _res_vals[o]; LDKPrivateRoute _res_conv_14_conv; - _res_conv_14_conv.inner = (void*)(_res_conv_14 & (~1)); - _res_conv_14_conv.is_owned = (_res_conv_14 & 1) || (_res_conv_14 == 0); + _res_conv_14_conv.inner = untag_ptr(_res_conv_14); + _res_conv_14_conv.is_owned = ptr_is_owned(_res_conv_14); CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_14_conv); _res_constr.data[o] = _res_conv_14_conv; } @@ -17282,536 +16008,536 @@ void __attribute__((export_name("TS_CVec_PrivateRouteZ_free"))) TS_CVec_Private CVec_PrivateRouteZ_free(_res_constr); } -uint32_t __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_ok"))) TS_CResult_PositiveTimestampCreationErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_ok"))) TS_CResult_PositiveTimestampCreationErrorZ_ok(uint64_t o) { LDKPositiveTimestamp o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = PositiveTimestamp_clone(&o_conv); LDKCResult_PositiveTimestampCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PositiveTimestampCreationErrorZ), "LDKCResult_PositiveTimestampCreationErrorZ"); *ret_conv = CResult_PositiveTimestampCreationErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_err"))) TS_CResult_PositiveTimestampCreationErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_err"))) TS_CResult_PositiveTimestampCreationErrorZ_err(uint32_t e) { LDKCreationError e_conv = LDKCreationError_from_js(e); LDKCResult_PositiveTimestampCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PositiveTimestampCreationErrorZ), "LDKCResult_PositiveTimestampCreationErrorZ"); *ret_conv = CResult_PositiveTimestampCreationErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_is_ok"))) TS_CResult_PositiveTimestampCreationErrorZ_is_ok(uint32_t o) { - LDKCResult_PositiveTimestampCreationErrorZ* o_conv = (LDKCResult_PositiveTimestampCreationErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_is_ok"))) TS_CResult_PositiveTimestampCreationErrorZ_is_ok(uint64_t o) { + LDKCResult_PositiveTimestampCreationErrorZ* o_conv = (LDKCResult_PositiveTimestampCreationErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_PositiveTimestampCreationErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_free"))) TS_CResult_PositiveTimestampCreationErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_free"))) TS_CResult_PositiveTimestampCreationErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_PositiveTimestampCreationErrorZ _res_conv = *(LDKCResult_PositiveTimestampCreationErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_PositiveTimestampCreationErrorZ_free(_res_conv); } -static inline uintptr_t CResult_PositiveTimestampCreationErrorZ_clone_ptr(LDKCResult_PositiveTimestampCreationErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_PositiveTimestampCreationErrorZ_clone_ptr(LDKCResult_PositiveTimestampCreationErrorZ *NONNULL_PTR arg) { LDKCResult_PositiveTimestampCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PositiveTimestampCreationErrorZ), "LDKCResult_PositiveTimestampCreationErrorZ"); *ret_conv = CResult_PositiveTimestampCreationErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_clone_ptr"))) TS_CResult_PositiveTimestampCreationErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_PositiveTimestampCreationErrorZ* arg_conv = (LDKCResult_PositiveTimestampCreationErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_PositiveTimestampCreationErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_clone_ptr"))) TS_CResult_PositiveTimestampCreationErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_PositiveTimestampCreationErrorZ* arg_conv = (LDKCResult_PositiveTimestampCreationErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_PositiveTimestampCreationErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_clone"))) TS_CResult_PositiveTimestampCreationErrorZ_clone(uint32_t orig) { - LDKCResult_PositiveTimestampCreationErrorZ* orig_conv = (LDKCResult_PositiveTimestampCreationErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_clone"))) TS_CResult_PositiveTimestampCreationErrorZ_clone(uint64_t orig) { + LDKCResult_PositiveTimestampCreationErrorZ* orig_conv = (LDKCResult_PositiveTimestampCreationErrorZ*)untag_ptr(orig); LDKCResult_PositiveTimestampCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PositiveTimestampCreationErrorZ), "LDKCResult_PositiveTimestampCreationErrorZ"); *ret_conv = CResult_PositiveTimestampCreationErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_ok"))) TS_CResult_NoneSemanticErrorZ_ok() { +uint64_t __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_ok"))) TS_CResult_NoneSemanticErrorZ_ok() { LDKCResult_NoneSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneSemanticErrorZ), "LDKCResult_NoneSemanticErrorZ"); *ret_conv = CResult_NoneSemanticErrorZ_ok(); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_err"))) TS_CResult_NoneSemanticErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_err"))) TS_CResult_NoneSemanticErrorZ_err(uint32_t e) { LDKSemanticError e_conv = LDKSemanticError_from_js(e); LDKCResult_NoneSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneSemanticErrorZ), "LDKCResult_NoneSemanticErrorZ"); *ret_conv = CResult_NoneSemanticErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_is_ok"))) TS_CResult_NoneSemanticErrorZ_is_ok(uint32_t o) { - LDKCResult_NoneSemanticErrorZ* o_conv = (LDKCResult_NoneSemanticErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_is_ok"))) TS_CResult_NoneSemanticErrorZ_is_ok(uint64_t o) { + LDKCResult_NoneSemanticErrorZ* o_conv = (LDKCResult_NoneSemanticErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_NoneSemanticErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_free"))) TS_CResult_NoneSemanticErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_free"))) TS_CResult_NoneSemanticErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_NoneSemanticErrorZ _res_conv = *(LDKCResult_NoneSemanticErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_NoneSemanticErrorZ_free(_res_conv); } -static inline uintptr_t CResult_NoneSemanticErrorZ_clone_ptr(LDKCResult_NoneSemanticErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_NoneSemanticErrorZ_clone_ptr(LDKCResult_NoneSemanticErrorZ *NONNULL_PTR arg) { LDKCResult_NoneSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneSemanticErrorZ), "LDKCResult_NoneSemanticErrorZ"); *ret_conv = CResult_NoneSemanticErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_clone_ptr"))) TS_CResult_NoneSemanticErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_NoneSemanticErrorZ* arg_conv = (LDKCResult_NoneSemanticErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_NoneSemanticErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_clone_ptr"))) TS_CResult_NoneSemanticErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_NoneSemanticErrorZ* arg_conv = (LDKCResult_NoneSemanticErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_NoneSemanticErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_clone"))) TS_CResult_NoneSemanticErrorZ_clone(uint32_t orig) { - LDKCResult_NoneSemanticErrorZ* orig_conv = (LDKCResult_NoneSemanticErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_clone"))) TS_CResult_NoneSemanticErrorZ_clone(uint64_t orig) { + LDKCResult_NoneSemanticErrorZ* orig_conv = (LDKCResult_NoneSemanticErrorZ*)untag_ptr(orig); LDKCResult_NoneSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneSemanticErrorZ), "LDKCResult_NoneSemanticErrorZ"); *ret_conv = CResult_NoneSemanticErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_ok"))) TS_CResult_InvoiceSemanticErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_ok"))) TS_CResult_InvoiceSemanticErrorZ_ok(uint64_t o) { LDKInvoice o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = Invoice_clone(&o_conv); LDKCResult_InvoiceSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceSemanticErrorZ), "LDKCResult_InvoiceSemanticErrorZ"); *ret_conv = CResult_InvoiceSemanticErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_err"))) TS_CResult_InvoiceSemanticErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_err"))) TS_CResult_InvoiceSemanticErrorZ_err(uint32_t e) { LDKSemanticError e_conv = LDKSemanticError_from_js(e); LDKCResult_InvoiceSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceSemanticErrorZ), "LDKCResult_InvoiceSemanticErrorZ"); *ret_conv = CResult_InvoiceSemanticErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_is_ok"))) TS_CResult_InvoiceSemanticErrorZ_is_ok(uint32_t o) { - LDKCResult_InvoiceSemanticErrorZ* o_conv = (LDKCResult_InvoiceSemanticErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_is_ok"))) TS_CResult_InvoiceSemanticErrorZ_is_ok(uint64_t o) { + LDKCResult_InvoiceSemanticErrorZ* o_conv = (LDKCResult_InvoiceSemanticErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_InvoiceSemanticErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_free"))) TS_CResult_InvoiceSemanticErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_free"))) TS_CResult_InvoiceSemanticErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_InvoiceSemanticErrorZ _res_conv = *(LDKCResult_InvoiceSemanticErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_InvoiceSemanticErrorZ_free(_res_conv); } -static inline uintptr_t CResult_InvoiceSemanticErrorZ_clone_ptr(LDKCResult_InvoiceSemanticErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_InvoiceSemanticErrorZ_clone_ptr(LDKCResult_InvoiceSemanticErrorZ *NONNULL_PTR arg) { LDKCResult_InvoiceSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceSemanticErrorZ), "LDKCResult_InvoiceSemanticErrorZ"); *ret_conv = CResult_InvoiceSemanticErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_clone_ptr"))) TS_CResult_InvoiceSemanticErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_InvoiceSemanticErrorZ* arg_conv = (LDKCResult_InvoiceSemanticErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_InvoiceSemanticErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_clone_ptr"))) TS_CResult_InvoiceSemanticErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_InvoiceSemanticErrorZ* arg_conv = (LDKCResult_InvoiceSemanticErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_InvoiceSemanticErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_clone"))) TS_CResult_InvoiceSemanticErrorZ_clone(uint32_t orig) { - LDKCResult_InvoiceSemanticErrorZ* orig_conv = (LDKCResult_InvoiceSemanticErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_clone"))) TS_CResult_InvoiceSemanticErrorZ_clone(uint64_t orig) { + LDKCResult_InvoiceSemanticErrorZ* orig_conv = (LDKCResult_InvoiceSemanticErrorZ*)untag_ptr(orig); LDKCResult_InvoiceSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceSemanticErrorZ), "LDKCResult_InvoiceSemanticErrorZ"); *ret_conv = CResult_InvoiceSemanticErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_ok"))) TS_CResult_DescriptionCreationErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_ok"))) TS_CResult_DescriptionCreationErrorZ_ok(uint64_t o) { LDKDescription o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = Description_clone(&o_conv); LDKCResult_DescriptionCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DescriptionCreationErrorZ), "LDKCResult_DescriptionCreationErrorZ"); *ret_conv = CResult_DescriptionCreationErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_err"))) TS_CResult_DescriptionCreationErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_err"))) TS_CResult_DescriptionCreationErrorZ_err(uint32_t e) { LDKCreationError e_conv = LDKCreationError_from_js(e); LDKCResult_DescriptionCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DescriptionCreationErrorZ), "LDKCResult_DescriptionCreationErrorZ"); *ret_conv = CResult_DescriptionCreationErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_is_ok"))) TS_CResult_DescriptionCreationErrorZ_is_ok(uint32_t o) { - LDKCResult_DescriptionCreationErrorZ* o_conv = (LDKCResult_DescriptionCreationErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_is_ok"))) TS_CResult_DescriptionCreationErrorZ_is_ok(uint64_t o) { + LDKCResult_DescriptionCreationErrorZ* o_conv = (LDKCResult_DescriptionCreationErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_DescriptionCreationErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_free"))) TS_CResult_DescriptionCreationErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_free"))) TS_CResult_DescriptionCreationErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_DescriptionCreationErrorZ _res_conv = *(LDKCResult_DescriptionCreationErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_DescriptionCreationErrorZ_free(_res_conv); } -static inline uintptr_t CResult_DescriptionCreationErrorZ_clone_ptr(LDKCResult_DescriptionCreationErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_DescriptionCreationErrorZ_clone_ptr(LDKCResult_DescriptionCreationErrorZ *NONNULL_PTR arg) { LDKCResult_DescriptionCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DescriptionCreationErrorZ), "LDKCResult_DescriptionCreationErrorZ"); *ret_conv = CResult_DescriptionCreationErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_clone_ptr"))) TS_CResult_DescriptionCreationErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_DescriptionCreationErrorZ* arg_conv = (LDKCResult_DescriptionCreationErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_DescriptionCreationErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_clone_ptr"))) TS_CResult_DescriptionCreationErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_DescriptionCreationErrorZ* arg_conv = (LDKCResult_DescriptionCreationErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_DescriptionCreationErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_clone"))) TS_CResult_DescriptionCreationErrorZ_clone(uint32_t orig) { - LDKCResult_DescriptionCreationErrorZ* orig_conv = (LDKCResult_DescriptionCreationErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_clone"))) TS_CResult_DescriptionCreationErrorZ_clone(uint64_t orig) { + LDKCResult_DescriptionCreationErrorZ* orig_conv = (LDKCResult_DescriptionCreationErrorZ*)untag_ptr(orig); LDKCResult_DescriptionCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DescriptionCreationErrorZ), "LDKCResult_DescriptionCreationErrorZ"); *ret_conv = CResult_DescriptionCreationErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_ok"))) TS_CResult_PrivateRouteCreationErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_ok"))) TS_CResult_PrivateRouteCreationErrorZ_ok(uint64_t o) { LDKPrivateRoute o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = PrivateRoute_clone(&o_conv); LDKCResult_PrivateRouteCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PrivateRouteCreationErrorZ), "LDKCResult_PrivateRouteCreationErrorZ"); *ret_conv = CResult_PrivateRouteCreationErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_err"))) TS_CResult_PrivateRouteCreationErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_err"))) TS_CResult_PrivateRouteCreationErrorZ_err(uint32_t e) { LDKCreationError e_conv = LDKCreationError_from_js(e); LDKCResult_PrivateRouteCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PrivateRouteCreationErrorZ), "LDKCResult_PrivateRouteCreationErrorZ"); *ret_conv = CResult_PrivateRouteCreationErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_is_ok"))) TS_CResult_PrivateRouteCreationErrorZ_is_ok(uint32_t o) { - LDKCResult_PrivateRouteCreationErrorZ* o_conv = (LDKCResult_PrivateRouteCreationErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_is_ok"))) TS_CResult_PrivateRouteCreationErrorZ_is_ok(uint64_t o) { + LDKCResult_PrivateRouteCreationErrorZ* o_conv = (LDKCResult_PrivateRouteCreationErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_PrivateRouteCreationErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_free"))) TS_CResult_PrivateRouteCreationErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_free"))) TS_CResult_PrivateRouteCreationErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_PrivateRouteCreationErrorZ _res_conv = *(LDKCResult_PrivateRouteCreationErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_PrivateRouteCreationErrorZ_free(_res_conv); } -static inline uintptr_t CResult_PrivateRouteCreationErrorZ_clone_ptr(LDKCResult_PrivateRouteCreationErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_PrivateRouteCreationErrorZ_clone_ptr(LDKCResult_PrivateRouteCreationErrorZ *NONNULL_PTR arg) { LDKCResult_PrivateRouteCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PrivateRouteCreationErrorZ), "LDKCResult_PrivateRouteCreationErrorZ"); *ret_conv = CResult_PrivateRouteCreationErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_clone_ptr"))) TS_CResult_PrivateRouteCreationErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_PrivateRouteCreationErrorZ* arg_conv = (LDKCResult_PrivateRouteCreationErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_PrivateRouteCreationErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_clone_ptr"))) TS_CResult_PrivateRouteCreationErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_PrivateRouteCreationErrorZ* arg_conv = (LDKCResult_PrivateRouteCreationErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_PrivateRouteCreationErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_clone"))) TS_CResult_PrivateRouteCreationErrorZ_clone(uint32_t orig) { - LDKCResult_PrivateRouteCreationErrorZ* orig_conv = (LDKCResult_PrivateRouteCreationErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_clone"))) TS_CResult_PrivateRouteCreationErrorZ_clone(uint64_t orig) { + LDKCResult_PrivateRouteCreationErrorZ* orig_conv = (LDKCResult_PrivateRouteCreationErrorZ*)untag_ptr(orig); LDKCResult_PrivateRouteCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PrivateRouteCreationErrorZ), "LDKCResult_PrivateRouteCreationErrorZ"); *ret_conv = CResult_PrivateRouteCreationErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_StringErrorZ_ok"))) TS_CResult_StringErrorZ_ok(jstring o) { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_StringErrorZ_err"))) TS_CResult_StringErrorZ_err(uint32_t e) { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_StringErrorZ_is_ok"))) TS_CResult_StringErrorZ_is_ok(uint32_t o) { - LDKCResult_StringErrorZ* o_conv = (LDKCResult_StringErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_StringErrorZ_is_ok"))) TS_CResult_StringErrorZ_is_ok(uint64_t o) { + LDKCResult_StringErrorZ* o_conv = (LDKCResult_StringErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_StringErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_StringErrorZ_free"))) TS_CResult_StringErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_StringErrorZ_free"))) TS_CResult_StringErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_StringErrorZ _res_conv = *(LDKCResult_StringErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_StringErrorZ_free(_res_conv); } -static inline uintptr_t CResult_StringErrorZ_clone_ptr(LDKCResult_StringErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_StringErrorZ_clone_ptr(LDKCResult_StringErrorZ *NONNULL_PTR arg) { LDKCResult_StringErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_StringErrorZ), "LDKCResult_StringErrorZ"); *ret_conv = CResult_StringErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_StringErrorZ_clone_ptr"))) TS_CResult_StringErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_StringErrorZ* arg_conv = (LDKCResult_StringErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_StringErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_StringErrorZ_clone_ptr"))) TS_CResult_StringErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_StringErrorZ* arg_conv = (LDKCResult_StringErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_StringErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_StringErrorZ_clone"))) TS_CResult_StringErrorZ_clone(uint32_t orig) { - LDKCResult_StringErrorZ* orig_conv = (LDKCResult_StringErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_StringErrorZ_clone"))) TS_CResult_StringErrorZ_clone(uint64_t orig) { + LDKCResult_StringErrorZ* orig_conv = (LDKCResult_StringErrorZ*)untag_ptr(orig); LDKCResult_StringErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_StringErrorZ), "LDKCResult_StringErrorZ"); *ret_conv = CResult_StringErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_ok"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_ok"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_ok(uint64_t o) { LDKChannelMonitorUpdate o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ChannelMonitorUpdate_clone(&o_conv); LDKCResult_ChannelMonitorUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelMonitorUpdateDecodeErrorZ), "LDKCResult_ChannelMonitorUpdateDecodeErrorZ"); *ret_conv = CResult_ChannelMonitorUpdateDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_err"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_err"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ChannelMonitorUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelMonitorUpdateDecodeErrorZ), "LDKCResult_ChannelMonitorUpdateDecodeErrorZ"); *ret_conv = CResult_ChannelMonitorUpdateDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_is_ok"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ChannelMonitorUpdateDecodeErrorZ* o_conv = (LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_is_ok"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ChannelMonitorUpdateDecodeErrorZ* o_conv = (LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ChannelMonitorUpdateDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_free"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_free"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ChannelMonitorUpdateDecodeErrorZ _res_conv = *(LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ChannelMonitorUpdateDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ChannelMonitorUpdateDecodeErrorZ_clone_ptr(LDKCResult_ChannelMonitorUpdateDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_ChannelMonitorUpdateDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ChannelMonitorUpdateDecodeErrorZ* arg_conv = (LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ChannelMonitorUpdateDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_clone"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ChannelMonitorUpdateDecodeErrorZ* orig_conv = (LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_clone"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ChannelMonitorUpdateDecodeErrorZ* orig_conv = (LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)untag_ptr(orig); LDKCResult_ChannelMonitorUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelMonitorUpdateDecodeErrorZ), "LDKCResult_ChannelMonitorUpdateDecodeErrorZ"); *ret_conv = CResult_ChannelMonitorUpdateDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_COption_MonitorEventZ_some"))) TS_COption_MonitorEventZ_some(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_COption_MonitorEventZ_some"))) TS_COption_MonitorEventZ_some(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKMonitorEvent o_conv = *(LDKMonitorEvent*)(o_ptr); - o_conv = MonitorEvent_clone((LDKMonitorEvent*)(((uintptr_t)o) & ~1)); + o_conv = MonitorEvent_clone((LDKMonitorEvent*)untag_ptr(o)); LDKCOption_MonitorEventZ *ret_copy = MALLOC(sizeof(LDKCOption_MonitorEventZ), "LDKCOption_MonitorEventZ"); *ret_copy = COption_MonitorEventZ_some(o_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_MonitorEventZ_none"))) TS_COption_MonitorEventZ_none() { +uint64_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(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_COption_MonitorEventZ_free"))) TS_COption_MonitorEventZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCOption_MonitorEventZ _res_conv = *(LDKCOption_MonitorEventZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); COption_MonitorEventZ_free(_res_conv); } -static inline uintptr_t COption_MonitorEventZ_clone_ptr(LDKCOption_MonitorEventZ *NONNULL_PTR arg) { +static inline uint64_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); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_MonitorEventZ_clone_ptr"))) TS_COption_MonitorEventZ_clone_ptr(uint32_t arg) { - LDKCOption_MonitorEventZ* arg_conv = (LDKCOption_MonitorEventZ*)arg; - uint32_t ret_conv = COption_MonitorEventZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_COption_MonitorEventZ_clone_ptr"))) TS_COption_MonitorEventZ_clone_ptr(uint64_t arg) { + LDKCOption_MonitorEventZ* arg_conv = (LDKCOption_MonitorEventZ*)untag_ptr(arg); + int64_t ret_conv = COption_MonitorEventZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_COption_MonitorEventZ_clone"))) TS_COption_MonitorEventZ_clone(uint32_t orig) { - LDKCOption_MonitorEventZ* orig_conv = (LDKCOption_MonitorEventZ*)orig; +uint64_t __attribute__((export_name("TS_COption_MonitorEventZ_clone"))) TS_COption_MonitorEventZ_clone(uint64_t orig) { + LDKCOption_MonitorEventZ* orig_conv = (LDKCOption_MonitorEventZ*)untag_ptr(orig); LDKCOption_MonitorEventZ *ret_copy = MALLOC(sizeof(LDKCOption_MonitorEventZ), "LDKCOption_MonitorEventZ"); *ret_copy = COption_MonitorEventZ_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_ok"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_ok(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKCOption_MonitorEventZ o_conv = *(LDKCOption_MonitorEventZ*)(o_ptr); - o_conv = COption_MonitorEventZ_clone((LDKCOption_MonitorEventZ*)(((uintptr_t)o) & ~1)); + o_conv = COption_MonitorEventZ_clone((LDKCOption_MonitorEventZ*)untag_ptr(o)); LDKCResult_COption_MonitorEventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_MonitorEventZDecodeErrorZ), "LDKCResult_COption_MonitorEventZDecodeErrorZ"); *ret_conv = CResult_COption_MonitorEventZDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_err"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_err"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_is_ok"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_COption_MonitorEventZDecodeErrorZ* o_conv = (LDKCResult_COption_MonitorEventZDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_is_ok"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_COption_MonitorEventZDecodeErrorZ* o_conv = (LDKCResult_COption_MonitorEventZDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_COption_MonitorEventZDecodeErrorZ_is_ok(o_conv); return ret_conv; } -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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_free"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_COption_MonitorEventZDecodeErrorZ _res_conv = *(LDKCResult_COption_MonitorEventZDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_COption_MonitorEventZDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_COption_MonitorEventZDecodeErrorZ_clone_ptr(LDKCResult_COption_MonitorEventZDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_COption_MonitorEventZDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_clone_ptr"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_COption_MonitorEventZDecodeErrorZ* arg_conv = (LDKCResult_COption_MonitorEventZDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_COption_MonitorEventZDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_clone"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_COption_MonitorEventZDecodeErrorZ* orig_conv = (LDKCResult_COption_MonitorEventZDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_clone"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_COption_MonitorEventZDecodeErrorZ* orig_conv = (LDKCResult_COption_MonitorEventZDecodeErrorZ*)untag_ptr(orig); LDKCResult_COption_MonitorEventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_MonitorEventZDecodeErrorZ), "LDKCResult_COption_MonitorEventZDecodeErrorZ"); *ret_conv = CResult_COption_MonitorEventZDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_ok"))) TS_CResult_HTLCUpdateDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_ok"))) TS_CResult_HTLCUpdateDecodeErrorZ_ok(uint64_t o) { LDKHTLCUpdate o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = HTLCUpdate_clone(&o_conv); LDKCResult_HTLCUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCUpdateDecodeErrorZ), "LDKCResult_HTLCUpdateDecodeErrorZ"); *ret_conv = CResult_HTLCUpdateDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_err"))) TS_CResult_HTLCUpdateDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_err"))) TS_CResult_HTLCUpdateDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_HTLCUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCUpdateDecodeErrorZ), "LDKCResult_HTLCUpdateDecodeErrorZ"); *ret_conv = CResult_HTLCUpdateDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_is_ok"))) TS_CResult_HTLCUpdateDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_HTLCUpdateDecodeErrorZ* o_conv = (LDKCResult_HTLCUpdateDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_is_ok"))) TS_CResult_HTLCUpdateDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_HTLCUpdateDecodeErrorZ* o_conv = (LDKCResult_HTLCUpdateDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_HTLCUpdateDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_free"))) TS_CResult_HTLCUpdateDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_free"))) TS_CResult_HTLCUpdateDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_HTLCUpdateDecodeErrorZ _res_conv = *(LDKCResult_HTLCUpdateDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_HTLCUpdateDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_HTLCUpdateDecodeErrorZ_clone_ptr(LDKCResult_HTLCUpdateDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_HTLCUpdateDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_clone_ptr"))) TS_CResult_HTLCUpdateDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_HTLCUpdateDecodeErrorZ* arg_conv = (LDKCResult_HTLCUpdateDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_HTLCUpdateDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_clone"))) TS_CResult_HTLCUpdateDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_HTLCUpdateDecodeErrorZ* orig_conv = (LDKCResult_HTLCUpdateDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_clone"))) TS_CResult_HTLCUpdateDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_HTLCUpdateDecodeErrorZ* orig_conv = (LDKCResult_HTLCUpdateDecodeErrorZ*)untag_ptr(orig); LDKCResult_HTLCUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCUpdateDecodeErrorZ), "LDKCResult_HTLCUpdateDecodeErrorZ"); *ret_conv = CResult_HTLCUpdateDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -static inline uintptr_t C2Tuple_OutPointScriptZ_clone_ptr(LDKC2Tuple_OutPointScriptZ *NONNULL_PTR arg) { +static inline uint64_t C2Tuple_OutPointScriptZ_clone_ptr(LDKC2Tuple_OutPointScriptZ *NONNULL_PTR arg) { LDKC2Tuple_OutPointScriptZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_OutPointScriptZ), "LDKC2Tuple_OutPointScriptZ"); *ret_conv = C2Tuple_OutPointScriptZ_clone(arg); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C2Tuple_OutPointScriptZ_clone_ptr"))) TS_C2Tuple_OutPointScriptZ_clone_ptr(uint32_t arg) { - LDKC2Tuple_OutPointScriptZ* arg_conv = (LDKC2Tuple_OutPointScriptZ*)(arg & ~1); - uint32_t ret_conv = C2Tuple_OutPointScriptZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_C2Tuple_OutPointScriptZ_clone_ptr"))) TS_C2Tuple_OutPointScriptZ_clone_ptr(uint64_t arg) { + LDKC2Tuple_OutPointScriptZ* arg_conv = (LDKC2Tuple_OutPointScriptZ*)untag_ptr(arg); + int64_t ret_conv = C2Tuple_OutPointScriptZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_C2Tuple_OutPointScriptZ_clone"))) TS_C2Tuple_OutPointScriptZ_clone(uint32_t orig) { - LDKC2Tuple_OutPointScriptZ* orig_conv = (LDKC2Tuple_OutPointScriptZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_C2Tuple_OutPointScriptZ_clone"))) TS_C2Tuple_OutPointScriptZ_clone(uint64_t orig) { + LDKC2Tuple_OutPointScriptZ* orig_conv = (LDKC2Tuple_OutPointScriptZ*)untag_ptr(orig); LDKC2Tuple_OutPointScriptZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_OutPointScriptZ), "LDKC2Tuple_OutPointScriptZ"); *ret_conv = C2Tuple_OutPointScriptZ_clone(orig_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C2Tuple_OutPointScriptZ_new"))) TS_C2Tuple_OutPointScriptZ_new(uint32_t a, int8_tArray b) { +uint64_t __attribute__((export_name("TS_C2Tuple_OutPointScriptZ_new"))) TS_C2Tuple_OutPointScriptZ_new(uint64_t a, int8_tArray b) { LDKOutPoint a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = (a & 1) || (a == 0); + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); a_conv = OutPoint_clone(&a_conv); LDKCVec_u8Z b_ref; @@ -17820,94 +16546,94 @@ uint32_t __attribute__((export_name("TS_C2Tuple_OutPointScriptZ_new"))) TS_C2Tu 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 ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_C2Tuple_OutPointScriptZ_free"))) TS_C2Tuple_OutPointScriptZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_C2Tuple_OutPointScriptZ_free"))) TS_C2Tuple_OutPointScriptZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKC2Tuple_OutPointScriptZ _res_conv = *(LDKC2Tuple_OutPointScriptZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); C2Tuple_OutPointScriptZ_free(_res_conv); } -static inline uintptr_t C2Tuple_u32ScriptZ_clone_ptr(LDKC2Tuple_u32ScriptZ *NONNULL_PTR arg) { +static inline uint64_t C2Tuple_u32ScriptZ_clone_ptr(LDKC2Tuple_u32ScriptZ *NONNULL_PTR arg) { LDKC2Tuple_u32ScriptZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_u32ScriptZ), "LDKC2Tuple_u32ScriptZ"); *ret_conv = C2Tuple_u32ScriptZ_clone(arg); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C2Tuple_u32ScriptZ_clone_ptr"))) TS_C2Tuple_u32ScriptZ_clone_ptr(uint32_t arg) { - LDKC2Tuple_u32ScriptZ* arg_conv = (LDKC2Tuple_u32ScriptZ*)(arg & ~1); - uint32_t ret_conv = C2Tuple_u32ScriptZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_C2Tuple_u32ScriptZ_clone_ptr"))) TS_C2Tuple_u32ScriptZ_clone_ptr(uint64_t arg) { + LDKC2Tuple_u32ScriptZ* arg_conv = (LDKC2Tuple_u32ScriptZ*)untag_ptr(arg); + int64_t ret_conv = C2Tuple_u32ScriptZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_C2Tuple_u32ScriptZ_clone"))) TS_C2Tuple_u32ScriptZ_clone(uint32_t orig) { - LDKC2Tuple_u32ScriptZ* orig_conv = (LDKC2Tuple_u32ScriptZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_C2Tuple_u32ScriptZ_clone"))) TS_C2Tuple_u32ScriptZ_clone(uint64_t orig) { + LDKC2Tuple_u32ScriptZ* orig_conv = (LDKC2Tuple_u32ScriptZ*)untag_ptr(orig); LDKC2Tuple_u32ScriptZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_u32ScriptZ), "LDKC2Tuple_u32ScriptZ"); *ret_conv = C2Tuple_u32ScriptZ_clone(orig_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C2Tuple_u32ScriptZ_new"))) TS_C2Tuple_u32ScriptZ_new(int32_t a, int8_tArray b) { +uint64_t __attribute__((export_name("TS_C2Tuple_u32ScriptZ_new"))) TS_C2Tuple_u32ScriptZ_new(int32_t a, int8_tArray b) { 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); FREE(b); LDKC2Tuple_u32ScriptZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_u32ScriptZ), "LDKC2Tuple_u32ScriptZ"); *ret_conv = C2Tuple_u32ScriptZ_new(a, b_ref); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_C2Tuple_u32ScriptZ_free"))) TS_C2Tuple_u32ScriptZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_C2Tuple_u32ScriptZ_free"))) TS_C2Tuple_u32ScriptZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKC2Tuple_u32ScriptZ _res_conv = *(LDKC2Tuple_u32ScriptZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); C2Tuple_u32ScriptZ_free(_res_conv); } -void __attribute__((export_name("TS_CVec_C2Tuple_u32ScriptZZ_free"))) TS_CVec_C2Tuple_u32ScriptZZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_C2Tuple_u32ScriptZZ_free"))) TS_CVec_C2Tuple_u32ScriptZZ_free(uint64_tArray _res) { LDKCVec_C2Tuple_u32ScriptZZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _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; + uint64_t* _res_vals = _res->elems; for (size_t v = 0; v < _res_constr.datalen; v++) { - uint32_t _res_conv_21 = _res_vals[v]; - void* _res_conv_21_ptr = (void*)(((uintptr_t)_res_conv_21) & ~1); + uint64_t _res_conv_21 = _res_vals[v]; + void* _res_conv_21_ptr = untag_ptr(_res_conv_21); CHECK_ACCESS(_res_conv_21_ptr); LDKC2Tuple_u32ScriptZ _res_conv_21_conv = *(LDKC2Tuple_u32ScriptZ*)(_res_conv_21_ptr); - FREE((void*)_res_conv_21); + FREE(untag_ptr(_res_conv_21)); _res_constr.data[v] = _res_conv_21_conv; } FREE(_res); CVec_C2Tuple_u32ScriptZZ_free(_res_constr); } -static inline uintptr_t C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone_ptr(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ *NONNULL_PTR arg) { +static inline uint64_t C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone_ptr(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ *NONNULL_PTR arg) { LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ"); *ret_conv = C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone(arg); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone_ptr"))) TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone_ptr(uint32_t arg) { - LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ* arg_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ*)(arg & ~1); - uint32_t ret_conv = C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone_ptr"))) TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone_ptr(uint64_t arg) { + LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ* arg_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ*)untag_ptr(arg); + int64_t ret_conv = C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone"))) TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone(uint32_t orig) { - LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ* orig_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone"))) TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone(uint64_t orig) { + LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ* orig_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ*)untag_ptr(orig); LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ"); *ret_conv = C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone(orig_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_new"))) TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_new(int8_tArray a, uint32_tArray b) { +uint64_t __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_new"))) TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_new(int8_tArray a, uint64_tArray b) { LDKThirtyTwoBytes a_ref; CHECK(a->arr_len == 32); memcpy(a_ref.data, a->elems, 32); FREE(a); @@ -17917,64 +16643,64 @@ uint32_t __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_n b_constr.data = MALLOC(b_constr.datalen * sizeof(LDKC2Tuple_u32ScriptZ), "LDKCVec_C2Tuple_u32ScriptZZ Elements"); else b_constr.data = NULL; - uint32_t* b_vals = b->elems; + uint64_t* b_vals = b->elems; for (size_t v = 0; v < b_constr.datalen; v++) { - uint32_t b_conv_21 = b_vals[v]; - void* b_conv_21_ptr = (void*)(((uintptr_t)b_conv_21) & ~1); + uint64_t b_conv_21 = b_vals[v]; + void* b_conv_21_ptr = untag_ptr(b_conv_21); CHECK_ACCESS(b_conv_21_ptr); LDKC2Tuple_u32ScriptZ b_conv_21_conv = *(LDKC2Tuple_u32ScriptZ*)(b_conv_21_ptr); - b_conv_21_conv = C2Tuple_u32ScriptZ_clone((LDKC2Tuple_u32ScriptZ*)(((uintptr_t)b_conv_21) & ~1)); + b_conv_21_conv = C2Tuple_u32ScriptZ_clone((LDKC2Tuple_u32ScriptZ*)untag_ptr(b_conv_21)); b_constr.data[v] = b_conv_21_conv; } FREE(b); LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ"); *ret_conv = C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_new(a_ref, b_constr); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_free"))) TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ _res_conv = *(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_free(_res_conv); } -void __attribute__((export_name("TS_CVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ_free"))) TS_CVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ_free"))) TS_CVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ_free(uint64_tArray _res) { LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _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; + uint64_t* _res_vals = _res->elems; for (size_t o = 0; o < _res_constr.datalen; o++) { - uint32_t _res_conv_40 = _res_vals[o]; - void* _res_conv_40_ptr = (void*)(((uintptr_t)_res_conv_40) & ~1); + uint64_t _res_conv_40 = _res_vals[o]; + void* _res_conv_40_ptr = untag_ptr(_res_conv_40); 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); + FREE(untag_ptr(_res_conv_40)); _res_constr.data[o] = _res_conv_40_conv; } FREE(_res); CVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ_free(_res_constr); } -void __attribute__((export_name("TS_CVec_EventZ_free"))) TS_CVec_EventZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_EventZ_free"))) TS_CVec_EventZ_free(uint64_tArray _res) { LDKCVec_EventZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKEvent), "LDKCVec_EventZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t h = 0; h < _res_constr.datalen; h++) { - uint32_t _res_conv_7 = _res_vals[h]; - void* _res_conv_7_ptr = (void*)(((uintptr_t)_res_conv_7) & ~1); + uint64_t _res_conv_7 = _res_vals[h]; + void* _res_conv_7_ptr = untag_ptr(_res_conv_7); CHECK_ACCESS(_res_conv_7_ptr); LDKEvent _res_conv_7_conv = *(LDKEvent*)(_res_conv_7_ptr); - FREE((void*)_res_conv_7); + FREE(untag_ptr(_res_conv_7)); _res_constr.data[h] = _res_conv_7_conv; } FREE(_res); @@ -18002,82 +16728,82 @@ void __attribute__((export_name("TS_CVec_TransactionZ_free"))) TS_CVec_Transact CVec_TransactionZ_free(_res_constr); } -static inline uintptr_t C2Tuple_u32TxOutZ_clone_ptr(LDKC2Tuple_u32TxOutZ *NONNULL_PTR arg) { +static inline uint64_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 ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = C2Tuple_u32TxOutZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_C2Tuple_u32TxOutZ_clone_ptr"))) TS_C2Tuple_u32TxOutZ_clone_ptr(uint64_t arg) { + LDKC2Tuple_u32TxOutZ* arg_conv = (LDKC2Tuple_u32TxOutZ*)untag_ptr(arg); + int64_t ret_conv = C2Tuple_u32TxOutZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_C2Tuple_u32TxOutZ_clone"))) TS_C2Tuple_u32TxOutZ_clone(uint32_t orig) { - LDKC2Tuple_u32TxOutZ* orig_conv = (LDKC2Tuple_u32TxOutZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_C2Tuple_u32TxOutZ_clone"))) TS_C2Tuple_u32TxOutZ_clone(uint64_t orig) { + LDKC2Tuple_u32TxOutZ* orig_conv = (LDKC2Tuple_u32TxOutZ*)untag_ptr(orig); LDKC2Tuple_u32TxOutZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_u32TxOutZ), "LDKC2Tuple_u32TxOutZ"); *ret_conv = C2Tuple_u32TxOutZ_clone(orig_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C2Tuple_u32TxOutZ_new"))) TS_C2Tuple_u32TxOutZ_new(int32_t a, uint32_t b) { - void* b_ptr = (void*)(((uintptr_t)b) & ~1); +uint64_t __attribute__((export_name("TS_C2Tuple_u32TxOutZ_new"))) TS_C2Tuple_u32TxOutZ_new(int32_t a, uint64_t b) { + void* b_ptr = untag_ptr(b); CHECK_ACCESS(b_ptr); LDKTxOut b_conv = *(LDKTxOut*)(b_ptr); - b_conv = TxOut_clone((LDKTxOut*)(((uintptr_t)b) & ~1)); + b_conv = TxOut_clone((LDKTxOut*)untag_ptr(b)); LDKC2Tuple_u32TxOutZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_u32TxOutZ), "LDKC2Tuple_u32TxOutZ"); *ret_conv = C2Tuple_u32TxOutZ_new(a, b_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_C2Tuple_u32TxOutZ_free"))) TS_C2Tuple_u32TxOutZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_C2Tuple_u32TxOutZ_free"))) TS_C2Tuple_u32TxOutZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKC2Tuple_u32TxOutZ _res_conv = *(LDKC2Tuple_u32TxOutZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); C2Tuple_u32TxOutZ_free(_res_conv); } -void __attribute__((export_name("TS_CVec_C2Tuple_u32TxOutZZ_free"))) TS_CVec_C2Tuple_u32TxOutZZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_C2Tuple_u32TxOutZZ_free"))) TS_CVec_C2Tuple_u32TxOutZZ_free(uint64_tArray _res) { LDKCVec_C2Tuple_u32TxOutZZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _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; + uint64_t* _res_vals = _res->elems; for (size_t u = 0; u < _res_constr.datalen; u++) { - uint32_t _res_conv_20 = _res_vals[u]; - void* _res_conv_20_ptr = (void*)(((uintptr_t)_res_conv_20) & ~1); + uint64_t _res_conv_20 = _res_vals[u]; + void* _res_conv_20_ptr = untag_ptr(_res_conv_20); CHECK_ACCESS(_res_conv_20_ptr); LDKC2Tuple_u32TxOutZ _res_conv_20_conv = *(LDKC2Tuple_u32TxOutZ*)(_res_conv_20_ptr); - FREE((void*)_res_conv_20); + FREE(untag_ptr(_res_conv_20)); _res_constr.data[u] = _res_conv_20_conv; } FREE(_res); CVec_C2Tuple_u32TxOutZZ_free(_res_constr); } -static inline uintptr_t C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone_ptr(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ *NONNULL_PTR arg) { +static inline uint64_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 ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone_ptr"))) TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone_ptr(uint64_t arg) { + LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* arg_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)untag_ptr(arg); + int64_t ret_conv = C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone"))) TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone(uint32_t orig) { - LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* orig_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone"))) TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone(uint64_t orig) { + LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* orig_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)untag_ptr(orig); 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 ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_new"))) TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_new(int8_tArray a, uint32_tArray b) { +uint64_t __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_new"))) TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_new(int8_tArray a, uint64_tArray b) { LDKThirtyTwoBytes a_ref; CHECK(a->arr_len == 32); memcpy(a_ref.data, a->elems, 32); FREE(a); @@ -18087,188 +16813,188 @@ uint32_t __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_ne b_constr.data = MALLOC(b_constr.datalen * sizeof(LDKC2Tuple_u32TxOutZ), "LDKCVec_C2Tuple_u32TxOutZZ Elements"); else b_constr.data = NULL; - uint32_t* b_vals = b->elems; + uint64_t* b_vals = b->elems; for (size_t u = 0; u < b_constr.datalen; u++) { - uint32_t b_conv_20 = b_vals[u]; - void* b_conv_20_ptr = (void*)(((uintptr_t)b_conv_20) & ~1); + uint64_t b_conv_20 = b_vals[u]; + void* b_conv_20_ptr = untag_ptr(b_conv_20); 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*)(((uintptr_t)b_conv_20) & ~1)); + b_conv_20_conv = C2Tuple_u32TxOutZ_clone((LDKC2Tuple_u32TxOutZ*)untag_ptr(b_conv_20)); b_constr.data[u] = b_conv_20_conv; } FREE(b); LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ"); *ret_conv = C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_new(a_ref, b_constr); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_free"))) TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ _res_conv = *(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_free(_res_conv); } -void __attribute__((export_name("TS_CVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ_free"))) TS_CVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ_free"))) TS_CVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ_free(uint64_tArray _res) { LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _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; + uint64_t* _res_vals = _res->elems; for (size_t n = 0; n < _res_constr.datalen; n++) { - uint32_t _res_conv_39 = _res_vals[n]; - void* _res_conv_39_ptr = (void*)(((uintptr_t)_res_conv_39) & ~1); + uint64_t _res_conv_39 = _res_vals[n]; + void* _res_conv_39_ptr = untag_ptr(_res_conv_39); 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); + FREE(untag_ptr(_res_conv_39)); _res_constr.data[n] = _res_conv_39_conv; } FREE(_res); CVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ_free(_res_constr); } -void __attribute__((export_name("TS_CVec_BalanceZ_free"))) TS_CVec_BalanceZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_BalanceZ_free"))) TS_CVec_BalanceZ_free(uint64_tArray _res) { LDKCVec_BalanceZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKBalance), "LDKCVec_BalanceZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t j = 0; j < _res_constr.datalen; j++) { - uint32_t _res_conv_9 = _res_vals[j]; - void* _res_conv_9_ptr = (void*)(((uintptr_t)_res_conv_9) & ~1); + uint64_t _res_conv_9 = _res_vals[j]; + void* _res_conv_9_ptr = untag_ptr(_res_conv_9); CHECK_ACCESS(_res_conv_9_ptr); LDKBalance _res_conv_9_conv = *(LDKBalance*)(_res_conv_9_ptr); - FREE((void*)_res_conv_9); + FREE(untag_ptr(_res_conv_9)); _res_constr.data[j] = _res_conv_9_conv; } FREE(_res); CVec_BalanceZ_free(_res_constr); } -static inline uintptr_t C2Tuple_BlockHashChannelMonitorZ_clone_ptr(LDKC2Tuple_BlockHashChannelMonitorZ *NONNULL_PTR arg) { +static inline uint64_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 ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = C2Tuple_BlockHashChannelMonitorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_clone_ptr"))) TS_C2Tuple_BlockHashChannelMonitorZ_clone_ptr(uint64_t arg) { + LDKC2Tuple_BlockHashChannelMonitorZ* arg_conv = (LDKC2Tuple_BlockHashChannelMonitorZ*)untag_ptr(arg); + int64_t ret_conv = C2Tuple_BlockHashChannelMonitorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_clone"))) TS_C2Tuple_BlockHashChannelMonitorZ_clone(uint32_t orig) { - LDKC2Tuple_BlockHashChannelMonitorZ* orig_conv = (LDKC2Tuple_BlockHashChannelMonitorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_clone"))) TS_C2Tuple_BlockHashChannelMonitorZ_clone(uint64_t orig) { + LDKC2Tuple_BlockHashChannelMonitorZ* orig_conv = (LDKC2Tuple_BlockHashChannelMonitorZ*)untag_ptr(orig); LDKC2Tuple_BlockHashChannelMonitorZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_BlockHashChannelMonitorZ), "LDKC2Tuple_BlockHashChannelMonitorZ"); *ret_conv = C2Tuple_BlockHashChannelMonitorZ_clone(orig_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_new"))) TS_C2Tuple_BlockHashChannelMonitorZ_new(int8_tArray a, uint32_t b) { +uint64_t __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_new"))) TS_C2Tuple_BlockHashChannelMonitorZ_new(int8_tArray a, uint64_t b) { LDKThirtyTwoBytes a_ref; CHECK(a->arr_len == 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); + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); 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 ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_free"))) TS_C2Tuple_BlockHashChannelMonitorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_free"))) TS_C2Tuple_BlockHashChannelMonitorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKC2Tuple_BlockHashChannelMonitorZ _res_conv = *(LDKC2Tuple_BlockHashChannelMonitorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); C2Tuple_BlockHashChannelMonitorZ_free(_res_conv); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_ok"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_ok"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_ok(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKC2Tuple_BlockHashChannelMonitorZ o_conv = *(LDKC2Tuple_BlockHashChannelMonitorZ*)(o_ptr); - o_conv = C2Tuple_BlockHashChannelMonitorZ_clone((LDKC2Tuple_BlockHashChannelMonitorZ*)(((uintptr_t)o) & ~1)); + o_conv = C2Tuple_BlockHashChannelMonitorZ_clone((LDKC2Tuple_BlockHashChannelMonitorZ*)untag_ptr(o)); LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ), "LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ"); *ret_conv = CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_err"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_err"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_is_ok"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* o_conv = (LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_is_ok"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* o_conv = (LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_is_ok(o_conv); return ret_conv; } -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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_free"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ _res_conv = *(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone_ptr(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone_ptr"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* arg_conv = (LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* orig_conv = (LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* orig_conv = (LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)untag_ptr(orig); LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ), "LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ"); *ret_conv = CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -static inline uintptr_t C2Tuple_PublicKeyTypeZ_clone_ptr(LDKC2Tuple_PublicKeyTypeZ *NONNULL_PTR arg) { +static inline uint64_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 ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = C2Tuple_PublicKeyTypeZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_C2Tuple_PublicKeyTypeZ_clone_ptr"))) TS_C2Tuple_PublicKeyTypeZ_clone_ptr(uint64_t arg) { + LDKC2Tuple_PublicKeyTypeZ* arg_conv = (LDKC2Tuple_PublicKeyTypeZ*)untag_ptr(arg); + int64_t ret_conv = C2Tuple_PublicKeyTypeZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_C2Tuple_PublicKeyTypeZ_clone"))) TS_C2Tuple_PublicKeyTypeZ_clone(uint32_t orig) { - LDKC2Tuple_PublicKeyTypeZ* orig_conv = (LDKC2Tuple_PublicKeyTypeZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_C2Tuple_PublicKeyTypeZ_clone"))) TS_C2Tuple_PublicKeyTypeZ_clone(uint64_t orig) { + LDKC2Tuple_PublicKeyTypeZ* orig_conv = (LDKC2Tuple_PublicKeyTypeZ*)untag_ptr(orig); LDKC2Tuple_PublicKeyTypeZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PublicKeyTypeZ), "LDKC2Tuple_PublicKeyTypeZ"); *ret_conv = C2Tuple_PublicKeyTypeZ_clone(orig_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_C2Tuple_PublicKeyTypeZ_new"))) TS_C2Tuple_PublicKeyTypeZ_new(int8_tArray a, uint32_t b) { +uint64_t __attribute__((export_name("TS_C2Tuple_PublicKeyTypeZ_new"))) TS_C2Tuple_PublicKeyTypeZ_new(int8_tArray a, uint64_t b) { LDKPublicKey a_ref; CHECK(a->arr_len == 33); memcpy(a_ref.compressed_form, a->elems, 33); FREE(a); - void* b_ptr = (void*)(((uintptr_t)b) & ~1); + void* b_ptr = untag_ptr(b); CHECK_ACCESS(b_ptr); LDKType b_conv = *(LDKType*)(b_ptr); if (b_conv.free == LDKType_JCalls_free) { @@ -18277,352 +17003,352 @@ uint32_t __attribute__((export_name("TS_C2Tuple_PublicKeyTypeZ_new"))) TS_C2Tup } LDKC2Tuple_PublicKeyTypeZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PublicKeyTypeZ), "LDKC2Tuple_PublicKeyTypeZ"); *ret_conv = C2Tuple_PublicKeyTypeZ_new(a_ref, b_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_C2Tuple_PublicKeyTypeZ_free"))) TS_C2Tuple_PublicKeyTypeZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_C2Tuple_PublicKeyTypeZ_free"))) TS_C2Tuple_PublicKeyTypeZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKC2Tuple_PublicKeyTypeZ _res_conv = *(LDKC2Tuple_PublicKeyTypeZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); C2Tuple_PublicKeyTypeZ_free(_res_conv); } -void __attribute__((export_name("TS_CVec_C2Tuple_PublicKeyTypeZZ_free"))) TS_CVec_C2Tuple_PublicKeyTypeZZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_C2Tuple_PublicKeyTypeZZ_free"))) TS_CVec_C2Tuple_PublicKeyTypeZZ_free(uint64_tArray _res) { LDKCVec_C2Tuple_PublicKeyTypeZZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _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; + uint64_t* _res_vals = _res->elems; for (size_t z = 0; z < _res_constr.datalen; z++) { - uint32_t _res_conv_25 = _res_vals[z]; - void* _res_conv_25_ptr = (void*)(((uintptr_t)_res_conv_25) & ~1); + uint64_t _res_conv_25 = _res_vals[z]; + void* _res_conv_25_ptr = untag_ptr(_res_conv_25); CHECK_ACCESS(_res_conv_25_ptr); LDKC2Tuple_PublicKeyTypeZ _res_conv_25_conv = *(LDKC2Tuple_PublicKeyTypeZ*)(_res_conv_25_ptr); - FREE((void*)_res_conv_25); + FREE(untag_ptr(_res_conv_25)); _res_constr.data[z] = _res_conv_25_conv; } FREE(_res); CVec_C2Tuple_PublicKeyTypeZZ_free(_res_constr); } -uint32_t __attribute__((export_name("TS_COption_NetAddressZ_some"))) TS_COption_NetAddressZ_some(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_COption_NetAddressZ_some"))) TS_COption_NetAddressZ_some(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKNetAddress o_conv = *(LDKNetAddress*)(o_ptr); - o_conv = NetAddress_clone((LDKNetAddress*)(((uintptr_t)o) & ~1)); + o_conv = NetAddress_clone((LDKNetAddress*)untag_ptr(o)); LDKCOption_NetAddressZ *ret_copy = MALLOC(sizeof(LDKCOption_NetAddressZ), "LDKCOption_NetAddressZ"); *ret_copy = COption_NetAddressZ_some(o_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_NetAddressZ_none"))) TS_COption_NetAddressZ_none() { +uint64_t __attribute__((export_name("TS_COption_NetAddressZ_none"))) TS_COption_NetAddressZ_none() { LDKCOption_NetAddressZ *ret_copy = MALLOC(sizeof(LDKCOption_NetAddressZ), "LDKCOption_NetAddressZ"); *ret_copy = COption_NetAddressZ_none(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_COption_NetAddressZ_free"))) TS_COption_NetAddressZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_COption_NetAddressZ_free"))) TS_COption_NetAddressZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCOption_NetAddressZ _res_conv = *(LDKCOption_NetAddressZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); COption_NetAddressZ_free(_res_conv); } -static inline uintptr_t COption_NetAddressZ_clone_ptr(LDKCOption_NetAddressZ *NONNULL_PTR arg) { +static inline uint64_t COption_NetAddressZ_clone_ptr(LDKCOption_NetAddressZ *NONNULL_PTR arg) { LDKCOption_NetAddressZ *ret_copy = MALLOC(sizeof(LDKCOption_NetAddressZ), "LDKCOption_NetAddressZ"); *ret_copy = COption_NetAddressZ_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_NetAddressZ_clone_ptr"))) TS_COption_NetAddressZ_clone_ptr(uint32_t arg) { - LDKCOption_NetAddressZ* arg_conv = (LDKCOption_NetAddressZ*)arg; - uint32_t ret_conv = COption_NetAddressZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_COption_NetAddressZ_clone_ptr"))) TS_COption_NetAddressZ_clone_ptr(uint64_t arg) { + LDKCOption_NetAddressZ* arg_conv = (LDKCOption_NetAddressZ*)untag_ptr(arg); + int64_t ret_conv = COption_NetAddressZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_COption_NetAddressZ_clone"))) TS_COption_NetAddressZ_clone(uint32_t orig) { - LDKCOption_NetAddressZ* orig_conv = (LDKCOption_NetAddressZ*)orig; +uint64_t __attribute__((export_name("TS_COption_NetAddressZ_clone"))) TS_COption_NetAddressZ_clone(uint64_t orig) { + LDKCOption_NetAddressZ* orig_conv = (LDKCOption_NetAddressZ*)untag_ptr(orig); LDKCOption_NetAddressZ *ret_copy = MALLOC(sizeof(LDKCOption_NetAddressZ), "LDKCOption_NetAddressZ"); *ret_copy = COption_NetAddressZ_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_ok"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_ok(int8_tArray o) { +uint64_t __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_ok"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_ok(int8_tArray o) { 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); FREE(o); LDKCResult_CVec_u8ZPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_u8ZPeerHandleErrorZ), "LDKCResult_CVec_u8ZPeerHandleErrorZ"); *ret_conv = CResult_CVec_u8ZPeerHandleErrorZ_ok(o_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_err"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_err"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_err(uint64_t e) { LDKPeerHandleError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_is_ok"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_is_ok(uint32_t o) { - LDKCResult_CVec_u8ZPeerHandleErrorZ* o_conv = (LDKCResult_CVec_u8ZPeerHandleErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_is_ok"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_is_ok(uint64_t o) { + LDKCResult_CVec_u8ZPeerHandleErrorZ* o_conv = (LDKCResult_CVec_u8ZPeerHandleErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_CVec_u8ZPeerHandleErrorZ_is_ok(o_conv); return ret_conv; } -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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_free"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_CVec_u8ZPeerHandleErrorZ _res_conv = *(LDKCResult_CVec_u8ZPeerHandleErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_CVec_u8ZPeerHandleErrorZ_free(_res_conv); } -static inline uintptr_t CResult_CVec_u8ZPeerHandleErrorZ_clone_ptr(LDKCResult_CVec_u8ZPeerHandleErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_CVec_u8ZPeerHandleErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_clone_ptr"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_CVec_u8ZPeerHandleErrorZ* arg_conv = (LDKCResult_CVec_u8ZPeerHandleErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_CVec_u8ZPeerHandleErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_clone"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_clone(uint32_t orig) { - LDKCResult_CVec_u8ZPeerHandleErrorZ* orig_conv = (LDKCResult_CVec_u8ZPeerHandleErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_clone"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_clone(uint64_t orig) { + LDKCResult_CVec_u8ZPeerHandleErrorZ* orig_conv = (LDKCResult_CVec_u8ZPeerHandleErrorZ*)untag_ptr(orig); LDKCResult_CVec_u8ZPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_u8ZPeerHandleErrorZ), "LDKCResult_CVec_u8ZPeerHandleErrorZ"); *ret_conv = CResult_CVec_u8ZPeerHandleErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_ok"))) TS_CResult_NonePeerHandleErrorZ_ok() { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_err"))) TS_CResult_NonePeerHandleErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_err"))) TS_CResult_NonePeerHandleErrorZ_err(uint64_t e) { LDKPeerHandleError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = PeerHandleError_clone(&e_conv); LDKCResult_NonePeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePeerHandleErrorZ), "LDKCResult_NonePeerHandleErrorZ"); *ret_conv = CResult_NonePeerHandleErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_is_ok"))) TS_CResult_NonePeerHandleErrorZ_is_ok(uint32_t o) { - LDKCResult_NonePeerHandleErrorZ* o_conv = (LDKCResult_NonePeerHandleErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_is_ok"))) TS_CResult_NonePeerHandleErrorZ_is_ok(uint64_t o) { + LDKCResult_NonePeerHandleErrorZ* o_conv = (LDKCResult_NonePeerHandleErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_NonePeerHandleErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_free"))) TS_CResult_NonePeerHandleErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_free"))) TS_CResult_NonePeerHandleErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_NonePeerHandleErrorZ _res_conv = *(LDKCResult_NonePeerHandleErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_NonePeerHandleErrorZ_free(_res_conv); } -static inline uintptr_t CResult_NonePeerHandleErrorZ_clone_ptr(LDKCResult_NonePeerHandleErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_NonePeerHandleErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_clone_ptr"))) TS_CResult_NonePeerHandleErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_NonePeerHandleErrorZ* arg_conv = (LDKCResult_NonePeerHandleErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_NonePeerHandleErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_clone"))) TS_CResult_NonePeerHandleErrorZ_clone(uint32_t orig) { - LDKCResult_NonePeerHandleErrorZ* orig_conv = (LDKCResult_NonePeerHandleErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_clone"))) TS_CResult_NonePeerHandleErrorZ_clone(uint64_t orig) { + LDKCResult_NonePeerHandleErrorZ* orig_conv = (LDKCResult_NonePeerHandleErrorZ*)untag_ptr(orig); LDKCResult_NonePeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePeerHandleErrorZ), "LDKCResult_NonePeerHandleErrorZ"); *ret_conv = CResult_NonePeerHandleErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_ok"))) TS_CResult_boolPeerHandleErrorZ_ok(jboolean o) { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_err"))) TS_CResult_boolPeerHandleErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_err"))) TS_CResult_boolPeerHandleErrorZ_err(uint64_t e) { LDKPeerHandleError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = PeerHandleError_clone(&e_conv); LDKCResult_boolPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolPeerHandleErrorZ), "LDKCResult_boolPeerHandleErrorZ"); *ret_conv = CResult_boolPeerHandleErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_is_ok"))) TS_CResult_boolPeerHandleErrorZ_is_ok(uint32_t o) { - LDKCResult_boolPeerHandleErrorZ* o_conv = (LDKCResult_boolPeerHandleErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_is_ok"))) TS_CResult_boolPeerHandleErrorZ_is_ok(uint64_t o) { + LDKCResult_boolPeerHandleErrorZ* o_conv = (LDKCResult_boolPeerHandleErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_boolPeerHandleErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_free"))) TS_CResult_boolPeerHandleErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_free"))) TS_CResult_boolPeerHandleErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_boolPeerHandleErrorZ _res_conv = *(LDKCResult_boolPeerHandleErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_boolPeerHandleErrorZ_free(_res_conv); } -static inline uintptr_t CResult_boolPeerHandleErrorZ_clone_ptr(LDKCResult_boolPeerHandleErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_boolPeerHandleErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_clone_ptr"))) TS_CResult_boolPeerHandleErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_boolPeerHandleErrorZ* arg_conv = (LDKCResult_boolPeerHandleErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_boolPeerHandleErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_clone"))) TS_CResult_boolPeerHandleErrorZ_clone(uint32_t orig) { - LDKCResult_boolPeerHandleErrorZ* orig_conv = (LDKCResult_boolPeerHandleErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_clone"))) TS_CResult_boolPeerHandleErrorZ_clone(uint64_t orig) { + LDKCResult_boolPeerHandleErrorZ* orig_conv = (LDKCResult_boolPeerHandleErrorZ*)untag_ptr(orig); LDKCResult_boolPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolPeerHandleErrorZ), "LDKCResult_boolPeerHandleErrorZ"); *ret_conv = CResult_boolPeerHandleErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NoneErrorZ_ok"))) TS_CResult_NoneErrorZ_ok() { +uint64_t __attribute__((export_name("TS_CResult_NoneErrorZ_ok"))) TS_CResult_NoneErrorZ_ok() { LDKCResult_NoneErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneErrorZ), "LDKCResult_NoneErrorZ"); *ret_conv = CResult_NoneErrorZ_ok(); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NoneErrorZ_err"))) TS_CResult_NoneErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_NoneErrorZ_err"))) TS_CResult_NoneErrorZ_err(uint32_t e) { LDKIOError e_conv = LDKIOError_from_js(e); LDKCResult_NoneErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneErrorZ), "LDKCResult_NoneErrorZ"); *ret_conv = CResult_NoneErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_NoneErrorZ_is_ok"))) TS_CResult_NoneErrorZ_is_ok(uint32_t o) { - LDKCResult_NoneErrorZ* o_conv = (LDKCResult_NoneErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_NoneErrorZ_is_ok"))) TS_CResult_NoneErrorZ_is_ok(uint64_t o) { + LDKCResult_NoneErrorZ* o_conv = (LDKCResult_NoneErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_NoneErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_NoneErrorZ_free"))) TS_CResult_NoneErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_NoneErrorZ_free"))) TS_CResult_NoneErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_NoneErrorZ _res_conv = *(LDKCResult_NoneErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_NoneErrorZ_free(_res_conv); } -static inline uintptr_t CResult_NoneErrorZ_clone_ptr(LDKCResult_NoneErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_NoneErrorZ_clone_ptr(LDKCResult_NoneErrorZ *NONNULL_PTR arg) { LDKCResult_NoneErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneErrorZ), "LDKCResult_NoneErrorZ"); *ret_conv = CResult_NoneErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NoneErrorZ_clone_ptr"))) TS_CResult_NoneErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_NoneErrorZ* arg_conv = (LDKCResult_NoneErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_NoneErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_NoneErrorZ_clone_ptr"))) TS_CResult_NoneErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_NoneErrorZ* arg_conv = (LDKCResult_NoneErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_NoneErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_NoneErrorZ_clone"))) TS_CResult_NoneErrorZ_clone(uint32_t orig) { - LDKCResult_NoneErrorZ* orig_conv = (LDKCResult_NoneErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_NoneErrorZ_clone"))) TS_CResult_NoneErrorZ_clone(uint64_t orig) { + LDKCResult_NoneErrorZ* orig_conv = (LDKCResult_NoneErrorZ*)untag_ptr(orig); LDKCResult_NoneErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneErrorZ), "LDKCResult_NoneErrorZ"); *ret_conv = CResult_NoneErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_ok"))) TS_CResult_NetAddressDecodeErrorZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_ok"))) TS_CResult_NetAddressDecodeErrorZ_ok(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKNetAddress o_conv = *(LDKNetAddress*)(o_ptr); - o_conv = NetAddress_clone((LDKNetAddress*)(((uintptr_t)o) & ~1)); + o_conv = NetAddress_clone((LDKNetAddress*)untag_ptr(o)); LDKCResult_NetAddressDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetAddressDecodeErrorZ), "LDKCResult_NetAddressDecodeErrorZ"); *ret_conv = CResult_NetAddressDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_err"))) TS_CResult_NetAddressDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_err"))) TS_CResult_NetAddressDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_NetAddressDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetAddressDecodeErrorZ), "LDKCResult_NetAddressDecodeErrorZ"); *ret_conv = CResult_NetAddressDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_is_ok"))) TS_CResult_NetAddressDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_NetAddressDecodeErrorZ* o_conv = (LDKCResult_NetAddressDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_is_ok"))) TS_CResult_NetAddressDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_NetAddressDecodeErrorZ* o_conv = (LDKCResult_NetAddressDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_NetAddressDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_free"))) TS_CResult_NetAddressDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_free"))) TS_CResult_NetAddressDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_NetAddressDecodeErrorZ _res_conv = *(LDKCResult_NetAddressDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_NetAddressDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_NetAddressDecodeErrorZ_clone_ptr(LDKCResult_NetAddressDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_NetAddressDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_clone_ptr"))) TS_CResult_NetAddressDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_NetAddressDecodeErrorZ* arg_conv = (LDKCResult_NetAddressDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_NetAddressDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_clone"))) TS_CResult_NetAddressDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_NetAddressDecodeErrorZ* orig_conv = (LDKCResult_NetAddressDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_clone"))) TS_CResult_NetAddressDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_NetAddressDecodeErrorZ* orig_conv = (LDKCResult_NetAddressDecodeErrorZ*)untag_ptr(orig); LDKCResult_NetAddressDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetAddressDecodeErrorZ), "LDKCResult_NetAddressDecodeErrorZ"); *ret_conv = CResult_NetAddressDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_CVec_UpdateAddHTLCZ_free"))) TS_CVec_UpdateAddHTLCZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_UpdateAddHTLCZ_free"))) TS_CVec_UpdateAddHTLCZ_free(uint64_tArray _res) { LDKCVec_UpdateAddHTLCZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKUpdateAddHTLC), "LDKCVec_UpdateAddHTLCZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t p = 0; p < _res_constr.datalen; p++) { - uint32_t _res_conv_15 = _res_vals[p]; + uint64_t _res_conv_15 = _res_vals[p]; LDKUpdateAddHTLC _res_conv_15_conv; - _res_conv_15_conv.inner = (void*)(_res_conv_15 & (~1)); - _res_conv_15_conv.is_owned = (_res_conv_15 & 1) || (_res_conv_15 == 0); + _res_conv_15_conv.inner = untag_ptr(_res_conv_15); + _res_conv_15_conv.is_owned = ptr_is_owned(_res_conv_15); CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_15_conv); _res_constr.data[p] = _res_conv_15_conv; } @@ -18630,19 +17356,19 @@ void __attribute__((export_name("TS_CVec_UpdateAddHTLCZ_free"))) TS_CVec_Update CVec_UpdateAddHTLCZ_free(_res_constr); } -void __attribute__((export_name("TS_CVec_UpdateFulfillHTLCZ_free"))) TS_CVec_UpdateFulfillHTLCZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_UpdateFulfillHTLCZ_free"))) TS_CVec_UpdateFulfillHTLCZ_free(uint64_tArray _res) { LDKCVec_UpdateFulfillHTLCZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKUpdateFulfillHTLC), "LDKCVec_UpdateFulfillHTLCZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t t = 0; t < _res_constr.datalen; t++) { - uint32_t _res_conv_19 = _res_vals[t]; + uint64_t _res_conv_19 = _res_vals[t]; LDKUpdateFulfillHTLC _res_conv_19_conv; - _res_conv_19_conv.inner = (void*)(_res_conv_19 & (~1)); - _res_conv_19_conv.is_owned = (_res_conv_19 & 1) || (_res_conv_19 == 0); + _res_conv_19_conv.inner = untag_ptr(_res_conv_19); + _res_conv_19_conv.is_owned = ptr_is_owned(_res_conv_19); CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_19_conv); _res_constr.data[t] = _res_conv_19_conv; } @@ -18650,19 +17376,19 @@ void __attribute__((export_name("TS_CVec_UpdateFulfillHTLCZ_free"))) TS_CVec_Up CVec_UpdateFulfillHTLCZ_free(_res_constr); } -void __attribute__((export_name("TS_CVec_UpdateFailHTLCZ_free"))) TS_CVec_UpdateFailHTLCZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_UpdateFailHTLCZ_free"))) TS_CVec_UpdateFailHTLCZ_free(uint64_tArray _res) { LDKCVec_UpdateFailHTLCZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKUpdateFailHTLC), "LDKCVec_UpdateFailHTLCZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t q = 0; q < _res_constr.datalen; q++) { - uint32_t _res_conv_16 = _res_vals[q]; + uint64_t _res_conv_16 = _res_vals[q]; LDKUpdateFailHTLC _res_conv_16_conv; - _res_conv_16_conv.inner = (void*)(_res_conv_16 & (~1)); - _res_conv_16_conv.is_owned = (_res_conv_16 & 1) || (_res_conv_16 == 0); + _res_conv_16_conv.inner = untag_ptr(_res_conv_16); + _res_conv_16_conv.is_owned = ptr_is_owned(_res_conv_16); CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_16_conv); _res_constr.data[q] = _res_conv_16_conv; } @@ -18670,19 +17396,19 @@ void __attribute__((export_name("TS_CVec_UpdateFailHTLCZ_free"))) TS_CVec_Updat CVec_UpdateFailHTLCZ_free(_res_constr); } -void __attribute__((export_name("TS_CVec_UpdateFailMalformedHTLCZ_free"))) TS_CVec_UpdateFailMalformedHTLCZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_UpdateFailMalformedHTLCZ_free"))) TS_CVec_UpdateFailMalformedHTLCZ_free(uint64_tArray _res) { LDKCVec_UpdateFailMalformedHTLCZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKUpdateFailMalformedHTLC), "LDKCVec_UpdateFailMalformedHTLCZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t z = 0; z < _res_constr.datalen; z++) { - uint32_t _res_conv_25 = _res_vals[z]; + uint64_t _res_conv_25 = _res_vals[z]; LDKUpdateFailMalformedHTLC _res_conv_25_conv; - _res_conv_25_conv.inner = (void*)(_res_conv_25 & (~1)); - _res_conv_25_conv.is_owned = (_res_conv_25 & 1) || (_res_conv_25 == 0); + _res_conv_25_conv.inner = untag_ptr(_res_conv_25); + _res_conv_25_conv.is_owned = ptr_is_owned(_res_conv_25); CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_25_conv); _res_constr.data[z] = _res_conv_25_conv; } @@ -18690,1877 +17416,1877 @@ void __attribute__((export_name("TS_CVec_UpdateFailMalformedHTLCZ_free"))) TS_C CVec_UpdateFailMalformedHTLCZ_free(_res_constr); } -uint32_t __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_ok"))) TS_CResult_AcceptChannelDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_ok"))) TS_CResult_AcceptChannelDecodeErrorZ_ok(uint64_t o) { LDKAcceptChannel o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = AcceptChannel_clone(&o_conv); LDKCResult_AcceptChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AcceptChannelDecodeErrorZ), "LDKCResult_AcceptChannelDecodeErrorZ"); *ret_conv = CResult_AcceptChannelDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_err"))) TS_CResult_AcceptChannelDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_err"))) TS_CResult_AcceptChannelDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_AcceptChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AcceptChannelDecodeErrorZ), "LDKCResult_AcceptChannelDecodeErrorZ"); *ret_conv = CResult_AcceptChannelDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_is_ok"))) TS_CResult_AcceptChannelDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_AcceptChannelDecodeErrorZ* o_conv = (LDKCResult_AcceptChannelDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_is_ok"))) TS_CResult_AcceptChannelDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_AcceptChannelDecodeErrorZ* o_conv = (LDKCResult_AcceptChannelDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_AcceptChannelDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_free"))) TS_CResult_AcceptChannelDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_free"))) TS_CResult_AcceptChannelDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_AcceptChannelDecodeErrorZ _res_conv = *(LDKCResult_AcceptChannelDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_AcceptChannelDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_AcceptChannelDecodeErrorZ_clone_ptr(LDKCResult_AcceptChannelDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_AcceptChannelDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_clone_ptr"))) TS_CResult_AcceptChannelDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_AcceptChannelDecodeErrorZ* arg_conv = (LDKCResult_AcceptChannelDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_AcceptChannelDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_clone"))) TS_CResult_AcceptChannelDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_AcceptChannelDecodeErrorZ* orig_conv = (LDKCResult_AcceptChannelDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_clone"))) TS_CResult_AcceptChannelDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_AcceptChannelDecodeErrorZ* orig_conv = (LDKCResult_AcceptChannelDecodeErrorZ*)untag_ptr(orig); LDKCResult_AcceptChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AcceptChannelDecodeErrorZ), "LDKCResult_AcceptChannelDecodeErrorZ"); *ret_conv = CResult_AcceptChannelDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_ok"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_ok"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_ok(uint64_t o) { LDKAnnouncementSignatures o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = AnnouncementSignatures_clone(&o_conv); LDKCResult_AnnouncementSignaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AnnouncementSignaturesDecodeErrorZ), "LDKCResult_AnnouncementSignaturesDecodeErrorZ"); *ret_conv = CResult_AnnouncementSignaturesDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_err"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_err"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_AnnouncementSignaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AnnouncementSignaturesDecodeErrorZ), "LDKCResult_AnnouncementSignaturesDecodeErrorZ"); *ret_conv = CResult_AnnouncementSignaturesDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_is_ok"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_AnnouncementSignaturesDecodeErrorZ* o_conv = (LDKCResult_AnnouncementSignaturesDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_is_ok"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_AnnouncementSignaturesDecodeErrorZ* o_conv = (LDKCResult_AnnouncementSignaturesDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_AnnouncementSignaturesDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_free"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_free"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_AnnouncementSignaturesDecodeErrorZ _res_conv = *(LDKCResult_AnnouncementSignaturesDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_AnnouncementSignaturesDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_AnnouncementSignaturesDecodeErrorZ_clone_ptr(LDKCResult_AnnouncementSignaturesDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_AnnouncementSignaturesDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_clone_ptr"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_AnnouncementSignaturesDecodeErrorZ* arg_conv = (LDKCResult_AnnouncementSignaturesDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_AnnouncementSignaturesDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_clone"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_AnnouncementSignaturesDecodeErrorZ* orig_conv = (LDKCResult_AnnouncementSignaturesDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_clone"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_AnnouncementSignaturesDecodeErrorZ* orig_conv = (LDKCResult_AnnouncementSignaturesDecodeErrorZ*)untag_ptr(orig); LDKCResult_AnnouncementSignaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AnnouncementSignaturesDecodeErrorZ), "LDKCResult_AnnouncementSignaturesDecodeErrorZ"); *ret_conv = CResult_AnnouncementSignaturesDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_ok"))) TS_CResult_ChannelReestablishDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_ok"))) TS_CResult_ChannelReestablishDecodeErrorZ_ok(uint64_t o) { LDKChannelReestablish o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ChannelReestablish_clone(&o_conv); LDKCResult_ChannelReestablishDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelReestablishDecodeErrorZ), "LDKCResult_ChannelReestablishDecodeErrorZ"); *ret_conv = CResult_ChannelReestablishDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_err"))) TS_CResult_ChannelReestablishDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_err"))) TS_CResult_ChannelReestablishDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ChannelReestablishDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelReestablishDecodeErrorZ), "LDKCResult_ChannelReestablishDecodeErrorZ"); *ret_conv = CResult_ChannelReestablishDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_is_ok"))) TS_CResult_ChannelReestablishDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ChannelReestablishDecodeErrorZ* o_conv = (LDKCResult_ChannelReestablishDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_is_ok"))) TS_CResult_ChannelReestablishDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ChannelReestablishDecodeErrorZ* o_conv = (LDKCResult_ChannelReestablishDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ChannelReestablishDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_free"))) TS_CResult_ChannelReestablishDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_free"))) TS_CResult_ChannelReestablishDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ChannelReestablishDecodeErrorZ _res_conv = *(LDKCResult_ChannelReestablishDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ChannelReestablishDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ChannelReestablishDecodeErrorZ_clone_ptr(LDKCResult_ChannelReestablishDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_ChannelReestablishDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelReestablishDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ChannelReestablishDecodeErrorZ* arg_conv = (LDKCResult_ChannelReestablishDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ChannelReestablishDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_clone"))) TS_CResult_ChannelReestablishDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ChannelReestablishDecodeErrorZ* orig_conv = (LDKCResult_ChannelReestablishDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_clone"))) TS_CResult_ChannelReestablishDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ChannelReestablishDecodeErrorZ* orig_conv = (LDKCResult_ChannelReestablishDecodeErrorZ*)untag_ptr(orig); LDKCResult_ChannelReestablishDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelReestablishDecodeErrorZ), "LDKCResult_ChannelReestablishDecodeErrorZ"); *ret_conv = CResult_ChannelReestablishDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_ok"))) TS_CResult_ClosingSignedDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_ok"))) TS_CResult_ClosingSignedDecodeErrorZ_ok(uint64_t o) { LDKClosingSigned o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ClosingSigned_clone(&o_conv); LDKCResult_ClosingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedDecodeErrorZ), "LDKCResult_ClosingSignedDecodeErrorZ"); *ret_conv = CResult_ClosingSignedDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_err"))) TS_CResult_ClosingSignedDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_err"))) TS_CResult_ClosingSignedDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ClosingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedDecodeErrorZ), "LDKCResult_ClosingSignedDecodeErrorZ"); *ret_conv = CResult_ClosingSignedDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_is_ok"))) TS_CResult_ClosingSignedDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ClosingSignedDecodeErrorZ* o_conv = (LDKCResult_ClosingSignedDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_is_ok"))) TS_CResult_ClosingSignedDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ClosingSignedDecodeErrorZ* o_conv = (LDKCResult_ClosingSignedDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ClosingSignedDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_free"))) TS_CResult_ClosingSignedDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_free"))) TS_CResult_ClosingSignedDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ClosingSignedDecodeErrorZ _res_conv = *(LDKCResult_ClosingSignedDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ClosingSignedDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ClosingSignedDecodeErrorZ_clone_ptr(LDKCResult_ClosingSignedDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_ClosingSignedDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_clone_ptr"))) TS_CResult_ClosingSignedDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ClosingSignedDecodeErrorZ* arg_conv = (LDKCResult_ClosingSignedDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ClosingSignedDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_clone"))) TS_CResult_ClosingSignedDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ClosingSignedDecodeErrorZ* orig_conv = (LDKCResult_ClosingSignedDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_clone"))) TS_CResult_ClosingSignedDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ClosingSignedDecodeErrorZ* orig_conv = (LDKCResult_ClosingSignedDecodeErrorZ*)untag_ptr(orig); LDKCResult_ClosingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedDecodeErrorZ), "LDKCResult_ClosingSignedDecodeErrorZ"); *ret_conv = CResult_ClosingSignedDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_ok"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_ok"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_ok(uint64_t o) { LDKClosingSignedFeeRange o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ClosingSignedFeeRange_clone(&o_conv); LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedFeeRangeDecodeErrorZ), "LDKCResult_ClosingSignedFeeRangeDecodeErrorZ"); *ret_conv = CResult_ClosingSignedFeeRangeDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_err"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_err"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedFeeRangeDecodeErrorZ), "LDKCResult_ClosingSignedFeeRangeDecodeErrorZ"); *ret_conv = CResult_ClosingSignedFeeRangeDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_is_ok"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* o_conv = (LDKCResult_ClosingSignedFeeRangeDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_is_ok"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* o_conv = (LDKCResult_ClosingSignedFeeRangeDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ClosingSignedFeeRangeDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_free"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_free"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ClosingSignedFeeRangeDecodeErrorZ _res_conv = *(LDKCResult_ClosingSignedFeeRangeDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ClosingSignedFeeRangeDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ClosingSignedFeeRangeDecodeErrorZ_clone_ptr(LDKCResult_ClosingSignedFeeRangeDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_ClosingSignedFeeRangeDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_clone_ptr"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* arg_conv = (LDKCResult_ClosingSignedFeeRangeDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ClosingSignedFeeRangeDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_clone"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* orig_conv = (LDKCResult_ClosingSignedFeeRangeDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_clone"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* orig_conv = (LDKCResult_ClosingSignedFeeRangeDecodeErrorZ*)untag_ptr(orig); LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedFeeRangeDecodeErrorZ), "LDKCResult_ClosingSignedFeeRangeDecodeErrorZ"); *ret_conv = CResult_ClosingSignedFeeRangeDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_ok"))) TS_CResult_CommitmentSignedDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_ok"))) TS_CResult_CommitmentSignedDecodeErrorZ_ok(uint64_t o) { LDKCommitmentSigned o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = CommitmentSigned_clone(&o_conv); LDKCResult_CommitmentSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentSignedDecodeErrorZ), "LDKCResult_CommitmentSignedDecodeErrorZ"); *ret_conv = CResult_CommitmentSignedDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_err"))) TS_CResult_CommitmentSignedDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_err"))) TS_CResult_CommitmentSignedDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_CommitmentSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentSignedDecodeErrorZ), "LDKCResult_CommitmentSignedDecodeErrorZ"); *ret_conv = CResult_CommitmentSignedDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_is_ok"))) TS_CResult_CommitmentSignedDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_CommitmentSignedDecodeErrorZ* o_conv = (LDKCResult_CommitmentSignedDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_is_ok"))) TS_CResult_CommitmentSignedDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_CommitmentSignedDecodeErrorZ* o_conv = (LDKCResult_CommitmentSignedDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_CommitmentSignedDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_free"))) TS_CResult_CommitmentSignedDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_free"))) TS_CResult_CommitmentSignedDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_CommitmentSignedDecodeErrorZ _res_conv = *(LDKCResult_CommitmentSignedDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_CommitmentSignedDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_CommitmentSignedDecodeErrorZ_clone_ptr(LDKCResult_CommitmentSignedDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_CommitmentSignedDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_clone_ptr"))) TS_CResult_CommitmentSignedDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_CommitmentSignedDecodeErrorZ* arg_conv = (LDKCResult_CommitmentSignedDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_CommitmentSignedDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_clone"))) TS_CResult_CommitmentSignedDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_CommitmentSignedDecodeErrorZ* orig_conv = (LDKCResult_CommitmentSignedDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_clone"))) TS_CResult_CommitmentSignedDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_CommitmentSignedDecodeErrorZ* orig_conv = (LDKCResult_CommitmentSignedDecodeErrorZ*)untag_ptr(orig); LDKCResult_CommitmentSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentSignedDecodeErrorZ), "LDKCResult_CommitmentSignedDecodeErrorZ"); *ret_conv = CResult_CommitmentSignedDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_ok"))) TS_CResult_FundingCreatedDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_ok"))) TS_CResult_FundingCreatedDecodeErrorZ_ok(uint64_t o) { LDKFundingCreated o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = FundingCreated_clone(&o_conv); LDKCResult_FundingCreatedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingCreatedDecodeErrorZ), "LDKCResult_FundingCreatedDecodeErrorZ"); *ret_conv = CResult_FundingCreatedDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_err"))) TS_CResult_FundingCreatedDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_err"))) TS_CResult_FundingCreatedDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_FundingCreatedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingCreatedDecodeErrorZ), "LDKCResult_FundingCreatedDecodeErrorZ"); *ret_conv = CResult_FundingCreatedDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_is_ok"))) TS_CResult_FundingCreatedDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_FundingCreatedDecodeErrorZ* o_conv = (LDKCResult_FundingCreatedDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_is_ok"))) TS_CResult_FundingCreatedDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_FundingCreatedDecodeErrorZ* o_conv = (LDKCResult_FundingCreatedDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_FundingCreatedDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_free"))) TS_CResult_FundingCreatedDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_free"))) TS_CResult_FundingCreatedDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_FundingCreatedDecodeErrorZ _res_conv = *(LDKCResult_FundingCreatedDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_FundingCreatedDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_FundingCreatedDecodeErrorZ_clone_ptr(LDKCResult_FundingCreatedDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_FundingCreatedDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_clone_ptr"))) TS_CResult_FundingCreatedDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_FundingCreatedDecodeErrorZ* arg_conv = (LDKCResult_FundingCreatedDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_FundingCreatedDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_clone"))) TS_CResult_FundingCreatedDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_FundingCreatedDecodeErrorZ* orig_conv = (LDKCResult_FundingCreatedDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_clone"))) TS_CResult_FundingCreatedDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_FundingCreatedDecodeErrorZ* orig_conv = (LDKCResult_FundingCreatedDecodeErrorZ*)untag_ptr(orig); LDKCResult_FundingCreatedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingCreatedDecodeErrorZ), "LDKCResult_FundingCreatedDecodeErrorZ"); *ret_conv = CResult_FundingCreatedDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_ok"))) TS_CResult_FundingSignedDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_ok"))) TS_CResult_FundingSignedDecodeErrorZ_ok(uint64_t o) { LDKFundingSigned o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = FundingSigned_clone(&o_conv); LDKCResult_FundingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingSignedDecodeErrorZ), "LDKCResult_FundingSignedDecodeErrorZ"); *ret_conv = CResult_FundingSignedDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_err"))) TS_CResult_FundingSignedDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_err"))) TS_CResult_FundingSignedDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_FundingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingSignedDecodeErrorZ), "LDKCResult_FundingSignedDecodeErrorZ"); *ret_conv = CResult_FundingSignedDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_is_ok"))) TS_CResult_FundingSignedDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_FundingSignedDecodeErrorZ* o_conv = (LDKCResult_FundingSignedDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_is_ok"))) TS_CResult_FundingSignedDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_FundingSignedDecodeErrorZ* o_conv = (LDKCResult_FundingSignedDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_FundingSignedDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_free"))) TS_CResult_FundingSignedDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_free"))) TS_CResult_FundingSignedDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_FundingSignedDecodeErrorZ _res_conv = *(LDKCResult_FundingSignedDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_FundingSignedDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_FundingSignedDecodeErrorZ_clone_ptr(LDKCResult_FundingSignedDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_FundingSignedDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_clone_ptr"))) TS_CResult_FundingSignedDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_FundingSignedDecodeErrorZ* arg_conv = (LDKCResult_FundingSignedDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_FundingSignedDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_clone"))) TS_CResult_FundingSignedDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_FundingSignedDecodeErrorZ* orig_conv = (LDKCResult_FundingSignedDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_clone"))) TS_CResult_FundingSignedDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_FundingSignedDecodeErrorZ* orig_conv = (LDKCResult_FundingSignedDecodeErrorZ*)untag_ptr(orig); LDKCResult_FundingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingSignedDecodeErrorZ), "LDKCResult_FundingSignedDecodeErrorZ"); *ret_conv = CResult_FundingSignedDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelReadyDecodeErrorZ_ok"))) TS_CResult_ChannelReadyDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ChannelReadyDecodeErrorZ_ok"))) TS_CResult_ChannelReadyDecodeErrorZ_ok(uint64_t o) { LDKChannelReady o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ChannelReady_clone(&o_conv); LDKCResult_ChannelReadyDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelReadyDecodeErrorZ), "LDKCResult_ChannelReadyDecodeErrorZ"); *ret_conv = CResult_ChannelReadyDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelReadyDecodeErrorZ_err"))) TS_CResult_ChannelReadyDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ChannelReadyDecodeErrorZ_err"))) TS_CResult_ChannelReadyDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ChannelReadyDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelReadyDecodeErrorZ), "LDKCResult_ChannelReadyDecodeErrorZ"); *ret_conv = CResult_ChannelReadyDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ChannelReadyDecodeErrorZ_is_ok"))) TS_CResult_ChannelReadyDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ChannelReadyDecodeErrorZ* o_conv = (LDKCResult_ChannelReadyDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ChannelReadyDecodeErrorZ_is_ok"))) TS_CResult_ChannelReadyDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ChannelReadyDecodeErrorZ* o_conv = (LDKCResult_ChannelReadyDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ChannelReadyDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ChannelReadyDecodeErrorZ_free"))) TS_CResult_ChannelReadyDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ChannelReadyDecodeErrorZ_free"))) TS_CResult_ChannelReadyDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ChannelReadyDecodeErrorZ _res_conv = *(LDKCResult_ChannelReadyDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ChannelReadyDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ChannelReadyDecodeErrorZ_clone_ptr(LDKCResult_ChannelReadyDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_ChannelReadyDecodeErrorZ_clone_ptr(LDKCResult_ChannelReadyDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_ChannelReadyDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelReadyDecodeErrorZ), "LDKCResult_ChannelReadyDecodeErrorZ"); *ret_conv = CResult_ChannelReadyDecodeErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelReadyDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelReadyDecodeErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_ChannelReadyDecodeErrorZ* arg_conv = (LDKCResult_ChannelReadyDecodeErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_ChannelReadyDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ChannelReadyDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelReadyDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ChannelReadyDecodeErrorZ* arg_conv = (LDKCResult_ChannelReadyDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ChannelReadyDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ChannelReadyDecodeErrorZ_clone"))) TS_CResult_ChannelReadyDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ChannelReadyDecodeErrorZ* orig_conv = (LDKCResult_ChannelReadyDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelReadyDecodeErrorZ_clone"))) TS_CResult_ChannelReadyDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ChannelReadyDecodeErrorZ* orig_conv = (LDKCResult_ChannelReadyDecodeErrorZ*)untag_ptr(orig); LDKCResult_ChannelReadyDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelReadyDecodeErrorZ), "LDKCResult_ChannelReadyDecodeErrorZ"); *ret_conv = CResult_ChannelReadyDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_InitDecodeErrorZ_ok"))) TS_CResult_InitDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_InitDecodeErrorZ_ok"))) TS_CResult_InitDecodeErrorZ_ok(uint64_t o) { LDKInit o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = Init_clone(&o_conv); LDKCResult_InitDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitDecodeErrorZ), "LDKCResult_InitDecodeErrorZ"); *ret_conv = CResult_InitDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_InitDecodeErrorZ_err"))) TS_CResult_InitDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_InitDecodeErrorZ_err"))) TS_CResult_InitDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_InitDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitDecodeErrorZ), "LDKCResult_InitDecodeErrorZ"); *ret_conv = CResult_InitDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_InitDecodeErrorZ_is_ok"))) TS_CResult_InitDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_InitDecodeErrorZ* o_conv = (LDKCResult_InitDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_InitDecodeErrorZ_is_ok"))) TS_CResult_InitDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_InitDecodeErrorZ* o_conv = (LDKCResult_InitDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_InitDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_InitDecodeErrorZ_free"))) TS_CResult_InitDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_InitDecodeErrorZ_free"))) TS_CResult_InitDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_InitDecodeErrorZ _res_conv = *(LDKCResult_InitDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_InitDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_InitDecodeErrorZ_clone_ptr(LDKCResult_InitDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_InitDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_InitDecodeErrorZ_clone_ptr"))) TS_CResult_InitDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_InitDecodeErrorZ* arg_conv = (LDKCResult_InitDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_InitDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_InitDecodeErrorZ_clone"))) TS_CResult_InitDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_InitDecodeErrorZ* orig_conv = (LDKCResult_InitDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_InitDecodeErrorZ_clone"))) TS_CResult_InitDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_InitDecodeErrorZ* orig_conv = (LDKCResult_InitDecodeErrorZ*)untag_ptr(orig); LDKCResult_InitDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitDecodeErrorZ), "LDKCResult_InitDecodeErrorZ"); *ret_conv = CResult_InitDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_ok"))) TS_CResult_OpenChannelDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_ok"))) TS_CResult_OpenChannelDecodeErrorZ_ok(uint64_t o) { LDKOpenChannel o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = OpenChannel_clone(&o_conv); LDKCResult_OpenChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OpenChannelDecodeErrorZ), "LDKCResult_OpenChannelDecodeErrorZ"); *ret_conv = CResult_OpenChannelDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_err"))) TS_CResult_OpenChannelDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_err"))) TS_CResult_OpenChannelDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_OpenChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OpenChannelDecodeErrorZ), "LDKCResult_OpenChannelDecodeErrorZ"); *ret_conv = CResult_OpenChannelDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_is_ok"))) TS_CResult_OpenChannelDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_OpenChannelDecodeErrorZ* o_conv = (LDKCResult_OpenChannelDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_is_ok"))) TS_CResult_OpenChannelDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_OpenChannelDecodeErrorZ* o_conv = (LDKCResult_OpenChannelDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_OpenChannelDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_free"))) TS_CResult_OpenChannelDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_free"))) TS_CResult_OpenChannelDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_OpenChannelDecodeErrorZ _res_conv = *(LDKCResult_OpenChannelDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_OpenChannelDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_OpenChannelDecodeErrorZ_clone_ptr(LDKCResult_OpenChannelDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_OpenChannelDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_clone_ptr"))) TS_CResult_OpenChannelDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_OpenChannelDecodeErrorZ* arg_conv = (LDKCResult_OpenChannelDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_OpenChannelDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_clone"))) TS_CResult_OpenChannelDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_OpenChannelDecodeErrorZ* orig_conv = (LDKCResult_OpenChannelDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_clone"))) TS_CResult_OpenChannelDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_OpenChannelDecodeErrorZ* orig_conv = (LDKCResult_OpenChannelDecodeErrorZ*)untag_ptr(orig); LDKCResult_OpenChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OpenChannelDecodeErrorZ), "LDKCResult_OpenChannelDecodeErrorZ"); *ret_conv = CResult_OpenChannelDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_ok"))) TS_CResult_RevokeAndACKDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_ok"))) TS_CResult_RevokeAndACKDecodeErrorZ_ok(uint64_t o) { LDKRevokeAndACK o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = RevokeAndACK_clone(&o_conv); LDKCResult_RevokeAndACKDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RevokeAndACKDecodeErrorZ), "LDKCResult_RevokeAndACKDecodeErrorZ"); *ret_conv = CResult_RevokeAndACKDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_err"))) TS_CResult_RevokeAndACKDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_err"))) TS_CResult_RevokeAndACKDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_RevokeAndACKDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RevokeAndACKDecodeErrorZ), "LDKCResult_RevokeAndACKDecodeErrorZ"); *ret_conv = CResult_RevokeAndACKDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_is_ok"))) TS_CResult_RevokeAndACKDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_RevokeAndACKDecodeErrorZ* o_conv = (LDKCResult_RevokeAndACKDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_is_ok"))) TS_CResult_RevokeAndACKDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_RevokeAndACKDecodeErrorZ* o_conv = (LDKCResult_RevokeAndACKDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_RevokeAndACKDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_free"))) TS_CResult_RevokeAndACKDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_free"))) TS_CResult_RevokeAndACKDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_RevokeAndACKDecodeErrorZ _res_conv = *(LDKCResult_RevokeAndACKDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_RevokeAndACKDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_RevokeAndACKDecodeErrorZ_clone_ptr(LDKCResult_RevokeAndACKDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_RevokeAndACKDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_clone_ptr"))) TS_CResult_RevokeAndACKDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_RevokeAndACKDecodeErrorZ* arg_conv = (LDKCResult_RevokeAndACKDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_RevokeAndACKDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_clone"))) TS_CResult_RevokeAndACKDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_RevokeAndACKDecodeErrorZ* orig_conv = (LDKCResult_RevokeAndACKDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_clone"))) TS_CResult_RevokeAndACKDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_RevokeAndACKDecodeErrorZ* orig_conv = (LDKCResult_RevokeAndACKDecodeErrorZ*)untag_ptr(orig); LDKCResult_RevokeAndACKDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RevokeAndACKDecodeErrorZ), "LDKCResult_RevokeAndACKDecodeErrorZ"); *ret_conv = CResult_RevokeAndACKDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_ok"))) TS_CResult_ShutdownDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_ok"))) TS_CResult_ShutdownDecodeErrorZ_ok(uint64_t o) { LDKShutdown o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = Shutdown_clone(&o_conv); LDKCResult_ShutdownDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownDecodeErrorZ), "LDKCResult_ShutdownDecodeErrorZ"); *ret_conv = CResult_ShutdownDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_err"))) TS_CResult_ShutdownDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_err"))) TS_CResult_ShutdownDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ShutdownDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownDecodeErrorZ), "LDKCResult_ShutdownDecodeErrorZ"); *ret_conv = CResult_ShutdownDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_is_ok"))) TS_CResult_ShutdownDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ShutdownDecodeErrorZ* o_conv = (LDKCResult_ShutdownDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_is_ok"))) TS_CResult_ShutdownDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ShutdownDecodeErrorZ* o_conv = (LDKCResult_ShutdownDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ShutdownDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_free"))) TS_CResult_ShutdownDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_free"))) TS_CResult_ShutdownDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ShutdownDecodeErrorZ _res_conv = *(LDKCResult_ShutdownDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ShutdownDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ShutdownDecodeErrorZ_clone_ptr(LDKCResult_ShutdownDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_ShutdownDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_clone_ptr"))) TS_CResult_ShutdownDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ShutdownDecodeErrorZ* arg_conv = (LDKCResult_ShutdownDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ShutdownDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_clone"))) TS_CResult_ShutdownDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ShutdownDecodeErrorZ* orig_conv = (LDKCResult_ShutdownDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_clone"))) TS_CResult_ShutdownDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ShutdownDecodeErrorZ* orig_conv = (LDKCResult_ShutdownDecodeErrorZ*)untag_ptr(orig); LDKCResult_ShutdownDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownDecodeErrorZ), "LDKCResult_ShutdownDecodeErrorZ"); *ret_conv = CResult_ShutdownDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_ok"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_ok"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_ok(uint64_t o) { LDKUpdateFailHTLC o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = UpdateFailHTLC_clone(&o_conv); LDKCResult_UpdateFailHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailHTLCDecodeErrorZ), "LDKCResult_UpdateFailHTLCDecodeErrorZ"); *ret_conv = CResult_UpdateFailHTLCDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_err"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_err"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_UpdateFailHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailHTLCDecodeErrorZ), "LDKCResult_UpdateFailHTLCDecodeErrorZ"); *ret_conv = CResult_UpdateFailHTLCDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_is_ok"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_UpdateFailHTLCDecodeErrorZ* o_conv = (LDKCResult_UpdateFailHTLCDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_is_ok"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_UpdateFailHTLCDecodeErrorZ* o_conv = (LDKCResult_UpdateFailHTLCDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_UpdateFailHTLCDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_free"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_free"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_UpdateFailHTLCDecodeErrorZ _res_conv = *(LDKCResult_UpdateFailHTLCDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_UpdateFailHTLCDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_UpdateFailHTLCDecodeErrorZ_clone_ptr(LDKCResult_UpdateFailHTLCDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_UpdateFailHTLCDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_clone_ptr"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_UpdateFailHTLCDecodeErrorZ* arg_conv = (LDKCResult_UpdateFailHTLCDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_UpdateFailHTLCDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_clone"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_UpdateFailHTLCDecodeErrorZ* orig_conv = (LDKCResult_UpdateFailHTLCDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_clone"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_UpdateFailHTLCDecodeErrorZ* orig_conv = (LDKCResult_UpdateFailHTLCDecodeErrorZ*)untag_ptr(orig); LDKCResult_UpdateFailHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailHTLCDecodeErrorZ), "LDKCResult_UpdateFailHTLCDecodeErrorZ"); *ret_conv = CResult_UpdateFailHTLCDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_ok"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_ok"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_ok(uint64_t o) { LDKUpdateFailMalformedHTLC o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = UpdateFailMalformedHTLC_clone(&o_conv); LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ), "LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ"); *ret_conv = CResult_UpdateFailMalformedHTLCDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_err"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_err"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ), "LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ"); *ret_conv = CResult_UpdateFailMalformedHTLCDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_is_ok"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* o_conv = (LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_is_ok"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* o_conv = (LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_UpdateFailMalformedHTLCDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_free"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_free"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ _res_conv = *(LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_UpdateFailMalformedHTLCDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone_ptr(LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone_ptr"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* arg_conv = (LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* orig_conv = (LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* orig_conv = (LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ*)untag_ptr(orig); LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ), "LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ"); *ret_conv = CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_ok"))) TS_CResult_UpdateFeeDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_ok"))) TS_CResult_UpdateFeeDecodeErrorZ_ok(uint64_t o) { LDKUpdateFee o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = UpdateFee_clone(&o_conv); LDKCResult_UpdateFeeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFeeDecodeErrorZ), "LDKCResult_UpdateFeeDecodeErrorZ"); *ret_conv = CResult_UpdateFeeDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_err"))) TS_CResult_UpdateFeeDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_err"))) TS_CResult_UpdateFeeDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_UpdateFeeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFeeDecodeErrorZ), "LDKCResult_UpdateFeeDecodeErrorZ"); *ret_conv = CResult_UpdateFeeDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_is_ok"))) TS_CResult_UpdateFeeDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_UpdateFeeDecodeErrorZ* o_conv = (LDKCResult_UpdateFeeDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_is_ok"))) TS_CResult_UpdateFeeDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_UpdateFeeDecodeErrorZ* o_conv = (LDKCResult_UpdateFeeDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_UpdateFeeDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_free"))) TS_CResult_UpdateFeeDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_free"))) TS_CResult_UpdateFeeDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_UpdateFeeDecodeErrorZ _res_conv = *(LDKCResult_UpdateFeeDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_UpdateFeeDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_UpdateFeeDecodeErrorZ_clone_ptr(LDKCResult_UpdateFeeDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_UpdateFeeDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_clone_ptr"))) TS_CResult_UpdateFeeDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_UpdateFeeDecodeErrorZ* arg_conv = (LDKCResult_UpdateFeeDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_UpdateFeeDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_clone"))) TS_CResult_UpdateFeeDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_UpdateFeeDecodeErrorZ* orig_conv = (LDKCResult_UpdateFeeDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_clone"))) TS_CResult_UpdateFeeDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_UpdateFeeDecodeErrorZ* orig_conv = (LDKCResult_UpdateFeeDecodeErrorZ*)untag_ptr(orig); LDKCResult_UpdateFeeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFeeDecodeErrorZ), "LDKCResult_UpdateFeeDecodeErrorZ"); *ret_conv = CResult_UpdateFeeDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_ok"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_ok"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_ok(uint64_t o) { LDKUpdateFulfillHTLC o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = UpdateFulfillHTLC_clone(&o_conv); LDKCResult_UpdateFulfillHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFulfillHTLCDecodeErrorZ), "LDKCResult_UpdateFulfillHTLCDecodeErrorZ"); *ret_conv = CResult_UpdateFulfillHTLCDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_err"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_err"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_UpdateFulfillHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFulfillHTLCDecodeErrorZ), "LDKCResult_UpdateFulfillHTLCDecodeErrorZ"); *ret_conv = CResult_UpdateFulfillHTLCDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_is_ok"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_UpdateFulfillHTLCDecodeErrorZ* o_conv = (LDKCResult_UpdateFulfillHTLCDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_is_ok"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_UpdateFulfillHTLCDecodeErrorZ* o_conv = (LDKCResult_UpdateFulfillHTLCDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_UpdateFulfillHTLCDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_free"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_free"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_UpdateFulfillHTLCDecodeErrorZ _res_conv = *(LDKCResult_UpdateFulfillHTLCDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_UpdateFulfillHTLCDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_UpdateFulfillHTLCDecodeErrorZ_clone_ptr(LDKCResult_UpdateFulfillHTLCDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_UpdateFulfillHTLCDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_clone_ptr"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_UpdateFulfillHTLCDecodeErrorZ* arg_conv = (LDKCResult_UpdateFulfillHTLCDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_UpdateFulfillHTLCDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_clone"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_UpdateFulfillHTLCDecodeErrorZ* orig_conv = (LDKCResult_UpdateFulfillHTLCDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_clone"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_UpdateFulfillHTLCDecodeErrorZ* orig_conv = (LDKCResult_UpdateFulfillHTLCDecodeErrorZ*)untag_ptr(orig); LDKCResult_UpdateFulfillHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFulfillHTLCDecodeErrorZ), "LDKCResult_UpdateFulfillHTLCDecodeErrorZ"); *ret_conv = CResult_UpdateFulfillHTLCDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_ok"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_ok"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_ok(uint64_t o) { LDKUpdateAddHTLC o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = UpdateAddHTLC_clone(&o_conv); LDKCResult_UpdateAddHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateAddHTLCDecodeErrorZ), "LDKCResult_UpdateAddHTLCDecodeErrorZ"); *ret_conv = CResult_UpdateAddHTLCDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_err"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_err"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_UpdateAddHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateAddHTLCDecodeErrorZ), "LDKCResult_UpdateAddHTLCDecodeErrorZ"); *ret_conv = CResult_UpdateAddHTLCDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_is_ok"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_UpdateAddHTLCDecodeErrorZ* o_conv = (LDKCResult_UpdateAddHTLCDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_is_ok"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_UpdateAddHTLCDecodeErrorZ* o_conv = (LDKCResult_UpdateAddHTLCDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_UpdateAddHTLCDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_free"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_free"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_UpdateAddHTLCDecodeErrorZ _res_conv = *(LDKCResult_UpdateAddHTLCDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_UpdateAddHTLCDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_UpdateAddHTLCDecodeErrorZ_clone_ptr(LDKCResult_UpdateAddHTLCDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_UpdateAddHTLCDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_clone_ptr"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_UpdateAddHTLCDecodeErrorZ* arg_conv = (LDKCResult_UpdateAddHTLCDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_UpdateAddHTLCDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_clone"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_UpdateAddHTLCDecodeErrorZ* orig_conv = (LDKCResult_UpdateAddHTLCDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_clone"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_UpdateAddHTLCDecodeErrorZ* orig_conv = (LDKCResult_UpdateAddHTLCDecodeErrorZ*)untag_ptr(orig); LDKCResult_UpdateAddHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateAddHTLCDecodeErrorZ), "LDKCResult_UpdateAddHTLCDecodeErrorZ"); *ret_conv = CResult_UpdateAddHTLCDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PingDecodeErrorZ_ok"))) TS_CResult_PingDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_PingDecodeErrorZ_ok"))) TS_CResult_PingDecodeErrorZ_ok(uint64_t o) { LDKPing o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = Ping_clone(&o_conv); LDKCResult_PingDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PingDecodeErrorZ), "LDKCResult_PingDecodeErrorZ"); *ret_conv = CResult_PingDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PingDecodeErrorZ_err"))) TS_CResult_PingDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_PingDecodeErrorZ_err"))) TS_CResult_PingDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_PingDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PingDecodeErrorZ), "LDKCResult_PingDecodeErrorZ"); *ret_conv = CResult_PingDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_PingDecodeErrorZ_is_ok"))) TS_CResult_PingDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_PingDecodeErrorZ* o_conv = (LDKCResult_PingDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_PingDecodeErrorZ_is_ok"))) TS_CResult_PingDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_PingDecodeErrorZ* o_conv = (LDKCResult_PingDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_PingDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_PingDecodeErrorZ_free"))) TS_CResult_PingDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_PingDecodeErrorZ_free"))) TS_CResult_PingDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_PingDecodeErrorZ _res_conv = *(LDKCResult_PingDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_PingDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_PingDecodeErrorZ_clone_ptr(LDKCResult_PingDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_PingDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_PingDecodeErrorZ_clone_ptr"))) TS_CResult_PingDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_PingDecodeErrorZ* arg_conv = (LDKCResult_PingDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_PingDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_PingDecodeErrorZ_clone"))) TS_CResult_PingDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_PingDecodeErrorZ* orig_conv = (LDKCResult_PingDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_PingDecodeErrorZ_clone"))) TS_CResult_PingDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_PingDecodeErrorZ* orig_conv = (LDKCResult_PingDecodeErrorZ*)untag_ptr(orig); LDKCResult_PingDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PingDecodeErrorZ), "LDKCResult_PingDecodeErrorZ"); *ret_conv = CResult_PingDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PongDecodeErrorZ_ok"))) TS_CResult_PongDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_PongDecodeErrorZ_ok"))) TS_CResult_PongDecodeErrorZ_ok(uint64_t o) { LDKPong o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = Pong_clone(&o_conv); LDKCResult_PongDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PongDecodeErrorZ), "LDKCResult_PongDecodeErrorZ"); *ret_conv = CResult_PongDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_PongDecodeErrorZ_err"))) TS_CResult_PongDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_PongDecodeErrorZ_err"))) TS_CResult_PongDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_PongDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PongDecodeErrorZ), "LDKCResult_PongDecodeErrorZ"); *ret_conv = CResult_PongDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_PongDecodeErrorZ_is_ok"))) TS_CResult_PongDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_PongDecodeErrorZ* o_conv = (LDKCResult_PongDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_PongDecodeErrorZ_is_ok"))) TS_CResult_PongDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_PongDecodeErrorZ* o_conv = (LDKCResult_PongDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_PongDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_PongDecodeErrorZ_free"))) TS_CResult_PongDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_PongDecodeErrorZ_free"))) TS_CResult_PongDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_PongDecodeErrorZ _res_conv = *(LDKCResult_PongDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_PongDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_PongDecodeErrorZ_clone_ptr(LDKCResult_PongDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_PongDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_PongDecodeErrorZ_clone_ptr"))) TS_CResult_PongDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_PongDecodeErrorZ* arg_conv = (LDKCResult_PongDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_PongDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_PongDecodeErrorZ_clone"))) TS_CResult_PongDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_PongDecodeErrorZ* orig_conv = (LDKCResult_PongDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_PongDecodeErrorZ_clone"))) TS_CResult_PongDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_PongDecodeErrorZ* orig_conv = (LDKCResult_PongDecodeErrorZ*)untag_ptr(orig); LDKCResult_PongDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PongDecodeErrorZ), "LDKCResult_PongDecodeErrorZ"); *ret_conv = CResult_PongDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_ok"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_ok"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_ok(uint64_t o) { LDKUnsignedChannelAnnouncement o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = UnsignedChannelAnnouncement_clone(&o_conv); LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ), "LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ"); *ret_conv = CResult_UnsignedChannelAnnouncementDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_err"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_err"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ), "LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ"); *ret_conv = CResult_UnsignedChannelAnnouncementDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_is_ok"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* o_conv = (LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_is_ok"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* o_conv = (LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_UnsignedChannelAnnouncementDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_free"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_free"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ _res_conv = *(LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_UnsignedChannelAnnouncementDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone_ptr(LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone_ptr"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* arg_conv = (LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* orig_conv = (LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* orig_conv = (LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ*)untag_ptr(orig); LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ), "LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ"); *ret_conv = CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_ok"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_ok"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_ok(uint64_t o) { LDKChannelAnnouncement o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ChannelAnnouncement_clone(&o_conv); LDKCResult_ChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelAnnouncementDecodeErrorZ), "LDKCResult_ChannelAnnouncementDecodeErrorZ"); *ret_conv = CResult_ChannelAnnouncementDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_err"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_err"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelAnnouncementDecodeErrorZ), "LDKCResult_ChannelAnnouncementDecodeErrorZ"); *ret_conv = CResult_ChannelAnnouncementDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_is_ok"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ChannelAnnouncementDecodeErrorZ* o_conv = (LDKCResult_ChannelAnnouncementDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_is_ok"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ChannelAnnouncementDecodeErrorZ* o_conv = (LDKCResult_ChannelAnnouncementDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ChannelAnnouncementDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_free"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_free"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ChannelAnnouncementDecodeErrorZ _res_conv = *(LDKCResult_ChannelAnnouncementDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ChannelAnnouncementDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ChannelAnnouncementDecodeErrorZ_clone_ptr(LDKCResult_ChannelAnnouncementDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_ChannelAnnouncementDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ChannelAnnouncementDecodeErrorZ* arg_conv = (LDKCResult_ChannelAnnouncementDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ChannelAnnouncementDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_clone"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ChannelAnnouncementDecodeErrorZ* orig_conv = (LDKCResult_ChannelAnnouncementDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_clone"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ChannelAnnouncementDecodeErrorZ* orig_conv = (LDKCResult_ChannelAnnouncementDecodeErrorZ*)untag_ptr(orig); LDKCResult_ChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelAnnouncementDecodeErrorZ), "LDKCResult_ChannelAnnouncementDecodeErrorZ"); *ret_conv = CResult_ChannelAnnouncementDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_ok"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_ok"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_ok(uint64_t o) { LDKUnsignedChannelUpdate o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = UnsignedChannelUpdate_clone(&o_conv); LDKCResult_UnsignedChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelUpdateDecodeErrorZ), "LDKCResult_UnsignedChannelUpdateDecodeErrorZ"); *ret_conv = CResult_UnsignedChannelUpdateDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_err"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_err"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_UnsignedChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelUpdateDecodeErrorZ), "LDKCResult_UnsignedChannelUpdateDecodeErrorZ"); *ret_conv = CResult_UnsignedChannelUpdateDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_is_ok"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_UnsignedChannelUpdateDecodeErrorZ* o_conv = (LDKCResult_UnsignedChannelUpdateDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_is_ok"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_UnsignedChannelUpdateDecodeErrorZ* o_conv = (LDKCResult_UnsignedChannelUpdateDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_UnsignedChannelUpdateDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_free"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_free"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_UnsignedChannelUpdateDecodeErrorZ _res_conv = *(LDKCResult_UnsignedChannelUpdateDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_UnsignedChannelUpdateDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_UnsignedChannelUpdateDecodeErrorZ_clone_ptr(LDKCResult_UnsignedChannelUpdateDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_UnsignedChannelUpdateDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_clone_ptr"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_UnsignedChannelUpdateDecodeErrorZ* arg_conv = (LDKCResult_UnsignedChannelUpdateDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_UnsignedChannelUpdateDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_clone"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_UnsignedChannelUpdateDecodeErrorZ* orig_conv = (LDKCResult_UnsignedChannelUpdateDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_clone"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_UnsignedChannelUpdateDecodeErrorZ* orig_conv = (LDKCResult_UnsignedChannelUpdateDecodeErrorZ*)untag_ptr(orig); LDKCResult_UnsignedChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelUpdateDecodeErrorZ), "LDKCResult_UnsignedChannelUpdateDecodeErrorZ"); *ret_conv = CResult_UnsignedChannelUpdateDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_ok"))) TS_CResult_ChannelUpdateDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_ok"))) TS_CResult_ChannelUpdateDecodeErrorZ_ok(uint64_t o) { LDKChannelUpdate o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ChannelUpdate_clone(&o_conv); LDKCResult_ChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateDecodeErrorZ), "LDKCResult_ChannelUpdateDecodeErrorZ"); *ret_conv = CResult_ChannelUpdateDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_err"))) TS_CResult_ChannelUpdateDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_err"))) TS_CResult_ChannelUpdateDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateDecodeErrorZ), "LDKCResult_ChannelUpdateDecodeErrorZ"); *ret_conv = CResult_ChannelUpdateDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_is_ok"))) TS_CResult_ChannelUpdateDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ChannelUpdateDecodeErrorZ* o_conv = (LDKCResult_ChannelUpdateDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_is_ok"))) TS_CResult_ChannelUpdateDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ChannelUpdateDecodeErrorZ* o_conv = (LDKCResult_ChannelUpdateDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ChannelUpdateDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_free"))) TS_CResult_ChannelUpdateDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_free"))) TS_CResult_ChannelUpdateDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ChannelUpdateDecodeErrorZ _res_conv = *(LDKCResult_ChannelUpdateDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ChannelUpdateDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ChannelUpdateDecodeErrorZ_clone_ptr(LDKCResult_ChannelUpdateDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_ChannelUpdateDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelUpdateDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ChannelUpdateDecodeErrorZ* arg_conv = (LDKCResult_ChannelUpdateDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ChannelUpdateDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_clone"))) TS_CResult_ChannelUpdateDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ChannelUpdateDecodeErrorZ* orig_conv = (LDKCResult_ChannelUpdateDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_clone"))) TS_CResult_ChannelUpdateDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ChannelUpdateDecodeErrorZ* orig_conv = (LDKCResult_ChannelUpdateDecodeErrorZ*)untag_ptr(orig); LDKCResult_ChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateDecodeErrorZ), "LDKCResult_ChannelUpdateDecodeErrorZ"); *ret_conv = CResult_ChannelUpdateDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_ok"))) TS_CResult_ErrorMessageDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_ok"))) TS_CResult_ErrorMessageDecodeErrorZ_ok(uint64_t o) { LDKErrorMessage o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ErrorMessage_clone(&o_conv); LDKCResult_ErrorMessageDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ErrorMessageDecodeErrorZ), "LDKCResult_ErrorMessageDecodeErrorZ"); *ret_conv = CResult_ErrorMessageDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_err"))) TS_CResult_ErrorMessageDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_err"))) TS_CResult_ErrorMessageDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ErrorMessageDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ErrorMessageDecodeErrorZ), "LDKCResult_ErrorMessageDecodeErrorZ"); *ret_conv = CResult_ErrorMessageDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_is_ok"))) TS_CResult_ErrorMessageDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ErrorMessageDecodeErrorZ* o_conv = (LDKCResult_ErrorMessageDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_is_ok"))) TS_CResult_ErrorMessageDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ErrorMessageDecodeErrorZ* o_conv = (LDKCResult_ErrorMessageDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ErrorMessageDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_free"))) TS_CResult_ErrorMessageDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_free"))) TS_CResult_ErrorMessageDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ErrorMessageDecodeErrorZ _res_conv = *(LDKCResult_ErrorMessageDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ErrorMessageDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ErrorMessageDecodeErrorZ_clone_ptr(LDKCResult_ErrorMessageDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_ErrorMessageDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_clone_ptr"))) TS_CResult_ErrorMessageDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ErrorMessageDecodeErrorZ* arg_conv = (LDKCResult_ErrorMessageDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ErrorMessageDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_clone"))) TS_CResult_ErrorMessageDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ErrorMessageDecodeErrorZ* orig_conv = (LDKCResult_ErrorMessageDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_clone"))) TS_CResult_ErrorMessageDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ErrorMessageDecodeErrorZ* orig_conv = (LDKCResult_ErrorMessageDecodeErrorZ*)untag_ptr(orig); LDKCResult_ErrorMessageDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ErrorMessageDecodeErrorZ), "LDKCResult_ErrorMessageDecodeErrorZ"); *ret_conv = CResult_ErrorMessageDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_ok"))) TS_CResult_WarningMessageDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_ok"))) TS_CResult_WarningMessageDecodeErrorZ_ok(uint64_t o) { LDKWarningMessage o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = WarningMessage_clone(&o_conv); LDKCResult_WarningMessageDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_WarningMessageDecodeErrorZ), "LDKCResult_WarningMessageDecodeErrorZ"); *ret_conv = CResult_WarningMessageDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_err"))) TS_CResult_WarningMessageDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_err"))) TS_CResult_WarningMessageDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_WarningMessageDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_WarningMessageDecodeErrorZ), "LDKCResult_WarningMessageDecodeErrorZ"); *ret_conv = CResult_WarningMessageDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_is_ok"))) TS_CResult_WarningMessageDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_WarningMessageDecodeErrorZ* o_conv = (LDKCResult_WarningMessageDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_is_ok"))) TS_CResult_WarningMessageDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_WarningMessageDecodeErrorZ* o_conv = (LDKCResult_WarningMessageDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_WarningMessageDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_free"))) TS_CResult_WarningMessageDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_free"))) TS_CResult_WarningMessageDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_WarningMessageDecodeErrorZ _res_conv = *(LDKCResult_WarningMessageDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_WarningMessageDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_WarningMessageDecodeErrorZ_clone_ptr(LDKCResult_WarningMessageDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_WarningMessageDecodeErrorZ_clone_ptr(LDKCResult_WarningMessageDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_WarningMessageDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_WarningMessageDecodeErrorZ), "LDKCResult_WarningMessageDecodeErrorZ"); *ret_conv = CResult_WarningMessageDecodeErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_clone_ptr"))) TS_CResult_WarningMessageDecodeErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_WarningMessageDecodeErrorZ* arg_conv = (LDKCResult_WarningMessageDecodeErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_WarningMessageDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_clone_ptr"))) TS_CResult_WarningMessageDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_WarningMessageDecodeErrorZ* arg_conv = (LDKCResult_WarningMessageDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_WarningMessageDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_clone"))) TS_CResult_WarningMessageDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_WarningMessageDecodeErrorZ* orig_conv = (LDKCResult_WarningMessageDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_clone"))) TS_CResult_WarningMessageDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_WarningMessageDecodeErrorZ* orig_conv = (LDKCResult_WarningMessageDecodeErrorZ*)untag_ptr(orig); LDKCResult_WarningMessageDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_WarningMessageDecodeErrorZ), "LDKCResult_WarningMessageDecodeErrorZ"); *ret_conv = CResult_WarningMessageDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_ok"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_ok"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_ok(uint64_t o) { LDKUnsignedNodeAnnouncement o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = UnsignedNodeAnnouncement_clone(&o_conv); LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ), "LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ"); *ret_conv = CResult_UnsignedNodeAnnouncementDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_err"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_err"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ), "LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ"); *ret_conv = CResult_UnsignedNodeAnnouncementDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_is_ok"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* o_conv = (LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_is_ok"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* o_conv = (LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_UnsignedNodeAnnouncementDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_free"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_free"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ _res_conv = *(LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_UnsignedNodeAnnouncementDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone_ptr(LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone_ptr"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* arg_conv = (LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* orig_conv = (LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* orig_conv = (LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ*)untag_ptr(orig); LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ), "LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ"); *ret_conv = CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_ok"))) TS_CResult_NodeAnnouncementDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_ok"))) TS_CResult_NodeAnnouncementDecodeErrorZ_ok(uint64_t o) { LDKNodeAnnouncement o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = NodeAnnouncement_clone(&o_conv); LDKCResult_NodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementDecodeErrorZ), "LDKCResult_NodeAnnouncementDecodeErrorZ"); *ret_conv = CResult_NodeAnnouncementDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_err"))) TS_CResult_NodeAnnouncementDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_err"))) TS_CResult_NodeAnnouncementDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_NodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementDecodeErrorZ), "LDKCResult_NodeAnnouncementDecodeErrorZ"); *ret_conv = CResult_NodeAnnouncementDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_is_ok"))) TS_CResult_NodeAnnouncementDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_NodeAnnouncementDecodeErrorZ* o_conv = (LDKCResult_NodeAnnouncementDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_is_ok"))) TS_CResult_NodeAnnouncementDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_NodeAnnouncementDecodeErrorZ* o_conv = (LDKCResult_NodeAnnouncementDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_NodeAnnouncementDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_free"))) TS_CResult_NodeAnnouncementDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_free"))) TS_CResult_NodeAnnouncementDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_NodeAnnouncementDecodeErrorZ _res_conv = *(LDKCResult_NodeAnnouncementDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_NodeAnnouncementDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_NodeAnnouncementDecodeErrorZ_clone_ptr(LDKCResult_NodeAnnouncementDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_NodeAnnouncementDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_clone_ptr"))) TS_CResult_NodeAnnouncementDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_NodeAnnouncementDecodeErrorZ* arg_conv = (LDKCResult_NodeAnnouncementDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_NodeAnnouncementDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_clone"))) TS_CResult_NodeAnnouncementDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_NodeAnnouncementDecodeErrorZ* orig_conv = (LDKCResult_NodeAnnouncementDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_clone"))) TS_CResult_NodeAnnouncementDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_NodeAnnouncementDecodeErrorZ* orig_conv = (LDKCResult_NodeAnnouncementDecodeErrorZ*)untag_ptr(orig); LDKCResult_NodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementDecodeErrorZ), "LDKCResult_NodeAnnouncementDecodeErrorZ"); *ret_conv = CResult_NodeAnnouncementDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_ok"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_ok"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_ok(uint64_t o) { LDKQueryShortChannelIds o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = QueryShortChannelIds_clone(&o_conv); LDKCResult_QueryShortChannelIdsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryShortChannelIdsDecodeErrorZ), "LDKCResult_QueryShortChannelIdsDecodeErrorZ"); *ret_conv = CResult_QueryShortChannelIdsDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_err"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_err"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_QueryShortChannelIdsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryShortChannelIdsDecodeErrorZ), "LDKCResult_QueryShortChannelIdsDecodeErrorZ"); *ret_conv = CResult_QueryShortChannelIdsDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_is_ok"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_QueryShortChannelIdsDecodeErrorZ* o_conv = (LDKCResult_QueryShortChannelIdsDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_is_ok"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_QueryShortChannelIdsDecodeErrorZ* o_conv = (LDKCResult_QueryShortChannelIdsDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_QueryShortChannelIdsDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_free"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_free"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_QueryShortChannelIdsDecodeErrorZ _res_conv = *(LDKCResult_QueryShortChannelIdsDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_QueryShortChannelIdsDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_QueryShortChannelIdsDecodeErrorZ_clone_ptr(LDKCResult_QueryShortChannelIdsDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_QueryShortChannelIdsDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_clone_ptr"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_QueryShortChannelIdsDecodeErrorZ* arg_conv = (LDKCResult_QueryShortChannelIdsDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_QueryShortChannelIdsDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_clone"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_QueryShortChannelIdsDecodeErrorZ* orig_conv = (LDKCResult_QueryShortChannelIdsDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_clone"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_QueryShortChannelIdsDecodeErrorZ* orig_conv = (LDKCResult_QueryShortChannelIdsDecodeErrorZ*)untag_ptr(orig); LDKCResult_QueryShortChannelIdsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryShortChannelIdsDecodeErrorZ), "LDKCResult_QueryShortChannelIdsDecodeErrorZ"); *ret_conv = CResult_QueryShortChannelIdsDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_ok"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_ok"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_ok(uint64_t o) { LDKReplyShortChannelIdsEnd o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ReplyShortChannelIdsEnd_clone(&o_conv); LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ), "LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ"); *ret_conv = CResult_ReplyShortChannelIdsEndDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_err"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_err"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ), "LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ"); *ret_conv = CResult_ReplyShortChannelIdsEndDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_is_ok"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* o_conv = (LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_is_ok"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* o_conv = (LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ReplyShortChannelIdsEndDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_free"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_free"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ _res_conv = *(LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ReplyShortChannelIdsEndDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone_ptr(LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone_ptr"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* arg_conv = (LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* orig_conv = (LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* orig_conv = (LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ*)untag_ptr(orig); LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ), "LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ"); *ret_conv = CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_ok"))) TS_CResult_QueryChannelRangeDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_ok"))) TS_CResult_QueryChannelRangeDecodeErrorZ_ok(uint64_t o) { LDKQueryChannelRange o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = QueryChannelRange_clone(&o_conv); LDKCResult_QueryChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryChannelRangeDecodeErrorZ), "LDKCResult_QueryChannelRangeDecodeErrorZ"); *ret_conv = CResult_QueryChannelRangeDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_err"))) TS_CResult_QueryChannelRangeDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_err"))) TS_CResult_QueryChannelRangeDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_QueryChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryChannelRangeDecodeErrorZ), "LDKCResult_QueryChannelRangeDecodeErrorZ"); *ret_conv = CResult_QueryChannelRangeDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_is_ok"))) TS_CResult_QueryChannelRangeDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_QueryChannelRangeDecodeErrorZ* o_conv = (LDKCResult_QueryChannelRangeDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_is_ok"))) TS_CResult_QueryChannelRangeDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_QueryChannelRangeDecodeErrorZ* o_conv = (LDKCResult_QueryChannelRangeDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_QueryChannelRangeDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_free"))) TS_CResult_QueryChannelRangeDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_free"))) TS_CResult_QueryChannelRangeDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_QueryChannelRangeDecodeErrorZ _res_conv = *(LDKCResult_QueryChannelRangeDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_QueryChannelRangeDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_QueryChannelRangeDecodeErrorZ_clone_ptr(LDKCResult_QueryChannelRangeDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_QueryChannelRangeDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_clone_ptr"))) TS_CResult_QueryChannelRangeDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_QueryChannelRangeDecodeErrorZ* arg_conv = (LDKCResult_QueryChannelRangeDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_QueryChannelRangeDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_clone"))) TS_CResult_QueryChannelRangeDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_QueryChannelRangeDecodeErrorZ* orig_conv = (LDKCResult_QueryChannelRangeDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_clone"))) TS_CResult_QueryChannelRangeDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_QueryChannelRangeDecodeErrorZ* orig_conv = (LDKCResult_QueryChannelRangeDecodeErrorZ*)untag_ptr(orig); LDKCResult_QueryChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryChannelRangeDecodeErrorZ), "LDKCResult_QueryChannelRangeDecodeErrorZ"); *ret_conv = CResult_QueryChannelRangeDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_ok"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_ok"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_ok(uint64_t o) { LDKReplyChannelRange o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = ReplyChannelRange_clone(&o_conv); LDKCResult_ReplyChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyChannelRangeDecodeErrorZ), "LDKCResult_ReplyChannelRangeDecodeErrorZ"); *ret_conv = CResult_ReplyChannelRangeDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_err"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_err"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_ReplyChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyChannelRangeDecodeErrorZ), "LDKCResult_ReplyChannelRangeDecodeErrorZ"); *ret_conv = CResult_ReplyChannelRangeDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_is_ok"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_ReplyChannelRangeDecodeErrorZ* o_conv = (LDKCResult_ReplyChannelRangeDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_is_ok"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_ReplyChannelRangeDecodeErrorZ* o_conv = (LDKCResult_ReplyChannelRangeDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_ReplyChannelRangeDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_free"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_free"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_ReplyChannelRangeDecodeErrorZ _res_conv = *(LDKCResult_ReplyChannelRangeDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_ReplyChannelRangeDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_ReplyChannelRangeDecodeErrorZ_clone_ptr(LDKCResult_ReplyChannelRangeDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_ReplyChannelRangeDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_clone_ptr"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_ReplyChannelRangeDecodeErrorZ* arg_conv = (LDKCResult_ReplyChannelRangeDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_ReplyChannelRangeDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_clone"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_ReplyChannelRangeDecodeErrorZ* orig_conv = (LDKCResult_ReplyChannelRangeDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_clone"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_ReplyChannelRangeDecodeErrorZ* orig_conv = (LDKCResult_ReplyChannelRangeDecodeErrorZ*)untag_ptr(orig); LDKCResult_ReplyChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyChannelRangeDecodeErrorZ), "LDKCResult_ReplyChannelRangeDecodeErrorZ"); *ret_conv = CResult_ReplyChannelRangeDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_ok"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_ok"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_ok(uint64_t o) { LDKGossipTimestampFilter o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = GossipTimestampFilter_clone(&o_conv); LDKCResult_GossipTimestampFilterDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_GossipTimestampFilterDecodeErrorZ), "LDKCResult_GossipTimestampFilterDecodeErrorZ"); *ret_conv = CResult_GossipTimestampFilterDecodeErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_err"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_err(uint32_t e) { +uint64_t __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_err"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_err(uint64_t e) { LDKDecodeError e_conv; - e_conv.inner = (void*)(e & (~1)); - e_conv.is_owned = (e & 1) || (e == 0); + e_conv.inner = untag_ptr(e); + e_conv.is_owned = ptr_is_owned(e); CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); e_conv = DecodeError_clone(&e_conv); LDKCResult_GossipTimestampFilterDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_GossipTimestampFilterDecodeErrorZ), "LDKCResult_GossipTimestampFilterDecodeErrorZ"); *ret_conv = CResult_GossipTimestampFilterDecodeErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_is_ok"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_is_ok(uint32_t o) { - LDKCResult_GossipTimestampFilterDecodeErrorZ* o_conv = (LDKCResult_GossipTimestampFilterDecodeErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_is_ok"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_is_ok(uint64_t o) { + LDKCResult_GossipTimestampFilterDecodeErrorZ* o_conv = (LDKCResult_GossipTimestampFilterDecodeErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_GossipTimestampFilterDecodeErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_free"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_free"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_GossipTimestampFilterDecodeErrorZ _res_conv = *(LDKCResult_GossipTimestampFilterDecodeErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_GossipTimestampFilterDecodeErrorZ_free(_res_conv); } -static inline uintptr_t CResult_GossipTimestampFilterDecodeErrorZ_clone_ptr(LDKCResult_GossipTimestampFilterDecodeErrorZ *NONNULL_PTR arg) { +static inline uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_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); - uint32_t ret_conv = CResult_GossipTimestampFilterDecodeErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_clone_ptr"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_GossipTimestampFilterDecodeErrorZ* arg_conv = (LDKCResult_GossipTimestampFilterDecodeErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_GossipTimestampFilterDecodeErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_clone"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_clone(uint32_t orig) { - LDKCResult_GossipTimestampFilterDecodeErrorZ* orig_conv = (LDKCResult_GossipTimestampFilterDecodeErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_clone"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_clone(uint64_t orig) { + LDKCResult_GossipTimestampFilterDecodeErrorZ* orig_conv = (LDKCResult_GossipTimestampFilterDecodeErrorZ*)untag_ptr(orig); LDKCResult_GossipTimestampFilterDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_GossipTimestampFilterDecodeErrorZ), "LDKCResult_GossipTimestampFilterDecodeErrorZ"); *ret_conv = CResult_GossipTimestampFilterDecodeErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_ok"))) TS_CResult_InvoiceSignOrCreationErrorZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_ok"))) TS_CResult_InvoiceSignOrCreationErrorZ_ok(uint64_t o) { LDKInvoice o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); o_conv = Invoice_clone(&o_conv); LDKCResult_InvoiceSignOrCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceSignOrCreationErrorZ), "LDKCResult_InvoiceSignOrCreationErrorZ"); *ret_conv = CResult_InvoiceSignOrCreationErrorZ_ok(o_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_err"))) TS_CResult_InvoiceSignOrCreationErrorZ_err(uint32_t e) { - void* e_ptr = (void*)(((uintptr_t)e) & ~1); +uint64_t __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_err"))) TS_CResult_InvoiceSignOrCreationErrorZ_err(uint64_t e) { + void* e_ptr = untag_ptr(e); CHECK_ACCESS(e_ptr); LDKSignOrCreationError e_conv = *(LDKSignOrCreationError*)(e_ptr); - e_conv = SignOrCreationError_clone((LDKSignOrCreationError*)(((uintptr_t)e) & ~1)); + e_conv = SignOrCreationError_clone((LDKSignOrCreationError*)untag_ptr(e)); LDKCResult_InvoiceSignOrCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceSignOrCreationErrorZ), "LDKCResult_InvoiceSignOrCreationErrorZ"); *ret_conv = CResult_InvoiceSignOrCreationErrorZ_err(e_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_is_ok"))) TS_CResult_InvoiceSignOrCreationErrorZ_is_ok(uint32_t o) { - LDKCResult_InvoiceSignOrCreationErrorZ* o_conv = (LDKCResult_InvoiceSignOrCreationErrorZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_is_ok"))) TS_CResult_InvoiceSignOrCreationErrorZ_is_ok(uint64_t o) { + LDKCResult_InvoiceSignOrCreationErrorZ* o_conv = (LDKCResult_InvoiceSignOrCreationErrorZ*)untag_ptr(o); jboolean ret_conv = CResult_InvoiceSignOrCreationErrorZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_free"))) TS_CResult_InvoiceSignOrCreationErrorZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_free"))) TS_CResult_InvoiceSignOrCreationErrorZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_InvoiceSignOrCreationErrorZ _res_conv = *(LDKCResult_InvoiceSignOrCreationErrorZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_InvoiceSignOrCreationErrorZ_free(_res_conv); } -static inline uintptr_t CResult_InvoiceSignOrCreationErrorZ_clone_ptr(LDKCResult_InvoiceSignOrCreationErrorZ *NONNULL_PTR arg) { +static inline uint64_t CResult_InvoiceSignOrCreationErrorZ_clone_ptr(LDKCResult_InvoiceSignOrCreationErrorZ *NONNULL_PTR arg) { LDKCResult_InvoiceSignOrCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceSignOrCreationErrorZ), "LDKCResult_InvoiceSignOrCreationErrorZ"); *ret_conv = CResult_InvoiceSignOrCreationErrorZ_clone(arg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_clone_ptr"))) TS_CResult_InvoiceSignOrCreationErrorZ_clone_ptr(uint32_t arg) { - LDKCResult_InvoiceSignOrCreationErrorZ* arg_conv = (LDKCResult_InvoiceSignOrCreationErrorZ*)(arg & ~1); - uint32_t ret_conv = CResult_InvoiceSignOrCreationErrorZ_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_clone_ptr"))) TS_CResult_InvoiceSignOrCreationErrorZ_clone_ptr(uint64_t arg) { + LDKCResult_InvoiceSignOrCreationErrorZ* arg_conv = (LDKCResult_InvoiceSignOrCreationErrorZ*)untag_ptr(arg); + int64_t ret_conv = CResult_InvoiceSignOrCreationErrorZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_clone"))) TS_CResult_InvoiceSignOrCreationErrorZ_clone(uint32_t orig) { - LDKCResult_InvoiceSignOrCreationErrorZ* orig_conv = (LDKCResult_InvoiceSignOrCreationErrorZ*)(orig & ~1); +uint64_t __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_clone"))) TS_CResult_InvoiceSignOrCreationErrorZ_clone(uint64_t orig) { + LDKCResult_InvoiceSignOrCreationErrorZ* orig_conv = (LDKCResult_InvoiceSignOrCreationErrorZ*)untag_ptr(orig); LDKCResult_InvoiceSignOrCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceSignOrCreationErrorZ), "LDKCResult_InvoiceSignOrCreationErrorZ"); *ret_conv = CResult_InvoiceSignOrCreationErrorZ_clone(orig_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_COption_FilterZ_some"))) TS_COption_FilterZ_some(uint32_t o) { - void* o_ptr = (void*)(((uintptr_t)o) & ~1); +uint64_t __attribute__((export_name("TS_COption_FilterZ_some"))) TS_COption_FilterZ_some(uint64_t o) { + void* o_ptr = untag_ptr(o); CHECK_ACCESS(o_ptr); LDKFilter o_conv = *(LDKFilter*)(o_ptr); if (o_conv.free == LDKFilter_JCalls_free) { @@ -20569,71 +19295,72 @@ uint32_t __attribute__((export_name("TS_COption_FilterZ_some"))) TS_COption_Fil } LDKCOption_FilterZ *ret_copy = MALLOC(sizeof(LDKCOption_FilterZ), "LDKCOption_FilterZ"); *ret_copy = COption_FilterZ_some(o_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_COption_FilterZ_none"))) TS_COption_FilterZ_none() { +uint64_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(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_COption_FilterZ_free"))) TS_COption_FilterZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCOption_FilterZ _res_conv = *(LDKCOption_FilterZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); COption_FilterZ_free(_res_conv); } -uint32_t __attribute__((export_name("TS_CResult_LockedChannelMonitorNoneZ_ok"))) TS_CResult_LockedChannelMonitorNoneZ_ok(uint32_t o) { +uint64_t __attribute__((export_name("TS_CResult_LockedChannelMonitorNoneZ_ok"))) TS_CResult_LockedChannelMonitorNoneZ_ok(uint64_t o) { LDKLockedChannelMonitor o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = (o & 1) || (o == 0); + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); // 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_CResult_LockedChannelMonitorNoneZ_err"))) TS_CResult_LockedChannelMonitorNoneZ_err() { +uint64_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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_CResult_LockedChannelMonitorNoneZ_is_ok"))) TS_CResult_LockedChannelMonitorNoneZ_is_ok(uint32_t o) { - LDKCResult_LockedChannelMonitorNoneZ* o_conv = (LDKCResult_LockedChannelMonitorNoneZ*)(o & ~1); +jboolean __attribute__((export_name("TS_CResult_LockedChannelMonitorNoneZ_is_ok"))) TS_CResult_LockedChannelMonitorNoneZ_is_ok(uint64_t o) { + LDKCResult_LockedChannelMonitorNoneZ* o_conv = (LDKCResult_LockedChannelMonitorNoneZ*)untag_ptr(o); jboolean ret_conv = CResult_LockedChannelMonitorNoneZ_is_ok(o_conv); return ret_conv; } -void __attribute__((export_name("TS_CResult_LockedChannelMonitorNoneZ_free"))) TS_CResult_LockedChannelMonitorNoneZ_free(uint32_t _res) { - if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); +void __attribute__((export_name("TS_CResult_LockedChannelMonitorNoneZ_free"))) TS_CResult_LockedChannelMonitorNoneZ_free(uint64_t _res) { + if (!ptr_is_owned(_res)) return; + void* _res_ptr = untag_ptr(_res); CHECK_ACCESS(_res_ptr); LDKCResult_LockedChannelMonitorNoneZ _res_conv = *(LDKCResult_LockedChannelMonitorNoneZ*)(_res_ptr); - FREE((void*)_res); + FREE(untag_ptr(_res)); CResult_LockedChannelMonitorNoneZ_free(_res_conv); } -void __attribute__((export_name("TS_CVec_OutPointZ_free"))) TS_CVec_OutPointZ_free(uint32_tArray _res) { +void __attribute__((export_name("TS_CVec_OutPointZ_free"))) TS_CVec_OutPointZ_free(uint64_tArray _res) { LDKCVec_OutPointZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKOutPoint), "LDKCVec_OutPointZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems; + uint64_t* _res_vals = _res->elems; for (size_t k = 0; k < _res_constr.datalen; k++) { - uint32_t _res_conv_10 = _res_vals[k]; + uint64_t _res_conv_10 = _res_vals[k]; LDKOutPoint _res_conv_10_conv; - _res_conv_10_conv.inner = (void*)(_res_conv_10 & (~1)); - _res_conv_10_conv.is_owned = (_res_conv_10 & 1) || (_res_conv_10 == 0); + _res_conv_10_conv.inner = untag_ptr(_res_conv_10); + _res_conv_10_conv.is_owned = ptr_is_owned(_res_conv_10); CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_10_conv); _res_constr.data[k] = _res_conv_10_conv; } @@ -20641,36 +19368,36 @@ void __attribute__((export_name("TS_CVec_OutPointZ_free"))) TS_CVec_OutPointZ_f CVec_OutPointZ_free(_res_constr); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_PaymentPurpose_free"))) TS_PaymentPurpose_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKPaymentPurpose this_ptr_conv = *(LDKPaymentPurpose*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); PaymentPurpose_free(this_ptr_conv); } -static inline uintptr_t PaymentPurpose_clone_ptr(LDKPaymentPurpose *NONNULL_PTR arg) { +static inline uint64_t PaymentPurpose_clone_ptr(LDKPaymentPurpose *NONNULL_PTR arg) { LDKPaymentPurpose *ret_copy = MALLOC(sizeof(LDKPaymentPurpose), "LDKPaymentPurpose"); *ret_copy = PaymentPurpose_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_PaymentPurpose_clone_ptr"))) TS_PaymentPurpose_clone_ptr(uint32_t arg) { - LDKPaymentPurpose* arg_conv = (LDKPaymentPurpose*)arg; - uint32_t ret_conv = PaymentPurpose_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_PaymentPurpose_clone_ptr"))) TS_PaymentPurpose_clone_ptr(uint64_t arg) { + LDKPaymentPurpose* arg_conv = (LDKPaymentPurpose*)untag_ptr(arg); + int64_t ret_conv = PaymentPurpose_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_PaymentPurpose_clone"))) TS_PaymentPurpose_clone(uint32_t orig) { - LDKPaymentPurpose* orig_conv = (LDKPaymentPurpose*)orig; +uint64_t __attribute__((export_name("TS_PaymentPurpose_clone"))) TS_PaymentPurpose_clone(uint64_t orig) { + LDKPaymentPurpose* orig_conv = (LDKPaymentPurpose*)untag_ptr(orig); LDKPaymentPurpose *ret_copy = MALLOC(sizeof(LDKPaymentPurpose), "LDKPaymentPurpose"); *ret_copy = PaymentPurpose_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_PaymentPurpose_invoice_payment"))) TS_PaymentPurpose_invoice_payment(int8_tArray payment_preimage, int8_tArray payment_secret) { +uint64_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); FREE(payment_preimage); @@ -20679,22 +19406,22 @@ uint32_t __attribute__((export_name("TS_PaymentPurpose_invoice_payment"))) TS_P 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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_PaymentPurpose_spontaneous_payment"))) TS_PaymentPurpose_spontaneous_payment(int8_tArray a) { +uint64_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); FREE(a); LDKPaymentPurpose *ret_copy = MALLOC(sizeof(LDKPaymentPurpose), "LDKPaymentPurpose"); *ret_copy = PaymentPurpose_spontaneous_payment(a_ref); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -int8_tArray __attribute__((export_name("TS_PaymentPurpose_write"))) TS_PaymentPurpose_write(uint32_t obj) { - LDKPaymentPurpose* obj_conv = (LDKPaymentPurpose*)obj; +int8_tArray __attribute__((export_name("TS_PaymentPurpose_write"))) TS_PaymentPurpose_write(uint64_t obj) { + LDKPaymentPurpose* obj_conv = (LDKPaymentPurpose*)untag_ptr(obj); LDKCVec_u8Z ret_var = PaymentPurpose_write(obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -20702,105 +19429,105 @@ int8_tArray __attribute__((export_name("TS_PaymentPurpose_write"))) TS_PaymentP return ret_arr; } -uint32_t __attribute__((export_name("TS_PaymentPurpose_read"))) TS_PaymentPurpose_read(int8_tArray ser) { +uint64_t __attribute__((export_name("TS_PaymentPurpose_read"))) TS_PaymentPurpose_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; ser_ref.data = ser->elems; LDKCResult_PaymentPurposeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentPurposeDecodeErrorZ), "LDKCResult_PaymentPurposeDecodeErrorZ"); *ret_conv = PaymentPurpose_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_ClosureReason_free"))) TS_ClosureReason_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKClosureReason this_ptr_conv = *(LDKClosureReason*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); ClosureReason_free(this_ptr_conv); } -static inline uintptr_t ClosureReason_clone_ptr(LDKClosureReason *NONNULL_PTR arg) { +static inline uint64_t ClosureReason_clone_ptr(LDKClosureReason *NONNULL_PTR arg) { LDKClosureReason *ret_copy = MALLOC(sizeof(LDKClosureReason), "LDKClosureReason"); *ret_copy = ClosureReason_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ClosureReason_clone_ptr"))) TS_ClosureReason_clone_ptr(uint32_t arg) { - LDKClosureReason* arg_conv = (LDKClosureReason*)arg; - uint32_t ret_conv = ClosureReason_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_ClosureReason_clone_ptr"))) TS_ClosureReason_clone_ptr(uint64_t arg) { + LDKClosureReason* arg_conv = (LDKClosureReason*)untag_ptr(arg); + int64_t ret_conv = ClosureReason_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ClosureReason_clone"))) TS_ClosureReason_clone(uint32_t orig) { - LDKClosureReason* orig_conv = (LDKClosureReason*)orig; +uint64_t __attribute__((export_name("TS_ClosureReason_clone"))) TS_ClosureReason_clone(uint64_t orig) { + LDKClosureReason* orig_conv = (LDKClosureReason*)untag_ptr(orig); LDKClosureReason *ret_copy = MALLOC(sizeof(LDKClosureReason), "LDKClosureReason"); *ret_copy = ClosureReason_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ClosureReason_counterparty_force_closed"))) TS_ClosureReason_counterparty_force_closed(jstring peer_msg) { +uint64_t __attribute__((export_name("TS_ClosureReason_counterparty_force_closed"))) TS_ClosureReason_counterparty_force_closed(jstring peer_msg) { 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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ClosureReason_holder_force_closed"))) TS_ClosureReason_holder_force_closed() { +uint64_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(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ClosureReason_cooperative_closure"))) TS_ClosureReason_cooperative_closure() { +uint64_t __attribute__((export_name("TS_ClosureReason_cooperative_closure"))) TS_ClosureReason_cooperative_closure() { LDKClosureReason *ret_copy = MALLOC(sizeof(LDKClosureReason), "LDKClosureReason"); *ret_copy = ClosureReason_cooperative_closure(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ClosureReason_commitment_tx_confirmed"))) TS_ClosureReason_commitment_tx_confirmed() { +uint64_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(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ClosureReason_funding_timed_out"))) TS_ClosureReason_funding_timed_out() { +uint64_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(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ClosureReason_processing_error"))) TS_ClosureReason_processing_error(jstring err) { +uint64_t __attribute__((export_name("TS_ClosureReason_processing_error"))) TS_ClosureReason_processing_error(jstring err) { LDKStr err_conv = str_ref_to_owned_c(err); LDKClosureReason *ret_copy = MALLOC(sizeof(LDKClosureReason), "LDKClosureReason"); *ret_copy = ClosureReason_processing_error(err_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ClosureReason_disconnected_peer"))) TS_ClosureReason_disconnected_peer() { +uint64_t __attribute__((export_name("TS_ClosureReason_disconnected_peer"))) TS_ClosureReason_disconnected_peer() { LDKClosureReason *ret_copy = MALLOC(sizeof(LDKClosureReason), "LDKClosureReason"); *ret_copy = ClosureReason_disconnected_peer(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ClosureReason_outdated_channel_manager"))) TS_ClosureReason_outdated_channel_manager() { +uint64_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(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -int8_tArray __attribute__((export_name("TS_ClosureReason_write"))) TS_ClosureReason_write(uint32_t obj) { - LDKClosureReason* obj_conv = (LDKClosureReason*)obj; +int8_tArray __attribute__((export_name("TS_ClosureReason_write"))) TS_ClosureReason_write(uint64_t obj) { + LDKClosureReason* obj_conv = (LDKClosureReason*)untag_ptr(obj); LDKCVec_u8Z ret_var = ClosureReason_write(obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -20808,46 +19535,46 @@ int8_tArray __attribute__((export_name("TS_ClosureReason_write"))) TS_ClosureRe return ret_arr; } -uint32_t __attribute__((export_name("TS_ClosureReason_read"))) TS_ClosureReason_read(int8_tArray ser) { +uint64_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; LDKCResult_COption_ClosureReasonZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_ClosureReasonZDecodeErrorZ), "LDKCResult_COption_ClosureReasonZDecodeErrorZ"); *ret_conv = ClosureReason_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_HTLCDestination_free"))) TS_HTLCDestination_free(uint32_t this_ptr) { - if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_HTLCDestination_free"))) TS_HTLCDestination_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKHTLCDestination this_ptr_conv = *(LDKHTLCDestination*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); HTLCDestination_free(this_ptr_conv); } -static inline uintptr_t HTLCDestination_clone_ptr(LDKHTLCDestination *NONNULL_PTR arg) { +static inline uint64_t HTLCDestination_clone_ptr(LDKHTLCDestination *NONNULL_PTR arg) { LDKHTLCDestination *ret_copy = MALLOC(sizeof(LDKHTLCDestination), "LDKHTLCDestination"); *ret_copy = HTLCDestination_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_HTLCDestination_clone_ptr"))) TS_HTLCDestination_clone_ptr(uint32_t arg) { - LDKHTLCDestination* arg_conv = (LDKHTLCDestination*)arg; - uint32_t ret_conv = HTLCDestination_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_HTLCDestination_clone_ptr"))) TS_HTLCDestination_clone_ptr(uint64_t arg) { + LDKHTLCDestination* arg_conv = (LDKHTLCDestination*)untag_ptr(arg); + int64_t ret_conv = HTLCDestination_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_HTLCDestination_clone"))) TS_HTLCDestination_clone(uint32_t orig) { - LDKHTLCDestination* orig_conv = (LDKHTLCDestination*)orig; +uint64_t __attribute__((export_name("TS_HTLCDestination_clone"))) TS_HTLCDestination_clone(uint64_t orig) { + LDKHTLCDestination* orig_conv = (LDKHTLCDestination*)untag_ptr(orig); LDKHTLCDestination *ret_copy = MALLOC(sizeof(LDKHTLCDestination), "LDKHTLCDestination"); *ret_copy = HTLCDestination_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_HTLCDestination_next_hop_channel"))) TS_HTLCDestination_next_hop_channel(int8_tArray node_id, int8_tArray channel_id) { +uint64_t __attribute__((export_name("TS_HTLCDestination_next_hop_channel"))) TS_HTLCDestination_next_hop_channel(int8_tArray node_id, int8_tArray channel_id) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 33); memcpy(node_id_ref.compressed_form, node_id->elems, 33); FREE(node_id); @@ -20856,29 +19583,29 @@ uint32_t __attribute__((export_name("TS_HTLCDestination_next_hop_channel"))) TS memcpy(channel_id_ref.data, channel_id->elems, 32); FREE(channel_id); LDKHTLCDestination *ret_copy = MALLOC(sizeof(LDKHTLCDestination), "LDKHTLCDestination"); *ret_copy = HTLCDestination_next_hop_channel(node_id_ref, channel_id_ref); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_HTLCDestination_unknown_next_hop"))) TS_HTLCDestination_unknown_next_hop(int64_t requested_forward_scid) { +uint64_t __attribute__((export_name("TS_HTLCDestination_unknown_next_hop"))) TS_HTLCDestination_unknown_next_hop(int64_t requested_forward_scid) { LDKHTLCDestination *ret_copy = MALLOC(sizeof(LDKHTLCDestination), "LDKHTLCDestination"); *ret_copy = HTLCDestination_unknown_next_hop(requested_forward_scid); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_HTLCDestination_failed_payment"))) TS_HTLCDestination_failed_payment(int8_tArray payment_hash) { +uint64_t __attribute__((export_name("TS_HTLCDestination_failed_payment"))) TS_HTLCDestination_failed_payment(int8_tArray payment_hash) { LDKThirtyTwoBytes payment_hash_ref; CHECK(payment_hash->arr_len == 32); memcpy(payment_hash_ref.data, payment_hash->elems, 32); FREE(payment_hash); LDKHTLCDestination *ret_copy = MALLOC(sizeof(LDKHTLCDestination), "LDKHTLCDestination"); *ret_copy = HTLCDestination_failed_payment(payment_hash_ref); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -int8_tArray __attribute__((export_name("TS_HTLCDestination_write"))) TS_HTLCDestination_write(uint32_t obj) { - LDKHTLCDestination* obj_conv = (LDKHTLCDestination*)obj; +int8_tArray __attribute__((export_name("TS_HTLCDestination_write"))) TS_HTLCDestination_write(uint64_t obj) { + LDKHTLCDestination* obj_conv = (LDKHTLCDestination*)untag_ptr(obj); LDKCVec_u8Z ret_var = HTLCDestination_write(obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -20886,46 +19613,46 @@ int8_tArray __attribute__((export_name("TS_HTLCDestination_write"))) TS_HTLCDes return ret_arr; } -uint32_t __attribute__((export_name("TS_HTLCDestination_read"))) TS_HTLCDestination_read(int8_tArray ser) { +uint64_t __attribute__((export_name("TS_HTLCDestination_read"))) TS_HTLCDestination_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; ser_ref.data = ser->elems; LDKCResult_COption_HTLCDestinationZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_HTLCDestinationZDecodeErrorZ), "LDKCResult_COption_HTLCDestinationZDecodeErrorZ"); *ret_conv = HTLCDestination_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_Event_free"))) TS_Event_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKEvent this_ptr_conv = *(LDKEvent*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); Event_free(this_ptr_conv); } -static inline uintptr_t Event_clone_ptr(LDKEvent *NONNULL_PTR arg) { +static inline uint64_t Event_clone_ptr(LDKEvent *NONNULL_PTR arg) { LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Event_clone_ptr"))) TS_Event_clone_ptr(uint32_t arg) { - LDKEvent* arg_conv = (LDKEvent*)arg; - uint32_t ret_conv = Event_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_Event_clone_ptr"))) TS_Event_clone_ptr(uint64_t arg) { + LDKEvent* arg_conv = (LDKEvent*)untag_ptr(arg); + int64_t ret_conv = Event_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_Event_clone"))) TS_Event_clone(uint32_t orig) { - LDKEvent* orig_conv = (LDKEvent*)orig; +uint64_t __attribute__((export_name("TS_Event_clone"))) TS_Event_clone(uint64_t orig) { + LDKEvent* orig_conv = (LDKEvent*)untag_ptr(orig); LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Event_funding_generation_ready"))) TS_Event_funding_generation_ready(int8_tArray temporary_channel_id, int8_tArray counterparty_node_id, int64_t channel_value_satoshis, int8_tArray output_script, int64_t user_channel_id) { +uint64_t __attribute__((export_name("TS_Event_funding_generation_ready"))) TS_Event_funding_generation_ready(int8_tArray temporary_channel_id, int8_tArray counterparty_node_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); FREE(temporary_channel_id); @@ -20938,39 +19665,39 @@ uint32_t __attribute__((export_name("TS_Event_funding_generation_ready"))) TS_E 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, counterparty_node_id_ref, channel_value_satoshis, output_script_ref, user_channel_id); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Event_payment_received"))) TS_Event_payment_received(int8_tArray payment_hash, int64_t amount_msat, uint32_t purpose) { +uint64_t __attribute__((export_name("TS_Event_payment_received"))) TS_Event_payment_received(int8_tArray payment_hash, int64_t amount_msat, uint64_t purpose) { LDKThirtyTwoBytes payment_hash_ref; CHECK(payment_hash->arr_len == 32); memcpy(payment_hash_ref.data, payment_hash->elems, 32); FREE(payment_hash); - void* purpose_ptr = (void*)(((uintptr_t)purpose) & ~1); + void* purpose_ptr = untag_ptr(purpose); CHECK_ACCESS(purpose_ptr); LDKPaymentPurpose purpose_conv = *(LDKPaymentPurpose*)(purpose_ptr); - purpose_conv = PaymentPurpose_clone((LDKPaymentPurpose*)(((uintptr_t)purpose) & ~1)); + purpose_conv = PaymentPurpose_clone((LDKPaymentPurpose*)untag_ptr(purpose)); LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_payment_received(payment_hash_ref, amount_msat, purpose_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Event_payment_claimed"))) TS_Event_payment_claimed(int8_tArray payment_hash, int64_t amount_msat, uint32_t purpose) { +uint64_t __attribute__((export_name("TS_Event_payment_claimed"))) TS_Event_payment_claimed(int8_tArray payment_hash, int64_t amount_msat, uint64_t purpose) { LDKThirtyTwoBytes payment_hash_ref; CHECK(payment_hash->arr_len == 32); memcpy(payment_hash_ref.data, payment_hash->elems, 32); FREE(payment_hash); - void* purpose_ptr = (void*)(((uintptr_t)purpose) & ~1); + void* purpose_ptr = untag_ptr(purpose); CHECK_ACCESS(purpose_ptr); LDKPaymentPurpose purpose_conv = *(LDKPaymentPurpose*)(purpose_ptr); - purpose_conv = PaymentPurpose_clone((LDKPaymentPurpose*)(((uintptr_t)purpose) & ~1)); + purpose_conv = PaymentPurpose_clone((LDKPaymentPurpose*)untag_ptr(purpose)); LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_payment_claimed(payment_hash_ref, amount_msat, purpose_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_t __attribute__((export_name("TS_Event_payment_sent"))) TS_Event_payment_sent(int8_tArray payment_id, int8_tArray payment_preimage, int8_tArray payment_hash, uint64_t fee_paid_msat) { LDKThirtyTwoBytes payment_id_ref; CHECK(payment_id->arr_len == 32); memcpy(payment_id_ref.data, payment_id->elems, 32); FREE(payment_id); @@ -20980,17 +19707,17 @@ uint32_t __attribute__((export_name("TS_Event_payment_sent"))) TS_Event_payment LDKThirtyTwoBytes payment_hash_ref; CHECK(payment_hash->arr_len == 32); memcpy(payment_hash_ref.data, payment_hash->elems, 32); FREE(payment_hash); - void* fee_paid_msat_ptr = (void*)(((uintptr_t)fee_paid_msat) & ~1); + void* fee_paid_msat_ptr = untag_ptr(fee_paid_msat); 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*)(((uintptr_t)fee_paid_msat) & ~1)); + fee_paid_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(fee_paid_msat)); 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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Event_payment_failed"))) TS_Event_payment_failed(int8_tArray payment_id, int8_tArray payment_hash) { +uint64_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); FREE(payment_id); @@ -20999,11 +19726,11 @@ uint32_t __attribute__((export_name("TS_Event_payment_failed"))) TS_Event_payme 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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_t __attribute__((export_name("TS_Event_payment_path_successful"))) TS_Event_payment_path_successful(int8_tArray payment_id, int8_tArray payment_hash, uint64_tArray path) { LDKThirtyTwoBytes payment_id_ref; CHECK(payment_id->arr_len == 32); memcpy(payment_id_ref.data, payment_id->elems, 32); FREE(payment_id); @@ -21016,12 +19743,12 @@ uint32_t __attribute__((export_name("TS_Event_payment_path_successful"))) TS_Ev path_constr.data = MALLOC(path_constr.datalen * sizeof(LDKRouteHop), "LDKCVec_RouteHopZ Elements"); else path_constr.data = NULL; - uint32_t* path_vals = path->elems; + uint64_t* path_vals = path->elems; for (size_t k = 0; k < path_constr.datalen; k++) { - uint32_t path_conv_10 = path_vals[k]; + uint64_t path_conv_10 = path_vals[k]; LDKRouteHop path_conv_10_conv; - path_conv_10_conv.inner = (void*)(path_conv_10 & (~1)); - path_conv_10_conv.is_owned = (path_conv_10 & 1) || (path_conv_10 == 0); + path_conv_10_conv.inner = untag_ptr(path_conv_10); + path_conv_10_conv.is_owned = ptr_is_owned(path_conv_10); CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_conv); path_conv_10_conv = RouteHop_clone(&path_conv_10_conv); path_constr.data[k] = path_conv_10_conv; @@ -21029,54 +19756,54 @@ uint32_t __attribute__((export_name("TS_Event_payment_path_successful"))) TS_Ev FREE(path); LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_payment_path_successful(payment_id_ref, payment_hash_ref, path_constr); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_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, uint64_t network_update, jboolean all_paths_failed, uint64_tArray path, uint64_t short_channel_id, uint64_t retry) { LDKThirtyTwoBytes payment_id_ref; CHECK(payment_id->arr_len == 32); memcpy(payment_id_ref.data, payment_id->elems, 32); FREE(payment_id); LDKThirtyTwoBytes payment_hash_ref; CHECK(payment_hash->arr_len == 32); memcpy(payment_hash_ref.data, payment_hash->elems, 32); FREE(payment_hash); - void* network_update_ptr = (void*)(((uintptr_t)network_update) & ~1); + void* network_update_ptr = untag_ptr(network_update); CHECK_ACCESS(network_update_ptr); LDKCOption_NetworkUpdateZ network_update_conv = *(LDKCOption_NetworkUpdateZ*)(network_update_ptr); - network_update_conv = COption_NetworkUpdateZ_clone((LDKCOption_NetworkUpdateZ*)(((uintptr_t)network_update) & ~1)); + network_update_conv = COption_NetworkUpdateZ_clone((LDKCOption_NetworkUpdateZ*)untag_ptr(network_update)); 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; + uint64_t* path_vals = path->elems; for (size_t k = 0; k < path_constr.datalen; k++) { - uint32_t path_conv_10 = path_vals[k]; + uint64_t path_conv_10 = path_vals[k]; LDKRouteHop path_conv_10_conv; - path_conv_10_conv.inner = (void*)(path_conv_10 & (~1)); - path_conv_10_conv.is_owned = (path_conv_10 & 1) || (path_conv_10 == 0); + path_conv_10_conv.inner = untag_ptr(path_conv_10); + path_conv_10_conv.is_owned = ptr_is_owned(path_conv_10); CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_conv); path_conv_10_conv = RouteHop_clone(&path_conv_10_conv); path_constr.data[k] = path_conv_10_conv; } FREE(path); - void* short_channel_id_ptr = (void*)(((uintptr_t)short_channel_id) & ~1); + void* short_channel_id_ptr = untag_ptr(short_channel_id); CHECK_ACCESS(short_channel_id_ptr); LDKCOption_u64Z short_channel_id_conv = *(LDKCOption_u64Z*)(short_channel_id_ptr); - short_channel_id_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)short_channel_id) & ~1)); + short_channel_id_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(short_channel_id)); LDKRouteParameters retry_conv; - retry_conv.inner = (void*)(retry & (~1)); - retry_conv.is_owned = (retry & 1) || (retry == 0); + retry_conv.inner = untag_ptr(retry); + retry_conv.is_owned = ptr_is_owned(retry); CHECK_INNER_FIELD_ACCESS_OR_NULL(retry_conv); 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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Event_probe_successful"))) TS_Event_probe_successful(int8_tArray payment_id, int8_tArray payment_hash, uint32_tArray path) { +uint64_t __attribute__((export_name("TS_Event_probe_successful"))) TS_Event_probe_successful(int8_tArray payment_id, int8_tArray payment_hash, uint64_tArray path) { LDKThirtyTwoBytes payment_id_ref; CHECK(payment_id->arr_len == 32); memcpy(payment_id_ref.data, payment_id->elems, 32); FREE(payment_id); @@ -21089,12 +19816,12 @@ uint32_t __attribute__((export_name("TS_Event_probe_successful"))) TS_Event_pro path_constr.data = MALLOC(path_constr.datalen * sizeof(LDKRouteHop), "LDKCVec_RouteHopZ Elements"); else path_constr.data = NULL; - uint32_t* path_vals = path->elems; + uint64_t* path_vals = path->elems; for (size_t k = 0; k < path_constr.datalen; k++) { - uint32_t path_conv_10 = path_vals[k]; + uint64_t path_conv_10 = path_vals[k]; LDKRouteHop path_conv_10_conv; - path_conv_10_conv.inner = (void*)(path_conv_10 & (~1)); - path_conv_10_conv.is_owned = (path_conv_10 & 1) || (path_conv_10 == 0); + path_conv_10_conv.inner = untag_ptr(path_conv_10); + path_conv_10_conv.is_owned = ptr_is_owned(path_conv_10); CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_conv); path_conv_10_conv = RouteHop_clone(&path_conv_10_conv); path_constr.data[k] = path_conv_10_conv; @@ -21102,11 +19829,11 @@ uint32_t __attribute__((export_name("TS_Event_probe_successful"))) TS_Event_pro FREE(path); LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_probe_successful(payment_id_ref, payment_hash_ref, path_constr); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Event_probe_failed"))) TS_Event_probe_failed(int8_tArray payment_id, int8_tArray payment_hash, uint32_tArray path, uint32_t short_channel_id) { +uint64_t __attribute__((export_name("TS_Event_probe_failed"))) TS_Event_probe_failed(int8_tArray payment_id, int8_tArray payment_hash, uint64_tArray path, uint64_t short_channel_id) { LDKThirtyTwoBytes payment_id_ref; CHECK(payment_id->arr_len == 32); memcpy(payment_id_ref.data, payment_id->elems, 32); FREE(payment_id); @@ -21119,89 +19846,89 @@ uint32_t __attribute__((export_name("TS_Event_probe_failed"))) TS_Event_probe_f path_constr.data = MALLOC(path_constr.datalen * sizeof(LDKRouteHop), "LDKCVec_RouteHopZ Elements"); else path_constr.data = NULL; - uint32_t* path_vals = path->elems; + uint64_t* path_vals = path->elems; for (size_t k = 0; k < path_constr.datalen; k++) { - uint32_t path_conv_10 = path_vals[k]; + uint64_t path_conv_10 = path_vals[k]; LDKRouteHop path_conv_10_conv; - path_conv_10_conv.inner = (void*)(path_conv_10 & (~1)); - path_conv_10_conv.is_owned = (path_conv_10 & 1) || (path_conv_10 == 0); + path_conv_10_conv.inner = untag_ptr(path_conv_10); + path_conv_10_conv.is_owned = ptr_is_owned(path_conv_10); CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_conv); path_conv_10_conv = RouteHop_clone(&path_conv_10_conv); path_constr.data[k] = path_conv_10_conv; } FREE(path); - void* short_channel_id_ptr = (void*)(((uintptr_t)short_channel_id) & ~1); + void* short_channel_id_ptr = untag_ptr(short_channel_id); CHECK_ACCESS(short_channel_id_ptr); LDKCOption_u64Z short_channel_id_conv = *(LDKCOption_u64Z*)(short_channel_id_ptr); - short_channel_id_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)short_channel_id) & ~1)); + short_channel_id_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(short_channel_id)); LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_probe_failed(payment_id_ref, payment_hash_ref, path_constr, short_channel_id_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Event_pending_htlcs_forwardable"))) TS_Event_pending_htlcs_forwardable(int64_t time_forwardable) { +uint64_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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Event_spendable_outputs"))) TS_Event_spendable_outputs(uint32_tArray outputs) { +uint64_t __attribute__((export_name("TS_Event_spendable_outputs"))) TS_Event_spendable_outputs(uint64_tArray outputs) { LDKCVec_SpendableOutputDescriptorZ outputs_constr; outputs_constr.datalen = outputs->arr_len; if (outputs_constr.datalen > 0) outputs_constr.data = MALLOC(outputs_constr.datalen * sizeof(LDKSpendableOutputDescriptor), "LDKCVec_SpendableOutputDescriptorZ Elements"); else outputs_constr.data = NULL; - uint32_t* outputs_vals = outputs->elems; + uint64_t* outputs_vals = outputs->elems; for (size_t b = 0; b < outputs_constr.datalen; b++) { - uint32_t outputs_conv_27 = outputs_vals[b]; - void* outputs_conv_27_ptr = (void*)(((uintptr_t)outputs_conv_27) & ~1); + uint64_t outputs_conv_27 = outputs_vals[b]; + void* outputs_conv_27_ptr = untag_ptr(outputs_conv_27); CHECK_ACCESS(outputs_conv_27_ptr); LDKSpendableOutputDescriptor outputs_conv_27_conv = *(LDKSpendableOutputDescriptor*)(outputs_conv_27_ptr); - outputs_conv_27_conv = SpendableOutputDescriptor_clone((LDKSpendableOutputDescriptor*)(((uintptr_t)outputs_conv_27) & ~1)); + outputs_conv_27_conv = SpendableOutputDescriptor_clone((LDKSpendableOutputDescriptor*)untag_ptr(outputs_conv_27)); outputs_constr.data[b] = outputs_conv_27_conv; } FREE(outputs); LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_spendable_outputs(outputs_constr); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Event_payment_forwarded"))) TS_Event_payment_forwarded(int8_tArray prev_channel_id, int8_tArray next_channel_id, uint32_t fee_earned_msat, jboolean claim_from_onchain_tx) { +uint64_t __attribute__((export_name("TS_Event_payment_forwarded"))) TS_Event_payment_forwarded(int8_tArray prev_channel_id, int8_tArray next_channel_id, uint64_t fee_earned_msat, jboolean claim_from_onchain_tx) { LDKThirtyTwoBytes prev_channel_id_ref; CHECK(prev_channel_id->arr_len == 32); memcpy(prev_channel_id_ref.data, prev_channel_id->elems, 32); FREE(prev_channel_id); LDKThirtyTwoBytes next_channel_id_ref; CHECK(next_channel_id->arr_len == 32); memcpy(next_channel_id_ref.data, next_channel_id->elems, 32); FREE(next_channel_id); - void* fee_earned_msat_ptr = (void*)(((uintptr_t)fee_earned_msat) & ~1); + void* fee_earned_msat_ptr = untag_ptr(fee_earned_msat); 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*)(((uintptr_t)fee_earned_msat) & ~1)); + fee_earned_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(fee_earned_msat)); LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_payment_forwarded(prev_channel_id_ref, next_channel_id_ref, fee_earned_msat_conv, claim_from_onchain_tx); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_t __attribute__((export_name("TS_Event_channel_closed"))) TS_Event_channel_closed(int8_tArray channel_id, int64_t user_channel_id, uint64_t reason) { LDKThirtyTwoBytes channel_id_ref; CHECK(channel_id->arr_len == 32); memcpy(channel_id_ref.data, channel_id->elems, 32); FREE(channel_id); - void* reason_ptr = (void*)(((uintptr_t)reason) & ~1); + void* reason_ptr = untag_ptr(reason); CHECK_ACCESS(reason_ptr); LDKClosureReason reason_conv = *(LDKClosureReason*)(reason_ptr); - reason_conv = ClosureReason_clone((LDKClosureReason*)(((uintptr_t)reason) & ~1)); + reason_conv = ClosureReason_clone((LDKClosureReason*)untag_ptr(reason)); LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_channel_closed(channel_id_ref, user_channel_id, reason_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Event_discard_funding"))) TS_Event_discard_funding(int8_tArray channel_id, int8_tArray transaction) { +uint64_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); FREE(channel_id); @@ -21212,11 +19939,11 @@ uint32_t __attribute__((export_name("TS_Event_discard_funding"))) TS_Event_disc transaction_ref.data_is_owned = true; LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_discard_funding(channel_id_ref, transaction_ref); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Event_open_channel_request"))) TS_Event_open_channel_request(int8_tArray temporary_channel_id, int8_tArray counterparty_node_id, int64_t funding_satoshis, int64_t push_msat, uint32_t channel_type) { +uint64_t __attribute__((export_name("TS_Event_open_channel_request"))) TS_Event_open_channel_request(int8_tArray temporary_channel_id, int8_tArray counterparty_node_id, int64_t funding_satoshis, int64_t push_msat, uint64_t channel_type) { LDKThirtyTwoBytes temporary_channel_id_ref; CHECK(temporary_channel_id->arr_len == 32); memcpy(temporary_channel_id_ref.data, temporary_channel_id->elems, 32); FREE(temporary_channel_id); @@ -21224,32 +19951,32 @@ uint32_t __attribute__((export_name("TS_Event_open_channel_request"))) TS_Event CHECK(counterparty_node_id->arr_len == 33); memcpy(counterparty_node_id_ref.compressed_form, counterparty_node_id->elems, 33); FREE(counterparty_node_id); LDKChannelTypeFeatures channel_type_conv; - channel_type_conv.inner = (void*)(channel_type & (~1)); - channel_type_conv.is_owned = (channel_type & 1) || (channel_type == 0); + channel_type_conv.inner = untag_ptr(channel_type); + channel_type_conv.is_owned = ptr_is_owned(channel_type); CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_type_conv); channel_type_conv = ChannelTypeFeatures_clone(&channel_type_conv); LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_open_channel_request(temporary_channel_id_ref, counterparty_node_id_ref, funding_satoshis, push_msat, channel_type_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Event_htlchandling_failed"))) TS_Event_htlchandling_failed(int8_tArray prev_channel_id, uint32_t failed_next_destination) { +uint64_t __attribute__((export_name("TS_Event_htlchandling_failed"))) TS_Event_htlchandling_failed(int8_tArray prev_channel_id, uint64_t failed_next_destination) { LDKThirtyTwoBytes prev_channel_id_ref; CHECK(prev_channel_id->arr_len == 32); memcpy(prev_channel_id_ref.data, prev_channel_id->elems, 32); FREE(prev_channel_id); - void* failed_next_destination_ptr = (void*)(((uintptr_t)failed_next_destination) & ~1); + void* failed_next_destination_ptr = untag_ptr(failed_next_destination); CHECK_ACCESS(failed_next_destination_ptr); LDKHTLCDestination failed_next_destination_conv = *(LDKHTLCDestination*)(failed_next_destination_ptr); - failed_next_destination_conv = HTLCDestination_clone((LDKHTLCDestination*)(((uintptr_t)failed_next_destination) & ~1)); + failed_next_destination_conv = HTLCDestination_clone((LDKHTLCDestination*)untag_ptr(failed_next_destination)); LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_htlchandling_failed(prev_channel_id_ref, failed_next_destination_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -int8_tArray __attribute__((export_name("TS_Event_write"))) TS_Event_write(uint32_t obj) { - LDKEvent* obj_conv = (LDKEvent*)obj; +int8_tArray __attribute__((export_name("TS_Event_write"))) TS_Event_write(uint64_t obj) { + LDKEvent* obj_conv = (LDKEvent*)untag_ptr(obj); LDKCVec_u8Z ret_var = Event_write(obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -21257,541 +19984,531 @@ int8_tArray __attribute__((export_name("TS_Event_write"))) TS_Event_write(uint3 return ret_arr; } -uint32_t __attribute__((export_name("TS_Event_read"))) TS_Event_read(int8_tArray ser) { +uint64_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; LDKCResult_COption_EventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_EventZDecodeErrorZ), "LDKCResult_COption_EventZDecodeErrorZ"); *ret_conv = Event_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_MessageSendEvent_free"))) TS_MessageSendEvent_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKMessageSendEvent this_ptr_conv = *(LDKMessageSendEvent*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); MessageSendEvent_free(this_ptr_conv); } -static inline uintptr_t MessageSendEvent_clone_ptr(LDKMessageSendEvent *NONNULL_PTR arg) { +static inline uint64_t MessageSendEvent_clone_ptr(LDKMessageSendEvent *NONNULL_PTR arg) { LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_MessageSendEvent_clone_ptr"))) TS_MessageSendEvent_clone_ptr(uint32_t arg) { - LDKMessageSendEvent* arg_conv = (LDKMessageSendEvent*)arg; - uint32_t ret_conv = MessageSendEvent_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_MessageSendEvent_clone_ptr"))) TS_MessageSendEvent_clone_ptr(uint64_t arg) { + LDKMessageSendEvent* arg_conv = (LDKMessageSendEvent*)untag_ptr(arg); + int64_t ret_conv = MessageSendEvent_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_MessageSendEvent_clone"))) TS_MessageSendEvent_clone(uint32_t orig) { - LDKMessageSendEvent* orig_conv = (LDKMessageSendEvent*)orig; +uint64_t __attribute__((export_name("TS_MessageSendEvent_clone"))) TS_MessageSendEvent_clone(uint64_t orig) { + LDKMessageSendEvent* orig_conv = (LDKMessageSendEvent*)untag_ptr(orig); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_t __attribute__((export_name("TS_MessageSendEvent_send_accept_channel"))) TS_MessageSendEvent_send_accept_channel(int8_tArray node_id, uint64_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 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); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = AcceptChannel_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_send_accept_channel(node_id_ref, msg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_t __attribute__((export_name("TS_MessageSendEvent_send_open_channel"))) TS_MessageSendEvent_send_open_channel(int8_tArray node_id, uint64_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 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); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = OpenChannel_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_send_open_channel(node_id_ref, msg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_t __attribute__((export_name("TS_MessageSendEvent_send_funding_created"))) TS_MessageSendEvent_send_funding_created(int8_tArray node_id, uint64_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 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); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = FundingCreated_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_send_funding_created(node_id_ref, msg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_t __attribute__((export_name("TS_MessageSendEvent_send_funding_signed"))) TS_MessageSendEvent_send_funding_signed(int8_tArray node_id, uint64_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 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); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = FundingSigned_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_send_funding_signed(node_id_ref, msg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_MessageSendEvent_send_channel_ready"))) TS_MessageSendEvent_send_channel_ready(int8_tArray node_id, uint32_t msg) { +uint64_t __attribute__((export_name("TS_MessageSendEvent_send_channel_ready"))) TS_MessageSendEvent_send_channel_ready(int8_tArray node_id, uint64_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 33); memcpy(node_id_ref.compressed_form, node_id->elems, 33); FREE(node_id); LDKChannelReady msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = (msg & 1) || (msg == 0); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = ChannelReady_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_send_channel_ready(node_id_ref, msg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_t __attribute__((export_name("TS_MessageSendEvent_send_announcement_signatures"))) TS_MessageSendEvent_send_announcement_signatures(int8_tArray node_id, uint64_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 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); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = AnnouncementSignatures_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_send_announcement_signatures(node_id_ref, msg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_MessageSendEvent_update_htlcs"))) TS_MessageSendEvent_update_htlcs(int8_tArray node_id, uint32_t updates) { +uint64_t __attribute__((export_name("TS_MessageSendEvent_update_htlcs"))) TS_MessageSendEvent_update_htlcs(int8_tArray node_id, uint64_t updates) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 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); + updates_conv.inner = untag_ptr(updates); + updates_conv.is_owned = ptr_is_owned(updates); CHECK_INNER_FIELD_ACCESS_OR_NULL(updates_conv); updates_conv = CommitmentUpdate_clone(&updates_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_update_htlcs(node_id_ref, updates_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_t __attribute__((export_name("TS_MessageSendEvent_send_revoke_and_ack"))) TS_MessageSendEvent_send_revoke_and_ack(int8_tArray node_id, uint64_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 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); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); 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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_t __attribute__((export_name("TS_MessageSendEvent_send_closing_signed"))) TS_MessageSendEvent_send_closing_signed(int8_tArray node_id, uint64_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 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); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = ClosingSigned_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_send_closing_signed(node_id_ref, msg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_MessageSendEvent_send_shutdown"))) TS_MessageSendEvent_send_shutdown(int8_tArray node_id, uint32_t msg) { +uint64_t __attribute__((export_name("TS_MessageSendEvent_send_shutdown"))) TS_MessageSendEvent_send_shutdown(int8_tArray node_id, uint64_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 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); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = Shutdown_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_send_shutdown(node_id_ref, msg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_t __attribute__((export_name("TS_MessageSendEvent_send_channel_reestablish"))) TS_MessageSendEvent_send_channel_reestablish(int8_tArray node_id, uint64_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 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); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = ChannelReestablish_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_send_channel_reestablish(node_id_ref, msg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_MessageSendEvent_broadcast_channel_announcement"))) TS_MessageSendEvent_broadcast_channel_announcement(uint32_t msg, uint32_t update_msg) { +uint64_t __attribute__((export_name("TS_MessageSendEvent_broadcast_channel_announcement"))) TS_MessageSendEvent_broadcast_channel_announcement(uint64_t msg, uint64_t update_msg) { LDKChannelAnnouncement msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = (msg & 1) || (msg == 0); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = ChannelAnnouncement_clone(&msg_conv); LDKChannelUpdate update_msg_conv; - update_msg_conv.inner = (void*)(update_msg & (~1)); - update_msg_conv.is_owned = (update_msg & 1) || (update_msg == 0); + update_msg_conv.inner = untag_ptr(update_msg); + update_msg_conv.is_owned = ptr_is_owned(update_msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(update_msg_conv); 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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_MessageSendEvent_broadcast_node_announcement"))) TS_MessageSendEvent_broadcast_node_announcement(uint32_t msg) { +uint64_t __attribute__((export_name("TS_MessageSendEvent_broadcast_node_announcement"))) TS_MessageSendEvent_broadcast_node_announcement(uint64_t msg) { LDKNodeAnnouncement msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = (msg & 1) || (msg == 0); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = NodeAnnouncement_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_broadcast_node_announcement(msg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_MessageSendEvent_broadcast_channel_update"))) TS_MessageSendEvent_broadcast_channel_update(uint32_t msg) { +uint64_t __attribute__((export_name("TS_MessageSendEvent_broadcast_channel_update"))) TS_MessageSendEvent_broadcast_channel_update(uint64_t msg) { LDKChannelUpdate msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = (msg & 1) || (msg == 0); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = ChannelUpdate_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_broadcast_channel_update(msg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_t __attribute__((export_name("TS_MessageSendEvent_send_channel_update"))) TS_MessageSendEvent_send_channel_update(int8_tArray node_id, uint64_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 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); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = ChannelUpdate_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_send_channel_update(node_id_ref, msg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_MessageSendEvent_handle_error"))) TS_MessageSendEvent_handle_error(int8_tArray node_id, uint32_t action) { +uint64_t __attribute__((export_name("TS_MessageSendEvent_handle_error"))) TS_MessageSendEvent_handle_error(int8_tArray node_id, uint64_t action) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 33); memcpy(node_id_ref.compressed_form, node_id->elems, 33); FREE(node_id); - void* action_ptr = (void*)(((uintptr_t)action) & ~1); + void* action_ptr = untag_ptr(action); CHECK_ACCESS(action_ptr); LDKErrorAction action_conv = *(LDKErrorAction*)(action_ptr); - action_conv = ErrorAction_clone((LDKErrorAction*)(((uintptr_t)action) & ~1)); + action_conv = ErrorAction_clone((LDKErrorAction*)untag_ptr(action)); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_handle_error(node_id_ref, action_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_t __attribute__((export_name("TS_MessageSendEvent_send_channel_range_query"))) TS_MessageSendEvent_send_channel_range_query(int8_tArray node_id, uint64_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 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); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); 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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_t __attribute__((export_name("TS_MessageSendEvent_send_short_ids_query"))) TS_MessageSendEvent_send_short_ids_query(int8_tArray node_id, uint64_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 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); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); 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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_t __attribute__((export_name("TS_MessageSendEvent_send_reply_channel_range"))) TS_MessageSendEvent_send_reply_channel_range(int8_tArray node_id, uint64_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 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); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); 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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_MessageSendEvent_send_gossip_timestamp_filter"))) TS_MessageSendEvent_send_gossip_timestamp_filter(int8_tArray node_id, uint32_t msg) { +uint64_t __attribute__((export_name("TS_MessageSendEvent_send_gossip_timestamp_filter"))) TS_MessageSendEvent_send_gossip_timestamp_filter(int8_tArray node_id, uint64_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 33); memcpy(node_id_ref.compressed_form, node_id->elems, 33); FREE(node_id); LDKGossipTimestampFilter msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = (msg & 1) || (msg == 0); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = GossipTimestampFilter_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_send_gossip_timestamp_filter(node_id_ref, msg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_MessageSendEventsProvider_free"))) TS_MessageSendEventsProvider_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKMessageSendEventsProvider this_ptr_conv = *(LDKMessageSendEventsProvider*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); MessageSendEventsProvider_free(this_ptr_conv); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_EventsProvider_free"))) TS_EventsProvider_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKEventsProvider this_ptr_conv = *(LDKEventsProvider*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); EventsProvider_free(this_ptr_conv); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_EventHandler_free"))) TS_EventHandler_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKEventHandler this_ptr_conv = *(LDKEventHandler*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); EventHandler_free(this_ptr_conv); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_APIError_free"))) TS_APIError_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKAPIError this_ptr_conv = *(LDKAPIError*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); APIError_free(this_ptr_conv); } -static inline uintptr_t APIError_clone_ptr(LDKAPIError *NONNULL_PTR arg) { +static inline uint64_t APIError_clone_ptr(LDKAPIError *NONNULL_PTR arg) { LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError"); *ret_copy = APIError_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_APIError_clone_ptr"))) TS_APIError_clone_ptr(uint32_t arg) { - LDKAPIError* arg_conv = (LDKAPIError*)arg; - uint32_t ret_conv = APIError_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_APIError_clone_ptr"))) TS_APIError_clone_ptr(uint64_t arg) { + LDKAPIError* arg_conv = (LDKAPIError*)untag_ptr(arg); + int64_t ret_conv = APIError_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_APIError_clone"))) TS_APIError_clone(uint32_t orig) { - LDKAPIError* orig_conv = (LDKAPIError*)orig; +uint64_t __attribute__((export_name("TS_APIError_clone"))) TS_APIError_clone(uint64_t orig) { + LDKAPIError* orig_conv = (LDKAPIError*)untag_ptr(orig); LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError"); *ret_copy = APIError_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_APIError_apimisuse_error"))) TS_APIError_apimisuse_error(jstring err) { +uint64_t __attribute__((export_name("TS_APIError_apimisuse_error"))) TS_APIError_apimisuse_error(jstring err) { LDKStr err_conv = str_ref_to_owned_c(err); LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError"); *ret_copy = APIError_apimisuse_error(err_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_APIError_fee_rate_too_high"))) TS_APIError_fee_rate_too_high(jstring err, int32_t feerate) { +uint64_t __attribute__((export_name("TS_APIError_fee_rate_too_high"))) TS_APIError_fee_rate_too_high(jstring err, int32_t feerate) { 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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_APIError_route_error"))) TS_APIError_route_error(jstring err) { +uint64_t __attribute__((export_name("TS_APIError_route_error"))) TS_APIError_route_error(jstring err) { LDKStr err_conv = str_ref_to_owned_c(err); LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError"); *ret_copy = APIError_route_error(err_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_APIError_channel_unavailable"))) TS_APIError_channel_unavailable(jstring err) { +uint64_t __attribute__((export_name("TS_APIError_channel_unavailable"))) TS_APIError_channel_unavailable(jstring err) { LDKStr err_conv = str_ref_to_owned_c(err); LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError"); *ret_copy = APIError_channel_unavailable(err_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_APIError_monitor_update_failed"))) TS_APIError_monitor_update_failed() { +uint64_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(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_APIError_incompatible_shutdown_script"))) TS_APIError_incompatible_shutdown_script(uint32_t script) { +uint64_t __attribute__((export_name("TS_APIError_incompatible_shutdown_script"))) TS_APIError_incompatible_shutdown_script(uint64_t script) { LDKShutdownScript script_conv; - script_conv.inner = (void*)(script & (~1)); - script_conv.is_owned = (script & 1) || (script == 0); + script_conv.inner = untag_ptr(script); + script_conv.is_owned = ptr_is_owned(script); CHECK_INNER_FIELD_ACCESS_OR_NULL(script_conv); script_conv = ShutdownScript_clone(&script_conv); LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError"); *ret_copy = APIError_incompatible_shutdown_script(script_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_BigSize_free"))) TS_BigSize_free(uint32_t this_obj) { +void __attribute__((export_name("TS_BigSize_free"))) TS_BigSize_free(uint64_t this_obj) { LDKBigSize this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); BigSize_free(this_obj_conv); } -int64_t __attribute__((export_name("TS_BigSize_get_a"))) TS_BigSize_get_a(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_BigSize_get_a"))) TS_BigSize_get_a(uint64_t this_ptr) { LDKBigSize this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = BigSize_get_a(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_BigSize_set_a"))) TS_BigSize_set_a(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_BigSize_set_a"))) TS_BigSize_set_a(uint64_t this_ptr, int64_t val) { LDKBigSize this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; BigSize_set_a(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_BigSize_new"))) TS_BigSize_new(int64_t a_arg) { +uint64_t __attribute__((export_name("TS_BigSize_new"))) TS_BigSize_new(int64_t a_arg) { LDKBigSize ret_var = BigSize_new(a_arg); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_Hostname_free"))) TS_Hostname_free(uint32_t this_obj) { +void __attribute__((export_name("TS_Hostname_free"))) TS_Hostname_free(uint64_t this_obj) { LDKHostname this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); Hostname_free(this_obj_conv); } -static inline uintptr_t Hostname_clone_ptr(LDKHostname *NONNULL_PTR arg) { +static inline uint64_t Hostname_clone_ptr(LDKHostname *NONNULL_PTR arg) { LDKHostname ret_var = Hostname_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_Hostname_clone_ptr"))) TS_Hostname_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_Hostname_clone_ptr"))) TS_Hostname_clone_ptr(uint64_t arg) { LDKHostname arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = Hostname_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = Hostname_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_Hostname_clone"))) TS_Hostname_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_Hostname_clone"))) TS_Hostname_clone(uint64_t orig) { LDKHostname orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKHostname ret_var = Hostname_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_t __attribute__((export_name("TS_Hostname_len"))) TS_Hostname_len(uint32_t this_arg) { +int8_t __attribute__((export_name("TS_Hostname_len"))) TS_Hostname_len(uint64_t this_arg) { LDKHostname this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int8_t ret_conv = Hostname_len(&this_arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_sign"))) TS_sign(int8_tArray msg, int8_tArray sk) { +uint64_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; @@ -21802,10 +20519,10 @@ uint32_t __attribute__((export_name("TS_sign"))) TS_sign(int8_tArray msg, int8_ LDKCResult_StringErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_StringErrorZ), "LDKCResult_StringErrorZ"); *ret_conv = sign(msg_ref, sk_ref); FREE(msg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_recover_pk"))) TS_recover_pk(int8_tArray msg, jstring sig) { +uint64_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; @@ -21813,7 +20530,7 @@ uint32_t __attribute__((export_name("TS_recover_pk"))) TS_recover_pk(int8_tArra LDKCResult_PublicKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PublicKeyErrorZ), "LDKCResult_PublicKeyErrorZ"); *ret_conv = recover_pk(msg_ref, sig_conv); FREE(msg); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } jboolean __attribute__((export_name("TS_verify"))) TS_verify(int8_tArray msg, jstring sig, int8_tArray pk) { @@ -21854,17 +20571,17 @@ int8_tArray __attribute__((export_name("TS_construct_invoice_preimage"))) TS_co return ret_arr; } -void __attribute__((export_name("TS_Persister_free"))) TS_Persister_free(uint32_t this_ptr) { - if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_Persister_free"))) TS_Persister_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKPersister this_ptr_conv = *(LDKPersister*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); Persister_free(this_ptr_conv); } -uint32_t __attribute__((export_name("TS_Level_clone"))) TS_Level_clone(uint32_t orig) { - LDKLevel* orig_conv = (LDKLevel*)(orig & ~1); +uint32_t __attribute__((export_name("TS_Level_clone"))) TS_Level_clone(uint64_t orig) { + LDKLevel* orig_conv = (LDKLevel*)untag_ptr(orig); uint32_t ret_conv = LDKLevel_to_js(Level_clone(orig_conv)); return ret_conv; } @@ -21899,15 +20616,15 @@ uint32_t __attribute__((export_name("TS_Level_error"))) TS_Level_error() { return ret_conv; } -jboolean __attribute__((export_name("TS_Level_eq"))) TS_Level_eq(uint32_t a, uint32_t b) { - LDKLevel* a_conv = (LDKLevel*)(a & ~1); - LDKLevel* b_conv = (LDKLevel*)(b & ~1); +jboolean __attribute__((export_name("TS_Level_eq"))) TS_Level_eq(uint64_t a, uint64_t b) { + LDKLevel* a_conv = (LDKLevel*)untag_ptr(a); + LDKLevel* b_conv = (LDKLevel*)untag_ptr(b); jboolean ret_conv = Level_eq(a_conv, b_conv); return ret_conv; } -int64_t __attribute__((export_name("TS_Level_hash"))) TS_Level_hash(uint32_t o) { - LDKLevel* o_conv = (LDKLevel*)(o & ~1); +int64_t __attribute__((export_name("TS_Level_hash"))) TS_Level_hash(uint64_t o) { + LDKLevel* o_conv = (LDKLevel*)untag_ptr(o); int64_t ret_conv = Level_hash(o_conv); return ret_conv; } @@ -21917,751 +20634,744 @@ uint32_t __attribute__((export_name("TS_Level_max"))) TS_Level_max() { return ret_conv; } -void __attribute__((export_name("TS_Record_free"))) TS_Record_free(uint32_t this_obj) { +void __attribute__((export_name("TS_Record_free"))) TS_Record_free(uint64_t this_obj) { LDKRecord this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); Record_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_Record_get_level"))) TS_Record_get_level(uint32_t this_ptr) { +uint32_t __attribute__((export_name("TS_Record_get_level"))) TS_Record_get_level(uint64_t this_ptr) { LDKRecord this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; uint32_t ret_conv = LDKLevel_to_js(Record_get_level(&this_ptr_conv)); return ret_conv; } -void __attribute__((export_name("TS_Record_set_level"))) TS_Record_set_level(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_Record_set_level"))) TS_Record_set_level(uint64_t this_ptr, uint32_t val) { LDKRecord this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKLevel val_conv = LDKLevel_from_js(val); Record_set_level(&this_ptr_conv, val_conv); } -jstring __attribute__((export_name("TS_Record_get_args"))) TS_Record_get_args(uint32_t this_ptr) { +jstring __attribute__((export_name("TS_Record_get_args"))) TS_Record_get_args(uint64_t this_ptr) { LDKRecord this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKStr ret_str = Record_get_args(&this_ptr_conv); jstring ret_conv = str_ref_to_ts(ret_str.chars, ret_str.len); Str_free(ret_str); return ret_conv; } -void __attribute__((export_name("TS_Record_set_args"))) TS_Record_set_args(uint32_t this_ptr, jstring val) { +void __attribute__((export_name("TS_Record_set_args"))) TS_Record_set_args(uint64_t this_ptr, jstring val) { LDKRecord this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKStr val_conv = str_ref_to_owned_c(val); Record_set_args(&this_ptr_conv, val_conv); } -jstring __attribute__((export_name("TS_Record_get_module_path"))) TS_Record_get_module_path(uint32_t this_ptr) { +jstring __attribute__((export_name("TS_Record_get_module_path"))) TS_Record_get_module_path(uint64_t this_ptr) { LDKRecord this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKStr ret_str = Record_get_module_path(&this_ptr_conv); jstring ret_conv = str_ref_to_ts(ret_str.chars, ret_str.len); Str_free(ret_str); return ret_conv; } -void __attribute__((export_name("TS_Record_set_module_path"))) TS_Record_set_module_path(uint32_t this_ptr, jstring val) { +void __attribute__((export_name("TS_Record_set_module_path"))) TS_Record_set_module_path(uint64_t this_ptr, jstring val) { LDKRecord this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKStr val_conv = str_ref_to_owned_c(val); Record_set_module_path(&this_ptr_conv, val_conv); } -jstring __attribute__((export_name("TS_Record_get_file"))) TS_Record_get_file(uint32_t this_ptr) { +jstring __attribute__((export_name("TS_Record_get_file"))) TS_Record_get_file(uint64_t this_ptr) { LDKRecord this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKStr ret_str = Record_get_file(&this_ptr_conv); jstring ret_conv = str_ref_to_ts(ret_str.chars, ret_str.len); Str_free(ret_str); return ret_conv; } -void __attribute__((export_name("TS_Record_set_file"))) TS_Record_set_file(uint32_t this_ptr, jstring val) { +void __attribute__((export_name("TS_Record_set_file"))) TS_Record_set_file(uint64_t this_ptr, jstring val) { LDKRecord this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKStr val_conv = str_ref_to_owned_c(val); Record_set_file(&this_ptr_conv, val_conv); } -int32_t __attribute__((export_name("TS_Record_get_line"))) TS_Record_get_line(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_Record_get_line"))) TS_Record_get_line(uint64_t this_ptr) { LDKRecord this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = Record_get_line(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_Record_set_line"))) TS_Record_set_line(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_Record_set_line"))) TS_Record_set_line(uint64_t this_ptr, int32_t val) { LDKRecord this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; Record_set_line(&this_ptr_conv, val); } -static inline uintptr_t Record_clone_ptr(LDKRecord *NONNULL_PTR arg) { +static inline uint64_t Record_clone_ptr(LDKRecord *NONNULL_PTR arg) { LDKRecord ret_var = Record_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_Record_clone_ptr"))) TS_Record_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_Record_clone_ptr"))) TS_Record_clone_ptr(uint64_t arg) { LDKRecord arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = Record_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = Record_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_Record_clone"))) TS_Record_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_Record_clone"))) TS_Record_clone(uint64_t orig) { LDKRecord orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKRecord ret_var = Record_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_Logger_free"))) TS_Logger_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKLogger this_ptr_conv = *(LDKLogger*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); Logger_free(this_ptr_conv); } -void __attribute__((export_name("TS_ChannelHandshakeConfig_free"))) TS_ChannelHandshakeConfig_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChannelHandshakeConfig_free"))) TS_ChannelHandshakeConfig_free(uint64_t this_obj) { LDKChannelHandshakeConfig this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChannelHandshakeConfig_free(this_obj_conv); } -int32_t __attribute__((export_name("TS_ChannelHandshakeConfig_get_minimum_depth"))) TS_ChannelHandshakeConfig_get_minimum_depth(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_ChannelHandshakeConfig_get_minimum_depth"))) TS_ChannelHandshakeConfig_get_minimum_depth(uint64_t this_ptr) { LDKChannelHandshakeConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = ChannelHandshakeConfig_get_minimum_depth(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelHandshakeConfig_set_minimum_depth"))) TS_ChannelHandshakeConfig_set_minimum_depth(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_ChannelHandshakeConfig_set_minimum_depth"))) TS_ChannelHandshakeConfig_set_minimum_depth(uint64_t this_ptr, int32_t val) { LDKChannelHandshakeConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelHandshakeConfig_set_minimum_depth(&this_ptr_conv, val); } -int16_t __attribute__((export_name("TS_ChannelHandshakeConfig_get_our_to_self_delay"))) TS_ChannelHandshakeConfig_get_our_to_self_delay(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_ChannelHandshakeConfig_get_our_to_self_delay"))) TS_ChannelHandshakeConfig_get_our_to_self_delay(uint64_t this_ptr) { LDKChannelHandshakeConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = ChannelHandshakeConfig_get_our_to_self_delay(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelHandshakeConfig_set_our_to_self_delay"))) TS_ChannelHandshakeConfig_set_our_to_self_delay(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_ChannelHandshakeConfig_set_our_to_self_delay"))) TS_ChannelHandshakeConfig_set_our_to_self_delay(uint64_t this_ptr, int16_t val) { LDKChannelHandshakeConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelHandshakeConfig_set_our_to_self_delay(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ChannelHandshakeConfig_get_our_htlc_minimum_msat"))) TS_ChannelHandshakeConfig_get_our_htlc_minimum_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelHandshakeConfig_get_our_htlc_minimum_msat"))) TS_ChannelHandshakeConfig_get_our_htlc_minimum_msat(uint64_t this_ptr) { LDKChannelHandshakeConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelHandshakeConfig_get_our_htlc_minimum_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelHandshakeConfig_set_our_htlc_minimum_msat"))) TS_ChannelHandshakeConfig_set_our_htlc_minimum_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelHandshakeConfig_set_our_htlc_minimum_msat"))) TS_ChannelHandshakeConfig_set_our_htlc_minimum_msat(uint64_t this_ptr, int64_t val) { LDKChannelHandshakeConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelHandshakeConfig_set_our_htlc_minimum_msat(&this_ptr_conv, val); } -int8_t __attribute__((export_name("TS_ChannelHandshakeConfig_get_max_inbound_htlc_value_in_flight_percent_of_channel"))) TS_ChannelHandshakeConfig_get_max_inbound_htlc_value_in_flight_percent_of_channel(uint32_t this_ptr) { +int8_t __attribute__((export_name("TS_ChannelHandshakeConfig_get_max_inbound_htlc_value_in_flight_percent_of_channel"))) TS_ChannelHandshakeConfig_get_max_inbound_htlc_value_in_flight_percent_of_channel(uint64_t this_ptr) { LDKChannelHandshakeConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_t ret_conv = ChannelHandshakeConfig_get_max_inbound_htlc_value_in_flight_percent_of_channel(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelHandshakeConfig_set_max_inbound_htlc_value_in_flight_percent_of_channel"))) TS_ChannelHandshakeConfig_set_max_inbound_htlc_value_in_flight_percent_of_channel(uint32_t this_ptr, int8_t val) { +void __attribute__((export_name("TS_ChannelHandshakeConfig_set_max_inbound_htlc_value_in_flight_percent_of_channel"))) TS_ChannelHandshakeConfig_set_max_inbound_htlc_value_in_flight_percent_of_channel(uint64_t this_ptr, int8_t val) { LDKChannelHandshakeConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelHandshakeConfig_set_max_inbound_htlc_value_in_flight_percent_of_channel(&this_ptr_conv, val); } -jboolean __attribute__((export_name("TS_ChannelHandshakeConfig_get_negotiate_scid_privacy"))) TS_ChannelHandshakeConfig_get_negotiate_scid_privacy(uint32_t this_ptr) { +jboolean __attribute__((export_name("TS_ChannelHandshakeConfig_get_negotiate_scid_privacy"))) TS_ChannelHandshakeConfig_get_negotiate_scid_privacy(uint64_t this_ptr) { LDKChannelHandshakeConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; jboolean ret_conv = ChannelHandshakeConfig_get_negotiate_scid_privacy(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelHandshakeConfig_set_negotiate_scid_privacy"))) TS_ChannelHandshakeConfig_set_negotiate_scid_privacy(uint32_t this_ptr, jboolean val) { +void __attribute__((export_name("TS_ChannelHandshakeConfig_set_negotiate_scid_privacy"))) TS_ChannelHandshakeConfig_set_negotiate_scid_privacy(uint64_t this_ptr, jboolean val) { LDKChannelHandshakeConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelHandshakeConfig_set_negotiate_scid_privacy(&this_ptr_conv, val); } -jboolean __attribute__((export_name("TS_ChannelHandshakeConfig_get_announced_channel"))) TS_ChannelHandshakeConfig_get_announced_channel(uint32_t this_ptr) { +jboolean __attribute__((export_name("TS_ChannelHandshakeConfig_get_announced_channel"))) TS_ChannelHandshakeConfig_get_announced_channel(uint64_t this_ptr) { LDKChannelHandshakeConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; jboolean ret_conv = ChannelHandshakeConfig_get_announced_channel(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelHandshakeConfig_set_announced_channel"))) TS_ChannelHandshakeConfig_set_announced_channel(uint32_t this_ptr, jboolean val) { +void __attribute__((export_name("TS_ChannelHandshakeConfig_set_announced_channel"))) TS_ChannelHandshakeConfig_set_announced_channel(uint64_t this_ptr, jboolean val) { LDKChannelHandshakeConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelHandshakeConfig_set_announced_channel(&this_ptr_conv, val); } -jboolean __attribute__((export_name("TS_ChannelHandshakeConfig_get_commit_upfront_shutdown_pubkey"))) TS_ChannelHandshakeConfig_get_commit_upfront_shutdown_pubkey(uint32_t this_ptr) { +jboolean __attribute__((export_name("TS_ChannelHandshakeConfig_get_commit_upfront_shutdown_pubkey"))) TS_ChannelHandshakeConfig_get_commit_upfront_shutdown_pubkey(uint64_t this_ptr) { LDKChannelHandshakeConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; jboolean ret_conv = ChannelHandshakeConfig_get_commit_upfront_shutdown_pubkey(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelHandshakeConfig_set_commit_upfront_shutdown_pubkey"))) TS_ChannelHandshakeConfig_set_commit_upfront_shutdown_pubkey(uint32_t this_ptr, jboolean val) { +void __attribute__((export_name("TS_ChannelHandshakeConfig_set_commit_upfront_shutdown_pubkey"))) TS_ChannelHandshakeConfig_set_commit_upfront_shutdown_pubkey(uint64_t this_ptr, jboolean val) { LDKChannelHandshakeConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelHandshakeConfig_set_commit_upfront_shutdown_pubkey(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_ChannelHandshakeConfig_new"))) TS_ChannelHandshakeConfig_new(int32_t minimum_depth_arg, int16_t our_to_self_delay_arg, int64_t our_htlc_minimum_msat_arg, int8_t max_inbound_htlc_value_in_flight_percent_of_channel_arg, jboolean negotiate_scid_privacy_arg, jboolean announced_channel_arg, jboolean commit_upfront_shutdown_pubkey_arg) { +uint64_t __attribute__((export_name("TS_ChannelHandshakeConfig_new"))) TS_ChannelHandshakeConfig_new(int32_t minimum_depth_arg, int16_t our_to_self_delay_arg, int64_t our_htlc_minimum_msat_arg, int8_t max_inbound_htlc_value_in_flight_percent_of_channel_arg, jboolean negotiate_scid_privacy_arg, jboolean announced_channel_arg, jboolean commit_upfront_shutdown_pubkey_arg) { LDKChannelHandshakeConfig ret_var = ChannelHandshakeConfig_new(minimum_depth_arg, our_to_self_delay_arg, our_htlc_minimum_msat_arg, max_inbound_htlc_value_in_flight_percent_of_channel_arg, negotiate_scid_privacy_arg, announced_channel_arg, commit_upfront_shutdown_pubkey_arg); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t ChannelHandshakeConfig_clone_ptr(LDKChannelHandshakeConfig *NONNULL_PTR arg) { +static inline uint64_t ChannelHandshakeConfig_clone_ptr(LDKChannelHandshakeConfig *NONNULL_PTR arg) { LDKChannelHandshakeConfig ret_var = ChannelHandshakeConfig_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelHandshakeConfig_clone_ptr"))) TS_ChannelHandshakeConfig_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ChannelHandshakeConfig_clone_ptr"))) TS_ChannelHandshakeConfig_clone_ptr(uint64_t arg) { LDKChannelHandshakeConfig arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ChannelHandshakeConfig_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ChannelHandshakeConfig_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelHandshakeConfig_clone"))) TS_ChannelHandshakeConfig_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ChannelHandshakeConfig_clone"))) TS_ChannelHandshakeConfig_clone(uint64_t orig) { LDKChannelHandshakeConfig orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKChannelHandshakeConfig ret_var = ChannelHandshakeConfig_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelHandshakeConfig_default"))) TS_ChannelHandshakeConfig_default() { +uint64_t __attribute__((export_name("TS_ChannelHandshakeConfig_default"))) TS_ChannelHandshakeConfig_default() { LDKChannelHandshakeConfig ret_var = ChannelHandshakeConfig_default(); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelHandshakeLimits_free"))) TS_ChannelHandshakeLimits_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChannelHandshakeLimits_free"))) TS_ChannelHandshakeLimits_free(uint64_t this_obj) { LDKChannelHandshakeLimits this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChannelHandshakeLimits_free(this_obj_conv); } -int64_t __attribute__((export_name("TS_ChannelHandshakeLimits_get_min_funding_satoshis"))) TS_ChannelHandshakeLimits_get_min_funding_satoshis(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelHandshakeLimits_get_min_funding_satoshis"))) TS_ChannelHandshakeLimits_get_min_funding_satoshis(uint64_t this_ptr) { LDKChannelHandshakeLimits this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelHandshakeLimits_get_min_funding_satoshis(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelHandshakeLimits_set_min_funding_satoshis"))) TS_ChannelHandshakeLimits_set_min_funding_satoshis(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelHandshakeLimits_set_min_funding_satoshis"))) TS_ChannelHandshakeLimits_set_min_funding_satoshis(uint64_t this_ptr, int64_t val) { LDKChannelHandshakeLimits this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelHandshakeLimits_set_min_funding_satoshis(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ChannelHandshakeLimits_get_max_funding_satoshis"))) TS_ChannelHandshakeLimits_get_max_funding_satoshis(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelHandshakeLimits_get_max_funding_satoshis"))) TS_ChannelHandshakeLimits_get_max_funding_satoshis(uint64_t this_ptr) { LDKChannelHandshakeLimits this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelHandshakeLimits_get_max_funding_satoshis(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelHandshakeLimits_set_max_funding_satoshis"))) TS_ChannelHandshakeLimits_set_max_funding_satoshis(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelHandshakeLimits_set_max_funding_satoshis"))) TS_ChannelHandshakeLimits_set_max_funding_satoshis(uint64_t this_ptr, int64_t val) { LDKChannelHandshakeLimits this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelHandshakeLimits_set_max_funding_satoshis(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ChannelHandshakeLimits_get_max_htlc_minimum_msat"))) TS_ChannelHandshakeLimits_get_max_htlc_minimum_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelHandshakeLimits_get_max_htlc_minimum_msat"))) TS_ChannelHandshakeLimits_get_max_htlc_minimum_msat(uint64_t this_ptr) { LDKChannelHandshakeLimits this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelHandshakeLimits_get_max_htlc_minimum_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelHandshakeLimits_set_max_htlc_minimum_msat"))) TS_ChannelHandshakeLimits_set_max_htlc_minimum_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelHandshakeLimits_set_max_htlc_minimum_msat"))) TS_ChannelHandshakeLimits_set_max_htlc_minimum_msat(uint64_t this_ptr, int64_t val) { LDKChannelHandshakeLimits this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelHandshakeLimits_set_max_htlc_minimum_msat(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ChannelHandshakeLimits_get_min_max_htlc_value_in_flight_msat"))) TS_ChannelHandshakeLimits_get_min_max_htlc_value_in_flight_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelHandshakeLimits_get_min_max_htlc_value_in_flight_msat"))) TS_ChannelHandshakeLimits_get_min_max_htlc_value_in_flight_msat(uint64_t this_ptr) { LDKChannelHandshakeLimits this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelHandshakeLimits_get_min_max_htlc_value_in_flight_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelHandshakeLimits_set_min_max_htlc_value_in_flight_msat"))) TS_ChannelHandshakeLimits_set_min_max_htlc_value_in_flight_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelHandshakeLimits_set_min_max_htlc_value_in_flight_msat"))) TS_ChannelHandshakeLimits_set_min_max_htlc_value_in_flight_msat(uint64_t this_ptr, int64_t val) { LDKChannelHandshakeLimits this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelHandshakeLimits_set_min_max_htlc_value_in_flight_msat(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ChannelHandshakeLimits_get_max_channel_reserve_satoshis"))) TS_ChannelHandshakeLimits_get_max_channel_reserve_satoshis(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelHandshakeLimits_get_max_channel_reserve_satoshis"))) TS_ChannelHandshakeLimits_get_max_channel_reserve_satoshis(uint64_t this_ptr) { LDKChannelHandshakeLimits this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelHandshakeLimits_get_max_channel_reserve_satoshis(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelHandshakeLimits_set_max_channel_reserve_satoshis"))) TS_ChannelHandshakeLimits_set_max_channel_reserve_satoshis(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelHandshakeLimits_set_max_channel_reserve_satoshis"))) TS_ChannelHandshakeLimits_set_max_channel_reserve_satoshis(uint64_t this_ptr, int64_t val) { LDKChannelHandshakeLimits this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelHandshakeLimits_set_max_channel_reserve_satoshis(&this_ptr_conv, val); } -int16_t __attribute__((export_name("TS_ChannelHandshakeLimits_get_min_max_accepted_htlcs"))) TS_ChannelHandshakeLimits_get_min_max_accepted_htlcs(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_ChannelHandshakeLimits_get_min_max_accepted_htlcs"))) TS_ChannelHandshakeLimits_get_min_max_accepted_htlcs(uint64_t this_ptr) { LDKChannelHandshakeLimits this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = ChannelHandshakeLimits_get_min_max_accepted_htlcs(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelHandshakeLimits_set_min_max_accepted_htlcs"))) TS_ChannelHandshakeLimits_set_min_max_accepted_htlcs(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_ChannelHandshakeLimits_set_min_max_accepted_htlcs"))) TS_ChannelHandshakeLimits_set_min_max_accepted_htlcs(uint64_t this_ptr, int16_t val) { LDKChannelHandshakeLimits this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelHandshakeLimits_set_min_max_accepted_htlcs(&this_ptr_conv, val); } -int32_t __attribute__((export_name("TS_ChannelHandshakeLimits_get_max_minimum_depth"))) TS_ChannelHandshakeLimits_get_max_minimum_depth(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_ChannelHandshakeLimits_get_max_minimum_depth"))) TS_ChannelHandshakeLimits_get_max_minimum_depth(uint64_t this_ptr) { LDKChannelHandshakeLimits this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = ChannelHandshakeLimits_get_max_minimum_depth(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelHandshakeLimits_set_max_minimum_depth"))) TS_ChannelHandshakeLimits_set_max_minimum_depth(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_ChannelHandshakeLimits_set_max_minimum_depth"))) TS_ChannelHandshakeLimits_set_max_minimum_depth(uint64_t this_ptr, int32_t val) { LDKChannelHandshakeLimits this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelHandshakeLimits_set_max_minimum_depth(&this_ptr_conv, val); } -jboolean __attribute__((export_name("TS_ChannelHandshakeLimits_get_trust_own_funding_0conf"))) TS_ChannelHandshakeLimits_get_trust_own_funding_0conf(uint32_t this_ptr) { +jboolean __attribute__((export_name("TS_ChannelHandshakeLimits_get_trust_own_funding_0conf"))) TS_ChannelHandshakeLimits_get_trust_own_funding_0conf(uint64_t this_ptr) { LDKChannelHandshakeLimits this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; jboolean ret_conv = ChannelHandshakeLimits_get_trust_own_funding_0conf(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelHandshakeLimits_set_trust_own_funding_0conf"))) TS_ChannelHandshakeLimits_set_trust_own_funding_0conf(uint32_t this_ptr, jboolean val) { +void __attribute__((export_name("TS_ChannelHandshakeLimits_set_trust_own_funding_0conf"))) TS_ChannelHandshakeLimits_set_trust_own_funding_0conf(uint64_t this_ptr, jboolean val) { LDKChannelHandshakeLimits this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelHandshakeLimits_set_trust_own_funding_0conf(&this_ptr_conv, val); } -jboolean __attribute__((export_name("TS_ChannelHandshakeLimits_get_force_announced_channel_preference"))) TS_ChannelHandshakeLimits_get_force_announced_channel_preference(uint32_t this_ptr) { +jboolean __attribute__((export_name("TS_ChannelHandshakeLimits_get_force_announced_channel_preference"))) TS_ChannelHandshakeLimits_get_force_announced_channel_preference(uint64_t this_ptr) { LDKChannelHandshakeLimits this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; jboolean ret_conv = ChannelHandshakeLimits_get_force_announced_channel_preference(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelHandshakeLimits_set_force_announced_channel_preference"))) TS_ChannelHandshakeLimits_set_force_announced_channel_preference(uint32_t this_ptr, jboolean val) { +void __attribute__((export_name("TS_ChannelHandshakeLimits_set_force_announced_channel_preference"))) TS_ChannelHandshakeLimits_set_force_announced_channel_preference(uint64_t this_ptr, jboolean val) { LDKChannelHandshakeLimits this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelHandshakeLimits_set_force_announced_channel_preference(&this_ptr_conv, val); } -int16_t __attribute__((export_name("TS_ChannelHandshakeLimits_get_their_to_self_delay"))) TS_ChannelHandshakeLimits_get_their_to_self_delay(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_ChannelHandshakeLimits_get_their_to_self_delay"))) TS_ChannelHandshakeLimits_get_their_to_self_delay(uint64_t this_ptr) { LDKChannelHandshakeLimits this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = ChannelHandshakeLimits_get_their_to_self_delay(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelHandshakeLimits_set_their_to_self_delay"))) TS_ChannelHandshakeLimits_set_their_to_self_delay(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_ChannelHandshakeLimits_set_their_to_self_delay"))) TS_ChannelHandshakeLimits_set_their_to_self_delay(uint64_t this_ptr, int16_t val) { LDKChannelHandshakeLimits this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelHandshakeLimits_set_their_to_self_delay(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_ChannelHandshakeLimits_new"))) TS_ChannelHandshakeLimits_new(int64_t min_funding_satoshis_arg, int64_t max_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 trust_own_funding_0conf_arg, jboolean force_announced_channel_preference_arg, int16_t their_to_self_delay_arg) { +uint64_t __attribute__((export_name("TS_ChannelHandshakeLimits_new"))) TS_ChannelHandshakeLimits_new(int64_t min_funding_satoshis_arg, int64_t max_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 trust_own_funding_0conf_arg, jboolean force_announced_channel_preference_arg, int16_t their_to_self_delay_arg) { LDKChannelHandshakeLimits ret_var = ChannelHandshakeLimits_new(min_funding_satoshis_arg, max_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, trust_own_funding_0conf_arg, force_announced_channel_preference_arg, their_to_self_delay_arg); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t ChannelHandshakeLimits_clone_ptr(LDKChannelHandshakeLimits *NONNULL_PTR arg) { +static inline uint64_t ChannelHandshakeLimits_clone_ptr(LDKChannelHandshakeLimits *NONNULL_PTR arg) { LDKChannelHandshakeLimits ret_var = ChannelHandshakeLimits_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelHandshakeLimits_clone_ptr"))) TS_ChannelHandshakeLimits_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ChannelHandshakeLimits_clone_ptr"))) TS_ChannelHandshakeLimits_clone_ptr(uint64_t arg) { LDKChannelHandshakeLimits arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ChannelHandshakeLimits_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ChannelHandshakeLimits_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelHandshakeLimits_clone"))) TS_ChannelHandshakeLimits_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ChannelHandshakeLimits_clone"))) TS_ChannelHandshakeLimits_clone(uint64_t orig) { LDKChannelHandshakeLimits orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKChannelHandshakeLimits ret_var = ChannelHandshakeLimits_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelHandshakeLimits_default"))) TS_ChannelHandshakeLimits_default() { +uint64_t __attribute__((export_name("TS_ChannelHandshakeLimits_default"))) TS_ChannelHandshakeLimits_default() { LDKChannelHandshakeLimits ret_var = ChannelHandshakeLimits_default(); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelConfig_free"))) TS_ChannelConfig_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChannelConfig_free"))) TS_ChannelConfig_free(uint64_t this_obj) { LDKChannelConfig this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChannelConfig_free(this_obj_conv); } -int32_t __attribute__((export_name("TS_ChannelConfig_get_forwarding_fee_proportional_millionths"))) TS_ChannelConfig_get_forwarding_fee_proportional_millionths(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_ChannelConfig_get_forwarding_fee_proportional_millionths"))) TS_ChannelConfig_get_forwarding_fee_proportional_millionths(uint64_t this_ptr) { LDKChannelConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = ChannelConfig_get_forwarding_fee_proportional_millionths(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelConfig_set_forwarding_fee_proportional_millionths"))) TS_ChannelConfig_set_forwarding_fee_proportional_millionths(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_ChannelConfig_set_forwarding_fee_proportional_millionths"))) TS_ChannelConfig_set_forwarding_fee_proportional_millionths(uint64_t this_ptr, int32_t val) { LDKChannelConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelConfig_set_forwarding_fee_proportional_millionths(&this_ptr_conv, val); } -int32_t __attribute__((export_name("TS_ChannelConfig_get_forwarding_fee_base_msat"))) TS_ChannelConfig_get_forwarding_fee_base_msat(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_ChannelConfig_get_forwarding_fee_base_msat"))) TS_ChannelConfig_get_forwarding_fee_base_msat(uint64_t this_ptr) { LDKChannelConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = ChannelConfig_get_forwarding_fee_base_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelConfig_set_forwarding_fee_base_msat"))) TS_ChannelConfig_set_forwarding_fee_base_msat(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_ChannelConfig_set_forwarding_fee_base_msat"))) TS_ChannelConfig_set_forwarding_fee_base_msat(uint64_t this_ptr, int32_t val) { LDKChannelConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelConfig_set_forwarding_fee_base_msat(&this_ptr_conv, val); } -int16_t __attribute__((export_name("TS_ChannelConfig_get_cltv_expiry_delta"))) TS_ChannelConfig_get_cltv_expiry_delta(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_ChannelConfig_get_cltv_expiry_delta"))) TS_ChannelConfig_get_cltv_expiry_delta(uint64_t this_ptr) { LDKChannelConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = ChannelConfig_get_cltv_expiry_delta(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelConfig_set_cltv_expiry_delta"))) TS_ChannelConfig_set_cltv_expiry_delta(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_ChannelConfig_set_cltv_expiry_delta"))) TS_ChannelConfig_set_cltv_expiry_delta(uint64_t this_ptr, int16_t val) { LDKChannelConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelConfig_set_cltv_expiry_delta(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ChannelConfig_get_max_dust_htlc_exposure_msat"))) TS_ChannelConfig_get_max_dust_htlc_exposure_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelConfig_get_max_dust_htlc_exposure_msat"))) TS_ChannelConfig_get_max_dust_htlc_exposure_msat(uint64_t this_ptr) { LDKChannelConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelConfig_get_max_dust_htlc_exposure_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelConfig_set_max_dust_htlc_exposure_msat"))) TS_ChannelConfig_set_max_dust_htlc_exposure_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelConfig_set_max_dust_htlc_exposure_msat"))) TS_ChannelConfig_set_max_dust_htlc_exposure_msat(uint64_t this_ptr, int64_t val) { LDKChannelConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelConfig_set_max_dust_htlc_exposure_msat(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ChannelConfig_get_force_close_avoidance_max_fee_satoshis"))) TS_ChannelConfig_get_force_close_avoidance_max_fee_satoshis(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelConfig_get_force_close_avoidance_max_fee_satoshis"))) TS_ChannelConfig_get_force_close_avoidance_max_fee_satoshis(uint64_t this_ptr) { LDKChannelConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelConfig_get_force_close_avoidance_max_fee_satoshis(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelConfig_set_force_close_avoidance_max_fee_satoshis"))) TS_ChannelConfig_set_force_close_avoidance_max_fee_satoshis(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelConfig_set_force_close_avoidance_max_fee_satoshis"))) TS_ChannelConfig_set_force_close_avoidance_max_fee_satoshis(uint64_t this_ptr, int64_t val) { LDKChannelConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelConfig_set_force_close_avoidance_max_fee_satoshis(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_ChannelConfig_new"))) TS_ChannelConfig_new(int32_t forwarding_fee_proportional_millionths_arg, int32_t forwarding_fee_base_msat_arg, int16_t cltv_expiry_delta_arg, int64_t max_dust_htlc_exposure_msat_arg, int64_t force_close_avoidance_max_fee_satoshis_arg) { +uint64_t __attribute__((export_name("TS_ChannelConfig_new"))) TS_ChannelConfig_new(int32_t forwarding_fee_proportional_millionths_arg, int32_t forwarding_fee_base_msat_arg, int16_t cltv_expiry_delta_arg, int64_t max_dust_htlc_exposure_msat_arg, int64_t force_close_avoidance_max_fee_satoshis_arg) { LDKChannelConfig ret_var = ChannelConfig_new(forwarding_fee_proportional_millionths_arg, forwarding_fee_base_msat_arg, cltv_expiry_delta_arg, max_dust_htlc_exposure_msat_arg, force_close_avoidance_max_fee_satoshis_arg); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t ChannelConfig_clone_ptr(LDKChannelConfig *NONNULL_PTR arg) { +static inline uint64_t ChannelConfig_clone_ptr(LDKChannelConfig *NONNULL_PTR arg) { LDKChannelConfig ret_var = ChannelConfig_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelConfig_clone_ptr"))) TS_ChannelConfig_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ChannelConfig_clone_ptr"))) TS_ChannelConfig_clone_ptr(uint64_t arg) { LDKChannelConfig arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ChannelConfig_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ChannelConfig_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelConfig_clone"))) TS_ChannelConfig_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ChannelConfig_clone"))) TS_ChannelConfig_clone(uint64_t orig) { LDKChannelConfig orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKChannelConfig ret_var = ChannelConfig_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelConfig_default"))) TS_ChannelConfig_default() { +uint64_t __attribute__((export_name("TS_ChannelConfig_default"))) TS_ChannelConfig_default() { LDKChannelConfig ret_var = ChannelConfig_default(); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_ChannelConfig_write"))) TS_ChannelConfig_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ChannelConfig_write"))) TS_ChannelConfig_write(uint64_t obj) { LDKChannelConfig obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ChannelConfig_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -22669,341 +21379,304 @@ int8_tArray __attribute__((export_name("TS_ChannelConfig_write"))) TS_ChannelCo return ret_arr; } -uint32_t __attribute__((export_name("TS_ChannelConfig_read"))) TS_ChannelConfig_read(int8_tArray ser) { +uint64_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; LDKCResult_ChannelConfigDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelConfigDecodeErrorZ), "LDKCResult_ChannelConfigDecodeErrorZ"); *ret_conv = ChannelConfig_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_UserConfig_free"))) TS_UserConfig_free(uint32_t this_obj) { +void __attribute__((export_name("TS_UserConfig_free"))) TS_UserConfig_free(uint64_t this_obj) { LDKUserConfig this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); UserConfig_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_UserConfig_get_channel_handshake_config"))) TS_UserConfig_get_channel_handshake_config(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_UserConfig_get_channel_handshake_config"))) TS_UserConfig_get_channel_handshake_config(uint64_t this_ptr) { LDKUserConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelHandshakeConfig ret_var = UserConfig_get_channel_handshake_config(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_UserConfig_set_channel_handshake_config"))) TS_UserConfig_set_channel_handshake_config(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_UserConfig_set_channel_handshake_config"))) TS_UserConfig_set_channel_handshake_config(uint64_t this_ptr, uint64_t val) { LDKUserConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelHandshakeConfig val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = ChannelHandshakeConfig_clone(&val_conv); UserConfig_set_channel_handshake_config(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_UserConfig_get_channel_handshake_limits"))) TS_UserConfig_get_channel_handshake_limits(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_UserConfig_get_channel_handshake_limits"))) TS_UserConfig_get_channel_handshake_limits(uint64_t this_ptr) { LDKUserConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelHandshakeLimits ret_var = UserConfig_get_channel_handshake_limits(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_UserConfig_set_channel_handshake_limits"))) TS_UserConfig_set_channel_handshake_limits(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_UserConfig_set_channel_handshake_limits"))) TS_UserConfig_set_channel_handshake_limits(uint64_t this_ptr, uint64_t val) { LDKUserConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelHandshakeLimits val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = ChannelHandshakeLimits_clone(&val_conv); UserConfig_set_channel_handshake_limits(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_UserConfig_get_channel_config"))) TS_UserConfig_get_channel_config(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_UserConfig_get_channel_config"))) TS_UserConfig_get_channel_config(uint64_t this_ptr) { LDKUserConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelConfig ret_var = UserConfig_get_channel_config(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_UserConfig_set_channel_config"))) TS_UserConfig_set_channel_config(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_UserConfig_set_channel_config"))) TS_UserConfig_set_channel_config(uint64_t this_ptr, uint64_t val) { LDKUserConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelConfig val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = ChannelConfig_clone(&val_conv); UserConfig_set_channel_config(&this_ptr_conv, val_conv); } -jboolean __attribute__((export_name("TS_UserConfig_get_accept_forwards_to_priv_channels"))) TS_UserConfig_get_accept_forwards_to_priv_channels(uint32_t this_ptr) { +jboolean __attribute__((export_name("TS_UserConfig_get_accept_forwards_to_priv_channels"))) TS_UserConfig_get_accept_forwards_to_priv_channels(uint64_t this_ptr) { LDKUserConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; jboolean ret_conv = UserConfig_get_accept_forwards_to_priv_channels(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UserConfig_set_accept_forwards_to_priv_channels"))) TS_UserConfig_set_accept_forwards_to_priv_channels(uint32_t this_ptr, jboolean val) { +void __attribute__((export_name("TS_UserConfig_set_accept_forwards_to_priv_channels"))) TS_UserConfig_set_accept_forwards_to_priv_channels(uint64_t this_ptr, jboolean val) { LDKUserConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UserConfig_set_accept_forwards_to_priv_channels(&this_ptr_conv, val); } -jboolean __attribute__((export_name("TS_UserConfig_get_accept_inbound_channels"))) TS_UserConfig_get_accept_inbound_channels(uint32_t this_ptr) { +jboolean __attribute__((export_name("TS_UserConfig_get_accept_inbound_channels"))) TS_UserConfig_get_accept_inbound_channels(uint64_t this_ptr) { LDKUserConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; jboolean ret_conv = UserConfig_get_accept_inbound_channels(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UserConfig_set_accept_inbound_channels"))) TS_UserConfig_set_accept_inbound_channels(uint32_t this_ptr, jboolean val) { +void __attribute__((export_name("TS_UserConfig_set_accept_inbound_channels"))) TS_UserConfig_set_accept_inbound_channels(uint64_t this_ptr, jboolean val) { LDKUserConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UserConfig_set_accept_inbound_channels(&this_ptr_conv, val); } -jboolean __attribute__((export_name("TS_UserConfig_get_manually_accept_inbound_channels"))) TS_UserConfig_get_manually_accept_inbound_channels(uint32_t this_ptr) { +jboolean __attribute__((export_name("TS_UserConfig_get_manually_accept_inbound_channels"))) TS_UserConfig_get_manually_accept_inbound_channels(uint64_t this_ptr) { LDKUserConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; jboolean ret_conv = UserConfig_get_manually_accept_inbound_channels(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UserConfig_set_manually_accept_inbound_channels"))) TS_UserConfig_set_manually_accept_inbound_channels(uint32_t this_ptr, jboolean val) { +void __attribute__((export_name("TS_UserConfig_set_manually_accept_inbound_channels"))) TS_UserConfig_set_manually_accept_inbound_channels(uint64_t this_ptr, jboolean val) { LDKUserConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UserConfig_set_manually_accept_inbound_channels(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_UserConfig_new"))) TS_UserConfig_new(uint32_t channel_handshake_config_arg, uint32_t channel_handshake_limits_arg, uint32_t channel_config_arg, jboolean accept_forwards_to_priv_channels_arg, jboolean accept_inbound_channels_arg, jboolean manually_accept_inbound_channels_arg) { +uint64_t __attribute__((export_name("TS_UserConfig_new"))) TS_UserConfig_new(uint64_t channel_handshake_config_arg, uint64_t channel_handshake_limits_arg, uint64_t channel_config_arg, jboolean accept_forwards_to_priv_channels_arg, jboolean accept_inbound_channels_arg, jboolean manually_accept_inbound_channels_arg) { LDKChannelHandshakeConfig channel_handshake_config_arg_conv; - channel_handshake_config_arg_conv.inner = (void*)(channel_handshake_config_arg & (~1)); - channel_handshake_config_arg_conv.is_owned = (channel_handshake_config_arg & 1) || (channel_handshake_config_arg == 0); + channel_handshake_config_arg_conv.inner = untag_ptr(channel_handshake_config_arg); + channel_handshake_config_arg_conv.is_owned = ptr_is_owned(channel_handshake_config_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_handshake_config_arg_conv); channel_handshake_config_arg_conv = ChannelHandshakeConfig_clone(&channel_handshake_config_arg_conv); LDKChannelHandshakeLimits channel_handshake_limits_arg_conv; - channel_handshake_limits_arg_conv.inner = (void*)(channel_handshake_limits_arg & (~1)); - channel_handshake_limits_arg_conv.is_owned = (channel_handshake_limits_arg & 1) || (channel_handshake_limits_arg == 0); + channel_handshake_limits_arg_conv.inner = untag_ptr(channel_handshake_limits_arg); + channel_handshake_limits_arg_conv.is_owned = ptr_is_owned(channel_handshake_limits_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_handshake_limits_arg_conv); channel_handshake_limits_arg_conv = ChannelHandshakeLimits_clone(&channel_handshake_limits_arg_conv); LDKChannelConfig channel_config_arg_conv; - channel_config_arg_conv.inner = (void*)(channel_config_arg & (~1)); - channel_config_arg_conv.is_owned = (channel_config_arg & 1) || (channel_config_arg == 0); + channel_config_arg_conv.inner = untag_ptr(channel_config_arg); + channel_config_arg_conv.is_owned = ptr_is_owned(channel_config_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_config_arg_conv); channel_config_arg_conv = ChannelConfig_clone(&channel_config_arg_conv); LDKUserConfig ret_var = UserConfig_new(channel_handshake_config_arg_conv, channel_handshake_limits_arg_conv, channel_config_arg_conv, accept_forwards_to_priv_channels_arg, accept_inbound_channels_arg, manually_accept_inbound_channels_arg); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t UserConfig_clone_ptr(LDKUserConfig *NONNULL_PTR arg) { +static inline uint64_t UserConfig_clone_ptr(LDKUserConfig *NONNULL_PTR arg) { LDKUserConfig ret_var = UserConfig_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_UserConfig_clone_ptr"))) TS_UserConfig_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_UserConfig_clone_ptr"))) TS_UserConfig_clone_ptr(uint64_t arg) { LDKUserConfig arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = UserConfig_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = UserConfig_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_UserConfig_clone"))) TS_UserConfig_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_UserConfig_clone"))) TS_UserConfig_clone(uint64_t orig) { LDKUserConfig orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKUserConfig ret_var = UserConfig_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_UserConfig_default"))) TS_UserConfig_default() { +uint64_t __attribute__((export_name("TS_UserConfig_default"))) TS_UserConfig_default() { LDKUserConfig ret_var = UserConfig_default(); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_BestBlock_free"))) TS_BestBlock_free(uint32_t this_obj) { +void __attribute__((export_name("TS_BestBlock_free"))) TS_BestBlock_free(uint64_t this_obj) { LDKBestBlock this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); BestBlock_free(this_obj_conv); } -static inline uintptr_t BestBlock_clone_ptr(LDKBestBlock *NONNULL_PTR arg) { +static inline uint64_t BestBlock_clone_ptr(LDKBestBlock *NONNULL_PTR arg) { LDKBestBlock ret_var = BestBlock_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_BestBlock_clone_ptr"))) TS_BestBlock_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_BestBlock_clone_ptr"))) TS_BestBlock_clone_ptr(uint64_t arg) { LDKBestBlock arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = BestBlock_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = BestBlock_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_BestBlock_clone"))) TS_BestBlock_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_BestBlock_clone"))) TS_BestBlock_clone(uint64_t orig) { LDKBestBlock orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKBestBlock ret_var = BestBlock_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_BestBlock_from_genesis"))) TS_BestBlock_from_genesis(uint32_t network) { +uint64_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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_BestBlock_new"))) TS_BestBlock_new(int8_tArray block_hash, int32_t height) { +uint64_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); FREE(block_hash); LDKBestBlock ret_var = BestBlock_new(block_hash_ref, height); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_BestBlock_block_hash"))) TS_BestBlock_block_hash(uint32_t this_arg) { +int8_tArray __attribute__((export_name("TS_BestBlock_block_hash"))) TS_BestBlock_block_hash(uint64_t this_arg) { LDKBestBlock this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, BestBlock_block_hash(&this_arg_conv).data, 32); return ret_arr; } -int32_t __attribute__((export_name("TS_BestBlock_height"))) TS_BestBlock_height(uint32_t this_arg) { +int32_t __attribute__((export_name("TS_BestBlock_height"))) TS_BestBlock_height(uint64_t this_arg) { LDKBestBlock this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int32_t ret_conv = BestBlock_height(&this_arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_AccessError_clone"))) TS_AccessError_clone(uint32_t orig) { - LDKAccessError* orig_conv = (LDKAccessError*)(orig & ~1); +uint32_t __attribute__((export_name("TS_AccessError_clone"))) TS_AccessError_clone(uint64_t orig) { + LDKAccessError* orig_conv = (LDKAccessError*)untag_ptr(orig); uint32_t ret_conv = LDKAccessError_to_js(AccessError_clone(orig_conv)); return ret_conv; } @@ -23018,35 +21691,35 @@ uint32_t __attribute__((export_name("TS_AccessError_unknown_tx"))) TS_AccessErr return ret_conv; } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_Access_free"))) TS_Access_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKAccess this_ptr_conv = *(LDKAccess*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); Access_free(this_ptr_conv); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_Listen_free"))) TS_Listen_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKListen this_ptr_conv = *(LDKListen*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); Listen_free(this_ptr_conv); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_Confirm_free"))) TS_Confirm_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKConfirm this_ptr_conv = *(LDKConfirm*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); Confirm_free(this_ptr_conv); } -uint32_t __attribute__((export_name("TS_ChannelMonitorUpdateErr_clone"))) TS_ChannelMonitorUpdateErr_clone(uint32_t orig) { - LDKChannelMonitorUpdateErr* orig_conv = (LDKChannelMonitorUpdateErr*)(orig & ~1); +uint32_t __attribute__((export_name("TS_ChannelMonitorUpdateErr_clone"))) TS_ChannelMonitorUpdateErr_clone(uint64_t orig) { + LDKChannelMonitorUpdateErr* orig_conv = (LDKChannelMonitorUpdateErr*)untag_ptr(orig); uint32_t ret_conv = LDKChannelMonitorUpdateErr_to_js(ChannelMonitorUpdateErr_clone(orig_conv)); return ret_conv; } @@ -23061,99 +21734,100 @@ uint32_t __attribute__((export_name("TS_ChannelMonitorUpdateErr_permanent_failu return ret_conv; } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_Watch_free"))) TS_Watch_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKWatch this_ptr_conv = *(LDKWatch*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); Watch_free(this_ptr_conv); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_Filter_free"))) TS_Filter_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKFilter this_ptr_conv = *(LDKFilter*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); Filter_free(this_ptr_conv); } -void __attribute__((export_name("TS_WatchedOutput_free"))) TS_WatchedOutput_free(uint32_t this_obj) { +void __attribute__((export_name("TS_WatchedOutput_free"))) TS_WatchedOutput_free(uint64_t this_obj) { LDKWatchedOutput this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); WatchedOutput_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_WatchedOutput_get_block_hash"))) TS_WatchedOutput_get_block_hash(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_WatchedOutput_get_block_hash"))) TS_WatchedOutput_get_block_hash(uint64_t this_ptr) { LDKWatchedOutput this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_WatchedOutput_set_block_hash"))) TS_WatchedOutput_set_block_hash(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_WatchedOutput_set_block_hash"))) TS_WatchedOutput_set_block_hash(uint64_t this_ptr, int8_tArray val) { LDKWatchedOutput this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); WatchedOutput_set_block_hash(&this_ptr_conv, val_ref); } -uint32_t __attribute__((export_name("TS_WatchedOutput_get_outpoint"))) TS_WatchedOutput_get_outpoint(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_WatchedOutput_get_outpoint"))) TS_WatchedOutput_get_outpoint(uint64_t this_ptr) { LDKWatchedOutput this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKOutPoint ret_var = WatchedOutput_get_outpoint(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_WatchedOutput_set_outpoint"))) TS_WatchedOutput_set_outpoint(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_WatchedOutput_set_outpoint"))) TS_WatchedOutput_set_outpoint(uint64_t this_ptr, uint64_t val) { LDKWatchedOutput this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKOutPoint val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = OutPoint_clone(&val_conv); WatchedOutput_set_outpoint(&this_ptr_conv, val_conv); } -int8_tArray __attribute__((export_name("TS_WatchedOutput_get_script_pubkey"))) TS_WatchedOutput_get_script_pubkey(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_WatchedOutput_get_script_pubkey"))) TS_WatchedOutput_get_script_pubkey(uint64_t this_ptr) { LDKWatchedOutput this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKu8slice ret_var = WatchedOutput_get_script_pubkey(&this_ptr_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); return ret_arr; } -void __attribute__((export_name("TS_WatchedOutput_set_script_pubkey"))) TS_WatchedOutput_set_script_pubkey(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_WatchedOutput_set_script_pubkey"))) TS_WatchedOutput_set_script_pubkey(uint64_t this_ptr, int8_tArray val) { LDKWatchedOutput this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_u8Z val_ref; val_ref.datalen = val->arr_len; val_ref.data = MALLOC(val_ref.datalen, "LDKCVec_u8Z Bytes"); @@ -23161,13 +21835,13 @@ void __attribute__((export_name("TS_WatchedOutput_set_script_pubkey"))) TS_Watc 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) { +uint64_t __attribute__((export_name("TS_WatchedOutput_new"))) TS_WatchedOutput_new(int8_tArray block_hash_arg, uint64_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); 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); + outpoint_arg_conv.inner = untag_ptr(outpoint_arg); + outpoint_arg_conv.is_owned = ptr_is_owned(outpoint_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(outpoint_arg_conv); outpoint_arg_conv = OutPoint_clone(&outpoint_arg_conv); LDKCVec_u8Z script_pubkey_arg_ref; @@ -23175,75 +21849,63 @@ uint32_t __attribute__((export_name("TS_WatchedOutput_new"))) TS_WatchedOutput_ 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); FREE(script_pubkey_arg); LDKWatchedOutput ret_var = WatchedOutput_new(block_hash_arg_ref, outpoint_arg_conv, script_pubkey_arg_ref); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t WatchedOutput_clone_ptr(LDKWatchedOutput *NONNULL_PTR arg) { +static inline uint64_t WatchedOutput_clone_ptr(LDKWatchedOutput *NONNULL_PTR arg) { LDKWatchedOutput ret_var = WatchedOutput_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_WatchedOutput_clone_ptr"))) TS_WatchedOutput_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_WatchedOutput_clone_ptr"))) TS_WatchedOutput_clone_ptr(uint64_t arg) { LDKWatchedOutput arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = WatchedOutput_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = WatchedOutput_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_WatchedOutput_clone"))) TS_WatchedOutput_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_WatchedOutput_clone"))) TS_WatchedOutput_clone(uint64_t orig) { LDKWatchedOutput orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKWatchedOutput ret_var = WatchedOutput_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int64_t __attribute__((export_name("TS_WatchedOutput_hash"))) TS_WatchedOutput_hash(uint32_t o) { +int64_t __attribute__((export_name("TS_WatchedOutput_hash"))) TS_WatchedOutput_hash(uint64_t o) { LDKWatchedOutput o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = false; + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); + o_conv.is_owned = false; int64_t ret_conv = WatchedOutput_hash(&o_conv); return ret_conv; } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_BroadcasterInterface_free"))) TS_BroadcasterInterface_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKBroadcasterInterface this_ptr_conv = *(LDKBroadcasterInterface*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); BroadcasterInterface_free(this_ptr_conv); } -uint32_t __attribute__((export_name("TS_ConfirmationTarget_clone"))) TS_ConfirmationTarget_clone(uint32_t orig) { - LDKConfirmationTarget* orig_conv = (LDKConfirmationTarget*)(orig & ~1); +uint32_t __attribute__((export_name("TS_ConfirmationTarget_clone"))) TS_ConfirmationTarget_clone(uint64_t orig) { + LDKConfirmationTarget* orig_conv = (LDKConfirmationTarget*)untag_ptr(orig); uint32_t ret_conv = LDKConfirmationTarget_to_js(ConfirmationTarget_clone(orig_conv)); return ret_conv; } @@ -23263,117 +21925,112 @@ uint32_t __attribute__((export_name("TS_ConfirmationTarget_high_priority"))) TS return ret_conv; } -jboolean __attribute__((export_name("TS_ConfirmationTarget_eq"))) TS_ConfirmationTarget_eq(uint32_t a, uint32_t b) { - LDKConfirmationTarget* a_conv = (LDKConfirmationTarget*)(a & ~1); - LDKConfirmationTarget* b_conv = (LDKConfirmationTarget*)(b & ~1); +jboolean __attribute__((export_name("TS_ConfirmationTarget_eq"))) TS_ConfirmationTarget_eq(uint64_t a, uint64_t b) { + LDKConfirmationTarget* a_conv = (LDKConfirmationTarget*)untag_ptr(a); + LDKConfirmationTarget* b_conv = (LDKConfirmationTarget*)untag_ptr(b); jboolean ret_conv = ConfirmationTarget_eq(a_conv, b_conv); return ret_conv; } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_FeeEstimator_free"))) TS_FeeEstimator_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKFeeEstimator this_ptr_conv = *(LDKFeeEstimator*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); FeeEstimator_free(this_ptr_conv); } -void __attribute__((export_name("TS_MonitorUpdateId_free"))) TS_MonitorUpdateId_free(uint32_t this_obj) { +void __attribute__((export_name("TS_MonitorUpdateId_free"))) TS_MonitorUpdateId_free(uint64_t this_obj) { LDKMonitorUpdateId this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); MonitorUpdateId_free(this_obj_conv); } -static inline uintptr_t MonitorUpdateId_clone_ptr(LDKMonitorUpdateId *NONNULL_PTR arg) { +static inline uint64_t MonitorUpdateId_clone_ptr(LDKMonitorUpdateId *NONNULL_PTR arg) { LDKMonitorUpdateId ret_var = MonitorUpdateId_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_MonitorUpdateId_clone_ptr"))) TS_MonitorUpdateId_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_MonitorUpdateId_clone_ptr"))) TS_MonitorUpdateId_clone_ptr(uint64_t arg) { LDKMonitorUpdateId arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = MonitorUpdateId_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = MonitorUpdateId_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_MonitorUpdateId_clone"))) TS_MonitorUpdateId_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_MonitorUpdateId_clone"))) TS_MonitorUpdateId_clone(uint64_t orig) { LDKMonitorUpdateId orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKMonitorUpdateId ret_var = MonitorUpdateId_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int64_t __attribute__((export_name("TS_MonitorUpdateId_hash"))) TS_MonitorUpdateId_hash(uint32_t o) { +int64_t __attribute__((export_name("TS_MonitorUpdateId_hash"))) TS_MonitorUpdateId_hash(uint64_t o) { LDKMonitorUpdateId o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = false; + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); + o_conv.is_owned = false; int64_t ret_conv = MonitorUpdateId_hash(&o_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_MonitorUpdateId_eq"))) TS_MonitorUpdateId_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_MonitorUpdateId_eq"))) TS_MonitorUpdateId_eq(uint64_t a, uint64_t b) { LDKMonitorUpdateId a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKMonitorUpdateId b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = MonitorUpdateId_eq(&a_conv, &b_conv); return ret_conv; } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_Persist_free"))) TS_Persist_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKPersist this_ptr_conv = *(LDKPersist*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); Persist_free(this_ptr_conv); } -void __attribute__((export_name("TS_LockedChannelMonitor_free"))) TS_LockedChannelMonitor_free(uint32_t this_obj) { +void __attribute__((export_name("TS_LockedChannelMonitor_free"))) TS_LockedChannelMonitor_free(uint64_t this_obj) { LDKLockedChannelMonitor this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); LockedChannelMonitor_free(this_obj_conv); } -void __attribute__((export_name("TS_ChainMonitor_free"))) TS_ChainMonitor_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChainMonitor_free"))) TS_ChainMonitor_free(uint64_t this_obj) { LDKChainMonitor this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChainMonitor_free(this_obj_conv); } -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*)(((uintptr_t)chain_source) & ~1); +uint64_t __attribute__((export_name("TS_ChainMonitor_new"))) TS_ChainMonitor_new(uint64_t chain_source, uint64_t broadcaster, uint64_t logger, uint64_t feeest, uint64_t persister) { + void* chain_source_ptr = untag_ptr(chain_source); 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 @@ -23384,28 +22041,28 @@ uint32_t __attribute__((export_name("TS_ChainMonitor_new"))) TS_ChainMonitor_ne LDKFilter_JCalls_cloned(&chain_source_conv.some); } } - void* broadcaster_ptr = (void*)(((uintptr_t)broadcaster) & ~1); + void* broadcaster_ptr = untag_ptr(broadcaster); CHECK_ACCESS(broadcaster_ptr); LDKBroadcasterInterface broadcaster_conv = *(LDKBroadcasterInterface*)(broadcaster_ptr); if (broadcaster_conv.free == LDKBroadcasterInterface_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKBroadcasterInterface_JCalls_cloned(&broadcaster_conv); } - void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); + void* logger_ptr = untag_ptr(logger); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); if (logger_conv.free == LDKLogger_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKLogger_JCalls_cloned(&logger_conv); } - void* feeest_ptr = (void*)(((uintptr_t)feeest) & ~1); + void* feeest_ptr = untag_ptr(feeest); CHECK_ACCESS(feeest_ptr); LDKFeeEstimator feeest_conv = *(LDKFeeEstimator*)(feeest_ptr); if (feeest_conv.free == LDKFeeEstimator_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKFeeEstimator_JCalls_cloned(&feeest_conv); } - void* persister_ptr = (void*)(((uintptr_t)persister) & ~1); + void* persister_ptr = untag_ptr(persister); CHECK_ACCESS(persister_ptr); LDKPersist persister_conv = *(LDKPersist*)(persister_ptr); if (persister_conv.free == LDKPersist_JCalls_free) { @@ -23413,47 +22070,43 @@ uint32_t __attribute__((export_name("TS_ChainMonitor_new"))) TS_ChainMonitor_ne LDKPersist_JCalls_cloned(&persister_conv); } LDKChainMonitor ret_var = ChainMonitor_new(chain_source_conv, broadcaster_conv, logger_conv, feeest_conv, persister_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_tArray __attribute__((export_name("TS_ChainMonitor_get_claimable_balances"))) TS_ChainMonitor_get_claimable_balances(uint32_t this_arg, uint32_tArray ignored_channels) { +uint64_tArray __attribute__((export_name("TS_ChainMonitor_get_claimable_balances"))) TS_ChainMonitor_get_claimable_balances(uint64_t this_arg, uint64_tArray ignored_channels) { LDKChainMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCVec_ChannelDetailsZ ignored_channels_constr; ignored_channels_constr.datalen = ignored_channels->arr_len; if (ignored_channels_constr.datalen > 0) 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; + uint64_t* ignored_channels_vals = ignored_channels->elems; for (size_t q = 0; q < ignored_channels_constr.datalen; q++) { - uint32_t ignored_channels_conv_16 = ignored_channels_vals[q]; + uint64_t ignored_channels_conv_16 = ignored_channels_vals[q]; LDKChannelDetails ignored_channels_conv_16_conv; - ignored_channels_conv_16_conv.inner = (void*)(ignored_channels_conv_16 & (~1)); - ignored_channels_conv_16_conv.is_owned = (ignored_channels_conv_16 & 1) || (ignored_channels_conv_16 == 0); + ignored_channels_conv_16_conv.inner = untag_ptr(ignored_channels_conv_16); + ignored_channels_conv_16_conv.is_owned = ptr_is_owned(ignored_channels_conv_16); CHECK_INNER_FIELD_ACCESS_OR_NULL(ignored_channels_conv_16_conv); ignored_channels_conv_16_conv = ChannelDetails_clone(&ignored_channels_conv_16_conv); ignored_channels_constr.data[q] = ignored_channels_conv_16_conv; } FREE(ignored_channels); LDKCVec_BalanceZ ret_var = ChainMonitor_get_claimable_balances(&this_arg_conv, ignored_channels_constr); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t j = 0; j < ret_var.datalen; j++) { LDKBalance *ret_conv_9_copy = MALLOC(sizeof(LDKBalance), "LDKBalance"); *ret_conv_9_copy = ret_var.data[j]; - uint32_t ret_conv_9_ref = (uintptr_t)ret_conv_9_copy; + uint64_t ret_conv_9_ref = tag_ptr(ret_conv_9_copy, true); ret_arr_ptr[j] = ret_conv_9_ref; } @@ -23461,40 +22114,37 @@ uint32_tArray __attribute__((export_name("TS_ChainMonitor_get_claimable_balance return ret_arr; } -uint32_t __attribute__((export_name("TS_ChainMonitor_get_monitor"))) TS_ChainMonitor_get_monitor(uint32_t this_arg, uint32_t funding_txo) { +uint64_t __attribute__((export_name("TS_ChainMonitor_get_monitor"))) TS_ChainMonitor_get_monitor(uint64_t this_arg, uint64_t funding_txo) { LDKChainMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKOutPoint funding_txo_conv; - funding_txo_conv.inner = (void*)(funding_txo & (~1)); - funding_txo_conv.is_owned = (funding_txo & 1) || (funding_txo == 0); + funding_txo_conv.inner = untag_ptr(funding_txo); + funding_txo_conv.is_owned = ptr_is_owned(funding_txo); CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_txo_conv); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_tArray __attribute__((export_name("TS_ChainMonitor_list_monitors"))) TS_ChainMonitor_list_monitors(uint32_t this_arg) { +uint64_tArray __attribute__((export_name("TS_ChainMonitor_list_monitors"))) TS_ChainMonitor_list_monitors(uint64_t this_arg) { LDKChainMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCVec_OutPointZ ret_var = ChainMonitor_list_monitors(&this_arg_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t k = 0; k < ret_var.datalen; k++) { LDKOutPoint ret_conv_10_var = ret_var.data[k]; - uint32_t ret_conv_10_ref = 0; - 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. + uint64_t ret_conv_10_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_10_var); - ret_conv_10_ref = (uintptr_t)ret_conv_10_var.inner; - if (ret_conv_10_var.is_owned) { - ret_conv_10_ref |= 1; - } + ret_conv_10_ref = tag_ptr(ret_conv_10_var.inner, ret_conv_10_var.is_owned); ret_arr_ptr[k] = ret_conv_10_ref; } @@ -23502,134 +22152,134 @@ uint32_tArray __attribute__((export_name("TS_ChainMonitor_list_monitors"))) TS_ return ret_arr; } -uint32_t __attribute__((export_name("TS_ChainMonitor_channel_monitor_updated"))) TS_ChainMonitor_channel_monitor_updated(uint32_t this_arg, uint32_t funding_txo, uint32_t completed_update_id) { +uint64_t __attribute__((export_name("TS_ChainMonitor_channel_monitor_updated"))) TS_ChainMonitor_channel_monitor_updated(uint64_t this_arg, uint64_t funding_txo, uint64_t completed_update_id) { LDKChainMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKOutPoint funding_txo_conv; - funding_txo_conv.inner = (void*)(funding_txo & (~1)); - funding_txo_conv.is_owned = (funding_txo & 1) || (funding_txo == 0); + funding_txo_conv.inner = untag_ptr(funding_txo); + funding_txo_conv.is_owned = ptr_is_owned(funding_txo); CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_txo_conv); funding_txo_conv = OutPoint_clone(&funding_txo_conv); LDKMonitorUpdateId completed_update_id_conv; - completed_update_id_conv.inner = (void*)(completed_update_id & (~1)); - completed_update_id_conv.is_owned = (completed_update_id & 1) || (completed_update_id == 0); + completed_update_id_conv.inner = untag_ptr(completed_update_id); + completed_update_id_conv.is_owned = ptr_is_owned(completed_update_id); CHECK_INNER_FIELD_ACCESS_OR_NULL(completed_update_id_conv); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_ChainMonitor_as_Listen"))) TS_ChainMonitor_as_Listen(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ChainMonitor_as_Listen"))) TS_ChainMonitor_as_Listen(uint64_t this_arg) { LDKChainMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKListen* ret_ret = MALLOC(sizeof(LDKListen), "LDKListen"); *ret_ret = ChainMonitor_as_Listen(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_t __attribute__((export_name("TS_ChainMonitor_as_Confirm"))) TS_ChainMonitor_as_Confirm(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ChainMonitor_as_Confirm"))) TS_ChainMonitor_as_Confirm(uint64_t this_arg) { LDKChainMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKConfirm* ret_ret = MALLOC(sizeof(LDKConfirm), "LDKConfirm"); *ret_ret = ChainMonitor_as_Confirm(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_t __attribute__((export_name("TS_ChainMonitor_as_Watch"))) TS_ChainMonitor_as_Watch(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ChainMonitor_as_Watch"))) TS_ChainMonitor_as_Watch(uint64_t this_arg) { LDKChainMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKWatch* ret_ret = MALLOC(sizeof(LDKWatch), "LDKWatch"); *ret_ret = ChainMonitor_as_Watch(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_t __attribute__((export_name("TS_ChainMonitor_as_EventsProvider"))) TS_ChainMonitor_as_EventsProvider(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ChainMonitor_as_EventsProvider"))) TS_ChainMonitor_as_EventsProvider(uint64_t this_arg) { LDKChainMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKEventsProvider* ret_ret = MALLOC(sizeof(LDKEventsProvider), "LDKEventsProvider"); *ret_ret = ChainMonitor_as_EventsProvider(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -void __attribute__((export_name("TS_ChannelMonitorUpdate_free"))) TS_ChannelMonitorUpdate_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChannelMonitorUpdate_free"))) TS_ChannelMonitorUpdate_free(uint64_t this_obj) { LDKChannelMonitorUpdate this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChannelMonitorUpdate_free(this_obj_conv); } -int64_t __attribute__((export_name("TS_ChannelMonitorUpdate_get_update_id"))) TS_ChannelMonitorUpdate_get_update_id(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelMonitorUpdate_get_update_id"))) TS_ChannelMonitorUpdate_get_update_id(uint64_t this_ptr) { LDKChannelMonitorUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelMonitorUpdate_get_update_id(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelMonitorUpdate_set_update_id"))) TS_ChannelMonitorUpdate_set_update_id(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelMonitorUpdate_set_update_id"))) TS_ChannelMonitorUpdate_set_update_id(uint64_t this_ptr, int64_t val) { LDKChannelMonitorUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelMonitorUpdate_set_update_id(&this_ptr_conv, val); } -static inline uintptr_t ChannelMonitorUpdate_clone_ptr(LDKChannelMonitorUpdate *NONNULL_PTR arg) { +static inline uint64_t ChannelMonitorUpdate_clone_ptr(LDKChannelMonitorUpdate *NONNULL_PTR arg) { LDKChannelMonitorUpdate ret_var = ChannelMonitorUpdate_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelMonitorUpdate_clone_ptr"))) TS_ChannelMonitorUpdate_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ChannelMonitorUpdate_clone_ptr"))) TS_ChannelMonitorUpdate_clone_ptr(uint64_t arg) { LDKChannelMonitorUpdate arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ChannelMonitorUpdate_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ChannelMonitorUpdate_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelMonitorUpdate_clone"))) TS_ChannelMonitorUpdate_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ChannelMonitorUpdate_clone"))) TS_ChannelMonitorUpdate_clone(uint64_t orig) { LDKChannelMonitorUpdate orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKChannelMonitorUpdate ret_var = ChannelMonitorUpdate_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_ChannelMonitorUpdate_write"))) TS_ChannelMonitorUpdate_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ChannelMonitorUpdate_write"))) TS_ChannelMonitorUpdate_write(uint64_t obj) { LDKChannelMonitorUpdate obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ChannelMonitorUpdate_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -23637,95 +22287,95 @@ int8_tArray __attribute__((export_name("TS_ChannelMonitorUpdate_write"))) TS_Ch return ret_arr; } -uint32_t __attribute__((export_name("TS_ChannelMonitorUpdate_read"))) TS_ChannelMonitorUpdate_read(int8_tArray ser) { +uint64_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; LDKCResult_ChannelMonitorUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelMonitorUpdateDecodeErrorZ), "LDKCResult_ChannelMonitorUpdateDecodeErrorZ"); *ret_conv = ChannelMonitorUpdate_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_MonitorEvent_free"))) TS_MonitorEvent_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKMonitorEvent this_ptr_conv = *(LDKMonitorEvent*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); MonitorEvent_free(this_ptr_conv); } -static inline uintptr_t MonitorEvent_clone_ptr(LDKMonitorEvent *NONNULL_PTR arg) { +static inline uint64_t MonitorEvent_clone_ptr(LDKMonitorEvent *NONNULL_PTR arg) { LDKMonitorEvent *ret_copy = MALLOC(sizeof(LDKMonitorEvent), "LDKMonitorEvent"); *ret_copy = MonitorEvent_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_MonitorEvent_clone_ptr"))) TS_MonitorEvent_clone_ptr(uint32_t arg) { - LDKMonitorEvent* arg_conv = (LDKMonitorEvent*)arg; - uint32_t ret_conv = MonitorEvent_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_MonitorEvent_clone_ptr"))) TS_MonitorEvent_clone_ptr(uint64_t arg) { + LDKMonitorEvent* arg_conv = (LDKMonitorEvent*)untag_ptr(arg); + int64_t ret_conv = MonitorEvent_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_MonitorEvent_clone"))) TS_MonitorEvent_clone(uint32_t orig) { - LDKMonitorEvent* orig_conv = (LDKMonitorEvent*)orig; +uint64_t __attribute__((export_name("TS_MonitorEvent_clone"))) TS_MonitorEvent_clone(uint64_t orig) { + LDKMonitorEvent* orig_conv = (LDKMonitorEvent*)untag_ptr(orig); LDKMonitorEvent *ret_copy = MALLOC(sizeof(LDKMonitorEvent), "LDKMonitorEvent"); *ret_copy = MonitorEvent_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_MonitorEvent_htlcevent"))) TS_MonitorEvent_htlcevent(uint32_t a) { +uint64_t __attribute__((export_name("TS_MonitorEvent_htlcevent"))) TS_MonitorEvent_htlcevent(uint64_t a) { LDKHTLCUpdate a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = (a & 1) || (a == 0); + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); a_conv = HTLCUpdate_clone(&a_conv); LDKMonitorEvent *ret_copy = MALLOC(sizeof(LDKMonitorEvent), "LDKMonitorEvent"); *ret_copy = MonitorEvent_htlcevent(a_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_MonitorEvent_commitment_tx_confirmed"))) TS_MonitorEvent_commitment_tx_confirmed(uint32_t a) { +uint64_t __attribute__((export_name("TS_MonitorEvent_commitment_tx_confirmed"))) TS_MonitorEvent_commitment_tx_confirmed(uint64_t a) { LDKOutPoint a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = (a & 1) || (a == 0); + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); a_conv = OutPoint_clone(&a_conv); LDKMonitorEvent *ret_copy = MALLOC(sizeof(LDKMonitorEvent), "LDKMonitorEvent"); *ret_copy = MonitorEvent_commitment_tx_confirmed(a_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_MonitorEvent_update_completed"))) TS_MonitorEvent_update_completed(uint32_t funding_txo, int64_t monitor_update_id) { +uint64_t __attribute__((export_name("TS_MonitorEvent_update_completed"))) TS_MonitorEvent_update_completed(uint64_t funding_txo, int64_t monitor_update_id) { LDKOutPoint funding_txo_conv; - funding_txo_conv.inner = (void*)(funding_txo & (~1)); - funding_txo_conv.is_owned = (funding_txo & 1) || (funding_txo == 0); + funding_txo_conv.inner = untag_ptr(funding_txo); + funding_txo_conv.is_owned = ptr_is_owned(funding_txo); CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_txo_conv); 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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_MonitorEvent_update_failed"))) TS_MonitorEvent_update_failed(uint32_t a) { +uint64_t __attribute__((export_name("TS_MonitorEvent_update_failed"))) TS_MonitorEvent_update_failed(uint64_t a) { LDKOutPoint a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = (a & 1) || (a == 0); + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); a_conv = OutPoint_clone(&a_conv); LDKMonitorEvent *ret_copy = MALLOC(sizeof(LDKMonitorEvent), "LDKMonitorEvent"); *ret_copy = MonitorEvent_update_failed(a_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -int8_tArray __attribute__((export_name("TS_MonitorEvent_write"))) TS_MonitorEvent_write(uint32_t obj) { - LDKMonitorEvent* obj_conv = (LDKMonitorEvent*)obj; +int8_tArray __attribute__((export_name("TS_MonitorEvent_write"))) TS_MonitorEvent_write(uint64_t obj) { + LDKMonitorEvent* obj_conv = (LDKMonitorEvent*)untag_ptr(obj); LDKCVec_u8Z ret_var = MonitorEvent_write(obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -23733,67 +22383,60 @@ int8_tArray __attribute__((export_name("TS_MonitorEvent_write"))) TS_MonitorEve return ret_arr; } -uint32_t __attribute__((export_name("TS_MonitorEvent_read"))) TS_MonitorEvent_read(int8_tArray ser) { +uint64_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; LDKCResult_COption_MonitorEventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_MonitorEventZDecodeErrorZ), "LDKCResult_COption_MonitorEventZDecodeErrorZ"); *ret_conv = MonitorEvent_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_HTLCUpdate_free"))) TS_HTLCUpdate_free(uint32_t this_obj) { +void __attribute__((export_name("TS_HTLCUpdate_free"))) TS_HTLCUpdate_free(uint64_t this_obj) { LDKHTLCUpdate this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); HTLCUpdate_free(this_obj_conv); } -static inline uintptr_t HTLCUpdate_clone_ptr(LDKHTLCUpdate *NONNULL_PTR arg) { +static inline uint64_t HTLCUpdate_clone_ptr(LDKHTLCUpdate *NONNULL_PTR arg) { LDKHTLCUpdate ret_var = HTLCUpdate_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_HTLCUpdate_clone_ptr"))) TS_HTLCUpdate_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_HTLCUpdate_clone_ptr"))) TS_HTLCUpdate_clone_ptr(uint64_t arg) { LDKHTLCUpdate arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = HTLCUpdate_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = HTLCUpdate_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_HTLCUpdate_clone"))) TS_HTLCUpdate_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_HTLCUpdate_clone"))) TS_HTLCUpdate_clone(uint64_t orig) { LDKHTLCUpdate orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKHTLCUpdate ret_var = HTLCUpdate_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_HTLCUpdate_write"))) TS_HTLCUpdate_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_HTLCUpdate_write"))) TS_HTLCUpdate_write(uint64_t obj) { LDKHTLCUpdate obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = HTLCUpdate_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -23801,131 +22444,124 @@ int8_tArray __attribute__((export_name("TS_HTLCUpdate_write"))) TS_HTLCUpdate_w return ret_arr; } -uint32_t __attribute__((export_name("TS_HTLCUpdate_read"))) TS_HTLCUpdate_read(int8_tArray ser) { +uint64_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; LDKCResult_HTLCUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCUpdateDecodeErrorZ), "LDKCResult_HTLCUpdateDecodeErrorZ"); *ret_conv = HTLCUpdate_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_Balance_free"))) TS_Balance_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKBalance this_ptr_conv = *(LDKBalance*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); Balance_free(this_ptr_conv); } -static inline uintptr_t Balance_clone_ptr(LDKBalance *NONNULL_PTR arg) { +static inline uint64_t Balance_clone_ptr(LDKBalance *NONNULL_PTR arg) { LDKBalance *ret_copy = MALLOC(sizeof(LDKBalance), "LDKBalance"); *ret_copy = Balance_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Balance_clone_ptr"))) TS_Balance_clone_ptr(uint32_t arg) { - LDKBalance* arg_conv = (LDKBalance*)arg; - uint32_t ret_conv = Balance_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_Balance_clone_ptr"))) TS_Balance_clone_ptr(uint64_t arg) { + LDKBalance* arg_conv = (LDKBalance*)untag_ptr(arg); + int64_t ret_conv = Balance_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_Balance_clone"))) TS_Balance_clone(uint32_t orig) { - LDKBalance* orig_conv = (LDKBalance*)orig; +uint64_t __attribute__((export_name("TS_Balance_clone"))) TS_Balance_clone(uint64_t orig) { + LDKBalance* orig_conv = (LDKBalance*)untag_ptr(orig); LDKBalance *ret_copy = MALLOC(sizeof(LDKBalance), "LDKBalance"); *ret_copy = Balance_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -jboolean __attribute__((export_name("TS_Balance_eq"))) TS_Balance_eq(uint32_t a, uint32_t b) { - LDKBalance* a_conv = (LDKBalance*)a; - LDKBalance* b_conv = (LDKBalance*)b; +jboolean __attribute__((export_name("TS_Balance_eq"))) TS_Balance_eq(uint64_t a, uint64_t b) { + LDKBalance* a_conv = (LDKBalance*)untag_ptr(a); + LDKBalance* b_conv = (LDKBalance*)untag_ptr(b); jboolean ret_conv = Balance_eq(a_conv, b_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelMonitor_free"))) TS_ChannelMonitor_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChannelMonitor_free"))) TS_ChannelMonitor_free(uint64_t this_obj) { LDKChannelMonitor this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChannelMonitor_free(this_obj_conv); } -static inline uintptr_t ChannelMonitor_clone_ptr(LDKChannelMonitor *NONNULL_PTR arg) { +static inline uint64_t ChannelMonitor_clone_ptr(LDKChannelMonitor *NONNULL_PTR arg) { LDKChannelMonitor ret_var = ChannelMonitor_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelMonitor_clone_ptr"))) TS_ChannelMonitor_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ChannelMonitor_clone_ptr"))) TS_ChannelMonitor_clone_ptr(uint64_t arg) { LDKChannelMonitor arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ChannelMonitor_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ChannelMonitor_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelMonitor_clone"))) TS_ChannelMonitor_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ChannelMonitor_clone"))) TS_ChannelMonitor_clone(uint64_t orig) { LDKChannelMonitor orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKChannelMonitor ret_var = ChannelMonitor_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_ChannelMonitor_write"))) TS_ChannelMonitor_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ChannelMonitor_write"))) TS_ChannelMonitor_write(uint64_t obj) { LDKChannelMonitor obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ChannelMonitor_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -23933,95 +22569,102 @@ int8_tArray __attribute__((export_name("TS_ChannelMonitor_write"))) TS_ChannelM return ret_arr; } -uint32_t __attribute__((export_name("TS_ChannelMonitor_update_monitor"))) TS_ChannelMonitor_update_monitor(uint32_t this_arg, uint32_t updates, uint32_t broadcaster, uint32_t fee_estimator, uint32_t logger) { +uint64_t __attribute__((export_name("TS_ChannelMonitor_update_monitor"))) TS_ChannelMonitor_update_monitor(uint64_t this_arg, uint64_t updates, uint64_t broadcaster, uint64_t fee_estimator, uint64_t logger) { LDKChannelMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKChannelMonitorUpdate updates_conv; - updates_conv.inner = (void*)(updates & (~1)); - updates_conv.is_owned = false; + updates_conv.inner = untag_ptr(updates); + updates_conv.is_owned = ptr_is_owned(updates); CHECK_INNER_FIELD_ACCESS_OR_NULL(updates_conv); - void* broadcaster_ptr = (void*)(((uintptr_t)broadcaster) & ~1); - if (!(broadcaster & 1)) { CHECK_ACCESS(broadcaster_ptr); } + updates_conv.is_owned = false; + void* broadcaster_ptr = untag_ptr(broadcaster); + if (ptr_is_owned(broadcaster)) { CHECK_ACCESS(broadcaster_ptr); } LDKBroadcasterInterface* broadcaster_conv = (LDKBroadcasterInterface*)broadcaster_ptr; - void* fee_estimator_ptr = (void*)(((uintptr_t)fee_estimator) & ~1); + void* fee_estimator_ptr = untag_ptr(fee_estimator); CHECK_ACCESS(fee_estimator_ptr); LDKFeeEstimator fee_estimator_conv = *(LDKFeeEstimator*)(fee_estimator_ptr); if (fee_estimator_conv.free == LDKFeeEstimator_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKFeeEstimator_JCalls_cloned(&fee_estimator_conv); } - void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); - if (!(logger & 1)) { CHECK_ACCESS(logger_ptr); } + void* logger_ptr = untag_ptr(logger); + if (ptr_is_owned(logger)) { 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int64_t __attribute__((export_name("TS_ChannelMonitor_get_latest_update_id"))) TS_ChannelMonitor_get_latest_update_id(uint32_t this_arg) { +int64_t __attribute__((export_name("TS_ChannelMonitor_get_latest_update_id"))) TS_ChannelMonitor_get_latest_update_id(uint64_t this_arg) { LDKChannelMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int64_t ret_conv = ChannelMonitor_get_latest_update_id(&this_arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelMonitor_get_funding_txo"))) TS_ChannelMonitor_get_funding_txo(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ChannelMonitor_get_funding_txo"))) TS_ChannelMonitor_get_funding_txo(uint64_t this_arg) { LDKChannelMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKC2Tuple_OutPointScriptZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_OutPointScriptZ), "LDKC2Tuple_OutPointScriptZ"); *ret_conv = ChannelMonitor_get_funding_txo(&this_arg_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_tArray __attribute__((export_name("TS_ChannelMonitor_get_outputs_to_watch"))) TS_ChannelMonitor_get_outputs_to_watch(uint32_t this_arg) { +uint64_tArray __attribute__((export_name("TS_ChannelMonitor_get_outputs_to_watch"))) TS_ChannelMonitor_get_outputs_to_watch(uint64_t this_arg) { LDKChannelMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ ret_var = ChannelMonitor_get_outputs_to_watch(&this_arg_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t o = 0; o < ret_var.datalen; o++) { LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ* ret_conv_40_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ"); *ret_conv_40_conv = ret_var.data[o]; - ret_arr_ptr[o] = ((uint32_t)ret_conv_40_conv); + ret_arr_ptr[o] = tag_ptr(ret_conv_40_conv, true); } FREE(ret_var.data); return ret_arr; } -void __attribute__((export_name("TS_ChannelMonitor_load_outputs_to_watch"))) TS_ChannelMonitor_load_outputs_to_watch(uint32_t this_arg, uint32_t filter) { +void __attribute__((export_name("TS_ChannelMonitor_load_outputs_to_watch"))) TS_ChannelMonitor_load_outputs_to_watch(uint64_t this_arg, uint64_t filter) { LDKChannelMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); - void* filter_ptr = (void*)(((uintptr_t)filter) & ~1); - if (!(filter & 1)) { CHECK_ACCESS(filter_ptr); } + this_arg_conv.is_owned = false; + void* filter_ptr = untag_ptr(filter); + if (ptr_is_owned(filter)) { CHECK_ACCESS(filter_ptr); } LDKFilter* filter_conv = (LDKFilter*)filter_ptr; ChannelMonitor_load_outputs_to_watch(&this_arg_conv, filter_conv); } -uint32_tArray __attribute__((export_name("TS_ChannelMonitor_get_and_clear_pending_monitor_events"))) TS_ChannelMonitor_get_and_clear_pending_monitor_events(uint32_t this_arg) { +uint64_tArray __attribute__((export_name("TS_ChannelMonitor_get_and_clear_pending_monitor_events"))) TS_ChannelMonitor_get_and_clear_pending_monitor_events(uint64_t this_arg) { LDKChannelMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCVec_MonitorEventZ ret_var = ChannelMonitor_get_and_clear_pending_monitor_events(&this_arg_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t o = 0; o < ret_var.datalen; o++) { LDKMonitorEvent *ret_conv_14_copy = MALLOC(sizeof(LDKMonitorEvent), "LDKMonitorEvent"); *ret_conv_14_copy = ret_var.data[o]; - uint32_t ret_conv_14_ref = (uintptr_t)ret_conv_14_copy; + uint64_t ret_conv_14_ref = tag_ptr(ret_conv_14_copy, true); ret_arr_ptr[o] = ret_conv_14_ref; } @@ -24029,19 +22672,20 @@ uint32_tArray __attribute__((export_name("TS_ChannelMonitor_get_and_clear_pendi return ret_arr; } -uint32_tArray __attribute__((export_name("TS_ChannelMonitor_get_and_clear_pending_events"))) TS_ChannelMonitor_get_and_clear_pending_events(uint32_t this_arg) { +uint64_tArray __attribute__((export_name("TS_ChannelMonitor_get_and_clear_pending_events"))) TS_ChannelMonitor_get_and_clear_pending_events(uint64_t this_arg) { LDKChannelMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCVec_EventZ ret_var = ChannelMonitor_get_and_clear_pending_events(&this_arg_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t h = 0; h < ret_var.datalen; h++) { LDKEvent *ret_conv_7_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_conv_7_copy = ret_var.data[h]; - uint32_t ret_conv_7_ref = (uintptr_t)ret_conv_7_copy; + uint64_t ret_conv_7_ref = tag_ptr(ret_conv_7_copy, true); ret_arr_ptr[h] = ret_conv_7_ref; } @@ -24049,23 +22693,25 @@ uint32_tArray __attribute__((export_name("TS_ChannelMonitor_get_and_clear_pendi return ret_arr; } -int8_tArray __attribute__((export_name("TS_ChannelMonitor_get_counterparty_node_id"))) TS_ChannelMonitor_get_counterparty_node_id(uint32_t this_arg) { +int8_tArray __attribute__((export_name("TS_ChannelMonitor_get_counterparty_node_id"))) TS_ChannelMonitor_get_counterparty_node_id(uint64_t this_arg) { LDKChannelMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, ChannelMonitor_get_counterparty_node_id(&this_arg_conv).compressed_form, 33); return ret_arr; } -ptrArray __attribute__((export_name("TS_ChannelMonitor_get_latest_holder_commitment_txn"))) TS_ChannelMonitor_get_latest_holder_commitment_txn(uint32_t this_arg, uint32_t logger) { +ptrArray __attribute__((export_name("TS_ChannelMonitor_get_latest_holder_commitment_txn"))) TS_ChannelMonitor_get_latest_holder_commitment_txn(uint64_t this_arg, uint64_t logger) { LDKChannelMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); - void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); - if (!(logger & 1)) { CHECK_ACCESS(logger_ptr); } + this_arg_conv.is_owned = false; + void* logger_ptr = untag_ptr(logger); + if (ptr_is_owned(logger)) { 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; @@ -24083,11 +22729,12 @@ ptrArray __attribute__((export_name("TS_ChannelMonitor_get_latest_holder_commit return ret_arr; } -uint32_tArray __attribute__((export_name("TS_ChannelMonitor_block_connected"))) TS_ChannelMonitor_block_connected(uint32_t this_arg, int8_tArray header, uint32_tArray txdata, int32_t height, uint32_t broadcaster, uint32_t fee_estimator, uint32_t logger) { +uint64_tArray __attribute__((export_name("TS_ChannelMonitor_block_connected"))) TS_ChannelMonitor_block_connected(uint64_t this_arg, int8_tArray header, uint64_tArray txdata, int32_t height, uint64_t broadcaster, uint64_t fee_estimator, uint64_t logger) { LDKChannelMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; unsigned char header_arr[80]; CHECK(header->arr_len == 80); memcpy(header_arr, header->elems, 80); FREE(header); @@ -24098,31 +22745,31 @@ 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; + uint64_t* txdata_vals = txdata->elems; for (size_t c = 0; c < txdata_constr.datalen; c++) { - uint32_t txdata_conv_28 = txdata_vals[c]; - void* txdata_conv_28_ptr = (void*)(((uintptr_t)txdata_conv_28) & ~1); + uint64_t txdata_conv_28 = txdata_vals[c]; + void* txdata_conv_28_ptr = untag_ptr(txdata_conv_28); 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*)(((uintptr_t)txdata_conv_28) & ~1)); + txdata_conv_28_conv = C2Tuple_usizeTransactionZ_clone((LDKC2Tuple_usizeTransactionZ*)untag_ptr(txdata_conv_28)); txdata_constr.data[c] = txdata_conv_28_conv; } FREE(txdata); - void* broadcaster_ptr = (void*)(((uintptr_t)broadcaster) & ~1); + void* broadcaster_ptr = untag_ptr(broadcaster); CHECK_ACCESS(broadcaster_ptr); LDKBroadcasterInterface broadcaster_conv = *(LDKBroadcasterInterface*)(broadcaster_ptr); if (broadcaster_conv.free == LDKBroadcasterInterface_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKBroadcasterInterface_JCalls_cloned(&broadcaster_conv); } - void* fee_estimator_ptr = (void*)(((uintptr_t)fee_estimator) & ~1); + void* fee_estimator_ptr = untag_ptr(fee_estimator); CHECK_ACCESS(fee_estimator_ptr); LDKFeeEstimator fee_estimator_conv = *(LDKFeeEstimator*)(fee_estimator_ptr); if (fee_estimator_conv.free == LDKFeeEstimator_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKFeeEstimator_JCalls_cloned(&fee_estimator_conv); } - void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); + void* logger_ptr = untag_ptr(logger); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); if (logger_conv.free == LDKLogger_JCalls_free) { @@ -24130,43 +22777,44 @@ uint32_tArray __attribute__((export_name("TS_ChannelMonitor_block_connected"))) LDKLogger_JCalls_cloned(&logger_conv); } LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ ret_var = ChannelMonitor_block_connected(&this_arg_conv, header_ref, txdata_constr, height, broadcaster_conv, fee_estimator_conv, logger_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t n = 0; n < ret_var.datalen; n++) { LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* ret_conv_39_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ"); *ret_conv_39_conv = ret_var.data[n]; - ret_arr_ptr[n] = ((uint32_t)ret_conv_39_conv); + ret_arr_ptr[n] = tag_ptr(ret_conv_39_conv, true); } FREE(ret_var.data); return ret_arr; } -void __attribute__((export_name("TS_ChannelMonitor_block_disconnected"))) TS_ChannelMonitor_block_disconnected(uint32_t this_arg, int8_tArray header, int32_t height, uint32_t broadcaster, uint32_t fee_estimator, uint32_t logger) { +void __attribute__((export_name("TS_ChannelMonitor_block_disconnected"))) TS_ChannelMonitor_block_disconnected(uint64_t this_arg, int8_tArray header, int32_t height, uint64_t broadcaster, uint64_t fee_estimator, uint64_t logger) { LDKChannelMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; unsigned char header_arr[80]; CHECK(header->arr_len == 80); memcpy(header_arr, header->elems, 80); FREE(header); unsigned char (*header_ref)[80] = &header_arr; - void* broadcaster_ptr = (void*)(((uintptr_t)broadcaster) & ~1); + void* broadcaster_ptr = untag_ptr(broadcaster); CHECK_ACCESS(broadcaster_ptr); LDKBroadcasterInterface broadcaster_conv = *(LDKBroadcasterInterface*)(broadcaster_ptr); if (broadcaster_conv.free == LDKBroadcasterInterface_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKBroadcasterInterface_JCalls_cloned(&broadcaster_conv); } - void* fee_estimator_ptr = (void*)(((uintptr_t)fee_estimator) & ~1); + void* fee_estimator_ptr = untag_ptr(fee_estimator); CHECK_ACCESS(fee_estimator_ptr); LDKFeeEstimator fee_estimator_conv = *(LDKFeeEstimator*)(fee_estimator_ptr); if (fee_estimator_conv.free == LDKFeeEstimator_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKFeeEstimator_JCalls_cloned(&fee_estimator_conv); } - void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); + void* logger_ptr = untag_ptr(logger); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); if (logger_conv.free == LDKLogger_JCalls_free) { @@ -24176,11 +22824,12 @@ void __attribute__((export_name("TS_ChannelMonitor_block_disconnected"))) TS_Ch ChannelMonitor_block_disconnected(&this_arg_conv, header_ref, height, broadcaster_conv, fee_estimator_conv, logger_conv); } -uint32_tArray __attribute__((export_name("TS_ChannelMonitor_transactions_confirmed"))) TS_ChannelMonitor_transactions_confirmed(uint32_t this_arg, int8_tArray header, uint32_tArray txdata, int32_t height, uint32_t broadcaster, uint32_t fee_estimator, uint32_t logger) { +uint64_tArray __attribute__((export_name("TS_ChannelMonitor_transactions_confirmed"))) TS_ChannelMonitor_transactions_confirmed(uint64_t this_arg, int8_tArray header, uint64_tArray txdata, int32_t height, uint64_t broadcaster, uint64_t fee_estimator, uint64_t logger) { LDKChannelMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; unsigned char header_arr[80]; CHECK(header->arr_len == 80); memcpy(header_arr, header->elems, 80); FREE(header); @@ -24191,31 +22840,31 @@ 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; + uint64_t* txdata_vals = txdata->elems; for (size_t c = 0; c < txdata_constr.datalen; c++) { - uint32_t txdata_conv_28 = txdata_vals[c]; - void* txdata_conv_28_ptr = (void*)(((uintptr_t)txdata_conv_28) & ~1); + uint64_t txdata_conv_28 = txdata_vals[c]; + void* txdata_conv_28_ptr = untag_ptr(txdata_conv_28); 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*)(((uintptr_t)txdata_conv_28) & ~1)); + txdata_conv_28_conv = C2Tuple_usizeTransactionZ_clone((LDKC2Tuple_usizeTransactionZ*)untag_ptr(txdata_conv_28)); txdata_constr.data[c] = txdata_conv_28_conv; } FREE(txdata); - void* broadcaster_ptr = (void*)(((uintptr_t)broadcaster) & ~1); + void* broadcaster_ptr = untag_ptr(broadcaster); CHECK_ACCESS(broadcaster_ptr); LDKBroadcasterInterface broadcaster_conv = *(LDKBroadcasterInterface*)(broadcaster_ptr); if (broadcaster_conv.free == LDKBroadcasterInterface_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKBroadcasterInterface_JCalls_cloned(&broadcaster_conv); } - void* fee_estimator_ptr = (void*)(((uintptr_t)fee_estimator) & ~1); + void* fee_estimator_ptr = untag_ptr(fee_estimator); CHECK_ACCESS(fee_estimator_ptr); LDKFeeEstimator fee_estimator_conv = *(LDKFeeEstimator*)(fee_estimator_ptr); if (fee_estimator_conv.free == LDKFeeEstimator_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKFeeEstimator_JCalls_cloned(&fee_estimator_conv); } - void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); + void* logger_ptr = untag_ptr(logger); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); if (logger_conv.free == LDKLogger_JCalls_free) { @@ -24223,43 +22872,44 @@ uint32_tArray __attribute__((export_name("TS_ChannelMonitor_transactions_confir LDKLogger_JCalls_cloned(&logger_conv); } LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ ret_var = ChannelMonitor_transactions_confirmed(&this_arg_conv, header_ref, txdata_constr, height, broadcaster_conv, fee_estimator_conv, logger_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t n = 0; n < ret_var.datalen; n++) { LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* ret_conv_39_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ"); *ret_conv_39_conv = ret_var.data[n]; - ret_arr_ptr[n] = ((uint32_t)ret_conv_39_conv); + ret_arr_ptr[n] = tag_ptr(ret_conv_39_conv, true); } FREE(ret_var.data); return ret_arr; } -void __attribute__((export_name("TS_ChannelMonitor_transaction_unconfirmed"))) TS_ChannelMonitor_transaction_unconfirmed(uint32_t this_arg, int8_tArray txid, uint32_t broadcaster, uint32_t fee_estimator, uint32_t logger) { +void __attribute__((export_name("TS_ChannelMonitor_transaction_unconfirmed"))) TS_ChannelMonitor_transaction_unconfirmed(uint64_t this_arg, int8_tArray txid, uint64_t broadcaster, uint64_t fee_estimator, uint64_t logger) { LDKChannelMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; unsigned char txid_arr[32]; CHECK(txid->arr_len == 32); memcpy(txid_arr, txid->elems, 32); FREE(txid); unsigned char (*txid_ref)[32] = &txid_arr; - void* broadcaster_ptr = (void*)(((uintptr_t)broadcaster) & ~1); + void* broadcaster_ptr = untag_ptr(broadcaster); CHECK_ACCESS(broadcaster_ptr); LDKBroadcasterInterface broadcaster_conv = *(LDKBroadcasterInterface*)(broadcaster_ptr); if (broadcaster_conv.free == LDKBroadcasterInterface_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKBroadcasterInterface_JCalls_cloned(&broadcaster_conv); } - void* fee_estimator_ptr = (void*)(((uintptr_t)fee_estimator) & ~1); + void* fee_estimator_ptr = untag_ptr(fee_estimator); CHECK_ACCESS(fee_estimator_ptr); LDKFeeEstimator fee_estimator_conv = *(LDKFeeEstimator*)(fee_estimator_ptr); if (fee_estimator_conv.free == LDKFeeEstimator_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKFeeEstimator_JCalls_cloned(&fee_estimator_conv); } - void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); + void* logger_ptr = untag_ptr(logger); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); if (logger_conv.free == LDKLogger_JCalls_free) { @@ -24269,30 +22919,31 @@ void __attribute__((export_name("TS_ChannelMonitor_transaction_unconfirmed"))) ChannelMonitor_transaction_unconfirmed(&this_arg_conv, txid_ref, broadcaster_conv, fee_estimator_conv, logger_conv); } -uint32_tArray __attribute__((export_name("TS_ChannelMonitor_best_block_updated"))) TS_ChannelMonitor_best_block_updated(uint32_t this_arg, int8_tArray header, int32_t height, uint32_t broadcaster, uint32_t fee_estimator, uint32_t logger) { +uint64_tArray __attribute__((export_name("TS_ChannelMonitor_best_block_updated"))) TS_ChannelMonitor_best_block_updated(uint64_t this_arg, int8_tArray header, int32_t height, uint64_t broadcaster, uint64_t fee_estimator, uint64_t logger) { LDKChannelMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; unsigned char header_arr[80]; CHECK(header->arr_len == 80); memcpy(header_arr, header->elems, 80); FREE(header); unsigned char (*header_ref)[80] = &header_arr; - void* broadcaster_ptr = (void*)(((uintptr_t)broadcaster) & ~1); + void* broadcaster_ptr = untag_ptr(broadcaster); CHECK_ACCESS(broadcaster_ptr); LDKBroadcasterInterface broadcaster_conv = *(LDKBroadcasterInterface*)(broadcaster_ptr); if (broadcaster_conv.free == LDKBroadcasterInterface_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKBroadcasterInterface_JCalls_cloned(&broadcaster_conv); } - void* fee_estimator_ptr = (void*)(((uintptr_t)fee_estimator) & ~1); + void* fee_estimator_ptr = untag_ptr(fee_estimator); CHECK_ACCESS(fee_estimator_ptr); LDKFeeEstimator fee_estimator_conv = *(LDKFeeEstimator*)(fee_estimator_ptr); if (fee_estimator_conv.free == LDKFeeEstimator_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKFeeEstimator_JCalls_cloned(&fee_estimator_conv); } - void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); + void* logger_ptr = untag_ptr(logger); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); if (logger_conv.free == LDKLogger_JCalls_free) { @@ -24300,24 +22951,25 @@ uint32_tArray __attribute__((export_name("TS_ChannelMonitor_best_block_updated" LDKLogger_JCalls_cloned(&logger_conv); } LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ ret_var = ChannelMonitor_best_block_updated(&this_arg_conv, header_ref, height, broadcaster_conv, fee_estimator_conv, logger_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t n = 0; n < ret_var.datalen; n++) { LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* ret_conv_39_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ"); *ret_conv_39_conv = ret_var.data[n]; - ret_arr_ptr[n] = ((uint32_t)ret_conv_39_conv); + ret_arr_ptr[n] = tag_ptr(ret_conv_39_conv, true); } FREE(ret_var.data); return ret_arr; } -ptrArray __attribute__((export_name("TS_ChannelMonitor_get_relevant_txids"))) TS_ChannelMonitor_get_relevant_txids(uint32_t this_arg) { +ptrArray __attribute__((export_name("TS_ChannelMonitor_get_relevant_txids"))) TS_ChannelMonitor_get_relevant_txids(uint64_t this_arg) { LDKChannelMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCVec_TxidZ ret_var = ChannelMonitor_get_relevant_txids(&this_arg_conv); ptrArray ret_arr = NULL; ret_arr = init_ptrArray(ret_var.datalen, __LINE__); @@ -24332,36 +22984,33 @@ ptrArray __attribute__((export_name("TS_ChannelMonitor_get_relevant_txids"))) T return ret_arr; } -uint32_t __attribute__((export_name("TS_ChannelMonitor_current_best_block"))) TS_ChannelMonitor_current_best_block(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ChannelMonitor_current_best_block"))) TS_ChannelMonitor_current_best_block(uint64_t this_arg) { LDKChannelMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKBestBlock ret_var = ChannelMonitor_current_best_block(&this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_tArray __attribute__((export_name("TS_ChannelMonitor_get_claimable_balances"))) TS_ChannelMonitor_get_claimable_balances(uint32_t this_arg) { +uint64_tArray __attribute__((export_name("TS_ChannelMonitor_get_claimable_balances"))) TS_ChannelMonitor_get_claimable_balances(uint64_t this_arg) { LDKChannelMonitor this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCVec_BalanceZ ret_var = ChannelMonitor_get_claimable_balances(&this_arg_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t j = 0; j < ret_var.datalen; j++) { LDKBalance *ret_conv_9_copy = MALLOC(sizeof(LDKBalance), "LDKBalance"); *ret_conv_9_copy = ret_var.data[j]; - uint32_t ret_conv_9_ref = (uintptr_t)ret_conv_9_copy; + uint64_t ret_conv_9_ref = tag_ptr(ret_conv_9_copy, true); ret_arr_ptr[j] = ret_conv_9_ref; } @@ -24369,156 +23018,152 @@ uint32_tArray __attribute__((export_name("TS_ChannelMonitor_get_claimable_balan return ret_arr; } -uint32_t __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_read"))) TS_C2Tuple_BlockHashChannelMonitorZ_read(int8_tArray ser, uint32_t arg) { +uint64_t __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_read"))) TS_C2Tuple_BlockHashChannelMonitorZ_read(int8_tArray ser, uint64_t arg) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; ser_ref.data = ser->elems; - void* arg_ptr = (void*)(((uintptr_t)arg) & ~1); - if (!(arg & 1)) { CHECK_ACCESS(arg_ptr); } + void* arg_ptr = untag_ptr(arg); + if (ptr_is_owned(arg)) { CHECK_ACCESS(arg_ptr); } LDKKeysInterface* arg_conv = (LDKKeysInterface*)arg_ptr; LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ), "LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ"); *ret_conv = C2Tuple_BlockHashChannelMonitorZ_read(ser_ref, arg_conv); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_OutPoint_free"))) TS_OutPoint_free(uint32_t this_obj) { +void __attribute__((export_name("TS_OutPoint_free"))) TS_OutPoint_free(uint64_t this_obj) { LDKOutPoint this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); OutPoint_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_OutPoint_get_txid"))) TS_OutPoint_get_txid(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_OutPoint_get_txid"))) TS_OutPoint_get_txid(uint64_t this_ptr) { LDKOutPoint this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *OutPoint_get_txid(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_OutPoint_set_txid"))) TS_OutPoint_set_txid(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_OutPoint_set_txid"))) TS_OutPoint_set_txid(uint64_t this_ptr, int8_tArray val) { LDKOutPoint this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); OutPoint_set_txid(&this_ptr_conv, val_ref); } -int16_t __attribute__((export_name("TS_OutPoint_get_index"))) TS_OutPoint_get_index(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_OutPoint_get_index"))) TS_OutPoint_get_index(uint64_t this_ptr) { LDKOutPoint this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = OutPoint_get_index(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_OutPoint_set_index"))) TS_OutPoint_set_index(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_OutPoint_set_index"))) TS_OutPoint_set_index(uint64_t this_ptr, int16_t val) { LDKOutPoint this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; OutPoint_set_index(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_OutPoint_new"))) TS_OutPoint_new(int8_tArray txid_arg, int16_t index_arg) { +uint64_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); FREE(txid_arg); LDKOutPoint ret_var = OutPoint_new(txid_arg_ref, index_arg); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t OutPoint_clone_ptr(LDKOutPoint *NONNULL_PTR arg) { +static inline uint64_t OutPoint_clone_ptr(LDKOutPoint *NONNULL_PTR arg) { LDKOutPoint ret_var = OutPoint_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_OutPoint_clone_ptr"))) TS_OutPoint_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_OutPoint_clone_ptr"))) TS_OutPoint_clone_ptr(uint64_t arg) { LDKOutPoint arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = OutPoint_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = OutPoint_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_OutPoint_clone"))) TS_OutPoint_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_OutPoint_clone"))) TS_OutPoint_clone(uint64_t orig) { LDKOutPoint orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKOutPoint ret_var = OutPoint_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -jboolean __attribute__((export_name("TS_OutPoint_eq"))) TS_OutPoint_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_OutPoint_eq"))) TS_OutPoint_eq(uint64_t a, uint64_t b) { LDKOutPoint a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKOutPoint b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = OutPoint_eq(&a_conv, &b_conv); return ret_conv; } -int64_t __attribute__((export_name("TS_OutPoint_hash"))) TS_OutPoint_hash(uint32_t o) { +int64_t __attribute__((export_name("TS_OutPoint_hash"))) TS_OutPoint_hash(uint64_t o) { LDKOutPoint o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = false; + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); + o_conv.is_owned = false; int64_t ret_conv = OutPoint_hash(&o_conv); return ret_conv; } -int8_tArray __attribute__((export_name("TS_OutPoint_to_channel_id"))) TS_OutPoint_to_channel_id(uint32_t this_arg) { +int8_tArray __attribute__((export_name("TS_OutPoint_to_channel_id"))) TS_OutPoint_to_channel_id(uint64_t this_arg) { LDKOutPoint this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; 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; } -int8_tArray __attribute__((export_name("TS_OutPoint_write"))) TS_OutPoint_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_OutPoint_write"))) TS_OutPoint_write(uint64_t obj) { LDKOutPoint obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = OutPoint_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -24526,186 +23171,195 @@ int8_tArray __attribute__((export_name("TS_OutPoint_write"))) TS_OutPoint_write return ret_arr; } -uint32_t __attribute__((export_name("TS_OutPoint_read"))) TS_OutPoint_read(int8_tArray ser) { +uint64_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; LDKCResult_OutPointDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OutPointDecodeErrorZ), "LDKCResult_OutPointDecodeErrorZ"); *ret_conv = OutPoint_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_free"))) TS_DelayedPaymentOutputDescriptor_free(uint32_t this_obj) { +void __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_free"))) TS_DelayedPaymentOutputDescriptor_free(uint64_t this_obj) { LDKDelayedPaymentOutputDescriptor this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); DelayedPaymentOutputDescriptor_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_get_outpoint"))) TS_DelayedPaymentOutputDescriptor_get_outpoint(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_get_outpoint"))) TS_DelayedPaymentOutputDescriptor_get_outpoint(uint64_t this_ptr) { LDKDelayedPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKOutPoint ret_var = DelayedPaymentOutputDescriptor_get_outpoint(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_set_outpoint"))) TS_DelayedPaymentOutputDescriptor_set_outpoint(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_set_outpoint"))) TS_DelayedPaymentOutputDescriptor_set_outpoint(uint64_t this_ptr, uint64_t val) { LDKDelayedPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKOutPoint val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = OutPoint_clone(&val_conv); DelayedPaymentOutputDescriptor_set_outpoint(&this_ptr_conv, val_conv); } -int8_tArray __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_get_per_commitment_point"))) TS_DelayedPaymentOutputDescriptor_get_per_commitment_point(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_get_per_commitment_point"))) TS_DelayedPaymentOutputDescriptor_get_per_commitment_point(uint64_t this_ptr) { LDKDelayedPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_set_per_commitment_point"))) TS_DelayedPaymentOutputDescriptor_set_per_commitment_point(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_set_per_commitment_point"))) TS_DelayedPaymentOutputDescriptor_set_per_commitment_point(uint64_t this_ptr, int8_tArray val) { LDKDelayedPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); DelayedPaymentOutputDescriptor_set_per_commitment_point(&this_ptr_conv, val_ref); } -int16_t __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_get_to_self_delay"))) TS_DelayedPaymentOutputDescriptor_get_to_self_delay(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_get_to_self_delay"))) TS_DelayedPaymentOutputDescriptor_get_to_self_delay(uint64_t this_ptr) { LDKDelayedPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = DelayedPaymentOutputDescriptor_get_to_self_delay(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_set_to_self_delay"))) TS_DelayedPaymentOutputDescriptor_set_to_self_delay(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_set_to_self_delay"))) TS_DelayedPaymentOutputDescriptor_set_to_self_delay(uint64_t this_ptr, int16_t val) { LDKDelayedPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; DelayedPaymentOutputDescriptor_set_to_self_delay(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_get_output"))) TS_DelayedPaymentOutputDescriptor_get_output(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_get_output"))) TS_DelayedPaymentOutputDescriptor_get_output(uint64_t this_ptr) { LDKDelayedPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKTxOut* ret_ref = MALLOC(sizeof(LDKTxOut), "LDKTxOut"); *ret_ref = DelayedPaymentOutputDescriptor_get_output(&this_ptr_conv); - return (uint32_t)ret_ref; + return tag_ptr(ret_ref, true); } -void __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_set_output"))) TS_DelayedPaymentOutputDescriptor_set_output(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_set_output"))) TS_DelayedPaymentOutputDescriptor_set_output(uint64_t this_ptr, uint64_t val) { LDKDelayedPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKTxOut val_conv = *(LDKTxOut*)(val_ptr); - val_conv = TxOut_clone((LDKTxOut*)(((uintptr_t)val) & ~1)); + val_conv = TxOut_clone((LDKTxOut*)untag_ptr(val)); DelayedPaymentOutputDescriptor_set_output(&this_ptr_conv, val_conv); } -int8_tArray __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_get_revocation_pubkey"))) TS_DelayedPaymentOutputDescriptor_get_revocation_pubkey(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_get_revocation_pubkey"))) TS_DelayedPaymentOutputDescriptor_get_revocation_pubkey(uint64_t this_ptr) { LDKDelayedPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_set_revocation_pubkey"))) TS_DelayedPaymentOutputDescriptor_set_revocation_pubkey(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_set_revocation_pubkey"))) TS_DelayedPaymentOutputDescriptor_set_revocation_pubkey(uint64_t this_ptr, int8_tArray val) { LDKDelayedPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); DelayedPaymentOutputDescriptor_set_revocation_pubkey(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_get_channel_keys_id"))) TS_DelayedPaymentOutputDescriptor_get_channel_keys_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_get_channel_keys_id"))) TS_DelayedPaymentOutputDescriptor_get_channel_keys_id(uint64_t this_ptr) { LDKDelayedPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_set_channel_keys_id"))) TS_DelayedPaymentOutputDescriptor_set_channel_keys_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_set_channel_keys_id"))) TS_DelayedPaymentOutputDescriptor_set_channel_keys_id(uint64_t this_ptr, int8_tArray val) { LDKDelayedPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); DelayedPaymentOutputDescriptor_set_channel_keys_id(&this_ptr_conv, val_ref); } -int64_t __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_get_channel_value_satoshis"))) TS_DelayedPaymentOutputDescriptor_get_channel_value_satoshis(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_get_channel_value_satoshis"))) TS_DelayedPaymentOutputDescriptor_get_channel_value_satoshis(uint64_t this_ptr) { LDKDelayedPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = DelayedPaymentOutputDescriptor_get_channel_value_satoshis(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_set_channel_value_satoshis"))) TS_DelayedPaymentOutputDescriptor_set_channel_value_satoshis(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_set_channel_value_satoshis"))) TS_DelayedPaymentOutputDescriptor_set_channel_value_satoshis(uint64_t this_ptr, int64_t val) { LDKDelayedPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; DelayedPaymentOutputDescriptor_set_channel_value_satoshis(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_new"))) TS_DelayedPaymentOutputDescriptor_new(uint32_t outpoint_arg, int8_tArray per_commitment_point_arg, int16_t to_self_delay_arg, uint32_t output_arg, int8_tArray revocation_pubkey_arg, int8_tArray channel_keys_id_arg, int64_t channel_value_satoshis_arg) { +uint64_t __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_new"))) TS_DelayedPaymentOutputDescriptor_new(uint64_t outpoint_arg, int8_tArray per_commitment_point_arg, int16_t to_self_delay_arg, uint64_t output_arg, int8_tArray revocation_pubkey_arg, int8_tArray channel_keys_id_arg, int64_t channel_value_satoshis_arg) { LDKOutPoint outpoint_arg_conv; - outpoint_arg_conv.inner = (void*)(outpoint_arg & (~1)); - outpoint_arg_conv.is_owned = (outpoint_arg & 1) || (outpoint_arg == 0); + outpoint_arg_conv.inner = untag_ptr(outpoint_arg); + outpoint_arg_conv.is_owned = ptr_is_owned(outpoint_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(outpoint_arg_conv); 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); FREE(per_commitment_point_arg); - void* output_arg_ptr = (void*)(((uintptr_t)output_arg) & ~1); + void* output_arg_ptr = untag_ptr(output_arg); CHECK_ACCESS(output_arg_ptr); LDKTxOut output_arg_conv = *(LDKTxOut*)(output_arg_ptr); - output_arg_conv = TxOut_clone((LDKTxOut*)(((uintptr_t)output_arg) & ~1)); + output_arg_conv = TxOut_clone((LDKTxOut*)untag_ptr(output_arg)); LDKPublicKey revocation_pubkey_arg_ref; CHECK(revocation_pubkey_arg->arr_len == 33); memcpy(revocation_pubkey_arg_ref.compressed_form, revocation_pubkey_arg->elems, 33); FREE(revocation_pubkey_arg); @@ -24713,60 +23367,48 @@ uint32_t __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_new"))) CHECK(channel_keys_id_arg->arr_len == 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t DelayedPaymentOutputDescriptor_clone_ptr(LDKDelayedPaymentOutputDescriptor *NONNULL_PTR arg) { +static inline uint64_t DelayedPaymentOutputDescriptor_clone_ptr(LDKDelayedPaymentOutputDescriptor *NONNULL_PTR arg) { LDKDelayedPaymentOutputDescriptor ret_var = DelayedPaymentOutputDescriptor_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_clone_ptr"))) TS_DelayedPaymentOutputDescriptor_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_clone_ptr"))) TS_DelayedPaymentOutputDescriptor_clone_ptr(uint64_t arg) { LDKDelayedPaymentOutputDescriptor arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = DelayedPaymentOutputDescriptor_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = DelayedPaymentOutputDescriptor_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_clone"))) TS_DelayedPaymentOutputDescriptor_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_clone"))) TS_DelayedPaymentOutputDescriptor_clone(uint64_t orig) { LDKDelayedPaymentOutputDescriptor orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKDelayedPaymentOutputDescriptor ret_var = DelayedPaymentOutputDescriptor_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_write"))) TS_DelayedPaymentOutputDescriptor_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_write"))) TS_DelayedPaymentOutputDescriptor_write(uint64_t obj) { LDKDelayedPaymentOutputDescriptor obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = DelayedPaymentOutputDescriptor_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -24774,182 +23416,173 @@ int8_tArray __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_write return ret_arr; } -uint32_t __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_read"))) TS_DelayedPaymentOutputDescriptor_read(int8_tArray ser) { +uint64_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; LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ"); *ret_conv = DelayedPaymentOutputDescriptor_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_StaticPaymentOutputDescriptor_free"))) TS_StaticPaymentOutputDescriptor_free(uint32_t this_obj) { +void __attribute__((export_name("TS_StaticPaymentOutputDescriptor_free"))) TS_StaticPaymentOutputDescriptor_free(uint64_t this_obj) { LDKStaticPaymentOutputDescriptor this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); StaticPaymentOutputDescriptor_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_StaticPaymentOutputDescriptor_get_outpoint"))) TS_StaticPaymentOutputDescriptor_get_outpoint(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_StaticPaymentOutputDescriptor_get_outpoint"))) TS_StaticPaymentOutputDescriptor_get_outpoint(uint64_t this_ptr) { LDKStaticPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKOutPoint ret_var = StaticPaymentOutputDescriptor_get_outpoint(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_StaticPaymentOutputDescriptor_set_outpoint"))) TS_StaticPaymentOutputDescriptor_set_outpoint(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_StaticPaymentOutputDescriptor_set_outpoint"))) TS_StaticPaymentOutputDescriptor_set_outpoint(uint64_t this_ptr, uint64_t val) { LDKStaticPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKOutPoint val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = OutPoint_clone(&val_conv); StaticPaymentOutputDescriptor_set_outpoint(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_StaticPaymentOutputDescriptor_get_output"))) TS_StaticPaymentOutputDescriptor_get_output(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_StaticPaymentOutputDescriptor_get_output"))) TS_StaticPaymentOutputDescriptor_get_output(uint64_t this_ptr) { LDKStaticPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKTxOut* ret_ref = MALLOC(sizeof(LDKTxOut), "LDKTxOut"); *ret_ref = StaticPaymentOutputDescriptor_get_output(&this_ptr_conv); - return (uint32_t)ret_ref; + return tag_ptr(ret_ref, true); } -void __attribute__((export_name("TS_StaticPaymentOutputDescriptor_set_output"))) TS_StaticPaymentOutputDescriptor_set_output(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_StaticPaymentOutputDescriptor_set_output"))) TS_StaticPaymentOutputDescriptor_set_output(uint64_t this_ptr, uint64_t val) { LDKStaticPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKTxOut val_conv = *(LDKTxOut*)(val_ptr); - val_conv = TxOut_clone((LDKTxOut*)(((uintptr_t)val) & ~1)); + val_conv = TxOut_clone((LDKTxOut*)untag_ptr(val)); StaticPaymentOutputDescriptor_set_output(&this_ptr_conv, val_conv); } -int8_tArray __attribute__((export_name("TS_StaticPaymentOutputDescriptor_get_channel_keys_id"))) TS_StaticPaymentOutputDescriptor_get_channel_keys_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_StaticPaymentOutputDescriptor_get_channel_keys_id"))) TS_StaticPaymentOutputDescriptor_get_channel_keys_id(uint64_t this_ptr) { LDKStaticPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_StaticPaymentOutputDescriptor_set_channel_keys_id"))) TS_StaticPaymentOutputDescriptor_set_channel_keys_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_StaticPaymentOutputDescriptor_set_channel_keys_id"))) TS_StaticPaymentOutputDescriptor_set_channel_keys_id(uint64_t this_ptr, int8_tArray val) { LDKStaticPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); StaticPaymentOutputDescriptor_set_channel_keys_id(&this_ptr_conv, val_ref); } -int64_t __attribute__((export_name("TS_StaticPaymentOutputDescriptor_get_channel_value_satoshis"))) TS_StaticPaymentOutputDescriptor_get_channel_value_satoshis(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_StaticPaymentOutputDescriptor_get_channel_value_satoshis"))) TS_StaticPaymentOutputDescriptor_get_channel_value_satoshis(uint64_t this_ptr) { LDKStaticPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = StaticPaymentOutputDescriptor_get_channel_value_satoshis(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_StaticPaymentOutputDescriptor_set_channel_value_satoshis"))) TS_StaticPaymentOutputDescriptor_set_channel_value_satoshis(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_StaticPaymentOutputDescriptor_set_channel_value_satoshis"))) TS_StaticPaymentOutputDescriptor_set_channel_value_satoshis(uint64_t this_ptr, int64_t val) { LDKStaticPaymentOutputDescriptor this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; StaticPaymentOutputDescriptor_set_channel_value_satoshis(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_StaticPaymentOutputDescriptor_new"))) TS_StaticPaymentOutputDescriptor_new(uint32_t outpoint_arg, uint32_t output_arg, int8_tArray channel_keys_id_arg, int64_t channel_value_satoshis_arg) { +uint64_t __attribute__((export_name("TS_StaticPaymentOutputDescriptor_new"))) TS_StaticPaymentOutputDescriptor_new(uint64_t outpoint_arg, uint64_t output_arg, int8_tArray channel_keys_id_arg, int64_t channel_value_satoshis_arg) { LDKOutPoint outpoint_arg_conv; - outpoint_arg_conv.inner = (void*)(outpoint_arg & (~1)); - outpoint_arg_conv.is_owned = (outpoint_arg & 1) || (outpoint_arg == 0); + outpoint_arg_conv.inner = untag_ptr(outpoint_arg); + outpoint_arg_conv.is_owned = ptr_is_owned(outpoint_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(outpoint_arg_conv); outpoint_arg_conv = OutPoint_clone(&outpoint_arg_conv); - void* output_arg_ptr = (void*)(((uintptr_t)output_arg) & ~1); + void* output_arg_ptr = untag_ptr(output_arg); CHECK_ACCESS(output_arg_ptr); LDKTxOut output_arg_conv = *(LDKTxOut*)(output_arg_ptr); - output_arg_conv = TxOut_clone((LDKTxOut*)(((uintptr_t)output_arg) & ~1)); + output_arg_conv = TxOut_clone((LDKTxOut*)untag_ptr(output_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); 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t StaticPaymentOutputDescriptor_clone_ptr(LDKStaticPaymentOutputDescriptor *NONNULL_PTR arg) { +static inline uint64_t StaticPaymentOutputDescriptor_clone_ptr(LDKStaticPaymentOutputDescriptor *NONNULL_PTR arg) { LDKStaticPaymentOutputDescriptor ret_var = StaticPaymentOutputDescriptor_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_StaticPaymentOutputDescriptor_clone_ptr"))) TS_StaticPaymentOutputDescriptor_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_StaticPaymentOutputDescriptor_clone_ptr"))) TS_StaticPaymentOutputDescriptor_clone_ptr(uint64_t arg) { LDKStaticPaymentOutputDescriptor arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = StaticPaymentOutputDescriptor_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = StaticPaymentOutputDescriptor_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_StaticPaymentOutputDescriptor_clone"))) TS_StaticPaymentOutputDescriptor_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_StaticPaymentOutputDescriptor_clone"))) TS_StaticPaymentOutputDescriptor_clone(uint64_t orig) { LDKStaticPaymentOutputDescriptor orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKStaticPaymentOutputDescriptor ret_var = StaticPaymentOutputDescriptor_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_StaticPaymentOutputDescriptor_write"))) TS_StaticPaymentOutputDescriptor_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_StaticPaymentOutputDescriptor_write"))) TS_StaticPaymentOutputDescriptor_write(uint64_t obj) { LDKStaticPaymentOutputDescriptor obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = StaticPaymentOutputDescriptor_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -24957,87 +23590,87 @@ int8_tArray __attribute__((export_name("TS_StaticPaymentOutputDescriptor_write" return ret_arr; } -uint32_t __attribute__((export_name("TS_StaticPaymentOutputDescriptor_read"))) TS_StaticPaymentOutputDescriptor_read(int8_tArray ser) { +uint64_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; LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ"); *ret_conv = StaticPaymentOutputDescriptor_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_SpendableOutputDescriptor_free"))) TS_SpendableOutputDescriptor_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKSpendableOutputDescriptor this_ptr_conv = *(LDKSpendableOutputDescriptor*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); SpendableOutputDescriptor_free(this_ptr_conv); } -static inline uintptr_t SpendableOutputDescriptor_clone_ptr(LDKSpendableOutputDescriptor *NONNULL_PTR arg) { +static inline uint64_t SpendableOutputDescriptor_clone_ptr(LDKSpendableOutputDescriptor *NONNULL_PTR arg) { LDKSpendableOutputDescriptor *ret_copy = MALLOC(sizeof(LDKSpendableOutputDescriptor), "LDKSpendableOutputDescriptor"); *ret_copy = SpendableOutputDescriptor_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_SpendableOutputDescriptor_clone_ptr"))) TS_SpendableOutputDescriptor_clone_ptr(uint32_t arg) { - LDKSpendableOutputDescriptor* arg_conv = (LDKSpendableOutputDescriptor*)arg; - uint32_t ret_conv = SpendableOutputDescriptor_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_SpendableOutputDescriptor_clone_ptr"))) TS_SpendableOutputDescriptor_clone_ptr(uint64_t arg) { + LDKSpendableOutputDescriptor* arg_conv = (LDKSpendableOutputDescriptor*)untag_ptr(arg); + int64_t ret_conv = SpendableOutputDescriptor_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_SpendableOutputDescriptor_clone"))) TS_SpendableOutputDescriptor_clone(uint32_t orig) { - LDKSpendableOutputDescriptor* orig_conv = (LDKSpendableOutputDescriptor*)orig; +uint64_t __attribute__((export_name("TS_SpendableOutputDescriptor_clone"))) TS_SpendableOutputDescriptor_clone(uint64_t orig) { + LDKSpendableOutputDescriptor* orig_conv = (LDKSpendableOutputDescriptor*)untag_ptr(orig); LDKSpendableOutputDescriptor *ret_copy = MALLOC(sizeof(LDKSpendableOutputDescriptor), "LDKSpendableOutputDescriptor"); *ret_copy = SpendableOutputDescriptor_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_SpendableOutputDescriptor_static_output"))) TS_SpendableOutputDescriptor_static_output(uint32_t outpoint, uint32_t output) { +uint64_t __attribute__((export_name("TS_SpendableOutputDescriptor_static_output"))) TS_SpendableOutputDescriptor_static_output(uint64_t outpoint, uint64_t output) { LDKOutPoint outpoint_conv; - outpoint_conv.inner = (void*)(outpoint & (~1)); - outpoint_conv.is_owned = (outpoint & 1) || (outpoint == 0); + outpoint_conv.inner = untag_ptr(outpoint); + outpoint_conv.is_owned = ptr_is_owned(outpoint); CHECK_INNER_FIELD_ACCESS_OR_NULL(outpoint_conv); outpoint_conv = OutPoint_clone(&outpoint_conv); - void* output_ptr = (void*)(((uintptr_t)output) & ~1); + void* output_ptr = untag_ptr(output); CHECK_ACCESS(output_ptr); LDKTxOut output_conv = *(LDKTxOut*)(output_ptr); - output_conv = TxOut_clone((LDKTxOut*)(((uintptr_t)output) & ~1)); + output_conv = TxOut_clone((LDKTxOut*)untag_ptr(output)); LDKSpendableOutputDescriptor *ret_copy = MALLOC(sizeof(LDKSpendableOutputDescriptor), "LDKSpendableOutputDescriptor"); *ret_copy = SpendableOutputDescriptor_static_output(outpoint_conv, output_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_SpendableOutputDescriptor_delayed_payment_output"))) TS_SpendableOutputDescriptor_delayed_payment_output(uint32_t a) { +uint64_t __attribute__((export_name("TS_SpendableOutputDescriptor_delayed_payment_output"))) TS_SpendableOutputDescriptor_delayed_payment_output(uint64_t a) { LDKDelayedPaymentOutputDescriptor a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = (a & 1) || (a == 0); + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); a_conv = DelayedPaymentOutputDescriptor_clone(&a_conv); LDKSpendableOutputDescriptor *ret_copy = MALLOC(sizeof(LDKSpendableOutputDescriptor), "LDKSpendableOutputDescriptor"); *ret_copy = SpendableOutputDescriptor_delayed_payment_output(a_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_SpendableOutputDescriptor_static_payment_output"))) TS_SpendableOutputDescriptor_static_payment_output(uint32_t a) { +uint64_t __attribute__((export_name("TS_SpendableOutputDescriptor_static_payment_output"))) TS_SpendableOutputDescriptor_static_payment_output(uint64_t a) { LDKStaticPaymentOutputDescriptor a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = (a & 1) || (a == 0); + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); a_conv = StaticPaymentOutputDescriptor_clone(&a_conv); LDKSpendableOutputDescriptor *ret_copy = MALLOC(sizeof(LDKSpendableOutputDescriptor), "LDKSpendableOutputDescriptor"); *ret_copy = SpendableOutputDescriptor_static_payment_output(a_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -int8_tArray __attribute__((export_name("TS_SpendableOutputDescriptor_write"))) TS_SpendableOutputDescriptor_write(uint32_t obj) { - LDKSpendableOutputDescriptor* obj_conv = (LDKSpendableOutputDescriptor*)obj; +int8_tArray __attribute__((export_name("TS_SpendableOutputDescriptor_write"))) TS_SpendableOutputDescriptor_write(uint64_t obj) { + LDKSpendableOutputDescriptor* obj_conv = (LDKSpendableOutputDescriptor*)untag_ptr(obj); LDKCVec_u8Z ret_var = SpendableOutputDescriptor_write(obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -25045,58 +23678,58 @@ int8_tArray __attribute__((export_name("TS_SpendableOutputDescriptor_write"))) return ret_arr; } -uint32_t __attribute__((export_name("TS_SpendableOutputDescriptor_read"))) TS_SpendableOutputDescriptor_read(int8_tArray ser) { +uint64_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; LDKCResult_SpendableOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SpendableOutputDescriptorDecodeErrorZ), "LDKCResult_SpendableOutputDescriptorDecodeErrorZ"); *ret_conv = SpendableOutputDescriptor_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_BaseSign_free"))) TS_BaseSign_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKBaseSign this_ptr_conv = *(LDKBaseSign*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); BaseSign_free(this_ptr_conv); } -static inline uintptr_t Sign_clone_ptr(LDKSign *NONNULL_PTR arg) { +static inline uint64_t Sign_clone_ptr(LDKSign *NONNULL_PTR arg) { LDKSign* ret_ret = MALLOC(sizeof(LDKSign), "LDKSign"); *ret_ret = Sign_clone(arg); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_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); } +int64_t __attribute__((export_name("TS_Sign_clone_ptr"))) TS_Sign_clone_ptr(uint64_t arg) { + void* arg_ptr = untag_ptr(arg); + if (ptr_is_owned(arg)) { CHECK_ACCESS(arg_ptr); } LDKSign* arg_conv = (LDKSign*)arg_ptr; - uint32_t ret_conv = Sign_clone_ptr(arg_conv); + int64_t ret_conv = Sign_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_Sign_clone"))) TS_Sign_clone(uint32_t orig) { - void* orig_ptr = (void*)(((uintptr_t)orig) & ~1); - if (!(orig & 1)) { CHECK_ACCESS(orig_ptr); } +uint64_t __attribute__((export_name("TS_Sign_clone"))) TS_Sign_clone(uint64_t orig) { + void* orig_ptr = untag_ptr(orig); + if (ptr_is_owned(orig)) { CHECK_ACCESS(orig_ptr); } LDKSign* orig_conv = (LDKSign*)orig_ptr; LDKSign* ret_ret = MALLOC(sizeof(LDKSign), "LDKSign"); *ret_ret = Sign_clone(orig_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_Sign_free"))) TS_Sign_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKSign this_ptr_conv = *(LDKSign*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); Sign_free(this_ptr_conv); } -uint32_t __attribute__((export_name("TS_Recipient_clone"))) TS_Recipient_clone(uint32_t orig) { - LDKRecipient* orig_conv = (LDKRecipient*)(orig & ~1); +uint32_t __attribute__((export_name("TS_Recipient_clone"))) TS_Recipient_clone(uint64_t orig) { + LDKRecipient* orig_conv = (LDKRecipient*)untag_ptr(orig); uint32_t ret_conv = LDKRecipient_to_js(Recipient_clone(orig_conv)); return ret_conv; } @@ -25111,188 +23744,192 @@ uint32_t __attribute__((export_name("TS_Recipient_phantom_node"))) TS_Recipient return ret_conv; } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_KeysInterface_free"))) TS_KeysInterface_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKKeysInterface this_ptr_conv = *(LDKKeysInterface*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); KeysInterface_free(this_ptr_conv); } -void __attribute__((export_name("TS_InMemorySigner_free"))) TS_InMemorySigner_free(uint32_t this_obj) { +void __attribute__((export_name("TS_InMemorySigner_free"))) TS_InMemorySigner_free(uint64_t this_obj) { LDKInMemorySigner this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); InMemorySigner_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_InMemorySigner_get_funding_key"))) TS_InMemorySigner_get_funding_key(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_InMemorySigner_get_funding_key"))) TS_InMemorySigner_get_funding_key(uint64_t this_ptr) { LDKInMemorySigner this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *InMemorySigner_get_funding_key(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_InMemorySigner_set_funding_key"))) TS_InMemorySigner_set_funding_key(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_InMemorySigner_set_funding_key"))) TS_InMemorySigner_set_funding_key(uint64_t this_ptr, int8_tArray val) { LDKInMemorySigner this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKSecretKey val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.bytes, val->elems, 32); FREE(val); InMemorySigner_set_funding_key(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_InMemorySigner_get_revocation_base_key"))) TS_InMemorySigner_get_revocation_base_key(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_InMemorySigner_get_revocation_base_key"))) TS_InMemorySigner_get_revocation_base_key(uint64_t this_ptr) { LDKInMemorySigner this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_InMemorySigner_set_revocation_base_key"))) TS_InMemorySigner_set_revocation_base_key(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_InMemorySigner_set_revocation_base_key"))) TS_InMemorySigner_set_revocation_base_key(uint64_t this_ptr, int8_tArray val) { LDKInMemorySigner this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKSecretKey val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.bytes, val->elems, 32); FREE(val); InMemorySigner_set_revocation_base_key(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_InMemorySigner_get_payment_key"))) TS_InMemorySigner_get_payment_key(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_InMemorySigner_get_payment_key"))) TS_InMemorySigner_get_payment_key(uint64_t this_ptr) { LDKInMemorySigner this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *InMemorySigner_get_payment_key(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_InMemorySigner_set_payment_key"))) TS_InMemorySigner_set_payment_key(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_InMemorySigner_set_payment_key"))) TS_InMemorySigner_set_payment_key(uint64_t this_ptr, int8_tArray val) { LDKInMemorySigner this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKSecretKey val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.bytes, val->elems, 32); FREE(val); InMemorySigner_set_payment_key(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_InMemorySigner_get_delayed_payment_base_key"))) TS_InMemorySigner_get_delayed_payment_base_key(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_InMemorySigner_get_delayed_payment_base_key"))) TS_InMemorySigner_get_delayed_payment_base_key(uint64_t this_ptr) { LDKInMemorySigner this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_InMemorySigner_set_delayed_payment_base_key"))) TS_InMemorySigner_set_delayed_payment_base_key(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_InMemorySigner_set_delayed_payment_base_key"))) TS_InMemorySigner_set_delayed_payment_base_key(uint64_t this_ptr, int8_tArray val) { LDKInMemorySigner this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKSecretKey val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.bytes, val->elems, 32); FREE(val); InMemorySigner_set_delayed_payment_base_key(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_InMemorySigner_get_htlc_base_key"))) TS_InMemorySigner_get_htlc_base_key(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_InMemorySigner_get_htlc_base_key"))) TS_InMemorySigner_get_htlc_base_key(uint64_t this_ptr) { LDKInMemorySigner this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_InMemorySigner_set_htlc_base_key"))) TS_InMemorySigner_set_htlc_base_key(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_InMemorySigner_set_htlc_base_key"))) TS_InMemorySigner_set_htlc_base_key(uint64_t this_ptr, int8_tArray val) { LDKInMemorySigner this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKSecretKey val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.bytes, val->elems, 32); FREE(val); InMemorySigner_set_htlc_base_key(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_InMemorySigner_get_commitment_seed"))) TS_InMemorySigner_get_commitment_seed(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_InMemorySigner_get_commitment_seed"))) TS_InMemorySigner_get_commitment_seed(uint64_t this_ptr) { LDKInMemorySigner this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *InMemorySigner_get_commitment_seed(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_InMemorySigner_set_commitment_seed"))) TS_InMemorySigner_set_commitment_seed(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_InMemorySigner_set_commitment_seed"))) TS_InMemorySigner_set_commitment_seed(uint64_t this_ptr, int8_tArray val) { LDKInMemorySigner this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 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) { +static inline uint64_t InMemorySigner_clone_ptr(LDKInMemorySigner *NONNULL_PTR arg) { LDKInMemorySigner ret_var = InMemorySigner_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_InMemorySigner_clone_ptr"))) TS_InMemorySigner_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_InMemorySigner_clone_ptr"))) TS_InMemorySigner_clone_ptr(uint64_t arg) { LDKInMemorySigner arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = InMemorySigner_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = InMemorySigner_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_InMemorySigner_clone"))) TS_InMemorySigner_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_InMemorySigner_clone"))) TS_InMemorySigner_clone(uint64_t orig) { LDKInMemorySigner orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKInMemorySigner ret_var = InMemorySigner_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_InMemorySigner_new"))) TS_InMemorySigner_new(int8_tArray node_secret, 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) { +uint64_t __attribute__((export_name("TS_InMemorySigner_new"))) TS_InMemorySigner_new(int8_tArray node_secret, 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 node_secret_ref; CHECK(node_secret->arr_len == 32); memcpy(node_secret_ref.bytes, node_secret->elems, 32); FREE(node_secret); @@ -25318,167 +23955,161 @@ uint32_t __attribute__((export_name("TS_InMemorySigner_new"))) TS_InMemorySigne CHECK(channel_keys_id->arr_len == 32); memcpy(channel_keys_id_ref.data, channel_keys_id->elems, 32); FREE(channel_keys_id); LDKInMemorySigner ret_var = InMemorySigner_new(node_secret_ref, 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_InMemorySigner_counterparty_pubkeys"))) TS_InMemorySigner_counterparty_pubkeys(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_InMemorySigner_counterparty_pubkeys"))) TS_InMemorySigner_counterparty_pubkeys(uint64_t this_arg) { LDKInMemorySigner this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKChannelPublicKeys ret_var = InMemorySigner_counterparty_pubkeys(&this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int16_t __attribute__((export_name("TS_InMemorySigner_counterparty_selected_contest_delay"))) TS_InMemorySigner_counterparty_selected_contest_delay(uint32_t this_arg) { +int16_t __attribute__((export_name("TS_InMemorySigner_counterparty_selected_contest_delay"))) TS_InMemorySigner_counterparty_selected_contest_delay(uint64_t this_arg) { LDKInMemorySigner this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int16_t ret_conv = InMemorySigner_counterparty_selected_contest_delay(&this_arg_conv); return ret_conv; } -int16_t __attribute__((export_name("TS_InMemorySigner_holder_selected_contest_delay"))) TS_InMemorySigner_holder_selected_contest_delay(uint32_t this_arg) { +int16_t __attribute__((export_name("TS_InMemorySigner_holder_selected_contest_delay"))) TS_InMemorySigner_holder_selected_contest_delay(uint64_t this_arg) { LDKInMemorySigner this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int16_t ret_conv = InMemorySigner_holder_selected_contest_delay(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_InMemorySigner_is_outbound"))) TS_InMemorySigner_is_outbound(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InMemorySigner_is_outbound"))) TS_InMemorySigner_is_outbound(uint64_t this_arg) { LDKInMemorySigner this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InMemorySigner_is_outbound(&this_arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_InMemorySigner_funding_outpoint"))) TS_InMemorySigner_funding_outpoint(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_InMemorySigner_funding_outpoint"))) TS_InMemorySigner_funding_outpoint(uint64_t this_arg) { LDKInMemorySigner this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKOutPoint ret_var = InMemorySigner_funding_outpoint(&this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_InMemorySigner_get_channel_parameters"))) TS_InMemorySigner_get_channel_parameters(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_InMemorySigner_get_channel_parameters"))) TS_InMemorySigner_get_channel_parameters(uint64_t this_arg) { LDKInMemorySigner this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKChannelTransactionParameters ret_var = InMemorySigner_get_channel_parameters(&this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -jboolean __attribute__((export_name("TS_InMemorySigner_opt_anchors"))) TS_InMemorySigner_opt_anchors(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InMemorySigner_opt_anchors"))) TS_InMemorySigner_opt_anchors(uint64_t this_arg) { LDKInMemorySigner this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InMemorySigner_opt_anchors(&this_arg_conv); return ret_conv; } -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, uint32_t input_idx, uint32_t descriptor) { +uint64_t __attribute__((export_name("TS_InMemorySigner_sign_counterparty_payment_input"))) TS_InMemorySigner_sign_counterparty_payment_input(uint64_t this_arg, int8_tArray spend_tx, uint32_t input_idx, uint64_t descriptor) { LDKInMemorySigner this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; 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); FREE(spend_tx); spend_tx_ref.data_is_owned = true; LDKStaticPaymentOutputDescriptor descriptor_conv; - descriptor_conv.inner = (void*)(descriptor & (~1)); - descriptor_conv.is_owned = false; + descriptor_conv.inner = untag_ptr(descriptor); + descriptor_conv.is_owned = ptr_is_owned(descriptor); CHECK_INNER_FIELD_ACCESS_OR_NULL(descriptor_conv); + descriptor_conv.is_owned = false; 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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, uint32_t input_idx, uint32_t descriptor) { +uint64_t __attribute__((export_name("TS_InMemorySigner_sign_dynamic_p2wsh_input"))) TS_InMemorySigner_sign_dynamic_p2wsh_input(uint64_t this_arg, int8_tArray spend_tx, uint32_t input_idx, uint64_t descriptor) { LDKInMemorySigner this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; 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); FREE(spend_tx); spend_tx_ref.data_is_owned = true; LDKDelayedPaymentOutputDescriptor descriptor_conv; - descriptor_conv.inner = (void*)(descriptor & (~1)); - descriptor_conv.is_owned = false; + descriptor_conv.inner = untag_ptr(descriptor); + descriptor_conv.is_owned = ptr_is_owned(descriptor); CHECK_INNER_FIELD_ACCESS_OR_NULL(descriptor_conv); + descriptor_conv.is_owned = false; 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_InMemorySigner_as_BaseSign"))) TS_InMemorySigner_as_BaseSign(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_InMemorySigner_as_BaseSign"))) TS_InMemorySigner_as_BaseSign(uint64_t this_arg) { LDKInMemorySigner this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKBaseSign* ret_ret = MALLOC(sizeof(LDKBaseSign), "LDKBaseSign"); *ret_ret = InMemorySigner_as_BaseSign(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_t __attribute__((export_name("TS_InMemorySigner_as_Sign"))) TS_InMemorySigner_as_Sign(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_InMemorySigner_as_Sign"))) TS_InMemorySigner_as_Sign(uint64_t this_arg) { LDKInMemorySigner this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKSign* ret_ret = MALLOC(sizeof(LDKSign), "LDKSign"); *ret_ret = InMemorySigner_as_Sign(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -int8_tArray __attribute__((export_name("TS_InMemorySigner_write"))) TS_InMemorySigner_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_InMemorySigner_write"))) TS_InMemorySigner_write(uint64_t obj) { LDKInMemorySigner obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = InMemorySigner_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -25486,7 +24117,7 @@ int8_tArray __attribute__((export_name("TS_InMemorySigner_write"))) TS_InMemory return ret_arr; } -uint32_t __attribute__((export_name("TS_InMemorySigner_read"))) TS_InMemorySigner_read(int8_tArray ser, int8_tArray arg) { +uint64_t __attribute__((export_name("TS_InMemorySigner_read"))) TS_InMemorySigner_read(int8_tArray ser, int8_tArray arg) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; ser_ref.data = ser->elems; @@ -25496,73 +24127,65 @@ uint32_t __attribute__((export_name("TS_InMemorySigner_read"))) TS_InMemorySign LDKCResult_InMemorySignerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InMemorySignerDecodeErrorZ), "LDKCResult_InMemorySignerDecodeErrorZ"); *ret_conv = InMemorySigner_read(ser_ref, arg_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_KeysManager_free"))) TS_KeysManager_free(uint32_t this_obj) { +void __attribute__((export_name("TS_KeysManager_free"))) TS_KeysManager_free(uint64_t this_obj) { LDKKeysManager this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); KeysManager_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_KeysManager_new"))) TS_KeysManager_new(int8_tArray seed, int64_t starting_time_secs, int32_t starting_time_nanos) { +uint64_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); FREE(seed); unsigned char (*seed_ref)[32] = &seed_arr; LDKKeysManager ret_var = KeysManager_new(seed_ref, starting_time_secs, starting_time_nanos); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_KeysManager_derive_channel_keys"))) TS_KeysManager_derive_channel_keys(uint32_t this_arg, int64_t channel_value_satoshis, int8_tArray params) { +uint64_t __attribute__((export_name("TS_KeysManager_derive_channel_keys"))) TS_KeysManager_derive_channel_keys(uint64_t this_arg, int64_t channel_value_satoshis, int8_tArray params) { LDKKeysManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; unsigned char params_arr[32]; CHECK(params->arr_len == 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_KeysManager_spend_spendable_outputs"))) TS_KeysManager_spend_spendable_outputs(uint32_t this_arg, uint32_tArray descriptors, uint32_tArray outputs, int8_tArray change_destination_script, int32_t feerate_sat_per_1000_weight) { +uint64_t __attribute__((export_name("TS_KeysManager_spend_spendable_outputs"))) TS_KeysManager_spend_spendable_outputs(uint64_t this_arg, uint64_tArray descriptors, uint64_tArray outputs, int8_tArray change_destination_script, int32_t feerate_sat_per_1000_weight) { LDKKeysManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCVec_SpendableOutputDescriptorZ descriptors_constr; descriptors_constr.datalen = descriptors->arr_len; if (descriptors_constr.datalen > 0) descriptors_constr.data = MALLOC(descriptors_constr.datalen * sizeof(LDKSpendableOutputDescriptor), "LDKCVec_SpendableOutputDescriptorZ Elements"); else descriptors_constr.data = NULL; - uint32_t* descriptors_vals = descriptors->elems; + uint64_t* descriptors_vals = descriptors->elems; for (size_t b = 0; b < descriptors_constr.datalen; b++) { - uint32_t descriptors_conv_27 = descriptors_vals[b]; - void* descriptors_conv_27_ptr = (void*)(((uintptr_t)descriptors_conv_27) & ~1); + uint64_t descriptors_conv_27 = descriptors_vals[b]; + void* descriptors_conv_27_ptr = untag_ptr(descriptors_conv_27); CHECK_ACCESS(descriptors_conv_27_ptr); LDKSpendableOutputDescriptor descriptors_conv_27_conv = *(LDKSpendableOutputDescriptor*)(descriptors_conv_27_ptr); - descriptors_conv_27_conv = SpendableOutputDescriptor_clone((LDKSpendableOutputDescriptor*)(((uintptr_t)descriptors_conv_27) & ~1)); + descriptors_conv_27_conv = SpendableOutputDescriptor_clone((LDKSpendableOutputDescriptor*)untag_ptr(descriptors_conv_27)); descriptors_constr.data[b] = descriptors_conv_27_conv; } FREE(descriptors); @@ -25572,13 +24195,13 @@ 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; + uint64_t* outputs_vals = outputs->elems; for (size_t h = 0; h < outputs_constr.datalen; h++) { - uint32_t outputs_conv_7 = outputs_vals[h]; - void* outputs_conv_7_ptr = (void*)(((uintptr_t)outputs_conv_7) & ~1); + uint64_t outputs_conv_7 = outputs_vals[h]; + void* outputs_conv_7_ptr = untag_ptr(outputs_conv_7); CHECK_ACCESS(outputs_conv_7_ptr); LDKTxOut outputs_conv_7_conv = *(LDKTxOut*)(outputs_conv_7_ptr); - outputs_conv_7_conv = TxOut_clone((LDKTxOut*)(((uintptr_t)outputs_conv_7) & ~1)); + outputs_conv_7_conv = TxOut_clone((LDKTxOut*)untag_ptr(outputs_conv_7)); outputs_constr.data[h] = outputs_conv_7_conv; } FREE(outputs); @@ -25588,38 +24211,40 @@ uint32_t __attribute__((export_name("TS_KeysManager_spend_spendable_outputs"))) 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_KeysManager_as_KeysInterface"))) TS_KeysManager_as_KeysInterface(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_KeysManager_as_KeysInterface"))) TS_KeysManager_as_KeysInterface(uint64_t this_arg) { LDKKeysManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKKeysInterface* ret_ret = MALLOC(sizeof(LDKKeysInterface), "LDKKeysInterface"); *ret_ret = KeysManager_as_KeysInterface(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -void __attribute__((export_name("TS_PhantomKeysManager_free"))) TS_PhantomKeysManager_free(uint32_t this_obj) { +void __attribute__((export_name("TS_PhantomKeysManager_free"))) TS_PhantomKeysManager_free(uint64_t this_obj) { LDKPhantomKeysManager this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); PhantomKeysManager_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_PhantomKeysManager_as_KeysInterface"))) TS_PhantomKeysManager_as_KeysInterface(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_PhantomKeysManager_as_KeysInterface"))) TS_PhantomKeysManager_as_KeysInterface(uint64_t this_arg) { LDKPhantomKeysManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKKeysInterface* ret_ret = MALLOC(sizeof(LDKKeysInterface), "LDKKeysInterface"); *ret_ret = PhantomKeysManager_as_KeysInterface(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_t __attribute__((export_name("TS_PhantomKeysManager_new"))) TS_PhantomKeysManager_new(int8_tArray seed, int64_t starting_time_secs, int32_t starting_time_nanos, int8_tArray cross_node_seed) { +uint64_t __attribute__((export_name("TS_PhantomKeysManager_new"))) TS_PhantomKeysManager_new(int8_tArray seed, int64_t starting_time_secs, int32_t starting_time_nanos, int8_tArray cross_node_seed) { unsigned char seed_arr[32]; CHECK(seed->arr_len == 32); memcpy(seed_arr, seed->elems, 32); FREE(seed); @@ -25629,35 +24254,31 @@ uint32_t __attribute__((export_name("TS_PhantomKeysManager_new"))) TS_PhantomKe memcpy(cross_node_seed_arr, cross_node_seed->elems, 32); FREE(cross_node_seed); unsigned char (*cross_node_seed_ref)[32] = &cross_node_seed_arr; LDKPhantomKeysManager ret_var = PhantomKeysManager_new(seed_ref, starting_time_secs, starting_time_nanos, cross_node_seed_ref); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_PhantomKeysManager_spend_spendable_outputs"))) TS_PhantomKeysManager_spend_spendable_outputs(uint32_t this_arg, uint32_tArray descriptors, uint32_tArray outputs, int8_tArray change_destination_script, int32_t feerate_sat_per_1000_weight) { +uint64_t __attribute__((export_name("TS_PhantomKeysManager_spend_spendable_outputs"))) TS_PhantomKeysManager_spend_spendable_outputs(uint64_t this_arg, uint64_tArray descriptors, uint64_tArray outputs, int8_tArray change_destination_script, int32_t feerate_sat_per_1000_weight) { LDKPhantomKeysManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCVec_SpendableOutputDescriptorZ descriptors_constr; descriptors_constr.datalen = descriptors->arr_len; if (descriptors_constr.datalen > 0) descriptors_constr.data = MALLOC(descriptors_constr.datalen * sizeof(LDKSpendableOutputDescriptor), "LDKCVec_SpendableOutputDescriptorZ Elements"); else descriptors_constr.data = NULL; - uint32_t* descriptors_vals = descriptors->elems; + uint64_t* descriptors_vals = descriptors->elems; for (size_t b = 0; b < descriptors_constr.datalen; b++) { - uint32_t descriptors_conv_27 = descriptors_vals[b]; - void* descriptors_conv_27_ptr = (void*)(((uintptr_t)descriptors_conv_27) & ~1); + uint64_t descriptors_conv_27 = descriptors_vals[b]; + void* descriptors_conv_27_ptr = untag_ptr(descriptors_conv_27); CHECK_ACCESS(descriptors_conv_27_ptr); LDKSpendableOutputDescriptor descriptors_conv_27_conv = *(LDKSpendableOutputDescriptor*)(descriptors_conv_27_ptr); - descriptors_conv_27_conv = SpendableOutputDescriptor_clone((LDKSpendableOutputDescriptor*)(((uintptr_t)descriptors_conv_27) & ~1)); + descriptors_conv_27_conv = SpendableOutputDescriptor_clone((LDKSpendableOutputDescriptor*)untag_ptr(descriptors_conv_27)); descriptors_constr.data[b] = descriptors_conv_27_conv; } FREE(descriptors); @@ -25667,13 +24288,13 @@ uint32_t __attribute__((export_name("TS_PhantomKeysManager_spend_spendable_outp outputs_constr.data = MALLOC(outputs_constr.datalen * sizeof(LDKTxOut), "LDKCVec_TxOutZ Elements"); else outputs_constr.data = NULL; - uint32_t* outputs_vals = outputs->elems; + uint64_t* outputs_vals = outputs->elems; for (size_t h = 0; h < outputs_constr.datalen; h++) { - uint32_t outputs_conv_7 = outputs_vals[h]; - void* outputs_conv_7_ptr = (void*)(((uintptr_t)outputs_conv_7) & ~1); + uint64_t outputs_conv_7 = outputs_vals[h]; + void* outputs_conv_7_ptr = untag_ptr(outputs_conv_7); CHECK_ACCESS(outputs_conv_7_ptr); LDKTxOut outputs_conv_7_conv = *(LDKTxOut*)(outputs_conv_7_ptr); - outputs_conv_7_conv = TxOut_clone((LDKTxOut*)(((uintptr_t)outputs_conv_7) & ~1)); + outputs_conv_7_conv = TxOut_clone((LDKTxOut*)untag_ptr(outputs_conv_7)); outputs_constr.data[h] = outputs_conv_7_conv; } FREE(outputs); @@ -25683,1228 +24304,1199 @@ uint32_t __attribute__((export_name("TS_PhantomKeysManager_spend_spendable_outp 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 = PhantomKeysManager_spend_spendable_outputs(&this_arg_conv, descriptors_constr, outputs_constr, change_destination_script_ref, feerate_sat_per_1000_weight); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_PhantomKeysManager_derive_channel_keys"))) TS_PhantomKeysManager_derive_channel_keys(uint32_t this_arg, int64_t channel_value_satoshis, int8_tArray params) { +uint64_t __attribute__((export_name("TS_PhantomKeysManager_derive_channel_keys"))) TS_PhantomKeysManager_derive_channel_keys(uint64_t this_arg, int64_t channel_value_satoshis, int8_tArray params) { LDKPhantomKeysManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; unsigned char params_arr[32]; CHECK(params->arr_len == 32); memcpy(params_arr, params->elems, 32); FREE(params); unsigned char (*params_ref)[32] = ¶ms_arr; LDKInMemorySigner ret_var = PhantomKeysManager_derive_channel_keys(&this_arg_conv, channel_value_satoshis, params_ref); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelManager_free"))) TS_ChannelManager_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChannelManager_free"))) TS_ChannelManager_free(uint64_t this_obj) { LDKChannelManager this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChannelManager_free(this_obj_conv); } -void __attribute__((export_name("TS_ChainParameters_free"))) TS_ChainParameters_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChainParameters_free"))) TS_ChainParameters_free(uint64_t this_obj) { LDKChainParameters this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChainParameters_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_ChainParameters_get_network"))) TS_ChainParameters_get_network(uint32_t this_ptr) { +uint32_t __attribute__((export_name("TS_ChainParameters_get_network"))) TS_ChainParameters_get_network(uint64_t this_ptr) { LDKChainParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; uint32_t ret_conv = LDKNetwork_to_js(ChainParameters_get_network(&this_ptr_conv)); return ret_conv; } -void __attribute__((export_name("TS_ChainParameters_set_network"))) TS_ChainParameters_set_network(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChainParameters_set_network"))) TS_ChainParameters_set_network(uint64_t this_ptr, uint32_t val) { LDKChainParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKNetwork val_conv = LDKNetwork_from_js(val); ChainParameters_set_network(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChainParameters_get_best_block"))) TS_ChainParameters_get_best_block(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChainParameters_get_best_block"))) TS_ChainParameters_get_best_block(uint64_t this_ptr) { LDKChainParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKBestBlock ret_var = ChainParameters_get_best_block(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChainParameters_set_best_block"))) TS_ChainParameters_set_best_block(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChainParameters_set_best_block"))) TS_ChainParameters_set_best_block(uint64_t this_ptr, uint64_t val) { LDKChainParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKBestBlock val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = BestBlock_clone(&val_conv); ChainParameters_set_best_block(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChainParameters_new"))) TS_ChainParameters_new(uint32_t network_arg, uint32_t best_block_arg) { +uint64_t __attribute__((export_name("TS_ChainParameters_new"))) TS_ChainParameters_new(uint32_t network_arg, uint64_t best_block_arg) { LDKNetwork network_arg_conv = LDKNetwork_from_js(network_arg); LDKBestBlock best_block_arg_conv; - best_block_arg_conv.inner = (void*)(best_block_arg & (~1)); - best_block_arg_conv.is_owned = (best_block_arg & 1) || (best_block_arg == 0); + best_block_arg_conv.inner = untag_ptr(best_block_arg); + best_block_arg_conv.is_owned = ptr_is_owned(best_block_arg); 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t ChainParameters_clone_ptr(LDKChainParameters *NONNULL_PTR arg) { +static inline uint64_t ChainParameters_clone_ptr(LDKChainParameters *NONNULL_PTR arg) { LDKChainParameters ret_var = ChainParameters_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChainParameters_clone_ptr"))) TS_ChainParameters_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ChainParameters_clone_ptr"))) TS_ChainParameters_clone_ptr(uint64_t arg) { LDKChainParameters arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ChainParameters_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ChainParameters_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChainParameters_clone"))) TS_ChainParameters_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ChainParameters_clone"))) TS_ChainParameters_clone(uint64_t orig) { LDKChainParameters orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKChainParameters ret_var = ChainParameters_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_CounterpartyForwardingInfo_free"))) TS_CounterpartyForwardingInfo_free(uint32_t this_obj) { +void __attribute__((export_name("TS_CounterpartyForwardingInfo_free"))) TS_CounterpartyForwardingInfo_free(uint64_t this_obj) { LDKCounterpartyForwardingInfo this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); CounterpartyForwardingInfo_free(this_obj_conv); } -int32_t __attribute__((export_name("TS_CounterpartyForwardingInfo_get_fee_base_msat"))) TS_CounterpartyForwardingInfo_get_fee_base_msat(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_CounterpartyForwardingInfo_get_fee_base_msat"))) TS_CounterpartyForwardingInfo_get_fee_base_msat(uint64_t this_ptr) { LDKCounterpartyForwardingInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = CounterpartyForwardingInfo_get_fee_base_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_CounterpartyForwardingInfo_set_fee_base_msat"))) TS_CounterpartyForwardingInfo_set_fee_base_msat(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_CounterpartyForwardingInfo_set_fee_base_msat"))) TS_CounterpartyForwardingInfo_set_fee_base_msat(uint64_t this_ptr, int32_t val) { LDKCounterpartyForwardingInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; CounterpartyForwardingInfo_set_fee_base_msat(&this_ptr_conv, val); } -int32_t __attribute__((export_name("TS_CounterpartyForwardingInfo_get_fee_proportional_millionths"))) TS_CounterpartyForwardingInfo_get_fee_proportional_millionths(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_CounterpartyForwardingInfo_get_fee_proportional_millionths"))) TS_CounterpartyForwardingInfo_get_fee_proportional_millionths(uint64_t this_ptr) { LDKCounterpartyForwardingInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = CounterpartyForwardingInfo_get_fee_proportional_millionths(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_CounterpartyForwardingInfo_set_fee_proportional_millionths"))) TS_CounterpartyForwardingInfo_set_fee_proportional_millionths(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_CounterpartyForwardingInfo_set_fee_proportional_millionths"))) TS_CounterpartyForwardingInfo_set_fee_proportional_millionths(uint64_t this_ptr, int32_t val) { LDKCounterpartyForwardingInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; CounterpartyForwardingInfo_set_fee_proportional_millionths(&this_ptr_conv, val); } -int16_t __attribute__((export_name("TS_CounterpartyForwardingInfo_get_cltv_expiry_delta"))) TS_CounterpartyForwardingInfo_get_cltv_expiry_delta(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_CounterpartyForwardingInfo_get_cltv_expiry_delta"))) TS_CounterpartyForwardingInfo_get_cltv_expiry_delta(uint64_t this_ptr) { LDKCounterpartyForwardingInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = CounterpartyForwardingInfo_get_cltv_expiry_delta(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_CounterpartyForwardingInfo_set_cltv_expiry_delta"))) TS_CounterpartyForwardingInfo_set_cltv_expiry_delta(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_CounterpartyForwardingInfo_set_cltv_expiry_delta"))) TS_CounterpartyForwardingInfo_set_cltv_expiry_delta(uint64_t this_ptr, int16_t val) { LDKCounterpartyForwardingInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; CounterpartyForwardingInfo_set_cltv_expiry_delta(&this_ptr_conv, val); } -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) { +uint64_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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t CounterpartyForwardingInfo_clone_ptr(LDKCounterpartyForwardingInfo *NONNULL_PTR arg) { +static inline uint64_t CounterpartyForwardingInfo_clone_ptr(LDKCounterpartyForwardingInfo *NONNULL_PTR arg) { LDKCounterpartyForwardingInfo ret_var = CounterpartyForwardingInfo_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_CounterpartyForwardingInfo_clone_ptr"))) TS_CounterpartyForwardingInfo_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_CounterpartyForwardingInfo_clone_ptr"))) TS_CounterpartyForwardingInfo_clone_ptr(uint64_t arg) { LDKCounterpartyForwardingInfo arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = CounterpartyForwardingInfo_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = CounterpartyForwardingInfo_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CounterpartyForwardingInfo_clone"))) TS_CounterpartyForwardingInfo_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_CounterpartyForwardingInfo_clone"))) TS_CounterpartyForwardingInfo_clone(uint64_t orig) { LDKCounterpartyForwardingInfo orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKCounterpartyForwardingInfo ret_var = CounterpartyForwardingInfo_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelCounterparty_free"))) TS_ChannelCounterparty_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChannelCounterparty_free"))) TS_ChannelCounterparty_free(uint64_t this_obj) { LDKChannelCounterparty this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChannelCounterparty_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_ChannelCounterparty_get_node_id"))) TS_ChannelCounterparty_get_node_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_ChannelCounterparty_get_node_id"))) TS_ChannelCounterparty_get_node_id(uint64_t this_ptr) { LDKChannelCounterparty this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_ChannelCounterparty_set_node_id"))) TS_ChannelCounterparty_set_node_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_ChannelCounterparty_set_node_id"))) TS_ChannelCounterparty_set_node_id(uint64_t this_ptr, int8_tArray val) { LDKChannelCounterparty this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); ChannelCounterparty_set_node_id(&this_ptr_conv, val_ref); } -uint32_t __attribute__((export_name("TS_ChannelCounterparty_get_features"))) TS_ChannelCounterparty_get_features(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelCounterparty_get_features"))) TS_ChannelCounterparty_get_features(uint64_t this_ptr) { LDKChannelCounterparty this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKInitFeatures ret_var = ChannelCounterparty_get_features(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelCounterparty_set_features"))) TS_ChannelCounterparty_set_features(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelCounterparty_set_features"))) TS_ChannelCounterparty_set_features(uint64_t this_ptr, uint64_t val) { LDKChannelCounterparty this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKInitFeatures val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = InitFeatures_clone(&val_conv); ChannelCounterparty_set_features(&this_ptr_conv, val_conv); } -int64_t __attribute__((export_name("TS_ChannelCounterparty_get_unspendable_punishment_reserve"))) TS_ChannelCounterparty_get_unspendable_punishment_reserve(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelCounterparty_get_unspendable_punishment_reserve"))) TS_ChannelCounterparty_get_unspendable_punishment_reserve(uint64_t this_ptr) { LDKChannelCounterparty this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelCounterparty_get_unspendable_punishment_reserve(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelCounterparty_set_unspendable_punishment_reserve"))) TS_ChannelCounterparty_set_unspendable_punishment_reserve(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelCounterparty_set_unspendable_punishment_reserve"))) TS_ChannelCounterparty_set_unspendable_punishment_reserve(uint64_t this_ptr, int64_t val) { LDKChannelCounterparty this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelCounterparty_set_unspendable_punishment_reserve(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_ChannelCounterparty_get_forwarding_info"))) TS_ChannelCounterparty_get_forwarding_info(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelCounterparty_get_forwarding_info"))) TS_ChannelCounterparty_get_forwarding_info(uint64_t this_ptr) { LDKChannelCounterparty this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCounterpartyForwardingInfo ret_var = ChannelCounterparty_get_forwarding_info(&this_ptr_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelCounterparty_set_forwarding_info"))) TS_ChannelCounterparty_set_forwarding_info(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelCounterparty_set_forwarding_info"))) TS_ChannelCounterparty_set_forwarding_info(uint64_t this_ptr, uint64_t val) { LDKChannelCounterparty this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCounterpartyForwardingInfo val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = CounterpartyForwardingInfo_clone(&val_conv); ChannelCounterparty_set_forwarding_info(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelCounterparty_get_outbound_htlc_minimum_msat"))) TS_ChannelCounterparty_get_outbound_htlc_minimum_msat(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelCounterparty_get_outbound_htlc_minimum_msat"))) TS_ChannelCounterparty_get_outbound_htlc_minimum_msat(uint64_t this_ptr) { LDKChannelCounterparty this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = ChannelCounterparty_get_outbound_htlc_minimum_msat(&this_ptr_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_ChannelCounterparty_set_outbound_htlc_minimum_msat"))) TS_ChannelCounterparty_set_outbound_htlc_minimum_msat(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelCounterparty_set_outbound_htlc_minimum_msat"))) TS_ChannelCounterparty_set_outbound_htlc_minimum_msat(uint64_t this_ptr, uint64_t val) { LDKChannelCounterparty this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr); - val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1)); + val_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(val)); ChannelCounterparty_set_outbound_htlc_minimum_msat(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelCounterparty_get_outbound_htlc_maximum_msat"))) TS_ChannelCounterparty_get_outbound_htlc_maximum_msat(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelCounterparty_get_outbound_htlc_maximum_msat"))) TS_ChannelCounterparty_get_outbound_htlc_maximum_msat(uint64_t this_ptr) { LDKChannelCounterparty this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = ChannelCounterparty_get_outbound_htlc_maximum_msat(&this_ptr_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_ChannelCounterparty_set_outbound_htlc_maximum_msat"))) TS_ChannelCounterparty_set_outbound_htlc_maximum_msat(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelCounterparty_set_outbound_htlc_maximum_msat"))) TS_ChannelCounterparty_set_outbound_htlc_maximum_msat(uint64_t this_ptr, uint64_t val) { LDKChannelCounterparty this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr); - val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1)); + val_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(val)); ChannelCounterparty_set_outbound_htlc_maximum_msat(&this_ptr_conv, val_conv); } -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, uint32_t outbound_htlc_minimum_msat_arg, uint32_t outbound_htlc_maximum_msat_arg) { +uint64_t __attribute__((export_name("TS_ChannelCounterparty_new"))) TS_ChannelCounterparty_new(int8_tArray node_id_arg, uint64_t features_arg, int64_t unspendable_punishment_reserve_arg, uint64_t forwarding_info_arg, uint64_t outbound_htlc_minimum_msat_arg, uint64_t outbound_htlc_maximum_msat_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); 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); + features_arg_conv.inner = untag_ptr(features_arg); + features_arg_conv.is_owned = ptr_is_owned(features_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(features_arg_conv); features_arg_conv = InitFeatures_clone(&features_arg_conv); LDKCounterpartyForwardingInfo forwarding_info_arg_conv; - forwarding_info_arg_conv.inner = (void*)(forwarding_info_arg & (~1)); - forwarding_info_arg_conv.is_owned = (forwarding_info_arg & 1) || (forwarding_info_arg == 0); + forwarding_info_arg_conv.inner = untag_ptr(forwarding_info_arg); + forwarding_info_arg_conv.is_owned = ptr_is_owned(forwarding_info_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(forwarding_info_arg_conv); forwarding_info_arg_conv = CounterpartyForwardingInfo_clone(&forwarding_info_arg_conv); - void* outbound_htlc_minimum_msat_arg_ptr = (void*)(((uintptr_t)outbound_htlc_minimum_msat_arg) & ~1); + void* outbound_htlc_minimum_msat_arg_ptr = untag_ptr(outbound_htlc_minimum_msat_arg); CHECK_ACCESS(outbound_htlc_minimum_msat_arg_ptr); LDKCOption_u64Z outbound_htlc_minimum_msat_arg_conv = *(LDKCOption_u64Z*)(outbound_htlc_minimum_msat_arg_ptr); - outbound_htlc_minimum_msat_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)outbound_htlc_minimum_msat_arg) & ~1)); - void* outbound_htlc_maximum_msat_arg_ptr = (void*)(((uintptr_t)outbound_htlc_maximum_msat_arg) & ~1); + outbound_htlc_minimum_msat_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(outbound_htlc_minimum_msat_arg)); + void* outbound_htlc_maximum_msat_arg_ptr = untag_ptr(outbound_htlc_maximum_msat_arg); CHECK_ACCESS(outbound_htlc_maximum_msat_arg_ptr); LDKCOption_u64Z outbound_htlc_maximum_msat_arg_conv = *(LDKCOption_u64Z*)(outbound_htlc_maximum_msat_arg_ptr); - outbound_htlc_maximum_msat_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)outbound_htlc_maximum_msat_arg) & ~1)); + outbound_htlc_maximum_msat_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(outbound_htlc_maximum_msat_arg)); LDKChannelCounterparty ret_var = ChannelCounterparty_new(node_id_arg_ref, features_arg_conv, unspendable_punishment_reserve_arg, forwarding_info_arg_conv, outbound_htlc_minimum_msat_arg_conv, outbound_htlc_maximum_msat_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t ChannelCounterparty_clone_ptr(LDKChannelCounterparty *NONNULL_PTR arg) { +static inline uint64_t ChannelCounterparty_clone_ptr(LDKChannelCounterparty *NONNULL_PTR arg) { LDKChannelCounterparty ret_var = ChannelCounterparty_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelCounterparty_clone_ptr"))) TS_ChannelCounterparty_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ChannelCounterparty_clone_ptr"))) TS_ChannelCounterparty_clone_ptr(uint64_t arg) { LDKChannelCounterparty arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ChannelCounterparty_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ChannelCounterparty_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelCounterparty_clone"))) TS_ChannelCounterparty_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ChannelCounterparty_clone"))) TS_ChannelCounterparty_clone(uint64_t orig) { LDKChannelCounterparty orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKChannelCounterparty ret_var = ChannelCounterparty_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelDetails_free"))) TS_ChannelDetails_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChannelDetails_free"))) TS_ChannelDetails_free(uint64_t this_obj) { LDKChannelDetails this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChannelDetails_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_ChannelDetails_get_channel_id"))) TS_ChannelDetails_get_channel_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_ChannelDetails_get_channel_id"))) TS_ChannelDetails_get_channel_id(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *ChannelDetails_get_channel_id(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_ChannelDetails_set_channel_id"))) TS_ChannelDetails_set_channel_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_ChannelDetails_set_channel_id"))) TS_ChannelDetails_set_channel_id(uint64_t this_ptr, int8_tArray val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); ChannelDetails_set_channel_id(&this_ptr_conv, val_ref); } -uint32_t __attribute__((export_name("TS_ChannelDetails_get_counterparty"))) TS_ChannelDetails_get_counterparty(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelDetails_get_counterparty"))) TS_ChannelDetails_get_counterparty(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelCounterparty ret_var = ChannelDetails_get_counterparty(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelDetails_set_counterparty"))) TS_ChannelDetails_set_counterparty(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelDetails_set_counterparty"))) TS_ChannelDetails_set_counterparty(uint64_t this_ptr, uint64_t val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelCounterparty val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = ChannelCounterparty_clone(&val_conv); ChannelDetails_set_counterparty(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelDetails_get_funding_txo"))) TS_ChannelDetails_get_funding_txo(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelDetails_get_funding_txo"))) TS_ChannelDetails_get_funding_txo(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKOutPoint ret_var = ChannelDetails_get_funding_txo(&this_ptr_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelDetails_set_funding_txo"))) TS_ChannelDetails_set_funding_txo(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelDetails_set_funding_txo"))) TS_ChannelDetails_set_funding_txo(uint64_t this_ptr, uint64_t val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKOutPoint val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = OutPoint_clone(&val_conv); ChannelDetails_set_funding_txo(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelDetails_get_channel_type"))) TS_ChannelDetails_get_channel_type(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelDetails_get_channel_type"))) TS_ChannelDetails_get_channel_type(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelTypeFeatures ret_var = ChannelDetails_get_channel_type(&this_ptr_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelDetails_set_channel_type"))) TS_ChannelDetails_set_channel_type(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelDetails_set_channel_type"))) TS_ChannelDetails_set_channel_type(uint64_t this_ptr, uint64_t val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelTypeFeatures val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = ChannelTypeFeatures_clone(&val_conv); ChannelDetails_set_channel_type(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelDetails_get_short_channel_id"))) TS_ChannelDetails_get_short_channel_id(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelDetails_get_short_channel_id"))) TS_ChannelDetails_get_short_channel_id(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = ChannelDetails_get_short_channel_id(&this_ptr_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_ChannelDetails_set_short_channel_id"))) TS_ChannelDetails_set_short_channel_id(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelDetails_set_short_channel_id"))) TS_ChannelDetails_set_short_channel_id(uint64_t this_ptr, uint64_t val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr); - val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1)); + val_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(val)); ChannelDetails_set_short_channel_id(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelDetails_get_outbound_scid_alias"))) TS_ChannelDetails_get_outbound_scid_alias(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelDetails_get_outbound_scid_alias"))) TS_ChannelDetails_get_outbound_scid_alias(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = ChannelDetails_get_outbound_scid_alias(&this_ptr_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_ChannelDetails_set_outbound_scid_alias"))) TS_ChannelDetails_set_outbound_scid_alias(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelDetails_set_outbound_scid_alias"))) TS_ChannelDetails_set_outbound_scid_alias(uint64_t this_ptr, uint64_t val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr); - val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1)); + val_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(val)); ChannelDetails_set_outbound_scid_alias(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelDetails_get_inbound_scid_alias"))) TS_ChannelDetails_get_inbound_scid_alias(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelDetails_get_inbound_scid_alias"))) TS_ChannelDetails_get_inbound_scid_alias(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = ChannelDetails_get_inbound_scid_alias(&this_ptr_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_ChannelDetails_set_inbound_scid_alias"))) TS_ChannelDetails_set_inbound_scid_alias(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelDetails_set_inbound_scid_alias"))) TS_ChannelDetails_set_inbound_scid_alias(uint64_t this_ptr, uint64_t val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr); - val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1)); + val_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(val)); ChannelDetails_set_inbound_scid_alias(&this_ptr_conv, val_conv); } -int64_t __attribute__((export_name("TS_ChannelDetails_get_channel_value_satoshis"))) TS_ChannelDetails_get_channel_value_satoshis(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelDetails_get_channel_value_satoshis"))) TS_ChannelDetails_get_channel_value_satoshis(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelDetails_get_channel_value_satoshis(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelDetails_set_channel_value_satoshis"))) TS_ChannelDetails_set_channel_value_satoshis(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelDetails_set_channel_value_satoshis"))) TS_ChannelDetails_set_channel_value_satoshis(uint64_t this_ptr, int64_t val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelDetails_set_channel_value_satoshis(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_ChannelDetails_get_unspendable_punishment_reserve"))) TS_ChannelDetails_get_unspendable_punishment_reserve(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelDetails_get_unspendable_punishment_reserve"))) TS_ChannelDetails_get_unspendable_punishment_reserve(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = ChannelDetails_get_unspendable_punishment_reserve(&this_ptr_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_ChannelDetails_set_unspendable_punishment_reserve"))) TS_ChannelDetails_set_unspendable_punishment_reserve(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelDetails_set_unspendable_punishment_reserve"))) TS_ChannelDetails_set_unspendable_punishment_reserve(uint64_t this_ptr, uint64_t val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr); - val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1)); + val_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(val)); ChannelDetails_set_unspendable_punishment_reserve(&this_ptr_conv, val_conv); } -int64_t __attribute__((export_name("TS_ChannelDetails_get_user_channel_id"))) TS_ChannelDetails_get_user_channel_id(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelDetails_get_user_channel_id"))) TS_ChannelDetails_get_user_channel_id(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelDetails_get_user_channel_id(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelDetails_set_user_channel_id"))) TS_ChannelDetails_set_user_channel_id(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelDetails_set_user_channel_id"))) TS_ChannelDetails_set_user_channel_id(uint64_t this_ptr, int64_t val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelDetails_set_user_channel_id(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ChannelDetails_get_balance_msat"))) TS_ChannelDetails_get_balance_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelDetails_get_balance_msat"))) TS_ChannelDetails_get_balance_msat(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelDetails_get_balance_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelDetails_set_balance_msat"))) TS_ChannelDetails_set_balance_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelDetails_set_balance_msat"))) TS_ChannelDetails_set_balance_msat(uint64_t this_ptr, int64_t val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelDetails_set_balance_msat(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ChannelDetails_get_outbound_capacity_msat"))) TS_ChannelDetails_get_outbound_capacity_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelDetails_get_outbound_capacity_msat"))) TS_ChannelDetails_get_outbound_capacity_msat(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelDetails_get_outbound_capacity_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelDetails_set_outbound_capacity_msat"))) TS_ChannelDetails_set_outbound_capacity_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelDetails_set_outbound_capacity_msat"))) TS_ChannelDetails_set_outbound_capacity_msat(uint64_t this_ptr, int64_t val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelDetails_set_outbound_capacity_msat(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ChannelDetails_get_next_outbound_htlc_limit_msat"))) TS_ChannelDetails_get_next_outbound_htlc_limit_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelDetails_get_next_outbound_htlc_limit_msat"))) TS_ChannelDetails_get_next_outbound_htlc_limit_msat(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelDetails_get_next_outbound_htlc_limit_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelDetails_set_next_outbound_htlc_limit_msat"))) TS_ChannelDetails_set_next_outbound_htlc_limit_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelDetails_set_next_outbound_htlc_limit_msat"))) TS_ChannelDetails_set_next_outbound_htlc_limit_msat(uint64_t this_ptr, int64_t val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelDetails_set_next_outbound_htlc_limit_msat(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ChannelDetails_get_inbound_capacity_msat"))) TS_ChannelDetails_get_inbound_capacity_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelDetails_get_inbound_capacity_msat"))) TS_ChannelDetails_get_inbound_capacity_msat(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelDetails_get_inbound_capacity_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelDetails_set_inbound_capacity_msat"))) TS_ChannelDetails_set_inbound_capacity_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelDetails_set_inbound_capacity_msat"))) TS_ChannelDetails_set_inbound_capacity_msat(uint64_t this_ptr, int64_t val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelDetails_set_inbound_capacity_msat(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_ChannelDetails_get_confirmations_required"))) TS_ChannelDetails_get_confirmations_required(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelDetails_get_confirmations_required"))) TS_ChannelDetails_get_confirmations_required(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCOption_u32Z *ret_copy = MALLOC(sizeof(LDKCOption_u32Z), "LDKCOption_u32Z"); *ret_copy = ChannelDetails_get_confirmations_required(&this_ptr_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_ChannelDetails_set_confirmations_required"))) TS_ChannelDetails_set_confirmations_required(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelDetails_set_confirmations_required"))) TS_ChannelDetails_set_confirmations_required(uint64_t this_ptr, uint64_t val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKCOption_u32Z val_conv = *(LDKCOption_u32Z*)(val_ptr); - val_conv = COption_u32Z_clone((LDKCOption_u32Z*)(((uintptr_t)val) & ~1)); + val_conv = COption_u32Z_clone((LDKCOption_u32Z*)untag_ptr(val)); ChannelDetails_set_confirmations_required(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelDetails_get_force_close_spend_delay"))) TS_ChannelDetails_get_force_close_spend_delay(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelDetails_get_force_close_spend_delay"))) TS_ChannelDetails_get_force_close_spend_delay(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCOption_u16Z *ret_copy = MALLOC(sizeof(LDKCOption_u16Z), "LDKCOption_u16Z"); *ret_copy = ChannelDetails_get_force_close_spend_delay(&this_ptr_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_ChannelDetails_set_force_close_spend_delay"))) TS_ChannelDetails_set_force_close_spend_delay(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelDetails_set_force_close_spend_delay"))) TS_ChannelDetails_set_force_close_spend_delay(uint64_t this_ptr, uint64_t val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKCOption_u16Z val_conv = *(LDKCOption_u16Z*)(val_ptr); - val_conv = COption_u16Z_clone((LDKCOption_u16Z*)(((uintptr_t)val) & ~1)); + val_conv = COption_u16Z_clone((LDKCOption_u16Z*)untag_ptr(val)); ChannelDetails_set_force_close_spend_delay(&this_ptr_conv, val_conv); } -jboolean __attribute__((export_name("TS_ChannelDetails_get_is_outbound"))) TS_ChannelDetails_get_is_outbound(uint32_t this_ptr) { +jboolean __attribute__((export_name("TS_ChannelDetails_get_is_outbound"))) TS_ChannelDetails_get_is_outbound(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; jboolean ret_conv = ChannelDetails_get_is_outbound(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelDetails_set_is_outbound"))) TS_ChannelDetails_set_is_outbound(uint32_t this_ptr, jboolean val) { +void __attribute__((export_name("TS_ChannelDetails_set_is_outbound"))) TS_ChannelDetails_set_is_outbound(uint64_t this_ptr, jboolean val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelDetails_set_is_outbound(&this_ptr_conv, val); } -jboolean __attribute__((export_name("TS_ChannelDetails_get_is_channel_ready"))) TS_ChannelDetails_get_is_channel_ready(uint32_t this_ptr) { +jboolean __attribute__((export_name("TS_ChannelDetails_get_is_channel_ready"))) TS_ChannelDetails_get_is_channel_ready(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; jboolean ret_conv = ChannelDetails_get_is_channel_ready(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelDetails_set_is_channel_ready"))) TS_ChannelDetails_set_is_channel_ready(uint32_t this_ptr, jboolean val) { +void __attribute__((export_name("TS_ChannelDetails_set_is_channel_ready"))) TS_ChannelDetails_set_is_channel_ready(uint64_t this_ptr, jboolean val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelDetails_set_is_channel_ready(&this_ptr_conv, val); } -jboolean __attribute__((export_name("TS_ChannelDetails_get_is_usable"))) TS_ChannelDetails_get_is_usable(uint32_t this_ptr) { +jboolean __attribute__((export_name("TS_ChannelDetails_get_is_usable"))) TS_ChannelDetails_get_is_usable(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; jboolean ret_conv = ChannelDetails_get_is_usable(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelDetails_set_is_usable"))) TS_ChannelDetails_set_is_usable(uint32_t this_ptr, jboolean val) { +void __attribute__((export_name("TS_ChannelDetails_set_is_usable"))) TS_ChannelDetails_set_is_usable(uint64_t this_ptr, jboolean val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelDetails_set_is_usable(&this_ptr_conv, val); } -jboolean __attribute__((export_name("TS_ChannelDetails_get_is_public"))) TS_ChannelDetails_get_is_public(uint32_t this_ptr) { +jboolean __attribute__((export_name("TS_ChannelDetails_get_is_public"))) TS_ChannelDetails_get_is_public(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; jboolean ret_conv = ChannelDetails_get_is_public(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelDetails_set_is_public"))) TS_ChannelDetails_set_is_public(uint32_t this_ptr, jboolean val) { +void __attribute__((export_name("TS_ChannelDetails_set_is_public"))) TS_ChannelDetails_set_is_public(uint64_t this_ptr, jboolean val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelDetails_set_is_public(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_ChannelDetails_get_inbound_htlc_minimum_msat"))) TS_ChannelDetails_get_inbound_htlc_minimum_msat(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelDetails_get_inbound_htlc_minimum_msat"))) TS_ChannelDetails_get_inbound_htlc_minimum_msat(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = ChannelDetails_get_inbound_htlc_minimum_msat(&this_ptr_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_ChannelDetails_set_inbound_htlc_minimum_msat"))) TS_ChannelDetails_set_inbound_htlc_minimum_msat(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelDetails_set_inbound_htlc_minimum_msat"))) TS_ChannelDetails_set_inbound_htlc_minimum_msat(uint64_t this_ptr, uint64_t val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr); - val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1)); + val_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(val)); ChannelDetails_set_inbound_htlc_minimum_msat(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelDetails_get_inbound_htlc_maximum_msat"))) TS_ChannelDetails_get_inbound_htlc_maximum_msat(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelDetails_get_inbound_htlc_maximum_msat"))) TS_ChannelDetails_get_inbound_htlc_maximum_msat(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = ChannelDetails_get_inbound_htlc_maximum_msat(&this_ptr_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_ChannelDetails_set_inbound_htlc_maximum_msat"))) TS_ChannelDetails_set_inbound_htlc_maximum_msat(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelDetails_set_inbound_htlc_maximum_msat"))) TS_ChannelDetails_set_inbound_htlc_maximum_msat(uint64_t this_ptr, uint64_t val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr); - val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1)); + val_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(val)); ChannelDetails_set_inbound_htlc_maximum_msat(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelDetails_get_config"))) TS_ChannelDetails_get_config(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelDetails_get_config"))) TS_ChannelDetails_get_config(uint64_t this_ptr) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelConfig ret_var = ChannelDetails_get_config(&this_ptr_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelDetails_set_config"))) TS_ChannelDetails_set_config(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelDetails_set_config"))) TS_ChannelDetails_set_config(uint64_t this_ptr, uint64_t val) { LDKChannelDetails this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelConfig val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = ChannelConfig_clone(&val_conv); ChannelDetails_set_config(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelDetails_new"))) TS_ChannelDetails_new(int8_tArray channel_id_arg, uint32_t counterparty_arg, uint32_t funding_txo_arg, uint32_t channel_type_arg, uint32_t short_channel_id_arg, uint32_t outbound_scid_alias_arg, uint32_t inbound_scid_alias_arg, int64_t channel_value_satoshis_arg, uint32_t unspendable_punishment_reserve_arg, int64_t user_channel_id_arg, int64_t balance_msat_arg, int64_t outbound_capacity_msat_arg, int64_t next_outbound_htlc_limit_msat_arg, int64_t inbound_capacity_msat_arg, uint32_t confirmations_required_arg, uint32_t force_close_spend_delay_arg, jboolean is_outbound_arg, jboolean is_channel_ready_arg, jboolean is_usable_arg, jboolean is_public_arg, uint32_t inbound_htlc_minimum_msat_arg, uint32_t inbound_htlc_maximum_msat_arg, uint32_t config_arg) { +uint64_t __attribute__((export_name("TS_ChannelDetails_new"))) TS_ChannelDetails_new(int8_tArray channel_id_arg, uint64_t counterparty_arg, uint64_t funding_txo_arg, uint64_t channel_type_arg, uint64_t short_channel_id_arg, uint64_t outbound_scid_alias_arg, uint64_t inbound_scid_alias_arg, int64_t channel_value_satoshis_arg, uint64_t unspendable_punishment_reserve_arg, int64_t user_channel_id_arg, int64_t balance_msat_arg, int64_t outbound_capacity_msat_arg, int64_t next_outbound_htlc_limit_msat_arg, int64_t inbound_capacity_msat_arg, uint64_t confirmations_required_arg, uint64_t force_close_spend_delay_arg, jboolean is_outbound_arg, jboolean is_channel_ready_arg, jboolean is_usable_arg, jboolean is_public_arg, uint64_t inbound_htlc_minimum_msat_arg, uint64_t inbound_htlc_maximum_msat_arg, uint64_t config_arg) { LDKThirtyTwoBytes channel_id_arg_ref; CHECK(channel_id_arg->arr_len == 32); memcpy(channel_id_arg_ref.data, channel_id_arg->elems, 32); FREE(channel_id_arg); LDKChannelCounterparty counterparty_arg_conv; - counterparty_arg_conv.inner = (void*)(counterparty_arg & (~1)); - counterparty_arg_conv.is_owned = (counterparty_arg & 1) || (counterparty_arg == 0); + counterparty_arg_conv.inner = untag_ptr(counterparty_arg); + counterparty_arg_conv.is_owned = ptr_is_owned(counterparty_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(counterparty_arg_conv); counterparty_arg_conv = ChannelCounterparty_clone(&counterparty_arg_conv); LDKOutPoint funding_txo_arg_conv; - funding_txo_arg_conv.inner = (void*)(funding_txo_arg & (~1)); - funding_txo_arg_conv.is_owned = (funding_txo_arg & 1) || (funding_txo_arg == 0); + funding_txo_arg_conv.inner = untag_ptr(funding_txo_arg); + funding_txo_arg_conv.is_owned = ptr_is_owned(funding_txo_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_txo_arg_conv); funding_txo_arg_conv = OutPoint_clone(&funding_txo_arg_conv); LDKChannelTypeFeatures channel_type_arg_conv; - channel_type_arg_conv.inner = (void*)(channel_type_arg & (~1)); - channel_type_arg_conv.is_owned = (channel_type_arg & 1) || (channel_type_arg == 0); + channel_type_arg_conv.inner = untag_ptr(channel_type_arg); + channel_type_arg_conv.is_owned = ptr_is_owned(channel_type_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_type_arg_conv); channel_type_arg_conv = ChannelTypeFeatures_clone(&channel_type_arg_conv); - void* short_channel_id_arg_ptr = (void*)(((uintptr_t)short_channel_id_arg) & ~1); + void* short_channel_id_arg_ptr = untag_ptr(short_channel_id_arg); 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*)(((uintptr_t)short_channel_id_arg) & ~1)); - void* outbound_scid_alias_arg_ptr = (void*)(((uintptr_t)outbound_scid_alias_arg) & ~1); + short_channel_id_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(short_channel_id_arg)); + void* outbound_scid_alias_arg_ptr = untag_ptr(outbound_scid_alias_arg); CHECK_ACCESS(outbound_scid_alias_arg_ptr); LDKCOption_u64Z outbound_scid_alias_arg_conv = *(LDKCOption_u64Z*)(outbound_scid_alias_arg_ptr); - outbound_scid_alias_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)outbound_scid_alias_arg) & ~1)); - void* inbound_scid_alias_arg_ptr = (void*)(((uintptr_t)inbound_scid_alias_arg) & ~1); + outbound_scid_alias_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(outbound_scid_alias_arg)); + void* inbound_scid_alias_arg_ptr = untag_ptr(inbound_scid_alias_arg); CHECK_ACCESS(inbound_scid_alias_arg_ptr); LDKCOption_u64Z inbound_scid_alias_arg_conv = *(LDKCOption_u64Z*)(inbound_scid_alias_arg_ptr); - inbound_scid_alias_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)inbound_scid_alias_arg) & ~1)); - void* unspendable_punishment_reserve_arg_ptr = (void*)(((uintptr_t)unspendable_punishment_reserve_arg) & ~1); + inbound_scid_alias_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(inbound_scid_alias_arg)); + void* unspendable_punishment_reserve_arg_ptr = untag_ptr(unspendable_punishment_reserve_arg); 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*)(((uintptr_t)confirmations_required_arg) & ~1); + void* confirmations_required_arg_ptr = untag_ptr(confirmations_required_arg); 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*)(((uintptr_t)confirmations_required_arg) & ~1)); - void* force_close_spend_delay_arg_ptr = (void*)(((uintptr_t)force_close_spend_delay_arg) & ~1); + confirmations_required_arg_conv = COption_u32Z_clone((LDKCOption_u32Z*)untag_ptr(confirmations_required_arg)); + void* force_close_spend_delay_arg_ptr = untag_ptr(force_close_spend_delay_arg); 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*)(((uintptr_t)force_close_spend_delay_arg) & ~1)); - void* inbound_htlc_minimum_msat_arg_ptr = (void*)(((uintptr_t)inbound_htlc_minimum_msat_arg) & ~1); + force_close_spend_delay_arg_conv = COption_u16Z_clone((LDKCOption_u16Z*)untag_ptr(force_close_spend_delay_arg)); + void* inbound_htlc_minimum_msat_arg_ptr = untag_ptr(inbound_htlc_minimum_msat_arg); CHECK_ACCESS(inbound_htlc_minimum_msat_arg_ptr); LDKCOption_u64Z inbound_htlc_minimum_msat_arg_conv = *(LDKCOption_u64Z*)(inbound_htlc_minimum_msat_arg_ptr); - inbound_htlc_minimum_msat_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)inbound_htlc_minimum_msat_arg) & ~1)); - void* inbound_htlc_maximum_msat_arg_ptr = (void*)(((uintptr_t)inbound_htlc_maximum_msat_arg) & ~1); + inbound_htlc_minimum_msat_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(inbound_htlc_minimum_msat_arg)); + void* inbound_htlc_maximum_msat_arg_ptr = untag_ptr(inbound_htlc_maximum_msat_arg); CHECK_ACCESS(inbound_htlc_maximum_msat_arg_ptr); LDKCOption_u64Z inbound_htlc_maximum_msat_arg_conv = *(LDKCOption_u64Z*)(inbound_htlc_maximum_msat_arg_ptr); - inbound_htlc_maximum_msat_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)inbound_htlc_maximum_msat_arg) & ~1)); + inbound_htlc_maximum_msat_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(inbound_htlc_maximum_msat_arg)); LDKChannelConfig config_arg_conv; - config_arg_conv.inner = (void*)(config_arg & (~1)); - config_arg_conv.is_owned = (config_arg & 1) || (config_arg == 0); + config_arg_conv.inner = untag_ptr(config_arg); + config_arg_conv.is_owned = ptr_is_owned(config_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(config_arg_conv); config_arg_conv = ChannelConfig_clone(&config_arg_conv); LDKChannelDetails ret_var = ChannelDetails_new(channel_id_arg_ref, counterparty_arg_conv, funding_txo_arg_conv, channel_type_arg_conv, short_channel_id_arg_conv, outbound_scid_alias_arg_conv, inbound_scid_alias_arg_conv, channel_value_satoshis_arg, unspendable_punishment_reserve_arg_conv, user_channel_id_arg, balance_msat_arg, outbound_capacity_msat_arg, next_outbound_htlc_limit_msat_arg, inbound_capacity_msat_arg, confirmations_required_arg_conv, force_close_spend_delay_arg_conv, is_outbound_arg, is_channel_ready_arg, is_usable_arg, is_public_arg, inbound_htlc_minimum_msat_arg_conv, inbound_htlc_maximum_msat_arg_conv, config_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t ChannelDetails_clone_ptr(LDKChannelDetails *NONNULL_PTR arg) { +static inline uint64_t ChannelDetails_clone_ptr(LDKChannelDetails *NONNULL_PTR arg) { LDKChannelDetails ret_var = ChannelDetails_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelDetails_clone_ptr"))) TS_ChannelDetails_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ChannelDetails_clone_ptr"))) TS_ChannelDetails_clone_ptr(uint64_t arg) { LDKChannelDetails arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ChannelDetails_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ChannelDetails_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelDetails_clone"))) TS_ChannelDetails_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ChannelDetails_clone"))) TS_ChannelDetails_clone(uint64_t orig) { LDKChannelDetails orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKChannelDetails ret_var = ChannelDetails_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelDetails_get_inbound_payment_scid"))) TS_ChannelDetails_get_inbound_payment_scid(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ChannelDetails_get_inbound_payment_scid"))) TS_ChannelDetails_get_inbound_payment_scid(uint64_t this_arg) { LDKChannelDetails this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = ChannelDetails_get_inbound_payment_scid(&this_arg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelDetails_get_outbound_payment_scid"))) TS_ChannelDetails_get_outbound_payment_scid(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ChannelDetails_get_outbound_payment_scid"))) TS_ChannelDetails_get_outbound_payment_scid(uint64_t this_arg) { LDKChannelDetails this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = ChannelDetails_get_outbound_payment_scid(&this_arg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_PaymentSendFailure_free"))) TS_PaymentSendFailure_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKPaymentSendFailure this_ptr_conv = *(LDKPaymentSendFailure*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); PaymentSendFailure_free(this_ptr_conv); } -static inline uintptr_t PaymentSendFailure_clone_ptr(LDKPaymentSendFailure *NONNULL_PTR arg) { +static inline uint64_t PaymentSendFailure_clone_ptr(LDKPaymentSendFailure *NONNULL_PTR arg) { LDKPaymentSendFailure *ret_copy = MALLOC(sizeof(LDKPaymentSendFailure), "LDKPaymentSendFailure"); *ret_copy = PaymentSendFailure_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_PaymentSendFailure_clone_ptr"))) TS_PaymentSendFailure_clone_ptr(uint32_t arg) { - LDKPaymentSendFailure* arg_conv = (LDKPaymentSendFailure*)arg; - uint32_t ret_conv = PaymentSendFailure_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_PaymentSendFailure_clone_ptr"))) TS_PaymentSendFailure_clone_ptr(uint64_t arg) { + LDKPaymentSendFailure* arg_conv = (LDKPaymentSendFailure*)untag_ptr(arg); + int64_t ret_conv = PaymentSendFailure_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_PaymentSendFailure_clone"))) TS_PaymentSendFailure_clone(uint32_t orig) { - LDKPaymentSendFailure* orig_conv = (LDKPaymentSendFailure*)orig; +uint64_t __attribute__((export_name("TS_PaymentSendFailure_clone"))) TS_PaymentSendFailure_clone(uint64_t orig) { + LDKPaymentSendFailure* orig_conv = (LDKPaymentSendFailure*)untag_ptr(orig); LDKPaymentSendFailure *ret_copy = MALLOC(sizeof(LDKPaymentSendFailure), "LDKPaymentSendFailure"); *ret_copy = PaymentSendFailure_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_PaymentSendFailure_parameter_error"))) TS_PaymentSendFailure_parameter_error(uint32_t a) { - void* a_ptr = (void*)(((uintptr_t)a) & ~1); +uint64_t __attribute__((export_name("TS_PaymentSendFailure_parameter_error"))) TS_PaymentSendFailure_parameter_error(uint64_t a) { + void* a_ptr = untag_ptr(a); CHECK_ACCESS(a_ptr); LDKAPIError a_conv = *(LDKAPIError*)(a_ptr); - a_conv = APIError_clone((LDKAPIError*)(((uintptr_t)a) & ~1)); + a_conv = APIError_clone((LDKAPIError*)untag_ptr(a)); LDKPaymentSendFailure *ret_copy = MALLOC(sizeof(LDKPaymentSendFailure), "LDKPaymentSendFailure"); *ret_copy = PaymentSendFailure_parameter_error(a_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_PaymentSendFailure_path_parameter_error"))) TS_PaymentSendFailure_path_parameter_error(uint32_tArray a) { +uint64_t __attribute__((export_name("TS_PaymentSendFailure_path_parameter_error"))) TS_PaymentSendFailure_path_parameter_error(uint64_tArray a) { LDKCVec_CResult_NoneAPIErrorZZ a_constr; a_constr.datalen = a->arr_len; if (a_constr.datalen > 0) 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; + uint64_t* a_vals = a->elems; for (size_t w = 0; w < a_constr.datalen; w++) { - uint32_t a_conv_22 = a_vals[w]; - void* a_conv_22_ptr = (void*)(((uintptr_t)a_conv_22) & ~1); + uint64_t a_conv_22 = a_vals[w]; + void* a_conv_22_ptr = untag_ptr(a_conv_22); 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*)(((uintptr_t)a_conv_22) & ~1)); + a_conv_22_conv = CResult_NoneAPIErrorZ_clone((LDKCResult_NoneAPIErrorZ*)untag_ptr(a_conv_22)); a_constr.data[w] = a_conv_22_conv; } FREE(a); LDKPaymentSendFailure *ret_copy = MALLOC(sizeof(LDKPaymentSendFailure), "LDKPaymentSendFailure"); *ret_copy = PaymentSendFailure_path_parameter_error(a_constr); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_PaymentSendFailure_all_failed_retry_safe"))) TS_PaymentSendFailure_all_failed_retry_safe(uint32_tArray a) { +uint64_t __attribute__((export_name("TS_PaymentSendFailure_all_failed_retry_safe"))) TS_PaymentSendFailure_all_failed_retry_safe(uint64_tArray a) { LDKCVec_APIErrorZ a_constr; a_constr.datalen = a->arr_len; if (a_constr.datalen > 0) a_constr.data = MALLOC(a_constr.datalen * sizeof(LDKAPIError), "LDKCVec_APIErrorZ Elements"); else a_constr.data = NULL; - uint32_t* a_vals = a->elems; + uint64_t* a_vals = a->elems; for (size_t k = 0; k < a_constr.datalen; k++) { - uint32_t a_conv_10 = a_vals[k]; - void* a_conv_10_ptr = (void*)(((uintptr_t)a_conv_10) & ~1); + uint64_t a_conv_10 = a_vals[k]; + void* a_conv_10_ptr = untag_ptr(a_conv_10); CHECK_ACCESS(a_conv_10_ptr); LDKAPIError a_conv_10_conv = *(LDKAPIError*)(a_conv_10_ptr); - a_conv_10_conv = APIError_clone((LDKAPIError*)(((uintptr_t)a_conv_10) & ~1)); + a_conv_10_conv = APIError_clone((LDKAPIError*)untag_ptr(a_conv_10)); a_constr.data[k] = a_conv_10_conv; } FREE(a); LDKPaymentSendFailure *ret_copy = MALLOC(sizeof(LDKPaymentSendFailure), "LDKPaymentSendFailure"); *ret_copy = PaymentSendFailure_all_failed_retry_safe(a_constr); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_PaymentSendFailure_partial_failure"))) TS_PaymentSendFailure_partial_failure(uint32_tArray results, uint32_t failed_paths_retry, int8_tArray payment_id) { +uint64_t __attribute__((export_name("TS_PaymentSendFailure_partial_failure"))) TS_PaymentSendFailure_partial_failure(uint64_tArray results, uint64_t failed_paths_retry, int8_tArray payment_id) { LDKCVec_CResult_NoneAPIErrorZZ results_constr; results_constr.datalen = results->arr_len; if (results_constr.datalen > 0) 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; + uint64_t* results_vals = results->elems; for (size_t w = 0; w < results_constr.datalen; w++) { - uint32_t results_conv_22 = results_vals[w]; - void* results_conv_22_ptr = (void*)(((uintptr_t)results_conv_22) & ~1); + uint64_t results_conv_22 = results_vals[w]; + void* results_conv_22_ptr = untag_ptr(results_conv_22); 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; } FREE(results); LDKRouteParameters failed_paths_retry_conv; - failed_paths_retry_conv.inner = (void*)(failed_paths_retry & (~1)); - failed_paths_retry_conv.is_owned = (failed_paths_retry & 1) || (failed_paths_retry == 0); + failed_paths_retry_conv.inner = untag_ptr(failed_paths_retry); + failed_paths_retry_conv.is_owned = ptr_is_owned(failed_paths_retry); CHECK_INNER_FIELD_ACCESS_OR_NULL(failed_paths_retry_conv); failed_paths_retry_conv = RouteParameters_clone(&failed_paths_retry_conv); LDKThirtyTwoBytes payment_id_ref; @@ -26912,37 +25504,33 @@ uint32_t __attribute__((export_name("TS_PaymentSendFailure_partial_failure"))) 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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_PhantomRouteHints_free"))) TS_PhantomRouteHints_free(uint32_t this_obj) { +void __attribute__((export_name("TS_PhantomRouteHints_free"))) TS_PhantomRouteHints_free(uint64_t this_obj) { LDKPhantomRouteHints this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); PhantomRouteHints_free(this_obj_conv); } -uint32_tArray __attribute__((export_name("TS_PhantomRouteHints_get_channels"))) TS_PhantomRouteHints_get_channels(uint32_t this_ptr) { +uint64_tArray __attribute__((export_name("TS_PhantomRouteHints_get_channels"))) TS_PhantomRouteHints_get_channels(uint64_t this_ptr) { LDKPhantomRouteHints this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_ChannelDetailsZ ret_var = PhantomRouteHints_get_channels(&this_ptr_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t q = 0; q < ret_var.datalen; q++) { LDKChannelDetails ret_conv_16_var = ret_var.data[q]; - uint32_t ret_conv_16_ref = 0; - 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. + uint64_t ret_conv_16_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_16_var); - ret_conv_16_ref = (uintptr_t)ret_conv_16_var.inner; - if (ret_conv_16_var.is_owned) { - ret_conv_16_ref |= 1; - } + ret_conv_16_ref = tag_ptr(ret_conv_16_var.inner, ret_conv_16_var.is_owned); ret_arr_ptr[q] = ret_conv_16_ref; } @@ -26950,23 +25538,24 @@ uint32_tArray __attribute__((export_name("TS_PhantomRouteHints_get_channels"))) return ret_arr; } -void __attribute__((export_name("TS_PhantomRouteHints_set_channels"))) TS_PhantomRouteHints_set_channels(uint32_t this_ptr, uint32_tArray val) { +void __attribute__((export_name("TS_PhantomRouteHints_set_channels"))) TS_PhantomRouteHints_set_channels(uint64_t this_ptr, uint64_tArray val) { LDKPhantomRouteHints this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_ChannelDetailsZ val_constr; val_constr.datalen = val->arr_len; if (val_constr.datalen > 0) val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKChannelDetails), "LDKCVec_ChannelDetailsZ Elements"); else val_constr.data = NULL; - uint32_t* val_vals = val->elems; + uint64_t* val_vals = val->elems; for (size_t q = 0; q < val_constr.datalen; q++) { - uint32_t val_conv_16 = val_vals[q]; + uint64_t val_conv_16 = val_vals[q]; LDKChannelDetails val_conv_16_conv; - val_conv_16_conv.inner = (void*)(val_conv_16 & (~1)); - val_conv_16_conv.is_owned = (val_conv_16 & 1) || (val_conv_16 == 0); + val_conv_16_conv.inner = untag_ptr(val_conv_16); + val_conv_16_conv.is_owned = ptr_is_owned(val_conv_16); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv_16_conv); val_conv_16_conv = ChannelDetails_clone(&val_conv_16_conv); val_constr.data[q] = val_conv_16_conv; @@ -26975,57 +25564,61 @@ void __attribute__((export_name("TS_PhantomRouteHints_set_channels"))) TS_Phant PhantomRouteHints_set_channels(&this_ptr_conv, val_constr); } -int64_t __attribute__((export_name("TS_PhantomRouteHints_get_phantom_scid"))) TS_PhantomRouteHints_get_phantom_scid(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_PhantomRouteHints_get_phantom_scid"))) TS_PhantomRouteHints_get_phantom_scid(uint64_t this_ptr) { LDKPhantomRouteHints this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = PhantomRouteHints_get_phantom_scid(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_PhantomRouteHints_set_phantom_scid"))) TS_PhantomRouteHints_set_phantom_scid(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_PhantomRouteHints_set_phantom_scid"))) TS_PhantomRouteHints_set_phantom_scid(uint64_t this_ptr, int64_t val) { LDKPhantomRouteHints this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; PhantomRouteHints_set_phantom_scid(&this_ptr_conv, val); } -int8_tArray __attribute__((export_name("TS_PhantomRouteHints_get_real_node_pubkey"))) TS_PhantomRouteHints_get_real_node_pubkey(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_PhantomRouteHints_get_real_node_pubkey"))) TS_PhantomRouteHints_get_real_node_pubkey(uint64_t this_ptr) { LDKPhantomRouteHints this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, PhantomRouteHints_get_real_node_pubkey(&this_ptr_conv).compressed_form, 33); return ret_arr; } -void __attribute__((export_name("TS_PhantomRouteHints_set_real_node_pubkey"))) TS_PhantomRouteHints_set_real_node_pubkey(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_PhantomRouteHints_set_real_node_pubkey"))) TS_PhantomRouteHints_set_real_node_pubkey(uint64_t this_ptr, int8_tArray val) { LDKPhantomRouteHints this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); PhantomRouteHints_set_real_node_pubkey(&this_ptr_conv, val_ref); } -uint32_t __attribute__((export_name("TS_PhantomRouteHints_new"))) TS_PhantomRouteHints_new(uint32_tArray channels_arg, int64_t phantom_scid_arg, int8_tArray real_node_pubkey_arg) { +uint64_t __attribute__((export_name("TS_PhantomRouteHints_new"))) TS_PhantomRouteHints_new(uint64_tArray channels_arg, int64_t phantom_scid_arg, int8_tArray real_node_pubkey_arg) { LDKCVec_ChannelDetailsZ channels_arg_constr; channels_arg_constr.datalen = channels_arg->arr_len; if (channels_arg_constr.datalen > 0) channels_arg_constr.data = MALLOC(channels_arg_constr.datalen * sizeof(LDKChannelDetails), "LDKCVec_ChannelDetailsZ Elements"); else channels_arg_constr.data = NULL; - uint32_t* channels_arg_vals = channels_arg->elems; + uint64_t* channels_arg_vals = channels_arg->elems; for (size_t q = 0; q < channels_arg_constr.datalen; q++) { - uint32_t channels_arg_conv_16 = channels_arg_vals[q]; + uint64_t channels_arg_conv_16 = channels_arg_vals[q]; LDKChannelDetails channels_arg_conv_16_conv; - channels_arg_conv_16_conv.inner = (void*)(channels_arg_conv_16 & (~1)); - channels_arg_conv_16_conv.is_owned = (channels_arg_conv_16 & 1) || (channels_arg_conv_16 == 0); + channels_arg_conv_16_conv.inner = untag_ptr(channels_arg_conv_16); + channels_arg_conv_16_conv.is_owned = ptr_is_owned(channels_arg_conv_16); CHECK_INNER_FIELD_ACCESS_OR_NULL(channels_arg_conv_16_conv); channels_arg_conv_16_conv = ChannelDetails_clone(&channels_arg_conv_16_conv); channels_arg_constr.data[q] = channels_arg_conv_16_conv; @@ -27035,85 +25628,72 @@ uint32_t __attribute__((export_name("TS_PhantomRouteHints_new"))) TS_PhantomRou CHECK(real_node_pubkey_arg->arr_len == 33); memcpy(real_node_pubkey_arg_ref.compressed_form, real_node_pubkey_arg->elems, 33); FREE(real_node_pubkey_arg); LDKPhantomRouteHints ret_var = PhantomRouteHints_new(channels_arg_constr, phantom_scid_arg, real_node_pubkey_arg_ref); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t PhantomRouteHints_clone_ptr(LDKPhantomRouteHints *NONNULL_PTR arg) { +static inline uint64_t PhantomRouteHints_clone_ptr(LDKPhantomRouteHints *NONNULL_PTR arg) { LDKPhantomRouteHints ret_var = PhantomRouteHints_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_PhantomRouteHints_clone_ptr"))) TS_PhantomRouteHints_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_PhantomRouteHints_clone_ptr"))) TS_PhantomRouteHints_clone_ptr(uint64_t arg) { LDKPhantomRouteHints arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = PhantomRouteHints_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = PhantomRouteHints_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_PhantomRouteHints_clone"))) TS_PhantomRouteHints_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_PhantomRouteHints_clone"))) TS_PhantomRouteHints_clone(uint64_t orig) { LDKPhantomRouteHints orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKPhantomRouteHints ret_var = PhantomRouteHints_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); 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*)(((uintptr_t)fee_est) & ~1); +uint64_t __attribute__((export_name("TS_ChannelManager_new"))) TS_ChannelManager_new(uint64_t fee_est, uint64_t chain_monitor, uint64_t tx_broadcaster, uint64_t logger, uint64_t keys_manager, uint64_t config, uint64_t params) { + void* fee_est_ptr = untag_ptr(fee_est); CHECK_ACCESS(fee_est_ptr); LDKFeeEstimator fee_est_conv = *(LDKFeeEstimator*)(fee_est_ptr); if (fee_est_conv.free == LDKFeeEstimator_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKFeeEstimator_JCalls_cloned(&fee_est_conv); } - void* chain_monitor_ptr = (void*)(((uintptr_t)chain_monitor) & ~1); + void* chain_monitor_ptr = untag_ptr(chain_monitor); CHECK_ACCESS(chain_monitor_ptr); LDKWatch chain_monitor_conv = *(LDKWatch*)(chain_monitor_ptr); if (chain_monitor_conv.free == LDKWatch_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKWatch_JCalls_cloned(&chain_monitor_conv); } - void* tx_broadcaster_ptr = (void*)(((uintptr_t)tx_broadcaster) & ~1); + void* tx_broadcaster_ptr = untag_ptr(tx_broadcaster); CHECK_ACCESS(tx_broadcaster_ptr); LDKBroadcasterInterface tx_broadcaster_conv = *(LDKBroadcasterInterface*)(tx_broadcaster_ptr); if (tx_broadcaster_conv.free == LDKBroadcasterInterface_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKBroadcasterInterface_JCalls_cloned(&tx_broadcaster_conv); } - void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); + void* logger_ptr = untag_ptr(logger); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); if (logger_conv.free == LDKLogger_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKLogger_JCalls_cloned(&logger_conv); } - void* keys_manager_ptr = (void*)(((uintptr_t)keys_manager) & ~1); + void* keys_manager_ptr = untag_ptr(keys_manager); CHECK_ACCESS(keys_manager_ptr); LDKKeysInterface keys_manager_conv = *(LDKKeysInterface*)(keys_manager_ptr); if (keys_manager_conv.free == LDKKeysInterface_JCalls_free) { @@ -27121,81 +25701,69 @@ uint32_t __attribute__((export_name("TS_ChannelManager_new"))) TS_ChannelManage LDKKeysInterface_JCalls_cloned(&keys_manager_conv); } LDKUserConfig config_conv; - config_conv.inner = (void*)(config & (~1)); - config_conv.is_owned = (config & 1) || (config == 0); + config_conv.inner = untag_ptr(config); + config_conv.is_owned = ptr_is_owned(config); CHECK_INNER_FIELD_ACCESS_OR_NULL(config_conv); config_conv = UserConfig_clone(&config_conv); LDKChainParameters params_conv; - params_conv.inner = (void*)(params & (~1)); - params_conv.is_owned = (params & 1) || (params == 0); + params_conv.inner = untag_ptr(params); + params_conv.is_owned = ptr_is_owned(params); 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelManager_get_current_default_configuration"))) TS_ChannelManager_get_current_default_configuration(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ChannelManager_get_current_default_configuration"))) TS_ChannelManager_get_current_default_configuration(uint64_t this_arg) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKUserConfig ret_var = ChannelManager_get_current_default_configuration(&this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelManager_create_channel"))) TS_ChannelManager_create_channel(uint32_t this_arg, int8_tArray their_network_key, int64_t channel_value_satoshis, int64_t push_msat, int64_t user_channel_id, uint32_t override_config) { +uint64_t __attribute__((export_name("TS_ChannelManager_create_channel"))) TS_ChannelManager_create_channel(uint64_t this_arg, int8_tArray their_network_key, int64_t channel_value_satoshis, int64_t push_msat, int64_t user_channel_id, uint64_t override_config) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKPublicKey their_network_key_ref; CHECK(their_network_key->arr_len == 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); + override_config_conv.inner = untag_ptr(override_config); + override_config_conv.is_owned = ptr_is_owned(override_config); CHECK_INNER_FIELD_ACCESS_OR_NULL(override_config_conv); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_tArray __attribute__((export_name("TS_ChannelManager_list_channels"))) TS_ChannelManager_list_channels(uint32_t this_arg) { +uint64_tArray __attribute__((export_name("TS_ChannelManager_list_channels"))) TS_ChannelManager_list_channels(uint64_t this_arg) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCVec_ChannelDetailsZ ret_var = ChannelManager_list_channels(&this_arg_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t q = 0; q < ret_var.datalen; q++) { LDKChannelDetails ret_conv_16_var = ret_var.data[q]; - uint32_t ret_conv_16_ref = 0; - 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. + uint64_t ret_conv_16_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_16_var); - ret_conv_16_ref = (uintptr_t)ret_conv_16_var.inner; - if (ret_conv_16_var.is_owned) { - ret_conv_16_ref |= 1; - } + ret_conv_16_ref = tag_ptr(ret_conv_16_var.inner, ret_conv_16_var.is_owned); ret_arr_ptr[q] = ret_conv_16_ref; } @@ -27203,25 +25771,21 @@ uint32_tArray __attribute__((export_name("TS_ChannelManager_list_channels"))) T return ret_arr; } -uint32_tArray __attribute__((export_name("TS_ChannelManager_list_usable_channels"))) TS_ChannelManager_list_usable_channels(uint32_t this_arg) { +uint64_tArray __attribute__((export_name("TS_ChannelManager_list_usable_channels"))) TS_ChannelManager_list_usable_channels(uint64_t this_arg) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCVec_ChannelDetailsZ ret_var = ChannelManager_list_usable_channels(&this_arg_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t q = 0; q < ret_var.datalen; q++) { LDKChannelDetails ret_conv_16_var = ret_var.data[q]; - uint32_t ret_conv_16_ref = 0; - 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. + uint64_t ret_conv_16_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_16_var); - ret_conv_16_ref = (uintptr_t)ret_conv_16_var.inner; - if (ret_conv_16_var.is_owned) { - ret_conv_16_ref |= 1; - } + ret_conv_16_ref = tag_ptr(ret_conv_16_var.inner, ret_conv_16_var.is_owned); ret_arr_ptr[q] = ret_conv_16_ref; } @@ -27229,11 +25793,12 @@ uint32_tArray __attribute__((export_name("TS_ChannelManager_list_usable_channel return ret_arr; } -uint32_t __attribute__((export_name("TS_ChannelManager_close_channel"))) TS_ChannelManager_close_channel(uint32_t this_arg, int8_tArray channel_id, int8_tArray counterparty_node_id) { +uint64_t __attribute__((export_name("TS_ChannelManager_close_channel"))) TS_ChannelManager_close_channel(uint64_t this_arg, int8_tArray channel_id, int8_tArray counterparty_node_id) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; unsigned char channel_id_arr[32]; CHECK(channel_id->arr_len == 32); memcpy(channel_id_arr, channel_id->elems, 32); FREE(channel_id); @@ -27243,14 +25808,15 @@ uint32_t __attribute__((export_name("TS_ChannelManager_close_channel"))) TS_Cha memcpy(counterparty_node_id_ref.compressed_form, counterparty_node_id->elems, 33); FREE(counterparty_node_id); LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); *ret_conv = ChannelManager_close_channel(&this_arg_conv, channel_id_ref, counterparty_node_id_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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, int8_tArray counterparty_node_id, int32_t target_feerate_sats_per_1000_weight) { +uint64_t __attribute__((export_name("TS_ChannelManager_close_channel_with_target_feerate"))) TS_ChannelManager_close_channel_with_target_feerate(uint64_t this_arg, int8_tArray channel_id, int8_tArray counterparty_node_id, int32_t target_feerate_sats_per_1000_weight) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; unsigned char channel_id_arr[32]; CHECK(channel_id->arr_len == 32); memcpy(channel_id_arr, channel_id->elems, 32); FREE(channel_id); @@ -27260,14 +25826,15 @@ uint32_t __attribute__((export_name("TS_ChannelManager_close_channel_with_targe memcpy(counterparty_node_id_ref.compressed_form, counterparty_node_id->elems, 33); FREE(counterparty_node_id); LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); *ret_conv = ChannelManager_close_channel_with_target_feerate(&this_arg_conv, channel_id_ref, counterparty_node_id_ref, target_feerate_sats_per_1000_weight); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_ChannelManager_force_close_broadcasting_latest_txn"))) TS_ChannelManager_force_close_broadcasting_latest_txn(uint32_t this_arg, int8_tArray channel_id, int8_tArray counterparty_node_id) { +uint64_t __attribute__((export_name("TS_ChannelManager_force_close_broadcasting_latest_txn"))) TS_ChannelManager_force_close_broadcasting_latest_txn(uint64_t this_arg, int8_tArray channel_id, int8_tArray counterparty_node_id) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; unsigned char channel_id_arr[32]; CHECK(channel_id->arr_len == 32); memcpy(channel_id_arr, channel_id->elems, 32); FREE(channel_id); @@ -27277,14 +25844,15 @@ uint32_t __attribute__((export_name("TS_ChannelManager_force_close_broadcasting memcpy(counterparty_node_id_ref.compressed_form, counterparty_node_id->elems, 33); FREE(counterparty_node_id); LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); *ret_conv = ChannelManager_force_close_broadcasting_latest_txn(&this_arg_conv, channel_id_ref, counterparty_node_id_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_ChannelManager_force_close_without_broadcasting_txn"))) TS_ChannelManager_force_close_without_broadcasting_txn(uint32_t this_arg, int8_tArray channel_id, int8_tArray counterparty_node_id) { +uint64_t __attribute__((export_name("TS_ChannelManager_force_close_without_broadcasting_txn"))) TS_ChannelManager_force_close_without_broadcasting_txn(uint64_t this_arg, int8_tArray channel_id, int8_tArray counterparty_node_id) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; unsigned char channel_id_arr[32]; CHECK(channel_id->arr_len == 32); memcpy(channel_id_arr, channel_id->elems, 32); FREE(channel_id); @@ -27294,34 +25862,38 @@ uint32_t __attribute__((export_name("TS_ChannelManager_force_close_without_broa memcpy(counterparty_node_id_ref.compressed_form, counterparty_node_id->elems, 33); FREE(counterparty_node_id); LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); *ret_conv = ChannelManager_force_close_without_broadcasting_txn(&this_arg_conv, channel_id_ref, counterparty_node_id_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_ChannelManager_force_close_all_channels_broadcasting_latest_txn"))) TS_ChannelManager_force_close_all_channels_broadcasting_latest_txn(uint32_t this_arg) { +void __attribute__((export_name("TS_ChannelManager_force_close_all_channels_broadcasting_latest_txn"))) TS_ChannelManager_force_close_all_channels_broadcasting_latest_txn(uint64_t this_arg) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; ChannelManager_force_close_all_channels_broadcasting_latest_txn(&this_arg_conv); } -void __attribute__((export_name("TS_ChannelManager_force_close_all_channels_without_broadcasting_txn"))) TS_ChannelManager_force_close_all_channels_without_broadcasting_txn(uint32_t this_arg) { +void __attribute__((export_name("TS_ChannelManager_force_close_all_channels_without_broadcasting_txn"))) TS_ChannelManager_force_close_all_channels_without_broadcasting_txn(uint64_t this_arg) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; ChannelManager_force_close_all_channels_without_broadcasting_txn(&this_arg_conv); } -uint32_t __attribute__((export_name("TS_ChannelManager_send_payment"))) TS_ChannelManager_send_payment(uint32_t this_arg, uint32_t route, int8_tArray payment_hash, int8_tArray payment_secret) { +uint64_t __attribute__((export_name("TS_ChannelManager_send_payment"))) TS_ChannelManager_send_payment(uint64_t this_arg, uint64_t route, int8_tArray payment_hash, int8_tArray payment_secret) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKRoute route_conv; - route_conv.inner = (void*)(route & (~1)); - route_conv.is_owned = false; + route_conv.inner = untag_ptr(route); + route_conv.is_owned = ptr_is_owned(route); CHECK_INNER_FIELD_ACCESS_OR_NULL(route_conv); + route_conv.is_owned = false; LDKThirtyTwoBytes payment_hash_ref; CHECK(payment_hash->arr_len == 32); memcpy(payment_hash_ref.data, payment_hash->elems, 32); FREE(payment_hash); @@ -27330,71 +25902,77 @@ uint32_t __attribute__((export_name("TS_ChannelManager_send_payment"))) TS_Chan 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_ChannelManager_retry_payment"))) TS_ChannelManager_retry_payment(uint32_t this_arg, uint32_t route, int8_tArray payment_id) { +uint64_t __attribute__((export_name("TS_ChannelManager_retry_payment"))) TS_ChannelManager_retry_payment(uint64_t this_arg, uint64_t route, int8_tArray payment_id) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKRoute route_conv; - route_conv.inner = (void*)(route & (~1)); - route_conv.is_owned = false; + route_conv.inner = untag_ptr(route); + route_conv.is_owned = ptr_is_owned(route); CHECK_INNER_FIELD_ACCESS_OR_NULL(route_conv); + route_conv.is_owned = false; LDKThirtyTwoBytes payment_id_ref; CHECK(payment_id->arr_len == 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_ChannelManager_abandon_payment"))) TS_ChannelManager_abandon_payment(uint32_t this_arg, int8_tArray payment_id) { +void __attribute__((export_name("TS_ChannelManager_abandon_payment"))) TS_ChannelManager_abandon_payment(uint64_t this_arg, int8_tArray payment_id) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKThirtyTwoBytes payment_id_ref; CHECK(payment_id->arr_len == 32); memcpy(payment_id_ref.data, payment_id->elems, 32); FREE(payment_id); ChannelManager_abandon_payment(&this_arg_conv, payment_id_ref); } -uint32_t __attribute__((export_name("TS_ChannelManager_send_spontaneous_payment"))) TS_ChannelManager_send_spontaneous_payment(uint32_t this_arg, uint32_t route, int8_tArray payment_preimage) { +uint64_t __attribute__((export_name("TS_ChannelManager_send_spontaneous_payment"))) TS_ChannelManager_send_spontaneous_payment(uint64_t this_arg, uint64_t route, int8_tArray payment_preimage) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKRoute route_conv; - route_conv.inner = (void*)(route & (~1)); - route_conv.is_owned = false; + route_conv.inner = untag_ptr(route); + route_conv.is_owned = ptr_is_owned(route); CHECK_INNER_FIELD_ACCESS_OR_NULL(route_conv); + route_conv.is_owned = false; LDKThirtyTwoBytes payment_preimage_ref; CHECK(payment_preimage->arr_len == 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_ChannelManager_send_probe"))) TS_ChannelManager_send_probe(uint32_t this_arg, uint32_tArray hops) { +uint64_t __attribute__((export_name("TS_ChannelManager_send_probe"))) TS_ChannelManager_send_probe(uint64_t this_arg, uint64_tArray hops) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCVec_RouteHopZ hops_constr; hops_constr.datalen = hops->arr_len; if (hops_constr.datalen > 0) hops_constr.data = MALLOC(hops_constr.datalen * sizeof(LDKRouteHop), "LDKCVec_RouteHopZ Elements"); else hops_constr.data = NULL; - uint32_t* hops_vals = hops->elems; + uint64_t* hops_vals = hops->elems; for (size_t k = 0; k < hops_constr.datalen; k++) { - uint32_t hops_conv_10 = hops_vals[k]; + uint64_t hops_conv_10 = hops_vals[k]; LDKRouteHop hops_conv_10_conv; - hops_conv_10_conv.inner = (void*)(hops_conv_10 & (~1)); - hops_conv_10_conv.is_owned = (hops_conv_10 & 1) || (hops_conv_10 == 0); + hops_conv_10_conv.inner = untag_ptr(hops_conv_10); + hops_conv_10_conv.is_owned = ptr_is_owned(hops_conv_10); CHECK_INNER_FIELD_ACCESS_OR_NULL(hops_conv_10_conv); hops_conv_10_conv = RouteHop_clone(&hops_conv_10_conv); hops_constr.data[k] = hops_conv_10_conv; @@ -27402,14 +25980,15 @@ uint32_t __attribute__((export_name("TS_ChannelManager_send_probe"))) TS_Channe FREE(hops); LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ), "LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ"); *ret_conv = ChannelManager_send_probe(&this_arg_conv, hops_constr); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_ChannelManager_funding_transaction_generated"))) TS_ChannelManager_funding_transaction_generated(uint32_t this_arg, int8_tArray temporary_channel_id, int8_tArray counterparty_node_id, int8_tArray funding_transaction) { +uint64_t __attribute__((export_name("TS_ChannelManager_funding_transaction_generated"))) TS_ChannelManager_funding_transaction_generated(uint64_t this_arg, int8_tArray temporary_channel_id, int8_tArray counterparty_node_id, int8_tArray funding_transaction) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; unsigned char temporary_channel_id_arr[32]; CHECK(temporary_channel_id->arr_len == 32); memcpy(temporary_channel_id_arr, temporary_channel_id->elems, 32); FREE(temporary_channel_id); @@ -27424,14 +26003,15 @@ uint32_t __attribute__((export_name("TS_ChannelManager_funding_transaction_gene 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, counterparty_node_id_ref, funding_transaction_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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) { +void __attribute__((export_name("TS_ChannelManager_broadcast_node_announcement"))) TS_ChannelManager_broadcast_node_announcement(uint64_t this_arg, int8_tArray rgb, int8_tArray alias, uint64_tArray addresses) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKThreeBytes rgb_ref; CHECK(rgb->arr_len == 3); memcpy(rgb_ref.data, rgb->elems, 3); FREE(rgb); @@ -27444,10 +26024,10 @@ void __attribute__((export_name("TS_ChannelManager_broadcast_node_announcement" addresses_constr.data = MALLOC(addresses_constr.datalen * sizeof(LDKNetAddress), "LDKCVec_NetAddressZ Elements"); else addresses_constr.data = NULL; - uint32_t* addresses_vals = addresses->elems; + uint64_t* addresses_vals = addresses->elems; for (size_t m = 0; m < addresses_constr.datalen; m++) { - uint32_t addresses_conv_12 = addresses_vals[m]; - void* addresses_conv_12_ptr = (void*)(((uintptr_t)addresses_conv_12) & ~1); + uint64_t addresses_conv_12 = addresses_vals[m]; + void* addresses_conv_12_ptr = untag_ptr(addresses_conv_12); CHECK_ACCESS(addresses_conv_12_ptr); LDKNetAddress addresses_conv_12_conv = *(LDKNetAddress*)(addresses_conv_12_ptr); addresses_constr.data[m] = addresses_conv_12_conv; @@ -27456,11 +26036,12 @@ void __attribute__((export_name("TS_ChannelManager_broadcast_node_announcement" ChannelManager_broadcast_node_announcement(&this_arg_conv, rgb_ref, alias_ref, addresses_constr); } -uint32_t __attribute__((export_name("TS_ChannelManager_update_channel_config"))) TS_ChannelManager_update_channel_config(uint32_t this_arg, int8_tArray counterparty_node_id, ptrArray channel_ids, uint32_t config) { +uint64_t __attribute__((export_name("TS_ChannelManager_update_channel_config"))) TS_ChannelManager_update_channel_config(uint64_t this_arg, int8_tArray counterparty_node_id, ptrArray channel_ids, uint64_t config) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKPublicKey counterparty_node_id_ref; CHECK(counterparty_node_id->arr_len == 33); memcpy(counterparty_node_id_ref.compressed_form, counterparty_node_id->elems, 33); FREE(counterparty_node_id); @@ -27480,35 +26061,39 @@ uint32_t __attribute__((export_name("TS_ChannelManager_update_channel_config")) } FREE(channel_ids); LDKChannelConfig config_conv; - config_conv.inner = (void*)(config & (~1)); - config_conv.is_owned = false; + config_conv.inner = untag_ptr(config); + config_conv.is_owned = ptr_is_owned(config); CHECK_INNER_FIELD_ACCESS_OR_NULL(config_conv); + config_conv.is_owned = false; LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); *ret_conv = ChannelManager_update_channel_config(&this_arg_conv, counterparty_node_id_ref, channel_ids_constr, &config_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_ChannelManager_process_pending_htlc_forwards"))) TS_ChannelManager_process_pending_htlc_forwards(uint32_t this_arg) { +void __attribute__((export_name("TS_ChannelManager_process_pending_htlc_forwards"))) TS_ChannelManager_process_pending_htlc_forwards(uint64_t this_arg) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; ChannelManager_process_pending_htlc_forwards(&this_arg_conv); } -void __attribute__((export_name("TS_ChannelManager_timer_tick_occurred"))) TS_ChannelManager_timer_tick_occurred(uint32_t this_arg) { +void __attribute__((export_name("TS_ChannelManager_timer_tick_occurred"))) TS_ChannelManager_timer_tick_occurred(uint64_t this_arg) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; ChannelManager_timer_tick_occurred(&this_arg_conv); } -void __attribute__((export_name("TS_ChannelManager_fail_htlc_backwards"))) TS_ChannelManager_fail_htlc_backwards(uint32_t this_arg, int8_tArray payment_hash) { +void __attribute__((export_name("TS_ChannelManager_fail_htlc_backwards"))) TS_ChannelManager_fail_htlc_backwards(uint64_t this_arg, int8_tArray payment_hash) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; unsigned char payment_hash_arr[32]; CHECK(payment_hash->arr_len == 32); memcpy(payment_hash_arr, payment_hash->elems, 32); FREE(payment_hash); @@ -27516,32 +26101,35 @@ void __attribute__((export_name("TS_ChannelManager_fail_htlc_backwards"))) TS_C ChannelManager_fail_htlc_backwards(&this_arg_conv, payment_hash_ref); } -void __attribute__((export_name("TS_ChannelManager_claim_funds"))) TS_ChannelManager_claim_funds(uint32_t this_arg, int8_tArray payment_preimage) { +void __attribute__((export_name("TS_ChannelManager_claim_funds"))) TS_ChannelManager_claim_funds(uint64_t this_arg, int8_tArray payment_preimage) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKThirtyTwoBytes payment_preimage_ref; CHECK(payment_preimage->arr_len == 32); memcpy(payment_preimage_ref.data, payment_preimage->elems, 32); FREE(payment_preimage); ChannelManager_claim_funds(&this_arg_conv, payment_preimage_ref); } -int8_tArray __attribute__((export_name("TS_ChannelManager_get_our_node_id"))) TS_ChannelManager_get_our_node_id(uint32_t this_arg) { +int8_tArray __attribute__((export_name("TS_ChannelManager_get_our_node_id"))) TS_ChannelManager_get_our_node_id(uint64_t this_arg) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; 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; } -uint32_t __attribute__((export_name("TS_ChannelManager_accept_inbound_channel"))) TS_ChannelManager_accept_inbound_channel(uint32_t this_arg, int8_tArray temporary_channel_id, int8_tArray counterparty_node_id, int64_t user_channel_id) { +uint64_t __attribute__((export_name("TS_ChannelManager_accept_inbound_channel"))) TS_ChannelManager_accept_inbound_channel(uint64_t this_arg, int8_tArray temporary_channel_id, int8_tArray counterparty_node_id, int64_t user_channel_id) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; unsigned char temporary_channel_id_arr[32]; CHECK(temporary_channel_id->arr_len == 32); memcpy(temporary_channel_id_arr, temporary_channel_id->elems, 32); FREE(temporary_channel_id); @@ -27551,14 +26139,15 @@ uint32_t __attribute__((export_name("TS_ChannelManager_accept_inbound_channel") memcpy(counterparty_node_id_ref.compressed_form, counterparty_node_id->elems, 33); FREE(counterparty_node_id); LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); *ret_conv = ChannelManager_accept_inbound_channel(&this_arg_conv, temporary_channel_id_ref, counterparty_node_id_ref, user_channel_id); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_ChannelManager_accept_inbound_channel_from_trusted_peer_0conf"))) TS_ChannelManager_accept_inbound_channel_from_trusted_peer_0conf(uint32_t this_arg, int8_tArray temporary_channel_id, int8_tArray counterparty_node_id, int64_t user_channel_id) { +uint64_t __attribute__((export_name("TS_ChannelManager_accept_inbound_channel_from_trusted_peer_0conf"))) TS_ChannelManager_accept_inbound_channel_from_trusted_peer_0conf(uint64_t this_arg, int8_tArray temporary_channel_id, int8_tArray counterparty_node_id, int64_t user_channel_id) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; unsigned char temporary_channel_id_arr[32]; CHECK(temporary_channel_id->arr_len == 32); memcpy(temporary_channel_id_arr, temporary_channel_id->elems, 32); FREE(temporary_channel_id); @@ -27568,76 +26157,81 @@ uint32_t __attribute__((export_name("TS_ChannelManager_accept_inbound_channel_f memcpy(counterparty_node_id_ref.compressed_form, counterparty_node_id->elems, 33); FREE(counterparty_node_id); LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); *ret_conv = ChannelManager_accept_inbound_channel_from_trusted_peer_0conf(&this_arg_conv, temporary_channel_id_ref, counterparty_node_id_ref, user_channel_id); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_ChannelManager_create_inbound_payment"))) TS_ChannelManager_create_inbound_payment(uint32_t this_arg, uint32_t min_value_msat, int32_t invoice_expiry_delta_secs) { +uint64_t __attribute__((export_name("TS_ChannelManager_create_inbound_payment"))) TS_ChannelManager_create_inbound_payment(uint64_t this_arg, uint64_t min_value_msat, int32_t invoice_expiry_delta_secs) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); - void* min_value_msat_ptr = (void*)(((uintptr_t)min_value_msat) & ~1); + this_arg_conv.is_owned = false; + void* min_value_msat_ptr = untag_ptr(min_value_msat); 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*)(((uintptr_t)min_value_msat) & ~1)); + min_value_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(min_value_msat)); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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) { +uint64_t __attribute__((export_name("TS_ChannelManager_create_inbound_payment_legacy"))) TS_ChannelManager_create_inbound_payment_legacy(uint64_t this_arg, uint64_t min_value_msat, int32_t invoice_expiry_delta_secs) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); - void* min_value_msat_ptr = (void*)(((uintptr_t)min_value_msat) & ~1); + this_arg_conv.is_owned = false; + void* min_value_msat_ptr = untag_ptr(min_value_msat); 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*)(((uintptr_t)min_value_msat) & ~1)); + min_value_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(min_value_msat)); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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) { +uint64_t __attribute__((export_name("TS_ChannelManager_create_inbound_payment_for_hash"))) TS_ChannelManager_create_inbound_payment_for_hash(uint64_t this_arg, int8_tArray payment_hash, uint64_t min_value_msat, int32_t invoice_expiry_delta_secs) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKThirtyTwoBytes payment_hash_ref; CHECK(payment_hash->arr_len == 32); memcpy(payment_hash_ref.data, payment_hash->elems, 32); FREE(payment_hash); - void* min_value_msat_ptr = (void*)(((uintptr_t)min_value_msat) & ~1); + void* min_value_msat_ptr = untag_ptr(min_value_msat); 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*)(((uintptr_t)min_value_msat) & ~1)); + min_value_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(min_value_msat)); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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) { +uint64_t __attribute__((export_name("TS_ChannelManager_create_inbound_payment_for_hash_legacy"))) TS_ChannelManager_create_inbound_payment_for_hash_legacy(uint64_t this_arg, int8_tArray payment_hash, uint64_t min_value_msat, int32_t invoice_expiry_delta_secs) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKThirtyTwoBytes payment_hash_ref; CHECK(payment_hash->arr_len == 32); memcpy(payment_hash_ref.data, payment_hash->elems, 32); FREE(payment_hash); - void* min_value_msat_ptr = (void*)(((uintptr_t)min_value_msat) & ~1); + void* min_value_msat_ptr = untag_ptr(min_value_msat); 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*)(((uintptr_t)min_value_msat) & ~1)); + min_value_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(min_value_msat)); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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) { +uint64_t __attribute__((export_name("TS_ChannelManager_get_payment_preimage"))) TS_ChannelManager_get_payment_preimage(uint64_t this_arg, int8_tArray payment_hash, int8_tArray payment_secret) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKThirtyTwoBytes payment_hash_ref; CHECK(payment_hash->arr_len == 32); memcpy(payment_hash_ref.data, payment_hash->elems, 32); FREE(payment_hash); @@ -27646,115 +26240,115 @@ uint32_t __attribute__((export_name("TS_ChannelManager_get_payment_preimage"))) 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int64_t __attribute__((export_name("TS_ChannelManager_get_phantom_scid"))) TS_ChannelManager_get_phantom_scid(uint32_t this_arg) { +int64_t __attribute__((export_name("TS_ChannelManager_get_phantom_scid"))) TS_ChannelManager_get_phantom_scid(uint64_t this_arg) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int64_t ret_conv = ChannelManager_get_phantom_scid(&this_arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelManager_get_phantom_route_hints"))) TS_ChannelManager_get_phantom_route_hints(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ChannelManager_get_phantom_route_hints"))) TS_ChannelManager_get_phantom_route_hints(uint64_t this_arg) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKPhantomRouteHints ret_var = ChannelManager_get_phantom_route_hints(&this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelManager_as_MessageSendEventsProvider"))) TS_ChannelManager_as_MessageSendEventsProvider(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ChannelManager_as_MessageSendEventsProvider"))) TS_ChannelManager_as_MessageSendEventsProvider(uint64_t this_arg) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKMessageSendEventsProvider* ret_ret = MALLOC(sizeof(LDKMessageSendEventsProvider), "LDKMessageSendEventsProvider"); *ret_ret = ChannelManager_as_MessageSendEventsProvider(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_t __attribute__((export_name("TS_ChannelManager_as_EventsProvider"))) TS_ChannelManager_as_EventsProvider(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ChannelManager_as_EventsProvider"))) TS_ChannelManager_as_EventsProvider(uint64_t this_arg) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKEventsProvider* ret_ret = MALLOC(sizeof(LDKEventsProvider), "LDKEventsProvider"); *ret_ret = ChannelManager_as_EventsProvider(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_t __attribute__((export_name("TS_ChannelManager_as_Listen"))) TS_ChannelManager_as_Listen(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ChannelManager_as_Listen"))) TS_ChannelManager_as_Listen(uint64_t this_arg) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKListen* ret_ret = MALLOC(sizeof(LDKListen), "LDKListen"); *ret_ret = ChannelManager_as_Listen(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_t __attribute__((export_name("TS_ChannelManager_as_Confirm"))) TS_ChannelManager_as_Confirm(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ChannelManager_as_Confirm"))) TS_ChannelManager_as_Confirm(uint64_t this_arg) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKConfirm* ret_ret = MALLOC(sizeof(LDKConfirm), "LDKConfirm"); *ret_ret = ChannelManager_as_Confirm(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -void __attribute__((export_name("TS_ChannelManager_await_persistable_update"))) TS_ChannelManager_await_persistable_update(uint32_t this_arg) { +void __attribute__((export_name("TS_ChannelManager_await_persistable_update"))) TS_ChannelManager_await_persistable_update(uint64_t this_arg) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; ChannelManager_await_persistable_update(&this_arg_conv); } -uint32_t __attribute__((export_name("TS_ChannelManager_current_best_block"))) TS_ChannelManager_current_best_block(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ChannelManager_current_best_block"))) TS_ChannelManager_current_best_block(uint64_t this_arg) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKBestBlock ret_var = ChannelManager_current_best_block(&this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelManager_as_ChannelMessageHandler"))) TS_ChannelManager_as_ChannelMessageHandler(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ChannelManager_as_ChannelMessageHandler"))) TS_ChannelManager_as_ChannelMessageHandler(uint64_t this_arg) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKChannelMessageHandler* ret_ret = MALLOC(sizeof(LDKChannelMessageHandler), "LDKChannelMessageHandler"); *ret_ret = ChannelManager_as_ChannelMessageHandler(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -int8_tArray __attribute__((export_name("TS_CounterpartyForwardingInfo_write"))) TS_CounterpartyForwardingInfo_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_CounterpartyForwardingInfo_write"))) TS_CounterpartyForwardingInfo_write(uint64_t obj) { LDKCounterpartyForwardingInfo obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = CounterpartyForwardingInfo_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -27762,21 +26356,22 @@ int8_tArray __attribute__((export_name("TS_CounterpartyForwardingInfo_write"))) return ret_arr; } -uint32_t __attribute__((export_name("TS_CounterpartyForwardingInfo_read"))) TS_CounterpartyForwardingInfo_read(int8_tArray ser) { +uint64_t __attribute__((export_name("TS_CounterpartyForwardingInfo_read"))) TS_CounterpartyForwardingInfo_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; ser_ref.data = ser->elems; LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyForwardingInfoDecodeErrorZ), "LDKCResult_CounterpartyForwardingInfoDecodeErrorZ"); *ret_conv = CounterpartyForwardingInfo_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_ChannelCounterparty_write"))) TS_ChannelCounterparty_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ChannelCounterparty_write"))) TS_ChannelCounterparty_write(uint64_t obj) { LDKChannelCounterparty obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ChannelCounterparty_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -27784,21 +26379,22 @@ int8_tArray __attribute__((export_name("TS_ChannelCounterparty_write"))) TS_Cha return ret_arr; } -uint32_t __attribute__((export_name("TS_ChannelCounterparty_read"))) TS_ChannelCounterparty_read(int8_tArray ser) { +uint64_t __attribute__((export_name("TS_ChannelCounterparty_read"))) TS_ChannelCounterparty_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; ser_ref.data = ser->elems; LDKCResult_ChannelCounterpartyDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelCounterpartyDecodeErrorZ), "LDKCResult_ChannelCounterpartyDecodeErrorZ"); *ret_conv = ChannelCounterparty_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_ChannelDetails_write"))) TS_ChannelDetails_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ChannelDetails_write"))) TS_ChannelDetails_write(uint64_t obj) { LDKChannelDetails obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ChannelDetails_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -27806,21 +26402,22 @@ int8_tArray __attribute__((export_name("TS_ChannelDetails_write"))) TS_ChannelD return ret_arr; } -uint32_t __attribute__((export_name("TS_ChannelDetails_read"))) TS_ChannelDetails_read(int8_tArray ser) { +uint64_t __attribute__((export_name("TS_ChannelDetails_read"))) TS_ChannelDetails_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; ser_ref.data = ser->elems; LDKCResult_ChannelDetailsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelDetailsDecodeErrorZ), "LDKCResult_ChannelDetailsDecodeErrorZ"); *ret_conv = ChannelDetails_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_PhantomRouteHints_write"))) TS_PhantomRouteHints_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_PhantomRouteHints_write"))) TS_PhantomRouteHints_write(uint64_t obj) { LDKPhantomRouteHints obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = PhantomRouteHints_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -27828,21 +26425,22 @@ int8_tArray __attribute__((export_name("TS_PhantomRouteHints_write"))) TS_Phant return ret_arr; } -uint32_t __attribute__((export_name("TS_PhantomRouteHints_read"))) TS_PhantomRouteHints_read(int8_tArray ser) { +uint64_t __attribute__((export_name("TS_PhantomRouteHints_read"))) TS_PhantomRouteHints_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; ser_ref.data = ser->elems; LDKCResult_PhantomRouteHintsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PhantomRouteHintsDecodeErrorZ), "LDKCResult_PhantomRouteHintsDecodeErrorZ"); *ret_conv = PhantomRouteHints_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_ChannelManager_write"))) TS_ChannelManager_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ChannelManager_write"))) TS_ChannelManager_write(uint64_t obj) { LDKChannelManager obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ChannelManager_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -27850,30 +26448,32 @@ int8_tArray __attribute__((export_name("TS_ChannelManager_write"))) TS_ChannelM return ret_arr; } -void __attribute__((export_name("TS_ChannelManagerReadArgs_free"))) TS_ChannelManagerReadArgs_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChannelManagerReadArgs_free"))) TS_ChannelManagerReadArgs_free(uint64_t this_obj) { LDKChannelManagerReadArgs this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChannelManagerReadArgs_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_ChannelManagerReadArgs_get_keys_manager"))) TS_ChannelManagerReadArgs_get_keys_manager(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelManagerReadArgs_get_keys_manager"))) TS_ChannelManagerReadArgs_get_keys_manager(uint64_t this_ptr) { LDKChannelManagerReadArgs this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; // WARNING: This object doesn't live past this scope, needs clone! - uint32_t ret_ret = ((uintptr_t)ChannelManagerReadArgs_get_keys_manager(&this_ptr_conv)) | 1; + uint64_t ret_ret = tag_ptr(ChannelManagerReadArgs_get_keys_manager(&this_ptr_conv), false); return ret_ret; } -void __attribute__((export_name("TS_ChannelManagerReadArgs_set_keys_manager"))) TS_ChannelManagerReadArgs_set_keys_manager(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelManagerReadArgs_set_keys_manager"))) TS_ChannelManagerReadArgs_set_keys_manager(uint64_t this_ptr, uint64_t val) { LDKChannelManagerReadArgs this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKKeysInterface val_conv = *(LDKKeysInterface*)(val_ptr); if (val_conv.free == LDKKeysInterface_JCalls_free) { @@ -27883,22 +26483,24 @@ void __attribute__((export_name("TS_ChannelManagerReadArgs_set_keys_manager"))) ChannelManagerReadArgs_set_keys_manager(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelManagerReadArgs_get_fee_estimator"))) TS_ChannelManagerReadArgs_get_fee_estimator(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelManagerReadArgs_get_fee_estimator"))) TS_ChannelManagerReadArgs_get_fee_estimator(uint64_t this_ptr) { LDKChannelManagerReadArgs this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; // WARNING: This object doesn't live past this scope, needs clone! - uint32_t ret_ret = ((uintptr_t)ChannelManagerReadArgs_get_fee_estimator(&this_ptr_conv)) | 1; + uint64_t ret_ret = tag_ptr(ChannelManagerReadArgs_get_fee_estimator(&this_ptr_conv), false); return ret_ret; } -void __attribute__((export_name("TS_ChannelManagerReadArgs_set_fee_estimator"))) TS_ChannelManagerReadArgs_set_fee_estimator(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelManagerReadArgs_set_fee_estimator"))) TS_ChannelManagerReadArgs_set_fee_estimator(uint64_t this_ptr, uint64_t val) { LDKChannelManagerReadArgs this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKFeeEstimator val_conv = *(LDKFeeEstimator*)(val_ptr); if (val_conv.free == LDKFeeEstimator_JCalls_free) { @@ -27908,22 +26510,24 @@ void __attribute__((export_name("TS_ChannelManagerReadArgs_set_fee_estimator")) ChannelManagerReadArgs_set_fee_estimator(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelManagerReadArgs_get_chain_monitor"))) TS_ChannelManagerReadArgs_get_chain_monitor(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelManagerReadArgs_get_chain_monitor"))) TS_ChannelManagerReadArgs_get_chain_monitor(uint64_t this_ptr) { LDKChannelManagerReadArgs this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; // WARNING: This object doesn't live past this scope, needs clone! - uint32_t ret_ret = ((uintptr_t)ChannelManagerReadArgs_get_chain_monitor(&this_ptr_conv)) | 1; + uint64_t ret_ret = tag_ptr(ChannelManagerReadArgs_get_chain_monitor(&this_ptr_conv), false); return ret_ret; } -void __attribute__((export_name("TS_ChannelManagerReadArgs_set_chain_monitor"))) TS_ChannelManagerReadArgs_set_chain_monitor(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelManagerReadArgs_set_chain_monitor"))) TS_ChannelManagerReadArgs_set_chain_monitor(uint64_t this_ptr, uint64_t val) { LDKChannelManagerReadArgs this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKWatch val_conv = *(LDKWatch*)(val_ptr); if (val_conv.free == LDKWatch_JCalls_free) { @@ -27933,22 +26537,24 @@ void __attribute__((export_name("TS_ChannelManagerReadArgs_set_chain_monitor")) ChannelManagerReadArgs_set_chain_monitor(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelManagerReadArgs_get_tx_broadcaster"))) TS_ChannelManagerReadArgs_get_tx_broadcaster(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelManagerReadArgs_get_tx_broadcaster"))) TS_ChannelManagerReadArgs_get_tx_broadcaster(uint64_t this_ptr) { LDKChannelManagerReadArgs this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; // WARNING: This object doesn't live past this scope, needs clone! - uint32_t ret_ret = ((uintptr_t)ChannelManagerReadArgs_get_tx_broadcaster(&this_ptr_conv)) | 1; + uint64_t ret_ret = tag_ptr(ChannelManagerReadArgs_get_tx_broadcaster(&this_ptr_conv), false); return ret_ret; } -void __attribute__((export_name("TS_ChannelManagerReadArgs_set_tx_broadcaster"))) TS_ChannelManagerReadArgs_set_tx_broadcaster(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelManagerReadArgs_set_tx_broadcaster"))) TS_ChannelManagerReadArgs_set_tx_broadcaster(uint64_t this_ptr, uint64_t val) { LDKChannelManagerReadArgs this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKBroadcasterInterface val_conv = *(LDKBroadcasterInterface*)(val_ptr); if (val_conv.free == LDKBroadcasterInterface_JCalls_free) { @@ -27958,22 +26564,24 @@ void __attribute__((export_name("TS_ChannelManagerReadArgs_set_tx_broadcaster") ChannelManagerReadArgs_set_tx_broadcaster(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelManagerReadArgs_get_logger"))) TS_ChannelManagerReadArgs_get_logger(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelManagerReadArgs_get_logger"))) TS_ChannelManagerReadArgs_get_logger(uint64_t this_ptr) { LDKChannelManagerReadArgs this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; // WARNING: This object doesn't live past this scope, needs clone! - uint32_t ret_ret = ((uintptr_t)ChannelManagerReadArgs_get_logger(&this_ptr_conv)) | 1; + uint64_t ret_ret = tag_ptr(ChannelManagerReadArgs_get_logger(&this_ptr_conv), false); return ret_ret; } -void __attribute__((export_name("TS_ChannelManagerReadArgs_set_logger"))) TS_ChannelManagerReadArgs_set_logger(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelManagerReadArgs_set_logger"))) TS_ChannelManagerReadArgs_set_logger(uint64_t this_ptr, uint64_t val) { LDKChannelManagerReadArgs this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKLogger val_conv = *(LDKLogger*)(val_ptr); if (val_conv.free == LDKLogger_JCalls_free) { @@ -27983,66 +26591,63 @@ void __attribute__((export_name("TS_ChannelManagerReadArgs_set_logger"))) TS_Ch ChannelManagerReadArgs_set_logger(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelManagerReadArgs_get_default_config"))) TS_ChannelManagerReadArgs_get_default_config(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelManagerReadArgs_get_default_config"))) TS_ChannelManagerReadArgs_get_default_config(uint64_t this_ptr) { LDKChannelManagerReadArgs this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKUserConfig ret_var = ChannelManagerReadArgs_get_default_config(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelManagerReadArgs_set_default_config"))) TS_ChannelManagerReadArgs_set_default_config(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelManagerReadArgs_set_default_config"))) TS_ChannelManagerReadArgs_set_default_config(uint64_t this_ptr, uint64_t val) { LDKChannelManagerReadArgs this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKUserConfig val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = UserConfig_clone(&val_conv); ChannelManagerReadArgs_set_default_config(&this_ptr_conv, val_conv); } -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*)(((uintptr_t)keys_manager) & ~1); +uint64_t __attribute__((export_name("TS_ChannelManagerReadArgs_new"))) TS_ChannelManagerReadArgs_new(uint64_t keys_manager, uint64_t fee_estimator, uint64_t chain_monitor, uint64_t tx_broadcaster, uint64_t logger, uint64_t default_config, uint64_tArray channel_monitors) { + void* keys_manager_ptr = untag_ptr(keys_manager); CHECK_ACCESS(keys_manager_ptr); LDKKeysInterface keys_manager_conv = *(LDKKeysInterface*)(keys_manager_ptr); if (keys_manager_conv.free == LDKKeysInterface_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKKeysInterface_JCalls_cloned(&keys_manager_conv); } - void* fee_estimator_ptr = (void*)(((uintptr_t)fee_estimator) & ~1); + void* fee_estimator_ptr = untag_ptr(fee_estimator); CHECK_ACCESS(fee_estimator_ptr); LDKFeeEstimator fee_estimator_conv = *(LDKFeeEstimator*)(fee_estimator_ptr); if (fee_estimator_conv.free == LDKFeeEstimator_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKFeeEstimator_JCalls_cloned(&fee_estimator_conv); } - void* chain_monitor_ptr = (void*)(((uintptr_t)chain_monitor) & ~1); + void* chain_monitor_ptr = untag_ptr(chain_monitor); CHECK_ACCESS(chain_monitor_ptr); LDKWatch chain_monitor_conv = *(LDKWatch*)(chain_monitor_ptr); if (chain_monitor_conv.free == LDKWatch_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKWatch_JCalls_cloned(&chain_monitor_conv); } - void* tx_broadcaster_ptr = (void*)(((uintptr_t)tx_broadcaster) & ~1); + void* tx_broadcaster_ptr = untag_ptr(tx_broadcaster); CHECK_ACCESS(tx_broadcaster_ptr); LDKBroadcasterInterface tx_broadcaster_conv = *(LDKBroadcasterInterface*)(tx_broadcaster_ptr); if (tx_broadcaster_conv.free == LDKBroadcasterInterface_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKBroadcasterInterface_JCalls_cloned(&tx_broadcaster_conv); } - void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); + void* logger_ptr = untag_ptr(logger); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); if (logger_conv.free == LDKLogger_JCalls_free) { @@ -28050,8 +26655,8 @@ uint32_t __attribute__((export_name("TS_ChannelManagerReadArgs_new"))) TS_Chann LDKLogger_JCalls_cloned(&logger_conv); } LDKUserConfig default_config_conv; - default_config_conv.inner = (void*)(default_config & (~1)); - default_config_conv.is_owned = (default_config & 1) || (default_config == 0); + default_config_conv.inner = untag_ptr(default_config); + default_config_conv.is_owned = ptr_is_owned(default_config); CHECK_INNER_FIELD_ACCESS_OR_NULL(default_config_conv); default_config_conv = UserConfig_clone(&default_config_conv); LDKCVec_ChannelMonitorZ channel_monitors_constr; @@ -28060,1494 +26665,1474 @@ 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; + uint64_t* channel_monitors_vals = channel_monitors->elems; for (size_t q = 0; q < channel_monitors_constr.datalen; q++) { - uint32_t channel_monitors_conv_16 = channel_monitors_vals[q]; + uint64_t channel_monitors_conv_16 = channel_monitors_vals[q]; LDKChannelMonitor channel_monitors_conv_16_conv; - channel_monitors_conv_16_conv.inner = (void*)(channel_monitors_conv_16 & (~1)); - channel_monitors_conv_16_conv.is_owned = (channel_monitors_conv_16 & 1) || (channel_monitors_conv_16 == 0); + channel_monitors_conv_16_conv.inner = untag_ptr(channel_monitors_conv_16); + channel_monitors_conv_16_conv.is_owned = ptr_is_owned(channel_monitors_conv_16); CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_monitors_conv_16_conv); + channel_monitors_conv_16_conv.is_owned = false; channel_monitors_constr.data[q] = channel_monitors_conv_16_conv; } FREE(channel_monitors); LDKChannelManagerReadArgs ret_var = ChannelManagerReadArgs_new(keys_manager_conv, fee_estimator_conv, chain_monitor_conv, tx_broadcaster_conv, logger_conv, default_config_conv, channel_monitors_constr); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_C2Tuple_BlockHashChannelManagerZ_read"))) TS_C2Tuple_BlockHashChannelManagerZ_read(int8_tArray ser, uint32_t arg) { +uint64_t __attribute__((export_name("TS_C2Tuple_BlockHashChannelManagerZ_read"))) TS_C2Tuple_BlockHashChannelManagerZ_read(int8_tArray ser, uint64_t arg) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; ser_ref.data = ser->elems; LDKChannelManagerReadArgs arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = (arg & 1) || (arg == 0); + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); // WARNING: we need a move here but no clone is available for LDKChannelManagerReadArgs + LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ), "LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ"); *ret_conv = C2Tuple_BlockHashChannelManagerZ_read(ser_ref, arg_conv); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_ExpandedKey_free"))) TS_ExpandedKey_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ExpandedKey_free"))) TS_ExpandedKey_free(uint64_t this_obj) { LDKExpandedKey this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ExpandedKey_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_ExpandedKey_new"))) TS_ExpandedKey_new(int8_tArray key_material) { +uint64_t __attribute__((export_name("TS_ExpandedKey_new"))) TS_ExpandedKey_new(int8_tArray key_material) { unsigned char key_material_arr[32]; CHECK(key_material->arr_len == 32); memcpy(key_material_arr, key_material->elems, 32); FREE(key_material); unsigned char (*key_material_ref)[32] = &key_material_arr; LDKExpandedKey ret_var = ExpandedKey_new(key_material_ref); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_create"))) TS_create(uint32_t keys, uint32_t min_value_msat, int32_t invoice_expiry_delta_secs, uint32_t keys_manager, int64_t current_time) { +uint64_t __attribute__((export_name("TS_create"))) TS_create(uint64_t keys, uint64_t min_value_msat, int32_t invoice_expiry_delta_secs, uint64_t keys_manager, int64_t current_time) { LDKExpandedKey keys_conv; - keys_conv.inner = (void*)(keys & (~1)); - keys_conv.is_owned = false; + keys_conv.inner = untag_ptr(keys); + keys_conv.is_owned = ptr_is_owned(keys); CHECK_INNER_FIELD_ACCESS_OR_NULL(keys_conv); - void* min_value_msat_ptr = (void*)(((uintptr_t)min_value_msat) & ~1); + keys_conv.is_owned = false; + void* min_value_msat_ptr = untag_ptr(min_value_msat); 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*)(((uintptr_t)min_value_msat) & ~1)); - void* keys_manager_ptr = (void*)(((uintptr_t)keys_manager) & ~1); - if (!(keys_manager & 1)) { CHECK_ACCESS(keys_manager_ptr); } + min_value_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(min_value_msat)); + void* keys_manager_ptr = untag_ptr(keys_manager); + if (ptr_is_owned(keys_manager)) { CHECK_ACCESS(keys_manager_ptr); } LDKKeysInterface* keys_manager_conv = (LDKKeysInterface*)keys_manager_ptr; LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ"); *ret_conv = create(&keys_conv, min_value_msat_conv, invoice_expiry_delta_secs, keys_manager_conv, current_time); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_create_from_hash"))) TS_create_from_hash(uint32_t keys, uint32_t min_value_msat, int8_tArray payment_hash, int32_t invoice_expiry_delta_secs, int64_t current_time) { +uint64_t __attribute__((export_name("TS_create_from_hash"))) TS_create_from_hash(uint64_t keys, uint64_t min_value_msat, int8_tArray payment_hash, int32_t invoice_expiry_delta_secs, int64_t current_time) { LDKExpandedKey keys_conv; - keys_conv.inner = (void*)(keys & (~1)); - keys_conv.is_owned = false; + keys_conv.inner = untag_ptr(keys); + keys_conv.is_owned = ptr_is_owned(keys); CHECK_INNER_FIELD_ACCESS_OR_NULL(keys_conv); - void* min_value_msat_ptr = (void*)(((uintptr_t)min_value_msat) & ~1); + keys_conv.is_owned = false; + void* min_value_msat_ptr = untag_ptr(min_value_msat); 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*)(((uintptr_t)min_value_msat) & ~1)); + min_value_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(min_value_msat)); LDKThirtyTwoBytes payment_hash_ref; CHECK(payment_hash->arr_len == 32); memcpy(payment_hash_ref.data, payment_hash->elems, 32); FREE(payment_hash); LDKCResult_PaymentSecretNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretNoneZ), "LDKCResult_PaymentSecretNoneZ"); *ret_conv = create_from_hash(&keys_conv, min_value_msat_conv, payment_hash_ref, invoice_expiry_delta_secs, current_time); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_DecodeError_free"))) TS_DecodeError_free(uint32_t this_obj) { +void __attribute__((export_name("TS_DecodeError_free"))) TS_DecodeError_free(uint64_t this_obj) { LDKDecodeError this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); DecodeError_free(this_obj_conv); } -static inline uintptr_t DecodeError_clone_ptr(LDKDecodeError *NONNULL_PTR arg) { +static inline uint64_t DecodeError_clone_ptr(LDKDecodeError *NONNULL_PTR arg) { LDKDecodeError ret_var = DecodeError_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_DecodeError_clone_ptr"))) TS_DecodeError_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_DecodeError_clone_ptr"))) TS_DecodeError_clone_ptr(uint64_t arg) { LDKDecodeError arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = DecodeError_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = DecodeError_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_DecodeError_clone"))) TS_DecodeError_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_DecodeError_clone"))) TS_DecodeError_clone(uint64_t orig) { LDKDecodeError orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKDecodeError ret_var = DecodeError_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_Init_free"))) TS_Init_free(uint32_t this_obj) { +void __attribute__((export_name("TS_Init_free"))) TS_Init_free(uint64_t this_obj) { LDKInit this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); Init_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_Init_get_features"))) TS_Init_get_features(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_Init_get_features"))) TS_Init_get_features(uint64_t this_ptr) { LDKInit this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKInitFeatures ret_var = Init_get_features(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_Init_set_features"))) TS_Init_set_features(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_Init_set_features"))) TS_Init_set_features(uint64_t this_ptr, uint64_t val) { LDKInit this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKInitFeatures val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = InitFeatures_clone(&val_conv); Init_set_features(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_Init_get_remote_network_address"))) TS_Init_get_remote_network_address(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_Init_get_remote_network_address"))) TS_Init_get_remote_network_address(uint64_t this_ptr) { LDKInit this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCOption_NetAddressZ *ret_copy = MALLOC(sizeof(LDKCOption_NetAddressZ), "LDKCOption_NetAddressZ"); *ret_copy = Init_get_remote_network_address(&this_ptr_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_Init_set_remote_network_address"))) TS_Init_set_remote_network_address(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_Init_set_remote_network_address"))) TS_Init_set_remote_network_address(uint64_t this_ptr, uint64_t val) { LDKInit this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKCOption_NetAddressZ val_conv = *(LDKCOption_NetAddressZ*)(val_ptr); - val_conv = COption_NetAddressZ_clone((LDKCOption_NetAddressZ*)(((uintptr_t)val) & ~1)); + val_conv = COption_NetAddressZ_clone((LDKCOption_NetAddressZ*)untag_ptr(val)); Init_set_remote_network_address(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_Init_new"))) TS_Init_new(uint32_t features_arg, uint32_t remote_network_address_arg) { +uint64_t __attribute__((export_name("TS_Init_new"))) TS_Init_new(uint64_t features_arg, uint64_t remote_network_address_arg) { LDKInitFeatures features_arg_conv; - features_arg_conv.inner = (void*)(features_arg & (~1)); - features_arg_conv.is_owned = (features_arg & 1) || (features_arg == 0); + features_arg_conv.inner = untag_ptr(features_arg); + features_arg_conv.is_owned = ptr_is_owned(features_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(features_arg_conv); features_arg_conv = InitFeatures_clone(&features_arg_conv); - void* remote_network_address_arg_ptr = (void*)(((uintptr_t)remote_network_address_arg) & ~1); + void* remote_network_address_arg_ptr = untag_ptr(remote_network_address_arg); CHECK_ACCESS(remote_network_address_arg_ptr); LDKCOption_NetAddressZ remote_network_address_arg_conv = *(LDKCOption_NetAddressZ*)(remote_network_address_arg_ptr); LDKInit ret_var = Init_new(features_arg_conv, remote_network_address_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t Init_clone_ptr(LDKInit *NONNULL_PTR arg) { +static inline uint64_t Init_clone_ptr(LDKInit *NONNULL_PTR arg) { LDKInit ret_var = Init_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_Init_clone_ptr"))) TS_Init_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_Init_clone_ptr"))) TS_Init_clone_ptr(uint64_t arg) { LDKInit arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = Init_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = Init_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_Init_clone"))) TS_Init_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_Init_clone"))) TS_Init_clone(uint64_t orig) { LDKInit orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKInit ret_var = Init_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ErrorMessage_free"))) TS_ErrorMessage_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ErrorMessage_free"))) TS_ErrorMessage_free(uint64_t this_obj) { LDKErrorMessage this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ErrorMessage_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_ErrorMessage_get_channel_id"))) TS_ErrorMessage_get_channel_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_ErrorMessage_get_channel_id"))) TS_ErrorMessage_get_channel_id(uint64_t this_ptr) { LDKErrorMessage this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *ErrorMessage_get_channel_id(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_ErrorMessage_set_channel_id"))) TS_ErrorMessage_set_channel_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_ErrorMessage_set_channel_id"))) TS_ErrorMessage_set_channel_id(uint64_t this_ptr, int8_tArray val) { LDKErrorMessage this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); ErrorMessage_set_channel_id(&this_ptr_conv, val_ref); } -jstring __attribute__((export_name("TS_ErrorMessage_get_data"))) TS_ErrorMessage_get_data(uint32_t this_ptr) { +jstring __attribute__((export_name("TS_ErrorMessage_get_data"))) TS_ErrorMessage_get_data(uint64_t this_ptr) { LDKErrorMessage this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKStr ret_str = ErrorMessage_get_data(&this_ptr_conv); jstring ret_conv = str_ref_to_ts(ret_str.chars, ret_str.len); Str_free(ret_str); return ret_conv; } -void __attribute__((export_name("TS_ErrorMessage_set_data"))) TS_ErrorMessage_set_data(uint32_t this_ptr, jstring val) { +void __attribute__((export_name("TS_ErrorMessage_set_data"))) TS_ErrorMessage_set_data(uint64_t this_ptr, jstring val) { LDKErrorMessage this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKStr val_conv = str_ref_to_owned_c(val); ErrorMessage_set_data(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ErrorMessage_new"))) TS_ErrorMessage_new(int8_tArray channel_id_arg, jstring data_arg) { +uint64_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); 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t ErrorMessage_clone_ptr(LDKErrorMessage *NONNULL_PTR arg) { +static inline uint64_t ErrorMessage_clone_ptr(LDKErrorMessage *NONNULL_PTR arg) { LDKErrorMessage ret_var = ErrorMessage_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ErrorMessage_clone_ptr"))) TS_ErrorMessage_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ErrorMessage_clone_ptr"))) TS_ErrorMessage_clone_ptr(uint64_t arg) { LDKErrorMessage arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ErrorMessage_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ErrorMessage_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ErrorMessage_clone"))) TS_ErrorMessage_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ErrorMessage_clone"))) TS_ErrorMessage_clone(uint64_t orig) { LDKErrorMessage orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKErrorMessage ret_var = ErrorMessage_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_WarningMessage_free"))) TS_WarningMessage_free(uint32_t this_obj) { +void __attribute__((export_name("TS_WarningMessage_free"))) TS_WarningMessage_free(uint64_t this_obj) { LDKWarningMessage this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); WarningMessage_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_WarningMessage_get_channel_id"))) TS_WarningMessage_get_channel_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_WarningMessage_get_channel_id"))) TS_WarningMessage_get_channel_id(uint64_t this_ptr) { LDKWarningMessage this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *WarningMessage_get_channel_id(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_WarningMessage_set_channel_id"))) TS_WarningMessage_set_channel_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_WarningMessage_set_channel_id"))) TS_WarningMessage_set_channel_id(uint64_t this_ptr, int8_tArray val) { LDKWarningMessage this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); WarningMessage_set_channel_id(&this_ptr_conv, val_ref); } -jstring __attribute__((export_name("TS_WarningMessage_get_data"))) TS_WarningMessage_get_data(uint32_t this_ptr) { +jstring __attribute__((export_name("TS_WarningMessage_get_data"))) TS_WarningMessage_get_data(uint64_t this_ptr) { LDKWarningMessage this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKStr ret_str = WarningMessage_get_data(&this_ptr_conv); jstring ret_conv = str_ref_to_ts(ret_str.chars, ret_str.len); Str_free(ret_str); return ret_conv; } -void __attribute__((export_name("TS_WarningMessage_set_data"))) TS_WarningMessage_set_data(uint32_t this_ptr, jstring val) { +void __attribute__((export_name("TS_WarningMessage_set_data"))) TS_WarningMessage_set_data(uint64_t this_ptr, jstring val) { LDKWarningMessage this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKStr val_conv = str_ref_to_owned_c(val); WarningMessage_set_data(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_WarningMessage_new"))) TS_WarningMessage_new(int8_tArray channel_id_arg, jstring data_arg) { +uint64_t __attribute__((export_name("TS_WarningMessage_new"))) TS_WarningMessage_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); FREE(channel_id_arg); LDKStr data_arg_conv = str_ref_to_owned_c(data_arg); LDKWarningMessage ret_var = WarningMessage_new(channel_id_arg_ref, data_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t WarningMessage_clone_ptr(LDKWarningMessage *NONNULL_PTR arg) { +static inline uint64_t WarningMessage_clone_ptr(LDKWarningMessage *NONNULL_PTR arg) { LDKWarningMessage ret_var = WarningMessage_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_WarningMessage_clone_ptr"))) TS_WarningMessage_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_WarningMessage_clone_ptr"))) TS_WarningMessage_clone_ptr(uint64_t arg) { LDKWarningMessage arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = WarningMessage_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = WarningMessage_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_WarningMessage_clone"))) TS_WarningMessage_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_WarningMessage_clone"))) TS_WarningMessage_clone(uint64_t orig) { LDKWarningMessage orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKWarningMessage ret_var = WarningMessage_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_Ping_free"))) TS_Ping_free(uint32_t this_obj) { +void __attribute__((export_name("TS_Ping_free"))) TS_Ping_free(uint64_t this_obj) { LDKPing this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); Ping_free(this_obj_conv); } -int16_t __attribute__((export_name("TS_Ping_get_ponglen"))) TS_Ping_get_ponglen(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_Ping_get_ponglen"))) TS_Ping_get_ponglen(uint64_t this_ptr) { LDKPing this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = Ping_get_ponglen(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_Ping_set_ponglen"))) TS_Ping_set_ponglen(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_Ping_set_ponglen"))) TS_Ping_set_ponglen(uint64_t this_ptr, int16_t val) { LDKPing this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; Ping_set_ponglen(&this_ptr_conv, val); } -int16_t __attribute__((export_name("TS_Ping_get_byteslen"))) TS_Ping_get_byteslen(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_Ping_get_byteslen"))) TS_Ping_get_byteslen(uint64_t this_ptr) { LDKPing this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = Ping_get_byteslen(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_Ping_set_byteslen"))) TS_Ping_set_byteslen(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_Ping_set_byteslen"))) TS_Ping_set_byteslen(uint64_t this_ptr, int16_t val) { LDKPing this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; Ping_set_byteslen(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_Ping_new"))) TS_Ping_new(int16_t ponglen_arg, int16_t byteslen_arg) { +uint64_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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t Ping_clone_ptr(LDKPing *NONNULL_PTR arg) { +static inline uint64_t Ping_clone_ptr(LDKPing *NONNULL_PTR arg) { LDKPing ret_var = Ping_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_Ping_clone_ptr"))) TS_Ping_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_Ping_clone_ptr"))) TS_Ping_clone_ptr(uint64_t arg) { LDKPing arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = Ping_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = Ping_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_Ping_clone"))) TS_Ping_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_Ping_clone"))) TS_Ping_clone(uint64_t orig) { LDKPing orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKPing ret_var = Ping_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_Pong_free"))) TS_Pong_free(uint32_t this_obj) { +void __attribute__((export_name("TS_Pong_free"))) TS_Pong_free(uint64_t this_obj) { LDKPong this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); Pong_free(this_obj_conv); } -int16_t __attribute__((export_name("TS_Pong_get_byteslen"))) TS_Pong_get_byteslen(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_Pong_get_byteslen"))) TS_Pong_get_byteslen(uint64_t this_ptr) { LDKPong this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = Pong_get_byteslen(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_Pong_set_byteslen"))) TS_Pong_set_byteslen(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_Pong_set_byteslen"))) TS_Pong_set_byteslen(uint64_t this_ptr, int16_t val) { LDKPong this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; Pong_set_byteslen(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_Pong_new"))) TS_Pong_new(int16_t byteslen_arg) { +uint64_t __attribute__((export_name("TS_Pong_new"))) TS_Pong_new(int16_t byteslen_arg) { LDKPong ret_var = Pong_new(byteslen_arg); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t Pong_clone_ptr(LDKPong *NONNULL_PTR arg) { +static inline uint64_t Pong_clone_ptr(LDKPong *NONNULL_PTR arg) { LDKPong ret_var = Pong_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_Pong_clone_ptr"))) TS_Pong_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_Pong_clone_ptr"))) TS_Pong_clone_ptr(uint64_t arg) { LDKPong arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = Pong_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = Pong_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_Pong_clone"))) TS_Pong_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_Pong_clone"))) TS_Pong_clone(uint64_t orig) { LDKPong orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKPong ret_var = Pong_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_OpenChannel_free"))) TS_OpenChannel_free(uint32_t this_obj) { +void __attribute__((export_name("TS_OpenChannel_free"))) TS_OpenChannel_free(uint64_t this_obj) { LDKOpenChannel this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); OpenChannel_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_OpenChannel_get_chain_hash"))) TS_OpenChannel_get_chain_hash(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_OpenChannel_get_chain_hash"))) TS_OpenChannel_get_chain_hash(uint64_t this_ptr) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *OpenChannel_get_chain_hash(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_OpenChannel_set_chain_hash"))) TS_OpenChannel_set_chain_hash(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_OpenChannel_set_chain_hash"))) TS_OpenChannel_set_chain_hash(uint64_t this_ptr, int8_tArray val) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); OpenChannel_set_chain_hash(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_OpenChannel_get_temporary_channel_id"))) TS_OpenChannel_get_temporary_channel_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_OpenChannel_get_temporary_channel_id"))) TS_OpenChannel_get_temporary_channel_id(uint64_t this_ptr) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_OpenChannel_set_temporary_channel_id"))) TS_OpenChannel_set_temporary_channel_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_OpenChannel_set_temporary_channel_id"))) TS_OpenChannel_set_temporary_channel_id(uint64_t this_ptr, int8_tArray val) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); OpenChannel_set_temporary_channel_id(&this_ptr_conv, val_ref); } -int64_t __attribute__((export_name("TS_OpenChannel_get_funding_satoshis"))) TS_OpenChannel_get_funding_satoshis(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_OpenChannel_get_funding_satoshis"))) TS_OpenChannel_get_funding_satoshis(uint64_t this_ptr) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = OpenChannel_get_funding_satoshis(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_OpenChannel_set_funding_satoshis"))) TS_OpenChannel_set_funding_satoshis(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_OpenChannel_set_funding_satoshis"))) TS_OpenChannel_set_funding_satoshis(uint64_t this_ptr, int64_t val) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; OpenChannel_set_funding_satoshis(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_OpenChannel_get_push_msat"))) TS_OpenChannel_get_push_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_OpenChannel_get_push_msat"))) TS_OpenChannel_get_push_msat(uint64_t this_ptr) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = OpenChannel_get_push_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_OpenChannel_set_push_msat"))) TS_OpenChannel_set_push_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_OpenChannel_set_push_msat"))) TS_OpenChannel_set_push_msat(uint64_t this_ptr, int64_t val) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; OpenChannel_set_push_msat(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_OpenChannel_get_dust_limit_satoshis"))) TS_OpenChannel_get_dust_limit_satoshis(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_OpenChannel_get_dust_limit_satoshis"))) TS_OpenChannel_get_dust_limit_satoshis(uint64_t this_ptr) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = OpenChannel_get_dust_limit_satoshis(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_OpenChannel_set_dust_limit_satoshis"))) TS_OpenChannel_set_dust_limit_satoshis(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_OpenChannel_set_dust_limit_satoshis"))) TS_OpenChannel_set_dust_limit_satoshis(uint64_t this_ptr, int64_t val) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; OpenChannel_set_dust_limit_satoshis(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_OpenChannel_get_max_htlc_value_in_flight_msat"))) TS_OpenChannel_get_max_htlc_value_in_flight_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_OpenChannel_get_max_htlc_value_in_flight_msat"))) TS_OpenChannel_get_max_htlc_value_in_flight_msat(uint64_t this_ptr) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = OpenChannel_get_max_htlc_value_in_flight_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_OpenChannel_set_max_htlc_value_in_flight_msat"))) TS_OpenChannel_set_max_htlc_value_in_flight_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_OpenChannel_set_max_htlc_value_in_flight_msat"))) TS_OpenChannel_set_max_htlc_value_in_flight_msat(uint64_t this_ptr, int64_t val) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; OpenChannel_set_max_htlc_value_in_flight_msat(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_OpenChannel_get_channel_reserve_satoshis"))) TS_OpenChannel_get_channel_reserve_satoshis(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_OpenChannel_get_channel_reserve_satoshis"))) TS_OpenChannel_get_channel_reserve_satoshis(uint64_t this_ptr) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = OpenChannel_get_channel_reserve_satoshis(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_OpenChannel_set_channel_reserve_satoshis"))) TS_OpenChannel_set_channel_reserve_satoshis(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_OpenChannel_set_channel_reserve_satoshis"))) TS_OpenChannel_set_channel_reserve_satoshis(uint64_t this_ptr, int64_t val) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; OpenChannel_set_channel_reserve_satoshis(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_OpenChannel_get_htlc_minimum_msat"))) TS_OpenChannel_get_htlc_minimum_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_OpenChannel_get_htlc_minimum_msat"))) TS_OpenChannel_get_htlc_minimum_msat(uint64_t this_ptr) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = OpenChannel_get_htlc_minimum_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_OpenChannel_set_htlc_minimum_msat"))) TS_OpenChannel_set_htlc_minimum_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_OpenChannel_set_htlc_minimum_msat"))) TS_OpenChannel_set_htlc_minimum_msat(uint64_t this_ptr, int64_t val) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; OpenChannel_set_htlc_minimum_msat(&this_ptr_conv, val); } -int32_t __attribute__((export_name("TS_OpenChannel_get_feerate_per_kw"))) TS_OpenChannel_get_feerate_per_kw(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_OpenChannel_get_feerate_per_kw"))) TS_OpenChannel_get_feerate_per_kw(uint64_t this_ptr) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = OpenChannel_get_feerate_per_kw(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_OpenChannel_set_feerate_per_kw"))) TS_OpenChannel_set_feerate_per_kw(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_OpenChannel_set_feerate_per_kw"))) TS_OpenChannel_set_feerate_per_kw(uint64_t this_ptr, int32_t val) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; OpenChannel_set_feerate_per_kw(&this_ptr_conv, val); } -int16_t __attribute__((export_name("TS_OpenChannel_get_to_self_delay"))) TS_OpenChannel_get_to_self_delay(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_OpenChannel_get_to_self_delay"))) TS_OpenChannel_get_to_self_delay(uint64_t this_ptr) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = OpenChannel_get_to_self_delay(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_OpenChannel_set_to_self_delay"))) TS_OpenChannel_set_to_self_delay(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_OpenChannel_set_to_self_delay"))) TS_OpenChannel_set_to_self_delay(uint64_t this_ptr, int16_t val) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; OpenChannel_set_to_self_delay(&this_ptr_conv, val); } -int16_t __attribute__((export_name("TS_OpenChannel_get_max_accepted_htlcs"))) TS_OpenChannel_get_max_accepted_htlcs(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_OpenChannel_get_max_accepted_htlcs"))) TS_OpenChannel_get_max_accepted_htlcs(uint64_t this_ptr) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = OpenChannel_get_max_accepted_htlcs(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_OpenChannel_set_max_accepted_htlcs"))) TS_OpenChannel_set_max_accepted_htlcs(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_OpenChannel_set_max_accepted_htlcs"))) TS_OpenChannel_set_max_accepted_htlcs(uint64_t this_ptr, int16_t val) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; OpenChannel_set_max_accepted_htlcs(&this_ptr_conv, val); } -int8_tArray __attribute__((export_name("TS_OpenChannel_get_funding_pubkey"))) TS_OpenChannel_get_funding_pubkey(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_OpenChannel_get_funding_pubkey"))) TS_OpenChannel_get_funding_pubkey(uint64_t this_ptr) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_OpenChannel_set_funding_pubkey"))) TS_OpenChannel_set_funding_pubkey(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_OpenChannel_set_funding_pubkey"))) TS_OpenChannel_set_funding_pubkey(uint64_t this_ptr, int8_tArray val) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); OpenChannel_set_funding_pubkey(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_OpenChannel_get_revocation_basepoint"))) TS_OpenChannel_get_revocation_basepoint(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_OpenChannel_get_revocation_basepoint"))) TS_OpenChannel_get_revocation_basepoint(uint64_t this_ptr) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_OpenChannel_set_revocation_basepoint"))) TS_OpenChannel_set_revocation_basepoint(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_OpenChannel_set_revocation_basepoint"))) TS_OpenChannel_set_revocation_basepoint(uint64_t this_ptr, int8_tArray val) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); OpenChannel_set_revocation_basepoint(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_OpenChannel_get_payment_point"))) TS_OpenChannel_get_payment_point(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_OpenChannel_get_payment_point"))) TS_OpenChannel_get_payment_point(uint64_t this_ptr) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_OpenChannel_set_payment_point"))) TS_OpenChannel_set_payment_point(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_OpenChannel_set_payment_point"))) TS_OpenChannel_set_payment_point(uint64_t this_ptr, int8_tArray val) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); OpenChannel_set_payment_point(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_OpenChannel_get_delayed_payment_basepoint"))) TS_OpenChannel_get_delayed_payment_basepoint(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_OpenChannel_get_delayed_payment_basepoint"))) TS_OpenChannel_get_delayed_payment_basepoint(uint64_t this_ptr) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_OpenChannel_set_delayed_payment_basepoint"))) TS_OpenChannel_set_delayed_payment_basepoint(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_OpenChannel_set_delayed_payment_basepoint"))) TS_OpenChannel_set_delayed_payment_basepoint(uint64_t this_ptr, int8_tArray val) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); OpenChannel_set_delayed_payment_basepoint(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_OpenChannel_get_htlc_basepoint"))) TS_OpenChannel_get_htlc_basepoint(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_OpenChannel_get_htlc_basepoint"))) TS_OpenChannel_get_htlc_basepoint(uint64_t this_ptr) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_OpenChannel_set_htlc_basepoint"))) TS_OpenChannel_set_htlc_basepoint(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_OpenChannel_set_htlc_basepoint"))) TS_OpenChannel_set_htlc_basepoint(uint64_t this_ptr, int8_tArray val) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); OpenChannel_set_htlc_basepoint(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_OpenChannel_get_first_per_commitment_point"))) TS_OpenChannel_get_first_per_commitment_point(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_OpenChannel_get_first_per_commitment_point"))) TS_OpenChannel_get_first_per_commitment_point(uint64_t this_ptr) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_OpenChannel_set_first_per_commitment_point"))) TS_OpenChannel_set_first_per_commitment_point(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_OpenChannel_set_first_per_commitment_point"))) TS_OpenChannel_set_first_per_commitment_point(uint64_t this_ptr, int8_tArray val) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); OpenChannel_set_first_per_commitment_point(&this_ptr_conv, val_ref); } -int8_t __attribute__((export_name("TS_OpenChannel_get_channel_flags"))) TS_OpenChannel_get_channel_flags(uint32_t this_ptr) { +int8_t __attribute__((export_name("TS_OpenChannel_get_channel_flags"))) TS_OpenChannel_get_channel_flags(uint64_t this_ptr) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_t ret_conv = OpenChannel_get_channel_flags(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_OpenChannel_set_channel_flags"))) TS_OpenChannel_set_channel_flags(uint32_t this_ptr, int8_t val) { +void __attribute__((export_name("TS_OpenChannel_set_channel_flags"))) TS_OpenChannel_set_channel_flags(uint64_t this_ptr, int8_t val) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; OpenChannel_set_channel_flags(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_OpenChannel_get_channel_type"))) TS_OpenChannel_get_channel_type(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_OpenChannel_get_channel_type"))) TS_OpenChannel_get_channel_type(uint64_t this_ptr) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelTypeFeatures ret_var = OpenChannel_get_channel_type(&this_ptr_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_OpenChannel_set_channel_type"))) TS_OpenChannel_set_channel_type(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_OpenChannel_set_channel_type"))) TS_OpenChannel_set_channel_type(uint64_t this_ptr, uint64_t val) { LDKOpenChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelTypeFeatures val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = ChannelTypeFeatures_clone(&val_conv); OpenChannel_set_channel_type(&this_ptr_conv, val_conv); } -static inline uintptr_t OpenChannel_clone_ptr(LDKOpenChannel *NONNULL_PTR arg) { +static inline uint64_t OpenChannel_clone_ptr(LDKOpenChannel *NONNULL_PTR arg) { LDKOpenChannel ret_var = OpenChannel_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_OpenChannel_clone_ptr"))) TS_OpenChannel_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_OpenChannel_clone_ptr"))) TS_OpenChannel_clone_ptr(uint64_t arg) { LDKOpenChannel arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = OpenChannel_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = OpenChannel_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_OpenChannel_clone"))) TS_OpenChannel_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_OpenChannel_clone"))) TS_OpenChannel_clone(uint64_t orig) { LDKOpenChannel orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKOpenChannel ret_var = OpenChannel_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_AcceptChannel_free"))) TS_AcceptChannel_free(uint32_t this_obj) { +void __attribute__((export_name("TS_AcceptChannel_free"))) TS_AcceptChannel_free(uint64_t this_obj) { LDKAcceptChannel this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); AcceptChannel_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_AcceptChannel_get_temporary_channel_id"))) TS_AcceptChannel_get_temporary_channel_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_AcceptChannel_get_temporary_channel_id"))) TS_AcceptChannel_get_temporary_channel_id(uint64_t this_ptr) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_AcceptChannel_set_temporary_channel_id"))) TS_AcceptChannel_set_temporary_channel_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_AcceptChannel_set_temporary_channel_id"))) TS_AcceptChannel_set_temporary_channel_id(uint64_t this_ptr, int8_tArray val) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); AcceptChannel_set_temporary_channel_id(&this_ptr_conv, val_ref); } -int64_t __attribute__((export_name("TS_AcceptChannel_get_dust_limit_satoshis"))) TS_AcceptChannel_get_dust_limit_satoshis(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_AcceptChannel_get_dust_limit_satoshis"))) TS_AcceptChannel_get_dust_limit_satoshis(uint64_t this_ptr) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = AcceptChannel_get_dust_limit_satoshis(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_AcceptChannel_set_dust_limit_satoshis"))) TS_AcceptChannel_set_dust_limit_satoshis(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_AcceptChannel_set_dust_limit_satoshis"))) TS_AcceptChannel_set_dust_limit_satoshis(uint64_t this_ptr, int64_t val) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; AcceptChannel_set_dust_limit_satoshis(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_AcceptChannel_get_max_htlc_value_in_flight_msat"))) TS_AcceptChannel_get_max_htlc_value_in_flight_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_AcceptChannel_get_max_htlc_value_in_flight_msat"))) TS_AcceptChannel_get_max_htlc_value_in_flight_msat(uint64_t this_ptr) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = AcceptChannel_get_max_htlc_value_in_flight_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_AcceptChannel_set_max_htlc_value_in_flight_msat"))) TS_AcceptChannel_set_max_htlc_value_in_flight_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_AcceptChannel_set_max_htlc_value_in_flight_msat"))) TS_AcceptChannel_set_max_htlc_value_in_flight_msat(uint64_t this_ptr, int64_t val) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; AcceptChannel_set_max_htlc_value_in_flight_msat(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_AcceptChannel_get_channel_reserve_satoshis"))) TS_AcceptChannel_get_channel_reserve_satoshis(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_AcceptChannel_get_channel_reserve_satoshis"))) TS_AcceptChannel_get_channel_reserve_satoshis(uint64_t this_ptr) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = AcceptChannel_get_channel_reserve_satoshis(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_AcceptChannel_set_channel_reserve_satoshis"))) TS_AcceptChannel_set_channel_reserve_satoshis(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_AcceptChannel_set_channel_reserve_satoshis"))) TS_AcceptChannel_set_channel_reserve_satoshis(uint64_t this_ptr, int64_t val) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; AcceptChannel_set_channel_reserve_satoshis(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_AcceptChannel_get_htlc_minimum_msat"))) TS_AcceptChannel_get_htlc_minimum_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_AcceptChannel_get_htlc_minimum_msat"))) TS_AcceptChannel_get_htlc_minimum_msat(uint64_t this_ptr) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = AcceptChannel_get_htlc_minimum_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_AcceptChannel_set_htlc_minimum_msat"))) TS_AcceptChannel_set_htlc_minimum_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_AcceptChannel_set_htlc_minimum_msat"))) TS_AcceptChannel_set_htlc_minimum_msat(uint64_t this_ptr, int64_t val) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; AcceptChannel_set_htlc_minimum_msat(&this_ptr_conv, val); } -int32_t __attribute__((export_name("TS_AcceptChannel_get_minimum_depth"))) TS_AcceptChannel_get_minimum_depth(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_AcceptChannel_get_minimum_depth"))) TS_AcceptChannel_get_minimum_depth(uint64_t this_ptr) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = AcceptChannel_get_minimum_depth(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_AcceptChannel_set_minimum_depth"))) TS_AcceptChannel_set_minimum_depth(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_AcceptChannel_set_minimum_depth"))) TS_AcceptChannel_set_minimum_depth(uint64_t this_ptr, int32_t val) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; AcceptChannel_set_minimum_depth(&this_ptr_conv, val); } -int16_t __attribute__((export_name("TS_AcceptChannel_get_to_self_delay"))) TS_AcceptChannel_get_to_self_delay(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_AcceptChannel_get_to_self_delay"))) TS_AcceptChannel_get_to_self_delay(uint64_t this_ptr) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = AcceptChannel_get_to_self_delay(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_AcceptChannel_set_to_self_delay"))) TS_AcceptChannel_set_to_self_delay(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_AcceptChannel_set_to_self_delay"))) TS_AcceptChannel_set_to_self_delay(uint64_t this_ptr, int16_t val) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; AcceptChannel_set_to_self_delay(&this_ptr_conv, val); } -int16_t __attribute__((export_name("TS_AcceptChannel_get_max_accepted_htlcs"))) TS_AcceptChannel_get_max_accepted_htlcs(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_AcceptChannel_get_max_accepted_htlcs"))) TS_AcceptChannel_get_max_accepted_htlcs(uint64_t this_ptr) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = AcceptChannel_get_max_accepted_htlcs(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_AcceptChannel_set_max_accepted_htlcs"))) TS_AcceptChannel_set_max_accepted_htlcs(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_AcceptChannel_set_max_accepted_htlcs"))) TS_AcceptChannel_set_max_accepted_htlcs(uint64_t this_ptr, int16_t val) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; AcceptChannel_set_max_accepted_htlcs(&this_ptr_conv, val); } -int8_tArray __attribute__((export_name("TS_AcceptChannel_get_funding_pubkey"))) TS_AcceptChannel_get_funding_pubkey(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_AcceptChannel_get_funding_pubkey"))) TS_AcceptChannel_get_funding_pubkey(uint64_t this_ptr) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_AcceptChannel_set_funding_pubkey"))) TS_AcceptChannel_set_funding_pubkey(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_AcceptChannel_set_funding_pubkey"))) TS_AcceptChannel_set_funding_pubkey(uint64_t this_ptr, int8_tArray val) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); AcceptChannel_set_funding_pubkey(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_AcceptChannel_get_revocation_basepoint"))) TS_AcceptChannel_get_revocation_basepoint(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_AcceptChannel_get_revocation_basepoint"))) TS_AcceptChannel_get_revocation_basepoint(uint64_t this_ptr) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_AcceptChannel_set_revocation_basepoint"))) TS_AcceptChannel_set_revocation_basepoint(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_AcceptChannel_set_revocation_basepoint"))) TS_AcceptChannel_set_revocation_basepoint(uint64_t this_ptr, int8_tArray val) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); AcceptChannel_set_revocation_basepoint(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_AcceptChannel_get_payment_point"))) TS_AcceptChannel_get_payment_point(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_AcceptChannel_get_payment_point"))) TS_AcceptChannel_get_payment_point(uint64_t this_ptr) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_AcceptChannel_set_payment_point"))) TS_AcceptChannel_set_payment_point(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_AcceptChannel_set_payment_point"))) TS_AcceptChannel_set_payment_point(uint64_t this_ptr, int8_tArray val) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); AcceptChannel_set_payment_point(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_AcceptChannel_get_delayed_payment_basepoint"))) TS_AcceptChannel_get_delayed_payment_basepoint(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_AcceptChannel_get_delayed_payment_basepoint"))) TS_AcceptChannel_get_delayed_payment_basepoint(uint64_t this_ptr) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_AcceptChannel_set_delayed_payment_basepoint"))) TS_AcceptChannel_set_delayed_payment_basepoint(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_AcceptChannel_set_delayed_payment_basepoint"))) TS_AcceptChannel_set_delayed_payment_basepoint(uint64_t this_ptr, int8_tArray val) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); AcceptChannel_set_delayed_payment_basepoint(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_AcceptChannel_get_htlc_basepoint"))) TS_AcceptChannel_get_htlc_basepoint(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_AcceptChannel_get_htlc_basepoint"))) TS_AcceptChannel_get_htlc_basepoint(uint64_t this_ptr) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_AcceptChannel_set_htlc_basepoint"))) TS_AcceptChannel_set_htlc_basepoint(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_AcceptChannel_set_htlc_basepoint"))) TS_AcceptChannel_set_htlc_basepoint(uint64_t this_ptr, int8_tArray val) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); AcceptChannel_set_htlc_basepoint(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_AcceptChannel_get_first_per_commitment_point"))) TS_AcceptChannel_get_first_per_commitment_point(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_AcceptChannel_get_first_per_commitment_point"))) TS_AcceptChannel_get_first_per_commitment_point(uint64_t this_ptr) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_AcceptChannel_set_first_per_commitment_point"))) TS_AcceptChannel_set_first_per_commitment_point(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_AcceptChannel_set_first_per_commitment_point"))) TS_AcceptChannel_set_first_per_commitment_point(uint64_t this_ptr, int8_tArray val) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); AcceptChannel_set_first_per_commitment_point(&this_ptr_conv, val_ref); } -uint32_t __attribute__((export_name("TS_AcceptChannel_get_channel_type"))) TS_AcceptChannel_get_channel_type(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_AcceptChannel_get_channel_type"))) TS_AcceptChannel_get_channel_type(uint64_t this_ptr) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelTypeFeatures ret_var = AcceptChannel_get_channel_type(&this_ptr_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_AcceptChannel_set_channel_type"))) TS_AcceptChannel_set_channel_type(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_AcceptChannel_set_channel_type"))) TS_AcceptChannel_set_channel_type(uint64_t this_ptr, uint64_t val) { LDKAcceptChannel this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelTypeFeatures val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = ChannelTypeFeatures_clone(&val_conv); AcceptChannel_set_channel_type(&this_ptr_conv, val_conv); } -static inline uintptr_t AcceptChannel_clone_ptr(LDKAcceptChannel *NONNULL_PTR arg) { +static inline uint64_t AcceptChannel_clone_ptr(LDKAcceptChannel *NONNULL_PTR arg) { LDKAcceptChannel ret_var = AcceptChannel_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_AcceptChannel_clone_ptr"))) TS_AcceptChannel_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_AcceptChannel_clone_ptr"))) TS_AcceptChannel_clone_ptr(uint64_t arg) { LDKAcceptChannel arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = AcceptChannel_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = AcceptChannel_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_AcceptChannel_clone"))) TS_AcceptChannel_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_AcceptChannel_clone"))) TS_AcceptChannel_clone(uint64_t orig) { LDKAcceptChannel orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKAcceptChannel ret_var = AcceptChannel_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_FundingCreated_free"))) TS_FundingCreated_free(uint32_t this_obj) { +void __attribute__((export_name("TS_FundingCreated_free"))) TS_FundingCreated_free(uint64_t this_obj) { LDKFundingCreated this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); FundingCreated_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_FundingCreated_get_temporary_channel_id"))) TS_FundingCreated_get_temporary_channel_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_FundingCreated_get_temporary_channel_id"))) TS_FundingCreated_get_temporary_channel_id(uint64_t this_ptr) { LDKFundingCreated this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_FundingCreated_set_temporary_channel_id"))) TS_FundingCreated_set_temporary_channel_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_FundingCreated_set_temporary_channel_id"))) TS_FundingCreated_set_temporary_channel_id(uint64_t this_ptr, int8_tArray val) { LDKFundingCreated this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); FundingCreated_set_temporary_channel_id(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_FundingCreated_get_funding_txid"))) TS_FundingCreated_get_funding_txid(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_FundingCreated_get_funding_txid"))) TS_FundingCreated_get_funding_txid(uint64_t this_ptr) { LDKFundingCreated this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *FundingCreated_get_funding_txid(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_FundingCreated_set_funding_txid"))) TS_FundingCreated_set_funding_txid(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_FundingCreated_set_funding_txid"))) TS_FundingCreated_set_funding_txid(uint64_t this_ptr, int8_tArray val) { LDKFundingCreated this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); FundingCreated_set_funding_txid(&this_ptr_conv, val_ref); } -int16_t __attribute__((export_name("TS_FundingCreated_get_funding_output_index"))) TS_FundingCreated_get_funding_output_index(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_FundingCreated_get_funding_output_index"))) TS_FundingCreated_get_funding_output_index(uint64_t this_ptr) { LDKFundingCreated this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = FundingCreated_get_funding_output_index(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_FundingCreated_set_funding_output_index"))) TS_FundingCreated_set_funding_output_index(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_FundingCreated_set_funding_output_index"))) TS_FundingCreated_set_funding_output_index(uint64_t this_ptr, int16_t val) { LDKFundingCreated this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; FundingCreated_set_funding_output_index(&this_ptr_conv, val); } -int8_tArray __attribute__((export_name("TS_FundingCreated_get_signature"))) TS_FundingCreated_get_signature(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_FundingCreated_get_signature"))) TS_FundingCreated_get_signature(uint64_t this_ptr) { LDKFundingCreated this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_FundingCreated_set_signature"))) TS_FundingCreated_set_signature(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_FundingCreated_set_signature"))) TS_FundingCreated_set_signature(uint64_t this_ptr, int8_tArray val) { LDKFundingCreated this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKSignature val_ref; CHECK(val->arr_len == 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) { +uint64_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); FREE(temporary_channel_id_arg); @@ -29558,106 +28143,97 @@ uint32_t __attribute__((export_name("TS_FundingCreated_new"))) TS_FundingCreate CHECK(signature_arg->arr_len == 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t FundingCreated_clone_ptr(LDKFundingCreated *NONNULL_PTR arg) { +static inline uint64_t FundingCreated_clone_ptr(LDKFundingCreated *NONNULL_PTR arg) { LDKFundingCreated ret_var = FundingCreated_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_FundingCreated_clone_ptr"))) TS_FundingCreated_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_FundingCreated_clone_ptr"))) TS_FundingCreated_clone_ptr(uint64_t arg) { LDKFundingCreated arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = FundingCreated_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = FundingCreated_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_FundingCreated_clone"))) TS_FundingCreated_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_FundingCreated_clone"))) TS_FundingCreated_clone(uint64_t orig) { LDKFundingCreated orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKFundingCreated ret_var = FundingCreated_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_FundingSigned_free"))) TS_FundingSigned_free(uint32_t this_obj) { +void __attribute__((export_name("TS_FundingSigned_free"))) TS_FundingSigned_free(uint64_t this_obj) { LDKFundingSigned this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); FundingSigned_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_FundingSigned_get_channel_id"))) TS_FundingSigned_get_channel_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_FundingSigned_get_channel_id"))) TS_FundingSigned_get_channel_id(uint64_t this_ptr) { LDKFundingSigned this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *FundingSigned_get_channel_id(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_FundingSigned_set_channel_id"))) TS_FundingSigned_set_channel_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_FundingSigned_set_channel_id"))) TS_FundingSigned_set_channel_id(uint64_t this_ptr, int8_tArray val) { LDKFundingSigned this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); FundingSigned_set_channel_id(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_FundingSigned_get_signature"))) TS_FundingSigned_get_signature(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_FundingSigned_get_signature"))) TS_FundingSigned_get_signature(uint64_t this_ptr) { LDKFundingSigned this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_FundingSigned_set_signature"))) TS_FundingSigned_set_signature(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_FundingSigned_set_signature"))) TS_FundingSigned_set_signature(uint64_t this_ptr, int8_tArray val) { LDKFundingSigned this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKSignature val_ref; CHECK(val->arr_len == 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) { +uint64_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); FREE(channel_id_arg); @@ -29665,234 +28241,218 @@ uint32_t __attribute__((export_name("TS_FundingSigned_new"))) TS_FundingSigned_ CHECK(signature_arg->arr_len == 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t FundingSigned_clone_ptr(LDKFundingSigned *NONNULL_PTR arg) { +static inline uint64_t FundingSigned_clone_ptr(LDKFundingSigned *NONNULL_PTR arg) { LDKFundingSigned ret_var = FundingSigned_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_FundingSigned_clone_ptr"))) TS_FundingSigned_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_FundingSigned_clone_ptr"))) TS_FundingSigned_clone_ptr(uint64_t arg) { LDKFundingSigned arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = FundingSigned_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = FundingSigned_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_FundingSigned_clone"))) TS_FundingSigned_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_FundingSigned_clone"))) TS_FundingSigned_clone(uint64_t orig) { LDKFundingSigned orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKFundingSigned ret_var = FundingSigned_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelReady_free"))) TS_ChannelReady_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChannelReady_free"))) TS_ChannelReady_free(uint64_t this_obj) { LDKChannelReady this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChannelReady_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_ChannelReady_get_channel_id"))) TS_ChannelReady_get_channel_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_ChannelReady_get_channel_id"))) TS_ChannelReady_get_channel_id(uint64_t this_ptr) { LDKChannelReady this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *ChannelReady_get_channel_id(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_ChannelReady_set_channel_id"))) TS_ChannelReady_set_channel_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_ChannelReady_set_channel_id"))) TS_ChannelReady_set_channel_id(uint64_t this_ptr, int8_tArray val) { LDKChannelReady this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); ChannelReady_set_channel_id(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_ChannelReady_get_next_per_commitment_point"))) TS_ChannelReady_get_next_per_commitment_point(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_ChannelReady_get_next_per_commitment_point"))) TS_ChannelReady_get_next_per_commitment_point(uint64_t this_ptr) { LDKChannelReady this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, ChannelReady_get_next_per_commitment_point(&this_ptr_conv).compressed_form, 33); return ret_arr; } -void __attribute__((export_name("TS_ChannelReady_set_next_per_commitment_point"))) TS_ChannelReady_set_next_per_commitment_point(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_ChannelReady_set_next_per_commitment_point"))) TS_ChannelReady_set_next_per_commitment_point(uint64_t this_ptr, int8_tArray val) { LDKChannelReady this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); ChannelReady_set_next_per_commitment_point(&this_ptr_conv, val_ref); } -uint32_t __attribute__((export_name("TS_ChannelReady_get_short_channel_id_alias"))) TS_ChannelReady_get_short_channel_id_alias(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelReady_get_short_channel_id_alias"))) TS_ChannelReady_get_short_channel_id_alias(uint64_t this_ptr) { LDKChannelReady this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = ChannelReady_get_short_channel_id_alias(&this_ptr_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_ChannelReady_set_short_channel_id_alias"))) TS_ChannelReady_set_short_channel_id_alias(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelReady_set_short_channel_id_alias"))) TS_ChannelReady_set_short_channel_id_alias(uint64_t this_ptr, uint64_t val) { LDKChannelReady this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr); - val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1)); + val_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(val)); ChannelReady_set_short_channel_id_alias(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelReady_new"))) TS_ChannelReady_new(int8_tArray channel_id_arg, int8_tArray next_per_commitment_point_arg, uint32_t short_channel_id_alias_arg) { +uint64_t __attribute__((export_name("TS_ChannelReady_new"))) TS_ChannelReady_new(int8_tArray channel_id_arg, int8_tArray next_per_commitment_point_arg, uint64_t short_channel_id_alias_arg) { LDKThirtyTwoBytes channel_id_arg_ref; CHECK(channel_id_arg->arr_len == 32); memcpy(channel_id_arg_ref.data, channel_id_arg->elems, 32); FREE(channel_id_arg); 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); FREE(next_per_commitment_point_arg); - void* short_channel_id_alias_arg_ptr = (void*)(((uintptr_t)short_channel_id_alias_arg) & ~1); + void* short_channel_id_alias_arg_ptr = untag_ptr(short_channel_id_alias_arg); CHECK_ACCESS(short_channel_id_alias_arg_ptr); LDKCOption_u64Z short_channel_id_alias_arg_conv = *(LDKCOption_u64Z*)(short_channel_id_alias_arg_ptr); - short_channel_id_alias_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)short_channel_id_alias_arg) & ~1)); + short_channel_id_alias_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(short_channel_id_alias_arg)); LDKChannelReady ret_var = ChannelReady_new(channel_id_arg_ref, next_per_commitment_point_arg_ref, short_channel_id_alias_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t ChannelReady_clone_ptr(LDKChannelReady *NONNULL_PTR arg) { +static inline uint64_t ChannelReady_clone_ptr(LDKChannelReady *NONNULL_PTR arg) { LDKChannelReady ret_var = ChannelReady_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelReady_clone_ptr"))) TS_ChannelReady_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ChannelReady_clone_ptr"))) TS_ChannelReady_clone_ptr(uint64_t arg) { LDKChannelReady arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ChannelReady_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ChannelReady_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelReady_clone"))) TS_ChannelReady_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ChannelReady_clone"))) TS_ChannelReady_clone(uint64_t orig) { LDKChannelReady orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKChannelReady ret_var = ChannelReady_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_Shutdown_free"))) TS_Shutdown_free(uint32_t this_obj) { +void __attribute__((export_name("TS_Shutdown_free"))) TS_Shutdown_free(uint64_t this_obj) { LDKShutdown this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); Shutdown_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_Shutdown_get_channel_id"))) TS_Shutdown_get_channel_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_Shutdown_get_channel_id"))) TS_Shutdown_get_channel_id(uint64_t this_ptr) { LDKShutdown this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *Shutdown_get_channel_id(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_Shutdown_set_channel_id"))) TS_Shutdown_set_channel_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_Shutdown_set_channel_id"))) TS_Shutdown_set_channel_id(uint64_t this_ptr, int8_tArray val) { LDKShutdown this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); Shutdown_set_channel_id(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_Shutdown_get_scriptpubkey"))) TS_Shutdown_get_scriptpubkey(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_Shutdown_get_scriptpubkey"))) TS_Shutdown_get_scriptpubkey(uint64_t this_ptr) { LDKShutdown this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKu8slice ret_var = Shutdown_get_scriptpubkey(&this_ptr_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); return ret_arr; } -void __attribute__((export_name("TS_Shutdown_set_scriptpubkey"))) TS_Shutdown_set_scriptpubkey(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_Shutdown_set_scriptpubkey"))) TS_Shutdown_set_scriptpubkey(uint64_t this_ptr, int8_tArray val) { LDKShutdown this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_u8Z val_ref; val_ref.datalen = val->arr_len; val_ref.data = MALLOC(val_ref.datalen, "LDKCVec_u8Z Bytes"); @@ -29900,7 +28460,7 @@ void __attribute__((export_name("TS_Shutdown_set_scriptpubkey"))) TS_Shutdown_s 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) { +uint64_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); FREE(channel_id_arg); @@ -29909,248 +28469,227 @@ uint32_t __attribute__((export_name("TS_Shutdown_new"))) TS_Shutdown_new(int8_t scriptpubkey_arg_ref.data = MALLOC(scriptpubkey_arg_ref.datalen, "LDKCVec_u8Z Bytes"); 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t Shutdown_clone_ptr(LDKShutdown *NONNULL_PTR arg) { +static inline uint64_t Shutdown_clone_ptr(LDKShutdown *NONNULL_PTR arg) { LDKShutdown ret_var = Shutdown_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_Shutdown_clone_ptr"))) TS_Shutdown_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_Shutdown_clone_ptr"))) TS_Shutdown_clone_ptr(uint64_t arg) { LDKShutdown arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = Shutdown_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = Shutdown_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_Shutdown_clone"))) TS_Shutdown_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_Shutdown_clone"))) TS_Shutdown_clone(uint64_t orig) { LDKShutdown orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKShutdown ret_var = Shutdown_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ClosingSignedFeeRange_free"))) TS_ClosingSignedFeeRange_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ClosingSignedFeeRange_free"))) TS_ClosingSignedFeeRange_free(uint64_t this_obj) { LDKClosingSignedFeeRange this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ClosingSignedFeeRange_free(this_obj_conv); } -int64_t __attribute__((export_name("TS_ClosingSignedFeeRange_get_min_fee_satoshis"))) TS_ClosingSignedFeeRange_get_min_fee_satoshis(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ClosingSignedFeeRange_get_min_fee_satoshis"))) TS_ClosingSignedFeeRange_get_min_fee_satoshis(uint64_t this_ptr) { LDKClosingSignedFeeRange this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ClosingSignedFeeRange_get_min_fee_satoshis(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ClosingSignedFeeRange_set_min_fee_satoshis"))) TS_ClosingSignedFeeRange_set_min_fee_satoshis(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ClosingSignedFeeRange_set_min_fee_satoshis"))) TS_ClosingSignedFeeRange_set_min_fee_satoshis(uint64_t this_ptr, int64_t val) { LDKClosingSignedFeeRange this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ClosingSignedFeeRange_set_min_fee_satoshis(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ClosingSignedFeeRange_get_max_fee_satoshis"))) TS_ClosingSignedFeeRange_get_max_fee_satoshis(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ClosingSignedFeeRange_get_max_fee_satoshis"))) TS_ClosingSignedFeeRange_get_max_fee_satoshis(uint64_t this_ptr) { LDKClosingSignedFeeRange this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ClosingSignedFeeRange_get_max_fee_satoshis(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ClosingSignedFeeRange_set_max_fee_satoshis"))) TS_ClosingSignedFeeRange_set_max_fee_satoshis(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ClosingSignedFeeRange_set_max_fee_satoshis"))) TS_ClosingSignedFeeRange_set_max_fee_satoshis(uint64_t this_ptr, int64_t val) { LDKClosingSignedFeeRange this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ClosingSignedFeeRange_set_max_fee_satoshis(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_ClosingSignedFeeRange_new"))) TS_ClosingSignedFeeRange_new(int64_t min_fee_satoshis_arg, int64_t max_fee_satoshis_arg) { +uint64_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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t ClosingSignedFeeRange_clone_ptr(LDKClosingSignedFeeRange *NONNULL_PTR arg) { +static inline uint64_t ClosingSignedFeeRange_clone_ptr(LDKClosingSignedFeeRange *NONNULL_PTR arg) { LDKClosingSignedFeeRange ret_var = ClosingSignedFeeRange_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ClosingSignedFeeRange_clone_ptr"))) TS_ClosingSignedFeeRange_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ClosingSignedFeeRange_clone_ptr"))) TS_ClosingSignedFeeRange_clone_ptr(uint64_t arg) { LDKClosingSignedFeeRange arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ClosingSignedFeeRange_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ClosingSignedFeeRange_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ClosingSignedFeeRange_clone"))) TS_ClosingSignedFeeRange_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ClosingSignedFeeRange_clone"))) TS_ClosingSignedFeeRange_clone(uint64_t orig) { LDKClosingSignedFeeRange orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKClosingSignedFeeRange ret_var = ClosingSignedFeeRange_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ClosingSigned_free"))) TS_ClosingSigned_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ClosingSigned_free"))) TS_ClosingSigned_free(uint64_t this_obj) { LDKClosingSigned this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ClosingSigned_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_ClosingSigned_get_channel_id"))) TS_ClosingSigned_get_channel_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_ClosingSigned_get_channel_id"))) TS_ClosingSigned_get_channel_id(uint64_t this_ptr) { LDKClosingSigned this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *ClosingSigned_get_channel_id(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_ClosingSigned_set_channel_id"))) TS_ClosingSigned_set_channel_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_ClosingSigned_set_channel_id"))) TS_ClosingSigned_set_channel_id(uint64_t this_ptr, int8_tArray val) { LDKClosingSigned this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); ClosingSigned_set_channel_id(&this_ptr_conv, val_ref); } -int64_t __attribute__((export_name("TS_ClosingSigned_get_fee_satoshis"))) TS_ClosingSigned_get_fee_satoshis(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ClosingSigned_get_fee_satoshis"))) TS_ClosingSigned_get_fee_satoshis(uint64_t this_ptr) { LDKClosingSigned this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ClosingSigned_get_fee_satoshis(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ClosingSigned_set_fee_satoshis"))) TS_ClosingSigned_set_fee_satoshis(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ClosingSigned_set_fee_satoshis"))) TS_ClosingSigned_set_fee_satoshis(uint64_t this_ptr, int64_t val) { LDKClosingSigned this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ClosingSigned_set_fee_satoshis(&this_ptr_conv, val); } -int8_tArray __attribute__((export_name("TS_ClosingSigned_get_signature"))) TS_ClosingSigned_get_signature(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_ClosingSigned_get_signature"))) TS_ClosingSigned_get_signature(uint64_t this_ptr) { LDKClosingSigned this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_ClosingSigned_set_signature"))) TS_ClosingSigned_set_signature(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_ClosingSigned_set_signature"))) TS_ClosingSigned_set_signature(uint64_t this_ptr, int8_tArray val) { LDKClosingSigned this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKSignature val_ref; CHECK(val->arr_len == 64); memcpy(val_ref.compact_form, val->elems, 64); FREE(val); ClosingSigned_set_signature(&this_ptr_conv, val_ref); } -uint32_t __attribute__((export_name("TS_ClosingSigned_get_fee_range"))) TS_ClosingSigned_get_fee_range(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ClosingSigned_get_fee_range"))) TS_ClosingSigned_get_fee_range(uint64_t this_ptr) { LDKClosingSigned this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKClosingSignedFeeRange ret_var = ClosingSigned_get_fee_range(&this_ptr_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ClosingSigned_set_fee_range"))) TS_ClosingSigned_set_fee_range(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ClosingSigned_set_fee_range"))) TS_ClosingSigned_set_fee_range(uint64_t this_ptr, uint64_t val) { LDKClosingSigned this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKClosingSignedFeeRange val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = ClosingSignedFeeRange_clone(&val_conv); ClosingSigned_set_fee_range(&this_ptr_conv, val_conv); } -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) { +uint64_t __attribute__((export_name("TS_ClosingSigned_new"))) TS_ClosingSigned_new(int8_tArray channel_id_arg, int64_t fee_satoshis_arg, int8_tArray signature_arg, uint64_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); FREE(channel_id_arg); @@ -30158,267 +28697,262 @@ uint32_t __attribute__((export_name("TS_ClosingSigned_new"))) TS_ClosingSigned_ CHECK(signature_arg->arr_len == 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); + fee_range_arg_conv.inner = untag_ptr(fee_range_arg); + fee_range_arg_conv.is_owned = ptr_is_owned(fee_range_arg); 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t ClosingSigned_clone_ptr(LDKClosingSigned *NONNULL_PTR arg) { +static inline uint64_t ClosingSigned_clone_ptr(LDKClosingSigned *NONNULL_PTR arg) { LDKClosingSigned ret_var = ClosingSigned_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ClosingSigned_clone_ptr"))) TS_ClosingSigned_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ClosingSigned_clone_ptr"))) TS_ClosingSigned_clone_ptr(uint64_t arg) { LDKClosingSigned arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ClosingSigned_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ClosingSigned_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ClosingSigned_clone"))) TS_ClosingSigned_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ClosingSigned_clone"))) TS_ClosingSigned_clone(uint64_t orig) { LDKClosingSigned orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKClosingSigned ret_var = ClosingSigned_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_UpdateAddHTLC_free"))) TS_UpdateAddHTLC_free(uint32_t this_obj) { +void __attribute__((export_name("TS_UpdateAddHTLC_free"))) TS_UpdateAddHTLC_free(uint64_t this_obj) { LDKUpdateAddHTLC this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); UpdateAddHTLC_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_UpdateAddHTLC_get_channel_id"))) TS_UpdateAddHTLC_get_channel_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_UpdateAddHTLC_get_channel_id"))) TS_UpdateAddHTLC_get_channel_id(uint64_t this_ptr) { LDKUpdateAddHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *UpdateAddHTLC_get_channel_id(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_UpdateAddHTLC_set_channel_id"))) TS_UpdateAddHTLC_set_channel_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_UpdateAddHTLC_set_channel_id"))) TS_UpdateAddHTLC_set_channel_id(uint64_t this_ptr, int8_tArray val) { LDKUpdateAddHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); UpdateAddHTLC_set_channel_id(&this_ptr_conv, val_ref); } -int64_t __attribute__((export_name("TS_UpdateAddHTLC_get_htlc_id"))) TS_UpdateAddHTLC_get_htlc_id(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_UpdateAddHTLC_get_htlc_id"))) TS_UpdateAddHTLC_get_htlc_id(uint64_t this_ptr) { LDKUpdateAddHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = UpdateAddHTLC_get_htlc_id(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UpdateAddHTLC_set_htlc_id"))) TS_UpdateAddHTLC_set_htlc_id(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_UpdateAddHTLC_set_htlc_id"))) TS_UpdateAddHTLC_set_htlc_id(uint64_t this_ptr, int64_t val) { LDKUpdateAddHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UpdateAddHTLC_set_htlc_id(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_UpdateAddHTLC_get_amount_msat"))) TS_UpdateAddHTLC_get_amount_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_UpdateAddHTLC_get_amount_msat"))) TS_UpdateAddHTLC_get_amount_msat(uint64_t this_ptr) { LDKUpdateAddHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = UpdateAddHTLC_get_amount_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UpdateAddHTLC_set_amount_msat"))) TS_UpdateAddHTLC_set_amount_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_UpdateAddHTLC_set_amount_msat"))) TS_UpdateAddHTLC_set_amount_msat(uint64_t this_ptr, int64_t val) { LDKUpdateAddHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UpdateAddHTLC_set_amount_msat(&this_ptr_conv, val); } -int8_tArray __attribute__((export_name("TS_UpdateAddHTLC_get_payment_hash"))) TS_UpdateAddHTLC_get_payment_hash(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_UpdateAddHTLC_get_payment_hash"))) TS_UpdateAddHTLC_get_payment_hash(uint64_t this_ptr) { LDKUpdateAddHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *UpdateAddHTLC_get_payment_hash(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_UpdateAddHTLC_set_payment_hash"))) TS_UpdateAddHTLC_set_payment_hash(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_UpdateAddHTLC_set_payment_hash"))) TS_UpdateAddHTLC_set_payment_hash(uint64_t this_ptr, int8_tArray val) { LDKUpdateAddHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); UpdateAddHTLC_set_payment_hash(&this_ptr_conv, val_ref); } -int32_t __attribute__((export_name("TS_UpdateAddHTLC_get_cltv_expiry"))) TS_UpdateAddHTLC_get_cltv_expiry(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_UpdateAddHTLC_get_cltv_expiry"))) TS_UpdateAddHTLC_get_cltv_expiry(uint64_t this_ptr) { LDKUpdateAddHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = UpdateAddHTLC_get_cltv_expiry(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UpdateAddHTLC_set_cltv_expiry"))) TS_UpdateAddHTLC_set_cltv_expiry(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_UpdateAddHTLC_set_cltv_expiry"))) TS_UpdateAddHTLC_set_cltv_expiry(uint64_t this_ptr, int32_t val) { LDKUpdateAddHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UpdateAddHTLC_set_cltv_expiry(&this_ptr_conv, val); } -static inline uintptr_t UpdateAddHTLC_clone_ptr(LDKUpdateAddHTLC *NONNULL_PTR arg) { +static inline uint64_t UpdateAddHTLC_clone_ptr(LDKUpdateAddHTLC *NONNULL_PTR arg) { LDKUpdateAddHTLC ret_var = UpdateAddHTLC_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_UpdateAddHTLC_clone_ptr"))) TS_UpdateAddHTLC_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_UpdateAddHTLC_clone_ptr"))) TS_UpdateAddHTLC_clone_ptr(uint64_t arg) { LDKUpdateAddHTLC arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = UpdateAddHTLC_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = UpdateAddHTLC_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_UpdateAddHTLC_clone"))) TS_UpdateAddHTLC_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_UpdateAddHTLC_clone"))) TS_UpdateAddHTLC_clone(uint64_t orig) { LDKUpdateAddHTLC orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKUpdateAddHTLC ret_var = UpdateAddHTLC_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_UpdateFulfillHTLC_free"))) TS_UpdateFulfillHTLC_free(uint32_t this_obj) { +void __attribute__((export_name("TS_UpdateFulfillHTLC_free"))) TS_UpdateFulfillHTLC_free(uint64_t this_obj) { LDKUpdateFulfillHTLC this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); UpdateFulfillHTLC_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_UpdateFulfillHTLC_get_channel_id"))) TS_UpdateFulfillHTLC_get_channel_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_UpdateFulfillHTLC_get_channel_id"))) TS_UpdateFulfillHTLC_get_channel_id(uint64_t this_ptr) { LDKUpdateFulfillHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *UpdateFulfillHTLC_get_channel_id(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_UpdateFulfillHTLC_set_channel_id"))) TS_UpdateFulfillHTLC_set_channel_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_UpdateFulfillHTLC_set_channel_id"))) TS_UpdateFulfillHTLC_set_channel_id(uint64_t this_ptr, int8_tArray val) { LDKUpdateFulfillHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); UpdateFulfillHTLC_set_channel_id(&this_ptr_conv, val_ref); } -int64_t __attribute__((export_name("TS_UpdateFulfillHTLC_get_htlc_id"))) TS_UpdateFulfillHTLC_get_htlc_id(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_UpdateFulfillHTLC_get_htlc_id"))) TS_UpdateFulfillHTLC_get_htlc_id(uint64_t this_ptr) { LDKUpdateFulfillHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = UpdateFulfillHTLC_get_htlc_id(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UpdateFulfillHTLC_set_htlc_id"))) TS_UpdateFulfillHTLC_set_htlc_id(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_UpdateFulfillHTLC_set_htlc_id"))) TS_UpdateFulfillHTLC_set_htlc_id(uint64_t this_ptr, int64_t val) { LDKUpdateFulfillHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UpdateFulfillHTLC_set_htlc_id(&this_ptr_conv, val); } -int8_tArray __attribute__((export_name("TS_UpdateFulfillHTLC_get_payment_preimage"))) TS_UpdateFulfillHTLC_get_payment_preimage(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_UpdateFulfillHTLC_get_payment_preimage"))) TS_UpdateFulfillHTLC_get_payment_preimage(uint64_t this_ptr) { LDKUpdateFulfillHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *UpdateFulfillHTLC_get_payment_preimage(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_UpdateFulfillHTLC_set_payment_preimage"))) TS_UpdateFulfillHTLC_set_payment_preimage(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_UpdateFulfillHTLC_set_payment_preimage"))) TS_UpdateFulfillHTLC_set_payment_preimage(uint64_t this_ptr, int8_tArray val) { LDKUpdateFulfillHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 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) { +uint64_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); FREE(channel_id_arg); @@ -30426,295 +28960,281 @@ uint32_t __attribute__((export_name("TS_UpdateFulfillHTLC_new"))) TS_UpdateFulf CHECK(payment_preimage_arg->arr_len == 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t UpdateFulfillHTLC_clone_ptr(LDKUpdateFulfillHTLC *NONNULL_PTR arg) { +static inline uint64_t UpdateFulfillHTLC_clone_ptr(LDKUpdateFulfillHTLC *NONNULL_PTR arg) { LDKUpdateFulfillHTLC ret_var = UpdateFulfillHTLC_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_UpdateFulfillHTLC_clone_ptr"))) TS_UpdateFulfillHTLC_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_UpdateFulfillHTLC_clone_ptr"))) TS_UpdateFulfillHTLC_clone_ptr(uint64_t arg) { LDKUpdateFulfillHTLC arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = UpdateFulfillHTLC_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = UpdateFulfillHTLC_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_UpdateFulfillHTLC_clone"))) TS_UpdateFulfillHTLC_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_UpdateFulfillHTLC_clone"))) TS_UpdateFulfillHTLC_clone(uint64_t orig) { LDKUpdateFulfillHTLC orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKUpdateFulfillHTLC ret_var = UpdateFulfillHTLC_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_UpdateFailHTLC_free"))) TS_UpdateFailHTLC_free(uint32_t this_obj) { +void __attribute__((export_name("TS_UpdateFailHTLC_free"))) TS_UpdateFailHTLC_free(uint64_t this_obj) { LDKUpdateFailHTLC this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); UpdateFailHTLC_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_UpdateFailHTLC_get_channel_id"))) TS_UpdateFailHTLC_get_channel_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_UpdateFailHTLC_get_channel_id"))) TS_UpdateFailHTLC_get_channel_id(uint64_t this_ptr) { LDKUpdateFailHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *UpdateFailHTLC_get_channel_id(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_UpdateFailHTLC_set_channel_id"))) TS_UpdateFailHTLC_set_channel_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_UpdateFailHTLC_set_channel_id"))) TS_UpdateFailHTLC_set_channel_id(uint64_t this_ptr, int8_tArray val) { LDKUpdateFailHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); UpdateFailHTLC_set_channel_id(&this_ptr_conv, val_ref); } -int64_t __attribute__((export_name("TS_UpdateFailHTLC_get_htlc_id"))) TS_UpdateFailHTLC_get_htlc_id(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_UpdateFailHTLC_get_htlc_id"))) TS_UpdateFailHTLC_get_htlc_id(uint64_t this_ptr) { LDKUpdateFailHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = UpdateFailHTLC_get_htlc_id(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UpdateFailHTLC_set_htlc_id"))) TS_UpdateFailHTLC_set_htlc_id(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_UpdateFailHTLC_set_htlc_id"))) TS_UpdateFailHTLC_set_htlc_id(uint64_t this_ptr, int64_t val) { LDKUpdateFailHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UpdateFailHTLC_set_htlc_id(&this_ptr_conv, val); } -static inline uintptr_t UpdateFailHTLC_clone_ptr(LDKUpdateFailHTLC *NONNULL_PTR arg) { +static inline uint64_t UpdateFailHTLC_clone_ptr(LDKUpdateFailHTLC *NONNULL_PTR arg) { LDKUpdateFailHTLC ret_var = UpdateFailHTLC_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_UpdateFailHTLC_clone_ptr"))) TS_UpdateFailHTLC_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_UpdateFailHTLC_clone_ptr"))) TS_UpdateFailHTLC_clone_ptr(uint64_t arg) { LDKUpdateFailHTLC arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = UpdateFailHTLC_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = UpdateFailHTLC_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_UpdateFailHTLC_clone"))) TS_UpdateFailHTLC_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_UpdateFailHTLC_clone"))) TS_UpdateFailHTLC_clone(uint64_t orig) { LDKUpdateFailHTLC orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKUpdateFailHTLC ret_var = UpdateFailHTLC_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_UpdateFailMalformedHTLC_free"))) TS_UpdateFailMalformedHTLC_free(uint32_t this_obj) { +void __attribute__((export_name("TS_UpdateFailMalformedHTLC_free"))) TS_UpdateFailMalformedHTLC_free(uint64_t this_obj) { LDKUpdateFailMalformedHTLC this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); UpdateFailMalformedHTLC_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_UpdateFailMalformedHTLC_get_channel_id"))) TS_UpdateFailMalformedHTLC_get_channel_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_UpdateFailMalformedHTLC_get_channel_id"))) TS_UpdateFailMalformedHTLC_get_channel_id(uint64_t this_ptr) { LDKUpdateFailMalformedHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *UpdateFailMalformedHTLC_get_channel_id(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_UpdateFailMalformedHTLC_set_channel_id"))) TS_UpdateFailMalformedHTLC_set_channel_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_UpdateFailMalformedHTLC_set_channel_id"))) TS_UpdateFailMalformedHTLC_set_channel_id(uint64_t this_ptr, int8_tArray val) { LDKUpdateFailMalformedHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); UpdateFailMalformedHTLC_set_channel_id(&this_ptr_conv, val_ref); } -int64_t __attribute__((export_name("TS_UpdateFailMalformedHTLC_get_htlc_id"))) TS_UpdateFailMalformedHTLC_get_htlc_id(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_UpdateFailMalformedHTLC_get_htlc_id"))) TS_UpdateFailMalformedHTLC_get_htlc_id(uint64_t this_ptr) { LDKUpdateFailMalformedHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = UpdateFailMalformedHTLC_get_htlc_id(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UpdateFailMalformedHTLC_set_htlc_id"))) TS_UpdateFailMalformedHTLC_set_htlc_id(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_UpdateFailMalformedHTLC_set_htlc_id"))) TS_UpdateFailMalformedHTLC_set_htlc_id(uint64_t this_ptr, int64_t val) { LDKUpdateFailMalformedHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UpdateFailMalformedHTLC_set_htlc_id(&this_ptr_conv, val); } -int16_t __attribute__((export_name("TS_UpdateFailMalformedHTLC_get_failure_code"))) TS_UpdateFailMalformedHTLC_get_failure_code(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_UpdateFailMalformedHTLC_get_failure_code"))) TS_UpdateFailMalformedHTLC_get_failure_code(uint64_t this_ptr) { LDKUpdateFailMalformedHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = UpdateFailMalformedHTLC_get_failure_code(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UpdateFailMalformedHTLC_set_failure_code"))) TS_UpdateFailMalformedHTLC_set_failure_code(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_UpdateFailMalformedHTLC_set_failure_code"))) TS_UpdateFailMalformedHTLC_set_failure_code(uint64_t this_ptr, int16_t val) { LDKUpdateFailMalformedHTLC this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UpdateFailMalformedHTLC_set_failure_code(&this_ptr_conv, val); } -static inline uintptr_t UpdateFailMalformedHTLC_clone_ptr(LDKUpdateFailMalformedHTLC *NONNULL_PTR arg) { +static inline uint64_t UpdateFailMalformedHTLC_clone_ptr(LDKUpdateFailMalformedHTLC *NONNULL_PTR arg) { LDKUpdateFailMalformedHTLC ret_var = UpdateFailMalformedHTLC_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_UpdateFailMalformedHTLC_clone_ptr"))) TS_UpdateFailMalformedHTLC_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_UpdateFailMalformedHTLC_clone_ptr"))) TS_UpdateFailMalformedHTLC_clone_ptr(uint64_t arg) { LDKUpdateFailMalformedHTLC arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = UpdateFailMalformedHTLC_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = UpdateFailMalformedHTLC_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_UpdateFailMalformedHTLC_clone"))) TS_UpdateFailMalformedHTLC_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_UpdateFailMalformedHTLC_clone"))) TS_UpdateFailMalformedHTLC_clone(uint64_t orig) { LDKUpdateFailMalformedHTLC orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKUpdateFailMalformedHTLC ret_var = UpdateFailMalformedHTLC_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_CommitmentSigned_free"))) TS_CommitmentSigned_free(uint32_t this_obj) { +void __attribute__((export_name("TS_CommitmentSigned_free"))) TS_CommitmentSigned_free(uint64_t this_obj) { LDKCommitmentSigned this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); CommitmentSigned_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_CommitmentSigned_get_channel_id"))) TS_CommitmentSigned_get_channel_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_CommitmentSigned_get_channel_id"))) TS_CommitmentSigned_get_channel_id(uint64_t this_ptr) { LDKCommitmentSigned this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *CommitmentSigned_get_channel_id(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_CommitmentSigned_set_channel_id"))) TS_CommitmentSigned_set_channel_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_CommitmentSigned_set_channel_id"))) TS_CommitmentSigned_set_channel_id(uint64_t this_ptr, int8_tArray val) { LDKCommitmentSigned this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); CommitmentSigned_set_channel_id(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_CommitmentSigned_get_signature"))) TS_CommitmentSigned_get_signature(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_CommitmentSigned_get_signature"))) TS_CommitmentSigned_get_signature(uint64_t this_ptr) { LDKCommitmentSigned this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_CommitmentSigned_set_signature"))) TS_CommitmentSigned_set_signature(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_CommitmentSigned_set_signature"))) TS_CommitmentSigned_set_signature(uint64_t this_ptr, int8_tArray val) { LDKCommitmentSigned this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKSignature val_ref; CHECK(val->arr_len == 64); memcpy(val_ref.compact_form, val->elems, 64); FREE(val); CommitmentSigned_set_signature(&this_ptr_conv, val_ref); } -ptrArray __attribute__((export_name("TS_CommitmentSigned_get_htlc_signatures"))) TS_CommitmentSigned_get_htlc_signatures(uint32_t this_ptr) { +ptrArray __attribute__((export_name("TS_CommitmentSigned_get_htlc_signatures"))) TS_CommitmentSigned_get_htlc_signatures(uint64_t this_ptr) { LDKCommitmentSigned this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_SignatureZ ret_var = CommitmentSigned_get_htlc_signatures(&this_ptr_conv); ptrArray ret_arr = NULL; ret_arr = init_ptrArray(ret_var.datalen, __LINE__); @@ -30729,11 +29249,12 @@ ptrArray __attribute__((export_name("TS_CommitmentSigned_get_htlc_signatures")) return ret_arr; } -void __attribute__((export_name("TS_CommitmentSigned_set_htlc_signatures"))) TS_CommitmentSigned_set_htlc_signatures(uint32_t this_ptr, ptrArray val) { +void __attribute__((export_name("TS_CommitmentSigned_set_htlc_signatures"))) TS_CommitmentSigned_set_htlc_signatures(uint64_t this_ptr, ptrArray val) { LDKCommitmentSigned this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_SignatureZ val_constr; val_constr.datalen = val->arr_len; if (val_constr.datalen > 0) @@ -30752,7 +29273,7 @@ void __attribute__((export_name("TS_CommitmentSigned_set_htlc_signatures"))) TS CommitmentSigned_set_htlc_signatures(&this_ptr_conv, val_constr); } -uint32_t __attribute__((export_name("TS_CommitmentSigned_new"))) TS_CommitmentSigned_new(int8_tArray channel_id_arg, int8_tArray signature_arg, ptrArray htlc_signatures_arg) { +uint64_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); FREE(channel_id_arg); @@ -30775,127 +29296,120 @@ uint32_t __attribute__((export_name("TS_CommitmentSigned_new"))) TS_CommitmentS } FREE(htlc_signatures_arg); LDKCommitmentSigned ret_var = CommitmentSigned_new(channel_id_arg_ref, signature_arg_ref, htlc_signatures_arg_constr); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t CommitmentSigned_clone_ptr(LDKCommitmentSigned *NONNULL_PTR arg) { +static inline uint64_t CommitmentSigned_clone_ptr(LDKCommitmentSigned *NONNULL_PTR arg) { LDKCommitmentSigned ret_var = CommitmentSigned_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_CommitmentSigned_clone_ptr"))) TS_CommitmentSigned_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_CommitmentSigned_clone_ptr"))) TS_CommitmentSigned_clone_ptr(uint64_t arg) { LDKCommitmentSigned arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = CommitmentSigned_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = CommitmentSigned_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CommitmentSigned_clone"))) TS_CommitmentSigned_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_CommitmentSigned_clone"))) TS_CommitmentSigned_clone(uint64_t orig) { LDKCommitmentSigned orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKCommitmentSigned ret_var = CommitmentSigned_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_RevokeAndACK_free"))) TS_RevokeAndACK_free(uint32_t this_obj) { +void __attribute__((export_name("TS_RevokeAndACK_free"))) TS_RevokeAndACK_free(uint64_t this_obj) { LDKRevokeAndACK this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); RevokeAndACK_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_RevokeAndACK_get_channel_id"))) TS_RevokeAndACK_get_channel_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_RevokeAndACK_get_channel_id"))) TS_RevokeAndACK_get_channel_id(uint64_t this_ptr) { LDKRevokeAndACK this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *RevokeAndACK_get_channel_id(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_RevokeAndACK_set_channel_id"))) TS_RevokeAndACK_set_channel_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_RevokeAndACK_set_channel_id"))) TS_RevokeAndACK_set_channel_id(uint64_t this_ptr, int8_tArray val) { LDKRevokeAndACK this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); RevokeAndACK_set_channel_id(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_RevokeAndACK_get_per_commitment_secret"))) TS_RevokeAndACK_get_per_commitment_secret(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_RevokeAndACK_get_per_commitment_secret"))) TS_RevokeAndACK_get_per_commitment_secret(uint64_t this_ptr) { LDKRevokeAndACK this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_RevokeAndACK_set_per_commitment_secret"))) TS_RevokeAndACK_set_per_commitment_secret(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_RevokeAndACK_set_per_commitment_secret"))) TS_RevokeAndACK_set_per_commitment_secret(uint64_t this_ptr, int8_tArray val) { LDKRevokeAndACK this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); RevokeAndACK_set_per_commitment_secret(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_RevokeAndACK_get_next_per_commitment_point"))) TS_RevokeAndACK_get_next_per_commitment_point(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_RevokeAndACK_get_next_per_commitment_point"))) TS_RevokeAndACK_get_next_per_commitment_point(uint64_t this_ptr) { LDKRevokeAndACK this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_RevokeAndACK_set_next_per_commitment_point"))) TS_RevokeAndACK_set_next_per_commitment_point(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_RevokeAndACK_set_next_per_commitment_point"))) TS_RevokeAndACK_set_next_per_commitment_point(uint64_t this_ptr, int8_tArray val) { LDKRevokeAndACK this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 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) { +uint64_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); FREE(channel_id_arg); @@ -30906,206 +29420,188 @@ uint32_t __attribute__((export_name("TS_RevokeAndACK_new"))) TS_RevokeAndACK_ne 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); 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t RevokeAndACK_clone_ptr(LDKRevokeAndACK *NONNULL_PTR arg) { +static inline uint64_t RevokeAndACK_clone_ptr(LDKRevokeAndACK *NONNULL_PTR arg) { LDKRevokeAndACK ret_var = RevokeAndACK_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_RevokeAndACK_clone_ptr"))) TS_RevokeAndACK_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_RevokeAndACK_clone_ptr"))) TS_RevokeAndACK_clone_ptr(uint64_t arg) { LDKRevokeAndACK arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = RevokeAndACK_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = RevokeAndACK_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_RevokeAndACK_clone"))) TS_RevokeAndACK_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_RevokeAndACK_clone"))) TS_RevokeAndACK_clone(uint64_t orig) { LDKRevokeAndACK orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKRevokeAndACK ret_var = RevokeAndACK_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_UpdateFee_free"))) TS_UpdateFee_free(uint32_t this_obj) { +void __attribute__((export_name("TS_UpdateFee_free"))) TS_UpdateFee_free(uint64_t this_obj) { LDKUpdateFee this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); UpdateFee_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_UpdateFee_get_channel_id"))) TS_UpdateFee_get_channel_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_UpdateFee_get_channel_id"))) TS_UpdateFee_get_channel_id(uint64_t this_ptr) { LDKUpdateFee this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *UpdateFee_get_channel_id(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_UpdateFee_set_channel_id"))) TS_UpdateFee_set_channel_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_UpdateFee_set_channel_id"))) TS_UpdateFee_set_channel_id(uint64_t this_ptr, int8_tArray val) { LDKUpdateFee this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); UpdateFee_set_channel_id(&this_ptr_conv, val_ref); } -int32_t __attribute__((export_name("TS_UpdateFee_get_feerate_per_kw"))) TS_UpdateFee_get_feerate_per_kw(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_UpdateFee_get_feerate_per_kw"))) TS_UpdateFee_get_feerate_per_kw(uint64_t this_ptr) { LDKUpdateFee this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = UpdateFee_get_feerate_per_kw(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UpdateFee_set_feerate_per_kw"))) TS_UpdateFee_set_feerate_per_kw(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_UpdateFee_set_feerate_per_kw"))) TS_UpdateFee_set_feerate_per_kw(uint64_t this_ptr, int32_t val) { LDKUpdateFee this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UpdateFee_set_feerate_per_kw(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_UpdateFee_new"))) TS_UpdateFee_new(int8_tArray channel_id_arg, int32_t feerate_per_kw_arg) { +uint64_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); FREE(channel_id_arg); LDKUpdateFee ret_var = UpdateFee_new(channel_id_arg_ref, feerate_per_kw_arg); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t UpdateFee_clone_ptr(LDKUpdateFee *NONNULL_PTR arg) { +static inline uint64_t UpdateFee_clone_ptr(LDKUpdateFee *NONNULL_PTR arg) { LDKUpdateFee ret_var = UpdateFee_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_UpdateFee_clone_ptr"))) TS_UpdateFee_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_UpdateFee_clone_ptr"))) TS_UpdateFee_clone_ptr(uint64_t arg) { LDKUpdateFee arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = UpdateFee_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = UpdateFee_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_UpdateFee_clone"))) TS_UpdateFee_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_UpdateFee_clone"))) TS_UpdateFee_clone(uint64_t orig) { LDKUpdateFee orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKUpdateFee ret_var = UpdateFee_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_DataLossProtect_free"))) TS_DataLossProtect_free(uint32_t this_obj) { +void __attribute__((export_name("TS_DataLossProtect_free"))) TS_DataLossProtect_free(uint64_t this_obj) { LDKDataLossProtect this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); DataLossProtect_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_DataLossProtect_get_your_last_per_commitment_secret"))) TS_DataLossProtect_get_your_last_per_commitment_secret(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_DataLossProtect_get_your_last_per_commitment_secret"))) TS_DataLossProtect_get_your_last_per_commitment_secret(uint64_t this_ptr) { LDKDataLossProtect this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_DataLossProtect_set_your_last_per_commitment_secret"))) TS_DataLossProtect_set_your_last_per_commitment_secret(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_DataLossProtect_set_your_last_per_commitment_secret"))) TS_DataLossProtect_set_your_last_per_commitment_secret(uint64_t this_ptr, int8_tArray val) { LDKDataLossProtect this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); DataLossProtect_set_your_last_per_commitment_secret(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_DataLossProtect_get_my_current_per_commitment_point"))) TS_DataLossProtect_get_my_current_per_commitment_point(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_DataLossProtect_get_my_current_per_commitment_point"))) TS_DataLossProtect_get_my_current_per_commitment_point(uint64_t this_ptr) { LDKDataLossProtect this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_DataLossProtect_set_my_current_per_commitment_point"))) TS_DataLossProtect_set_my_current_per_commitment_point(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_DataLossProtect_set_my_current_per_commitment_point"))) TS_DataLossProtect_set_my_current_per_commitment_point(uint64_t this_ptr, int8_tArray val) { LDKDataLossProtect this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 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) { +uint64_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); FREE(your_last_per_commitment_secret_arg); @@ -31113,245 +29609,238 @@ uint32_t __attribute__((export_name("TS_DataLossProtect_new"))) TS_DataLossProt 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); 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t DataLossProtect_clone_ptr(LDKDataLossProtect *NONNULL_PTR arg) { +static inline uint64_t DataLossProtect_clone_ptr(LDKDataLossProtect *NONNULL_PTR arg) { LDKDataLossProtect ret_var = DataLossProtect_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_DataLossProtect_clone_ptr"))) TS_DataLossProtect_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_DataLossProtect_clone_ptr"))) TS_DataLossProtect_clone_ptr(uint64_t arg) { LDKDataLossProtect arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = DataLossProtect_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = DataLossProtect_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_DataLossProtect_clone"))) TS_DataLossProtect_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_DataLossProtect_clone"))) TS_DataLossProtect_clone(uint64_t orig) { LDKDataLossProtect orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKDataLossProtect ret_var = DataLossProtect_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelReestablish_free"))) TS_ChannelReestablish_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChannelReestablish_free"))) TS_ChannelReestablish_free(uint64_t this_obj) { LDKChannelReestablish this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChannelReestablish_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_ChannelReestablish_get_channel_id"))) TS_ChannelReestablish_get_channel_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_ChannelReestablish_get_channel_id"))) TS_ChannelReestablish_get_channel_id(uint64_t this_ptr) { LDKChannelReestablish this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *ChannelReestablish_get_channel_id(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_ChannelReestablish_set_channel_id"))) TS_ChannelReestablish_set_channel_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_ChannelReestablish_set_channel_id"))) TS_ChannelReestablish_set_channel_id(uint64_t this_ptr, int8_tArray val) { LDKChannelReestablish this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); ChannelReestablish_set_channel_id(&this_ptr_conv, val_ref); } -int64_t __attribute__((export_name("TS_ChannelReestablish_get_next_local_commitment_number"))) TS_ChannelReestablish_get_next_local_commitment_number(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelReestablish_get_next_local_commitment_number"))) TS_ChannelReestablish_get_next_local_commitment_number(uint64_t this_ptr) { LDKChannelReestablish this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelReestablish_get_next_local_commitment_number(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelReestablish_set_next_local_commitment_number"))) TS_ChannelReestablish_set_next_local_commitment_number(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelReestablish_set_next_local_commitment_number"))) TS_ChannelReestablish_set_next_local_commitment_number(uint64_t this_ptr, int64_t val) { LDKChannelReestablish this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelReestablish_set_next_local_commitment_number(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ChannelReestablish_get_next_remote_commitment_number"))) TS_ChannelReestablish_get_next_remote_commitment_number(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelReestablish_get_next_remote_commitment_number"))) TS_ChannelReestablish_get_next_remote_commitment_number(uint64_t this_ptr) { LDKChannelReestablish this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelReestablish_get_next_remote_commitment_number(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelReestablish_set_next_remote_commitment_number"))) TS_ChannelReestablish_set_next_remote_commitment_number(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelReestablish_set_next_remote_commitment_number"))) TS_ChannelReestablish_set_next_remote_commitment_number(uint64_t this_ptr, int64_t val) { LDKChannelReestablish this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelReestablish_set_next_remote_commitment_number(&this_ptr_conv, val); } -static inline uintptr_t ChannelReestablish_clone_ptr(LDKChannelReestablish *NONNULL_PTR arg) { +static inline uint64_t ChannelReestablish_clone_ptr(LDKChannelReestablish *NONNULL_PTR arg) { LDKChannelReestablish ret_var = ChannelReestablish_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelReestablish_clone_ptr"))) TS_ChannelReestablish_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ChannelReestablish_clone_ptr"))) TS_ChannelReestablish_clone_ptr(uint64_t arg) { LDKChannelReestablish arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ChannelReestablish_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ChannelReestablish_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelReestablish_clone"))) TS_ChannelReestablish_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ChannelReestablish_clone"))) TS_ChannelReestablish_clone(uint64_t orig) { LDKChannelReestablish orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKChannelReestablish ret_var = ChannelReestablish_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_AnnouncementSignatures_free"))) TS_AnnouncementSignatures_free(uint32_t this_obj) { +void __attribute__((export_name("TS_AnnouncementSignatures_free"))) TS_AnnouncementSignatures_free(uint64_t this_obj) { LDKAnnouncementSignatures this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); AnnouncementSignatures_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_AnnouncementSignatures_get_channel_id"))) TS_AnnouncementSignatures_get_channel_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_AnnouncementSignatures_get_channel_id"))) TS_AnnouncementSignatures_get_channel_id(uint64_t this_ptr) { LDKAnnouncementSignatures this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *AnnouncementSignatures_get_channel_id(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_AnnouncementSignatures_set_channel_id"))) TS_AnnouncementSignatures_set_channel_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_AnnouncementSignatures_set_channel_id"))) TS_AnnouncementSignatures_set_channel_id(uint64_t this_ptr, int8_tArray val) { LDKAnnouncementSignatures this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); AnnouncementSignatures_set_channel_id(&this_ptr_conv, val_ref); } -int64_t __attribute__((export_name("TS_AnnouncementSignatures_get_short_channel_id"))) TS_AnnouncementSignatures_get_short_channel_id(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_AnnouncementSignatures_get_short_channel_id"))) TS_AnnouncementSignatures_get_short_channel_id(uint64_t this_ptr) { LDKAnnouncementSignatures this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = AnnouncementSignatures_get_short_channel_id(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_AnnouncementSignatures_set_short_channel_id"))) TS_AnnouncementSignatures_set_short_channel_id(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_AnnouncementSignatures_set_short_channel_id"))) TS_AnnouncementSignatures_set_short_channel_id(uint64_t this_ptr, int64_t val) { LDKAnnouncementSignatures this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; AnnouncementSignatures_set_short_channel_id(&this_ptr_conv, val); } -int8_tArray __attribute__((export_name("TS_AnnouncementSignatures_get_node_signature"))) TS_AnnouncementSignatures_get_node_signature(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_AnnouncementSignatures_get_node_signature"))) TS_AnnouncementSignatures_get_node_signature(uint64_t this_ptr) { LDKAnnouncementSignatures this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_AnnouncementSignatures_set_node_signature"))) TS_AnnouncementSignatures_set_node_signature(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_AnnouncementSignatures_set_node_signature"))) TS_AnnouncementSignatures_set_node_signature(uint64_t this_ptr, int8_tArray val) { LDKAnnouncementSignatures this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKSignature val_ref; CHECK(val->arr_len == 64); memcpy(val_ref.compact_form, val->elems, 64); FREE(val); AnnouncementSignatures_set_node_signature(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_AnnouncementSignatures_get_bitcoin_signature"))) TS_AnnouncementSignatures_get_bitcoin_signature(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_AnnouncementSignatures_get_bitcoin_signature"))) TS_AnnouncementSignatures_get_bitcoin_signature(uint64_t this_ptr) { LDKAnnouncementSignatures this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_AnnouncementSignatures_set_bitcoin_signature"))) TS_AnnouncementSignatures_set_bitcoin_signature(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_AnnouncementSignatures_set_bitcoin_signature"))) TS_AnnouncementSignatures_set_bitcoin_signature(uint64_t this_ptr, int8_tArray val) { LDKAnnouncementSignatures this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKSignature val_ref; CHECK(val->arr_len == 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) { +uint64_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); FREE(channel_id_arg); @@ -31362,138 +29851,125 @@ uint32_t __attribute__((export_name("TS_AnnouncementSignatures_new"))) TS_Annou CHECK(bitcoin_signature_arg->arr_len == 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t AnnouncementSignatures_clone_ptr(LDKAnnouncementSignatures *NONNULL_PTR arg) { +static inline uint64_t AnnouncementSignatures_clone_ptr(LDKAnnouncementSignatures *NONNULL_PTR arg) { LDKAnnouncementSignatures ret_var = AnnouncementSignatures_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_AnnouncementSignatures_clone_ptr"))) TS_AnnouncementSignatures_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_AnnouncementSignatures_clone_ptr"))) TS_AnnouncementSignatures_clone_ptr(uint64_t arg) { LDKAnnouncementSignatures arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = AnnouncementSignatures_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = AnnouncementSignatures_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_AnnouncementSignatures_clone"))) TS_AnnouncementSignatures_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_AnnouncementSignatures_clone"))) TS_AnnouncementSignatures_clone(uint64_t orig) { LDKAnnouncementSignatures orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKAnnouncementSignatures ret_var = AnnouncementSignatures_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_NetAddress_free"))) TS_NetAddress_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKNetAddress this_ptr_conv = *(LDKNetAddress*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); NetAddress_free(this_ptr_conv); } -static inline uintptr_t NetAddress_clone_ptr(LDKNetAddress *NONNULL_PTR arg) { +static inline uint64_t NetAddress_clone_ptr(LDKNetAddress *NONNULL_PTR arg) { LDKNetAddress *ret_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress"); *ret_copy = NetAddress_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_NetAddress_clone_ptr"))) TS_NetAddress_clone_ptr(uint32_t arg) { - LDKNetAddress* arg_conv = (LDKNetAddress*)arg; - uint32_t ret_conv = NetAddress_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_NetAddress_clone_ptr"))) TS_NetAddress_clone_ptr(uint64_t arg) { + LDKNetAddress* arg_conv = (LDKNetAddress*)untag_ptr(arg); + int64_t ret_conv = NetAddress_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_NetAddress_clone"))) TS_NetAddress_clone(uint32_t orig) { - LDKNetAddress* orig_conv = (LDKNetAddress*)orig; +uint64_t __attribute__((export_name("TS_NetAddress_clone"))) TS_NetAddress_clone(uint64_t orig) { + LDKNetAddress* orig_conv = (LDKNetAddress*)untag_ptr(orig); LDKNetAddress *ret_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress"); *ret_copy = NetAddress_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_NetAddress_ipv4"))) TS_NetAddress_ipv4(int8_tArray addr, int16_t port) { +uint64_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); FREE(addr); LDKNetAddress *ret_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress"); *ret_copy = NetAddress_ipv4(addr_ref, port); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_NetAddress_ipv6"))) TS_NetAddress_ipv6(int8_tArray addr, int16_t port) { +uint64_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); FREE(addr); LDKNetAddress *ret_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress"); *ret_copy = NetAddress_ipv6(addr_ref, port); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_NetAddress_onion_v2"))) TS_NetAddress_onion_v2(int8_tArray a) { +uint64_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); FREE(a); LDKNetAddress *ret_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress"); *ret_copy = NetAddress_onion_v2(a_ref); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); 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) { +uint64_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); FREE(ed25519_pubkey); LDKNetAddress *ret_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress"); *ret_copy = NetAddress_onion_v3(ed25519_pubkey_ref, checksum, version, port); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_NetAddress_hostname"))) TS_NetAddress_hostname(uint32_t hostname, int16_t port) { +uint64_t __attribute__((export_name("TS_NetAddress_hostname"))) TS_NetAddress_hostname(uint64_t hostname, int16_t port) { LDKHostname hostname_conv; - hostname_conv.inner = (void*)(hostname & (~1)); - hostname_conv.is_owned = (hostname & 1) || (hostname == 0); + hostname_conv.inner = untag_ptr(hostname); + hostname_conv.is_owned = ptr_is_owned(hostname); CHECK_INNER_FIELD_ACCESS_OR_NULL(hostname_conv); hostname_conv = Hostname_clone(&hostname_conv); LDKNetAddress *ret_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress"); *ret_copy = NetAddress_hostname(hostname_conv, port); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -int8_tArray __attribute__((export_name("TS_NetAddress_write"))) TS_NetAddress_write(uint32_t obj) { - LDKNetAddress* obj_conv = (LDKNetAddress*)obj; +int8_tArray __attribute__((export_name("TS_NetAddress_write"))) TS_NetAddress_write(uint64_t obj) { + LDKNetAddress* obj_conv = (LDKNetAddress*)untag_ptr(obj); LDKCVec_u8Z ret_var = NetAddress_write(obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -31501,147 +29977,153 @@ int8_tArray __attribute__((export_name("TS_NetAddress_write"))) TS_NetAddress_w return ret_arr; } -uint32_t __attribute__((export_name("TS_NetAddress_read"))) TS_NetAddress_read(int8_tArray ser) { +uint64_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; LDKCResult_NetAddressDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetAddressDecodeErrorZ), "LDKCResult_NetAddressDecodeErrorZ"); *ret_conv = NetAddress_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_UnsignedNodeAnnouncement_free"))) TS_UnsignedNodeAnnouncement_free(uint32_t this_obj) { +void __attribute__((export_name("TS_UnsignedNodeAnnouncement_free"))) TS_UnsignedNodeAnnouncement_free(uint64_t this_obj) { LDKUnsignedNodeAnnouncement this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); UnsignedNodeAnnouncement_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_UnsignedNodeAnnouncement_get_features"))) TS_UnsignedNodeAnnouncement_get_features(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_UnsignedNodeAnnouncement_get_features"))) TS_UnsignedNodeAnnouncement_get_features(uint64_t this_ptr) { LDKUnsignedNodeAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKNodeFeatures ret_var = UnsignedNodeAnnouncement_get_features(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_UnsignedNodeAnnouncement_set_features"))) TS_UnsignedNodeAnnouncement_set_features(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_UnsignedNodeAnnouncement_set_features"))) TS_UnsignedNodeAnnouncement_set_features(uint64_t this_ptr, uint64_t val) { LDKUnsignedNodeAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKNodeFeatures val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = NodeFeatures_clone(&val_conv); UnsignedNodeAnnouncement_set_features(&this_ptr_conv, val_conv); } -int32_t __attribute__((export_name("TS_UnsignedNodeAnnouncement_get_timestamp"))) TS_UnsignedNodeAnnouncement_get_timestamp(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_UnsignedNodeAnnouncement_get_timestamp"))) TS_UnsignedNodeAnnouncement_get_timestamp(uint64_t this_ptr) { LDKUnsignedNodeAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = UnsignedNodeAnnouncement_get_timestamp(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UnsignedNodeAnnouncement_set_timestamp"))) TS_UnsignedNodeAnnouncement_set_timestamp(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_UnsignedNodeAnnouncement_set_timestamp"))) TS_UnsignedNodeAnnouncement_set_timestamp(uint64_t this_ptr, int32_t val) { LDKUnsignedNodeAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UnsignedNodeAnnouncement_set_timestamp(&this_ptr_conv, val); } -int8_tArray __attribute__((export_name("TS_UnsignedNodeAnnouncement_get_node_id"))) TS_UnsignedNodeAnnouncement_get_node_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_UnsignedNodeAnnouncement_get_node_id"))) TS_UnsignedNodeAnnouncement_get_node_id(uint64_t this_ptr) { LDKUnsignedNodeAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_UnsignedNodeAnnouncement_set_node_id"))) TS_UnsignedNodeAnnouncement_set_node_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_UnsignedNodeAnnouncement_set_node_id"))) TS_UnsignedNodeAnnouncement_set_node_id(uint64_t this_ptr, int8_tArray val) { LDKUnsignedNodeAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); UnsignedNodeAnnouncement_set_node_id(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_UnsignedNodeAnnouncement_get_rgb"))) TS_UnsignedNodeAnnouncement_get_rgb(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_UnsignedNodeAnnouncement_get_rgb"))) TS_UnsignedNodeAnnouncement_get_rgb(uint64_t this_ptr) { LDKUnsignedNodeAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(3, __LINE__); memcpy(ret_arr->elems, *UnsignedNodeAnnouncement_get_rgb(&this_ptr_conv), 3); return ret_arr; } -void __attribute__((export_name("TS_UnsignedNodeAnnouncement_set_rgb"))) TS_UnsignedNodeAnnouncement_set_rgb(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_UnsignedNodeAnnouncement_set_rgb"))) TS_UnsignedNodeAnnouncement_set_rgb(uint64_t this_ptr, int8_tArray val) { LDKUnsignedNodeAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThreeBytes val_ref; CHECK(val->arr_len == 3); memcpy(val_ref.data, val->elems, 3); FREE(val); UnsignedNodeAnnouncement_set_rgb(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_UnsignedNodeAnnouncement_get_alias"))) TS_UnsignedNodeAnnouncement_get_alias(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_UnsignedNodeAnnouncement_get_alias"))) TS_UnsignedNodeAnnouncement_get_alias(uint64_t this_ptr) { LDKUnsignedNodeAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *UnsignedNodeAnnouncement_get_alias(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_UnsignedNodeAnnouncement_set_alias"))) TS_UnsignedNodeAnnouncement_set_alias(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_UnsignedNodeAnnouncement_set_alias"))) TS_UnsignedNodeAnnouncement_set_alias(uint64_t this_ptr, int8_tArray val) { LDKUnsignedNodeAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); UnsignedNodeAnnouncement_set_alias(&this_ptr_conv, val_ref); } -uint32_tArray __attribute__((export_name("TS_UnsignedNodeAnnouncement_get_addresses"))) TS_UnsignedNodeAnnouncement_get_addresses(uint32_t this_ptr) { +uint64_tArray __attribute__((export_name("TS_UnsignedNodeAnnouncement_get_addresses"))) TS_UnsignedNodeAnnouncement_get_addresses(uint64_t this_ptr) { LDKUnsignedNodeAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_NetAddressZ ret_var = UnsignedNodeAnnouncement_get_addresses(&this_ptr_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t m = 0; m < ret_var.datalen; m++) { LDKNetAddress *ret_conv_12_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress"); *ret_conv_12_copy = ret_var.data[m]; - uint32_t ret_conv_12_ref = (uintptr_t)ret_conv_12_copy; + uint64_t ret_conv_12_ref = tag_ptr(ret_conv_12_copy, true); ret_arr_ptr[m] = ret_conv_12_ref; } @@ -31649,507 +30131,492 @@ uint32_tArray __attribute__((export_name("TS_UnsignedNodeAnnouncement_get_addre return ret_arr; } -void __attribute__((export_name("TS_UnsignedNodeAnnouncement_set_addresses"))) TS_UnsignedNodeAnnouncement_set_addresses(uint32_t this_ptr, uint32_tArray val) { +void __attribute__((export_name("TS_UnsignedNodeAnnouncement_set_addresses"))) TS_UnsignedNodeAnnouncement_set_addresses(uint64_t this_ptr, uint64_tArray val) { LDKUnsignedNodeAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_NetAddressZ val_constr; val_constr.datalen = val->arr_len; if (val_constr.datalen > 0) val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKNetAddress), "LDKCVec_NetAddressZ Elements"); else val_constr.data = NULL; - uint32_t* val_vals = val->elems; + uint64_t* val_vals = val->elems; for (size_t m = 0; m < val_constr.datalen; m++) { - uint32_t val_conv_12 = val_vals[m]; - void* val_conv_12_ptr = (void*)(((uintptr_t)val_conv_12) & ~1); + uint64_t val_conv_12 = val_vals[m]; + void* val_conv_12_ptr = untag_ptr(val_conv_12); CHECK_ACCESS(val_conv_12_ptr); LDKNetAddress val_conv_12_conv = *(LDKNetAddress*)(val_conv_12_ptr); - val_conv_12_conv = NetAddress_clone((LDKNetAddress*)(((uintptr_t)val_conv_12) & ~1)); + val_conv_12_conv = NetAddress_clone((LDKNetAddress*)untag_ptr(val_conv_12)); val_constr.data[m] = val_conv_12_conv; } FREE(val); UnsignedNodeAnnouncement_set_addresses(&this_ptr_conv, val_constr); } -static inline uintptr_t UnsignedNodeAnnouncement_clone_ptr(LDKUnsignedNodeAnnouncement *NONNULL_PTR arg) { +static inline uint64_t UnsignedNodeAnnouncement_clone_ptr(LDKUnsignedNodeAnnouncement *NONNULL_PTR arg) { LDKUnsignedNodeAnnouncement ret_var = UnsignedNodeAnnouncement_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_UnsignedNodeAnnouncement_clone_ptr"))) TS_UnsignedNodeAnnouncement_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_UnsignedNodeAnnouncement_clone_ptr"))) TS_UnsignedNodeAnnouncement_clone_ptr(uint64_t arg) { LDKUnsignedNodeAnnouncement arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = UnsignedNodeAnnouncement_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = UnsignedNodeAnnouncement_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_UnsignedNodeAnnouncement_clone"))) TS_UnsignedNodeAnnouncement_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_UnsignedNodeAnnouncement_clone"))) TS_UnsignedNodeAnnouncement_clone(uint64_t orig) { LDKUnsignedNodeAnnouncement orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKUnsignedNodeAnnouncement ret_var = UnsignedNodeAnnouncement_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_NodeAnnouncement_free"))) TS_NodeAnnouncement_free(uint32_t this_obj) { +void __attribute__((export_name("TS_NodeAnnouncement_free"))) TS_NodeAnnouncement_free(uint64_t this_obj) { LDKNodeAnnouncement this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); NodeAnnouncement_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_NodeAnnouncement_get_signature"))) TS_NodeAnnouncement_get_signature(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_NodeAnnouncement_get_signature"))) TS_NodeAnnouncement_get_signature(uint64_t this_ptr) { LDKNodeAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_NodeAnnouncement_set_signature"))) TS_NodeAnnouncement_set_signature(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_NodeAnnouncement_set_signature"))) TS_NodeAnnouncement_set_signature(uint64_t this_ptr, int8_tArray val) { LDKNodeAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKSignature val_ref; CHECK(val->arr_len == 64); memcpy(val_ref.compact_form, val->elems, 64); FREE(val); NodeAnnouncement_set_signature(&this_ptr_conv, val_ref); } -uint32_t __attribute__((export_name("TS_NodeAnnouncement_get_contents"))) TS_NodeAnnouncement_get_contents(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_NodeAnnouncement_get_contents"))) TS_NodeAnnouncement_get_contents(uint64_t this_ptr) { LDKNodeAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKUnsignedNodeAnnouncement ret_var = NodeAnnouncement_get_contents(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_NodeAnnouncement_set_contents"))) TS_NodeAnnouncement_set_contents(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_NodeAnnouncement_set_contents"))) TS_NodeAnnouncement_set_contents(uint64_t this_ptr, uint64_t val) { LDKNodeAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKUnsignedNodeAnnouncement val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = UnsignedNodeAnnouncement_clone(&val_conv); NodeAnnouncement_set_contents(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_NodeAnnouncement_new"))) TS_NodeAnnouncement_new(int8_tArray signature_arg, uint32_t contents_arg) { +uint64_t __attribute__((export_name("TS_NodeAnnouncement_new"))) TS_NodeAnnouncement_new(int8_tArray signature_arg, uint64_t contents_arg) { LDKSignature signature_arg_ref; CHECK(signature_arg->arr_len == 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); + contents_arg_conv.inner = untag_ptr(contents_arg); + contents_arg_conv.is_owned = ptr_is_owned(contents_arg); 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t NodeAnnouncement_clone_ptr(LDKNodeAnnouncement *NONNULL_PTR arg) { +static inline uint64_t NodeAnnouncement_clone_ptr(LDKNodeAnnouncement *NONNULL_PTR arg) { LDKNodeAnnouncement ret_var = NodeAnnouncement_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_NodeAnnouncement_clone_ptr"))) TS_NodeAnnouncement_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_NodeAnnouncement_clone_ptr"))) TS_NodeAnnouncement_clone_ptr(uint64_t arg) { LDKNodeAnnouncement arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = NodeAnnouncement_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = NodeAnnouncement_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_NodeAnnouncement_clone"))) TS_NodeAnnouncement_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_NodeAnnouncement_clone"))) TS_NodeAnnouncement_clone(uint64_t orig) { LDKNodeAnnouncement orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKNodeAnnouncement ret_var = NodeAnnouncement_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_UnsignedChannelAnnouncement_free"))) TS_UnsignedChannelAnnouncement_free(uint32_t this_obj) { +void __attribute__((export_name("TS_UnsignedChannelAnnouncement_free"))) TS_UnsignedChannelAnnouncement_free(uint64_t this_obj) { LDKUnsignedChannelAnnouncement this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); UnsignedChannelAnnouncement_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_UnsignedChannelAnnouncement_get_features"))) TS_UnsignedChannelAnnouncement_get_features(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_UnsignedChannelAnnouncement_get_features"))) TS_UnsignedChannelAnnouncement_get_features(uint64_t this_ptr) { LDKUnsignedChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelFeatures ret_var = UnsignedChannelAnnouncement_get_features(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_UnsignedChannelAnnouncement_set_features"))) TS_UnsignedChannelAnnouncement_set_features(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_UnsignedChannelAnnouncement_set_features"))) TS_UnsignedChannelAnnouncement_set_features(uint64_t this_ptr, uint64_t val) { LDKUnsignedChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelFeatures val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = ChannelFeatures_clone(&val_conv); UnsignedChannelAnnouncement_set_features(&this_ptr_conv, val_conv); } -int8_tArray __attribute__((export_name("TS_UnsignedChannelAnnouncement_get_chain_hash"))) TS_UnsignedChannelAnnouncement_get_chain_hash(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_UnsignedChannelAnnouncement_get_chain_hash"))) TS_UnsignedChannelAnnouncement_get_chain_hash(uint64_t this_ptr) { LDKUnsignedChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *UnsignedChannelAnnouncement_get_chain_hash(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_UnsignedChannelAnnouncement_set_chain_hash"))) TS_UnsignedChannelAnnouncement_set_chain_hash(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_UnsignedChannelAnnouncement_set_chain_hash"))) TS_UnsignedChannelAnnouncement_set_chain_hash(uint64_t this_ptr, int8_tArray val) { LDKUnsignedChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); UnsignedChannelAnnouncement_set_chain_hash(&this_ptr_conv, val_ref); } -int64_t __attribute__((export_name("TS_UnsignedChannelAnnouncement_get_short_channel_id"))) TS_UnsignedChannelAnnouncement_get_short_channel_id(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_UnsignedChannelAnnouncement_get_short_channel_id"))) TS_UnsignedChannelAnnouncement_get_short_channel_id(uint64_t this_ptr) { LDKUnsignedChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = UnsignedChannelAnnouncement_get_short_channel_id(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UnsignedChannelAnnouncement_set_short_channel_id"))) TS_UnsignedChannelAnnouncement_set_short_channel_id(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_UnsignedChannelAnnouncement_set_short_channel_id"))) TS_UnsignedChannelAnnouncement_set_short_channel_id(uint64_t this_ptr, int64_t val) { LDKUnsignedChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UnsignedChannelAnnouncement_set_short_channel_id(&this_ptr_conv, val); } -int8_tArray __attribute__((export_name("TS_UnsignedChannelAnnouncement_get_node_id_1"))) TS_UnsignedChannelAnnouncement_get_node_id_1(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_UnsignedChannelAnnouncement_get_node_id_1"))) TS_UnsignedChannelAnnouncement_get_node_id_1(uint64_t this_ptr) { LDKUnsignedChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_UnsignedChannelAnnouncement_set_node_id_1"))) TS_UnsignedChannelAnnouncement_set_node_id_1(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_UnsignedChannelAnnouncement_set_node_id_1"))) TS_UnsignedChannelAnnouncement_set_node_id_1(uint64_t this_ptr, int8_tArray val) { LDKUnsignedChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); UnsignedChannelAnnouncement_set_node_id_1(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_UnsignedChannelAnnouncement_get_node_id_2"))) TS_UnsignedChannelAnnouncement_get_node_id_2(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_UnsignedChannelAnnouncement_get_node_id_2"))) TS_UnsignedChannelAnnouncement_get_node_id_2(uint64_t this_ptr) { LDKUnsignedChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_UnsignedChannelAnnouncement_set_node_id_2"))) TS_UnsignedChannelAnnouncement_set_node_id_2(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_UnsignedChannelAnnouncement_set_node_id_2"))) TS_UnsignedChannelAnnouncement_set_node_id_2(uint64_t this_ptr, int8_tArray val) { LDKUnsignedChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); UnsignedChannelAnnouncement_set_node_id_2(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_UnsignedChannelAnnouncement_get_bitcoin_key_1"))) TS_UnsignedChannelAnnouncement_get_bitcoin_key_1(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_UnsignedChannelAnnouncement_get_bitcoin_key_1"))) TS_UnsignedChannelAnnouncement_get_bitcoin_key_1(uint64_t this_ptr) { LDKUnsignedChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_UnsignedChannelAnnouncement_set_bitcoin_key_1"))) TS_UnsignedChannelAnnouncement_set_bitcoin_key_1(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_UnsignedChannelAnnouncement_set_bitcoin_key_1"))) TS_UnsignedChannelAnnouncement_set_bitcoin_key_1(uint64_t this_ptr, int8_tArray val) { LDKUnsignedChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); UnsignedChannelAnnouncement_set_bitcoin_key_1(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_UnsignedChannelAnnouncement_get_bitcoin_key_2"))) TS_UnsignedChannelAnnouncement_get_bitcoin_key_2(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_UnsignedChannelAnnouncement_get_bitcoin_key_2"))) TS_UnsignedChannelAnnouncement_get_bitcoin_key_2(uint64_t this_ptr) { LDKUnsignedChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_UnsignedChannelAnnouncement_set_bitcoin_key_2"))) TS_UnsignedChannelAnnouncement_set_bitcoin_key_2(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_UnsignedChannelAnnouncement_set_bitcoin_key_2"))) TS_UnsignedChannelAnnouncement_set_bitcoin_key_2(uint64_t this_ptr, int8_tArray val) { LDKUnsignedChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 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) { +static inline uint64_t UnsignedChannelAnnouncement_clone_ptr(LDKUnsignedChannelAnnouncement *NONNULL_PTR arg) { LDKUnsignedChannelAnnouncement ret_var = UnsignedChannelAnnouncement_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_UnsignedChannelAnnouncement_clone_ptr"))) TS_UnsignedChannelAnnouncement_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_UnsignedChannelAnnouncement_clone_ptr"))) TS_UnsignedChannelAnnouncement_clone_ptr(uint64_t arg) { LDKUnsignedChannelAnnouncement arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = UnsignedChannelAnnouncement_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = UnsignedChannelAnnouncement_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_UnsignedChannelAnnouncement_clone"))) TS_UnsignedChannelAnnouncement_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_UnsignedChannelAnnouncement_clone"))) TS_UnsignedChannelAnnouncement_clone(uint64_t orig) { LDKUnsignedChannelAnnouncement orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKUnsignedChannelAnnouncement ret_var = UnsignedChannelAnnouncement_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelAnnouncement_free"))) TS_ChannelAnnouncement_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChannelAnnouncement_free"))) TS_ChannelAnnouncement_free(uint64_t this_obj) { LDKChannelAnnouncement this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChannelAnnouncement_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_ChannelAnnouncement_get_node_signature_1"))) TS_ChannelAnnouncement_get_node_signature_1(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_ChannelAnnouncement_get_node_signature_1"))) TS_ChannelAnnouncement_get_node_signature_1(uint64_t this_ptr) { LDKChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_ChannelAnnouncement_set_node_signature_1"))) TS_ChannelAnnouncement_set_node_signature_1(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_ChannelAnnouncement_set_node_signature_1"))) TS_ChannelAnnouncement_set_node_signature_1(uint64_t this_ptr, int8_tArray val) { LDKChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKSignature val_ref; CHECK(val->arr_len == 64); memcpy(val_ref.compact_form, val->elems, 64); FREE(val); ChannelAnnouncement_set_node_signature_1(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_ChannelAnnouncement_get_node_signature_2"))) TS_ChannelAnnouncement_get_node_signature_2(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_ChannelAnnouncement_get_node_signature_2"))) TS_ChannelAnnouncement_get_node_signature_2(uint64_t this_ptr) { LDKChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_ChannelAnnouncement_set_node_signature_2"))) TS_ChannelAnnouncement_set_node_signature_2(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_ChannelAnnouncement_set_node_signature_2"))) TS_ChannelAnnouncement_set_node_signature_2(uint64_t this_ptr, int8_tArray val) { LDKChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKSignature val_ref; CHECK(val->arr_len == 64); memcpy(val_ref.compact_form, val->elems, 64); FREE(val); ChannelAnnouncement_set_node_signature_2(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_ChannelAnnouncement_get_bitcoin_signature_1"))) TS_ChannelAnnouncement_get_bitcoin_signature_1(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_ChannelAnnouncement_get_bitcoin_signature_1"))) TS_ChannelAnnouncement_get_bitcoin_signature_1(uint64_t this_ptr) { LDKChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_ChannelAnnouncement_set_bitcoin_signature_1"))) TS_ChannelAnnouncement_set_bitcoin_signature_1(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_ChannelAnnouncement_set_bitcoin_signature_1"))) TS_ChannelAnnouncement_set_bitcoin_signature_1(uint64_t this_ptr, int8_tArray val) { LDKChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKSignature val_ref; CHECK(val->arr_len == 64); memcpy(val_ref.compact_form, val->elems, 64); FREE(val); ChannelAnnouncement_set_bitcoin_signature_1(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_ChannelAnnouncement_get_bitcoin_signature_2"))) TS_ChannelAnnouncement_get_bitcoin_signature_2(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_ChannelAnnouncement_get_bitcoin_signature_2"))) TS_ChannelAnnouncement_get_bitcoin_signature_2(uint64_t this_ptr) { LDKChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_ChannelAnnouncement_set_bitcoin_signature_2"))) TS_ChannelAnnouncement_set_bitcoin_signature_2(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_ChannelAnnouncement_set_bitcoin_signature_2"))) TS_ChannelAnnouncement_set_bitcoin_signature_2(uint64_t this_ptr, int8_tArray val) { LDKChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKSignature val_ref; CHECK(val->arr_len == 64); memcpy(val_ref.compact_form, val->elems, 64); FREE(val); ChannelAnnouncement_set_bitcoin_signature_2(&this_ptr_conv, val_ref); } -uint32_t __attribute__((export_name("TS_ChannelAnnouncement_get_contents"))) TS_ChannelAnnouncement_get_contents(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelAnnouncement_get_contents"))) TS_ChannelAnnouncement_get_contents(uint64_t this_ptr) { LDKChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKUnsignedChannelAnnouncement ret_var = ChannelAnnouncement_get_contents(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelAnnouncement_set_contents"))) TS_ChannelAnnouncement_set_contents(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelAnnouncement_set_contents"))) TS_ChannelAnnouncement_set_contents(uint64_t this_ptr, uint64_t val) { LDKChannelAnnouncement this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKUnsignedChannelAnnouncement val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = UnsignedChannelAnnouncement_clone(&val_conv); ChannelAnnouncement_set_contents(&this_ptr_conv, val_conv); } -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) { +uint64_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, uint64_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); FREE(node_signature_1_arg); @@ -32163,230 +30630,236 @@ uint32_t __attribute__((export_name("TS_ChannelAnnouncement_new"))) TS_ChannelA CHECK(bitcoin_signature_2_arg->arr_len == 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); + contents_arg_conv.inner = untag_ptr(contents_arg); + contents_arg_conv.is_owned = ptr_is_owned(contents_arg); 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t ChannelAnnouncement_clone_ptr(LDKChannelAnnouncement *NONNULL_PTR arg) { +static inline uint64_t ChannelAnnouncement_clone_ptr(LDKChannelAnnouncement *NONNULL_PTR arg) { LDKChannelAnnouncement ret_var = ChannelAnnouncement_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelAnnouncement_clone_ptr"))) TS_ChannelAnnouncement_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ChannelAnnouncement_clone_ptr"))) TS_ChannelAnnouncement_clone_ptr(uint64_t arg) { LDKChannelAnnouncement arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ChannelAnnouncement_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ChannelAnnouncement_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelAnnouncement_clone"))) TS_ChannelAnnouncement_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ChannelAnnouncement_clone"))) TS_ChannelAnnouncement_clone(uint64_t orig) { LDKChannelAnnouncement orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKChannelAnnouncement ret_var = ChannelAnnouncement_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_UnsignedChannelUpdate_free"))) TS_UnsignedChannelUpdate_free(uint32_t this_obj) { +void __attribute__((export_name("TS_UnsignedChannelUpdate_free"))) TS_UnsignedChannelUpdate_free(uint64_t this_obj) { LDKUnsignedChannelUpdate this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); UnsignedChannelUpdate_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_UnsignedChannelUpdate_get_chain_hash"))) TS_UnsignedChannelUpdate_get_chain_hash(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_UnsignedChannelUpdate_get_chain_hash"))) TS_UnsignedChannelUpdate_get_chain_hash(uint64_t this_ptr) { LDKUnsignedChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *UnsignedChannelUpdate_get_chain_hash(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_UnsignedChannelUpdate_set_chain_hash"))) TS_UnsignedChannelUpdate_set_chain_hash(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_UnsignedChannelUpdate_set_chain_hash"))) TS_UnsignedChannelUpdate_set_chain_hash(uint64_t this_ptr, int8_tArray val) { LDKUnsignedChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); UnsignedChannelUpdate_set_chain_hash(&this_ptr_conv, val_ref); } -int64_t __attribute__((export_name("TS_UnsignedChannelUpdate_get_short_channel_id"))) TS_UnsignedChannelUpdate_get_short_channel_id(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_UnsignedChannelUpdate_get_short_channel_id"))) TS_UnsignedChannelUpdate_get_short_channel_id(uint64_t this_ptr) { LDKUnsignedChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = UnsignedChannelUpdate_get_short_channel_id(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UnsignedChannelUpdate_set_short_channel_id"))) TS_UnsignedChannelUpdate_set_short_channel_id(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_UnsignedChannelUpdate_set_short_channel_id"))) TS_UnsignedChannelUpdate_set_short_channel_id(uint64_t this_ptr, int64_t val) { LDKUnsignedChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UnsignedChannelUpdate_set_short_channel_id(&this_ptr_conv, val); } -int32_t __attribute__((export_name("TS_UnsignedChannelUpdate_get_timestamp"))) TS_UnsignedChannelUpdate_get_timestamp(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_UnsignedChannelUpdate_get_timestamp"))) TS_UnsignedChannelUpdate_get_timestamp(uint64_t this_ptr) { LDKUnsignedChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = UnsignedChannelUpdate_get_timestamp(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UnsignedChannelUpdate_set_timestamp"))) TS_UnsignedChannelUpdate_set_timestamp(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_UnsignedChannelUpdate_set_timestamp"))) TS_UnsignedChannelUpdate_set_timestamp(uint64_t this_ptr, int32_t val) { LDKUnsignedChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UnsignedChannelUpdate_set_timestamp(&this_ptr_conv, val); } -int8_t __attribute__((export_name("TS_UnsignedChannelUpdate_get_flags"))) TS_UnsignedChannelUpdate_get_flags(uint32_t this_ptr) { +int8_t __attribute__((export_name("TS_UnsignedChannelUpdate_get_flags"))) TS_UnsignedChannelUpdate_get_flags(uint64_t this_ptr) { LDKUnsignedChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_t ret_conv = UnsignedChannelUpdate_get_flags(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UnsignedChannelUpdate_set_flags"))) TS_UnsignedChannelUpdate_set_flags(uint32_t this_ptr, int8_t val) { +void __attribute__((export_name("TS_UnsignedChannelUpdate_set_flags"))) TS_UnsignedChannelUpdate_set_flags(uint64_t this_ptr, int8_t val) { LDKUnsignedChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UnsignedChannelUpdate_set_flags(&this_ptr_conv, val); } -int16_t __attribute__((export_name("TS_UnsignedChannelUpdate_get_cltv_expiry_delta"))) TS_UnsignedChannelUpdate_get_cltv_expiry_delta(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_UnsignedChannelUpdate_get_cltv_expiry_delta"))) TS_UnsignedChannelUpdate_get_cltv_expiry_delta(uint64_t this_ptr) { LDKUnsignedChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = UnsignedChannelUpdate_get_cltv_expiry_delta(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UnsignedChannelUpdate_set_cltv_expiry_delta"))) TS_UnsignedChannelUpdate_set_cltv_expiry_delta(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_UnsignedChannelUpdate_set_cltv_expiry_delta"))) TS_UnsignedChannelUpdate_set_cltv_expiry_delta(uint64_t this_ptr, int16_t val) { LDKUnsignedChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UnsignedChannelUpdate_set_cltv_expiry_delta(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_UnsignedChannelUpdate_get_htlc_minimum_msat"))) TS_UnsignedChannelUpdate_get_htlc_minimum_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_UnsignedChannelUpdate_get_htlc_minimum_msat"))) TS_UnsignedChannelUpdate_get_htlc_minimum_msat(uint64_t this_ptr) { LDKUnsignedChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = UnsignedChannelUpdate_get_htlc_minimum_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UnsignedChannelUpdate_set_htlc_minimum_msat"))) TS_UnsignedChannelUpdate_set_htlc_minimum_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_UnsignedChannelUpdate_set_htlc_minimum_msat"))) TS_UnsignedChannelUpdate_set_htlc_minimum_msat(uint64_t this_ptr, int64_t val) { LDKUnsignedChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UnsignedChannelUpdate_set_htlc_minimum_msat(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_UnsignedChannelUpdate_get_htlc_maximum_msat"))) TS_UnsignedChannelUpdate_get_htlc_maximum_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_UnsignedChannelUpdate_get_htlc_maximum_msat"))) TS_UnsignedChannelUpdate_get_htlc_maximum_msat(uint64_t this_ptr) { LDKUnsignedChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = UnsignedChannelUpdate_get_htlc_maximum_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UnsignedChannelUpdate_set_htlc_maximum_msat"))) TS_UnsignedChannelUpdate_set_htlc_maximum_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_UnsignedChannelUpdate_set_htlc_maximum_msat"))) TS_UnsignedChannelUpdate_set_htlc_maximum_msat(uint64_t this_ptr, int64_t val) { LDKUnsignedChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UnsignedChannelUpdate_set_htlc_maximum_msat(&this_ptr_conv, val); } -int32_t __attribute__((export_name("TS_UnsignedChannelUpdate_get_fee_base_msat"))) TS_UnsignedChannelUpdate_get_fee_base_msat(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_UnsignedChannelUpdate_get_fee_base_msat"))) TS_UnsignedChannelUpdate_get_fee_base_msat(uint64_t this_ptr) { LDKUnsignedChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = UnsignedChannelUpdate_get_fee_base_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UnsignedChannelUpdate_set_fee_base_msat"))) TS_UnsignedChannelUpdate_set_fee_base_msat(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_UnsignedChannelUpdate_set_fee_base_msat"))) TS_UnsignedChannelUpdate_set_fee_base_msat(uint64_t this_ptr, int32_t val) { LDKUnsignedChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UnsignedChannelUpdate_set_fee_base_msat(&this_ptr_conv, val); } -int32_t __attribute__((export_name("TS_UnsignedChannelUpdate_get_fee_proportional_millionths"))) TS_UnsignedChannelUpdate_get_fee_proportional_millionths(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_UnsignedChannelUpdate_get_fee_proportional_millionths"))) TS_UnsignedChannelUpdate_get_fee_proportional_millionths(uint64_t this_ptr) { LDKUnsignedChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = UnsignedChannelUpdate_get_fee_proportional_millionths(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_UnsignedChannelUpdate_set_fee_proportional_millionths"))) TS_UnsignedChannelUpdate_set_fee_proportional_millionths(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_UnsignedChannelUpdate_set_fee_proportional_millionths"))) TS_UnsignedChannelUpdate_set_fee_proportional_millionths(uint64_t this_ptr, int32_t val) { LDKUnsignedChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; UnsignedChannelUpdate_set_fee_proportional_millionths(&this_ptr_conv, val); } -int8_tArray __attribute__((export_name("TS_UnsignedChannelUpdate_get_excess_data"))) TS_UnsignedChannelUpdate_get_excess_data(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_UnsignedChannelUpdate_get_excess_data"))) TS_UnsignedChannelUpdate_get_excess_data(uint64_t this_ptr) { LDKUnsignedChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_u8Z ret_var = UnsignedChannelUpdate_get_excess_data(&this_ptr_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -32394,11 +30867,12 @@ int8_tArray __attribute__((export_name("TS_UnsignedChannelUpdate_get_excess_dat return ret_arr; } -void __attribute__((export_name("TS_UnsignedChannelUpdate_set_excess_data"))) TS_UnsignedChannelUpdate_set_excess_data(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_UnsignedChannelUpdate_set_excess_data"))) TS_UnsignedChannelUpdate_set_excess_data(uint64_t this_ptr, int8_tArray val) { LDKUnsignedChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_u8Z val_ref; val_ref.datalen = val->arr_len; val_ref.data = MALLOC(val_ref.datalen, "LDKCVec_u8Z Bytes"); @@ -32406,7 +30880,7 @@ void __attribute__((export_name("TS_UnsignedChannelUpdate_set_excess_data"))) T UnsignedChannelUpdate_set_excess_data(&this_ptr_conv, val_ref); } -uint32_t __attribute__((export_name("TS_UnsignedChannelUpdate_new"))) TS_UnsignedChannelUpdate_new(int8_tArray chain_hash_arg, int64_t short_channel_id_arg, int32_t timestamp_arg, int8_t flags_arg, int16_t cltv_expiry_delta_arg, int64_t htlc_minimum_msat_arg, int64_t htlc_maximum_msat_arg, int32_t fee_base_msat_arg, int32_t fee_proportional_millionths_arg, int8_tArray excess_data_arg) { +uint64_t __attribute__((export_name("TS_UnsignedChannelUpdate_new"))) TS_UnsignedChannelUpdate_new(int8_tArray chain_hash_arg, int64_t short_channel_id_arg, int32_t timestamp_arg, int8_t flags_arg, int16_t cltv_expiry_delta_arg, int64_t htlc_minimum_msat_arg, int64_t htlc_maximum_msat_arg, int32_t fee_base_msat_arg, int32_t fee_proportional_millionths_arg, int8_tArray excess_data_arg) { LDKThirtyTwoBytes chain_hash_arg_ref; CHECK(chain_hash_arg->arr_len == 32); memcpy(chain_hash_arg_ref.data, chain_hash_arg->elems, 32); FREE(chain_hash_arg); @@ -32415,375 +30889,350 @@ uint32_t __attribute__((export_name("TS_UnsignedChannelUpdate_new"))) TS_Unsign excess_data_arg_ref.data = MALLOC(excess_data_arg_ref.datalen, "LDKCVec_u8Z Bytes"); memcpy(excess_data_arg_ref.data, excess_data_arg->elems, excess_data_arg_ref.datalen); FREE(excess_data_arg); LDKUnsignedChannelUpdate ret_var = UnsignedChannelUpdate_new(chain_hash_arg_ref, short_channel_id_arg, timestamp_arg, flags_arg, cltv_expiry_delta_arg, htlc_minimum_msat_arg, htlc_maximum_msat_arg, fee_base_msat_arg, fee_proportional_millionths_arg, excess_data_arg_ref); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t UnsignedChannelUpdate_clone_ptr(LDKUnsignedChannelUpdate *NONNULL_PTR arg) { +static inline uint64_t UnsignedChannelUpdate_clone_ptr(LDKUnsignedChannelUpdate *NONNULL_PTR arg) { LDKUnsignedChannelUpdate ret_var = UnsignedChannelUpdate_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_UnsignedChannelUpdate_clone_ptr"))) TS_UnsignedChannelUpdate_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_UnsignedChannelUpdate_clone_ptr"))) TS_UnsignedChannelUpdate_clone_ptr(uint64_t arg) { LDKUnsignedChannelUpdate arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = UnsignedChannelUpdate_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = UnsignedChannelUpdate_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_UnsignedChannelUpdate_clone"))) TS_UnsignedChannelUpdate_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_UnsignedChannelUpdate_clone"))) TS_UnsignedChannelUpdate_clone(uint64_t orig) { LDKUnsignedChannelUpdate orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKUnsignedChannelUpdate ret_var = UnsignedChannelUpdate_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelUpdate_free"))) TS_ChannelUpdate_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChannelUpdate_free"))) TS_ChannelUpdate_free(uint64_t this_obj) { LDKChannelUpdate this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChannelUpdate_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_ChannelUpdate_get_signature"))) TS_ChannelUpdate_get_signature(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_ChannelUpdate_get_signature"))) TS_ChannelUpdate_get_signature(uint64_t this_ptr) { LDKChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_ChannelUpdate_set_signature"))) TS_ChannelUpdate_set_signature(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_ChannelUpdate_set_signature"))) TS_ChannelUpdate_set_signature(uint64_t this_ptr, int8_tArray val) { LDKChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKSignature val_ref; CHECK(val->arr_len == 64); memcpy(val_ref.compact_form, val->elems, 64); FREE(val); ChannelUpdate_set_signature(&this_ptr_conv, val_ref); } -uint32_t __attribute__((export_name("TS_ChannelUpdate_get_contents"))) TS_ChannelUpdate_get_contents(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelUpdate_get_contents"))) TS_ChannelUpdate_get_contents(uint64_t this_ptr) { LDKChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKUnsignedChannelUpdate ret_var = ChannelUpdate_get_contents(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelUpdate_set_contents"))) TS_ChannelUpdate_set_contents(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelUpdate_set_contents"))) TS_ChannelUpdate_set_contents(uint64_t this_ptr, uint64_t val) { LDKChannelUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKUnsignedChannelUpdate val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = UnsignedChannelUpdate_clone(&val_conv); ChannelUpdate_set_contents(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelUpdate_new"))) TS_ChannelUpdate_new(int8_tArray signature_arg, uint32_t contents_arg) { +uint64_t __attribute__((export_name("TS_ChannelUpdate_new"))) TS_ChannelUpdate_new(int8_tArray signature_arg, uint64_t contents_arg) { LDKSignature signature_arg_ref; CHECK(signature_arg->arr_len == 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); + contents_arg_conv.inner = untag_ptr(contents_arg); + contents_arg_conv.is_owned = ptr_is_owned(contents_arg); 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t ChannelUpdate_clone_ptr(LDKChannelUpdate *NONNULL_PTR arg) { +static inline uint64_t ChannelUpdate_clone_ptr(LDKChannelUpdate *NONNULL_PTR arg) { LDKChannelUpdate ret_var = ChannelUpdate_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelUpdate_clone_ptr"))) TS_ChannelUpdate_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ChannelUpdate_clone_ptr"))) TS_ChannelUpdate_clone_ptr(uint64_t arg) { LDKChannelUpdate arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ChannelUpdate_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ChannelUpdate_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelUpdate_clone"))) TS_ChannelUpdate_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ChannelUpdate_clone"))) TS_ChannelUpdate_clone(uint64_t orig) { LDKChannelUpdate orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKChannelUpdate ret_var = ChannelUpdate_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_QueryChannelRange_free"))) TS_QueryChannelRange_free(uint32_t this_obj) { +void __attribute__((export_name("TS_QueryChannelRange_free"))) TS_QueryChannelRange_free(uint64_t this_obj) { LDKQueryChannelRange this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); QueryChannelRange_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_QueryChannelRange_get_chain_hash"))) TS_QueryChannelRange_get_chain_hash(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_QueryChannelRange_get_chain_hash"))) TS_QueryChannelRange_get_chain_hash(uint64_t this_ptr) { LDKQueryChannelRange this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *QueryChannelRange_get_chain_hash(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_QueryChannelRange_set_chain_hash"))) TS_QueryChannelRange_set_chain_hash(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_QueryChannelRange_set_chain_hash"))) TS_QueryChannelRange_set_chain_hash(uint64_t this_ptr, int8_tArray val) { LDKQueryChannelRange this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); QueryChannelRange_set_chain_hash(&this_ptr_conv, val_ref); } -int32_t __attribute__((export_name("TS_QueryChannelRange_get_first_blocknum"))) TS_QueryChannelRange_get_first_blocknum(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_QueryChannelRange_get_first_blocknum"))) TS_QueryChannelRange_get_first_blocknum(uint64_t this_ptr) { LDKQueryChannelRange this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = QueryChannelRange_get_first_blocknum(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_QueryChannelRange_set_first_blocknum"))) TS_QueryChannelRange_set_first_blocknum(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_QueryChannelRange_set_first_blocknum"))) TS_QueryChannelRange_set_first_blocknum(uint64_t this_ptr, int32_t val) { LDKQueryChannelRange this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; QueryChannelRange_set_first_blocknum(&this_ptr_conv, val); } -int32_t __attribute__((export_name("TS_QueryChannelRange_get_number_of_blocks"))) TS_QueryChannelRange_get_number_of_blocks(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_QueryChannelRange_get_number_of_blocks"))) TS_QueryChannelRange_get_number_of_blocks(uint64_t this_ptr) { LDKQueryChannelRange this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = QueryChannelRange_get_number_of_blocks(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_QueryChannelRange_set_number_of_blocks"))) TS_QueryChannelRange_set_number_of_blocks(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_QueryChannelRange_set_number_of_blocks"))) TS_QueryChannelRange_set_number_of_blocks(uint64_t this_ptr, int32_t val) { LDKQueryChannelRange this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; QueryChannelRange_set_number_of_blocks(&this_ptr_conv, val); } -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) { +uint64_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); FREE(chain_hash_arg); LDKQueryChannelRange ret_var = QueryChannelRange_new(chain_hash_arg_ref, first_blocknum_arg, number_of_blocks_arg); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t QueryChannelRange_clone_ptr(LDKQueryChannelRange *NONNULL_PTR arg) { +static inline uint64_t QueryChannelRange_clone_ptr(LDKQueryChannelRange *NONNULL_PTR arg) { LDKQueryChannelRange ret_var = QueryChannelRange_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_QueryChannelRange_clone_ptr"))) TS_QueryChannelRange_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_QueryChannelRange_clone_ptr"))) TS_QueryChannelRange_clone_ptr(uint64_t arg) { LDKQueryChannelRange arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = QueryChannelRange_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = QueryChannelRange_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_QueryChannelRange_clone"))) TS_QueryChannelRange_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_QueryChannelRange_clone"))) TS_QueryChannelRange_clone(uint64_t orig) { LDKQueryChannelRange orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKQueryChannelRange ret_var = QueryChannelRange_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ReplyChannelRange_free"))) TS_ReplyChannelRange_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ReplyChannelRange_free"))) TS_ReplyChannelRange_free(uint64_t this_obj) { LDKReplyChannelRange this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ReplyChannelRange_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_ReplyChannelRange_get_chain_hash"))) TS_ReplyChannelRange_get_chain_hash(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_ReplyChannelRange_get_chain_hash"))) TS_ReplyChannelRange_get_chain_hash(uint64_t this_ptr) { LDKReplyChannelRange this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *ReplyChannelRange_get_chain_hash(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_ReplyChannelRange_set_chain_hash"))) TS_ReplyChannelRange_set_chain_hash(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_ReplyChannelRange_set_chain_hash"))) TS_ReplyChannelRange_set_chain_hash(uint64_t this_ptr, int8_tArray val) { LDKReplyChannelRange this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); ReplyChannelRange_set_chain_hash(&this_ptr_conv, val_ref); } -int32_t __attribute__((export_name("TS_ReplyChannelRange_get_first_blocknum"))) TS_ReplyChannelRange_get_first_blocknum(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_ReplyChannelRange_get_first_blocknum"))) TS_ReplyChannelRange_get_first_blocknum(uint64_t this_ptr) { LDKReplyChannelRange this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = ReplyChannelRange_get_first_blocknum(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ReplyChannelRange_set_first_blocknum"))) TS_ReplyChannelRange_set_first_blocknum(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_ReplyChannelRange_set_first_blocknum"))) TS_ReplyChannelRange_set_first_blocknum(uint64_t this_ptr, int32_t val) { LDKReplyChannelRange this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ReplyChannelRange_set_first_blocknum(&this_ptr_conv, val); } -int32_t __attribute__((export_name("TS_ReplyChannelRange_get_number_of_blocks"))) TS_ReplyChannelRange_get_number_of_blocks(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_ReplyChannelRange_get_number_of_blocks"))) TS_ReplyChannelRange_get_number_of_blocks(uint64_t this_ptr) { LDKReplyChannelRange this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = ReplyChannelRange_get_number_of_blocks(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ReplyChannelRange_set_number_of_blocks"))) TS_ReplyChannelRange_set_number_of_blocks(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_ReplyChannelRange_set_number_of_blocks"))) TS_ReplyChannelRange_set_number_of_blocks(uint64_t this_ptr, int32_t val) { LDKReplyChannelRange this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ReplyChannelRange_set_number_of_blocks(&this_ptr_conv, val); } -jboolean __attribute__((export_name("TS_ReplyChannelRange_get_sync_complete"))) TS_ReplyChannelRange_get_sync_complete(uint32_t this_ptr) { +jboolean __attribute__((export_name("TS_ReplyChannelRange_get_sync_complete"))) TS_ReplyChannelRange_get_sync_complete(uint64_t this_ptr) { LDKReplyChannelRange this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; jboolean ret_conv = ReplyChannelRange_get_sync_complete(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ReplyChannelRange_set_sync_complete"))) TS_ReplyChannelRange_set_sync_complete(uint32_t this_ptr, jboolean val) { +void __attribute__((export_name("TS_ReplyChannelRange_set_sync_complete"))) TS_ReplyChannelRange_set_sync_complete(uint64_t this_ptr, jboolean val) { LDKReplyChannelRange this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ReplyChannelRange_set_sync_complete(&this_ptr_conv, val); } -int64_tArray __attribute__((export_name("TS_ReplyChannelRange_get_short_channel_ids"))) TS_ReplyChannelRange_get_short_channel_ids(uint32_t this_ptr) { +int64_tArray __attribute__((export_name("TS_ReplyChannelRange_get_short_channel_ids"))) TS_ReplyChannelRange_get_short_channel_ids(uint64_t this_ptr) { LDKReplyChannelRange this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_u64Z ret_var = ReplyChannelRange_get_short_channel_ids(&this_ptr_conv); int64_tArray ret_arr = NULL; ret_arr = init_int64_tArray(ret_var.datalen, __LINE__); @@ -32797,11 +31246,12 @@ int64_tArray __attribute__((export_name("TS_ReplyChannelRange_get_short_channel return ret_arr; } -void __attribute__((export_name("TS_ReplyChannelRange_set_short_channel_ids"))) TS_ReplyChannelRange_set_short_channel_ids(uint32_t this_ptr, int64_tArray val) { +void __attribute__((export_name("TS_ReplyChannelRange_set_short_channel_ids"))) TS_ReplyChannelRange_set_short_channel_ids(uint64_t this_ptr, int64_tArray val) { LDKReplyChannelRange this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_u64Z val_constr; val_constr.datalen = val->arr_len; if (val_constr.datalen > 0) @@ -32817,7 +31267,7 @@ void __attribute__((export_name("TS_ReplyChannelRange_set_short_channel_ids"))) ReplyChannelRange_set_short_channel_ids(&this_ptr_conv, val_constr); } -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) { +uint64_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); FREE(chain_hash_arg); @@ -32834,89 +31284,79 @@ uint32_t __attribute__((export_name("TS_ReplyChannelRange_new"))) TS_ReplyChann } FREE(short_channel_ids_arg); LDKReplyChannelRange ret_var = ReplyChannelRange_new(chain_hash_arg_ref, first_blocknum_arg, number_of_blocks_arg, sync_complete_arg, short_channel_ids_arg_constr); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t ReplyChannelRange_clone_ptr(LDKReplyChannelRange *NONNULL_PTR arg) { +static inline uint64_t ReplyChannelRange_clone_ptr(LDKReplyChannelRange *NONNULL_PTR arg) { LDKReplyChannelRange ret_var = ReplyChannelRange_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ReplyChannelRange_clone_ptr"))) TS_ReplyChannelRange_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ReplyChannelRange_clone_ptr"))) TS_ReplyChannelRange_clone_ptr(uint64_t arg) { LDKReplyChannelRange arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ReplyChannelRange_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ReplyChannelRange_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ReplyChannelRange_clone"))) TS_ReplyChannelRange_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ReplyChannelRange_clone"))) TS_ReplyChannelRange_clone(uint64_t orig) { LDKReplyChannelRange orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKReplyChannelRange ret_var = ReplyChannelRange_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_QueryShortChannelIds_free"))) TS_QueryShortChannelIds_free(uint32_t this_obj) { +void __attribute__((export_name("TS_QueryShortChannelIds_free"))) TS_QueryShortChannelIds_free(uint64_t this_obj) { LDKQueryShortChannelIds this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); QueryShortChannelIds_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_QueryShortChannelIds_get_chain_hash"))) TS_QueryShortChannelIds_get_chain_hash(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_QueryShortChannelIds_get_chain_hash"))) TS_QueryShortChannelIds_get_chain_hash(uint64_t this_ptr) { LDKQueryShortChannelIds this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *QueryShortChannelIds_get_chain_hash(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_QueryShortChannelIds_set_chain_hash"))) TS_QueryShortChannelIds_set_chain_hash(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_QueryShortChannelIds_set_chain_hash"))) TS_QueryShortChannelIds_set_chain_hash(uint64_t this_ptr, int8_tArray val) { LDKQueryShortChannelIds this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); QueryShortChannelIds_set_chain_hash(&this_ptr_conv, val_ref); } -int64_tArray __attribute__((export_name("TS_QueryShortChannelIds_get_short_channel_ids"))) TS_QueryShortChannelIds_get_short_channel_ids(uint32_t this_ptr) { +int64_tArray __attribute__((export_name("TS_QueryShortChannelIds_get_short_channel_ids"))) TS_QueryShortChannelIds_get_short_channel_ids(uint64_t this_ptr) { LDKQueryShortChannelIds this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_u64Z ret_var = QueryShortChannelIds_get_short_channel_ids(&this_ptr_conv); int64_tArray ret_arr = NULL; ret_arr = init_int64_tArray(ret_var.datalen, __LINE__); @@ -32930,11 +31370,12 @@ int64_tArray __attribute__((export_name("TS_QueryShortChannelIds_get_short_chan return ret_arr; } -void __attribute__((export_name("TS_QueryShortChannelIds_set_short_channel_ids"))) TS_QueryShortChannelIds_set_short_channel_ids(uint32_t this_ptr, int64_tArray val) { +void __attribute__((export_name("TS_QueryShortChannelIds_set_short_channel_ids"))) TS_QueryShortChannelIds_set_short_channel_ids(uint64_t this_ptr, int64_tArray val) { LDKQueryShortChannelIds this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_u64Z val_constr; val_constr.datalen = val->arr_len; if (val_constr.datalen > 0) @@ -32950,7 +31391,7 @@ void __attribute__((export_name("TS_QueryShortChannelIds_set_short_channel_ids" QueryShortChannelIds_set_short_channel_ids(&this_ptr_conv, val_constr); } -uint32_t __attribute__((export_name("TS_QueryShortChannelIds_new"))) TS_QueryShortChannelIds_new(int8_tArray chain_hash_arg, int64_tArray short_channel_ids_arg) { +uint64_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); FREE(chain_hash_arg); @@ -32967,494 +31408,452 @@ uint32_t __attribute__((export_name("TS_QueryShortChannelIds_new"))) TS_QuerySh } FREE(short_channel_ids_arg); LDKQueryShortChannelIds ret_var = QueryShortChannelIds_new(chain_hash_arg_ref, short_channel_ids_arg_constr); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t QueryShortChannelIds_clone_ptr(LDKQueryShortChannelIds *NONNULL_PTR arg) { +static inline uint64_t QueryShortChannelIds_clone_ptr(LDKQueryShortChannelIds *NONNULL_PTR arg) { LDKQueryShortChannelIds ret_var = QueryShortChannelIds_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_QueryShortChannelIds_clone_ptr"))) TS_QueryShortChannelIds_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_QueryShortChannelIds_clone_ptr"))) TS_QueryShortChannelIds_clone_ptr(uint64_t arg) { LDKQueryShortChannelIds arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = QueryShortChannelIds_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = QueryShortChannelIds_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_QueryShortChannelIds_clone"))) TS_QueryShortChannelIds_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_QueryShortChannelIds_clone"))) TS_QueryShortChannelIds_clone(uint64_t orig) { LDKQueryShortChannelIds orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKQueryShortChannelIds ret_var = QueryShortChannelIds_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ReplyShortChannelIdsEnd_free"))) TS_ReplyShortChannelIdsEnd_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ReplyShortChannelIdsEnd_free"))) TS_ReplyShortChannelIdsEnd_free(uint64_t this_obj) { LDKReplyShortChannelIdsEnd this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ReplyShortChannelIdsEnd_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_ReplyShortChannelIdsEnd_get_chain_hash"))) TS_ReplyShortChannelIdsEnd_get_chain_hash(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_ReplyShortChannelIdsEnd_get_chain_hash"))) TS_ReplyShortChannelIdsEnd_get_chain_hash(uint64_t this_ptr) { LDKReplyShortChannelIdsEnd this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *ReplyShortChannelIdsEnd_get_chain_hash(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_ReplyShortChannelIdsEnd_set_chain_hash"))) TS_ReplyShortChannelIdsEnd_set_chain_hash(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_ReplyShortChannelIdsEnd_set_chain_hash"))) TS_ReplyShortChannelIdsEnd_set_chain_hash(uint64_t this_ptr, int8_tArray val) { LDKReplyShortChannelIdsEnd this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); ReplyShortChannelIdsEnd_set_chain_hash(&this_ptr_conv, val_ref); } -jboolean __attribute__((export_name("TS_ReplyShortChannelIdsEnd_get_full_information"))) TS_ReplyShortChannelIdsEnd_get_full_information(uint32_t this_ptr) { +jboolean __attribute__((export_name("TS_ReplyShortChannelIdsEnd_get_full_information"))) TS_ReplyShortChannelIdsEnd_get_full_information(uint64_t this_ptr) { LDKReplyShortChannelIdsEnd this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; jboolean ret_conv = ReplyShortChannelIdsEnd_get_full_information(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ReplyShortChannelIdsEnd_set_full_information"))) TS_ReplyShortChannelIdsEnd_set_full_information(uint32_t this_ptr, jboolean val) { +void __attribute__((export_name("TS_ReplyShortChannelIdsEnd_set_full_information"))) TS_ReplyShortChannelIdsEnd_set_full_information(uint64_t this_ptr, jboolean val) { LDKReplyShortChannelIdsEnd this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ReplyShortChannelIdsEnd_set_full_information(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_ReplyShortChannelIdsEnd_new"))) TS_ReplyShortChannelIdsEnd_new(int8_tArray chain_hash_arg, jboolean full_information_arg) { +uint64_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); FREE(chain_hash_arg); LDKReplyShortChannelIdsEnd ret_var = ReplyShortChannelIdsEnd_new(chain_hash_arg_ref, full_information_arg); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t ReplyShortChannelIdsEnd_clone_ptr(LDKReplyShortChannelIdsEnd *NONNULL_PTR arg) { +static inline uint64_t ReplyShortChannelIdsEnd_clone_ptr(LDKReplyShortChannelIdsEnd *NONNULL_PTR arg) { LDKReplyShortChannelIdsEnd ret_var = ReplyShortChannelIdsEnd_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ReplyShortChannelIdsEnd_clone_ptr"))) TS_ReplyShortChannelIdsEnd_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ReplyShortChannelIdsEnd_clone_ptr"))) TS_ReplyShortChannelIdsEnd_clone_ptr(uint64_t arg) { LDKReplyShortChannelIdsEnd arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ReplyShortChannelIdsEnd_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ReplyShortChannelIdsEnd_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ReplyShortChannelIdsEnd_clone"))) TS_ReplyShortChannelIdsEnd_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ReplyShortChannelIdsEnd_clone"))) TS_ReplyShortChannelIdsEnd_clone(uint64_t orig) { LDKReplyShortChannelIdsEnd orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKReplyShortChannelIdsEnd ret_var = ReplyShortChannelIdsEnd_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_GossipTimestampFilter_free"))) TS_GossipTimestampFilter_free(uint32_t this_obj) { +void __attribute__((export_name("TS_GossipTimestampFilter_free"))) TS_GossipTimestampFilter_free(uint64_t this_obj) { LDKGossipTimestampFilter this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); GossipTimestampFilter_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_GossipTimestampFilter_get_chain_hash"))) TS_GossipTimestampFilter_get_chain_hash(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_GossipTimestampFilter_get_chain_hash"))) TS_GossipTimestampFilter_get_chain_hash(uint64_t this_ptr) { LDKGossipTimestampFilter this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *GossipTimestampFilter_get_chain_hash(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_GossipTimestampFilter_set_chain_hash"))) TS_GossipTimestampFilter_set_chain_hash(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_GossipTimestampFilter_set_chain_hash"))) TS_GossipTimestampFilter_set_chain_hash(uint64_t this_ptr, int8_tArray val) { LDKGossipTimestampFilter this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); GossipTimestampFilter_set_chain_hash(&this_ptr_conv, val_ref); } -int32_t __attribute__((export_name("TS_GossipTimestampFilter_get_first_timestamp"))) TS_GossipTimestampFilter_get_first_timestamp(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_GossipTimestampFilter_get_first_timestamp"))) TS_GossipTimestampFilter_get_first_timestamp(uint64_t this_ptr) { LDKGossipTimestampFilter this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = GossipTimestampFilter_get_first_timestamp(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_GossipTimestampFilter_set_first_timestamp"))) TS_GossipTimestampFilter_set_first_timestamp(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_GossipTimestampFilter_set_first_timestamp"))) TS_GossipTimestampFilter_set_first_timestamp(uint64_t this_ptr, int32_t val) { LDKGossipTimestampFilter this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; GossipTimestampFilter_set_first_timestamp(&this_ptr_conv, val); } -int32_t __attribute__((export_name("TS_GossipTimestampFilter_get_timestamp_range"))) TS_GossipTimestampFilter_get_timestamp_range(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_GossipTimestampFilter_get_timestamp_range"))) TS_GossipTimestampFilter_get_timestamp_range(uint64_t this_ptr) { LDKGossipTimestampFilter this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = GossipTimestampFilter_get_timestamp_range(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_GossipTimestampFilter_set_timestamp_range"))) TS_GossipTimestampFilter_set_timestamp_range(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_GossipTimestampFilter_set_timestamp_range"))) TS_GossipTimestampFilter_set_timestamp_range(uint64_t this_ptr, int32_t val) { LDKGossipTimestampFilter this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; GossipTimestampFilter_set_timestamp_range(&this_ptr_conv, val); } -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) { +uint64_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); FREE(chain_hash_arg); LDKGossipTimestampFilter ret_var = GossipTimestampFilter_new(chain_hash_arg_ref, first_timestamp_arg, timestamp_range_arg); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t GossipTimestampFilter_clone_ptr(LDKGossipTimestampFilter *NONNULL_PTR arg) { +static inline uint64_t GossipTimestampFilter_clone_ptr(LDKGossipTimestampFilter *NONNULL_PTR arg) { LDKGossipTimestampFilter ret_var = GossipTimestampFilter_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_GossipTimestampFilter_clone_ptr"))) TS_GossipTimestampFilter_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_GossipTimestampFilter_clone_ptr"))) TS_GossipTimestampFilter_clone_ptr(uint64_t arg) { LDKGossipTimestampFilter arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = GossipTimestampFilter_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = GossipTimestampFilter_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_GossipTimestampFilter_clone"))) TS_GossipTimestampFilter_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_GossipTimestampFilter_clone"))) TS_GossipTimestampFilter_clone(uint64_t orig) { LDKGossipTimestampFilter orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKGossipTimestampFilter ret_var = GossipTimestampFilter_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_ErrorAction_free"))) TS_ErrorAction_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKErrorAction this_ptr_conv = *(LDKErrorAction*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); ErrorAction_free(this_ptr_conv); } -static inline uintptr_t ErrorAction_clone_ptr(LDKErrorAction *NONNULL_PTR arg) { +static inline uint64_t ErrorAction_clone_ptr(LDKErrorAction *NONNULL_PTR arg) { LDKErrorAction *ret_copy = MALLOC(sizeof(LDKErrorAction), "LDKErrorAction"); *ret_copy = ErrorAction_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ErrorAction_clone_ptr"))) TS_ErrorAction_clone_ptr(uint32_t arg) { - LDKErrorAction* arg_conv = (LDKErrorAction*)arg; - uint32_t ret_conv = ErrorAction_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_ErrorAction_clone_ptr"))) TS_ErrorAction_clone_ptr(uint64_t arg) { + LDKErrorAction* arg_conv = (LDKErrorAction*)untag_ptr(arg); + int64_t ret_conv = ErrorAction_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ErrorAction_clone"))) TS_ErrorAction_clone(uint32_t orig) { - LDKErrorAction* orig_conv = (LDKErrorAction*)orig; +uint64_t __attribute__((export_name("TS_ErrorAction_clone"))) TS_ErrorAction_clone(uint64_t orig) { + LDKErrorAction* orig_conv = (LDKErrorAction*)untag_ptr(orig); LDKErrorAction *ret_copy = MALLOC(sizeof(LDKErrorAction), "LDKErrorAction"); *ret_copy = ErrorAction_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ErrorAction_disconnect_peer"))) TS_ErrorAction_disconnect_peer(uint32_t msg) { +uint64_t __attribute__((export_name("TS_ErrorAction_disconnect_peer"))) TS_ErrorAction_disconnect_peer(uint64_t msg) { LDKErrorMessage msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = (msg & 1) || (msg == 0); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = ErrorMessage_clone(&msg_conv); LDKErrorAction *ret_copy = MALLOC(sizeof(LDKErrorAction), "LDKErrorAction"); *ret_copy = ErrorAction_disconnect_peer(msg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ErrorAction_ignore_error"))) TS_ErrorAction_ignore_error() { +uint64_t __attribute__((export_name("TS_ErrorAction_ignore_error"))) TS_ErrorAction_ignore_error() { LDKErrorAction *ret_copy = MALLOC(sizeof(LDKErrorAction), "LDKErrorAction"); *ret_copy = ErrorAction_ignore_error(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ErrorAction_ignore_and_log"))) TS_ErrorAction_ignore_and_log(uint32_t a) { +uint64_t __attribute__((export_name("TS_ErrorAction_ignore_and_log"))) TS_ErrorAction_ignore_and_log(uint32_t a) { LDKLevel a_conv = LDKLevel_from_js(a); LDKErrorAction *ret_copy = MALLOC(sizeof(LDKErrorAction), "LDKErrorAction"); *ret_copy = ErrorAction_ignore_and_log(a_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ErrorAction_ignore_duplicate_gossip"))) TS_ErrorAction_ignore_duplicate_gossip() { +uint64_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(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ErrorAction_send_error_message"))) TS_ErrorAction_send_error_message(uint32_t msg) { +uint64_t __attribute__((export_name("TS_ErrorAction_send_error_message"))) TS_ErrorAction_send_error_message(uint64_t msg) { LDKErrorMessage msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = (msg & 1) || (msg == 0); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = ErrorMessage_clone(&msg_conv); LDKErrorAction *ret_copy = MALLOC(sizeof(LDKErrorAction), "LDKErrorAction"); *ret_copy = ErrorAction_send_error_message(msg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ErrorAction_send_warning_message"))) TS_ErrorAction_send_warning_message(uint32_t msg, uint32_t log_level) { +uint64_t __attribute__((export_name("TS_ErrorAction_send_warning_message"))) TS_ErrorAction_send_warning_message(uint64_t msg, uint32_t log_level) { LDKWarningMessage msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = (msg & 1) || (msg == 0); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = WarningMessage_clone(&msg_conv); LDKLevel log_level_conv = LDKLevel_from_js(log_level); LDKErrorAction *ret_copy = MALLOC(sizeof(LDKErrorAction), "LDKErrorAction"); *ret_copy = ErrorAction_send_warning_message(msg_conv, log_level_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_LightningError_free"))) TS_LightningError_free(uint32_t this_obj) { +void __attribute__((export_name("TS_LightningError_free"))) TS_LightningError_free(uint64_t this_obj) { LDKLightningError this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); LightningError_free(this_obj_conv); } -jstring __attribute__((export_name("TS_LightningError_get_err"))) TS_LightningError_get_err(uint32_t this_ptr) { +jstring __attribute__((export_name("TS_LightningError_get_err"))) TS_LightningError_get_err(uint64_t this_ptr) { LDKLightningError this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKStr ret_str = LightningError_get_err(&this_ptr_conv); jstring ret_conv = str_ref_to_ts(ret_str.chars, ret_str.len); Str_free(ret_str); return ret_conv; } -void __attribute__((export_name("TS_LightningError_set_err"))) TS_LightningError_set_err(uint32_t this_ptr, jstring val) { +void __attribute__((export_name("TS_LightningError_set_err"))) TS_LightningError_set_err(uint64_t this_ptr, jstring val) { LDKLightningError this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKStr val_conv = str_ref_to_owned_c(val); LightningError_set_err(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_LightningError_get_action"))) TS_LightningError_get_action(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_LightningError_get_action"))) TS_LightningError_get_action(uint64_t this_ptr) { LDKLightningError this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKErrorAction *ret_copy = MALLOC(sizeof(LDKErrorAction), "LDKErrorAction"); *ret_copy = LightningError_get_action(&this_ptr_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_LightningError_set_action"))) TS_LightningError_set_action(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_LightningError_set_action"))) TS_LightningError_set_action(uint64_t this_ptr, uint64_t val) { LDKLightningError this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKErrorAction val_conv = *(LDKErrorAction*)(val_ptr); - val_conv = ErrorAction_clone((LDKErrorAction*)(((uintptr_t)val) & ~1)); + val_conv = ErrorAction_clone((LDKErrorAction*)untag_ptr(val)); 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) { +uint64_t __attribute__((export_name("TS_LightningError_new"))) TS_LightningError_new(jstring err_arg, uint64_t action_arg) { LDKStr err_arg_conv = str_ref_to_owned_c(err_arg); - void* action_arg_ptr = (void*)(((uintptr_t)action_arg) & ~1); + void* action_arg_ptr = untag_ptr(action_arg); CHECK_ACCESS(action_arg_ptr); LDKErrorAction action_arg_conv = *(LDKErrorAction*)(action_arg_ptr); - action_arg_conv = ErrorAction_clone((LDKErrorAction*)(((uintptr_t)action_arg) & ~1)); + action_arg_conv = ErrorAction_clone((LDKErrorAction*)untag_ptr(action_arg)); LDKLightningError ret_var = LightningError_new(err_arg_conv, action_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t LightningError_clone_ptr(LDKLightningError *NONNULL_PTR arg) { +static inline uint64_t LightningError_clone_ptr(LDKLightningError *NONNULL_PTR arg) { LDKLightningError ret_var = LightningError_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_LightningError_clone_ptr"))) TS_LightningError_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_LightningError_clone_ptr"))) TS_LightningError_clone_ptr(uint64_t arg) { LDKLightningError arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = LightningError_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = LightningError_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_LightningError_clone"))) TS_LightningError_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_LightningError_clone"))) TS_LightningError_clone(uint64_t orig) { LDKLightningError orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKLightningError ret_var = LightningError_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_CommitmentUpdate_free"))) TS_CommitmentUpdate_free(uint32_t this_obj) { +void __attribute__((export_name("TS_CommitmentUpdate_free"))) TS_CommitmentUpdate_free(uint64_t this_obj) { LDKCommitmentUpdate this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); CommitmentUpdate_free(this_obj_conv); } -uint32_tArray __attribute__((export_name("TS_CommitmentUpdate_get_update_add_htlcs"))) TS_CommitmentUpdate_get_update_add_htlcs(uint32_t this_ptr) { +uint64_tArray __attribute__((export_name("TS_CommitmentUpdate_get_update_add_htlcs"))) TS_CommitmentUpdate_get_update_add_htlcs(uint64_t this_ptr) { LDKCommitmentUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_UpdateAddHTLCZ ret_var = CommitmentUpdate_get_update_add_htlcs(&this_ptr_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t p = 0; p < ret_var.datalen; p++) { LDKUpdateAddHTLC ret_conv_15_var = ret_var.data[p]; - uint32_t ret_conv_15_ref = 0; - 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. + uint64_t ret_conv_15_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_15_var); - ret_conv_15_ref = (uintptr_t)ret_conv_15_var.inner; - if (ret_conv_15_var.is_owned) { - ret_conv_15_ref |= 1; - } + ret_conv_15_ref = tag_ptr(ret_conv_15_var.inner, ret_conv_15_var.is_owned); ret_arr_ptr[p] = ret_conv_15_ref; } @@ -33462,23 +31861,24 @@ uint32_tArray __attribute__((export_name("TS_CommitmentUpdate_get_update_add_ht return ret_arr; } -void __attribute__((export_name("TS_CommitmentUpdate_set_update_add_htlcs"))) TS_CommitmentUpdate_set_update_add_htlcs(uint32_t this_ptr, uint32_tArray val) { +void __attribute__((export_name("TS_CommitmentUpdate_set_update_add_htlcs"))) TS_CommitmentUpdate_set_update_add_htlcs(uint64_t this_ptr, uint64_tArray val) { LDKCommitmentUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_UpdateAddHTLCZ val_constr; val_constr.datalen = val->arr_len; if (val_constr.datalen > 0) val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKUpdateAddHTLC), "LDKCVec_UpdateAddHTLCZ Elements"); else val_constr.data = NULL; - uint32_t* val_vals = val->elems; + uint64_t* val_vals = val->elems; for (size_t p = 0; p < val_constr.datalen; p++) { - uint32_t val_conv_15 = val_vals[p]; + uint64_t val_conv_15 = val_vals[p]; LDKUpdateAddHTLC val_conv_15_conv; - val_conv_15_conv.inner = (void*)(val_conv_15 & (~1)); - val_conv_15_conv.is_owned = (val_conv_15 & 1) || (val_conv_15 == 0); + val_conv_15_conv.inner = untag_ptr(val_conv_15); + val_conv_15_conv.is_owned = ptr_is_owned(val_conv_15); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv_15_conv); val_conv_15_conv = UpdateAddHTLC_clone(&val_conv_15_conv); val_constr.data[p] = val_conv_15_conv; @@ -33487,25 +31887,21 @@ void __attribute__((export_name("TS_CommitmentUpdate_set_update_add_htlcs"))) T CommitmentUpdate_set_update_add_htlcs(&this_ptr_conv, val_constr); } -uint32_tArray __attribute__((export_name("TS_CommitmentUpdate_get_update_fulfill_htlcs"))) TS_CommitmentUpdate_get_update_fulfill_htlcs(uint32_t this_ptr) { +uint64_tArray __attribute__((export_name("TS_CommitmentUpdate_get_update_fulfill_htlcs"))) TS_CommitmentUpdate_get_update_fulfill_htlcs(uint64_t this_ptr) { LDKCommitmentUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_UpdateFulfillHTLCZ ret_var = CommitmentUpdate_get_update_fulfill_htlcs(&this_ptr_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t t = 0; t < ret_var.datalen; t++) { LDKUpdateFulfillHTLC ret_conv_19_var = ret_var.data[t]; - uint32_t ret_conv_19_ref = 0; - 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. + uint64_t ret_conv_19_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_19_var); - ret_conv_19_ref = (uintptr_t)ret_conv_19_var.inner; - if (ret_conv_19_var.is_owned) { - ret_conv_19_ref |= 1; - } + ret_conv_19_ref = tag_ptr(ret_conv_19_var.inner, ret_conv_19_var.is_owned); ret_arr_ptr[t] = ret_conv_19_ref; } @@ -33513,23 +31909,24 @@ uint32_tArray __attribute__((export_name("TS_CommitmentUpdate_get_update_fulfil return ret_arr; } -void __attribute__((export_name("TS_CommitmentUpdate_set_update_fulfill_htlcs"))) TS_CommitmentUpdate_set_update_fulfill_htlcs(uint32_t this_ptr, uint32_tArray val) { +void __attribute__((export_name("TS_CommitmentUpdate_set_update_fulfill_htlcs"))) TS_CommitmentUpdate_set_update_fulfill_htlcs(uint64_t this_ptr, uint64_tArray val) { LDKCommitmentUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_UpdateFulfillHTLCZ val_constr; val_constr.datalen = val->arr_len; if (val_constr.datalen > 0) val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKUpdateFulfillHTLC), "LDKCVec_UpdateFulfillHTLCZ Elements"); else val_constr.data = NULL; - uint32_t* val_vals = val->elems; + uint64_t* val_vals = val->elems; for (size_t t = 0; t < val_constr.datalen; t++) { - uint32_t val_conv_19 = val_vals[t]; + uint64_t val_conv_19 = val_vals[t]; LDKUpdateFulfillHTLC val_conv_19_conv; - val_conv_19_conv.inner = (void*)(val_conv_19 & (~1)); - val_conv_19_conv.is_owned = (val_conv_19 & 1) || (val_conv_19 == 0); + val_conv_19_conv.inner = untag_ptr(val_conv_19); + val_conv_19_conv.is_owned = ptr_is_owned(val_conv_19); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv_19_conv); val_conv_19_conv = UpdateFulfillHTLC_clone(&val_conv_19_conv); val_constr.data[t] = val_conv_19_conv; @@ -33538,25 +31935,21 @@ void __attribute__((export_name("TS_CommitmentUpdate_set_update_fulfill_htlcs") CommitmentUpdate_set_update_fulfill_htlcs(&this_ptr_conv, val_constr); } -uint32_tArray __attribute__((export_name("TS_CommitmentUpdate_get_update_fail_htlcs"))) TS_CommitmentUpdate_get_update_fail_htlcs(uint32_t this_ptr) { +uint64_tArray __attribute__((export_name("TS_CommitmentUpdate_get_update_fail_htlcs"))) TS_CommitmentUpdate_get_update_fail_htlcs(uint64_t this_ptr) { LDKCommitmentUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_UpdateFailHTLCZ ret_var = CommitmentUpdate_get_update_fail_htlcs(&this_ptr_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t q = 0; q < ret_var.datalen; q++) { LDKUpdateFailHTLC ret_conv_16_var = ret_var.data[q]; - uint32_t ret_conv_16_ref = 0; - 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. + uint64_t ret_conv_16_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_16_var); - ret_conv_16_ref = (uintptr_t)ret_conv_16_var.inner; - if (ret_conv_16_var.is_owned) { - ret_conv_16_ref |= 1; - } + ret_conv_16_ref = tag_ptr(ret_conv_16_var.inner, ret_conv_16_var.is_owned); ret_arr_ptr[q] = ret_conv_16_ref; } @@ -33564,23 +31957,24 @@ uint32_tArray __attribute__((export_name("TS_CommitmentUpdate_get_update_fail_h return ret_arr; } -void __attribute__((export_name("TS_CommitmentUpdate_set_update_fail_htlcs"))) TS_CommitmentUpdate_set_update_fail_htlcs(uint32_t this_ptr, uint32_tArray val) { +void __attribute__((export_name("TS_CommitmentUpdate_set_update_fail_htlcs"))) TS_CommitmentUpdate_set_update_fail_htlcs(uint64_t this_ptr, uint64_tArray val) { LDKCommitmentUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_UpdateFailHTLCZ val_constr; val_constr.datalen = val->arr_len; if (val_constr.datalen > 0) val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKUpdateFailHTLC), "LDKCVec_UpdateFailHTLCZ Elements"); else val_constr.data = NULL; - uint32_t* val_vals = val->elems; + uint64_t* val_vals = val->elems; for (size_t q = 0; q < val_constr.datalen; q++) { - uint32_t val_conv_16 = val_vals[q]; + uint64_t val_conv_16 = val_vals[q]; LDKUpdateFailHTLC val_conv_16_conv; - val_conv_16_conv.inner = (void*)(val_conv_16 & (~1)); - val_conv_16_conv.is_owned = (val_conv_16 & 1) || (val_conv_16 == 0); + val_conv_16_conv.inner = untag_ptr(val_conv_16); + val_conv_16_conv.is_owned = ptr_is_owned(val_conv_16); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv_16_conv); val_conv_16_conv = UpdateFailHTLC_clone(&val_conv_16_conv); val_constr.data[q] = val_conv_16_conv; @@ -33589,25 +31983,21 @@ void __attribute__((export_name("TS_CommitmentUpdate_set_update_fail_htlcs"))) CommitmentUpdate_set_update_fail_htlcs(&this_ptr_conv, val_constr); } -uint32_tArray __attribute__((export_name("TS_CommitmentUpdate_get_update_fail_malformed_htlcs"))) TS_CommitmentUpdate_get_update_fail_malformed_htlcs(uint32_t this_ptr) { +uint64_tArray __attribute__((export_name("TS_CommitmentUpdate_get_update_fail_malformed_htlcs"))) TS_CommitmentUpdate_get_update_fail_malformed_htlcs(uint64_t this_ptr) { LDKCommitmentUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_UpdateFailMalformedHTLCZ ret_var = CommitmentUpdate_get_update_fail_malformed_htlcs(&this_ptr_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t z = 0; z < ret_var.datalen; z++) { LDKUpdateFailMalformedHTLC ret_conv_25_var = ret_var.data[z]; - uint32_t ret_conv_25_ref = 0; - 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. + uint64_t ret_conv_25_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_25_var); - ret_conv_25_ref = (uintptr_t)ret_conv_25_var.inner; - if (ret_conv_25_var.is_owned) { - ret_conv_25_ref |= 1; - } + ret_conv_25_ref = tag_ptr(ret_conv_25_var.inner, ret_conv_25_var.is_owned); ret_arr_ptr[z] = ret_conv_25_ref; } @@ -33615,23 +32005,24 @@ uint32_tArray __attribute__((export_name("TS_CommitmentUpdate_get_update_fail_m return ret_arr; } -void __attribute__((export_name("TS_CommitmentUpdate_set_update_fail_malformed_htlcs"))) TS_CommitmentUpdate_set_update_fail_malformed_htlcs(uint32_t this_ptr, uint32_tArray val) { +void __attribute__((export_name("TS_CommitmentUpdate_set_update_fail_malformed_htlcs"))) TS_CommitmentUpdate_set_update_fail_malformed_htlcs(uint64_t this_ptr, uint64_tArray val) { LDKCommitmentUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_UpdateFailMalformedHTLCZ val_constr; val_constr.datalen = val->arr_len; if (val_constr.datalen > 0) val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKUpdateFailMalformedHTLC), "LDKCVec_UpdateFailMalformedHTLCZ Elements"); else val_constr.data = NULL; - uint32_t* val_vals = val->elems; + uint64_t* val_vals = val->elems; for (size_t z = 0; z < val_constr.datalen; z++) { - uint32_t val_conv_25 = val_vals[z]; + uint64_t val_conv_25 = val_vals[z]; LDKUpdateFailMalformedHTLC val_conv_25_conv; - val_conv_25_conv.inner = (void*)(val_conv_25 & (~1)); - val_conv_25_conv.is_owned = (val_conv_25 & 1) || (val_conv_25 == 0); + val_conv_25_conv.inner = untag_ptr(val_conv_25); + val_conv_25_conv.is_owned = ptr_is_owned(val_conv_25); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv_25_conv); val_conv_25_conv = UpdateFailMalformedHTLC_clone(&val_conv_25_conv); val_constr.data[z] = val_conv_25_conv; @@ -33640,81 +32031,73 @@ void __attribute__((export_name("TS_CommitmentUpdate_set_update_fail_malformed_ CommitmentUpdate_set_update_fail_malformed_htlcs(&this_ptr_conv, val_constr); } -uint32_t __attribute__((export_name("TS_CommitmentUpdate_get_update_fee"))) TS_CommitmentUpdate_get_update_fee(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_CommitmentUpdate_get_update_fee"))) TS_CommitmentUpdate_get_update_fee(uint64_t this_ptr) { LDKCommitmentUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKUpdateFee ret_var = CommitmentUpdate_get_update_fee(&this_ptr_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_CommitmentUpdate_set_update_fee"))) TS_CommitmentUpdate_set_update_fee(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_CommitmentUpdate_set_update_fee"))) TS_CommitmentUpdate_set_update_fee(uint64_t this_ptr, uint64_t val) { LDKCommitmentUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKUpdateFee val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = UpdateFee_clone(&val_conv); CommitmentUpdate_set_update_fee(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_CommitmentUpdate_get_commitment_signed"))) TS_CommitmentUpdate_get_commitment_signed(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_CommitmentUpdate_get_commitment_signed"))) TS_CommitmentUpdate_get_commitment_signed(uint64_t this_ptr) { LDKCommitmentUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCommitmentSigned ret_var = CommitmentUpdate_get_commitment_signed(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_CommitmentUpdate_set_commitment_signed"))) TS_CommitmentUpdate_set_commitment_signed(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_CommitmentUpdate_set_commitment_signed"))) TS_CommitmentUpdate_set_commitment_signed(uint64_t this_ptr, uint64_t val) { LDKCommitmentUpdate this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCommitmentSigned val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = CommitmentSigned_clone(&val_conv); CommitmentUpdate_set_commitment_signed(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_CommitmentUpdate_new"))) TS_CommitmentUpdate_new(uint32_tArray update_add_htlcs_arg, uint32_tArray update_fulfill_htlcs_arg, uint32_tArray update_fail_htlcs_arg, uint32_tArray update_fail_malformed_htlcs_arg, uint32_t update_fee_arg, uint32_t commitment_signed_arg) { +uint64_t __attribute__((export_name("TS_CommitmentUpdate_new"))) TS_CommitmentUpdate_new(uint64_tArray update_add_htlcs_arg, uint64_tArray update_fulfill_htlcs_arg, uint64_tArray update_fail_htlcs_arg, uint64_tArray update_fail_malformed_htlcs_arg, uint64_t update_fee_arg, uint64_t commitment_signed_arg) { LDKCVec_UpdateAddHTLCZ update_add_htlcs_arg_constr; update_add_htlcs_arg_constr.datalen = update_add_htlcs_arg->arr_len; if (update_add_htlcs_arg_constr.datalen > 0) 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; + uint64_t* update_add_htlcs_arg_vals = update_add_htlcs_arg->elems; for (size_t p = 0; p < update_add_htlcs_arg_constr.datalen; p++) { - uint32_t update_add_htlcs_arg_conv_15 = update_add_htlcs_arg_vals[p]; + uint64_t update_add_htlcs_arg_conv_15 = update_add_htlcs_arg_vals[p]; LDKUpdateAddHTLC update_add_htlcs_arg_conv_15_conv; - update_add_htlcs_arg_conv_15_conv.inner = (void*)(update_add_htlcs_arg_conv_15 & (~1)); - update_add_htlcs_arg_conv_15_conv.is_owned = (update_add_htlcs_arg_conv_15 & 1) || (update_add_htlcs_arg_conv_15 == 0); + update_add_htlcs_arg_conv_15_conv.inner = untag_ptr(update_add_htlcs_arg_conv_15); + update_add_htlcs_arg_conv_15_conv.is_owned = ptr_is_owned(update_add_htlcs_arg_conv_15); CHECK_INNER_FIELD_ACCESS_OR_NULL(update_add_htlcs_arg_conv_15_conv); update_add_htlcs_arg_conv_15_conv = UpdateAddHTLC_clone(&update_add_htlcs_arg_conv_15_conv); update_add_htlcs_arg_constr.data[p] = update_add_htlcs_arg_conv_15_conv; @@ -33726,12 +32109,12 @@ 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; + uint64_t* update_fulfill_htlcs_arg_vals = update_fulfill_htlcs_arg->elems; for (size_t t = 0; t < update_fulfill_htlcs_arg_constr.datalen; t++) { - uint32_t update_fulfill_htlcs_arg_conv_19 = update_fulfill_htlcs_arg_vals[t]; + uint64_t update_fulfill_htlcs_arg_conv_19 = update_fulfill_htlcs_arg_vals[t]; LDKUpdateFulfillHTLC update_fulfill_htlcs_arg_conv_19_conv; - update_fulfill_htlcs_arg_conv_19_conv.inner = (void*)(update_fulfill_htlcs_arg_conv_19 & (~1)); - update_fulfill_htlcs_arg_conv_19_conv.is_owned = (update_fulfill_htlcs_arg_conv_19 & 1) || (update_fulfill_htlcs_arg_conv_19 == 0); + update_fulfill_htlcs_arg_conv_19_conv.inner = untag_ptr(update_fulfill_htlcs_arg_conv_19); + update_fulfill_htlcs_arg_conv_19_conv.is_owned = ptr_is_owned(update_fulfill_htlcs_arg_conv_19); CHECK_INNER_FIELD_ACCESS_OR_NULL(update_fulfill_htlcs_arg_conv_19_conv); update_fulfill_htlcs_arg_conv_19_conv = UpdateFulfillHTLC_clone(&update_fulfill_htlcs_arg_conv_19_conv); update_fulfill_htlcs_arg_constr.data[t] = update_fulfill_htlcs_arg_conv_19_conv; @@ -33743,12 +32126,12 @@ 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; + uint64_t* update_fail_htlcs_arg_vals = update_fail_htlcs_arg->elems; for (size_t q = 0; q < update_fail_htlcs_arg_constr.datalen; q++) { - uint32_t update_fail_htlcs_arg_conv_16 = update_fail_htlcs_arg_vals[q]; + uint64_t update_fail_htlcs_arg_conv_16 = update_fail_htlcs_arg_vals[q]; LDKUpdateFailHTLC update_fail_htlcs_arg_conv_16_conv; - update_fail_htlcs_arg_conv_16_conv.inner = (void*)(update_fail_htlcs_arg_conv_16 & (~1)); - update_fail_htlcs_arg_conv_16_conv.is_owned = (update_fail_htlcs_arg_conv_16 & 1) || (update_fail_htlcs_arg_conv_16 == 0); + update_fail_htlcs_arg_conv_16_conv.inner = untag_ptr(update_fail_htlcs_arg_conv_16); + update_fail_htlcs_arg_conv_16_conv.is_owned = ptr_is_owned(update_fail_htlcs_arg_conv_16); CHECK_INNER_FIELD_ACCESS_OR_NULL(update_fail_htlcs_arg_conv_16_conv); update_fail_htlcs_arg_conv_16_conv = UpdateFailHTLC_clone(&update_fail_htlcs_arg_conv_16_conv); update_fail_htlcs_arg_constr.data[q] = update_fail_htlcs_arg_conv_16_conv; @@ -33760,100 +32143,88 @@ 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; + uint64_t* update_fail_malformed_htlcs_arg_vals = update_fail_malformed_htlcs_arg->elems; for (size_t z = 0; z < update_fail_malformed_htlcs_arg_constr.datalen; z++) { - uint32_t update_fail_malformed_htlcs_arg_conv_25 = update_fail_malformed_htlcs_arg_vals[z]; + uint64_t update_fail_malformed_htlcs_arg_conv_25 = update_fail_malformed_htlcs_arg_vals[z]; LDKUpdateFailMalformedHTLC update_fail_malformed_htlcs_arg_conv_25_conv; - update_fail_malformed_htlcs_arg_conv_25_conv.inner = (void*)(update_fail_malformed_htlcs_arg_conv_25 & (~1)); - update_fail_malformed_htlcs_arg_conv_25_conv.is_owned = (update_fail_malformed_htlcs_arg_conv_25 & 1) || (update_fail_malformed_htlcs_arg_conv_25 == 0); + update_fail_malformed_htlcs_arg_conv_25_conv.inner = untag_ptr(update_fail_malformed_htlcs_arg_conv_25); + update_fail_malformed_htlcs_arg_conv_25_conv.is_owned = ptr_is_owned(update_fail_malformed_htlcs_arg_conv_25); CHECK_INNER_FIELD_ACCESS_OR_NULL(update_fail_malformed_htlcs_arg_conv_25_conv); update_fail_malformed_htlcs_arg_conv_25_conv = UpdateFailMalformedHTLC_clone(&update_fail_malformed_htlcs_arg_conv_25_conv); update_fail_malformed_htlcs_arg_constr.data[z] = update_fail_malformed_htlcs_arg_conv_25_conv; } FREE(update_fail_malformed_htlcs_arg); LDKUpdateFee update_fee_arg_conv; - update_fee_arg_conv.inner = (void*)(update_fee_arg & (~1)); - update_fee_arg_conv.is_owned = (update_fee_arg & 1) || (update_fee_arg == 0); + update_fee_arg_conv.inner = untag_ptr(update_fee_arg); + update_fee_arg_conv.is_owned = ptr_is_owned(update_fee_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(update_fee_arg_conv); update_fee_arg_conv = UpdateFee_clone(&update_fee_arg_conv); LDKCommitmentSigned commitment_signed_arg_conv; - commitment_signed_arg_conv.inner = (void*)(commitment_signed_arg & (~1)); - commitment_signed_arg_conv.is_owned = (commitment_signed_arg & 1) || (commitment_signed_arg == 0); + commitment_signed_arg_conv.inner = untag_ptr(commitment_signed_arg); + commitment_signed_arg_conv.is_owned = ptr_is_owned(commitment_signed_arg); 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t CommitmentUpdate_clone_ptr(LDKCommitmentUpdate *NONNULL_PTR arg) { +static inline uint64_t CommitmentUpdate_clone_ptr(LDKCommitmentUpdate *NONNULL_PTR arg) { LDKCommitmentUpdate ret_var = CommitmentUpdate_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_CommitmentUpdate_clone_ptr"))) TS_CommitmentUpdate_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_CommitmentUpdate_clone_ptr"))) TS_CommitmentUpdate_clone_ptr(uint64_t arg) { LDKCommitmentUpdate arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = CommitmentUpdate_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = CommitmentUpdate_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CommitmentUpdate_clone"))) TS_CommitmentUpdate_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_CommitmentUpdate_clone"))) TS_CommitmentUpdate_clone(uint64_t orig) { LDKCommitmentUpdate orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKCommitmentUpdate ret_var = CommitmentUpdate_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_ChannelMessageHandler_free"))) TS_ChannelMessageHandler_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKChannelMessageHandler this_ptr_conv = *(LDKChannelMessageHandler*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); ChannelMessageHandler_free(this_ptr_conv); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_RoutingMessageHandler_free"))) TS_RoutingMessageHandler_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKRoutingMessageHandler this_ptr_conv = *(LDKRoutingMessageHandler*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); RoutingMessageHandler_free(this_ptr_conv); } -int8_tArray __attribute__((export_name("TS_AcceptChannel_write"))) TS_AcceptChannel_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_AcceptChannel_write"))) TS_AcceptChannel_write(uint64_t obj) { LDKAcceptChannel obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = AcceptChannel_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -33861,21 +32232,22 @@ int8_tArray __attribute__((export_name("TS_AcceptChannel_write"))) TS_AcceptCha return ret_arr; } -uint32_t __attribute__((export_name("TS_AcceptChannel_read"))) TS_AcceptChannel_read(int8_tArray ser) { +uint64_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; LDKCResult_AcceptChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AcceptChannelDecodeErrorZ), "LDKCResult_AcceptChannelDecodeErrorZ"); *ret_conv = AcceptChannel_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_AnnouncementSignatures_write"))) TS_AnnouncementSignatures_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_AnnouncementSignatures_write"))) TS_AnnouncementSignatures_write(uint64_t obj) { LDKAnnouncementSignatures obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = AnnouncementSignatures_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -33883,21 +32255,22 @@ int8_tArray __attribute__((export_name("TS_AnnouncementSignatures_write"))) TS_ return ret_arr; } -uint32_t __attribute__((export_name("TS_AnnouncementSignatures_read"))) TS_AnnouncementSignatures_read(int8_tArray ser) { +uint64_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; LDKCResult_AnnouncementSignaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AnnouncementSignaturesDecodeErrorZ), "LDKCResult_AnnouncementSignaturesDecodeErrorZ"); *ret_conv = AnnouncementSignatures_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_ChannelReestablish_write"))) TS_ChannelReestablish_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ChannelReestablish_write"))) TS_ChannelReestablish_write(uint64_t obj) { LDKChannelReestablish obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ChannelReestablish_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -33905,21 +32278,22 @@ int8_tArray __attribute__((export_name("TS_ChannelReestablish_write"))) TS_Chan return ret_arr; } -uint32_t __attribute__((export_name("TS_ChannelReestablish_read"))) TS_ChannelReestablish_read(int8_tArray ser) { +uint64_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; LDKCResult_ChannelReestablishDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelReestablishDecodeErrorZ), "LDKCResult_ChannelReestablishDecodeErrorZ"); *ret_conv = ChannelReestablish_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_ClosingSigned_write"))) TS_ClosingSigned_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ClosingSigned_write"))) TS_ClosingSigned_write(uint64_t obj) { LDKClosingSigned obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ClosingSigned_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -33927,21 +32301,22 @@ int8_tArray __attribute__((export_name("TS_ClosingSigned_write"))) TS_ClosingSi return ret_arr; } -uint32_t __attribute__((export_name("TS_ClosingSigned_read"))) TS_ClosingSigned_read(int8_tArray ser) { +uint64_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; LDKCResult_ClosingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedDecodeErrorZ), "LDKCResult_ClosingSignedDecodeErrorZ"); *ret_conv = ClosingSigned_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_ClosingSignedFeeRange_write"))) TS_ClosingSignedFeeRange_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ClosingSignedFeeRange_write"))) TS_ClosingSignedFeeRange_write(uint64_t obj) { LDKClosingSignedFeeRange obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ClosingSignedFeeRange_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -33949,21 +32324,22 @@ int8_tArray __attribute__((export_name("TS_ClosingSignedFeeRange_write"))) TS_C return ret_arr; } -uint32_t __attribute__((export_name("TS_ClosingSignedFeeRange_read"))) TS_ClosingSignedFeeRange_read(int8_tArray ser) { +uint64_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; LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedFeeRangeDecodeErrorZ), "LDKCResult_ClosingSignedFeeRangeDecodeErrorZ"); *ret_conv = ClosingSignedFeeRange_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_CommitmentSigned_write"))) TS_CommitmentSigned_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_CommitmentSigned_write"))) TS_CommitmentSigned_write(uint64_t obj) { LDKCommitmentSigned obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = CommitmentSigned_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -33971,21 +32347,22 @@ int8_tArray __attribute__((export_name("TS_CommitmentSigned_write"))) TS_Commit return ret_arr; } -uint32_t __attribute__((export_name("TS_CommitmentSigned_read"))) TS_CommitmentSigned_read(int8_tArray ser) { +uint64_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; LDKCResult_CommitmentSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentSignedDecodeErrorZ), "LDKCResult_CommitmentSignedDecodeErrorZ"); *ret_conv = CommitmentSigned_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_FundingCreated_write"))) TS_FundingCreated_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_FundingCreated_write"))) TS_FundingCreated_write(uint64_t obj) { LDKFundingCreated obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = FundingCreated_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -33993,21 +32370,22 @@ int8_tArray __attribute__((export_name("TS_FundingCreated_write"))) TS_FundingC return ret_arr; } -uint32_t __attribute__((export_name("TS_FundingCreated_read"))) TS_FundingCreated_read(int8_tArray ser) { +uint64_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; LDKCResult_FundingCreatedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingCreatedDecodeErrorZ), "LDKCResult_FundingCreatedDecodeErrorZ"); *ret_conv = FundingCreated_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_FundingSigned_write"))) TS_FundingSigned_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_FundingSigned_write"))) TS_FundingSigned_write(uint64_t obj) { LDKFundingSigned obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = FundingSigned_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34015,21 +32393,22 @@ int8_tArray __attribute__((export_name("TS_FundingSigned_write"))) TS_FundingSi return ret_arr; } -uint32_t __attribute__((export_name("TS_FundingSigned_read"))) TS_FundingSigned_read(int8_tArray ser) { +uint64_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; LDKCResult_FundingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingSignedDecodeErrorZ), "LDKCResult_FundingSignedDecodeErrorZ"); *ret_conv = FundingSigned_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_ChannelReady_write"))) TS_ChannelReady_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ChannelReady_write"))) TS_ChannelReady_write(uint64_t obj) { LDKChannelReady obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ChannelReady_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34037,21 +32416,22 @@ int8_tArray __attribute__((export_name("TS_ChannelReady_write"))) TS_ChannelRea return ret_arr; } -uint32_t __attribute__((export_name("TS_ChannelReady_read"))) TS_ChannelReady_read(int8_tArray ser) { +uint64_t __attribute__((export_name("TS_ChannelReady_read"))) TS_ChannelReady_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; ser_ref.data = ser->elems; LDKCResult_ChannelReadyDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelReadyDecodeErrorZ), "LDKCResult_ChannelReadyDecodeErrorZ"); *ret_conv = ChannelReady_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_Init_write"))) TS_Init_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_Init_write"))) TS_Init_write(uint64_t obj) { LDKInit obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = Init_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34059,21 +32439,22 @@ int8_tArray __attribute__((export_name("TS_Init_write"))) TS_Init_write(uint32_ return ret_arr; } -uint32_t __attribute__((export_name("TS_Init_read"))) TS_Init_read(int8_tArray ser) { +uint64_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; LDKCResult_InitDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitDecodeErrorZ), "LDKCResult_InitDecodeErrorZ"); *ret_conv = Init_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_OpenChannel_write"))) TS_OpenChannel_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_OpenChannel_write"))) TS_OpenChannel_write(uint64_t obj) { LDKOpenChannel obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = OpenChannel_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34081,21 +32462,22 @@ int8_tArray __attribute__((export_name("TS_OpenChannel_write"))) TS_OpenChannel return ret_arr; } -uint32_t __attribute__((export_name("TS_OpenChannel_read"))) TS_OpenChannel_read(int8_tArray ser) { +uint64_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; LDKCResult_OpenChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OpenChannelDecodeErrorZ), "LDKCResult_OpenChannelDecodeErrorZ"); *ret_conv = OpenChannel_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_RevokeAndACK_write"))) TS_RevokeAndACK_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_RevokeAndACK_write"))) TS_RevokeAndACK_write(uint64_t obj) { LDKRevokeAndACK obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = RevokeAndACK_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34103,21 +32485,22 @@ int8_tArray __attribute__((export_name("TS_RevokeAndACK_write"))) TS_RevokeAndA return ret_arr; } -uint32_t __attribute__((export_name("TS_RevokeAndACK_read"))) TS_RevokeAndACK_read(int8_tArray ser) { +uint64_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; LDKCResult_RevokeAndACKDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RevokeAndACKDecodeErrorZ), "LDKCResult_RevokeAndACKDecodeErrorZ"); *ret_conv = RevokeAndACK_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_Shutdown_write"))) TS_Shutdown_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_Shutdown_write"))) TS_Shutdown_write(uint64_t obj) { LDKShutdown obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = Shutdown_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34125,21 +32508,22 @@ int8_tArray __attribute__((export_name("TS_Shutdown_write"))) TS_Shutdown_write return ret_arr; } -uint32_t __attribute__((export_name("TS_Shutdown_read"))) TS_Shutdown_read(int8_tArray ser) { +uint64_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; LDKCResult_ShutdownDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownDecodeErrorZ), "LDKCResult_ShutdownDecodeErrorZ"); *ret_conv = Shutdown_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_UpdateFailHTLC_write"))) TS_UpdateFailHTLC_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_UpdateFailHTLC_write"))) TS_UpdateFailHTLC_write(uint64_t obj) { LDKUpdateFailHTLC obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = UpdateFailHTLC_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34147,21 +32531,22 @@ int8_tArray __attribute__((export_name("TS_UpdateFailHTLC_write"))) TS_UpdateFa return ret_arr; } -uint32_t __attribute__((export_name("TS_UpdateFailHTLC_read"))) TS_UpdateFailHTLC_read(int8_tArray ser) { +uint64_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; LDKCResult_UpdateFailHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailHTLCDecodeErrorZ), "LDKCResult_UpdateFailHTLCDecodeErrorZ"); *ret_conv = UpdateFailHTLC_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_UpdateFailMalformedHTLC_write"))) TS_UpdateFailMalformedHTLC_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_UpdateFailMalformedHTLC_write"))) TS_UpdateFailMalformedHTLC_write(uint64_t obj) { LDKUpdateFailMalformedHTLC obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = UpdateFailMalformedHTLC_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34169,21 +32554,22 @@ int8_tArray __attribute__((export_name("TS_UpdateFailMalformedHTLC_write"))) TS return ret_arr; } -uint32_t __attribute__((export_name("TS_UpdateFailMalformedHTLC_read"))) TS_UpdateFailMalformedHTLC_read(int8_tArray ser) { +uint64_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; LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ), "LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ"); *ret_conv = UpdateFailMalformedHTLC_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_UpdateFee_write"))) TS_UpdateFee_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_UpdateFee_write"))) TS_UpdateFee_write(uint64_t obj) { LDKUpdateFee obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = UpdateFee_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34191,21 +32577,22 @@ int8_tArray __attribute__((export_name("TS_UpdateFee_write"))) TS_UpdateFee_wri return ret_arr; } -uint32_t __attribute__((export_name("TS_UpdateFee_read"))) TS_UpdateFee_read(int8_tArray ser) { +uint64_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; LDKCResult_UpdateFeeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFeeDecodeErrorZ), "LDKCResult_UpdateFeeDecodeErrorZ"); *ret_conv = UpdateFee_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_UpdateFulfillHTLC_write"))) TS_UpdateFulfillHTLC_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_UpdateFulfillHTLC_write"))) TS_UpdateFulfillHTLC_write(uint64_t obj) { LDKUpdateFulfillHTLC obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = UpdateFulfillHTLC_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34213,21 +32600,22 @@ int8_tArray __attribute__((export_name("TS_UpdateFulfillHTLC_write"))) TS_Updat return ret_arr; } -uint32_t __attribute__((export_name("TS_UpdateFulfillHTLC_read"))) TS_UpdateFulfillHTLC_read(int8_tArray ser) { +uint64_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; LDKCResult_UpdateFulfillHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFulfillHTLCDecodeErrorZ), "LDKCResult_UpdateFulfillHTLCDecodeErrorZ"); *ret_conv = UpdateFulfillHTLC_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_UpdateAddHTLC_write"))) TS_UpdateAddHTLC_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_UpdateAddHTLC_write"))) TS_UpdateAddHTLC_write(uint64_t obj) { LDKUpdateAddHTLC obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = UpdateAddHTLC_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34235,21 +32623,22 @@ int8_tArray __attribute__((export_name("TS_UpdateAddHTLC_write"))) TS_UpdateAdd return ret_arr; } -uint32_t __attribute__((export_name("TS_UpdateAddHTLC_read"))) TS_UpdateAddHTLC_read(int8_tArray ser) { +uint64_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; LDKCResult_UpdateAddHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateAddHTLCDecodeErrorZ), "LDKCResult_UpdateAddHTLCDecodeErrorZ"); *ret_conv = UpdateAddHTLC_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_Ping_write"))) TS_Ping_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_Ping_write"))) TS_Ping_write(uint64_t obj) { LDKPing obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = Ping_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34257,21 +32646,22 @@ int8_tArray __attribute__((export_name("TS_Ping_write"))) TS_Ping_write(uint32_ return ret_arr; } -uint32_t __attribute__((export_name("TS_Ping_read"))) TS_Ping_read(int8_tArray ser) { +uint64_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; LDKCResult_PingDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PingDecodeErrorZ), "LDKCResult_PingDecodeErrorZ"); *ret_conv = Ping_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_Pong_write"))) TS_Pong_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_Pong_write"))) TS_Pong_write(uint64_t obj) { LDKPong obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = Pong_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34279,21 +32669,22 @@ int8_tArray __attribute__((export_name("TS_Pong_write"))) TS_Pong_write(uint32_ return ret_arr; } -uint32_t __attribute__((export_name("TS_Pong_read"))) TS_Pong_read(int8_tArray ser) { +uint64_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; LDKCResult_PongDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PongDecodeErrorZ), "LDKCResult_PongDecodeErrorZ"); *ret_conv = Pong_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_UnsignedChannelAnnouncement_write"))) TS_UnsignedChannelAnnouncement_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_UnsignedChannelAnnouncement_write"))) TS_UnsignedChannelAnnouncement_write(uint64_t obj) { LDKUnsignedChannelAnnouncement obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = UnsignedChannelAnnouncement_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34301,21 +32692,22 @@ int8_tArray __attribute__((export_name("TS_UnsignedChannelAnnouncement_write")) return ret_arr; } -uint32_t __attribute__((export_name("TS_UnsignedChannelAnnouncement_read"))) TS_UnsignedChannelAnnouncement_read(int8_tArray ser) { +uint64_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; LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ), "LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ"); *ret_conv = UnsignedChannelAnnouncement_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_ChannelAnnouncement_write"))) TS_ChannelAnnouncement_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ChannelAnnouncement_write"))) TS_ChannelAnnouncement_write(uint64_t obj) { LDKChannelAnnouncement obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ChannelAnnouncement_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34323,21 +32715,22 @@ int8_tArray __attribute__((export_name("TS_ChannelAnnouncement_write"))) TS_Cha return ret_arr; } -uint32_t __attribute__((export_name("TS_ChannelAnnouncement_read"))) TS_ChannelAnnouncement_read(int8_tArray ser) { +uint64_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; LDKCResult_ChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelAnnouncementDecodeErrorZ), "LDKCResult_ChannelAnnouncementDecodeErrorZ"); *ret_conv = ChannelAnnouncement_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_UnsignedChannelUpdate_write"))) TS_UnsignedChannelUpdate_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_UnsignedChannelUpdate_write"))) TS_UnsignedChannelUpdate_write(uint64_t obj) { LDKUnsignedChannelUpdate obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = UnsignedChannelUpdate_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34345,21 +32738,22 @@ int8_tArray __attribute__((export_name("TS_UnsignedChannelUpdate_write"))) TS_U return ret_arr; } -uint32_t __attribute__((export_name("TS_UnsignedChannelUpdate_read"))) TS_UnsignedChannelUpdate_read(int8_tArray ser) { +uint64_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; LDKCResult_UnsignedChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelUpdateDecodeErrorZ), "LDKCResult_UnsignedChannelUpdateDecodeErrorZ"); *ret_conv = UnsignedChannelUpdate_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_ChannelUpdate_write"))) TS_ChannelUpdate_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ChannelUpdate_write"))) TS_ChannelUpdate_write(uint64_t obj) { LDKChannelUpdate obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ChannelUpdate_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34367,21 +32761,22 @@ int8_tArray __attribute__((export_name("TS_ChannelUpdate_write"))) TS_ChannelUp return ret_arr; } -uint32_t __attribute__((export_name("TS_ChannelUpdate_read"))) TS_ChannelUpdate_read(int8_tArray ser) { +uint64_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; LDKCResult_ChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateDecodeErrorZ), "LDKCResult_ChannelUpdateDecodeErrorZ"); *ret_conv = ChannelUpdate_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_ErrorMessage_write"))) TS_ErrorMessage_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ErrorMessage_write"))) TS_ErrorMessage_write(uint64_t obj) { LDKErrorMessage obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ErrorMessage_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34389,21 +32784,22 @@ int8_tArray __attribute__((export_name("TS_ErrorMessage_write"))) TS_ErrorMessa return ret_arr; } -uint32_t __attribute__((export_name("TS_ErrorMessage_read"))) TS_ErrorMessage_read(int8_tArray ser) { +uint64_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; LDKCResult_ErrorMessageDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ErrorMessageDecodeErrorZ), "LDKCResult_ErrorMessageDecodeErrorZ"); *ret_conv = ErrorMessage_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_WarningMessage_write"))) TS_WarningMessage_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_WarningMessage_write"))) TS_WarningMessage_write(uint64_t obj) { LDKWarningMessage obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = WarningMessage_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34411,21 +32807,22 @@ int8_tArray __attribute__((export_name("TS_WarningMessage_write"))) TS_WarningM return ret_arr; } -uint32_t __attribute__((export_name("TS_WarningMessage_read"))) TS_WarningMessage_read(int8_tArray ser) { +uint64_t __attribute__((export_name("TS_WarningMessage_read"))) TS_WarningMessage_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; ser_ref.data = ser->elems; LDKCResult_WarningMessageDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_WarningMessageDecodeErrorZ), "LDKCResult_WarningMessageDecodeErrorZ"); *ret_conv = WarningMessage_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_UnsignedNodeAnnouncement_write"))) TS_UnsignedNodeAnnouncement_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_UnsignedNodeAnnouncement_write"))) TS_UnsignedNodeAnnouncement_write(uint64_t obj) { LDKUnsignedNodeAnnouncement obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = UnsignedNodeAnnouncement_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34433,21 +32830,22 @@ int8_tArray __attribute__((export_name("TS_UnsignedNodeAnnouncement_write"))) T return ret_arr; } -uint32_t __attribute__((export_name("TS_UnsignedNodeAnnouncement_read"))) TS_UnsignedNodeAnnouncement_read(int8_tArray ser) { +uint64_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; LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ), "LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ"); *ret_conv = UnsignedNodeAnnouncement_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_NodeAnnouncement_write"))) TS_NodeAnnouncement_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_NodeAnnouncement_write"))) TS_NodeAnnouncement_write(uint64_t obj) { LDKNodeAnnouncement obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = NodeAnnouncement_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34455,31 +32853,32 @@ int8_tArray __attribute__((export_name("TS_NodeAnnouncement_write"))) TS_NodeAn return ret_arr; } -uint32_t __attribute__((export_name("TS_NodeAnnouncement_read"))) TS_NodeAnnouncement_read(int8_tArray ser) { +uint64_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; LDKCResult_NodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementDecodeErrorZ), "LDKCResult_NodeAnnouncementDecodeErrorZ"); *ret_conv = NodeAnnouncement_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_QueryShortChannelIds_read"))) TS_QueryShortChannelIds_read(int8_tArray ser) { +uint64_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; LDKCResult_QueryShortChannelIdsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryShortChannelIdsDecodeErrorZ), "LDKCResult_QueryShortChannelIdsDecodeErrorZ"); *ret_conv = QueryShortChannelIds_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_QueryShortChannelIds_write"))) TS_QueryShortChannelIds_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_QueryShortChannelIds_write"))) TS_QueryShortChannelIds_write(uint64_t obj) { LDKQueryShortChannelIds obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = QueryShortChannelIds_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34487,11 +32886,12 @@ int8_tArray __attribute__((export_name("TS_QueryShortChannelIds_write"))) TS_Qu return ret_arr; } -int8_tArray __attribute__((export_name("TS_ReplyShortChannelIdsEnd_write"))) TS_ReplyShortChannelIdsEnd_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ReplyShortChannelIdsEnd_write"))) TS_ReplyShortChannelIdsEnd_write(uint64_t obj) { LDKReplyShortChannelIdsEnd obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ReplyShortChannelIdsEnd_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34499,30 +32899,32 @@ int8_tArray __attribute__((export_name("TS_ReplyShortChannelIdsEnd_write"))) TS return ret_arr; } -uint32_t __attribute__((export_name("TS_ReplyShortChannelIdsEnd_read"))) TS_ReplyShortChannelIdsEnd_read(int8_tArray ser) { +uint64_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; LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ), "LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ"); *ret_conv = ReplyShortChannelIdsEnd_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int32_t __attribute__((export_name("TS_QueryChannelRange_end_blocknum"))) TS_QueryChannelRange_end_blocknum(uint32_t this_arg) { +int32_t __attribute__((export_name("TS_QueryChannelRange_end_blocknum"))) TS_QueryChannelRange_end_blocknum(uint64_t this_arg) { LDKQueryChannelRange this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int32_t ret_conv = QueryChannelRange_end_blocknum(&this_arg_conv); return ret_conv; } -int8_tArray __attribute__((export_name("TS_QueryChannelRange_write"))) TS_QueryChannelRange_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_QueryChannelRange_write"))) TS_QueryChannelRange_write(uint64_t obj) { LDKQueryChannelRange obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = QueryChannelRange_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34530,31 +32932,32 @@ int8_tArray __attribute__((export_name("TS_QueryChannelRange_write"))) TS_Query return ret_arr; } -uint32_t __attribute__((export_name("TS_QueryChannelRange_read"))) TS_QueryChannelRange_read(int8_tArray ser) { +uint64_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; LDKCResult_QueryChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryChannelRangeDecodeErrorZ), "LDKCResult_QueryChannelRangeDecodeErrorZ"); *ret_conv = QueryChannelRange_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_ReplyChannelRange_read"))) TS_ReplyChannelRange_read(int8_tArray ser) { +uint64_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; LDKCResult_ReplyChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyChannelRangeDecodeErrorZ), "LDKCResult_ReplyChannelRangeDecodeErrorZ"); *ret_conv = ReplyChannelRange_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_ReplyChannelRange_write"))) TS_ReplyChannelRange_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ReplyChannelRange_write"))) TS_ReplyChannelRange_write(uint64_t obj) { LDKReplyChannelRange obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ReplyChannelRange_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34562,11 +32965,12 @@ int8_tArray __attribute__((export_name("TS_ReplyChannelRange_write"))) TS_Reply return ret_arr; } -int8_tArray __attribute__((export_name("TS_GossipTimestampFilter_write"))) TS_GossipTimestampFilter_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_GossipTimestampFilter_write"))) TS_GossipTimestampFilter_write(uint64_t obj) { LDKGossipTimestampFilter obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = GossipTimestampFilter_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -34574,151 +32978,149 @@ int8_tArray __attribute__((export_name("TS_GossipTimestampFilter_write"))) TS_G return ret_arr; } -uint32_t __attribute__((export_name("TS_GossipTimestampFilter_read"))) TS_GossipTimestampFilter_read(int8_tArray ser) { +uint64_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; LDKCResult_GossipTimestampFilterDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_GossipTimestampFilterDecodeErrorZ), "LDKCResult_GossipTimestampFilterDecodeErrorZ"); *ret_conv = GossipTimestampFilter_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_CustomMessageHandler_free"))) TS_CustomMessageHandler_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKCustomMessageHandler this_ptr_conv = *(LDKCustomMessageHandler*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); CustomMessageHandler_free(this_ptr_conv); } -void __attribute__((export_name("TS_IgnoringMessageHandler_free"))) TS_IgnoringMessageHandler_free(uint32_t this_obj) { +void __attribute__((export_name("TS_IgnoringMessageHandler_free"))) TS_IgnoringMessageHandler_free(uint64_t this_obj) { LDKIgnoringMessageHandler this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); IgnoringMessageHandler_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_IgnoringMessageHandler_new"))) TS_IgnoringMessageHandler_new() { +uint64_t __attribute__((export_name("TS_IgnoringMessageHandler_new"))) TS_IgnoringMessageHandler_new() { LDKIgnoringMessageHandler ret_var = IgnoringMessageHandler_new(); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_IgnoringMessageHandler_as_MessageSendEventsProvider"))) TS_IgnoringMessageHandler_as_MessageSendEventsProvider(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_IgnoringMessageHandler_as_MessageSendEventsProvider"))) TS_IgnoringMessageHandler_as_MessageSendEventsProvider(uint64_t this_arg) { LDKIgnoringMessageHandler this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKMessageSendEventsProvider* ret_ret = MALLOC(sizeof(LDKMessageSendEventsProvider), "LDKMessageSendEventsProvider"); *ret_ret = IgnoringMessageHandler_as_MessageSendEventsProvider(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_t __attribute__((export_name("TS_IgnoringMessageHandler_as_RoutingMessageHandler"))) TS_IgnoringMessageHandler_as_RoutingMessageHandler(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_IgnoringMessageHandler_as_RoutingMessageHandler"))) TS_IgnoringMessageHandler_as_RoutingMessageHandler(uint64_t this_arg) { LDKIgnoringMessageHandler this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKRoutingMessageHandler* ret_ret = MALLOC(sizeof(LDKRoutingMessageHandler), "LDKRoutingMessageHandler"); *ret_ret = IgnoringMessageHandler_as_RoutingMessageHandler(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_t __attribute__((export_name("TS_IgnoringMessageHandler_as_CustomMessageReader"))) TS_IgnoringMessageHandler_as_CustomMessageReader(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_IgnoringMessageHandler_as_CustomMessageReader"))) TS_IgnoringMessageHandler_as_CustomMessageReader(uint64_t this_arg) { LDKIgnoringMessageHandler this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCustomMessageReader* ret_ret = MALLOC(sizeof(LDKCustomMessageReader), "LDKCustomMessageReader"); *ret_ret = IgnoringMessageHandler_as_CustomMessageReader(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_t __attribute__((export_name("TS_IgnoringMessageHandler_as_CustomMessageHandler"))) TS_IgnoringMessageHandler_as_CustomMessageHandler(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_IgnoringMessageHandler_as_CustomMessageHandler"))) TS_IgnoringMessageHandler_as_CustomMessageHandler(uint64_t this_arg) { LDKIgnoringMessageHandler this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCustomMessageHandler* ret_ret = MALLOC(sizeof(LDKCustomMessageHandler), "LDKCustomMessageHandler"); *ret_ret = IgnoringMessageHandler_as_CustomMessageHandler(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -void __attribute__((export_name("TS_ErroringMessageHandler_free"))) TS_ErroringMessageHandler_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ErroringMessageHandler_free"))) TS_ErroringMessageHandler_free(uint64_t this_obj) { LDKErroringMessageHandler this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ErroringMessageHandler_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_ErroringMessageHandler_new"))) TS_ErroringMessageHandler_new() { +uint64_t __attribute__((export_name("TS_ErroringMessageHandler_new"))) TS_ErroringMessageHandler_new() { LDKErroringMessageHandler ret_var = ErroringMessageHandler_new(); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ErroringMessageHandler_as_MessageSendEventsProvider"))) TS_ErroringMessageHandler_as_MessageSendEventsProvider(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ErroringMessageHandler_as_MessageSendEventsProvider"))) TS_ErroringMessageHandler_as_MessageSendEventsProvider(uint64_t this_arg) { LDKErroringMessageHandler this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKMessageSendEventsProvider* ret_ret = MALLOC(sizeof(LDKMessageSendEventsProvider), "LDKMessageSendEventsProvider"); *ret_ret = ErroringMessageHandler_as_MessageSendEventsProvider(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_t __attribute__((export_name("TS_ErroringMessageHandler_as_ChannelMessageHandler"))) TS_ErroringMessageHandler_as_ChannelMessageHandler(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ErroringMessageHandler_as_ChannelMessageHandler"))) TS_ErroringMessageHandler_as_ChannelMessageHandler(uint64_t this_arg) { LDKErroringMessageHandler this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKChannelMessageHandler* ret_ret = MALLOC(sizeof(LDKChannelMessageHandler), "LDKChannelMessageHandler"); *ret_ret = ErroringMessageHandler_as_ChannelMessageHandler(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -void __attribute__((export_name("TS_MessageHandler_free"))) TS_MessageHandler_free(uint32_t this_obj) { +void __attribute__((export_name("TS_MessageHandler_free"))) TS_MessageHandler_free(uint64_t this_obj) { LDKMessageHandler this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); MessageHandler_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_MessageHandler_get_chan_handler"))) TS_MessageHandler_get_chan_handler(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_MessageHandler_get_chan_handler"))) TS_MessageHandler_get_chan_handler(uint64_t this_ptr) { LDKMessageHandler this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; // WARNING: This object doesn't live past this scope, needs clone! - uint32_t ret_ret = ((uintptr_t)MessageHandler_get_chan_handler(&this_ptr_conv)) | 1; + uint64_t ret_ret = tag_ptr(MessageHandler_get_chan_handler(&this_ptr_conv), false); return ret_ret; } -void __attribute__((export_name("TS_MessageHandler_set_chan_handler"))) TS_MessageHandler_set_chan_handler(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_MessageHandler_set_chan_handler"))) TS_MessageHandler_set_chan_handler(uint64_t this_ptr, uint64_t val) { LDKMessageHandler this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKChannelMessageHandler val_conv = *(LDKChannelMessageHandler*)(val_ptr); if (val_conv.free == LDKChannelMessageHandler_JCalls_free) { @@ -34728,22 +33130,24 @@ void __attribute__((export_name("TS_MessageHandler_set_chan_handler"))) TS_Mess MessageHandler_set_chan_handler(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_MessageHandler_get_route_handler"))) TS_MessageHandler_get_route_handler(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_MessageHandler_get_route_handler"))) TS_MessageHandler_get_route_handler(uint64_t this_ptr) { LDKMessageHandler this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; // WARNING: This object doesn't live past this scope, needs clone! - uint32_t ret_ret = ((uintptr_t)MessageHandler_get_route_handler(&this_ptr_conv)) | 1; + uint64_t ret_ret = tag_ptr(MessageHandler_get_route_handler(&this_ptr_conv), false); return ret_ret; } -void __attribute__((export_name("TS_MessageHandler_set_route_handler"))) TS_MessageHandler_set_route_handler(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_MessageHandler_set_route_handler"))) TS_MessageHandler_set_route_handler(uint64_t this_ptr, uint64_t val) { LDKMessageHandler this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKRoutingMessageHandler val_conv = *(LDKRoutingMessageHandler*)(val_ptr); if (val_conv.free == LDKRoutingMessageHandler_JCalls_free) { @@ -34753,15 +33157,15 @@ void __attribute__((export_name("TS_MessageHandler_set_route_handler"))) TS_Mes 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*)(((uintptr_t)chan_handler_arg) & ~1); +uint64_t __attribute__((export_name("TS_MessageHandler_new"))) TS_MessageHandler_new(uint64_t chan_handler_arg, uint64_t route_handler_arg) { + void* chan_handler_arg_ptr = untag_ptr(chan_handler_arg); CHECK_ACCESS(chan_handler_arg_ptr); LDKChannelMessageHandler chan_handler_arg_conv = *(LDKChannelMessageHandler*)(chan_handler_arg_ptr); if (chan_handler_arg_conv.free == LDKChannelMessageHandler_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKChannelMessageHandler_JCalls_cloned(&chan_handler_arg_conv); } - void* route_handler_arg_ptr = (void*)(((uintptr_t)route_handler_arg) & ~1); + void* route_handler_arg_ptr = untag_ptr(route_handler_arg); CHECK_ACCESS(route_handler_arg_ptr); LDKRoutingMessageHandler route_handler_arg_conv = *(LDKRoutingMessageHandler*)(route_handler_arg_ptr); if (route_handler_arg_conv.free == LDKRoutingMessageHandler_JCalls_free) { @@ -34769,138 +33173,123 @@ uint32_t __attribute__((export_name("TS_MessageHandler_new"))) TS_MessageHandle LDKRoutingMessageHandler_JCalls_cloned(&route_handler_arg_conv); } LDKMessageHandler ret_var = MessageHandler_new(chan_handler_arg_conv, route_handler_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t SocketDescriptor_clone_ptr(LDKSocketDescriptor *NONNULL_PTR arg) { +static inline uint64_t SocketDescriptor_clone_ptr(LDKSocketDescriptor *NONNULL_PTR arg) { LDKSocketDescriptor* ret_ret = MALLOC(sizeof(LDKSocketDescriptor), "LDKSocketDescriptor"); *ret_ret = SocketDescriptor_clone(arg); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_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); } +int64_t __attribute__((export_name("TS_SocketDescriptor_clone_ptr"))) TS_SocketDescriptor_clone_ptr(uint64_t arg) { + void* arg_ptr = untag_ptr(arg); + if (ptr_is_owned(arg)) { CHECK_ACCESS(arg_ptr); } LDKSocketDescriptor* arg_conv = (LDKSocketDescriptor*)arg_ptr; - uint32_t ret_conv = SocketDescriptor_clone_ptr(arg_conv); + int64_t ret_conv = SocketDescriptor_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_SocketDescriptor_clone"))) TS_SocketDescriptor_clone(uint32_t orig) { - void* orig_ptr = (void*)(((uintptr_t)orig) & ~1); - if (!(orig & 1)) { CHECK_ACCESS(orig_ptr); } +uint64_t __attribute__((export_name("TS_SocketDescriptor_clone"))) TS_SocketDescriptor_clone(uint64_t orig) { + void* orig_ptr = untag_ptr(orig); + if (ptr_is_owned(orig)) { CHECK_ACCESS(orig_ptr); } LDKSocketDescriptor* orig_conv = (LDKSocketDescriptor*)orig_ptr; LDKSocketDescriptor* ret_ret = MALLOC(sizeof(LDKSocketDescriptor), "LDKSocketDescriptor"); *ret_ret = SocketDescriptor_clone(orig_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_SocketDescriptor_free"))) TS_SocketDescriptor_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKSocketDescriptor this_ptr_conv = *(LDKSocketDescriptor*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); SocketDescriptor_free(this_ptr_conv); } -void __attribute__((export_name("TS_PeerHandleError_free"))) TS_PeerHandleError_free(uint32_t this_obj) { +void __attribute__((export_name("TS_PeerHandleError_free"))) TS_PeerHandleError_free(uint64_t this_obj) { LDKPeerHandleError this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); PeerHandleError_free(this_obj_conv); } -jboolean __attribute__((export_name("TS_PeerHandleError_get_no_connection_possible"))) TS_PeerHandleError_get_no_connection_possible(uint32_t this_ptr) { +jboolean __attribute__((export_name("TS_PeerHandleError_get_no_connection_possible"))) TS_PeerHandleError_get_no_connection_possible(uint64_t this_ptr) { LDKPeerHandleError this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; jboolean ret_conv = PeerHandleError_get_no_connection_possible(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_PeerHandleError_set_no_connection_possible"))) TS_PeerHandleError_set_no_connection_possible(uint32_t this_ptr, jboolean val) { +void __attribute__((export_name("TS_PeerHandleError_set_no_connection_possible"))) TS_PeerHandleError_set_no_connection_possible(uint64_t this_ptr, jboolean val) { LDKPeerHandleError this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; PeerHandleError_set_no_connection_possible(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_PeerHandleError_new"))) TS_PeerHandleError_new(jboolean no_connection_possible_arg) { +uint64_t __attribute__((export_name("TS_PeerHandleError_new"))) TS_PeerHandleError_new(jboolean no_connection_possible_arg) { LDKPeerHandleError ret_var = PeerHandleError_new(no_connection_possible_arg); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t PeerHandleError_clone_ptr(LDKPeerHandleError *NONNULL_PTR arg) { +static inline uint64_t PeerHandleError_clone_ptr(LDKPeerHandleError *NONNULL_PTR arg) { LDKPeerHandleError ret_var = PeerHandleError_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_PeerHandleError_clone_ptr"))) TS_PeerHandleError_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_PeerHandleError_clone_ptr"))) TS_PeerHandleError_clone_ptr(uint64_t arg) { LDKPeerHandleError arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = PeerHandleError_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = PeerHandleError_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_PeerHandleError_clone"))) TS_PeerHandleError_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_PeerHandleError_clone"))) TS_PeerHandleError_clone(uint64_t orig) { LDKPeerHandleError orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKPeerHandleError ret_var = PeerHandleError_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_PeerManager_free"))) TS_PeerManager_free(uint32_t this_obj) { +void __attribute__((export_name("TS_PeerManager_free"))) TS_PeerManager_free(uint64_t this_obj) { LDKPeerManager this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); PeerManager_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_PeerManager_new"))) TS_PeerManager_new(uint32_t message_handler, int8_tArray our_node_secret, int8_tArray ephemeral_random_data, uint32_t logger, uint32_t custom_message_handler) { +uint64_t __attribute__((export_name("TS_PeerManager_new"))) TS_PeerManager_new(uint64_t message_handler, int8_tArray our_node_secret, int8_tArray ephemeral_random_data, uint64_t logger, uint64_t custom_message_handler) { LDKMessageHandler message_handler_conv; - message_handler_conv.inner = (void*)(message_handler & (~1)); - message_handler_conv.is_owned = (message_handler & 1) || (message_handler == 0); + message_handler_conv.inner = untag_ptr(message_handler); + message_handler_conv.is_owned = ptr_is_owned(message_handler); CHECK_INNER_FIELD_ACCESS_OR_NULL(message_handler_conv); // 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); FREE(our_node_secret); @@ -34908,14 +33297,14 @@ uint32_t __attribute__((export_name("TS_PeerManager_new"))) TS_PeerManager_new( CHECK(ephemeral_random_data->arr_len == 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*)(((uintptr_t)logger) & ~1); + void* logger_ptr = untag_ptr(logger); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); if (logger_conv.free == LDKLogger_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKLogger_JCalls_cloned(&logger_conv); } - void* custom_message_handler_ptr = (void*)(((uintptr_t)custom_message_handler) & ~1); + void* custom_message_handler_ptr = untag_ptr(custom_message_handler); CHECK_ACCESS(custom_message_handler_ptr); LDKCustomMessageHandler custom_message_handler_conv = *(LDKCustomMessageHandler*)(custom_message_handler_ptr); if (custom_message_handler_conv.free == LDKCustomMessageHandler_JCalls_free) { @@ -34923,22 +33312,18 @@ uint32_t __attribute__((export_name("TS_PeerManager_new"))) TS_PeerManager_new( LDKCustomMessageHandler_JCalls_cloned(&custom_message_handler_conv); } LDKPeerManager ret_var = PeerManager_new(message_handler_conv, our_node_secret_ref, ephemeral_random_data_ref, logger_conv, custom_message_handler_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -ptrArray __attribute__((export_name("TS_PeerManager_get_peer_node_ids"))) TS_PeerManager_get_peer_node_ids(uint32_t this_arg) { +ptrArray __attribute__((export_name("TS_PeerManager_get_peer_node_ids"))) TS_PeerManager_get_peer_node_ids(uint64_t this_arg) { LDKPeerManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCVec_PublicKeyZ ret_var = PeerManager_get_peer_node_ids(&this_arg_conv); ptrArray ret_arr = NULL; ret_arr = init_ptrArray(ret_var.datalen, __LINE__); @@ -34953,69 +33338,73 @@ ptrArray __attribute__((export_name("TS_PeerManager_get_peer_node_ids"))) TS_Pe return ret_arr; } -uint32_t __attribute__((export_name("TS_PeerManager_new_outbound_connection"))) TS_PeerManager_new_outbound_connection(uint32_t this_arg, int8_tArray their_node_id, uint32_t descriptor, uint32_t remote_network_address) { +uint64_t __attribute__((export_name("TS_PeerManager_new_outbound_connection"))) TS_PeerManager_new_outbound_connection(uint64_t this_arg, int8_tArray their_node_id, uint64_t descriptor, uint64_t remote_network_address) { LDKPeerManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKPublicKey their_node_id_ref; CHECK(their_node_id->arr_len == 33); memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); FREE(their_node_id); - void* descriptor_ptr = (void*)(((uintptr_t)descriptor) & ~1); + void* descriptor_ptr = untag_ptr(descriptor); CHECK_ACCESS(descriptor_ptr); LDKSocketDescriptor descriptor_conv = *(LDKSocketDescriptor*)(descriptor_ptr); if (descriptor_conv.free == LDKSocketDescriptor_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKSocketDescriptor_JCalls_cloned(&descriptor_conv); } - void* remote_network_address_ptr = (void*)(((uintptr_t)remote_network_address) & ~1); + void* remote_network_address_ptr = untag_ptr(remote_network_address); CHECK_ACCESS(remote_network_address_ptr); LDKCOption_NetAddressZ remote_network_address_conv = *(LDKCOption_NetAddressZ*)(remote_network_address_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, remote_network_address_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_PeerManager_new_inbound_connection"))) TS_PeerManager_new_inbound_connection(uint32_t this_arg, uint32_t descriptor, uint32_t remote_network_address) { +uint64_t __attribute__((export_name("TS_PeerManager_new_inbound_connection"))) TS_PeerManager_new_inbound_connection(uint64_t this_arg, uint64_t descriptor, uint64_t remote_network_address) { LDKPeerManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); - void* descriptor_ptr = (void*)(((uintptr_t)descriptor) & ~1); + this_arg_conv.is_owned = false; + void* descriptor_ptr = untag_ptr(descriptor); CHECK_ACCESS(descriptor_ptr); LDKSocketDescriptor descriptor_conv = *(LDKSocketDescriptor*)(descriptor_ptr); if (descriptor_conv.free == LDKSocketDescriptor_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKSocketDescriptor_JCalls_cloned(&descriptor_conv); } - void* remote_network_address_ptr = (void*)(((uintptr_t)remote_network_address) & ~1); + void* remote_network_address_ptr = untag_ptr(remote_network_address); CHECK_ACCESS(remote_network_address_ptr); LDKCOption_NetAddressZ remote_network_address_conv = *(LDKCOption_NetAddressZ*)(remote_network_address_ptr); LDKCResult_NonePeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePeerHandleErrorZ), "LDKCResult_NonePeerHandleErrorZ"); *ret_conv = PeerManager_new_inbound_connection(&this_arg_conv, descriptor_conv, remote_network_address_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_PeerManager_write_buffer_space_avail"))) TS_PeerManager_write_buffer_space_avail(uint32_t this_arg, uint32_t descriptor) { +uint64_t __attribute__((export_name("TS_PeerManager_write_buffer_space_avail"))) TS_PeerManager_write_buffer_space_avail(uint64_t this_arg, uint64_t descriptor) { LDKPeerManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); - void* descriptor_ptr = (void*)(((uintptr_t)descriptor) & ~1); - if (!(descriptor & 1)) { CHECK_ACCESS(descriptor_ptr); } + this_arg_conv.is_owned = false; + void* descriptor_ptr = untag_ptr(descriptor); + if (ptr_is_owned(descriptor)) { 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_PeerManager_read_event"))) TS_PeerManager_read_event(uint32_t this_arg, uint32_t peer_descriptor, int8_tArray data) { +uint64_t __attribute__((export_name("TS_PeerManager_read_event"))) TS_PeerManager_read_event(uint64_t this_arg, uint64_t peer_descriptor, int8_tArray data) { LDKPeerManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); - void* peer_descriptor_ptr = (void*)(((uintptr_t)peer_descriptor) & ~1); - if (!(peer_descriptor & 1)) { CHECK_ACCESS(peer_descriptor_ptr); } + this_arg_conv.is_owned = false; + void* peer_descriptor_ptr = untag_ptr(peer_descriptor); + if (ptr_is_owned(peer_descriptor)) { CHECK_ACCESS(peer_descriptor_ptr); } LDKSocketDescriptor* peer_descriptor_conv = (LDKSocketDescriptor*)peer_descriptor_ptr; LDKu8slice data_ref; data_ref.datalen = data->arr_len; @@ -35023,52 +33412,57 @@ uint32_t __attribute__((export_name("TS_PeerManager_read_event"))) TS_PeerManag LDKCResult_boolPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolPeerHandleErrorZ), "LDKCResult_boolPeerHandleErrorZ"); *ret_conv = PeerManager_read_event(&this_arg_conv, peer_descriptor_conv, data_ref); FREE(data); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_PeerManager_process_events"))) TS_PeerManager_process_events(uint32_t this_arg) { +void __attribute__((export_name("TS_PeerManager_process_events"))) TS_PeerManager_process_events(uint64_t this_arg) { LDKPeerManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; PeerManager_process_events(&this_arg_conv); } -void __attribute__((export_name("TS_PeerManager_socket_disconnected"))) TS_PeerManager_socket_disconnected(uint32_t this_arg, uint32_t descriptor) { +void __attribute__((export_name("TS_PeerManager_socket_disconnected"))) TS_PeerManager_socket_disconnected(uint64_t this_arg, uint64_t descriptor) { LDKPeerManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); - void* descriptor_ptr = (void*)(((uintptr_t)descriptor) & ~1); - if (!(descriptor & 1)) { CHECK_ACCESS(descriptor_ptr); } + this_arg_conv.is_owned = false; + void* descriptor_ptr = untag_ptr(descriptor); + if (ptr_is_owned(descriptor)) { CHECK_ACCESS(descriptor_ptr); } LDKSocketDescriptor* descriptor_conv = (LDKSocketDescriptor*)descriptor_ptr; PeerManager_socket_disconnected(&this_arg_conv, descriptor_conv); } -void __attribute__((export_name("TS_PeerManager_disconnect_by_node_id"))) TS_PeerManager_disconnect_by_node_id(uint32_t this_arg, int8_tArray node_id, jboolean no_connection_possible) { +void __attribute__((export_name("TS_PeerManager_disconnect_by_node_id"))) TS_PeerManager_disconnect_by_node_id(uint64_t this_arg, int8_tArray node_id, jboolean no_connection_possible) { LDKPeerManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 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); } -void __attribute__((export_name("TS_PeerManager_disconnect_all_peers"))) TS_PeerManager_disconnect_all_peers(uint32_t this_arg) { +void __attribute__((export_name("TS_PeerManager_disconnect_all_peers"))) TS_PeerManager_disconnect_all_peers(uint64_t this_arg) { LDKPeerManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; PeerManager_disconnect_all_peers(&this_arg_conv); } -void __attribute__((export_name("TS_PeerManager_timer_tick_occurred"))) TS_PeerManager_timer_tick_occurred(uint32_t this_arg) { +void __attribute__((export_name("TS_PeerManager_timer_tick_occurred"))) TS_PeerManager_timer_tick_occurred(uint64_t this_arg) { LDKPeerManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; PeerManager_timer_tick_occurred(&this_arg_conv); } @@ -35092,7 +33486,7 @@ int8_tArray __attribute__((export_name("TS_build_commitment_secret"))) TS_build return ret_arr; } -int8_tArray __attribute__((export_name("TS_build_closing_transaction"))) TS_build_closing_transaction(int64_t to_holder_value_sat, int64_t to_counterparty_value_sat, int8_tArray to_holder_script, int8_tArray to_counterparty_script, uint32_t funding_outpoint) { +int8_tArray __attribute__((export_name("TS_build_closing_transaction"))) TS_build_closing_transaction(int64_t to_holder_value_sat, int64_t to_counterparty_value_sat, int8_tArray to_holder_script, int8_tArray to_counterparty_script, uint64_t funding_outpoint) { 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"); @@ -35102,8 +33496,8 @@ int8_tArray __attribute__((export_name("TS_build_closing_transaction"))) TS_bui 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); 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); + funding_outpoint_conv.inner = untag_ptr(funding_outpoint); + funding_outpoint_conv.is_owned = ptr_is_owned(funding_outpoint); 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); @@ -35113,102 +33507,93 @@ int8_tArray __attribute__((export_name("TS_build_closing_transaction"))) TS_bui return ret_arr; } -void __attribute__((export_name("TS_CounterpartyCommitmentSecrets_free"))) TS_CounterpartyCommitmentSecrets_free(uint32_t this_obj) { +void __attribute__((export_name("TS_CounterpartyCommitmentSecrets_free"))) TS_CounterpartyCommitmentSecrets_free(uint64_t this_obj) { LDKCounterpartyCommitmentSecrets this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); CounterpartyCommitmentSecrets_free(this_obj_conv); } -static inline uintptr_t CounterpartyCommitmentSecrets_clone_ptr(LDKCounterpartyCommitmentSecrets *NONNULL_PTR arg) { +static inline uint64_t CounterpartyCommitmentSecrets_clone_ptr(LDKCounterpartyCommitmentSecrets *NONNULL_PTR arg) { LDKCounterpartyCommitmentSecrets ret_var = CounterpartyCommitmentSecrets_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_CounterpartyCommitmentSecrets_clone_ptr"))) TS_CounterpartyCommitmentSecrets_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_CounterpartyCommitmentSecrets_clone_ptr"))) TS_CounterpartyCommitmentSecrets_clone_ptr(uint64_t arg) { LDKCounterpartyCommitmentSecrets arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = CounterpartyCommitmentSecrets_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = CounterpartyCommitmentSecrets_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CounterpartyCommitmentSecrets_clone"))) TS_CounterpartyCommitmentSecrets_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_CounterpartyCommitmentSecrets_clone"))) TS_CounterpartyCommitmentSecrets_clone(uint64_t orig) { LDKCounterpartyCommitmentSecrets orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKCounterpartyCommitmentSecrets ret_var = CounterpartyCommitmentSecrets_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_CounterpartyCommitmentSecrets_new"))) TS_CounterpartyCommitmentSecrets_new() { +uint64_t __attribute__((export_name("TS_CounterpartyCommitmentSecrets_new"))) TS_CounterpartyCommitmentSecrets_new() { LDKCounterpartyCommitmentSecrets ret_var = CounterpartyCommitmentSecrets_new(); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int64_t __attribute__((export_name("TS_CounterpartyCommitmentSecrets_get_min_seen_secret"))) TS_CounterpartyCommitmentSecrets_get_min_seen_secret(uint32_t this_arg) { +int64_t __attribute__((export_name("TS_CounterpartyCommitmentSecrets_get_min_seen_secret"))) TS_CounterpartyCommitmentSecrets_get_min_seen_secret(uint64_t this_arg) { LDKCounterpartyCommitmentSecrets this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int64_t ret_conv = CounterpartyCommitmentSecrets_get_min_seen_secret(&this_arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CounterpartyCommitmentSecrets_provide_secret"))) TS_CounterpartyCommitmentSecrets_provide_secret(uint32_t this_arg, int64_t idx, int8_tArray secret) { +uint64_t __attribute__((export_name("TS_CounterpartyCommitmentSecrets_provide_secret"))) TS_CounterpartyCommitmentSecrets_provide_secret(uint64_t this_arg, int64_t idx, int8_tArray secret) { LDKCounterpartyCommitmentSecrets this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKThirtyTwoBytes secret_ref; CHECK(secret->arr_len == 32); memcpy(secret_ref.data, secret->elems, 32); FREE(secret); LDKCResult_NoneNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneNoneZ), "LDKCResult_NoneNoneZ"); *ret_conv = CounterpartyCommitmentSecrets_provide_secret(&this_arg_conv, idx, secret_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_CounterpartyCommitmentSecrets_get_secret"))) TS_CounterpartyCommitmentSecrets_get_secret(uint32_t this_arg, int64_t idx) { +int8_tArray __attribute__((export_name("TS_CounterpartyCommitmentSecrets_get_secret"))) TS_CounterpartyCommitmentSecrets_get_secret(uint64_t this_arg, int64_t idx) { LDKCounterpartyCommitmentSecrets this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, CounterpartyCommitmentSecrets_get_secret(&this_arg_conv, idx).data, 32); return ret_arr; } -int8_tArray __attribute__((export_name("TS_CounterpartyCommitmentSecrets_write"))) TS_CounterpartyCommitmentSecrets_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_CounterpartyCommitmentSecrets_write"))) TS_CounterpartyCommitmentSecrets_write(uint64_t obj) { LDKCounterpartyCommitmentSecrets obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = CounterpartyCommitmentSecrets_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -35216,17 +33601,17 @@ int8_tArray __attribute__((export_name("TS_CounterpartyCommitmentSecrets_write" return ret_arr; } -uint32_t __attribute__((export_name("TS_CounterpartyCommitmentSecrets_read"))) TS_CounterpartyCommitmentSecrets_read(int8_tArray ser) { +uint64_t __attribute__((export_name("TS_CounterpartyCommitmentSecrets_read"))) TS_CounterpartyCommitmentSecrets_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; ser_ref.data = ser->elems; LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ), "LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ"); *ret_conv = CounterpartyCommitmentSecrets_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_derive_private_key"))) TS_derive_private_key(int8_tArray per_commitment_point, int8_tArray base_secret) { +uint64_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); FREE(per_commitment_point); @@ -35236,10 +33621,10 @@ uint32_t __attribute__((export_name("TS_derive_private_key"))) TS_derive_privat 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_derive_public_key"))) TS_derive_public_key(int8_tArray per_commitment_point, int8_tArray base_point) { +uint64_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); FREE(per_commitment_point); @@ -35248,10 +33633,10 @@ uint32_t __attribute__((export_name("TS_derive_public_key"))) TS_derive_public_ 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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) { +uint64_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); FREE(per_commitment_secret); @@ -35262,10 +33647,10 @@ uint32_t __attribute__((export_name("TS_derive_private_revocation_key"))) TS_de 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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) { +uint64_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); FREE(per_commitment_point); @@ -35274,123 +33659,133 @@ uint32_t __attribute__((export_name("TS_derive_public_revocation_key"))) TS_der 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_TxCreationKeys_free"))) TS_TxCreationKeys_free(uint32_t this_obj) { +void __attribute__((export_name("TS_TxCreationKeys_free"))) TS_TxCreationKeys_free(uint64_t this_obj) { LDKTxCreationKeys this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); TxCreationKeys_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_TxCreationKeys_get_per_commitment_point"))) TS_TxCreationKeys_get_per_commitment_point(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_TxCreationKeys_get_per_commitment_point"))) TS_TxCreationKeys_get_per_commitment_point(uint64_t this_ptr) { LDKTxCreationKeys this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_TxCreationKeys_set_per_commitment_point"))) TS_TxCreationKeys_set_per_commitment_point(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_TxCreationKeys_set_per_commitment_point"))) TS_TxCreationKeys_set_per_commitment_point(uint64_t this_ptr, int8_tArray val) { LDKTxCreationKeys this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); TxCreationKeys_set_per_commitment_point(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_TxCreationKeys_get_revocation_key"))) TS_TxCreationKeys_get_revocation_key(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_TxCreationKeys_get_revocation_key"))) TS_TxCreationKeys_get_revocation_key(uint64_t this_ptr) { LDKTxCreationKeys this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_TxCreationKeys_set_revocation_key"))) TS_TxCreationKeys_set_revocation_key(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_TxCreationKeys_set_revocation_key"))) TS_TxCreationKeys_set_revocation_key(uint64_t this_ptr, int8_tArray val) { LDKTxCreationKeys this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); TxCreationKeys_set_revocation_key(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_TxCreationKeys_get_broadcaster_htlc_key"))) TS_TxCreationKeys_get_broadcaster_htlc_key(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_TxCreationKeys_get_broadcaster_htlc_key"))) TS_TxCreationKeys_get_broadcaster_htlc_key(uint64_t this_ptr) { LDKTxCreationKeys this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_TxCreationKeys_set_broadcaster_htlc_key"))) TS_TxCreationKeys_set_broadcaster_htlc_key(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_TxCreationKeys_set_broadcaster_htlc_key"))) TS_TxCreationKeys_set_broadcaster_htlc_key(uint64_t this_ptr, int8_tArray val) { LDKTxCreationKeys this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); TxCreationKeys_set_broadcaster_htlc_key(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_TxCreationKeys_get_countersignatory_htlc_key"))) TS_TxCreationKeys_get_countersignatory_htlc_key(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_TxCreationKeys_get_countersignatory_htlc_key"))) TS_TxCreationKeys_get_countersignatory_htlc_key(uint64_t this_ptr) { LDKTxCreationKeys this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_TxCreationKeys_set_countersignatory_htlc_key"))) TS_TxCreationKeys_set_countersignatory_htlc_key(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_TxCreationKeys_set_countersignatory_htlc_key"))) TS_TxCreationKeys_set_countersignatory_htlc_key(uint64_t this_ptr, int8_tArray val) { LDKTxCreationKeys this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); TxCreationKeys_set_countersignatory_htlc_key(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_TxCreationKeys_get_broadcaster_delayed_payment_key"))) TS_TxCreationKeys_get_broadcaster_delayed_payment_key(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_TxCreationKeys_get_broadcaster_delayed_payment_key"))) TS_TxCreationKeys_get_broadcaster_delayed_payment_key(uint64_t this_ptr) { LDKTxCreationKeys this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_TxCreationKeys_set_broadcaster_delayed_payment_key"))) TS_TxCreationKeys_set_broadcaster_delayed_payment_key(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_TxCreationKeys_set_broadcaster_delayed_payment_key"))) TS_TxCreationKeys_set_broadcaster_delayed_payment_key(uint64_t this_ptr, int8_tArray val) { LDKTxCreationKeys this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 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) { +uint64_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); FREE(per_commitment_point_arg); @@ -35407,60 +33802,48 @@ uint32_t __attribute__((export_name("TS_TxCreationKeys_new"))) TS_TxCreationKey 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); 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t TxCreationKeys_clone_ptr(LDKTxCreationKeys *NONNULL_PTR arg) { +static inline uint64_t TxCreationKeys_clone_ptr(LDKTxCreationKeys *NONNULL_PTR arg) { LDKTxCreationKeys ret_var = TxCreationKeys_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_TxCreationKeys_clone_ptr"))) TS_TxCreationKeys_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_TxCreationKeys_clone_ptr"))) TS_TxCreationKeys_clone_ptr(uint64_t arg) { LDKTxCreationKeys arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = TxCreationKeys_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = TxCreationKeys_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_TxCreationKeys_clone"))) TS_TxCreationKeys_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_TxCreationKeys_clone"))) TS_TxCreationKeys_clone(uint64_t orig) { LDKTxCreationKeys orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKTxCreationKeys ret_var = TxCreationKeys_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_TxCreationKeys_write"))) TS_TxCreationKeys_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_TxCreationKeys_write"))) TS_TxCreationKeys_write(uint64_t obj) { LDKTxCreationKeys obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = TxCreationKeys_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -35468,130 +33851,140 @@ int8_tArray __attribute__((export_name("TS_TxCreationKeys_write"))) TS_TxCreati return ret_arr; } -uint32_t __attribute__((export_name("TS_TxCreationKeys_read"))) TS_TxCreationKeys_read(int8_tArray ser) { +uint64_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; LDKCResult_TxCreationKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysDecodeErrorZ), "LDKCResult_TxCreationKeysDecodeErrorZ"); *ret_conv = TxCreationKeys_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_ChannelPublicKeys_free"))) TS_ChannelPublicKeys_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChannelPublicKeys_free"))) TS_ChannelPublicKeys_free(uint64_t this_obj) { LDKChannelPublicKeys this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChannelPublicKeys_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_ChannelPublicKeys_get_funding_pubkey"))) TS_ChannelPublicKeys_get_funding_pubkey(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_ChannelPublicKeys_get_funding_pubkey"))) TS_ChannelPublicKeys_get_funding_pubkey(uint64_t this_ptr) { LDKChannelPublicKeys this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_ChannelPublicKeys_set_funding_pubkey"))) TS_ChannelPublicKeys_set_funding_pubkey(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_ChannelPublicKeys_set_funding_pubkey"))) TS_ChannelPublicKeys_set_funding_pubkey(uint64_t this_ptr, int8_tArray val) { LDKChannelPublicKeys this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); ChannelPublicKeys_set_funding_pubkey(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_ChannelPublicKeys_get_revocation_basepoint"))) TS_ChannelPublicKeys_get_revocation_basepoint(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_ChannelPublicKeys_get_revocation_basepoint"))) TS_ChannelPublicKeys_get_revocation_basepoint(uint64_t this_ptr) { LDKChannelPublicKeys this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_ChannelPublicKeys_set_revocation_basepoint"))) TS_ChannelPublicKeys_set_revocation_basepoint(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_ChannelPublicKeys_set_revocation_basepoint"))) TS_ChannelPublicKeys_set_revocation_basepoint(uint64_t this_ptr, int8_tArray val) { LDKChannelPublicKeys this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); ChannelPublicKeys_set_revocation_basepoint(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_ChannelPublicKeys_get_payment_point"))) TS_ChannelPublicKeys_get_payment_point(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_ChannelPublicKeys_get_payment_point"))) TS_ChannelPublicKeys_get_payment_point(uint64_t this_ptr) { LDKChannelPublicKeys this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_ChannelPublicKeys_set_payment_point"))) TS_ChannelPublicKeys_set_payment_point(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_ChannelPublicKeys_set_payment_point"))) TS_ChannelPublicKeys_set_payment_point(uint64_t this_ptr, int8_tArray val) { LDKChannelPublicKeys this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); ChannelPublicKeys_set_payment_point(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_ChannelPublicKeys_get_delayed_payment_basepoint"))) TS_ChannelPublicKeys_get_delayed_payment_basepoint(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_ChannelPublicKeys_get_delayed_payment_basepoint"))) TS_ChannelPublicKeys_get_delayed_payment_basepoint(uint64_t this_ptr) { LDKChannelPublicKeys this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_ChannelPublicKeys_set_delayed_payment_basepoint"))) TS_ChannelPublicKeys_set_delayed_payment_basepoint(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_ChannelPublicKeys_set_delayed_payment_basepoint"))) TS_ChannelPublicKeys_set_delayed_payment_basepoint(uint64_t this_ptr, int8_tArray val) { LDKChannelPublicKeys this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); ChannelPublicKeys_set_delayed_payment_basepoint(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_ChannelPublicKeys_get_htlc_basepoint"))) TS_ChannelPublicKeys_get_htlc_basepoint(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_ChannelPublicKeys_get_htlc_basepoint"))) TS_ChannelPublicKeys_get_htlc_basepoint(uint64_t this_ptr) { LDKChannelPublicKeys this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_ChannelPublicKeys_set_htlc_basepoint"))) TS_ChannelPublicKeys_set_htlc_basepoint(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_ChannelPublicKeys_set_htlc_basepoint"))) TS_ChannelPublicKeys_set_htlc_basepoint(uint64_t this_ptr, int8_tArray val) { LDKChannelPublicKeys this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 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) { +uint64_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); FREE(funding_pubkey_arg); @@ -35608,60 +34001,48 @@ uint32_t __attribute__((export_name("TS_ChannelPublicKeys_new"))) TS_ChannelPub CHECK(htlc_basepoint_arg->arr_len == 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t ChannelPublicKeys_clone_ptr(LDKChannelPublicKeys *NONNULL_PTR arg) { +static inline uint64_t ChannelPublicKeys_clone_ptr(LDKChannelPublicKeys *NONNULL_PTR arg) { LDKChannelPublicKeys ret_var = ChannelPublicKeys_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelPublicKeys_clone_ptr"))) TS_ChannelPublicKeys_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ChannelPublicKeys_clone_ptr"))) TS_ChannelPublicKeys_clone_ptr(uint64_t arg) { LDKChannelPublicKeys arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ChannelPublicKeys_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ChannelPublicKeys_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelPublicKeys_clone"))) TS_ChannelPublicKeys_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ChannelPublicKeys_clone"))) TS_ChannelPublicKeys_clone(uint64_t orig) { LDKChannelPublicKeys orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKChannelPublicKeys ret_var = ChannelPublicKeys_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_ChannelPublicKeys_write"))) TS_ChannelPublicKeys_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ChannelPublicKeys_write"))) TS_ChannelPublicKeys_write(uint64_t obj) { LDKChannelPublicKeys obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ChannelPublicKeys_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -35669,17 +34050,17 @@ int8_tArray __attribute__((export_name("TS_ChannelPublicKeys_write"))) TS_Chann return ret_arr; } -uint32_t __attribute__((export_name("TS_ChannelPublicKeys_read"))) TS_ChannelPublicKeys_read(int8_tArray ser) { +uint64_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; LDKCResult_ChannelPublicKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelPublicKeysDecodeErrorZ), "LDKCResult_ChannelPublicKeysDecodeErrorZ"); *ret_conv = ChannelPublicKeys_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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) { +uint64_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); FREE(per_commitment_point); @@ -35697,24 +34078,26 @@ uint32_t __attribute__((export_name("TS_TxCreationKeys_derive_new"))) TS_TxCrea 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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) { +uint64_t __attribute__((export_name("TS_TxCreationKeys_from_channel_static_keys"))) TS_TxCreationKeys_from_channel_static_keys(int8_tArray per_commitment_point, uint64_t broadcaster_keys, uint64_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); FREE(per_commitment_point); LDKChannelPublicKeys broadcaster_keys_conv; - broadcaster_keys_conv.inner = (void*)(broadcaster_keys & (~1)); - broadcaster_keys_conv.is_owned = false; + broadcaster_keys_conv.inner = untag_ptr(broadcaster_keys); + broadcaster_keys_conv.is_owned = ptr_is_owned(broadcaster_keys); CHECK_INNER_FIELD_ACCESS_OR_NULL(broadcaster_keys_conv); + broadcaster_keys_conv.is_owned = false; LDKChannelPublicKeys countersignatory_keys_conv; - countersignatory_keys_conv.inner = (void*)(countersignatory_keys & (~1)); - countersignatory_keys_conv.is_owned = false; + countersignatory_keys_conv.inner = untag_ptr(countersignatory_keys); + countersignatory_keys_conv.is_owned = ptr_is_owned(countersignatory_keys); CHECK_INNER_FIELD_ACCESS_OR_NULL(countersignatory_keys_conv); + countersignatory_keys_conv.is_owned = false; 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } 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) { @@ -35731,172 +34114,170 @@ int8_tArray __attribute__((export_name("TS_get_revokeable_redeemscript"))) TS_g return ret_arr; } -void __attribute__((export_name("TS_HTLCOutputInCommitment_free"))) TS_HTLCOutputInCommitment_free(uint32_t this_obj) { +void __attribute__((export_name("TS_HTLCOutputInCommitment_free"))) TS_HTLCOutputInCommitment_free(uint64_t this_obj) { LDKHTLCOutputInCommitment this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); HTLCOutputInCommitment_free(this_obj_conv); } -jboolean __attribute__((export_name("TS_HTLCOutputInCommitment_get_offered"))) TS_HTLCOutputInCommitment_get_offered(uint32_t this_ptr) { +jboolean __attribute__((export_name("TS_HTLCOutputInCommitment_get_offered"))) TS_HTLCOutputInCommitment_get_offered(uint64_t this_ptr) { LDKHTLCOutputInCommitment this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; jboolean ret_conv = HTLCOutputInCommitment_get_offered(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_HTLCOutputInCommitment_set_offered"))) TS_HTLCOutputInCommitment_set_offered(uint32_t this_ptr, jboolean val) { +void __attribute__((export_name("TS_HTLCOutputInCommitment_set_offered"))) TS_HTLCOutputInCommitment_set_offered(uint64_t this_ptr, jboolean val) { LDKHTLCOutputInCommitment this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; HTLCOutputInCommitment_set_offered(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_HTLCOutputInCommitment_get_amount_msat"))) TS_HTLCOutputInCommitment_get_amount_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_HTLCOutputInCommitment_get_amount_msat"))) TS_HTLCOutputInCommitment_get_amount_msat(uint64_t this_ptr) { LDKHTLCOutputInCommitment this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = HTLCOutputInCommitment_get_amount_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_HTLCOutputInCommitment_set_amount_msat"))) TS_HTLCOutputInCommitment_set_amount_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_HTLCOutputInCommitment_set_amount_msat"))) TS_HTLCOutputInCommitment_set_amount_msat(uint64_t this_ptr, int64_t val) { LDKHTLCOutputInCommitment this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; HTLCOutputInCommitment_set_amount_msat(&this_ptr_conv, val); } -int32_t __attribute__((export_name("TS_HTLCOutputInCommitment_get_cltv_expiry"))) TS_HTLCOutputInCommitment_get_cltv_expiry(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_HTLCOutputInCommitment_get_cltv_expiry"))) TS_HTLCOutputInCommitment_get_cltv_expiry(uint64_t this_ptr) { LDKHTLCOutputInCommitment this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = HTLCOutputInCommitment_get_cltv_expiry(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_HTLCOutputInCommitment_set_cltv_expiry"))) TS_HTLCOutputInCommitment_set_cltv_expiry(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_HTLCOutputInCommitment_set_cltv_expiry"))) TS_HTLCOutputInCommitment_set_cltv_expiry(uint64_t this_ptr, int32_t val) { LDKHTLCOutputInCommitment this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; HTLCOutputInCommitment_set_cltv_expiry(&this_ptr_conv, val); } -int8_tArray __attribute__((export_name("TS_HTLCOutputInCommitment_get_payment_hash"))) TS_HTLCOutputInCommitment_get_payment_hash(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_HTLCOutputInCommitment_get_payment_hash"))) TS_HTLCOutputInCommitment_get_payment_hash(uint64_t this_ptr) { LDKHTLCOutputInCommitment this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *HTLCOutputInCommitment_get_payment_hash(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_HTLCOutputInCommitment_set_payment_hash"))) TS_HTLCOutputInCommitment_set_payment_hash(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_HTLCOutputInCommitment_set_payment_hash"))) TS_HTLCOutputInCommitment_set_payment_hash(uint64_t this_ptr, int8_tArray val) { LDKHTLCOutputInCommitment this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); HTLCOutputInCommitment_set_payment_hash(&this_ptr_conv, val_ref); } -uint32_t __attribute__((export_name("TS_HTLCOutputInCommitment_get_transaction_output_index"))) TS_HTLCOutputInCommitment_get_transaction_output_index(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_HTLCOutputInCommitment_get_transaction_output_index"))) TS_HTLCOutputInCommitment_get_transaction_output_index(uint64_t this_ptr) { LDKHTLCOutputInCommitment this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCOption_u32Z *ret_copy = MALLOC(sizeof(LDKCOption_u32Z), "LDKCOption_u32Z"); *ret_copy = HTLCOutputInCommitment_get_transaction_output_index(&this_ptr_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_HTLCOutputInCommitment_set_transaction_output_index"))) TS_HTLCOutputInCommitment_set_transaction_output_index(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_HTLCOutputInCommitment_set_transaction_output_index"))) TS_HTLCOutputInCommitment_set_transaction_output_index(uint64_t this_ptr, uint64_t val) { LDKHTLCOutputInCommitment this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKCOption_u32Z val_conv = *(LDKCOption_u32Z*)(val_ptr); - val_conv = COption_u32Z_clone((LDKCOption_u32Z*)(((uintptr_t)val) & ~1)); + val_conv = COption_u32Z_clone((LDKCOption_u32Z*)untag_ptr(val)); 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) { +uint64_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, uint64_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); FREE(payment_hash_arg); - void* transaction_output_index_arg_ptr = (void*)(((uintptr_t)transaction_output_index_arg) & ~1); + void* transaction_output_index_arg_ptr = untag_ptr(transaction_output_index_arg); 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*)(((uintptr_t)transaction_output_index_arg) & ~1)); + transaction_output_index_arg_conv = COption_u32Z_clone((LDKCOption_u32Z*)untag_ptr(transaction_output_index_arg)); LDKHTLCOutputInCommitment ret_var = HTLCOutputInCommitment_new(offered_arg, amount_msat_arg, cltv_expiry_arg, payment_hash_arg_ref, transaction_output_index_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t HTLCOutputInCommitment_clone_ptr(LDKHTLCOutputInCommitment *NONNULL_PTR arg) { +static inline uint64_t HTLCOutputInCommitment_clone_ptr(LDKHTLCOutputInCommitment *NONNULL_PTR arg) { LDKHTLCOutputInCommitment ret_var = HTLCOutputInCommitment_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_HTLCOutputInCommitment_clone_ptr"))) TS_HTLCOutputInCommitment_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_HTLCOutputInCommitment_clone_ptr"))) TS_HTLCOutputInCommitment_clone_ptr(uint64_t arg) { LDKHTLCOutputInCommitment arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = HTLCOutputInCommitment_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = HTLCOutputInCommitment_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_HTLCOutputInCommitment_clone"))) TS_HTLCOutputInCommitment_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_HTLCOutputInCommitment_clone"))) TS_HTLCOutputInCommitment_clone(uint64_t orig) { LDKHTLCOutputInCommitment orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKHTLCOutputInCommitment ret_var = HTLCOutputInCommitment_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_HTLCOutputInCommitment_write"))) TS_HTLCOutputInCommitment_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_HTLCOutputInCommitment_write"))) TS_HTLCOutputInCommitment_write(uint64_t obj) { LDKHTLCOutputInCommitment obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = HTLCOutputInCommitment_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -35904,25 +34285,27 @@ int8_tArray __attribute__((export_name("TS_HTLCOutputInCommitment_write"))) TS_ return ret_arr; } -uint32_t __attribute__((export_name("TS_HTLCOutputInCommitment_read"))) TS_HTLCOutputInCommitment_read(int8_tArray ser) { +uint64_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; LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCOutputInCommitmentDecodeErrorZ), "LDKCResult_HTLCOutputInCommitmentDecodeErrorZ"); *ret_conv = HTLCOutputInCommitment_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_get_htlc_redeemscript"))) TS_get_htlc_redeemscript(uint32_t htlc, jboolean opt_anchors, uint32_t keys) { +int8_tArray __attribute__((export_name("TS_get_htlc_redeemscript"))) TS_get_htlc_redeemscript(uint64_t htlc, jboolean opt_anchors, uint64_t keys) { LDKHTLCOutputInCommitment htlc_conv; - htlc_conv.inner = (void*)(htlc & (~1)); - htlc_conv.is_owned = false; + htlc_conv.inner = untag_ptr(htlc); + htlc_conv.is_owned = ptr_is_owned(htlc); CHECK_INNER_FIELD_ACCESS_OR_NULL(htlc_conv); + htlc_conv.is_owned = false; LDKTxCreationKeys keys_conv; - keys_conv.inner = (void*)(keys & (~1)); - keys_conv.is_owned = false; + keys_conv.inner = untag_ptr(keys); + keys_conv.is_owned = ptr_is_owned(keys); CHECK_INNER_FIELD_ACCESS_OR_NULL(keys_conv); + keys_conv.is_owned = false; LDKCVec_u8Z ret_var = get_htlc_redeemscript(&htlc_conv, opt_anchors, &keys_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -35944,15 +34327,16 @@ int8_tArray __attribute__((export_name("TS_make_funding_redeemscript"))) TS_mak return ret_arr; } -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) { +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, uint64_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); FREE(commitment_txid); unsigned char (*commitment_txid_ref)[32] = &commitment_txid_arr; LDKHTLCOutputInCommitment htlc_conv; - htlc_conv.inner = (void*)(htlc & (~1)); - htlc_conv.is_owned = false; + htlc_conv.inner = untag_ptr(htlc); + htlc_conv.is_owned = ptr_is_owned(htlc); CHECK_INNER_FIELD_ACCESS_OR_NULL(htlc_conv); + htlc_conv.is_owned = false; 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); FREE(broadcaster_delayed_payment_key); @@ -35977,386 +34361,346 @@ int8_tArray __attribute__((export_name("TS_get_anchor_redeemscript"))) TS_get_a return ret_arr; } -void __attribute__((export_name("TS_ChannelTransactionParameters_free"))) TS_ChannelTransactionParameters_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChannelTransactionParameters_free"))) TS_ChannelTransactionParameters_free(uint64_t this_obj) { LDKChannelTransactionParameters this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChannelTransactionParameters_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_ChannelTransactionParameters_get_holder_pubkeys"))) TS_ChannelTransactionParameters_get_holder_pubkeys(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelTransactionParameters_get_holder_pubkeys"))) TS_ChannelTransactionParameters_get_holder_pubkeys(uint64_t this_ptr) { LDKChannelTransactionParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelPublicKeys ret_var = ChannelTransactionParameters_get_holder_pubkeys(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelTransactionParameters_set_holder_pubkeys"))) TS_ChannelTransactionParameters_set_holder_pubkeys(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelTransactionParameters_set_holder_pubkeys"))) TS_ChannelTransactionParameters_set_holder_pubkeys(uint64_t this_ptr, uint64_t val) { LDKChannelTransactionParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelPublicKeys val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = ChannelPublicKeys_clone(&val_conv); ChannelTransactionParameters_set_holder_pubkeys(&this_ptr_conv, val_conv); } -int16_t __attribute__((export_name("TS_ChannelTransactionParameters_get_holder_selected_contest_delay"))) TS_ChannelTransactionParameters_get_holder_selected_contest_delay(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_ChannelTransactionParameters_get_holder_selected_contest_delay"))) TS_ChannelTransactionParameters_get_holder_selected_contest_delay(uint64_t this_ptr) { LDKChannelTransactionParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = ChannelTransactionParameters_get_holder_selected_contest_delay(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelTransactionParameters_set_holder_selected_contest_delay"))) TS_ChannelTransactionParameters_set_holder_selected_contest_delay(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_ChannelTransactionParameters_set_holder_selected_contest_delay"))) TS_ChannelTransactionParameters_set_holder_selected_contest_delay(uint64_t this_ptr, int16_t val) { LDKChannelTransactionParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelTransactionParameters_set_holder_selected_contest_delay(&this_ptr_conv, val); } -jboolean __attribute__((export_name("TS_ChannelTransactionParameters_get_is_outbound_from_holder"))) TS_ChannelTransactionParameters_get_is_outbound_from_holder(uint32_t this_ptr) { +jboolean __attribute__((export_name("TS_ChannelTransactionParameters_get_is_outbound_from_holder"))) TS_ChannelTransactionParameters_get_is_outbound_from_holder(uint64_t this_ptr) { LDKChannelTransactionParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; jboolean ret_conv = ChannelTransactionParameters_get_is_outbound_from_holder(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelTransactionParameters_set_is_outbound_from_holder"))) TS_ChannelTransactionParameters_set_is_outbound_from_holder(uint32_t this_ptr, jboolean val) { +void __attribute__((export_name("TS_ChannelTransactionParameters_set_is_outbound_from_holder"))) TS_ChannelTransactionParameters_set_is_outbound_from_holder(uint64_t this_ptr, jboolean val) { LDKChannelTransactionParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelTransactionParameters_set_is_outbound_from_holder(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_ChannelTransactionParameters_get_counterparty_parameters"))) TS_ChannelTransactionParameters_get_counterparty_parameters(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelTransactionParameters_get_counterparty_parameters"))) TS_ChannelTransactionParameters_get_counterparty_parameters(uint64_t this_ptr) { LDKChannelTransactionParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCounterpartyChannelTransactionParameters ret_var = ChannelTransactionParameters_get_counterparty_parameters(&this_ptr_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelTransactionParameters_set_counterparty_parameters"))) TS_ChannelTransactionParameters_set_counterparty_parameters(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelTransactionParameters_set_counterparty_parameters"))) TS_ChannelTransactionParameters_set_counterparty_parameters(uint64_t this_ptr, uint64_t val) { LDKChannelTransactionParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCounterpartyChannelTransactionParameters val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = CounterpartyChannelTransactionParameters_clone(&val_conv); ChannelTransactionParameters_set_counterparty_parameters(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelTransactionParameters_get_funding_outpoint"))) TS_ChannelTransactionParameters_get_funding_outpoint(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelTransactionParameters_get_funding_outpoint"))) TS_ChannelTransactionParameters_get_funding_outpoint(uint64_t this_ptr) { LDKChannelTransactionParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKOutPoint ret_var = ChannelTransactionParameters_get_funding_outpoint(&this_ptr_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelTransactionParameters_set_funding_outpoint"))) TS_ChannelTransactionParameters_set_funding_outpoint(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelTransactionParameters_set_funding_outpoint"))) TS_ChannelTransactionParameters_set_funding_outpoint(uint64_t this_ptr, uint64_t val) { LDKChannelTransactionParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKOutPoint val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = OutPoint_clone(&val_conv); ChannelTransactionParameters_set_funding_outpoint(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelTransactionParameters_get_opt_anchors"))) TS_ChannelTransactionParameters_get_opt_anchors(uint32_t this_ptr) { +uint32_t __attribute__((export_name("TS_ChannelTransactionParameters_get_opt_anchors"))) TS_ChannelTransactionParameters_get_opt_anchors(uint64_t this_ptr) { LDKChannelTransactionParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; uint32_t ret_conv = LDKCOption_NoneZ_to_js(ChannelTransactionParameters_get_opt_anchors(&this_ptr_conv)); return ret_conv; } -void __attribute__((export_name("TS_ChannelTransactionParameters_set_opt_anchors"))) TS_ChannelTransactionParameters_set_opt_anchors(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelTransactionParameters_set_opt_anchors"))) TS_ChannelTransactionParameters_set_opt_anchors(uint64_t this_ptr, uint32_t val) { LDKChannelTransactionParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCOption_NoneZ val_conv = LDKCOption_NoneZ_from_js(val); ChannelTransactionParameters_set_opt_anchors(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelTransactionParameters_new"))) TS_ChannelTransactionParameters_new(uint32_t holder_pubkeys_arg, int16_t holder_selected_contest_delay_arg, jboolean is_outbound_from_holder_arg, uint32_t counterparty_parameters_arg, uint32_t funding_outpoint_arg, uint32_t opt_anchors_arg) { +uint64_t __attribute__((export_name("TS_ChannelTransactionParameters_new"))) TS_ChannelTransactionParameters_new(uint64_t holder_pubkeys_arg, int16_t holder_selected_contest_delay_arg, jboolean is_outbound_from_holder_arg, uint64_t counterparty_parameters_arg, uint64_t funding_outpoint_arg, uint32_t opt_anchors_arg) { LDKChannelPublicKeys holder_pubkeys_arg_conv; - holder_pubkeys_arg_conv.inner = (void*)(holder_pubkeys_arg & (~1)); - holder_pubkeys_arg_conv.is_owned = (holder_pubkeys_arg & 1) || (holder_pubkeys_arg == 0); + holder_pubkeys_arg_conv.inner = untag_ptr(holder_pubkeys_arg); + holder_pubkeys_arg_conv.is_owned = ptr_is_owned(holder_pubkeys_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(holder_pubkeys_arg_conv); holder_pubkeys_arg_conv = ChannelPublicKeys_clone(&holder_pubkeys_arg_conv); LDKCounterpartyChannelTransactionParameters counterparty_parameters_arg_conv; - counterparty_parameters_arg_conv.inner = (void*)(counterparty_parameters_arg & (~1)); - counterparty_parameters_arg_conv.is_owned = (counterparty_parameters_arg & 1) || (counterparty_parameters_arg == 0); + counterparty_parameters_arg_conv.inner = untag_ptr(counterparty_parameters_arg); + counterparty_parameters_arg_conv.is_owned = ptr_is_owned(counterparty_parameters_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(counterparty_parameters_arg_conv); counterparty_parameters_arg_conv = CounterpartyChannelTransactionParameters_clone(&counterparty_parameters_arg_conv); LDKOutPoint funding_outpoint_arg_conv; - funding_outpoint_arg_conv.inner = (void*)(funding_outpoint_arg & (~1)); - funding_outpoint_arg_conv.is_owned = (funding_outpoint_arg & 1) || (funding_outpoint_arg == 0); + funding_outpoint_arg_conv.inner = untag_ptr(funding_outpoint_arg); + funding_outpoint_arg_conv.is_owned = ptr_is_owned(funding_outpoint_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_outpoint_arg_conv); 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t ChannelTransactionParameters_clone_ptr(LDKChannelTransactionParameters *NONNULL_PTR arg) { +static inline uint64_t ChannelTransactionParameters_clone_ptr(LDKChannelTransactionParameters *NONNULL_PTR arg) { LDKChannelTransactionParameters ret_var = ChannelTransactionParameters_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelTransactionParameters_clone_ptr"))) TS_ChannelTransactionParameters_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ChannelTransactionParameters_clone_ptr"))) TS_ChannelTransactionParameters_clone_ptr(uint64_t arg) { LDKChannelTransactionParameters arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ChannelTransactionParameters_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ChannelTransactionParameters_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelTransactionParameters_clone"))) TS_ChannelTransactionParameters_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ChannelTransactionParameters_clone"))) TS_ChannelTransactionParameters_clone(uint64_t orig) { LDKChannelTransactionParameters orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKChannelTransactionParameters ret_var = ChannelTransactionParameters_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_free"))) TS_CounterpartyChannelTransactionParameters_free(uint32_t this_obj) { +void __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_free"))) TS_CounterpartyChannelTransactionParameters_free(uint64_t this_obj) { LDKCounterpartyChannelTransactionParameters this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); CounterpartyChannelTransactionParameters_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_get_pubkeys"))) TS_CounterpartyChannelTransactionParameters_get_pubkeys(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_get_pubkeys"))) TS_CounterpartyChannelTransactionParameters_get_pubkeys(uint64_t this_ptr) { LDKCounterpartyChannelTransactionParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelPublicKeys ret_var = CounterpartyChannelTransactionParameters_get_pubkeys(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_set_pubkeys"))) TS_CounterpartyChannelTransactionParameters_set_pubkeys(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_set_pubkeys"))) TS_CounterpartyChannelTransactionParameters_set_pubkeys(uint64_t this_ptr, uint64_t val) { LDKCounterpartyChannelTransactionParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelPublicKeys val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = ChannelPublicKeys_clone(&val_conv); CounterpartyChannelTransactionParameters_set_pubkeys(&this_ptr_conv, val_conv); } -int16_t __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_get_selected_contest_delay"))) TS_CounterpartyChannelTransactionParameters_get_selected_contest_delay(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_get_selected_contest_delay"))) TS_CounterpartyChannelTransactionParameters_get_selected_contest_delay(uint64_t this_ptr) { LDKCounterpartyChannelTransactionParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = CounterpartyChannelTransactionParameters_get_selected_contest_delay(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_set_selected_contest_delay"))) TS_CounterpartyChannelTransactionParameters_set_selected_contest_delay(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_set_selected_contest_delay"))) TS_CounterpartyChannelTransactionParameters_set_selected_contest_delay(uint64_t this_ptr, int16_t val) { LDKCounterpartyChannelTransactionParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; CounterpartyChannelTransactionParameters_set_selected_contest_delay(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_new"))) TS_CounterpartyChannelTransactionParameters_new(uint32_t pubkeys_arg, int16_t selected_contest_delay_arg) { +uint64_t __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_new"))) TS_CounterpartyChannelTransactionParameters_new(uint64_t pubkeys_arg, int16_t selected_contest_delay_arg) { LDKChannelPublicKeys pubkeys_arg_conv; - pubkeys_arg_conv.inner = (void*)(pubkeys_arg & (~1)); - pubkeys_arg_conv.is_owned = (pubkeys_arg & 1) || (pubkeys_arg == 0); + pubkeys_arg_conv.inner = untag_ptr(pubkeys_arg); + pubkeys_arg_conv.is_owned = ptr_is_owned(pubkeys_arg); 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t CounterpartyChannelTransactionParameters_clone_ptr(LDKCounterpartyChannelTransactionParameters *NONNULL_PTR arg) { +static inline uint64_t CounterpartyChannelTransactionParameters_clone_ptr(LDKCounterpartyChannelTransactionParameters *NONNULL_PTR arg) { LDKCounterpartyChannelTransactionParameters ret_var = CounterpartyChannelTransactionParameters_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_clone_ptr"))) TS_CounterpartyChannelTransactionParameters_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_clone_ptr"))) TS_CounterpartyChannelTransactionParameters_clone_ptr(uint64_t arg) { LDKCounterpartyChannelTransactionParameters arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = CounterpartyChannelTransactionParameters_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = CounterpartyChannelTransactionParameters_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_clone"))) TS_CounterpartyChannelTransactionParameters_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_clone"))) TS_CounterpartyChannelTransactionParameters_clone(uint64_t orig) { LDKCounterpartyChannelTransactionParameters orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKCounterpartyChannelTransactionParameters ret_var = CounterpartyChannelTransactionParameters_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -jboolean __attribute__((export_name("TS_ChannelTransactionParameters_is_populated"))) TS_ChannelTransactionParameters_is_populated(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_ChannelTransactionParameters_is_populated"))) TS_ChannelTransactionParameters_is_populated(uint64_t this_arg) { LDKChannelTransactionParameters this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = ChannelTransactionParameters_is_populated(&this_arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelTransactionParameters_as_holder_broadcastable"))) TS_ChannelTransactionParameters_as_holder_broadcastable(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ChannelTransactionParameters_as_holder_broadcastable"))) TS_ChannelTransactionParameters_as_holder_broadcastable(uint64_t this_arg) { LDKChannelTransactionParameters this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKDirectedChannelTransactionParameters ret_var = ChannelTransactionParameters_as_holder_broadcastable(&this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelTransactionParameters_as_counterparty_broadcastable"))) TS_ChannelTransactionParameters_as_counterparty_broadcastable(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ChannelTransactionParameters_as_counterparty_broadcastable"))) TS_ChannelTransactionParameters_as_counterparty_broadcastable(uint64_t this_arg) { LDKChannelTransactionParameters this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKDirectedChannelTransactionParameters ret_var = ChannelTransactionParameters_as_counterparty_broadcastable(&this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_write"))) TS_CounterpartyChannelTransactionParameters_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_write"))) TS_CounterpartyChannelTransactionParameters_write(uint64_t obj) { LDKCounterpartyChannelTransactionParameters obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = CounterpartyChannelTransactionParameters_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -36364,21 +34708,22 @@ int8_tArray __attribute__((export_name("TS_CounterpartyChannelTransactionParame return ret_arr; } -uint32_t __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_read"))) TS_CounterpartyChannelTransactionParameters_read(int8_tArray ser) { +uint64_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; LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ), "LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ"); *ret_conv = CounterpartyChannelTransactionParameters_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_ChannelTransactionParameters_write"))) TS_ChannelTransactionParameters_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ChannelTransactionParameters_write"))) TS_ChannelTransactionParameters_write(uint64_t obj) { LDKChannelTransactionParameters obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ChannelTransactionParameters_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -36386,136 +34731,130 @@ int8_tArray __attribute__((export_name("TS_ChannelTransactionParameters_write") return ret_arr; } -uint32_t __attribute__((export_name("TS_ChannelTransactionParameters_read"))) TS_ChannelTransactionParameters_read(int8_tArray ser) { +uint64_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; LDKCResult_ChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTransactionParametersDecodeErrorZ), "LDKCResult_ChannelTransactionParametersDecodeErrorZ"); *ret_conv = ChannelTransactionParameters_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_DirectedChannelTransactionParameters_free"))) TS_DirectedChannelTransactionParameters_free(uint32_t this_obj) { +void __attribute__((export_name("TS_DirectedChannelTransactionParameters_free"))) TS_DirectedChannelTransactionParameters_free(uint64_t this_obj) { LDKDirectedChannelTransactionParameters this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); DirectedChannelTransactionParameters_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_DirectedChannelTransactionParameters_broadcaster_pubkeys"))) TS_DirectedChannelTransactionParameters_broadcaster_pubkeys(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_DirectedChannelTransactionParameters_broadcaster_pubkeys"))) TS_DirectedChannelTransactionParameters_broadcaster_pubkeys(uint64_t this_arg) { LDKDirectedChannelTransactionParameters this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKChannelPublicKeys ret_var = DirectedChannelTransactionParameters_broadcaster_pubkeys(&this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_DirectedChannelTransactionParameters_countersignatory_pubkeys"))) TS_DirectedChannelTransactionParameters_countersignatory_pubkeys(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_DirectedChannelTransactionParameters_countersignatory_pubkeys"))) TS_DirectedChannelTransactionParameters_countersignatory_pubkeys(uint64_t this_arg) { LDKDirectedChannelTransactionParameters this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKChannelPublicKeys ret_var = DirectedChannelTransactionParameters_countersignatory_pubkeys(&this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int16_t __attribute__((export_name("TS_DirectedChannelTransactionParameters_contest_delay"))) TS_DirectedChannelTransactionParameters_contest_delay(uint32_t this_arg) { +int16_t __attribute__((export_name("TS_DirectedChannelTransactionParameters_contest_delay"))) TS_DirectedChannelTransactionParameters_contest_delay(uint64_t this_arg) { LDKDirectedChannelTransactionParameters this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int16_t ret_conv = DirectedChannelTransactionParameters_contest_delay(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_DirectedChannelTransactionParameters_is_outbound"))) TS_DirectedChannelTransactionParameters_is_outbound(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_DirectedChannelTransactionParameters_is_outbound"))) TS_DirectedChannelTransactionParameters_is_outbound(uint64_t this_arg) { LDKDirectedChannelTransactionParameters this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = DirectedChannelTransactionParameters_is_outbound(&this_arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_DirectedChannelTransactionParameters_funding_outpoint"))) TS_DirectedChannelTransactionParameters_funding_outpoint(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_DirectedChannelTransactionParameters_funding_outpoint"))) TS_DirectedChannelTransactionParameters_funding_outpoint(uint64_t this_arg) { LDKDirectedChannelTransactionParameters this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKOutPoint ret_var = DirectedChannelTransactionParameters_funding_outpoint(&this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -jboolean __attribute__((export_name("TS_DirectedChannelTransactionParameters_opt_anchors"))) TS_DirectedChannelTransactionParameters_opt_anchors(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_DirectedChannelTransactionParameters_opt_anchors"))) TS_DirectedChannelTransactionParameters_opt_anchors(uint64_t this_arg) { LDKDirectedChannelTransactionParameters this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = DirectedChannelTransactionParameters_opt_anchors(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_HolderCommitmentTransaction_free"))) TS_HolderCommitmentTransaction_free(uint32_t this_obj) { +void __attribute__((export_name("TS_HolderCommitmentTransaction_free"))) TS_HolderCommitmentTransaction_free(uint64_t this_obj) { LDKHolderCommitmentTransaction this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); HolderCommitmentTransaction_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_HolderCommitmentTransaction_get_counterparty_sig"))) TS_HolderCommitmentTransaction_get_counterparty_sig(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_HolderCommitmentTransaction_get_counterparty_sig"))) TS_HolderCommitmentTransaction_get_counterparty_sig(uint64_t this_ptr) { LDKHolderCommitmentTransaction this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_HolderCommitmentTransaction_set_counterparty_sig"))) TS_HolderCommitmentTransaction_set_counterparty_sig(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_HolderCommitmentTransaction_set_counterparty_sig"))) TS_HolderCommitmentTransaction_set_counterparty_sig(uint64_t this_ptr, int8_tArray val) { LDKHolderCommitmentTransaction this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKSignature val_ref; CHECK(val->arr_len == 64); memcpy(val_ref.compact_form, val->elems, 64); FREE(val); HolderCommitmentTransaction_set_counterparty_sig(&this_ptr_conv, val_ref); } -ptrArray __attribute__((export_name("TS_HolderCommitmentTransaction_get_counterparty_htlc_sigs"))) TS_HolderCommitmentTransaction_get_counterparty_htlc_sigs(uint32_t this_ptr) { +ptrArray __attribute__((export_name("TS_HolderCommitmentTransaction_get_counterparty_htlc_sigs"))) TS_HolderCommitmentTransaction_get_counterparty_htlc_sigs(uint64_t this_ptr) { LDKHolderCommitmentTransaction this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_SignatureZ ret_var = HolderCommitmentTransaction_get_counterparty_htlc_sigs(&this_ptr_conv); ptrArray ret_arr = NULL; ret_arr = init_ptrArray(ret_var.datalen, __LINE__); @@ -36530,11 +34869,12 @@ ptrArray __attribute__((export_name("TS_HolderCommitmentTransaction_get_counter return ret_arr; } -void __attribute__((export_name("TS_HolderCommitmentTransaction_set_counterparty_htlc_sigs"))) TS_HolderCommitmentTransaction_set_counterparty_htlc_sigs(uint32_t this_ptr, ptrArray val) { +void __attribute__((export_name("TS_HolderCommitmentTransaction_set_counterparty_htlc_sigs"))) TS_HolderCommitmentTransaction_set_counterparty_htlc_sigs(uint64_t this_ptr, ptrArray val) { LDKHolderCommitmentTransaction this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_SignatureZ val_constr; val_constr.datalen = val->arr_len; if (val_constr.datalen > 0) @@ -36553,49 +34893,42 @@ void __attribute__((export_name("TS_HolderCommitmentTransaction_set_counterpart HolderCommitmentTransaction_set_counterparty_htlc_sigs(&this_ptr_conv, val_constr); } -static inline uintptr_t HolderCommitmentTransaction_clone_ptr(LDKHolderCommitmentTransaction *NONNULL_PTR arg) { +static inline uint64_t HolderCommitmentTransaction_clone_ptr(LDKHolderCommitmentTransaction *NONNULL_PTR arg) { LDKHolderCommitmentTransaction ret_var = HolderCommitmentTransaction_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_HolderCommitmentTransaction_clone_ptr"))) TS_HolderCommitmentTransaction_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_HolderCommitmentTransaction_clone_ptr"))) TS_HolderCommitmentTransaction_clone_ptr(uint64_t arg) { LDKHolderCommitmentTransaction arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = HolderCommitmentTransaction_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = HolderCommitmentTransaction_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_HolderCommitmentTransaction_clone"))) TS_HolderCommitmentTransaction_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_HolderCommitmentTransaction_clone"))) TS_HolderCommitmentTransaction_clone(uint64_t orig) { LDKHolderCommitmentTransaction orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKHolderCommitmentTransaction ret_var = HolderCommitmentTransaction_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_HolderCommitmentTransaction_write"))) TS_HolderCommitmentTransaction_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_HolderCommitmentTransaction_write"))) TS_HolderCommitmentTransaction_write(uint64_t obj) { LDKHolderCommitmentTransaction obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = HolderCommitmentTransaction_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -36603,20 +34936,20 @@ int8_tArray __attribute__((export_name("TS_HolderCommitmentTransaction_write")) return ret_arr; } -uint32_t __attribute__((export_name("TS_HolderCommitmentTransaction_read"))) TS_HolderCommitmentTransaction_read(int8_tArray ser) { +uint64_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; LDKCResult_HolderCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HolderCommitmentTransactionDecodeErrorZ), "LDKCResult_HolderCommitmentTransactionDecodeErrorZ"); *ret_conv = HolderCommitmentTransaction_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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) { +uint64_t __attribute__((export_name("TS_HolderCommitmentTransaction_new"))) TS_HolderCommitmentTransaction_new(uint64_t commitment_tx, int8_tArray counterparty_sig, ptrArray counterparty_htlc_sigs, int8_tArray holder_funding_key, int8_tArray counterparty_funding_key) { LDKCommitmentTransaction commitment_tx_conv; - commitment_tx_conv.inner = (void*)(commitment_tx & (~1)); - commitment_tx_conv.is_owned = (commitment_tx & 1) || (commitment_tx == 0); + commitment_tx_conv.inner = untag_ptr(commitment_tx); + commitment_tx_conv.is_owned = ptr_is_owned(commitment_tx); CHECK_INNER_FIELD_ACCESS_OR_NULL(commitment_tx_conv); commitment_tx_conv = CommitmentTransaction_clone(&commitment_tx_conv); LDKSignature counterparty_sig_ref; @@ -36644,30 +34977,26 @@ uint32_t __attribute__((export_name("TS_HolderCommitmentTransaction_new"))) TS_ CHECK(counterparty_funding_key->arr_len == 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_BuiltCommitmentTransaction_free"))) TS_BuiltCommitmentTransaction_free(uint32_t this_obj) { +void __attribute__((export_name("TS_BuiltCommitmentTransaction_free"))) TS_BuiltCommitmentTransaction_free(uint64_t this_obj) { LDKBuiltCommitmentTransaction this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); BuiltCommitmentTransaction_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_BuiltCommitmentTransaction_get_transaction"))) TS_BuiltCommitmentTransaction_get_transaction(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_BuiltCommitmentTransaction_get_transaction"))) TS_BuiltCommitmentTransaction_get_transaction(uint64_t this_ptr) { LDKBuiltCommitmentTransaction this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKTransaction ret_var = BuiltCommitmentTransaction_get_transaction(&this_ptr_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -36675,11 +35004,12 @@ int8_tArray __attribute__((export_name("TS_BuiltCommitmentTransaction_get_trans return ret_arr; } -void __attribute__((export_name("TS_BuiltCommitmentTransaction_set_transaction"))) TS_BuiltCommitmentTransaction_set_transaction(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_BuiltCommitmentTransaction_set_transaction"))) TS_BuiltCommitmentTransaction_set_transaction(uint64_t this_ptr, int8_tArray val) { LDKBuiltCommitmentTransaction this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKTransaction val_ref; val_ref.datalen = val->arr_len; val_ref.data = MALLOC(val_ref.datalen, "LDKTransaction Bytes"); @@ -36688,28 +35018,30 @@ void __attribute__((export_name("TS_BuiltCommitmentTransaction_set_transaction" BuiltCommitmentTransaction_set_transaction(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_BuiltCommitmentTransaction_get_txid"))) TS_BuiltCommitmentTransaction_get_txid(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_BuiltCommitmentTransaction_get_txid"))) TS_BuiltCommitmentTransaction_get_txid(uint64_t this_ptr) { LDKBuiltCommitmentTransaction this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *BuiltCommitmentTransaction_get_txid(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_BuiltCommitmentTransaction_set_txid"))) TS_BuiltCommitmentTransaction_set_txid(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_BuiltCommitmentTransaction_set_txid"))) TS_BuiltCommitmentTransaction_set_txid(uint64_t this_ptr, int8_tArray val) { LDKBuiltCommitmentTransaction this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); BuiltCommitmentTransaction_set_txid(&this_ptr_conv, val_ref); } -uint32_t __attribute__((export_name("TS_BuiltCommitmentTransaction_new"))) TS_BuiltCommitmentTransaction_new(int8_tArray transaction_arg, int8_tArray txid_arg) { +uint64_t __attribute__((export_name("TS_BuiltCommitmentTransaction_new"))) TS_BuiltCommitmentTransaction_new(int8_tArray transaction_arg, int8_tArray txid_arg) { LDKTransaction transaction_arg_ref; transaction_arg_ref.datalen = transaction_arg->arr_len; transaction_arg_ref.data = MALLOC(transaction_arg_ref.datalen, "LDKTransaction Bytes"); @@ -36719,60 +35051,48 @@ uint32_t __attribute__((export_name("TS_BuiltCommitmentTransaction_new"))) TS_B CHECK(txid_arg->arr_len == 32); memcpy(txid_arg_ref.data, txid_arg->elems, 32); FREE(txid_arg); LDKBuiltCommitmentTransaction ret_var = BuiltCommitmentTransaction_new(transaction_arg_ref, txid_arg_ref); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t BuiltCommitmentTransaction_clone_ptr(LDKBuiltCommitmentTransaction *NONNULL_PTR arg) { +static inline uint64_t BuiltCommitmentTransaction_clone_ptr(LDKBuiltCommitmentTransaction *NONNULL_PTR arg) { LDKBuiltCommitmentTransaction ret_var = BuiltCommitmentTransaction_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_BuiltCommitmentTransaction_clone_ptr"))) TS_BuiltCommitmentTransaction_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_BuiltCommitmentTransaction_clone_ptr"))) TS_BuiltCommitmentTransaction_clone_ptr(uint64_t arg) { LDKBuiltCommitmentTransaction arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = BuiltCommitmentTransaction_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = BuiltCommitmentTransaction_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_BuiltCommitmentTransaction_clone"))) TS_BuiltCommitmentTransaction_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_BuiltCommitmentTransaction_clone"))) TS_BuiltCommitmentTransaction_clone(uint64_t orig) { LDKBuiltCommitmentTransaction orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKBuiltCommitmentTransaction ret_var = BuiltCommitmentTransaction_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_BuiltCommitmentTransaction_write"))) TS_BuiltCommitmentTransaction_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_BuiltCommitmentTransaction_write"))) TS_BuiltCommitmentTransaction_write(uint64_t obj) { LDKBuiltCommitmentTransaction obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = BuiltCommitmentTransaction_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -36780,21 +35100,22 @@ int8_tArray __attribute__((export_name("TS_BuiltCommitmentTransaction_write"))) return ret_arr; } -uint32_t __attribute__((export_name("TS_BuiltCommitmentTransaction_read"))) TS_BuiltCommitmentTransaction_read(int8_tArray ser) { +uint64_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; LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_BuiltCommitmentTransactionDecodeErrorZ), "LDKCResult_BuiltCommitmentTransactionDecodeErrorZ"); *ret_conv = BuiltCommitmentTransaction_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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) { +int8_tArray __attribute__((export_name("TS_BuiltCommitmentTransaction_get_sighash_all"))) TS_BuiltCommitmentTransaction_get_sighash_all(uint64_t this_arg, int8_tArray funding_redeemscript, int64_t channel_value_satoshis) { LDKBuiltCommitmentTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKu8slice funding_redeemscript_ref; funding_redeemscript_ref.datalen = funding_redeemscript->arr_len; funding_redeemscript_ref.data = funding_redeemscript->elems; @@ -36804,11 +35125,12 @@ int8_tArray __attribute__((export_name("TS_BuiltCommitmentTransaction_get_sigha return ret_arr; } -int8_tArray __attribute__((export_name("TS_BuiltCommitmentTransaction_sign"))) TS_BuiltCommitmentTransaction_sign(uint32_t this_arg, int8_tArray funding_key, int8_tArray funding_redeemscript, int64_t channel_value_satoshis) { +int8_tArray __attribute__((export_name("TS_BuiltCommitmentTransaction_sign"))) TS_BuiltCommitmentTransaction_sign(uint64_t this_arg, int8_tArray funding_key, int8_tArray funding_redeemscript, int64_t channel_value_satoshis) { LDKBuiltCommitmentTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; unsigned char funding_key_arr[32]; CHECK(funding_key->arr_len == 32); memcpy(funding_key_arr, funding_key->elems, 32); FREE(funding_key); @@ -36822,62 +35144,55 @@ int8_tArray __attribute__((export_name("TS_BuiltCommitmentTransaction_sign"))) return ret_arr; } -void __attribute__((export_name("TS_ClosingTransaction_free"))) TS_ClosingTransaction_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ClosingTransaction_free"))) TS_ClosingTransaction_free(uint64_t this_obj) { LDKClosingTransaction this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ClosingTransaction_free(this_obj_conv); } -static inline uintptr_t ClosingTransaction_clone_ptr(LDKClosingTransaction *NONNULL_PTR arg) { +static inline uint64_t ClosingTransaction_clone_ptr(LDKClosingTransaction *NONNULL_PTR arg) { LDKClosingTransaction ret_var = ClosingTransaction_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ClosingTransaction_clone_ptr"))) TS_ClosingTransaction_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ClosingTransaction_clone_ptr"))) TS_ClosingTransaction_clone_ptr(uint64_t arg) { LDKClosingTransaction arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ClosingTransaction_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ClosingTransaction_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ClosingTransaction_clone"))) TS_ClosingTransaction_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ClosingTransaction_clone"))) TS_ClosingTransaction_clone(uint64_t orig) { LDKClosingTransaction orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKClosingTransaction ret_var = ClosingTransaction_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int64_t __attribute__((export_name("TS_ClosingTransaction_hash"))) TS_ClosingTransaction_hash(uint32_t o) { +int64_t __attribute__((export_name("TS_ClosingTransaction_hash"))) TS_ClosingTransaction_hash(uint64_t o) { LDKClosingTransaction o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = false; + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); + o_conv.is_owned = false; int64_t ret_conv = ClosingTransaction_hash(&o_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ClosingTransaction_new"))) TS_ClosingTransaction_new(int64_t to_holder_value_sat, int64_t to_counterparty_value_sat, int8_tArray to_holder_script, int8_tArray to_counterparty_script, uint32_t funding_outpoint) { +uint64_t __attribute__((export_name("TS_ClosingTransaction_new"))) TS_ClosingTransaction_new(int64_t to_holder_value_sat, int64_t to_counterparty_value_sat, int8_tArray to_holder_script, int8_tArray to_counterparty_script, uint64_t funding_outpoint) { 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"); @@ -36887,107 +35202,104 @@ uint32_t __attribute__((export_name("TS_ClosingTransaction_new"))) TS_ClosingTr 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); 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); + funding_outpoint_conv.inner = untag_ptr(funding_outpoint); + funding_outpoint_conv.is_owned = ptr_is_owned(funding_outpoint); 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ClosingTransaction_trust"))) TS_ClosingTransaction_trust(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ClosingTransaction_trust"))) TS_ClosingTransaction_trust(uint64_t this_arg) { LDKClosingTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKTrustedClosingTransaction ret_var = ClosingTransaction_trust(&this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ClosingTransaction_verify"))) TS_ClosingTransaction_verify(uint32_t this_arg, uint32_t funding_outpoint) { +uint64_t __attribute__((export_name("TS_ClosingTransaction_verify"))) TS_ClosingTransaction_verify(uint64_t this_arg, uint64_t funding_outpoint) { LDKClosingTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKOutPoint funding_outpoint_conv; - funding_outpoint_conv.inner = (void*)(funding_outpoint & (~1)); - funding_outpoint_conv.is_owned = (funding_outpoint & 1) || (funding_outpoint == 0); + funding_outpoint_conv.inner = untag_ptr(funding_outpoint); + funding_outpoint_conv.is_owned = ptr_is_owned(funding_outpoint); CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_outpoint_conv); 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int64_t __attribute__((export_name("TS_ClosingTransaction_to_holder_value_sat"))) TS_ClosingTransaction_to_holder_value_sat(uint32_t this_arg) { +int64_t __attribute__((export_name("TS_ClosingTransaction_to_holder_value_sat"))) TS_ClosingTransaction_to_holder_value_sat(uint64_t this_arg) { LDKClosingTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int64_t ret_conv = ClosingTransaction_to_holder_value_sat(&this_arg_conv); return ret_conv; } -int64_t __attribute__((export_name("TS_ClosingTransaction_to_counterparty_value_sat"))) TS_ClosingTransaction_to_counterparty_value_sat(uint32_t this_arg) { +int64_t __attribute__((export_name("TS_ClosingTransaction_to_counterparty_value_sat"))) TS_ClosingTransaction_to_counterparty_value_sat(uint64_t this_arg) { LDKClosingTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int64_t ret_conv = ClosingTransaction_to_counterparty_value_sat(&this_arg_conv); return ret_conv; } -int8_tArray __attribute__((export_name("TS_ClosingTransaction_to_holder_script"))) TS_ClosingTransaction_to_holder_script(uint32_t this_arg) { +int8_tArray __attribute__((export_name("TS_ClosingTransaction_to_holder_script"))) TS_ClosingTransaction_to_holder_script(uint64_t this_arg) { LDKClosingTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKu8slice ret_var = ClosingTransaction_to_holder_script(&this_arg_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); return ret_arr; } -int8_tArray __attribute__((export_name("TS_ClosingTransaction_to_counterparty_script"))) TS_ClosingTransaction_to_counterparty_script(uint32_t this_arg) { +int8_tArray __attribute__((export_name("TS_ClosingTransaction_to_counterparty_script"))) TS_ClosingTransaction_to_counterparty_script(uint64_t this_arg) { LDKClosingTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKu8slice ret_var = ClosingTransaction_to_counterparty_script(&this_arg_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); return ret_arr; } -void __attribute__((export_name("TS_TrustedClosingTransaction_free"))) TS_TrustedClosingTransaction_free(uint32_t this_obj) { +void __attribute__((export_name("TS_TrustedClosingTransaction_free"))) TS_TrustedClosingTransaction_free(uint64_t this_obj) { LDKTrustedClosingTransaction this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); TrustedClosingTransaction_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_TrustedClosingTransaction_built_transaction"))) TS_TrustedClosingTransaction_built_transaction(uint32_t this_arg) { +int8_tArray __attribute__((export_name("TS_TrustedClosingTransaction_built_transaction"))) TS_TrustedClosingTransaction_built_transaction(uint64_t this_arg) { LDKTrustedClosingTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKTransaction ret_var = TrustedClosingTransaction_built_transaction(&this_arg_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -36995,11 +35307,12 @@ int8_tArray __attribute__((export_name("TS_TrustedClosingTransaction_built_tran return ret_arr; } -int8_tArray __attribute__((export_name("TS_TrustedClosingTransaction_get_sighash_all"))) TS_TrustedClosingTransaction_get_sighash_all(uint32_t this_arg, int8_tArray funding_redeemscript, int64_t channel_value_satoshis) { +int8_tArray __attribute__((export_name("TS_TrustedClosingTransaction_get_sighash_all"))) TS_TrustedClosingTransaction_get_sighash_all(uint64_t this_arg, int8_tArray funding_redeemscript, int64_t channel_value_satoshis) { LDKTrustedClosingTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKu8slice funding_redeemscript_ref; funding_redeemscript_ref.datalen = funding_redeemscript->arr_len; funding_redeemscript_ref.data = funding_redeemscript->elems; @@ -37009,11 +35322,12 @@ int8_tArray __attribute__((export_name("TS_TrustedClosingTransaction_get_sighas return ret_arr; } -int8_tArray __attribute__((export_name("TS_TrustedClosingTransaction_sign"))) TS_TrustedClosingTransaction_sign(uint32_t this_arg, int8_tArray funding_key, int8_tArray funding_redeemscript, int64_t channel_value_satoshis) { +int8_tArray __attribute__((export_name("TS_TrustedClosingTransaction_sign"))) TS_TrustedClosingTransaction_sign(uint64_t this_arg, int8_tArray funding_key, int8_tArray funding_redeemscript, int64_t channel_value_satoshis) { LDKTrustedClosingTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; unsigned char funding_key_arr[32]; CHECK(funding_key->arr_len == 32); memcpy(funding_key_arr, funding_key->elems, 32); FREE(funding_key); @@ -37027,57 +35341,50 @@ int8_tArray __attribute__((export_name("TS_TrustedClosingTransaction_sign"))) T return ret_arr; } -void __attribute__((export_name("TS_CommitmentTransaction_free"))) TS_CommitmentTransaction_free(uint32_t this_obj) { +void __attribute__((export_name("TS_CommitmentTransaction_free"))) TS_CommitmentTransaction_free(uint64_t this_obj) { LDKCommitmentTransaction this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); CommitmentTransaction_free(this_obj_conv); } -static inline uintptr_t CommitmentTransaction_clone_ptr(LDKCommitmentTransaction *NONNULL_PTR arg) { +static inline uint64_t CommitmentTransaction_clone_ptr(LDKCommitmentTransaction *NONNULL_PTR arg) { LDKCommitmentTransaction ret_var = CommitmentTransaction_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_CommitmentTransaction_clone_ptr"))) TS_CommitmentTransaction_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_CommitmentTransaction_clone_ptr"))) TS_CommitmentTransaction_clone_ptr(uint64_t arg) { LDKCommitmentTransaction arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = CommitmentTransaction_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = CommitmentTransaction_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CommitmentTransaction_clone"))) TS_CommitmentTransaction_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_CommitmentTransaction_clone"))) TS_CommitmentTransaction_clone(uint64_t orig) { LDKCommitmentTransaction orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKCommitmentTransaction ret_var = CommitmentTransaction_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_CommitmentTransaction_write"))) TS_CommitmentTransaction_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_CommitmentTransaction_write"))) TS_CommitmentTransaction_write(uint64_t obj) { LDKCommitmentTransaction obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = CommitmentTransaction_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -37085,168 +35392,168 @@ int8_tArray __attribute__((export_name("TS_CommitmentTransaction_write"))) TS_C return ret_arr; } -uint32_t __attribute__((export_name("TS_CommitmentTransaction_read"))) TS_CommitmentTransaction_read(int8_tArray ser) { +uint64_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; LDKCResult_CommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentTransactionDecodeErrorZ), "LDKCResult_CommitmentTransactionDecodeErrorZ"); *ret_conv = CommitmentTransaction_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int64_t __attribute__((export_name("TS_CommitmentTransaction_commitment_number"))) TS_CommitmentTransaction_commitment_number(uint32_t this_arg) { +int64_t __attribute__((export_name("TS_CommitmentTransaction_commitment_number"))) TS_CommitmentTransaction_commitment_number(uint64_t this_arg) { LDKCommitmentTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int64_t ret_conv = CommitmentTransaction_commitment_number(&this_arg_conv); return ret_conv; } -int64_t __attribute__((export_name("TS_CommitmentTransaction_to_broadcaster_value_sat"))) TS_CommitmentTransaction_to_broadcaster_value_sat(uint32_t this_arg) { +int64_t __attribute__((export_name("TS_CommitmentTransaction_to_broadcaster_value_sat"))) TS_CommitmentTransaction_to_broadcaster_value_sat(uint64_t this_arg) { LDKCommitmentTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int64_t ret_conv = CommitmentTransaction_to_broadcaster_value_sat(&this_arg_conv); return ret_conv; } -int64_t __attribute__((export_name("TS_CommitmentTransaction_to_countersignatory_value_sat"))) TS_CommitmentTransaction_to_countersignatory_value_sat(uint32_t this_arg) { +int64_t __attribute__((export_name("TS_CommitmentTransaction_to_countersignatory_value_sat"))) TS_CommitmentTransaction_to_countersignatory_value_sat(uint64_t this_arg) { LDKCommitmentTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int64_t ret_conv = CommitmentTransaction_to_countersignatory_value_sat(&this_arg_conv); return ret_conv; } -int32_t __attribute__((export_name("TS_CommitmentTransaction_feerate_per_kw"))) TS_CommitmentTransaction_feerate_per_kw(uint32_t this_arg) { +int32_t __attribute__((export_name("TS_CommitmentTransaction_feerate_per_kw"))) TS_CommitmentTransaction_feerate_per_kw(uint64_t this_arg) { LDKCommitmentTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int32_t ret_conv = CommitmentTransaction_feerate_per_kw(&this_arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_CommitmentTransaction_trust"))) TS_CommitmentTransaction_trust(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_CommitmentTransaction_trust"))) TS_CommitmentTransaction_trust(uint64_t this_arg) { LDKCommitmentTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKTrustedCommitmentTransaction ret_var = CommitmentTransaction_trust(&this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_CommitmentTransaction_verify"))) TS_CommitmentTransaction_verify(uint32_t this_arg, uint32_t channel_parameters, uint32_t broadcaster_keys, uint32_t countersignatory_keys) { +uint64_t __attribute__((export_name("TS_CommitmentTransaction_verify"))) TS_CommitmentTransaction_verify(uint64_t this_arg, uint64_t channel_parameters, uint64_t broadcaster_keys, uint64_t countersignatory_keys) { LDKCommitmentTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKDirectedChannelTransactionParameters channel_parameters_conv; - channel_parameters_conv.inner = (void*)(channel_parameters & (~1)); - channel_parameters_conv.is_owned = false; + channel_parameters_conv.inner = untag_ptr(channel_parameters); + channel_parameters_conv.is_owned = ptr_is_owned(channel_parameters); CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_parameters_conv); + channel_parameters_conv.is_owned = false; LDKChannelPublicKeys broadcaster_keys_conv; - broadcaster_keys_conv.inner = (void*)(broadcaster_keys & (~1)); - broadcaster_keys_conv.is_owned = false; + broadcaster_keys_conv.inner = untag_ptr(broadcaster_keys); + broadcaster_keys_conv.is_owned = ptr_is_owned(broadcaster_keys); CHECK_INNER_FIELD_ACCESS_OR_NULL(broadcaster_keys_conv); + broadcaster_keys_conv.is_owned = false; LDKChannelPublicKeys countersignatory_keys_conv; - countersignatory_keys_conv.inner = (void*)(countersignatory_keys & (~1)); - countersignatory_keys_conv.is_owned = false; + countersignatory_keys_conv.inner = untag_ptr(countersignatory_keys); + countersignatory_keys_conv.is_owned = ptr_is_owned(countersignatory_keys); CHECK_INNER_FIELD_ACCESS_OR_NULL(countersignatory_keys_conv); + countersignatory_keys_conv.is_owned = false; 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_TrustedCommitmentTransaction_free"))) TS_TrustedCommitmentTransaction_free(uint32_t this_obj) { +void __attribute__((export_name("TS_TrustedCommitmentTransaction_free"))) TS_TrustedCommitmentTransaction_free(uint64_t this_obj) { LDKTrustedCommitmentTransaction this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); TrustedCommitmentTransaction_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_TrustedCommitmentTransaction_txid"))) TS_TrustedCommitmentTransaction_txid(uint32_t this_arg) { +int8_tArray __attribute__((export_name("TS_TrustedCommitmentTransaction_txid"))) TS_TrustedCommitmentTransaction_txid(uint64_t this_arg) { LDKTrustedCommitmentTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, TrustedCommitmentTransaction_txid(&this_arg_conv).data, 32); return ret_arr; } -uint32_t __attribute__((export_name("TS_TrustedCommitmentTransaction_built_transaction"))) TS_TrustedCommitmentTransaction_built_transaction(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_TrustedCommitmentTransaction_built_transaction"))) TS_TrustedCommitmentTransaction_built_transaction(uint64_t this_arg) { LDKTrustedCommitmentTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKBuiltCommitmentTransaction ret_var = TrustedCommitmentTransaction_built_transaction(&this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_TrustedCommitmentTransaction_keys"))) TS_TrustedCommitmentTransaction_keys(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_TrustedCommitmentTransaction_keys"))) TS_TrustedCommitmentTransaction_keys(uint64_t this_arg) { LDKTrustedCommitmentTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKTxCreationKeys ret_var = TrustedCommitmentTransaction_keys(&this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -jboolean __attribute__((export_name("TS_TrustedCommitmentTransaction_opt_anchors"))) TS_TrustedCommitmentTransaction_opt_anchors(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_TrustedCommitmentTransaction_opt_anchors"))) TS_TrustedCommitmentTransaction_opt_anchors(uint64_t this_arg) { LDKTrustedCommitmentTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = TrustedCommitmentTransaction_opt_anchors(&this_arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_TrustedCommitmentTransaction_get_htlc_sigs"))) TS_TrustedCommitmentTransaction_get_htlc_sigs(uint32_t this_arg, int8_tArray htlc_base_key, uint32_t channel_parameters) { +uint64_t __attribute__((export_name("TS_TrustedCommitmentTransaction_get_htlc_sigs"))) TS_TrustedCommitmentTransaction_get_htlc_sigs(uint64_t this_arg, int8_tArray htlc_base_key, uint64_t channel_parameters) { LDKTrustedCommitmentTransaction this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; unsigned char htlc_base_key_arr[32]; CHECK(htlc_base_key->arr_len == 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)); - channel_parameters_conv.is_owned = false; + channel_parameters_conv.inner = untag_ptr(channel_parameters); + channel_parameters_conv.is_owned = ptr_is_owned(channel_parameters); CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_parameters_conv); + channel_parameters_conv.is_owned = false; 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } 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) { @@ -37260,481 +35567,407 @@ int64_t __attribute__((export_name("TS_get_commitment_transaction_number_obscur return ret_conv; } -jboolean __attribute__((export_name("TS_InitFeatures_eq"))) TS_InitFeatures_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_InitFeatures_eq"))) TS_InitFeatures_eq(uint64_t a, uint64_t b) { LDKInitFeatures a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKInitFeatures b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = InitFeatures_eq(&a_conv, &b_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_NodeFeatures_eq"))) TS_NodeFeatures_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_NodeFeatures_eq"))) TS_NodeFeatures_eq(uint64_t a, uint64_t b) { LDKNodeFeatures a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKNodeFeatures b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = NodeFeatures_eq(&a_conv, &b_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_ChannelFeatures_eq"))) TS_ChannelFeatures_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_ChannelFeatures_eq"))) TS_ChannelFeatures_eq(uint64_t a, uint64_t b) { LDKChannelFeatures a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKChannelFeatures b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = ChannelFeatures_eq(&a_conv, &b_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_InvoiceFeatures_eq"))) TS_InvoiceFeatures_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_InvoiceFeatures_eq"))) TS_InvoiceFeatures_eq(uint64_t a, uint64_t b) { LDKInvoiceFeatures a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKInvoiceFeatures b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = InvoiceFeatures_eq(&a_conv, &b_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_ChannelTypeFeatures_eq"))) TS_ChannelTypeFeatures_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_ChannelTypeFeatures_eq"))) TS_ChannelTypeFeatures_eq(uint64_t a, uint64_t b) { LDKChannelTypeFeatures a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKChannelTypeFeatures b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = ChannelTypeFeatures_eq(&a_conv, &b_conv); return ret_conv; } -static inline uintptr_t InitFeatures_clone_ptr(LDKInitFeatures *NONNULL_PTR arg) { +static inline uint64_t InitFeatures_clone_ptr(LDKInitFeatures *NONNULL_PTR arg) { LDKInitFeatures ret_var = InitFeatures_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_InitFeatures_clone_ptr"))) TS_InitFeatures_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_InitFeatures_clone_ptr"))) TS_InitFeatures_clone_ptr(uint64_t arg) { LDKInitFeatures arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = InitFeatures_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = InitFeatures_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_InitFeatures_clone"))) TS_InitFeatures_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_InitFeatures_clone"))) TS_InitFeatures_clone(uint64_t orig) { LDKInitFeatures orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKInitFeatures ret_var = InitFeatures_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t NodeFeatures_clone_ptr(LDKNodeFeatures *NONNULL_PTR arg) { +static inline uint64_t NodeFeatures_clone_ptr(LDKNodeFeatures *NONNULL_PTR arg) { LDKNodeFeatures ret_var = NodeFeatures_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_NodeFeatures_clone_ptr"))) TS_NodeFeatures_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_NodeFeatures_clone_ptr"))) TS_NodeFeatures_clone_ptr(uint64_t arg) { LDKNodeFeatures arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = NodeFeatures_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = NodeFeatures_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_NodeFeatures_clone"))) TS_NodeFeatures_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_NodeFeatures_clone"))) TS_NodeFeatures_clone(uint64_t orig) { LDKNodeFeatures orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKNodeFeatures ret_var = NodeFeatures_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t ChannelFeatures_clone_ptr(LDKChannelFeatures *NONNULL_PTR arg) { +static inline uint64_t ChannelFeatures_clone_ptr(LDKChannelFeatures *NONNULL_PTR arg) { LDKChannelFeatures ret_var = ChannelFeatures_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelFeatures_clone_ptr"))) TS_ChannelFeatures_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ChannelFeatures_clone_ptr"))) TS_ChannelFeatures_clone_ptr(uint64_t arg) { LDKChannelFeatures arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ChannelFeatures_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ChannelFeatures_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelFeatures_clone"))) TS_ChannelFeatures_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ChannelFeatures_clone"))) TS_ChannelFeatures_clone(uint64_t orig) { LDKChannelFeatures orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKChannelFeatures ret_var = ChannelFeatures_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t InvoiceFeatures_clone_ptr(LDKInvoiceFeatures *NONNULL_PTR arg) { +static inline uint64_t InvoiceFeatures_clone_ptr(LDKInvoiceFeatures *NONNULL_PTR arg) { LDKInvoiceFeatures ret_var = InvoiceFeatures_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_InvoiceFeatures_clone_ptr"))) TS_InvoiceFeatures_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_InvoiceFeatures_clone_ptr"))) TS_InvoiceFeatures_clone_ptr(uint64_t arg) { LDKInvoiceFeatures arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = InvoiceFeatures_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = InvoiceFeatures_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_InvoiceFeatures_clone"))) TS_InvoiceFeatures_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_InvoiceFeatures_clone"))) TS_InvoiceFeatures_clone(uint64_t orig) { LDKInvoiceFeatures orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKInvoiceFeatures ret_var = InvoiceFeatures_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t ChannelTypeFeatures_clone_ptr(LDKChannelTypeFeatures *NONNULL_PTR arg) { +static inline uint64_t ChannelTypeFeatures_clone_ptr(LDKChannelTypeFeatures *NONNULL_PTR arg) { LDKChannelTypeFeatures ret_var = ChannelTypeFeatures_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelTypeFeatures_clone_ptr"))) TS_ChannelTypeFeatures_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ChannelTypeFeatures_clone_ptr"))) TS_ChannelTypeFeatures_clone_ptr(uint64_t arg) { LDKChannelTypeFeatures arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ChannelTypeFeatures_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ChannelTypeFeatures_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelTypeFeatures_clone"))) TS_ChannelTypeFeatures_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ChannelTypeFeatures_clone"))) TS_ChannelTypeFeatures_clone(uint64_t orig) { LDKChannelTypeFeatures orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKChannelTypeFeatures ret_var = ChannelTypeFeatures_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_InitFeatures_free"))) TS_InitFeatures_free(uint32_t this_obj) { +void __attribute__((export_name("TS_InitFeatures_free"))) TS_InitFeatures_free(uint64_t this_obj) { LDKInitFeatures this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); InitFeatures_free(this_obj_conv); } -void __attribute__((export_name("TS_NodeFeatures_free"))) TS_NodeFeatures_free(uint32_t this_obj) { +void __attribute__((export_name("TS_NodeFeatures_free"))) TS_NodeFeatures_free(uint64_t this_obj) { LDKNodeFeatures this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); NodeFeatures_free(this_obj_conv); } -void __attribute__((export_name("TS_ChannelFeatures_free"))) TS_ChannelFeatures_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChannelFeatures_free"))) TS_ChannelFeatures_free(uint64_t this_obj) { LDKChannelFeatures this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChannelFeatures_free(this_obj_conv); } -void __attribute__((export_name("TS_InvoiceFeatures_free"))) TS_InvoiceFeatures_free(uint32_t this_obj) { +void __attribute__((export_name("TS_InvoiceFeatures_free"))) TS_InvoiceFeatures_free(uint64_t this_obj) { LDKInvoiceFeatures this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); InvoiceFeatures_free(this_obj_conv); } -void __attribute__((export_name("TS_ChannelTypeFeatures_free"))) TS_ChannelTypeFeatures_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChannelTypeFeatures_free"))) TS_ChannelTypeFeatures_free(uint64_t this_obj) { LDKChannelTypeFeatures this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChannelTypeFeatures_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_InitFeatures_empty"))) TS_InitFeatures_empty() { +uint64_t __attribute__((export_name("TS_InitFeatures_empty"))) TS_InitFeatures_empty() { LDKInitFeatures ret_var = InitFeatures_empty(); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_InitFeatures_known"))) TS_InitFeatures_known() { +uint64_t __attribute__((export_name("TS_InitFeatures_known"))) TS_InitFeatures_known() { LDKInitFeatures ret_var = InitFeatures_known(); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -jboolean __attribute__((export_name("TS_InitFeatures_requires_unknown_bits"))) TS_InitFeatures_requires_unknown_bits(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_requires_unknown_bits"))) TS_InitFeatures_requires_unknown_bits(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_requires_unknown_bits(&this_arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_NodeFeatures_empty"))) TS_NodeFeatures_empty() { +uint64_t __attribute__((export_name("TS_NodeFeatures_empty"))) TS_NodeFeatures_empty() { LDKNodeFeatures ret_var = NodeFeatures_empty(); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_NodeFeatures_known"))) TS_NodeFeatures_known() { +uint64_t __attribute__((export_name("TS_NodeFeatures_known"))) TS_NodeFeatures_known() { LDKNodeFeatures ret_var = NodeFeatures_known(); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -jboolean __attribute__((export_name("TS_NodeFeatures_requires_unknown_bits"))) TS_NodeFeatures_requires_unknown_bits(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_requires_unknown_bits"))) TS_NodeFeatures_requires_unknown_bits(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_requires_unknown_bits(&this_arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelFeatures_empty"))) TS_ChannelFeatures_empty() { +uint64_t __attribute__((export_name("TS_ChannelFeatures_empty"))) TS_ChannelFeatures_empty() { LDKChannelFeatures ret_var = ChannelFeatures_empty(); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelFeatures_known"))) TS_ChannelFeatures_known() { +uint64_t __attribute__((export_name("TS_ChannelFeatures_known"))) TS_ChannelFeatures_known() { LDKChannelFeatures ret_var = ChannelFeatures_known(); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -jboolean __attribute__((export_name("TS_ChannelFeatures_requires_unknown_bits"))) TS_ChannelFeatures_requires_unknown_bits(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_ChannelFeatures_requires_unknown_bits"))) TS_ChannelFeatures_requires_unknown_bits(uint64_t this_arg) { LDKChannelFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = ChannelFeatures_requires_unknown_bits(&this_arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_InvoiceFeatures_empty"))) TS_InvoiceFeatures_empty() { +uint64_t __attribute__((export_name("TS_InvoiceFeatures_empty"))) TS_InvoiceFeatures_empty() { LDKInvoiceFeatures ret_var = InvoiceFeatures_empty(); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_InvoiceFeatures_known"))) TS_InvoiceFeatures_known() { +uint64_t __attribute__((export_name("TS_InvoiceFeatures_known"))) TS_InvoiceFeatures_known() { LDKInvoiceFeatures ret_var = InvoiceFeatures_known(); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -jboolean __attribute__((export_name("TS_InvoiceFeatures_requires_unknown_bits"))) TS_InvoiceFeatures_requires_unknown_bits(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InvoiceFeatures_requires_unknown_bits"))) TS_InvoiceFeatures_requires_unknown_bits(uint64_t this_arg) { LDKInvoiceFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InvoiceFeatures_requires_unknown_bits(&this_arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelTypeFeatures_empty"))) TS_ChannelTypeFeatures_empty() { +uint64_t __attribute__((export_name("TS_ChannelTypeFeatures_empty"))) TS_ChannelTypeFeatures_empty() { LDKChannelTypeFeatures ret_var = ChannelTypeFeatures_empty(); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelTypeFeatures_known"))) TS_ChannelTypeFeatures_known() { +uint64_t __attribute__((export_name("TS_ChannelTypeFeatures_known"))) TS_ChannelTypeFeatures_known() { LDKChannelTypeFeatures ret_var = ChannelTypeFeatures_known(); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -jboolean __attribute__((export_name("TS_ChannelTypeFeatures_requires_unknown_bits"))) TS_ChannelTypeFeatures_requires_unknown_bits(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_ChannelTypeFeatures_requires_unknown_bits"))) TS_ChannelTypeFeatures_requires_unknown_bits(uint64_t this_arg) { LDKChannelTypeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = ChannelTypeFeatures_requires_unknown_bits(&this_arg_conv); return ret_conv; } -int8_tArray __attribute__((export_name("TS_InitFeatures_write"))) TS_InitFeatures_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_InitFeatures_write"))) TS_InitFeatures_write(uint64_t obj) { LDKInitFeatures obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = InitFeatures_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -37742,21 +35975,22 @@ int8_tArray __attribute__((export_name("TS_InitFeatures_write"))) TS_InitFeatur return ret_arr; } -uint32_t __attribute__((export_name("TS_InitFeatures_read"))) TS_InitFeatures_read(int8_tArray ser) { +uint64_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; LDKCResult_InitFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitFeaturesDecodeErrorZ), "LDKCResult_InitFeaturesDecodeErrorZ"); *ret_conv = InitFeatures_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_ChannelFeatures_write"))) TS_ChannelFeatures_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ChannelFeatures_write"))) TS_ChannelFeatures_write(uint64_t obj) { LDKChannelFeatures obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ChannelFeatures_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -37764,21 +35998,22 @@ int8_tArray __attribute__((export_name("TS_ChannelFeatures_write"))) TS_Channel return ret_arr; } -uint32_t __attribute__((export_name("TS_ChannelFeatures_read"))) TS_ChannelFeatures_read(int8_tArray ser) { +uint64_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; LDKCResult_ChannelFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelFeaturesDecodeErrorZ), "LDKCResult_ChannelFeaturesDecodeErrorZ"); *ret_conv = ChannelFeatures_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_NodeFeatures_write"))) TS_NodeFeatures_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_NodeFeatures_write"))) TS_NodeFeatures_write(uint64_t obj) { LDKNodeFeatures obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = NodeFeatures_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -37786,21 +36021,22 @@ int8_tArray __attribute__((export_name("TS_NodeFeatures_write"))) TS_NodeFeatur return ret_arr; } -uint32_t __attribute__((export_name("TS_NodeFeatures_read"))) TS_NodeFeatures_read(int8_tArray ser) { +uint64_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; LDKCResult_NodeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeFeaturesDecodeErrorZ), "LDKCResult_NodeFeaturesDecodeErrorZ"); *ret_conv = NodeFeatures_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_InvoiceFeatures_write"))) TS_InvoiceFeatures_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_InvoiceFeatures_write"))) TS_InvoiceFeatures_write(uint64_t obj) { LDKInvoiceFeatures obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = InvoiceFeatures_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -37808,21 +36044,22 @@ int8_tArray __attribute__((export_name("TS_InvoiceFeatures_write"))) TS_Invoice return ret_arr; } -uint32_t __attribute__((export_name("TS_InvoiceFeatures_read"))) TS_InvoiceFeatures_read(int8_tArray ser) { +uint64_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; LDKCResult_InvoiceFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceFeaturesDecodeErrorZ), "LDKCResult_InvoiceFeaturesDecodeErrorZ"); *ret_conv = InvoiceFeatures_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_ChannelTypeFeatures_write"))) TS_ChannelTypeFeatures_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ChannelTypeFeatures_write"))) TS_ChannelTypeFeatures_write(uint64_t obj) { LDKChannelTypeFeatures obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ChannelTypeFeatures_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -37830,1165 +36067,1286 @@ int8_tArray __attribute__((export_name("TS_ChannelTypeFeatures_write"))) TS_Cha return ret_arr; } -uint32_t __attribute__((export_name("TS_ChannelTypeFeatures_read"))) TS_ChannelTypeFeatures_read(int8_tArray ser) { +uint64_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; LDKCResult_ChannelTypeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTypeFeaturesDecodeErrorZ), "LDKCResult_ChannelTypeFeaturesDecodeErrorZ"); *ret_conv = ChannelTypeFeatures_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_InitFeatures_set_data_loss_protect_optional"))) TS_InitFeatures_set_data_loss_protect_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_data_loss_protect_optional"))) TS_InitFeatures_set_data_loss_protect_optional(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_data_loss_protect_optional(&this_arg_conv); } -void __attribute__((export_name("TS_InitFeatures_set_data_loss_protect_required"))) TS_InitFeatures_set_data_loss_protect_required(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_data_loss_protect_required"))) TS_InitFeatures_set_data_loss_protect_required(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_data_loss_protect_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_InitFeatures_supports_data_loss_protect"))) TS_InitFeatures_supports_data_loss_protect(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_supports_data_loss_protect"))) TS_InitFeatures_supports_data_loss_protect(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_supports_data_loss_protect(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_NodeFeatures_set_data_loss_protect_optional"))) TS_NodeFeatures_set_data_loss_protect_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_data_loss_protect_optional"))) TS_NodeFeatures_set_data_loss_protect_optional(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_data_loss_protect_optional(&this_arg_conv); } -void __attribute__((export_name("TS_NodeFeatures_set_data_loss_protect_required"))) TS_NodeFeatures_set_data_loss_protect_required(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_data_loss_protect_required"))) TS_NodeFeatures_set_data_loss_protect_required(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_data_loss_protect_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_NodeFeatures_supports_data_loss_protect"))) TS_NodeFeatures_supports_data_loss_protect(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_supports_data_loss_protect"))) TS_NodeFeatures_supports_data_loss_protect(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_supports_data_loss_protect(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_InitFeatures_requires_data_loss_protect"))) TS_InitFeatures_requires_data_loss_protect(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_requires_data_loss_protect"))) TS_InitFeatures_requires_data_loss_protect(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_requires_data_loss_protect(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_NodeFeatures_requires_data_loss_protect"))) TS_NodeFeatures_requires_data_loss_protect(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_requires_data_loss_protect"))) TS_NodeFeatures_requires_data_loss_protect(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_requires_data_loss_protect(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_InitFeatures_set_initial_routing_sync_optional"))) TS_InitFeatures_set_initial_routing_sync_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_initial_routing_sync_optional"))) TS_InitFeatures_set_initial_routing_sync_optional(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_initial_routing_sync_optional(&this_arg_conv); } -void __attribute__((export_name("TS_InitFeatures_set_initial_routing_sync_required"))) TS_InitFeatures_set_initial_routing_sync_required(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_initial_routing_sync_required"))) TS_InitFeatures_set_initial_routing_sync_required(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_initial_routing_sync_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_InitFeatures_initial_routing_sync"))) TS_InitFeatures_initial_routing_sync(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_initial_routing_sync"))) TS_InitFeatures_initial_routing_sync(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_initial_routing_sync(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_InitFeatures_set_upfront_shutdown_script_optional"))) TS_InitFeatures_set_upfront_shutdown_script_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_upfront_shutdown_script_optional"))) TS_InitFeatures_set_upfront_shutdown_script_optional(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_upfront_shutdown_script_optional(&this_arg_conv); } -void __attribute__((export_name("TS_InitFeatures_set_upfront_shutdown_script_required"))) TS_InitFeatures_set_upfront_shutdown_script_required(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_upfront_shutdown_script_required"))) TS_InitFeatures_set_upfront_shutdown_script_required(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_upfront_shutdown_script_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_InitFeatures_supports_upfront_shutdown_script"))) TS_InitFeatures_supports_upfront_shutdown_script(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_supports_upfront_shutdown_script"))) TS_InitFeatures_supports_upfront_shutdown_script(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_supports_upfront_shutdown_script(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_NodeFeatures_set_upfront_shutdown_script_optional"))) TS_NodeFeatures_set_upfront_shutdown_script_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_upfront_shutdown_script_optional"))) TS_NodeFeatures_set_upfront_shutdown_script_optional(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_upfront_shutdown_script_optional(&this_arg_conv); } -void __attribute__((export_name("TS_NodeFeatures_set_upfront_shutdown_script_required"))) TS_NodeFeatures_set_upfront_shutdown_script_required(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_upfront_shutdown_script_required"))) TS_NodeFeatures_set_upfront_shutdown_script_required(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_upfront_shutdown_script_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_NodeFeatures_supports_upfront_shutdown_script"))) TS_NodeFeatures_supports_upfront_shutdown_script(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_supports_upfront_shutdown_script"))) TS_NodeFeatures_supports_upfront_shutdown_script(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_supports_upfront_shutdown_script(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_InitFeatures_requires_upfront_shutdown_script"))) TS_InitFeatures_requires_upfront_shutdown_script(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_requires_upfront_shutdown_script"))) TS_InitFeatures_requires_upfront_shutdown_script(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_requires_upfront_shutdown_script(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_NodeFeatures_requires_upfront_shutdown_script"))) TS_NodeFeatures_requires_upfront_shutdown_script(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_requires_upfront_shutdown_script"))) TS_NodeFeatures_requires_upfront_shutdown_script(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_requires_upfront_shutdown_script(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_InitFeatures_set_gossip_queries_optional"))) TS_InitFeatures_set_gossip_queries_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_gossip_queries_optional"))) TS_InitFeatures_set_gossip_queries_optional(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_gossip_queries_optional(&this_arg_conv); } -void __attribute__((export_name("TS_InitFeatures_set_gossip_queries_required"))) TS_InitFeatures_set_gossip_queries_required(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_gossip_queries_required"))) TS_InitFeatures_set_gossip_queries_required(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_gossip_queries_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_InitFeatures_supports_gossip_queries"))) TS_InitFeatures_supports_gossip_queries(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_supports_gossip_queries"))) TS_InitFeatures_supports_gossip_queries(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_supports_gossip_queries(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_NodeFeatures_set_gossip_queries_optional"))) TS_NodeFeatures_set_gossip_queries_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_gossip_queries_optional"))) TS_NodeFeatures_set_gossip_queries_optional(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_gossip_queries_optional(&this_arg_conv); } -void __attribute__((export_name("TS_NodeFeatures_set_gossip_queries_required"))) TS_NodeFeatures_set_gossip_queries_required(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_gossip_queries_required"))) TS_NodeFeatures_set_gossip_queries_required(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_gossip_queries_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_NodeFeatures_supports_gossip_queries"))) TS_NodeFeatures_supports_gossip_queries(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_supports_gossip_queries"))) TS_NodeFeatures_supports_gossip_queries(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_supports_gossip_queries(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_InitFeatures_requires_gossip_queries"))) TS_InitFeatures_requires_gossip_queries(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_requires_gossip_queries"))) TS_InitFeatures_requires_gossip_queries(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_requires_gossip_queries(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_NodeFeatures_requires_gossip_queries"))) TS_NodeFeatures_requires_gossip_queries(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_requires_gossip_queries"))) TS_NodeFeatures_requires_gossip_queries(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_requires_gossip_queries(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_InitFeatures_set_variable_length_onion_optional"))) TS_InitFeatures_set_variable_length_onion_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_variable_length_onion_optional"))) TS_InitFeatures_set_variable_length_onion_optional(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_variable_length_onion_optional(&this_arg_conv); } -void __attribute__((export_name("TS_InitFeatures_set_variable_length_onion_required"))) TS_InitFeatures_set_variable_length_onion_required(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_variable_length_onion_required"))) TS_InitFeatures_set_variable_length_onion_required(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_variable_length_onion_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_InitFeatures_supports_variable_length_onion"))) TS_InitFeatures_supports_variable_length_onion(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_supports_variable_length_onion"))) TS_InitFeatures_supports_variable_length_onion(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_supports_variable_length_onion(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_NodeFeatures_set_variable_length_onion_optional"))) TS_NodeFeatures_set_variable_length_onion_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_variable_length_onion_optional"))) TS_NodeFeatures_set_variable_length_onion_optional(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_variable_length_onion_optional(&this_arg_conv); } -void __attribute__((export_name("TS_NodeFeatures_set_variable_length_onion_required"))) TS_NodeFeatures_set_variable_length_onion_required(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_variable_length_onion_required"))) TS_NodeFeatures_set_variable_length_onion_required(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_variable_length_onion_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_NodeFeatures_supports_variable_length_onion"))) TS_NodeFeatures_supports_variable_length_onion(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_supports_variable_length_onion"))) TS_NodeFeatures_supports_variable_length_onion(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_supports_variable_length_onion(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_InvoiceFeatures_set_variable_length_onion_optional"))) TS_InvoiceFeatures_set_variable_length_onion_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_InvoiceFeatures_set_variable_length_onion_optional"))) TS_InvoiceFeatures_set_variable_length_onion_optional(uint64_t this_arg) { LDKInvoiceFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InvoiceFeatures_set_variable_length_onion_optional(&this_arg_conv); } -void __attribute__((export_name("TS_InvoiceFeatures_set_variable_length_onion_required"))) TS_InvoiceFeatures_set_variable_length_onion_required(uint32_t this_arg) { +void __attribute__((export_name("TS_InvoiceFeatures_set_variable_length_onion_required"))) TS_InvoiceFeatures_set_variable_length_onion_required(uint64_t this_arg) { LDKInvoiceFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InvoiceFeatures_set_variable_length_onion_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_InvoiceFeatures_supports_variable_length_onion"))) TS_InvoiceFeatures_supports_variable_length_onion(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InvoiceFeatures_supports_variable_length_onion"))) TS_InvoiceFeatures_supports_variable_length_onion(uint64_t this_arg) { LDKInvoiceFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InvoiceFeatures_supports_variable_length_onion(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_InitFeatures_requires_variable_length_onion"))) TS_InitFeatures_requires_variable_length_onion(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_requires_variable_length_onion"))) TS_InitFeatures_requires_variable_length_onion(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_requires_variable_length_onion(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_NodeFeatures_requires_variable_length_onion"))) TS_NodeFeatures_requires_variable_length_onion(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_requires_variable_length_onion"))) TS_NodeFeatures_requires_variable_length_onion(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_requires_variable_length_onion(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_InvoiceFeatures_requires_variable_length_onion"))) TS_InvoiceFeatures_requires_variable_length_onion(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InvoiceFeatures_requires_variable_length_onion"))) TS_InvoiceFeatures_requires_variable_length_onion(uint64_t this_arg) { LDKInvoiceFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InvoiceFeatures_requires_variable_length_onion(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_InitFeatures_set_static_remote_key_optional"))) TS_InitFeatures_set_static_remote_key_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_static_remote_key_optional"))) TS_InitFeatures_set_static_remote_key_optional(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_static_remote_key_optional(&this_arg_conv); } -void __attribute__((export_name("TS_InitFeatures_set_static_remote_key_required"))) TS_InitFeatures_set_static_remote_key_required(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_static_remote_key_required"))) TS_InitFeatures_set_static_remote_key_required(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_static_remote_key_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_InitFeatures_supports_static_remote_key"))) TS_InitFeatures_supports_static_remote_key(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_supports_static_remote_key"))) TS_InitFeatures_supports_static_remote_key(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_supports_static_remote_key(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_NodeFeatures_set_static_remote_key_optional"))) TS_NodeFeatures_set_static_remote_key_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_static_remote_key_optional"))) TS_NodeFeatures_set_static_remote_key_optional(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_static_remote_key_optional(&this_arg_conv); } -void __attribute__((export_name("TS_NodeFeatures_set_static_remote_key_required"))) TS_NodeFeatures_set_static_remote_key_required(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_static_remote_key_required"))) TS_NodeFeatures_set_static_remote_key_required(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_static_remote_key_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_NodeFeatures_supports_static_remote_key"))) TS_NodeFeatures_supports_static_remote_key(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_supports_static_remote_key"))) TS_NodeFeatures_supports_static_remote_key(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_supports_static_remote_key(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelTypeFeatures_set_static_remote_key_optional"))) TS_ChannelTypeFeatures_set_static_remote_key_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_ChannelTypeFeatures_set_static_remote_key_optional"))) TS_ChannelTypeFeatures_set_static_remote_key_optional(uint64_t this_arg) { LDKChannelTypeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; ChannelTypeFeatures_set_static_remote_key_optional(&this_arg_conv); } -void __attribute__((export_name("TS_ChannelTypeFeatures_set_static_remote_key_required"))) TS_ChannelTypeFeatures_set_static_remote_key_required(uint32_t this_arg) { +void __attribute__((export_name("TS_ChannelTypeFeatures_set_static_remote_key_required"))) TS_ChannelTypeFeatures_set_static_remote_key_required(uint64_t this_arg) { LDKChannelTypeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; ChannelTypeFeatures_set_static_remote_key_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_ChannelTypeFeatures_supports_static_remote_key"))) TS_ChannelTypeFeatures_supports_static_remote_key(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_ChannelTypeFeatures_supports_static_remote_key"))) TS_ChannelTypeFeatures_supports_static_remote_key(uint64_t this_arg) { LDKChannelTypeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = ChannelTypeFeatures_supports_static_remote_key(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_InitFeatures_requires_static_remote_key"))) TS_InitFeatures_requires_static_remote_key(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_requires_static_remote_key"))) TS_InitFeatures_requires_static_remote_key(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_requires_static_remote_key(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_NodeFeatures_requires_static_remote_key"))) TS_NodeFeatures_requires_static_remote_key(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_requires_static_remote_key"))) TS_NodeFeatures_requires_static_remote_key(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_requires_static_remote_key(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_ChannelTypeFeatures_requires_static_remote_key"))) TS_ChannelTypeFeatures_requires_static_remote_key(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_ChannelTypeFeatures_requires_static_remote_key"))) TS_ChannelTypeFeatures_requires_static_remote_key(uint64_t this_arg) { LDKChannelTypeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = ChannelTypeFeatures_requires_static_remote_key(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_InitFeatures_set_payment_secret_optional"))) TS_InitFeatures_set_payment_secret_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_payment_secret_optional"))) TS_InitFeatures_set_payment_secret_optional(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_payment_secret_optional(&this_arg_conv); } -void __attribute__((export_name("TS_InitFeatures_set_payment_secret_required"))) TS_InitFeatures_set_payment_secret_required(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_payment_secret_required"))) TS_InitFeatures_set_payment_secret_required(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_payment_secret_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_InitFeatures_supports_payment_secret"))) TS_InitFeatures_supports_payment_secret(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_supports_payment_secret"))) TS_InitFeatures_supports_payment_secret(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_supports_payment_secret(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_NodeFeatures_set_payment_secret_optional"))) TS_NodeFeatures_set_payment_secret_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_payment_secret_optional"))) TS_NodeFeatures_set_payment_secret_optional(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_payment_secret_optional(&this_arg_conv); } -void __attribute__((export_name("TS_NodeFeatures_set_payment_secret_required"))) TS_NodeFeatures_set_payment_secret_required(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_payment_secret_required"))) TS_NodeFeatures_set_payment_secret_required(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_payment_secret_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_NodeFeatures_supports_payment_secret"))) TS_NodeFeatures_supports_payment_secret(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_supports_payment_secret"))) TS_NodeFeatures_supports_payment_secret(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_supports_payment_secret(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_InvoiceFeatures_set_payment_secret_optional"))) TS_InvoiceFeatures_set_payment_secret_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_InvoiceFeatures_set_payment_secret_optional"))) TS_InvoiceFeatures_set_payment_secret_optional(uint64_t this_arg) { LDKInvoiceFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InvoiceFeatures_set_payment_secret_optional(&this_arg_conv); } -void __attribute__((export_name("TS_InvoiceFeatures_set_payment_secret_required"))) TS_InvoiceFeatures_set_payment_secret_required(uint32_t this_arg) { +void __attribute__((export_name("TS_InvoiceFeatures_set_payment_secret_required"))) TS_InvoiceFeatures_set_payment_secret_required(uint64_t this_arg) { LDKInvoiceFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InvoiceFeatures_set_payment_secret_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_InvoiceFeatures_supports_payment_secret"))) TS_InvoiceFeatures_supports_payment_secret(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InvoiceFeatures_supports_payment_secret"))) TS_InvoiceFeatures_supports_payment_secret(uint64_t this_arg) { LDKInvoiceFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InvoiceFeatures_supports_payment_secret(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_InitFeatures_requires_payment_secret"))) TS_InitFeatures_requires_payment_secret(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_requires_payment_secret"))) TS_InitFeatures_requires_payment_secret(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_requires_payment_secret(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_NodeFeatures_requires_payment_secret"))) TS_NodeFeatures_requires_payment_secret(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_requires_payment_secret"))) TS_NodeFeatures_requires_payment_secret(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_requires_payment_secret(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_InvoiceFeatures_requires_payment_secret"))) TS_InvoiceFeatures_requires_payment_secret(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InvoiceFeatures_requires_payment_secret"))) TS_InvoiceFeatures_requires_payment_secret(uint64_t this_arg) { LDKInvoiceFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InvoiceFeatures_requires_payment_secret(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_InitFeatures_set_basic_mpp_optional"))) TS_InitFeatures_set_basic_mpp_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_basic_mpp_optional"))) TS_InitFeatures_set_basic_mpp_optional(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_basic_mpp_optional(&this_arg_conv); } -void __attribute__((export_name("TS_InitFeatures_set_basic_mpp_required"))) TS_InitFeatures_set_basic_mpp_required(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_basic_mpp_required"))) TS_InitFeatures_set_basic_mpp_required(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_basic_mpp_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_InitFeatures_supports_basic_mpp"))) TS_InitFeatures_supports_basic_mpp(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_supports_basic_mpp"))) TS_InitFeatures_supports_basic_mpp(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_supports_basic_mpp(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_NodeFeatures_set_basic_mpp_optional"))) TS_NodeFeatures_set_basic_mpp_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_basic_mpp_optional"))) TS_NodeFeatures_set_basic_mpp_optional(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_basic_mpp_optional(&this_arg_conv); } -void __attribute__((export_name("TS_NodeFeatures_set_basic_mpp_required"))) TS_NodeFeatures_set_basic_mpp_required(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_basic_mpp_required"))) TS_NodeFeatures_set_basic_mpp_required(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_basic_mpp_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_NodeFeatures_supports_basic_mpp"))) TS_NodeFeatures_supports_basic_mpp(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_supports_basic_mpp"))) TS_NodeFeatures_supports_basic_mpp(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_supports_basic_mpp(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_InvoiceFeatures_set_basic_mpp_optional"))) TS_InvoiceFeatures_set_basic_mpp_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_InvoiceFeatures_set_basic_mpp_optional"))) TS_InvoiceFeatures_set_basic_mpp_optional(uint64_t this_arg) { LDKInvoiceFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InvoiceFeatures_set_basic_mpp_optional(&this_arg_conv); } -void __attribute__((export_name("TS_InvoiceFeatures_set_basic_mpp_required"))) TS_InvoiceFeatures_set_basic_mpp_required(uint32_t this_arg) { +void __attribute__((export_name("TS_InvoiceFeatures_set_basic_mpp_required"))) TS_InvoiceFeatures_set_basic_mpp_required(uint64_t this_arg) { LDKInvoiceFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InvoiceFeatures_set_basic_mpp_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_InvoiceFeatures_supports_basic_mpp"))) TS_InvoiceFeatures_supports_basic_mpp(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InvoiceFeatures_supports_basic_mpp"))) TS_InvoiceFeatures_supports_basic_mpp(uint64_t this_arg) { LDKInvoiceFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InvoiceFeatures_supports_basic_mpp(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_InitFeatures_requires_basic_mpp"))) TS_InitFeatures_requires_basic_mpp(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_requires_basic_mpp"))) TS_InitFeatures_requires_basic_mpp(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_requires_basic_mpp(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_NodeFeatures_requires_basic_mpp"))) TS_NodeFeatures_requires_basic_mpp(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_requires_basic_mpp"))) TS_NodeFeatures_requires_basic_mpp(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_requires_basic_mpp(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_InvoiceFeatures_requires_basic_mpp"))) TS_InvoiceFeatures_requires_basic_mpp(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InvoiceFeatures_requires_basic_mpp"))) TS_InvoiceFeatures_requires_basic_mpp(uint64_t this_arg) { LDKInvoiceFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InvoiceFeatures_requires_basic_mpp(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_InitFeatures_set_wumbo_optional"))) TS_InitFeatures_set_wumbo_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_wumbo_optional"))) TS_InitFeatures_set_wumbo_optional(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_wumbo_optional(&this_arg_conv); } -void __attribute__((export_name("TS_InitFeatures_set_wumbo_required"))) TS_InitFeatures_set_wumbo_required(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_wumbo_required"))) TS_InitFeatures_set_wumbo_required(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_wumbo_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_InitFeatures_supports_wumbo"))) TS_InitFeatures_supports_wumbo(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_supports_wumbo"))) TS_InitFeatures_supports_wumbo(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_supports_wumbo(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_NodeFeatures_set_wumbo_optional"))) TS_NodeFeatures_set_wumbo_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_wumbo_optional"))) TS_NodeFeatures_set_wumbo_optional(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_wumbo_optional(&this_arg_conv); } -void __attribute__((export_name("TS_NodeFeatures_set_wumbo_required"))) TS_NodeFeatures_set_wumbo_required(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_wumbo_required"))) TS_NodeFeatures_set_wumbo_required(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_wumbo_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_NodeFeatures_supports_wumbo"))) TS_NodeFeatures_supports_wumbo(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_supports_wumbo"))) TS_NodeFeatures_supports_wumbo(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_supports_wumbo(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_InitFeatures_requires_wumbo"))) TS_InitFeatures_requires_wumbo(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_requires_wumbo"))) TS_InitFeatures_requires_wumbo(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_requires_wumbo(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_NodeFeatures_requires_wumbo"))) TS_NodeFeatures_requires_wumbo(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_requires_wumbo"))) TS_NodeFeatures_requires_wumbo(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_requires_wumbo(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_InitFeatures_set_shutdown_any_segwit_optional"))) TS_InitFeatures_set_shutdown_any_segwit_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_shutdown_any_segwit_optional"))) TS_InitFeatures_set_shutdown_any_segwit_optional(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_shutdown_any_segwit_optional(&this_arg_conv); } -void __attribute__((export_name("TS_InitFeatures_set_shutdown_any_segwit_required"))) TS_InitFeatures_set_shutdown_any_segwit_required(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_shutdown_any_segwit_required"))) TS_InitFeatures_set_shutdown_any_segwit_required(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_shutdown_any_segwit_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_InitFeatures_supports_shutdown_anysegwit"))) TS_InitFeatures_supports_shutdown_anysegwit(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_supports_shutdown_anysegwit"))) TS_InitFeatures_supports_shutdown_anysegwit(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_supports_shutdown_anysegwit(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_NodeFeatures_set_shutdown_any_segwit_optional"))) TS_NodeFeatures_set_shutdown_any_segwit_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_shutdown_any_segwit_optional"))) TS_NodeFeatures_set_shutdown_any_segwit_optional(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_shutdown_any_segwit_optional(&this_arg_conv); } -void __attribute__((export_name("TS_NodeFeatures_set_shutdown_any_segwit_required"))) TS_NodeFeatures_set_shutdown_any_segwit_required(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_shutdown_any_segwit_required"))) TS_NodeFeatures_set_shutdown_any_segwit_required(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_shutdown_any_segwit_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_NodeFeatures_supports_shutdown_anysegwit"))) TS_NodeFeatures_supports_shutdown_anysegwit(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_supports_shutdown_anysegwit"))) TS_NodeFeatures_supports_shutdown_anysegwit(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_supports_shutdown_anysegwit(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_InitFeatures_requires_shutdown_anysegwit"))) TS_InitFeatures_requires_shutdown_anysegwit(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_requires_shutdown_anysegwit"))) TS_InitFeatures_requires_shutdown_anysegwit(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_requires_shutdown_anysegwit(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_NodeFeatures_requires_shutdown_anysegwit"))) TS_NodeFeatures_requires_shutdown_anysegwit(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_requires_shutdown_anysegwit"))) TS_NodeFeatures_requires_shutdown_anysegwit(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_requires_shutdown_anysegwit(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_InitFeatures_set_channel_type_optional"))) TS_InitFeatures_set_channel_type_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_channel_type_optional"))) TS_InitFeatures_set_channel_type_optional(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_channel_type_optional(&this_arg_conv); } -void __attribute__((export_name("TS_InitFeatures_set_channel_type_required"))) TS_InitFeatures_set_channel_type_required(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_channel_type_required"))) TS_InitFeatures_set_channel_type_required(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_channel_type_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_InitFeatures_supports_channel_type"))) TS_InitFeatures_supports_channel_type(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_supports_channel_type"))) TS_InitFeatures_supports_channel_type(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_supports_channel_type(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_NodeFeatures_set_channel_type_optional"))) TS_NodeFeatures_set_channel_type_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_channel_type_optional"))) TS_NodeFeatures_set_channel_type_optional(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_channel_type_optional(&this_arg_conv); } -void __attribute__((export_name("TS_NodeFeatures_set_channel_type_required"))) TS_NodeFeatures_set_channel_type_required(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_channel_type_required"))) TS_NodeFeatures_set_channel_type_required(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_channel_type_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_NodeFeatures_supports_channel_type"))) TS_NodeFeatures_supports_channel_type(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_supports_channel_type"))) TS_NodeFeatures_supports_channel_type(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_supports_channel_type(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_InitFeatures_requires_channel_type"))) TS_InitFeatures_requires_channel_type(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_requires_channel_type"))) TS_InitFeatures_requires_channel_type(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_requires_channel_type(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_NodeFeatures_requires_channel_type"))) TS_NodeFeatures_requires_channel_type(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_requires_channel_type"))) TS_NodeFeatures_requires_channel_type(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_requires_channel_type(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_InitFeatures_set_scid_privacy_optional"))) TS_InitFeatures_set_scid_privacy_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_scid_privacy_optional"))) TS_InitFeatures_set_scid_privacy_optional(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_scid_privacy_optional(&this_arg_conv); } -void __attribute__((export_name("TS_InitFeatures_set_scid_privacy_required"))) TS_InitFeatures_set_scid_privacy_required(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_scid_privacy_required"))) TS_InitFeatures_set_scid_privacy_required(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_scid_privacy_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_InitFeatures_supports_scid_privacy"))) TS_InitFeatures_supports_scid_privacy(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_supports_scid_privacy"))) TS_InitFeatures_supports_scid_privacy(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_supports_scid_privacy(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_NodeFeatures_set_scid_privacy_optional"))) TS_NodeFeatures_set_scid_privacy_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_scid_privacy_optional"))) TS_NodeFeatures_set_scid_privacy_optional(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_scid_privacy_optional(&this_arg_conv); } -void __attribute__((export_name("TS_NodeFeatures_set_scid_privacy_required"))) TS_NodeFeatures_set_scid_privacy_required(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_scid_privacy_required"))) TS_NodeFeatures_set_scid_privacy_required(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_scid_privacy_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_NodeFeatures_supports_scid_privacy"))) TS_NodeFeatures_supports_scid_privacy(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_supports_scid_privacy"))) TS_NodeFeatures_supports_scid_privacy(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_supports_scid_privacy(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelTypeFeatures_set_scid_privacy_optional"))) TS_ChannelTypeFeatures_set_scid_privacy_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_ChannelTypeFeatures_set_scid_privacy_optional"))) TS_ChannelTypeFeatures_set_scid_privacy_optional(uint64_t this_arg) { LDKChannelTypeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; ChannelTypeFeatures_set_scid_privacy_optional(&this_arg_conv); } -void __attribute__((export_name("TS_ChannelTypeFeatures_set_scid_privacy_required"))) TS_ChannelTypeFeatures_set_scid_privacy_required(uint32_t this_arg) { +void __attribute__((export_name("TS_ChannelTypeFeatures_set_scid_privacy_required"))) TS_ChannelTypeFeatures_set_scid_privacy_required(uint64_t this_arg) { LDKChannelTypeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; ChannelTypeFeatures_set_scid_privacy_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_ChannelTypeFeatures_supports_scid_privacy"))) TS_ChannelTypeFeatures_supports_scid_privacy(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_ChannelTypeFeatures_supports_scid_privacy"))) TS_ChannelTypeFeatures_supports_scid_privacy(uint64_t this_arg) { LDKChannelTypeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = ChannelTypeFeatures_supports_scid_privacy(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_InitFeatures_requires_scid_privacy"))) TS_InitFeatures_requires_scid_privacy(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_requires_scid_privacy"))) TS_InitFeatures_requires_scid_privacy(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_requires_scid_privacy(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_NodeFeatures_requires_scid_privacy"))) TS_NodeFeatures_requires_scid_privacy(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_requires_scid_privacy"))) TS_NodeFeatures_requires_scid_privacy(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_requires_scid_privacy(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_ChannelTypeFeatures_requires_scid_privacy"))) TS_ChannelTypeFeatures_requires_scid_privacy(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_ChannelTypeFeatures_requires_scid_privacy"))) TS_ChannelTypeFeatures_requires_scid_privacy(uint64_t this_arg) { LDKChannelTypeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = ChannelTypeFeatures_requires_scid_privacy(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_InitFeatures_set_zero_conf_optional"))) TS_InitFeatures_set_zero_conf_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_zero_conf_optional"))) TS_InitFeatures_set_zero_conf_optional(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_zero_conf_optional(&this_arg_conv); } -void __attribute__((export_name("TS_InitFeatures_set_zero_conf_required"))) TS_InitFeatures_set_zero_conf_required(uint32_t this_arg) { +void __attribute__((export_name("TS_InitFeatures_set_zero_conf_required"))) TS_InitFeatures_set_zero_conf_required(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; InitFeatures_set_zero_conf_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_InitFeatures_supports_zero_conf"))) TS_InitFeatures_supports_zero_conf(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_supports_zero_conf"))) TS_InitFeatures_supports_zero_conf(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_supports_zero_conf(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_NodeFeatures_set_zero_conf_optional"))) TS_NodeFeatures_set_zero_conf_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_zero_conf_optional"))) TS_NodeFeatures_set_zero_conf_optional(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_zero_conf_optional(&this_arg_conv); } -void __attribute__((export_name("TS_NodeFeatures_set_zero_conf_required"))) TS_NodeFeatures_set_zero_conf_required(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_zero_conf_required"))) TS_NodeFeatures_set_zero_conf_required(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_zero_conf_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_NodeFeatures_supports_zero_conf"))) TS_NodeFeatures_supports_zero_conf(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_supports_zero_conf"))) TS_NodeFeatures_supports_zero_conf(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_supports_zero_conf(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelTypeFeatures_set_zero_conf_optional"))) TS_ChannelTypeFeatures_set_zero_conf_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_ChannelTypeFeatures_set_zero_conf_optional"))) TS_ChannelTypeFeatures_set_zero_conf_optional(uint64_t this_arg) { LDKChannelTypeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; ChannelTypeFeatures_set_zero_conf_optional(&this_arg_conv); } -void __attribute__((export_name("TS_ChannelTypeFeatures_set_zero_conf_required"))) TS_ChannelTypeFeatures_set_zero_conf_required(uint32_t this_arg) { +void __attribute__((export_name("TS_ChannelTypeFeatures_set_zero_conf_required"))) TS_ChannelTypeFeatures_set_zero_conf_required(uint64_t this_arg) { LDKChannelTypeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; ChannelTypeFeatures_set_zero_conf_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_ChannelTypeFeatures_supports_zero_conf"))) TS_ChannelTypeFeatures_supports_zero_conf(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_ChannelTypeFeatures_supports_zero_conf"))) TS_ChannelTypeFeatures_supports_zero_conf(uint64_t this_arg) { LDKChannelTypeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = ChannelTypeFeatures_supports_zero_conf(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_InitFeatures_requires_zero_conf"))) TS_InitFeatures_requires_zero_conf(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_InitFeatures_requires_zero_conf"))) TS_InitFeatures_requires_zero_conf(uint64_t this_arg) { LDKInitFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = InitFeatures_requires_zero_conf(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_NodeFeatures_requires_zero_conf"))) TS_NodeFeatures_requires_zero_conf(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_requires_zero_conf"))) TS_NodeFeatures_requires_zero_conf(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_requires_zero_conf(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_ChannelTypeFeatures_requires_zero_conf"))) TS_ChannelTypeFeatures_requires_zero_conf(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_ChannelTypeFeatures_requires_zero_conf"))) TS_ChannelTypeFeatures_requires_zero_conf(uint64_t this_arg) { LDKChannelTypeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = ChannelTypeFeatures_requires_zero_conf(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_NodeFeatures_set_keysend_optional"))) TS_NodeFeatures_set_keysend_optional(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_keysend_optional"))) TS_NodeFeatures_set_keysend_optional(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_keysend_optional(&this_arg_conv); } -void __attribute__((export_name("TS_NodeFeatures_set_keysend_required"))) TS_NodeFeatures_set_keysend_required(uint32_t this_arg) { +void __attribute__((export_name("TS_NodeFeatures_set_keysend_required"))) TS_NodeFeatures_set_keysend_required(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NodeFeatures_set_keysend_required(&this_arg_conv); } -jboolean __attribute__((export_name("TS_NodeFeatures_supports_keysend"))) TS_NodeFeatures_supports_keysend(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_supports_keysend"))) TS_NodeFeatures_supports_keysend(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_supports_keysend(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_NodeFeatures_requires_keysend"))) TS_NodeFeatures_requires_keysend(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_NodeFeatures_requires_keysend"))) TS_NodeFeatures_requires_keysend(uint64_t this_arg) { LDKNodeFeatures this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = NodeFeatures_requires_keysend(&this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_ShutdownScript_free"))) TS_ShutdownScript_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ShutdownScript_free"))) TS_ShutdownScript_free(uint64_t this_obj) { LDKShutdownScript this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ShutdownScript_free(this_obj_conv); } -static inline uintptr_t ShutdownScript_clone_ptr(LDKShutdownScript *NONNULL_PTR arg) { +static inline uint64_t ShutdownScript_clone_ptr(LDKShutdownScript *NONNULL_PTR arg) { LDKShutdownScript ret_var = ShutdownScript_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ShutdownScript_clone_ptr"))) TS_ShutdownScript_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ShutdownScript_clone_ptr"))) TS_ShutdownScript_clone_ptr(uint64_t arg) { LDKShutdownScript arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ShutdownScript_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ShutdownScript_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ShutdownScript_clone"))) TS_ShutdownScript_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ShutdownScript_clone"))) TS_ShutdownScript_clone(uint64_t orig) { LDKShutdownScript orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKShutdownScript ret_var = ShutdownScript_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_InvalidShutdownScript_free"))) TS_InvalidShutdownScript_free(uint32_t this_obj) { +void __attribute__((export_name("TS_InvalidShutdownScript_free"))) TS_InvalidShutdownScript_free(uint64_t this_obj) { LDKInvalidShutdownScript this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); InvalidShutdownScript_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_InvalidShutdownScript_get_script"))) TS_InvalidShutdownScript_get_script(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_InvalidShutdownScript_get_script"))) TS_InvalidShutdownScript_get_script(uint64_t this_ptr) { LDKInvalidShutdownScript this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKu8slice ret_var = InvalidShutdownScript_get_script(&this_ptr_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); return ret_arr; } -void __attribute__((export_name("TS_InvalidShutdownScript_set_script"))) TS_InvalidShutdownScript_set_script(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_InvalidShutdownScript_set_script"))) TS_InvalidShutdownScript_set_script(uint64_t this_ptr, int8_tArray val) { LDKInvalidShutdownScript this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_u8Z val_ref; val_ref.datalen = val->arr_len; val_ref.data = MALLOC(val_ref.datalen, "LDKCVec_u8Z Bytes"); @@ -38996,66 +37354,54 @@ void __attribute__((export_name("TS_InvalidShutdownScript_set_script"))) TS_Inv InvalidShutdownScript_set_script(&this_ptr_conv, val_ref); } -uint32_t __attribute__((export_name("TS_InvalidShutdownScript_new"))) TS_InvalidShutdownScript_new(int8_tArray script_arg) { +uint64_t __attribute__((export_name("TS_InvalidShutdownScript_new"))) TS_InvalidShutdownScript_new(int8_tArray script_arg) { 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); FREE(script_arg); LDKInvalidShutdownScript ret_var = InvalidShutdownScript_new(script_arg_ref); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t InvalidShutdownScript_clone_ptr(LDKInvalidShutdownScript *NONNULL_PTR arg) { +static inline uint64_t InvalidShutdownScript_clone_ptr(LDKInvalidShutdownScript *NONNULL_PTR arg) { LDKInvalidShutdownScript ret_var = InvalidShutdownScript_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_InvalidShutdownScript_clone_ptr"))) TS_InvalidShutdownScript_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_InvalidShutdownScript_clone_ptr"))) TS_InvalidShutdownScript_clone_ptr(uint64_t arg) { LDKInvalidShutdownScript arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = InvalidShutdownScript_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = InvalidShutdownScript_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_InvalidShutdownScript_clone"))) TS_InvalidShutdownScript_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_InvalidShutdownScript_clone"))) TS_InvalidShutdownScript_clone(uint64_t orig) { LDKInvalidShutdownScript orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKInvalidShutdownScript ret_var = InvalidShutdownScript_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_ShutdownScript_write"))) TS_ShutdownScript_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ShutdownScript_write"))) TS_ShutdownScript_write(uint64_t obj) { LDKShutdownScript obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ShutdownScript_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -39063,51 +37409,41 @@ int8_tArray __attribute__((export_name("TS_ShutdownScript_write"))) TS_Shutdown return ret_arr; } -uint32_t __attribute__((export_name("TS_ShutdownScript_read"))) TS_ShutdownScript_read(int8_tArray ser) { +uint64_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; LDKCResult_ShutdownScriptDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptDecodeErrorZ), "LDKCResult_ShutdownScriptDecodeErrorZ"); *ret_conv = ShutdownScript_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_ShutdownScript_new_p2wpkh"))) TS_ShutdownScript_new_p2wpkh(int8_tArray pubkey_hash) { +uint64_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); FREE(pubkey_hash); unsigned char (*pubkey_hash_ref)[20] = &pubkey_hash_arr; LDKShutdownScript ret_var = ShutdownScript_new_p2wpkh(pubkey_hash_ref); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ShutdownScript_new_p2wsh"))) TS_ShutdownScript_new_p2wsh(int8_tArray script_hash) { +uint64_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); FREE(script_hash); unsigned char (*script_hash_ref)[32] = &script_hash_arr; LDKShutdownScript ret_var = ShutdownScript_new_p2wsh(script_hash_ref); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ShutdownScript_new_witness_program"))) TS_ShutdownScript_new_witness_program(int8_t version, int8_tArray program) { +uint64_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; @@ -39115,13 +37451,13 @@ uint32_t __attribute__((export_name("TS_ShutdownScript_new_witness_program"))) LDKCResult_ShutdownScriptInvalidShutdownScriptZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptInvalidShutdownScriptZ), "LDKCResult_ShutdownScriptInvalidShutdownScriptZ"); *ret_conv = ShutdownScript_new_witness_program((LDKWitnessVersion){ ._0 = version }, program_ref); FREE(program); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_ShutdownScript_into_inner"))) TS_ShutdownScript_into_inner(uint32_t this_arg) { +int8_tArray __attribute__((export_name("TS_ShutdownScript_into_inner"))) TS_ShutdownScript_into_inner(uint64_t this_arg) { LDKShutdownScript this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0); + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); 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); @@ -39131,156 +37467,149 @@ int8_tArray __attribute__((export_name("TS_ShutdownScript_into_inner"))) TS_Shu return ret_arr; } -int8_tArray __attribute__((export_name("TS_ShutdownScript_as_legacy_pubkey"))) TS_ShutdownScript_as_legacy_pubkey(uint32_t this_arg) { +int8_tArray __attribute__((export_name("TS_ShutdownScript_as_legacy_pubkey"))) TS_ShutdownScript_as_legacy_pubkey(uint64_t this_arg) { LDKShutdownScript this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; 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; } -jboolean __attribute__((export_name("TS_ShutdownScript_is_compatible"))) TS_ShutdownScript_is_compatible(uint32_t this_arg, uint32_t features) { +jboolean __attribute__((export_name("TS_ShutdownScript_is_compatible"))) TS_ShutdownScript_is_compatible(uint64_t this_arg, uint64_t features) { LDKShutdownScript this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKInitFeatures features_conv; - features_conv.inner = (void*)(features & (~1)); - features_conv.is_owned = false; + features_conv.inner = untag_ptr(features); + features_conv.is_owned = ptr_is_owned(features); CHECK_INNER_FIELD_ACCESS_OR_NULL(features_conv); + features_conv.is_owned = false; jboolean ret_conv = ShutdownScript_is_compatible(&this_arg_conv, &features_conv); return ret_conv; } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_CustomMessageReader_free"))) TS_CustomMessageReader_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKCustomMessageReader this_ptr_conv = *(LDKCustomMessageReader*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); CustomMessageReader_free(this_ptr_conv); } -static inline uintptr_t Type_clone_ptr(LDKType *NONNULL_PTR arg) { +static inline uint64_t Type_clone_ptr(LDKType *NONNULL_PTR arg) { LDKType* ret_ret = MALLOC(sizeof(LDKType), "LDKType"); *ret_ret = Type_clone(arg); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_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); } +int64_t __attribute__((export_name("TS_Type_clone_ptr"))) TS_Type_clone_ptr(uint64_t arg) { + void* arg_ptr = untag_ptr(arg); + if (ptr_is_owned(arg)) { CHECK_ACCESS(arg_ptr); } LDKType* arg_conv = (LDKType*)arg_ptr; - uint32_t ret_conv = Type_clone_ptr(arg_conv); + int64_t ret_conv = Type_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_Type_clone"))) TS_Type_clone(uint32_t orig) { - void* orig_ptr = (void*)(((uintptr_t)orig) & ~1); - if (!(orig & 1)) { CHECK_ACCESS(orig_ptr); } +uint64_t __attribute__((export_name("TS_Type_clone"))) TS_Type_clone(uint64_t orig) { + void* orig_ptr = untag_ptr(orig); + if (ptr_is_owned(orig)) { CHECK_ACCESS(orig_ptr); } LDKType* orig_conv = (LDKType*)orig_ptr; LDKType* ret_ret = MALLOC(sizeof(LDKType), "LDKType"); *ret_ret = Type_clone(orig_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_Type_free"))) TS_Type_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKType this_ptr_conv = *(LDKType*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); Type_free(this_ptr_conv); } -void __attribute__((export_name("TS_NodeId_free"))) TS_NodeId_free(uint32_t this_obj) { +void __attribute__((export_name("TS_NodeId_free"))) TS_NodeId_free(uint64_t this_obj) { LDKNodeId this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); NodeId_free(this_obj_conv); } -static inline uintptr_t NodeId_clone_ptr(LDKNodeId *NONNULL_PTR arg) { +static inline uint64_t NodeId_clone_ptr(LDKNodeId *NONNULL_PTR arg) { LDKNodeId ret_var = NodeId_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_NodeId_clone_ptr"))) TS_NodeId_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_NodeId_clone_ptr"))) TS_NodeId_clone_ptr(uint64_t arg) { LDKNodeId arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = NodeId_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = NodeId_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_NodeId_clone"))) TS_NodeId_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_NodeId_clone"))) TS_NodeId_clone(uint64_t orig) { LDKNodeId orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKNodeId ret_var = NodeId_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_NodeId_from_pubkey"))) TS_NodeId_from_pubkey(int8_tArray pubkey) { +uint64_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); FREE(pubkey); LDKNodeId ret_var = NodeId_from_pubkey(pubkey_ref); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_NodeId_as_slice"))) TS_NodeId_as_slice(uint32_t this_arg) { +int8_tArray __attribute__((export_name("TS_NodeId_as_slice"))) TS_NodeId_as_slice(uint64_t this_arg) { LDKNodeId this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKu8slice ret_var = NodeId_as_slice(&this_arg_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); return ret_arr; } -int64_t __attribute__((export_name("TS_NodeId_hash"))) TS_NodeId_hash(uint32_t o) { +int64_t __attribute__((export_name("TS_NodeId_hash"))) TS_NodeId_hash(uint64_t o) { LDKNodeId o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = false; + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); + o_conv.is_owned = false; int64_t ret_conv = NodeId_hash(&o_conv); return ret_conv; } -int8_tArray __attribute__((export_name("TS_NodeId_write"))) TS_NodeId_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_NodeId_write"))) TS_NodeId_write(uint64_t obj) { LDKNodeId obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = NodeId_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -39288,92 +37617,92 @@ int8_tArray __attribute__((export_name("TS_NodeId_write"))) TS_NodeId_write(uin return ret_arr; } -uint32_t __attribute__((export_name("TS_NodeId_read"))) TS_NodeId_read(int8_tArray ser) { +uint64_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; LDKCResult_NodeIdDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeIdDecodeErrorZ), "LDKCResult_NodeIdDecodeErrorZ"); *ret_conv = NodeId_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_NetworkGraph_free"))) TS_NetworkGraph_free(uint32_t this_obj) { +void __attribute__((export_name("TS_NetworkGraph_free"))) TS_NetworkGraph_free(uint64_t this_obj) { LDKNetworkGraph this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); NetworkGraph_free(this_obj_conv); } -void __attribute__((export_name("TS_ReadOnlyNetworkGraph_free"))) TS_ReadOnlyNetworkGraph_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ReadOnlyNetworkGraph_free"))) TS_ReadOnlyNetworkGraph_free(uint64_t this_obj) { LDKReadOnlyNetworkGraph this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ReadOnlyNetworkGraph_free(this_obj_conv); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_NetworkUpdate_free"))) TS_NetworkUpdate_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKNetworkUpdate this_ptr_conv = *(LDKNetworkUpdate*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); NetworkUpdate_free(this_ptr_conv); } -static inline uintptr_t NetworkUpdate_clone_ptr(LDKNetworkUpdate *NONNULL_PTR arg) { +static inline uint64_t NetworkUpdate_clone_ptr(LDKNetworkUpdate *NONNULL_PTR arg) { LDKNetworkUpdate *ret_copy = MALLOC(sizeof(LDKNetworkUpdate), "LDKNetworkUpdate"); *ret_copy = NetworkUpdate_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_NetworkUpdate_clone_ptr"))) TS_NetworkUpdate_clone_ptr(uint32_t arg) { - LDKNetworkUpdate* arg_conv = (LDKNetworkUpdate*)arg; - uint32_t ret_conv = NetworkUpdate_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_NetworkUpdate_clone_ptr"))) TS_NetworkUpdate_clone_ptr(uint64_t arg) { + LDKNetworkUpdate* arg_conv = (LDKNetworkUpdate*)untag_ptr(arg); + int64_t ret_conv = NetworkUpdate_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_NetworkUpdate_clone"))) TS_NetworkUpdate_clone(uint32_t orig) { - LDKNetworkUpdate* orig_conv = (LDKNetworkUpdate*)orig; +uint64_t __attribute__((export_name("TS_NetworkUpdate_clone"))) TS_NetworkUpdate_clone(uint64_t orig) { + LDKNetworkUpdate* orig_conv = (LDKNetworkUpdate*)untag_ptr(orig); LDKNetworkUpdate *ret_copy = MALLOC(sizeof(LDKNetworkUpdate), "LDKNetworkUpdate"); *ret_copy = NetworkUpdate_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_NetworkUpdate_channel_update_message"))) TS_NetworkUpdate_channel_update_message(uint32_t msg) { +uint64_t __attribute__((export_name("TS_NetworkUpdate_channel_update_message"))) TS_NetworkUpdate_channel_update_message(uint64_t msg) { LDKChannelUpdate msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = (msg & 1) || (msg == 0); + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); msg_conv = ChannelUpdate_clone(&msg_conv); LDKNetworkUpdate *ret_copy = MALLOC(sizeof(LDKNetworkUpdate), "LDKNetworkUpdate"); *ret_copy = NetworkUpdate_channel_update_message(msg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_NetworkUpdate_channel_failure"))) TS_NetworkUpdate_channel_failure(int64_t short_channel_id, jboolean is_permanent) { +uint64_t __attribute__((export_name("TS_NetworkUpdate_channel_failure"))) TS_NetworkUpdate_channel_failure(int64_t short_channel_id, jboolean is_permanent) { LDKNetworkUpdate *ret_copy = MALLOC(sizeof(LDKNetworkUpdate), "LDKNetworkUpdate"); *ret_copy = NetworkUpdate_channel_failure(short_channel_id, is_permanent); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_NetworkUpdate_node_failure"))) TS_NetworkUpdate_node_failure(int8_tArray node_id, jboolean is_permanent) { +uint64_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); FREE(node_id); LDKNetworkUpdate *ret_copy = MALLOC(sizeof(LDKNetworkUpdate), "LDKNetworkUpdate"); *ret_copy = NetworkUpdate_node_failure(node_id_ref, is_permanent); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -int8_tArray __attribute__((export_name("TS_NetworkUpdate_write"))) TS_NetworkUpdate_write(uint32_t obj) { - LDKNetworkUpdate* obj_conv = (LDKNetworkUpdate*)obj; +int8_tArray __attribute__((export_name("TS_NetworkUpdate_write"))) TS_NetworkUpdate_write(uint64_t obj) { + LDKNetworkUpdate* obj_conv = (LDKNetworkUpdate*)untag_ptr(obj); LDKCVec_u8Z ret_var = NetworkUpdate_write(obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -39381,30 +37710,31 @@ int8_tArray __attribute__((export_name("TS_NetworkUpdate_write"))) TS_NetworkUp return ret_arr; } -uint32_t __attribute__((export_name("TS_NetworkUpdate_read"))) TS_NetworkUpdate_read(int8_tArray ser) { +uint64_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; LDKCResult_COption_NetworkUpdateZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_NetworkUpdateZDecodeErrorZ), "LDKCResult_COption_NetworkUpdateZDecodeErrorZ"); *ret_conv = NetworkUpdate_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_P2PGossipSync_free"))) TS_P2PGossipSync_free(uint32_t this_obj) { +void __attribute__((export_name("TS_P2PGossipSync_free"))) TS_P2PGossipSync_free(uint64_t this_obj) { LDKP2PGossipSync this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); P2PGossipSync_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_P2PGossipSync_new"))) TS_P2PGossipSync_new(uint32_t network_graph, uint32_t chain_access, uint32_t logger) { +uint64_t __attribute__((export_name("TS_P2PGossipSync_new"))) TS_P2PGossipSync_new(uint64_t network_graph, uint64_t chain_access, uint64_t logger) { LDKNetworkGraph network_graph_conv; - network_graph_conv.inner = (void*)(network_graph & (~1)); - network_graph_conv.is_owned = false; + network_graph_conv.inner = untag_ptr(network_graph); + network_graph_conv.is_owned = ptr_is_owned(network_graph); CHECK_INNER_FIELD_ACCESS_OR_NULL(network_graph_conv); - void* chain_access_ptr = (void*)(((uintptr_t)chain_access) & ~1); + network_graph_conv.is_owned = false; + void* chain_access_ptr = untag_ptr(chain_access); 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 @@ -39415,7 +37745,7 @@ uint32_t __attribute__((export_name("TS_P2PGossipSync_new"))) TS_P2PGossipSync_ LDKAccess_JCalls_cloned(&chain_access_conv.some); } } - void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); + void* logger_ptr = untag_ptr(logger); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); if (logger_conv.free == LDKLogger_JCalls_free) { @@ -39423,23 +37753,19 @@ uint32_t __attribute__((export_name("TS_P2PGossipSync_new"))) TS_P2PGossipSync_ LDKLogger_JCalls_cloned(&logger_conv); } LDKP2PGossipSync ret_var = P2PGossipSync_new(&network_graph_conv, chain_access_conv, logger_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_P2PGossipSync_add_chain_access"))) TS_P2PGossipSync_add_chain_access(uint32_t this_arg, uint32_t chain_access) { +void __attribute__((export_name("TS_P2PGossipSync_add_chain_access"))) TS_P2PGossipSync_add_chain_access(uint64_t this_arg, uint64_t chain_access) { LDKP2PGossipSync this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); - void* chain_access_ptr = (void*)(((uintptr_t)chain_access) & ~1); + this_arg_conv.is_owned = false; + void* chain_access_ptr = untag_ptr(chain_access); 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 @@ -39453,257 +37779,250 @@ void __attribute__((export_name("TS_P2PGossipSync_add_chain_access"))) TS_P2PGo P2PGossipSync_add_chain_access(&this_arg_conv, chain_access_conv); } -uint32_t __attribute__((export_name("TS_NetworkGraph_as_EventHandler"))) TS_NetworkGraph_as_EventHandler(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_NetworkGraph_as_EventHandler"))) TS_NetworkGraph_as_EventHandler(uint64_t this_arg) { LDKNetworkGraph this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKEventHandler* ret_ret = MALLOC(sizeof(LDKEventHandler), "LDKEventHandler"); *ret_ret = NetworkGraph_as_EventHandler(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_t __attribute__((export_name("TS_P2PGossipSync_as_RoutingMessageHandler"))) TS_P2PGossipSync_as_RoutingMessageHandler(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_P2PGossipSync_as_RoutingMessageHandler"))) TS_P2PGossipSync_as_RoutingMessageHandler(uint64_t this_arg) { LDKP2PGossipSync this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKRoutingMessageHandler* ret_ret = MALLOC(sizeof(LDKRoutingMessageHandler), "LDKRoutingMessageHandler"); *ret_ret = P2PGossipSync_as_RoutingMessageHandler(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_t __attribute__((export_name("TS_P2PGossipSync_as_MessageSendEventsProvider"))) TS_P2PGossipSync_as_MessageSendEventsProvider(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_P2PGossipSync_as_MessageSendEventsProvider"))) TS_P2PGossipSync_as_MessageSendEventsProvider(uint64_t this_arg) { LDKP2PGossipSync this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKMessageSendEventsProvider* ret_ret = MALLOC(sizeof(LDKMessageSendEventsProvider), "LDKMessageSendEventsProvider"); *ret_ret = P2PGossipSync_as_MessageSendEventsProvider(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -void __attribute__((export_name("TS_ChannelUpdateInfo_free"))) TS_ChannelUpdateInfo_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChannelUpdateInfo_free"))) TS_ChannelUpdateInfo_free(uint64_t this_obj) { LDKChannelUpdateInfo this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChannelUpdateInfo_free(this_obj_conv); } -int32_t __attribute__((export_name("TS_ChannelUpdateInfo_get_last_update"))) TS_ChannelUpdateInfo_get_last_update(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_ChannelUpdateInfo_get_last_update"))) TS_ChannelUpdateInfo_get_last_update(uint64_t this_ptr) { LDKChannelUpdateInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = ChannelUpdateInfo_get_last_update(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelUpdateInfo_set_last_update"))) TS_ChannelUpdateInfo_set_last_update(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_ChannelUpdateInfo_set_last_update"))) TS_ChannelUpdateInfo_set_last_update(uint64_t this_ptr, int32_t val) { LDKChannelUpdateInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelUpdateInfo_set_last_update(&this_ptr_conv, val); } -jboolean __attribute__((export_name("TS_ChannelUpdateInfo_get_enabled"))) TS_ChannelUpdateInfo_get_enabled(uint32_t this_ptr) { +jboolean __attribute__((export_name("TS_ChannelUpdateInfo_get_enabled"))) TS_ChannelUpdateInfo_get_enabled(uint64_t this_ptr) { LDKChannelUpdateInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; jboolean ret_conv = ChannelUpdateInfo_get_enabled(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelUpdateInfo_set_enabled"))) TS_ChannelUpdateInfo_set_enabled(uint32_t this_ptr, jboolean val) { +void __attribute__((export_name("TS_ChannelUpdateInfo_set_enabled"))) TS_ChannelUpdateInfo_set_enabled(uint64_t this_ptr, jboolean val) { LDKChannelUpdateInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelUpdateInfo_set_enabled(&this_ptr_conv, val); } -int16_t __attribute__((export_name("TS_ChannelUpdateInfo_get_cltv_expiry_delta"))) TS_ChannelUpdateInfo_get_cltv_expiry_delta(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_ChannelUpdateInfo_get_cltv_expiry_delta"))) TS_ChannelUpdateInfo_get_cltv_expiry_delta(uint64_t this_ptr) { LDKChannelUpdateInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = ChannelUpdateInfo_get_cltv_expiry_delta(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelUpdateInfo_set_cltv_expiry_delta"))) TS_ChannelUpdateInfo_set_cltv_expiry_delta(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_ChannelUpdateInfo_set_cltv_expiry_delta"))) TS_ChannelUpdateInfo_set_cltv_expiry_delta(uint64_t this_ptr, int16_t val) { LDKChannelUpdateInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelUpdateInfo_set_cltv_expiry_delta(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ChannelUpdateInfo_get_htlc_minimum_msat"))) TS_ChannelUpdateInfo_get_htlc_minimum_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelUpdateInfo_get_htlc_minimum_msat"))) TS_ChannelUpdateInfo_get_htlc_minimum_msat(uint64_t this_ptr) { LDKChannelUpdateInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelUpdateInfo_get_htlc_minimum_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelUpdateInfo_set_htlc_minimum_msat"))) TS_ChannelUpdateInfo_set_htlc_minimum_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelUpdateInfo_set_htlc_minimum_msat"))) TS_ChannelUpdateInfo_set_htlc_minimum_msat(uint64_t this_ptr, int64_t val) { LDKChannelUpdateInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelUpdateInfo_set_htlc_minimum_msat(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ChannelUpdateInfo_get_htlc_maximum_msat"))) TS_ChannelUpdateInfo_get_htlc_maximum_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelUpdateInfo_get_htlc_maximum_msat"))) TS_ChannelUpdateInfo_get_htlc_maximum_msat(uint64_t this_ptr) { LDKChannelUpdateInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelUpdateInfo_get_htlc_maximum_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelUpdateInfo_set_htlc_maximum_msat"))) TS_ChannelUpdateInfo_set_htlc_maximum_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelUpdateInfo_set_htlc_maximum_msat"))) TS_ChannelUpdateInfo_set_htlc_maximum_msat(uint64_t this_ptr, int64_t val) { LDKChannelUpdateInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelUpdateInfo_set_htlc_maximum_msat(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_ChannelUpdateInfo_get_fees"))) TS_ChannelUpdateInfo_get_fees(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelUpdateInfo_get_fees"))) TS_ChannelUpdateInfo_get_fees(uint64_t this_ptr) { LDKChannelUpdateInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKRoutingFees ret_var = ChannelUpdateInfo_get_fees(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelUpdateInfo_set_fees"))) TS_ChannelUpdateInfo_set_fees(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelUpdateInfo_set_fees"))) TS_ChannelUpdateInfo_set_fees(uint64_t this_ptr, uint64_t val) { LDKChannelUpdateInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKRoutingFees val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = RoutingFees_clone(&val_conv); ChannelUpdateInfo_set_fees(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelUpdateInfo_get_last_update_message"))) TS_ChannelUpdateInfo_get_last_update_message(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelUpdateInfo_get_last_update_message"))) TS_ChannelUpdateInfo_get_last_update_message(uint64_t this_ptr) { LDKChannelUpdateInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelUpdate ret_var = ChannelUpdateInfo_get_last_update_message(&this_ptr_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelUpdateInfo_set_last_update_message"))) TS_ChannelUpdateInfo_set_last_update_message(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelUpdateInfo_set_last_update_message"))) TS_ChannelUpdateInfo_set_last_update_message(uint64_t this_ptr, uint64_t val) { LDKChannelUpdateInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelUpdate val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = ChannelUpdate_clone(&val_conv); ChannelUpdateInfo_set_last_update_message(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelUpdateInfo_new"))) TS_ChannelUpdateInfo_new(int32_t last_update_arg, jboolean enabled_arg, int16_t cltv_expiry_delta_arg, int64_t htlc_minimum_msat_arg, int64_t htlc_maximum_msat_arg, uint32_t fees_arg, uint32_t last_update_message_arg) { +uint64_t __attribute__((export_name("TS_ChannelUpdateInfo_new"))) TS_ChannelUpdateInfo_new(int32_t last_update_arg, jboolean enabled_arg, int16_t cltv_expiry_delta_arg, int64_t htlc_minimum_msat_arg, int64_t htlc_maximum_msat_arg, uint64_t fees_arg, uint64_t last_update_message_arg) { LDKRoutingFees fees_arg_conv; - fees_arg_conv.inner = (void*)(fees_arg & (~1)); - fees_arg_conv.is_owned = (fees_arg & 1) || (fees_arg == 0); + fees_arg_conv.inner = untag_ptr(fees_arg); + fees_arg_conv.is_owned = ptr_is_owned(fees_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(fees_arg_conv); fees_arg_conv = RoutingFees_clone(&fees_arg_conv); LDKChannelUpdate last_update_message_arg_conv; - last_update_message_arg_conv.inner = (void*)(last_update_message_arg & (~1)); - last_update_message_arg_conv.is_owned = (last_update_message_arg & 1) || (last_update_message_arg == 0); + last_update_message_arg_conv.inner = untag_ptr(last_update_message_arg); + last_update_message_arg_conv.is_owned = ptr_is_owned(last_update_message_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(last_update_message_arg_conv); last_update_message_arg_conv = ChannelUpdate_clone(&last_update_message_arg_conv); LDKChannelUpdateInfo ret_var = ChannelUpdateInfo_new(last_update_arg, enabled_arg, cltv_expiry_delta_arg, htlc_minimum_msat_arg, htlc_maximum_msat_arg, fees_arg_conv, last_update_message_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t ChannelUpdateInfo_clone_ptr(LDKChannelUpdateInfo *NONNULL_PTR arg) { +static inline uint64_t ChannelUpdateInfo_clone_ptr(LDKChannelUpdateInfo *NONNULL_PTR arg) { LDKChannelUpdateInfo ret_var = ChannelUpdateInfo_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelUpdateInfo_clone_ptr"))) TS_ChannelUpdateInfo_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ChannelUpdateInfo_clone_ptr"))) TS_ChannelUpdateInfo_clone_ptr(uint64_t arg) { LDKChannelUpdateInfo arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ChannelUpdateInfo_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ChannelUpdateInfo_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelUpdateInfo_clone"))) TS_ChannelUpdateInfo_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ChannelUpdateInfo_clone"))) TS_ChannelUpdateInfo_clone(uint64_t orig) { LDKChannelUpdateInfo orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKChannelUpdateInfo ret_var = ChannelUpdateInfo_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_ChannelUpdateInfo_write"))) TS_ChannelUpdateInfo_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ChannelUpdateInfo_write"))) TS_ChannelUpdateInfo_write(uint64_t obj) { LDKChannelUpdateInfo obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ChannelUpdateInfo_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -39711,295 +38030,260 @@ int8_tArray __attribute__((export_name("TS_ChannelUpdateInfo_write"))) TS_Chann return ret_arr; } -uint32_t __attribute__((export_name("TS_ChannelUpdateInfo_read"))) TS_ChannelUpdateInfo_read(int8_tArray ser) { +uint64_t __attribute__((export_name("TS_ChannelUpdateInfo_read"))) TS_ChannelUpdateInfo_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; ser_ref.data = ser->elems; LDKCResult_ChannelUpdateInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateInfoDecodeErrorZ), "LDKCResult_ChannelUpdateInfoDecodeErrorZ"); *ret_conv = ChannelUpdateInfo_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_ChannelInfo_free"))) TS_ChannelInfo_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChannelInfo_free"))) TS_ChannelInfo_free(uint64_t this_obj) { LDKChannelInfo this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChannelInfo_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_ChannelInfo_get_features"))) TS_ChannelInfo_get_features(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelInfo_get_features"))) TS_ChannelInfo_get_features(uint64_t this_ptr) { LDKChannelInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelFeatures ret_var = ChannelInfo_get_features(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelInfo_set_features"))) TS_ChannelInfo_set_features(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelInfo_set_features"))) TS_ChannelInfo_set_features(uint64_t this_ptr, uint64_t val) { LDKChannelInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelFeatures val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = ChannelFeatures_clone(&val_conv); ChannelInfo_set_features(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelInfo_get_node_one"))) TS_ChannelInfo_get_node_one(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelInfo_get_node_one"))) TS_ChannelInfo_get_node_one(uint64_t this_ptr) { LDKChannelInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKNodeId ret_var = ChannelInfo_get_node_one(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelInfo_set_node_one"))) TS_ChannelInfo_set_node_one(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelInfo_set_node_one"))) TS_ChannelInfo_set_node_one(uint64_t this_ptr, uint64_t val) { LDKChannelInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKNodeId val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = NodeId_clone(&val_conv); ChannelInfo_set_node_one(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelInfo_get_one_to_two"))) TS_ChannelInfo_get_one_to_two(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelInfo_get_one_to_two"))) TS_ChannelInfo_get_one_to_two(uint64_t this_ptr) { LDKChannelInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelUpdateInfo ret_var = ChannelInfo_get_one_to_two(&this_ptr_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelInfo_set_one_to_two"))) TS_ChannelInfo_set_one_to_two(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelInfo_set_one_to_two"))) TS_ChannelInfo_set_one_to_two(uint64_t this_ptr, uint64_t val) { LDKChannelInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelUpdateInfo val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = ChannelUpdateInfo_clone(&val_conv); ChannelInfo_set_one_to_two(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelInfo_get_node_two"))) TS_ChannelInfo_get_node_two(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelInfo_get_node_two"))) TS_ChannelInfo_get_node_two(uint64_t this_ptr) { LDKChannelInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKNodeId ret_var = ChannelInfo_get_node_two(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelInfo_set_node_two"))) TS_ChannelInfo_set_node_two(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelInfo_set_node_two"))) TS_ChannelInfo_set_node_two(uint64_t this_ptr, uint64_t val) { LDKChannelInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKNodeId val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = NodeId_clone(&val_conv); ChannelInfo_set_node_two(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelInfo_get_two_to_one"))) TS_ChannelInfo_get_two_to_one(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelInfo_get_two_to_one"))) TS_ChannelInfo_get_two_to_one(uint64_t this_ptr) { LDKChannelInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelUpdateInfo ret_var = ChannelInfo_get_two_to_one(&this_ptr_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelInfo_set_two_to_one"))) TS_ChannelInfo_set_two_to_one(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelInfo_set_two_to_one"))) TS_ChannelInfo_set_two_to_one(uint64_t this_ptr, uint64_t val) { LDKChannelInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelUpdateInfo val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = ChannelUpdateInfo_clone(&val_conv); ChannelInfo_set_two_to_one(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelInfo_get_capacity_sats"))) TS_ChannelInfo_get_capacity_sats(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelInfo_get_capacity_sats"))) TS_ChannelInfo_get_capacity_sats(uint64_t this_ptr) { LDKChannelInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = ChannelInfo_get_capacity_sats(&this_ptr_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_ChannelInfo_set_capacity_sats"))) TS_ChannelInfo_set_capacity_sats(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelInfo_set_capacity_sats"))) TS_ChannelInfo_set_capacity_sats(uint64_t this_ptr, uint64_t val) { LDKChannelInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr); - val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1)); + val_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(val)); ChannelInfo_set_capacity_sats(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelInfo_get_announcement_message"))) TS_ChannelInfo_get_announcement_message(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelInfo_get_announcement_message"))) TS_ChannelInfo_get_announcement_message(uint64_t this_ptr) { LDKChannelInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelAnnouncement ret_var = ChannelInfo_get_announcement_message(&this_ptr_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelInfo_set_announcement_message"))) TS_ChannelInfo_set_announcement_message(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelInfo_set_announcement_message"))) TS_ChannelInfo_set_announcement_message(uint64_t this_ptr, uint64_t val) { LDKChannelInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelAnnouncement val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = ChannelAnnouncement_clone(&val_conv); ChannelInfo_set_announcement_message(&this_ptr_conv, val_conv); } -static inline uintptr_t ChannelInfo_clone_ptr(LDKChannelInfo *NONNULL_PTR arg) { +static inline uint64_t ChannelInfo_clone_ptr(LDKChannelInfo *NONNULL_PTR arg) { LDKChannelInfo ret_var = ChannelInfo_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelInfo_clone_ptr"))) TS_ChannelInfo_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ChannelInfo_clone_ptr"))) TS_ChannelInfo_clone_ptr(uint64_t arg) { LDKChannelInfo arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ChannelInfo_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ChannelInfo_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelInfo_clone"))) TS_ChannelInfo_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ChannelInfo_clone"))) TS_ChannelInfo_clone(uint64_t orig) { LDKChannelInfo orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKChannelInfo ret_var = ChannelInfo_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelInfo_get_directional_info"))) TS_ChannelInfo_get_directional_info(uint32_t this_arg, int8_t channel_flags) { +uint64_t __attribute__((export_name("TS_ChannelInfo_get_directional_info"))) TS_ChannelInfo_get_directional_info(uint64_t this_arg, int8_t channel_flags) { LDKChannelInfo this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKChannelUpdateInfo ret_var = ChannelInfo_get_directional_info(&this_arg_conv, channel_flags); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_ChannelInfo_write"))) TS_ChannelInfo_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ChannelInfo_write"))) TS_ChannelInfo_write(uint64_t obj) { LDKChannelInfo obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ChannelInfo_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -40007,312 +38291,291 @@ int8_tArray __attribute__((export_name("TS_ChannelInfo_write"))) TS_ChannelInfo return ret_arr; } -uint32_t __attribute__((export_name("TS_ChannelInfo_read"))) TS_ChannelInfo_read(int8_tArray ser) { +uint64_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; LDKCResult_ChannelInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelInfoDecodeErrorZ), "LDKCResult_ChannelInfoDecodeErrorZ"); *ret_conv = ChannelInfo_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_DirectedChannelInfo_free"))) TS_DirectedChannelInfo_free(uint32_t this_obj) { +void __attribute__((export_name("TS_DirectedChannelInfo_free"))) TS_DirectedChannelInfo_free(uint64_t this_obj) { LDKDirectedChannelInfo this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); DirectedChannelInfo_free(this_obj_conv); } -static inline uintptr_t DirectedChannelInfo_clone_ptr(LDKDirectedChannelInfo *NONNULL_PTR arg) { +static inline uint64_t DirectedChannelInfo_clone_ptr(LDKDirectedChannelInfo *NONNULL_PTR arg) { LDKDirectedChannelInfo ret_var = DirectedChannelInfo_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_DirectedChannelInfo_clone_ptr"))) TS_DirectedChannelInfo_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_DirectedChannelInfo_clone_ptr"))) TS_DirectedChannelInfo_clone_ptr(uint64_t arg) { LDKDirectedChannelInfo arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = DirectedChannelInfo_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = DirectedChannelInfo_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_DirectedChannelInfo_clone"))) TS_DirectedChannelInfo_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_DirectedChannelInfo_clone"))) TS_DirectedChannelInfo_clone(uint64_t orig) { LDKDirectedChannelInfo orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKDirectedChannelInfo ret_var = DirectedChannelInfo_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_DirectedChannelInfo_channel"))) TS_DirectedChannelInfo_channel(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_DirectedChannelInfo_channel"))) TS_DirectedChannelInfo_channel(uint64_t this_arg) { LDKDirectedChannelInfo this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKChannelInfo ret_var = DirectedChannelInfo_channel(&this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_DirectedChannelInfo_direction"))) TS_DirectedChannelInfo_direction(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_DirectedChannelInfo_direction"))) TS_DirectedChannelInfo_direction(uint64_t this_arg) { LDKDirectedChannelInfo this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKChannelUpdateInfo ret_var = DirectedChannelInfo_direction(&this_arg_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int64_t __attribute__((export_name("TS_DirectedChannelInfo_htlc_maximum_msat"))) TS_DirectedChannelInfo_htlc_maximum_msat(uint32_t this_arg) { +int64_t __attribute__((export_name("TS_DirectedChannelInfo_htlc_maximum_msat"))) TS_DirectedChannelInfo_htlc_maximum_msat(uint64_t this_arg) { LDKDirectedChannelInfo this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int64_t ret_conv = DirectedChannelInfo_htlc_maximum_msat(&this_arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_DirectedChannelInfo_effective_capacity"))) TS_DirectedChannelInfo_effective_capacity(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_DirectedChannelInfo_effective_capacity"))) TS_DirectedChannelInfo_effective_capacity(uint64_t this_arg) { LDKDirectedChannelInfo this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKEffectiveCapacity *ret_copy = MALLOC(sizeof(LDKEffectiveCapacity), "LDKEffectiveCapacity"); *ret_copy = DirectedChannelInfo_effective_capacity(&this_arg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_EffectiveCapacity_free"))) TS_EffectiveCapacity_free(uint32_t this_ptr) { - if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_EffectiveCapacity_free"))) TS_EffectiveCapacity_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKEffectiveCapacity this_ptr_conv = *(LDKEffectiveCapacity*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); EffectiveCapacity_free(this_ptr_conv); } -static inline uintptr_t EffectiveCapacity_clone_ptr(LDKEffectiveCapacity *NONNULL_PTR arg) { +static inline uint64_t EffectiveCapacity_clone_ptr(LDKEffectiveCapacity *NONNULL_PTR arg) { LDKEffectiveCapacity *ret_copy = MALLOC(sizeof(LDKEffectiveCapacity), "LDKEffectiveCapacity"); *ret_copy = EffectiveCapacity_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_EffectiveCapacity_clone_ptr"))) TS_EffectiveCapacity_clone_ptr(uint32_t arg) { - LDKEffectiveCapacity* arg_conv = (LDKEffectiveCapacity*)arg; - uint32_t ret_conv = EffectiveCapacity_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_EffectiveCapacity_clone_ptr"))) TS_EffectiveCapacity_clone_ptr(uint64_t arg) { + LDKEffectiveCapacity* arg_conv = (LDKEffectiveCapacity*)untag_ptr(arg); + int64_t ret_conv = EffectiveCapacity_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_EffectiveCapacity_clone"))) TS_EffectiveCapacity_clone(uint32_t orig) { - LDKEffectiveCapacity* orig_conv = (LDKEffectiveCapacity*)orig; +uint64_t __attribute__((export_name("TS_EffectiveCapacity_clone"))) TS_EffectiveCapacity_clone(uint64_t orig) { + LDKEffectiveCapacity* orig_conv = (LDKEffectiveCapacity*)untag_ptr(orig); LDKEffectiveCapacity *ret_copy = MALLOC(sizeof(LDKEffectiveCapacity), "LDKEffectiveCapacity"); *ret_copy = EffectiveCapacity_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_EffectiveCapacity_exact_liquidity"))) TS_EffectiveCapacity_exact_liquidity(int64_t liquidity_msat) { +uint64_t __attribute__((export_name("TS_EffectiveCapacity_exact_liquidity"))) TS_EffectiveCapacity_exact_liquidity(int64_t liquidity_msat) { LDKEffectiveCapacity *ret_copy = MALLOC(sizeof(LDKEffectiveCapacity), "LDKEffectiveCapacity"); *ret_copy = EffectiveCapacity_exact_liquidity(liquidity_msat); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_EffectiveCapacity_maximum_htlc"))) TS_EffectiveCapacity_maximum_htlc(int64_t amount_msat) { +uint64_t __attribute__((export_name("TS_EffectiveCapacity_maximum_htlc"))) TS_EffectiveCapacity_maximum_htlc(int64_t amount_msat) { LDKEffectiveCapacity *ret_copy = MALLOC(sizeof(LDKEffectiveCapacity), "LDKEffectiveCapacity"); *ret_copy = EffectiveCapacity_maximum_htlc(amount_msat); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_EffectiveCapacity_total"))) TS_EffectiveCapacity_total(int64_t capacity_msat, uint32_t htlc_maximum_msat) { - void* htlc_maximum_msat_ptr = (void*)(((uintptr_t)htlc_maximum_msat) & ~1); +uint64_t __attribute__((export_name("TS_EffectiveCapacity_total"))) TS_EffectiveCapacity_total(int64_t capacity_msat, uint64_t htlc_maximum_msat) { + void* htlc_maximum_msat_ptr = untag_ptr(htlc_maximum_msat); CHECK_ACCESS(htlc_maximum_msat_ptr); LDKCOption_u64Z htlc_maximum_msat_conv = *(LDKCOption_u64Z*)(htlc_maximum_msat_ptr); - htlc_maximum_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)htlc_maximum_msat) & ~1)); + htlc_maximum_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(htlc_maximum_msat)); LDKEffectiveCapacity *ret_copy = MALLOC(sizeof(LDKEffectiveCapacity), "LDKEffectiveCapacity"); *ret_copy = EffectiveCapacity_total(capacity_msat, htlc_maximum_msat_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_EffectiveCapacity_infinite"))) TS_EffectiveCapacity_infinite() { +uint64_t __attribute__((export_name("TS_EffectiveCapacity_infinite"))) TS_EffectiveCapacity_infinite() { LDKEffectiveCapacity *ret_copy = MALLOC(sizeof(LDKEffectiveCapacity), "LDKEffectiveCapacity"); *ret_copy = EffectiveCapacity_infinite(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_EffectiveCapacity_unknown"))) TS_EffectiveCapacity_unknown() { +uint64_t __attribute__((export_name("TS_EffectiveCapacity_unknown"))) TS_EffectiveCapacity_unknown() { LDKEffectiveCapacity *ret_copy = MALLOC(sizeof(LDKEffectiveCapacity), "LDKEffectiveCapacity"); *ret_copy = EffectiveCapacity_unknown(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -int64_t __attribute__((export_name("TS_EffectiveCapacity_as_msat"))) TS_EffectiveCapacity_as_msat(uint32_t this_arg) { - LDKEffectiveCapacity* this_arg_conv = (LDKEffectiveCapacity*)this_arg; +int64_t __attribute__((export_name("TS_EffectiveCapacity_as_msat"))) TS_EffectiveCapacity_as_msat(uint64_t this_arg) { + LDKEffectiveCapacity* this_arg_conv = (LDKEffectiveCapacity*)untag_ptr(this_arg); int64_t ret_conv = EffectiveCapacity_as_msat(this_arg_conv); return ret_conv; } -void __attribute__((export_name("TS_RoutingFees_free"))) TS_RoutingFees_free(uint32_t this_obj) { +void __attribute__((export_name("TS_RoutingFees_free"))) TS_RoutingFees_free(uint64_t this_obj) { LDKRoutingFees this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); RoutingFees_free(this_obj_conv); } -int32_t __attribute__((export_name("TS_RoutingFees_get_base_msat"))) TS_RoutingFees_get_base_msat(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_RoutingFees_get_base_msat"))) TS_RoutingFees_get_base_msat(uint64_t this_ptr) { LDKRoutingFees this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = RoutingFees_get_base_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_RoutingFees_set_base_msat"))) TS_RoutingFees_set_base_msat(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_RoutingFees_set_base_msat"))) TS_RoutingFees_set_base_msat(uint64_t this_ptr, int32_t val) { LDKRoutingFees this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; RoutingFees_set_base_msat(&this_ptr_conv, val); } -int32_t __attribute__((export_name("TS_RoutingFees_get_proportional_millionths"))) TS_RoutingFees_get_proportional_millionths(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_RoutingFees_get_proportional_millionths"))) TS_RoutingFees_get_proportional_millionths(uint64_t this_ptr) { LDKRoutingFees this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = RoutingFees_get_proportional_millionths(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_RoutingFees_set_proportional_millionths"))) TS_RoutingFees_set_proportional_millionths(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_RoutingFees_set_proportional_millionths"))) TS_RoutingFees_set_proportional_millionths(uint64_t this_ptr, int32_t val) { LDKRoutingFees this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; RoutingFees_set_proportional_millionths(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_RoutingFees_new"))) TS_RoutingFees_new(int32_t base_msat_arg, int32_t proportional_millionths_arg) { +uint64_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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -jboolean __attribute__((export_name("TS_RoutingFees_eq"))) TS_RoutingFees_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_RoutingFees_eq"))) TS_RoutingFees_eq(uint64_t a, uint64_t b) { LDKRoutingFees a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKRoutingFees b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = RoutingFees_eq(&a_conv, &b_conv); return ret_conv; } -static inline uintptr_t RoutingFees_clone_ptr(LDKRoutingFees *NONNULL_PTR arg) { +static inline uint64_t RoutingFees_clone_ptr(LDKRoutingFees *NONNULL_PTR arg) { LDKRoutingFees ret_var = RoutingFees_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_RoutingFees_clone_ptr"))) TS_RoutingFees_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_RoutingFees_clone_ptr"))) TS_RoutingFees_clone_ptr(uint64_t arg) { LDKRoutingFees arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = RoutingFees_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = RoutingFees_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_RoutingFees_clone"))) TS_RoutingFees_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_RoutingFees_clone"))) TS_RoutingFees_clone(uint64_t orig) { LDKRoutingFees orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKRoutingFees ret_var = RoutingFees_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int64_t __attribute__((export_name("TS_RoutingFees_hash"))) TS_RoutingFees_hash(uint32_t o) { +int64_t __attribute__((export_name("TS_RoutingFees_hash"))) TS_RoutingFees_hash(uint64_t o) { LDKRoutingFees o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = false; + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); + o_conv.is_owned = false; int64_t ret_conv = RoutingFees_hash(&o_conv); return ret_conv; } -int8_tArray __attribute__((export_name("TS_RoutingFees_write"))) TS_RoutingFees_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_RoutingFees_write"))) TS_RoutingFees_write(uint64_t obj) { LDKRoutingFees obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = RoutingFees_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -40320,135 +38583,134 @@ int8_tArray __attribute__((export_name("TS_RoutingFees_write"))) TS_RoutingFees return ret_arr; } -uint32_t __attribute__((export_name("TS_RoutingFees_read"))) TS_RoutingFees_read(int8_tArray ser) { +uint64_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; LDKCResult_RoutingFeesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RoutingFeesDecodeErrorZ), "LDKCResult_RoutingFeesDecodeErrorZ"); *ret_conv = RoutingFees_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_NodeAnnouncementInfo_free"))) TS_NodeAnnouncementInfo_free(uint32_t this_obj) { +void __attribute__((export_name("TS_NodeAnnouncementInfo_free"))) TS_NodeAnnouncementInfo_free(uint64_t this_obj) { LDKNodeAnnouncementInfo this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); NodeAnnouncementInfo_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_NodeAnnouncementInfo_get_features"))) TS_NodeAnnouncementInfo_get_features(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_NodeAnnouncementInfo_get_features"))) TS_NodeAnnouncementInfo_get_features(uint64_t this_ptr) { LDKNodeAnnouncementInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKNodeFeatures ret_var = NodeAnnouncementInfo_get_features(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_NodeAnnouncementInfo_set_features"))) TS_NodeAnnouncementInfo_set_features(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_NodeAnnouncementInfo_set_features"))) TS_NodeAnnouncementInfo_set_features(uint64_t this_ptr, uint64_t val) { LDKNodeAnnouncementInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKNodeFeatures val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = NodeFeatures_clone(&val_conv); NodeAnnouncementInfo_set_features(&this_ptr_conv, val_conv); } -int32_t __attribute__((export_name("TS_NodeAnnouncementInfo_get_last_update"))) TS_NodeAnnouncementInfo_get_last_update(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_NodeAnnouncementInfo_get_last_update"))) TS_NodeAnnouncementInfo_get_last_update(uint64_t this_ptr) { LDKNodeAnnouncementInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = NodeAnnouncementInfo_get_last_update(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_NodeAnnouncementInfo_set_last_update"))) TS_NodeAnnouncementInfo_set_last_update(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_NodeAnnouncementInfo_set_last_update"))) TS_NodeAnnouncementInfo_set_last_update(uint64_t this_ptr, int32_t val) { LDKNodeAnnouncementInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; NodeAnnouncementInfo_set_last_update(&this_ptr_conv, val); } -int8_tArray __attribute__((export_name("TS_NodeAnnouncementInfo_get_rgb"))) TS_NodeAnnouncementInfo_get_rgb(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_NodeAnnouncementInfo_get_rgb"))) TS_NodeAnnouncementInfo_get_rgb(uint64_t this_ptr) { LDKNodeAnnouncementInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(3, __LINE__); memcpy(ret_arr->elems, *NodeAnnouncementInfo_get_rgb(&this_ptr_conv), 3); return ret_arr; } -void __attribute__((export_name("TS_NodeAnnouncementInfo_set_rgb"))) TS_NodeAnnouncementInfo_set_rgb(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_NodeAnnouncementInfo_set_rgb"))) TS_NodeAnnouncementInfo_set_rgb(uint64_t this_ptr, int8_tArray val) { LDKNodeAnnouncementInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThreeBytes val_ref; CHECK(val->arr_len == 3); memcpy(val_ref.data, val->elems, 3); FREE(val); NodeAnnouncementInfo_set_rgb(&this_ptr_conv, val_ref); } -uint32_t __attribute__((export_name("TS_NodeAnnouncementInfo_get_alias"))) TS_NodeAnnouncementInfo_get_alias(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_NodeAnnouncementInfo_get_alias"))) TS_NodeAnnouncementInfo_get_alias(uint64_t this_ptr) { LDKNodeAnnouncementInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKNodeAlias ret_var = NodeAnnouncementInfo_get_alias(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_NodeAnnouncementInfo_set_alias"))) TS_NodeAnnouncementInfo_set_alias(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_NodeAnnouncementInfo_set_alias"))) TS_NodeAnnouncementInfo_set_alias(uint64_t this_ptr, uint64_t val) { LDKNodeAnnouncementInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKNodeAlias val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = NodeAlias_clone(&val_conv); NodeAnnouncementInfo_set_alias(&this_ptr_conv, val_conv); } -uint32_tArray __attribute__((export_name("TS_NodeAnnouncementInfo_get_addresses"))) TS_NodeAnnouncementInfo_get_addresses(uint32_t this_ptr) { +uint64_tArray __attribute__((export_name("TS_NodeAnnouncementInfo_get_addresses"))) TS_NodeAnnouncementInfo_get_addresses(uint64_t this_ptr) { LDKNodeAnnouncementInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_NetAddressZ ret_var = NodeAnnouncementInfo_get_addresses(&this_ptr_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t m = 0; m < ret_var.datalen; m++) { LDKNetAddress *ret_conv_12_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress"); *ret_conv_12_copy = ret_var.data[m]; - uint32_t ret_conv_12_ref = (uintptr_t)ret_conv_12_copy; + uint64_t ret_conv_12_ref = tag_ptr(ret_conv_12_copy, true); ret_arr_ptr[m] = ret_conv_12_ref; } @@ -40456,74 +38718,70 @@ uint32_tArray __attribute__((export_name("TS_NodeAnnouncementInfo_get_addresses return ret_arr; } -void __attribute__((export_name("TS_NodeAnnouncementInfo_set_addresses"))) TS_NodeAnnouncementInfo_set_addresses(uint32_t this_ptr, uint32_tArray val) { +void __attribute__((export_name("TS_NodeAnnouncementInfo_set_addresses"))) TS_NodeAnnouncementInfo_set_addresses(uint64_t this_ptr, uint64_tArray val) { LDKNodeAnnouncementInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_NetAddressZ val_constr; val_constr.datalen = val->arr_len; if (val_constr.datalen > 0) val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKNetAddress), "LDKCVec_NetAddressZ Elements"); else val_constr.data = NULL; - uint32_t* val_vals = val->elems; + uint64_t* val_vals = val->elems; for (size_t m = 0; m < val_constr.datalen; m++) { - uint32_t val_conv_12 = val_vals[m]; - void* val_conv_12_ptr = (void*)(((uintptr_t)val_conv_12) & ~1); + uint64_t val_conv_12 = val_vals[m]; + void* val_conv_12_ptr = untag_ptr(val_conv_12); CHECK_ACCESS(val_conv_12_ptr); LDKNetAddress val_conv_12_conv = *(LDKNetAddress*)(val_conv_12_ptr); - val_conv_12_conv = NetAddress_clone((LDKNetAddress*)(((uintptr_t)val_conv_12) & ~1)); + val_conv_12_conv = NetAddress_clone((LDKNetAddress*)untag_ptr(val_conv_12)); val_constr.data[m] = val_conv_12_conv; } FREE(val); NodeAnnouncementInfo_set_addresses(&this_ptr_conv, val_constr); } -uint32_t __attribute__((export_name("TS_NodeAnnouncementInfo_get_announcement_message"))) TS_NodeAnnouncementInfo_get_announcement_message(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_NodeAnnouncementInfo_get_announcement_message"))) TS_NodeAnnouncementInfo_get_announcement_message(uint64_t this_ptr) { LDKNodeAnnouncementInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKNodeAnnouncement ret_var = NodeAnnouncementInfo_get_announcement_message(&this_ptr_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_NodeAnnouncementInfo_set_announcement_message"))) TS_NodeAnnouncementInfo_set_announcement_message(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_NodeAnnouncementInfo_set_announcement_message"))) TS_NodeAnnouncementInfo_set_announcement_message(uint64_t this_ptr, uint64_t val) { LDKNodeAnnouncementInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKNodeAnnouncement val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = NodeAnnouncement_clone(&val_conv); NodeAnnouncementInfo_set_announcement_message(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_NodeAnnouncementInfo_new"))) TS_NodeAnnouncementInfo_new(uint32_t features_arg, int32_t last_update_arg, int8_tArray rgb_arg, uint32_t alias_arg, uint32_tArray addresses_arg, uint32_t announcement_message_arg) { +uint64_t __attribute__((export_name("TS_NodeAnnouncementInfo_new"))) TS_NodeAnnouncementInfo_new(uint64_t features_arg, int32_t last_update_arg, int8_tArray rgb_arg, uint64_t alias_arg, uint64_tArray addresses_arg, uint64_t announcement_message_arg) { LDKNodeFeatures features_arg_conv; - features_arg_conv.inner = (void*)(features_arg & (~1)); - features_arg_conv.is_owned = (features_arg & 1) || (features_arg == 0); + features_arg_conv.inner = untag_ptr(features_arg); + features_arg_conv.is_owned = ptr_is_owned(features_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(features_arg_conv); 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); FREE(rgb_arg); LDKNodeAlias alias_arg_conv; - alias_arg_conv.inner = (void*)(alias_arg & (~1)); - alias_arg_conv.is_owned = (alias_arg & 1) || (alias_arg == 0); + alias_arg_conv.inner = untag_ptr(alias_arg); + alias_arg_conv.is_owned = ptr_is_owned(alias_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(alias_arg_conv); alias_arg_conv = NodeAlias_clone(&alias_arg_conv); LDKCVec_NetAddressZ addresses_arg_constr; @@ -40532,75 +38790,63 @@ uint32_t __attribute__((export_name("TS_NodeAnnouncementInfo_new"))) TS_NodeAnn 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; + uint64_t* addresses_arg_vals = addresses_arg->elems; for (size_t m = 0; m < addresses_arg_constr.datalen; m++) { - uint32_t addresses_arg_conv_12 = addresses_arg_vals[m]; - void* addresses_arg_conv_12_ptr = (void*)(((uintptr_t)addresses_arg_conv_12) & ~1); + uint64_t addresses_arg_conv_12 = addresses_arg_vals[m]; + void* addresses_arg_conv_12_ptr = untag_ptr(addresses_arg_conv_12); 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; } FREE(addresses_arg); LDKNodeAnnouncement announcement_message_arg_conv; - announcement_message_arg_conv.inner = (void*)(announcement_message_arg & (~1)); - announcement_message_arg_conv.is_owned = (announcement_message_arg & 1) || (announcement_message_arg == 0); + announcement_message_arg_conv.inner = untag_ptr(announcement_message_arg); + announcement_message_arg_conv.is_owned = ptr_is_owned(announcement_message_arg); 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_conv, addresses_arg_constr, announcement_message_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t NodeAnnouncementInfo_clone_ptr(LDKNodeAnnouncementInfo *NONNULL_PTR arg) { +static inline uint64_t NodeAnnouncementInfo_clone_ptr(LDKNodeAnnouncementInfo *NONNULL_PTR arg) { LDKNodeAnnouncementInfo ret_var = NodeAnnouncementInfo_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_NodeAnnouncementInfo_clone_ptr"))) TS_NodeAnnouncementInfo_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_NodeAnnouncementInfo_clone_ptr"))) TS_NodeAnnouncementInfo_clone_ptr(uint64_t arg) { LDKNodeAnnouncementInfo arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = NodeAnnouncementInfo_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = NodeAnnouncementInfo_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_NodeAnnouncementInfo_clone"))) TS_NodeAnnouncementInfo_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_NodeAnnouncementInfo_clone"))) TS_NodeAnnouncementInfo_clone(uint64_t orig) { LDKNodeAnnouncementInfo orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKNodeAnnouncementInfo ret_var = NodeAnnouncementInfo_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_NodeAnnouncementInfo_write"))) TS_NodeAnnouncementInfo_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_NodeAnnouncementInfo_write"))) TS_NodeAnnouncementInfo_write(uint64_t obj) { LDKNodeAnnouncementInfo obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = NodeAnnouncementInfo_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -40608,104 +38854,94 @@ int8_tArray __attribute__((export_name("TS_NodeAnnouncementInfo_write"))) TS_No return ret_arr; } -uint32_t __attribute__((export_name("TS_NodeAnnouncementInfo_read"))) TS_NodeAnnouncementInfo_read(int8_tArray ser) { +uint64_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; LDKCResult_NodeAnnouncementInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementInfoDecodeErrorZ), "LDKCResult_NodeAnnouncementInfoDecodeErrorZ"); *ret_conv = NodeAnnouncementInfo_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_NodeAlias_free"))) TS_NodeAlias_free(uint32_t this_obj) { +void __attribute__((export_name("TS_NodeAlias_free"))) TS_NodeAlias_free(uint64_t this_obj) { LDKNodeAlias this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); NodeAlias_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_NodeAlias_get_a"))) TS_NodeAlias_get_a(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_NodeAlias_get_a"))) TS_NodeAlias_get_a(uint64_t this_ptr) { LDKNodeAlias this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *NodeAlias_get_a(&this_ptr_conv), 32); return ret_arr; } -void __attribute__((export_name("TS_NodeAlias_set_a"))) TS_NodeAlias_set_a(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_NodeAlias_set_a"))) TS_NodeAlias_set_a(uint64_t this_ptr, int8_tArray val) { LDKNodeAlias this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); memcpy(val_ref.data, val->elems, 32); FREE(val); NodeAlias_set_a(&this_ptr_conv, val_ref); } -uint32_t __attribute__((export_name("TS_NodeAlias_new"))) TS_NodeAlias_new(int8_tArray a_arg) { +uint64_t __attribute__((export_name("TS_NodeAlias_new"))) TS_NodeAlias_new(int8_tArray a_arg) { LDKThirtyTwoBytes a_arg_ref; CHECK(a_arg->arr_len == 32); memcpy(a_arg_ref.data, a_arg->elems, 32); FREE(a_arg); LDKNodeAlias ret_var = NodeAlias_new(a_arg_ref); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t NodeAlias_clone_ptr(LDKNodeAlias *NONNULL_PTR arg) { +static inline uint64_t NodeAlias_clone_ptr(LDKNodeAlias *NONNULL_PTR arg) { LDKNodeAlias ret_var = NodeAlias_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_NodeAlias_clone_ptr"))) TS_NodeAlias_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_NodeAlias_clone_ptr"))) TS_NodeAlias_clone_ptr(uint64_t arg) { LDKNodeAlias arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = NodeAlias_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = NodeAlias_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_NodeAlias_clone"))) TS_NodeAlias_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_NodeAlias_clone"))) TS_NodeAlias_clone(uint64_t orig) { LDKNodeAlias orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKNodeAlias ret_var = NodeAlias_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_NodeAlias_write"))) TS_NodeAlias_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_NodeAlias_write"))) TS_NodeAlias_write(uint64_t obj) { LDKNodeAlias obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = NodeAlias_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -40713,29 +38949,30 @@ int8_tArray __attribute__((export_name("TS_NodeAlias_write"))) TS_NodeAlias_wri return ret_arr; } -uint32_t __attribute__((export_name("TS_NodeAlias_read"))) TS_NodeAlias_read(int8_tArray ser) { +uint64_t __attribute__((export_name("TS_NodeAlias_read"))) TS_NodeAlias_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; ser_ref.data = ser->elems; LDKCResult_NodeAliasDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAliasDecodeErrorZ), "LDKCResult_NodeAliasDecodeErrorZ"); *ret_conv = NodeAlias_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_NodeInfo_free"))) TS_NodeInfo_free(uint32_t this_obj) { +void __attribute__((export_name("TS_NodeInfo_free"))) TS_NodeInfo_free(uint64_t this_obj) { LDKNodeInfo this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); NodeInfo_free(this_obj_conv); } -int64_tArray __attribute__((export_name("TS_NodeInfo_get_channels"))) TS_NodeInfo_get_channels(uint32_t this_ptr) { +int64_tArray __attribute__((export_name("TS_NodeInfo_get_channels"))) TS_NodeInfo_get_channels(uint64_t this_ptr) { LDKNodeInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_u64Z ret_var = NodeInfo_get_channels(&this_ptr_conv); int64_tArray ret_arr = NULL; ret_arr = init_int64_tArray(ret_var.datalen, __LINE__); @@ -40749,11 +38986,12 @@ int64_tArray __attribute__((export_name("TS_NodeInfo_get_channels"))) TS_NodeIn return ret_arr; } -void __attribute__((export_name("TS_NodeInfo_set_channels"))) TS_NodeInfo_set_channels(uint32_t this_ptr, int64_tArray val) { +void __attribute__((export_name("TS_NodeInfo_set_channels"))) TS_NodeInfo_set_channels(uint64_t this_ptr, int64_tArray val) { LDKNodeInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_u64Z val_constr; val_constr.datalen = val->arr_len; if (val_constr.datalen > 0) @@ -40769,71 +39007,61 @@ void __attribute__((export_name("TS_NodeInfo_set_channels"))) TS_NodeInfo_set_c NodeInfo_set_channels(&this_ptr_conv, val_constr); } -uint32_t __attribute__((export_name("TS_NodeInfo_get_lowest_inbound_channel_fees"))) TS_NodeInfo_get_lowest_inbound_channel_fees(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_NodeInfo_get_lowest_inbound_channel_fees"))) TS_NodeInfo_get_lowest_inbound_channel_fees(uint64_t this_ptr) { LDKNodeInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKRoutingFees ret_var = NodeInfo_get_lowest_inbound_channel_fees(&this_ptr_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_NodeInfo_set_lowest_inbound_channel_fees"))) TS_NodeInfo_set_lowest_inbound_channel_fees(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_NodeInfo_set_lowest_inbound_channel_fees"))) TS_NodeInfo_set_lowest_inbound_channel_fees(uint64_t this_ptr, uint64_t val) { LDKNodeInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKRoutingFees val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = RoutingFees_clone(&val_conv); NodeInfo_set_lowest_inbound_channel_fees(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_NodeInfo_get_announcement_info"))) TS_NodeInfo_get_announcement_info(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_NodeInfo_get_announcement_info"))) TS_NodeInfo_get_announcement_info(uint64_t this_ptr) { LDKNodeInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKNodeAnnouncementInfo ret_var = NodeInfo_get_announcement_info(&this_ptr_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_NodeInfo_set_announcement_info"))) TS_NodeInfo_set_announcement_info(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_NodeInfo_set_announcement_info"))) TS_NodeInfo_set_announcement_info(uint64_t this_ptr, uint64_t val) { LDKNodeInfo this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKNodeAnnouncementInfo val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = NodeAnnouncementInfo_clone(&val_conv); NodeInfo_set_announcement_info(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_NodeInfo_new"))) TS_NodeInfo_new(int64_tArray channels_arg, uint32_t lowest_inbound_channel_fees_arg, uint32_t announcement_info_arg) { +uint64_t __attribute__((export_name("TS_NodeInfo_new"))) TS_NodeInfo_new(int64_tArray channels_arg, uint64_t lowest_inbound_channel_fees_arg, uint64_t announcement_info_arg) { LDKCVec_u64Z channels_arg_constr; channels_arg_constr.datalen = channels_arg->arr_len; if (channels_arg_constr.datalen > 0) @@ -40847,70 +39075,58 @@ uint32_t __attribute__((export_name("TS_NodeInfo_new"))) TS_NodeInfo_new(int64_ } FREE(channels_arg); LDKRoutingFees lowest_inbound_channel_fees_arg_conv; - lowest_inbound_channel_fees_arg_conv.inner = (void*)(lowest_inbound_channel_fees_arg & (~1)); - lowest_inbound_channel_fees_arg_conv.is_owned = (lowest_inbound_channel_fees_arg & 1) || (lowest_inbound_channel_fees_arg == 0); + lowest_inbound_channel_fees_arg_conv.inner = untag_ptr(lowest_inbound_channel_fees_arg); + lowest_inbound_channel_fees_arg_conv.is_owned = ptr_is_owned(lowest_inbound_channel_fees_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(lowest_inbound_channel_fees_arg_conv); lowest_inbound_channel_fees_arg_conv = RoutingFees_clone(&lowest_inbound_channel_fees_arg_conv); LDKNodeAnnouncementInfo announcement_info_arg_conv; - announcement_info_arg_conv.inner = (void*)(announcement_info_arg & (~1)); - announcement_info_arg_conv.is_owned = (announcement_info_arg & 1) || (announcement_info_arg == 0); + announcement_info_arg_conv.inner = untag_ptr(announcement_info_arg); + announcement_info_arg_conv.is_owned = ptr_is_owned(announcement_info_arg); 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t NodeInfo_clone_ptr(LDKNodeInfo *NONNULL_PTR arg) { +static inline uint64_t NodeInfo_clone_ptr(LDKNodeInfo *NONNULL_PTR arg) { LDKNodeInfo ret_var = NodeInfo_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_NodeInfo_clone_ptr"))) TS_NodeInfo_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_NodeInfo_clone_ptr"))) TS_NodeInfo_clone_ptr(uint64_t arg) { LDKNodeInfo arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = NodeInfo_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = NodeInfo_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_NodeInfo_clone"))) TS_NodeInfo_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_NodeInfo_clone"))) TS_NodeInfo_clone(uint64_t orig) { LDKNodeInfo orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKNodeInfo ret_var = NodeInfo_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_NodeInfo_write"))) TS_NodeInfo_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_NodeInfo_write"))) TS_NodeInfo_write(uint64_t obj) { LDKNodeInfo obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = NodeInfo_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -40918,21 +39134,22 @@ int8_tArray __attribute__((export_name("TS_NodeInfo_write"))) TS_NodeInfo_write return ret_arr; } -uint32_t __attribute__((export_name("TS_NodeInfo_read"))) TS_NodeInfo_read(int8_tArray ser) { +uint64_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; LDKCResult_NodeInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeInfoDecodeErrorZ), "LDKCResult_NodeInfoDecodeErrorZ"); *ret_conv = NodeInfo_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int8_tArray __attribute__((export_name("TS_NetworkGraph_write"))) TS_NetworkGraph_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_NetworkGraph_write"))) TS_NetworkGraph_write(uint64_t obj) { LDKNetworkGraph obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = NetworkGraph_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -40940,11 +39157,11 @@ int8_tArray __attribute__((export_name("TS_NetworkGraph_write"))) TS_NetworkGra return ret_arr; } -uint32_t __attribute__((export_name("TS_NetworkGraph_read"))) TS_NetworkGraph_read(int8_tArray ser, uint32_t arg) { +uint64_t __attribute__((export_name("TS_NetworkGraph_read"))) TS_NetworkGraph_read(int8_tArray ser, uint64_t arg) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; ser_ref.data = ser->elems; - void* arg_ptr = (void*)(((uintptr_t)arg) & ~1); + void* arg_ptr = untag_ptr(arg); CHECK_ACCESS(arg_ptr); LDKLogger arg_conv = *(LDKLogger*)(arg_ptr); if (arg_conv.free == LDKLogger_JCalls_free) { @@ -40954,14 +39171,14 @@ uint32_t __attribute__((export_name("TS_NetworkGraph_read"))) TS_NetworkGraph_r LDKCResult_NetworkGraphDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetworkGraphDecodeErrorZ), "LDKCResult_NetworkGraphDecodeErrorZ"); *ret_conv = NetworkGraph_read(ser_ref, arg_conv); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_NetworkGraph_new"))) TS_NetworkGraph_new(int8_tArray genesis_hash, uint32_t logger) { +uint64_t __attribute__((export_name("TS_NetworkGraph_new"))) TS_NetworkGraph_new(int8_tArray genesis_hash, uint64_t logger) { LDKThirtyTwoBytes genesis_hash_ref; CHECK(genesis_hash->arr_len == 32); memcpy(genesis_hash_ref.data, genesis_hash->elems, 32); FREE(genesis_hash); - void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); + void* logger_ptr = untag_ptr(logger); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); if (logger_conv.free == LDKLogger_JCalls_free) { @@ -40969,91 +39186,90 @@ uint32_t __attribute__((export_name("TS_NetworkGraph_new"))) TS_NetworkGraph_ne LDKLogger_JCalls_cloned(&logger_conv); } LDKNetworkGraph ret_var = NetworkGraph_new(genesis_hash_ref, logger_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_NetworkGraph_read_only"))) TS_NetworkGraph_read_only(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_NetworkGraph_read_only"))) TS_NetworkGraph_read_only(uint64_t this_arg) { LDKNetworkGraph this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKReadOnlyNetworkGraph ret_var = NetworkGraph_read_only(&this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_NetworkGraph_get_last_rapid_gossip_sync_timestamp"))) TS_NetworkGraph_get_last_rapid_gossip_sync_timestamp(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_NetworkGraph_get_last_rapid_gossip_sync_timestamp"))) TS_NetworkGraph_get_last_rapid_gossip_sync_timestamp(uint64_t this_arg) { LDKNetworkGraph this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCOption_u32Z *ret_copy = MALLOC(sizeof(LDKCOption_u32Z), "LDKCOption_u32Z"); *ret_copy = NetworkGraph_get_last_rapid_gossip_sync_timestamp(&this_arg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_NetworkGraph_set_last_rapid_gossip_sync_timestamp"))) TS_NetworkGraph_set_last_rapid_gossip_sync_timestamp(uint32_t this_arg, int32_t last_rapid_gossip_sync_timestamp) { +void __attribute__((export_name("TS_NetworkGraph_set_last_rapid_gossip_sync_timestamp"))) TS_NetworkGraph_set_last_rapid_gossip_sync_timestamp(uint64_t this_arg, int32_t last_rapid_gossip_sync_timestamp) { LDKNetworkGraph this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NetworkGraph_set_last_rapid_gossip_sync_timestamp(&this_arg_conv, last_rapid_gossip_sync_timestamp); } -uint32_t __attribute__((export_name("TS_NetworkGraph_update_node_from_announcement"))) TS_NetworkGraph_update_node_from_announcement(uint32_t this_arg, uint32_t msg) { +uint64_t __attribute__((export_name("TS_NetworkGraph_update_node_from_announcement"))) TS_NetworkGraph_update_node_from_announcement(uint64_t this_arg, uint64_t msg) { LDKNetworkGraph this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKNodeAnnouncement msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = NetworkGraph_update_node_from_announcement(&this_arg_conv, &msg_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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) { +uint64_t __attribute__((export_name("TS_NetworkGraph_update_node_from_unsigned_announcement"))) TS_NetworkGraph_update_node_from_unsigned_announcement(uint64_t this_arg, uint64_t msg) { LDKNetworkGraph this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKUnsignedNodeAnnouncement msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = NetworkGraph_update_node_from_unsigned_announcement(&this_arg_conv, &msg_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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) { +uint64_t __attribute__((export_name("TS_NetworkGraph_update_channel_from_announcement"))) TS_NetworkGraph_update_channel_from_announcement(uint64_t this_arg, uint64_t msg, uint64_t chain_access) { LDKNetworkGraph this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKChannelAnnouncement msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); - void* chain_access_ptr = (void*)(((uintptr_t)chain_access) & ~1); + msg_conv.is_owned = false; + void* chain_access_ptr = untag_ptr(chain_access); 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 @@ -41066,19 +39282,21 @@ 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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) { +uint64_t __attribute__((export_name("TS_NetworkGraph_update_channel_from_unsigned_announcement"))) TS_NetworkGraph_update_channel_from_unsigned_announcement(uint64_t this_arg, uint64_t msg, uint64_t chain_access) { LDKNetworkGraph this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKUnsignedChannelAnnouncement msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); - void* chain_access_ptr = (void*)(((uintptr_t)chain_access) & ~1); + msg_conv.is_owned = false; + void* chain_access_ptr = untag_ptr(chain_access); 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 @@ -41091,17 +39309,18 @@ 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 (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_NetworkGraph_add_channel_from_partial_announcement"))) TS_NetworkGraph_add_channel_from_partial_announcement(uint32_t this_arg, int64_t short_channel_id, int64_t timestamp, uint32_t features, int8_tArray node_id_1, int8_tArray node_id_2) { +uint64_t __attribute__((export_name("TS_NetworkGraph_add_channel_from_partial_announcement"))) TS_NetworkGraph_add_channel_from_partial_announcement(uint64_t this_arg, int64_t short_channel_id, int64_t timestamp, uint64_t features, int8_tArray node_id_1, int8_tArray node_id_2) { LDKNetworkGraph this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKChannelFeatures features_conv; - features_conv.inner = (void*)(features & (~1)); - features_conv.is_owned = (features & 1) || (features == 0); + features_conv.inner = untag_ptr(features); + features_conv.is_owned = ptr_is_owned(features); CHECK_INNER_FIELD_ACCESS_OR_NULL(features_conv); features_conv = ChannelFeatures_clone(&features_conv); LDKPublicKey node_id_1_ref; @@ -41112,88 +39331,90 @@ uint32_t __attribute__((export_name("TS_NetworkGraph_add_channel_from_partial_a memcpy(node_id_2_ref.compressed_form, node_id_2->elems, 33); FREE(node_id_2); LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = NetworkGraph_add_channel_from_partial_announcement(&this_arg_conv, short_channel_id, timestamp, features_conv, node_id_1_ref, node_id_2_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_NetworkGraph_channel_failed"))) TS_NetworkGraph_channel_failed(uint32_t this_arg, int64_t short_channel_id, jboolean is_permanent) { +void __attribute__((export_name("TS_NetworkGraph_channel_failed"))) TS_NetworkGraph_channel_failed(uint64_t this_arg, int64_t short_channel_id, jboolean is_permanent) { LDKNetworkGraph this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NetworkGraph_channel_failed(&this_arg_conv, short_channel_id, is_permanent); } -void __attribute__((export_name("TS_NetworkGraph_node_failed"))) TS_NetworkGraph_node_failed(uint32_t this_arg, int8_tArray _node_id, jboolean is_permanent) { +void __attribute__((export_name("TS_NetworkGraph_node_failed"))) TS_NetworkGraph_node_failed(uint64_t this_arg, int8_tArray _node_id, jboolean is_permanent) { LDKNetworkGraph this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKPublicKey _node_id_ref; CHECK(_node_id->arr_len == 33); memcpy(_node_id_ref.compressed_form, _node_id->elems, 33); FREE(_node_id); NetworkGraph_node_failed(&this_arg_conv, _node_id_ref, is_permanent); } -void __attribute__((export_name("TS_NetworkGraph_remove_stale_channels_with_time"))) TS_NetworkGraph_remove_stale_channels_with_time(uint32_t this_arg, int64_t current_time_unix) { +void __attribute__((export_name("TS_NetworkGraph_remove_stale_channels_with_time"))) TS_NetworkGraph_remove_stale_channels_with_time(uint64_t this_arg, int64_t current_time_unix) { LDKNetworkGraph this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; NetworkGraph_remove_stale_channels_with_time(&this_arg_conv, current_time_unix); } -uint32_t __attribute__((export_name("TS_NetworkGraph_update_channel"))) TS_NetworkGraph_update_channel(uint32_t this_arg, uint32_t msg) { +uint64_t __attribute__((export_name("TS_NetworkGraph_update_channel"))) TS_NetworkGraph_update_channel(uint64_t this_arg, uint64_t msg) { LDKNetworkGraph this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKChannelUpdate msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = NetworkGraph_update_channel(&this_arg_conv, &msg_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_NetworkGraph_update_channel_unsigned"))) TS_NetworkGraph_update_channel_unsigned(uint32_t this_arg, uint32_t msg) { +uint64_t __attribute__((export_name("TS_NetworkGraph_update_channel_unsigned"))) TS_NetworkGraph_update_channel_unsigned(uint64_t this_arg, uint64_t msg) { LDKNetworkGraph this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKUnsignedChannelUpdate msg_conv; - msg_conv.inner = (void*)(msg & (~1)); - msg_conv.is_owned = false; + msg_conv.inner = untag_ptr(msg); + msg_conv.is_owned = ptr_is_owned(msg); CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); + msg_conv.is_owned = false; LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = NetworkGraph_update_channel_unsigned(&this_arg_conv, &msg_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_ReadOnlyNetworkGraph_channel"))) TS_ReadOnlyNetworkGraph_channel(uint32_t this_arg, int64_t short_channel_id) { +uint64_t __attribute__((export_name("TS_ReadOnlyNetworkGraph_channel"))) TS_ReadOnlyNetworkGraph_channel(uint64_t this_arg, int64_t short_channel_id) { LDKReadOnlyNetworkGraph this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKChannelInfo ret_var = ReadOnlyNetworkGraph_channel(&this_arg_conv, short_channel_id); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int64_tArray __attribute__((export_name("TS_ReadOnlyNetworkGraph_list_channels"))) TS_ReadOnlyNetworkGraph_list_channels(uint32_t this_arg) { +int64_tArray __attribute__((export_name("TS_ReadOnlyNetworkGraph_list_channels"))) TS_ReadOnlyNetworkGraph_list_channels(uint64_t this_arg) { LDKReadOnlyNetworkGraph this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCVec_u64Z ret_var = ReadOnlyNetworkGraph_list_channels(&this_arg_conv); int64_tArray ret_arr = NULL; ret_arr = init_int64_tArray(ret_var.datalen, __LINE__); @@ -41207,48 +39428,39 @@ int64_tArray __attribute__((export_name("TS_ReadOnlyNetworkGraph_list_channels" return ret_arr; } -uint32_t __attribute__((export_name("TS_ReadOnlyNetworkGraph_node"))) TS_ReadOnlyNetworkGraph_node(uint32_t this_arg, uint32_t node_id) { +uint64_t __attribute__((export_name("TS_ReadOnlyNetworkGraph_node"))) TS_ReadOnlyNetworkGraph_node(uint64_t this_arg, uint64_t node_id) { LDKReadOnlyNetworkGraph this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKNodeId node_id_conv; - node_id_conv.inner = (void*)(node_id & (~1)); - node_id_conv.is_owned = false; + node_id_conv.inner = untag_ptr(node_id); + node_id_conv.is_owned = ptr_is_owned(node_id); CHECK_INNER_FIELD_ACCESS_OR_NULL(node_id_conv); + node_id_conv.is_owned = false; LDKNodeInfo ret_var = ReadOnlyNetworkGraph_node(&this_arg_conv, &node_id_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_tArray __attribute__((export_name("TS_ReadOnlyNetworkGraph_list_nodes"))) TS_ReadOnlyNetworkGraph_list_nodes(uint32_t this_arg) { +uint64_tArray __attribute__((export_name("TS_ReadOnlyNetworkGraph_list_nodes"))) TS_ReadOnlyNetworkGraph_list_nodes(uint64_t this_arg) { LDKReadOnlyNetworkGraph this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCVec_NodeIdZ ret_var = ReadOnlyNetworkGraph_list_nodes(&this_arg_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t i = 0; i < ret_var.datalen; i++) { LDKNodeId ret_conv_8_var = ret_var.data[i]; - uint32_t ret_conv_8_ref = 0; - CHECK((((uintptr_t)ret_conv_8_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_conv_8_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_conv_8_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_8_var); - ret_conv_8_ref = (uintptr_t)ret_conv_8_var.inner; - if (ret_conv_8_var.is_owned) { - ret_conv_8_ref |= 1; - } + ret_conv_8_ref = tag_ptr(ret_conv_8_var.inner, ret_conv_8_var.is_owned); ret_arr_ptr[i] = ret_conv_8_ref; } @@ -41256,251 +39468,245 @@ uint32_tArray __attribute__((export_name("TS_ReadOnlyNetworkGraph_list_nodes")) return ret_arr; } -uint32_t __attribute__((export_name("TS_ReadOnlyNetworkGraph_get_addresses"))) TS_ReadOnlyNetworkGraph_get_addresses(uint32_t this_arg, int8_tArray pubkey) { +uint64_t __attribute__((export_name("TS_ReadOnlyNetworkGraph_get_addresses"))) TS_ReadOnlyNetworkGraph_get_addresses(uint64_t this_arg, int8_tArray pubkey) { LDKReadOnlyNetworkGraph this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKPublicKey pubkey_ref; CHECK(pubkey->arr_len == 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); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_RouteHop_free"))) TS_RouteHop_free(uint32_t this_obj) { +void __attribute__((export_name("TS_RouteHop_free"))) TS_RouteHop_free(uint64_t this_obj) { LDKRouteHop this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); RouteHop_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_RouteHop_get_pubkey"))) TS_RouteHop_get_pubkey(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_RouteHop_get_pubkey"))) TS_RouteHop_get_pubkey(uint64_t this_ptr) { LDKRouteHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_RouteHop_set_pubkey"))) TS_RouteHop_set_pubkey(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_RouteHop_set_pubkey"))) TS_RouteHop_set_pubkey(uint64_t this_ptr, int8_tArray val) { LDKRouteHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); RouteHop_set_pubkey(&this_ptr_conv, val_ref); } -uint32_t __attribute__((export_name("TS_RouteHop_get_node_features"))) TS_RouteHop_get_node_features(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_RouteHop_get_node_features"))) TS_RouteHop_get_node_features(uint64_t this_ptr) { LDKRouteHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKNodeFeatures ret_var = RouteHop_get_node_features(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_RouteHop_set_node_features"))) TS_RouteHop_set_node_features(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_RouteHop_set_node_features"))) TS_RouteHop_set_node_features(uint64_t this_ptr, uint64_t val) { LDKRouteHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKNodeFeatures val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = NodeFeatures_clone(&val_conv); RouteHop_set_node_features(&this_ptr_conv, val_conv); } -int64_t __attribute__((export_name("TS_RouteHop_get_short_channel_id"))) TS_RouteHop_get_short_channel_id(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_RouteHop_get_short_channel_id"))) TS_RouteHop_get_short_channel_id(uint64_t this_ptr) { LDKRouteHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = RouteHop_get_short_channel_id(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_RouteHop_set_short_channel_id"))) TS_RouteHop_set_short_channel_id(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_RouteHop_set_short_channel_id"))) TS_RouteHop_set_short_channel_id(uint64_t this_ptr, int64_t val) { LDKRouteHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; RouteHop_set_short_channel_id(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_RouteHop_get_channel_features"))) TS_RouteHop_get_channel_features(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_RouteHop_get_channel_features"))) TS_RouteHop_get_channel_features(uint64_t this_ptr) { LDKRouteHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelFeatures ret_var = RouteHop_get_channel_features(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_RouteHop_set_channel_features"))) TS_RouteHop_set_channel_features(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_RouteHop_set_channel_features"))) TS_RouteHop_set_channel_features(uint64_t this_ptr, uint64_t val) { LDKRouteHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKChannelFeatures val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = ChannelFeatures_clone(&val_conv); RouteHop_set_channel_features(&this_ptr_conv, val_conv); } -int64_t __attribute__((export_name("TS_RouteHop_get_fee_msat"))) TS_RouteHop_get_fee_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_RouteHop_get_fee_msat"))) TS_RouteHop_get_fee_msat(uint64_t this_ptr) { LDKRouteHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = RouteHop_get_fee_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_RouteHop_set_fee_msat"))) TS_RouteHop_set_fee_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_RouteHop_set_fee_msat"))) TS_RouteHop_set_fee_msat(uint64_t this_ptr, int64_t val) { LDKRouteHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; RouteHop_set_fee_msat(&this_ptr_conv, val); } -int32_t __attribute__((export_name("TS_RouteHop_get_cltv_expiry_delta"))) TS_RouteHop_get_cltv_expiry_delta(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_RouteHop_get_cltv_expiry_delta"))) TS_RouteHop_get_cltv_expiry_delta(uint64_t this_ptr) { LDKRouteHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = RouteHop_get_cltv_expiry_delta(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_RouteHop_set_cltv_expiry_delta"))) TS_RouteHop_set_cltv_expiry_delta(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_RouteHop_set_cltv_expiry_delta"))) TS_RouteHop_set_cltv_expiry_delta(uint64_t this_ptr, int32_t val) { LDKRouteHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; RouteHop_set_cltv_expiry_delta(&this_ptr_conv, val); } -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) { +uint64_t __attribute__((export_name("TS_RouteHop_new"))) TS_RouteHop_new(int8_tArray pubkey_arg, uint64_t node_features_arg, int64_t short_channel_id_arg, uint64_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); 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); + node_features_arg_conv.inner = untag_ptr(node_features_arg); + node_features_arg_conv.is_owned = ptr_is_owned(node_features_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(node_features_arg_conv); node_features_arg_conv = NodeFeatures_clone(&node_features_arg_conv); LDKChannelFeatures channel_features_arg_conv; - channel_features_arg_conv.inner = (void*)(channel_features_arg & (~1)); - channel_features_arg_conv.is_owned = (channel_features_arg & 1) || (channel_features_arg == 0); + channel_features_arg_conv.inner = untag_ptr(channel_features_arg); + channel_features_arg_conv.is_owned = ptr_is_owned(channel_features_arg); 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t RouteHop_clone_ptr(LDKRouteHop *NONNULL_PTR arg) { +static inline uint64_t RouteHop_clone_ptr(LDKRouteHop *NONNULL_PTR arg) { LDKRouteHop ret_var = RouteHop_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_RouteHop_clone_ptr"))) TS_RouteHop_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_RouteHop_clone_ptr"))) TS_RouteHop_clone_ptr(uint64_t arg) { LDKRouteHop arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = RouteHop_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = RouteHop_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_RouteHop_clone"))) TS_RouteHop_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_RouteHop_clone"))) TS_RouteHop_clone(uint64_t orig) { LDKRouteHop orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKRouteHop ret_var = RouteHop_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int64_t __attribute__((export_name("TS_RouteHop_hash"))) TS_RouteHop_hash(uint32_t o) { +int64_t __attribute__((export_name("TS_RouteHop_hash"))) TS_RouteHop_hash(uint64_t o) { LDKRouteHop o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = false; + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); + o_conv.is_owned = false; int64_t ret_conv = RouteHop_hash(&o_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_RouteHop_eq"))) TS_RouteHop_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_RouteHop_eq"))) TS_RouteHop_eq(uint64_t a, uint64_t b) { LDKRouteHop a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKRouteHop b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = RouteHop_eq(&a_conv, &b_conv); return ret_conv; } -int8_tArray __attribute__((export_name("TS_RouteHop_write"))) TS_RouteHop_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_RouteHop_write"))) TS_RouteHop_write(uint64_t obj) { LDKRouteHop obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = RouteHop_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -41508,48 +39714,44 @@ int8_tArray __attribute__((export_name("TS_RouteHop_write"))) TS_RouteHop_write return ret_arr; } -uint32_t __attribute__((export_name("TS_RouteHop_read"))) TS_RouteHop_read(int8_tArray ser) { +uint64_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; LDKCResult_RouteHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHopDecodeErrorZ), "LDKCResult_RouteHopDecodeErrorZ"); *ret_conv = RouteHop_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_Route_free"))) TS_Route_free(uint32_t this_obj) { +void __attribute__((export_name("TS_Route_free"))) TS_Route_free(uint64_t this_obj) { LDKRoute this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); Route_free(this_obj_conv); } -ptrArray __attribute__((export_name("TS_Route_get_paths"))) TS_Route_get_paths(uint32_t this_ptr) { +ptrArray __attribute__((export_name("TS_Route_get_paths"))) TS_Route_get_paths(uint64_t this_ptr) { LDKRoute this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_CVec_RouteHopZZ ret_var = Route_get_paths(&this_ptr_conv); ptrArray ret_arr = NULL; ret_arr = init_ptrArray(ret_var.datalen, __LINE__); - uint32_tArray *ret_arr_ptr = (uint32_tArray*)(((uint8_t*)ret_arr) + 8); + uint64_tArray *ret_arr_ptr = (uint64_tArray*)(((uint8_t*)ret_arr) + 8); for (size_t m = 0; m < ret_var.datalen; m++) { LDKCVec_RouteHopZ ret_conv_12_var = ret_var.data[m]; - uint32_tArray ret_conv_12_arr = NULL; - ret_conv_12_arr = init_uint32_tArray(ret_conv_12_var.datalen, __LINE__); - uint32_t *ret_conv_12_arr_ptr = (uint32_t*)(((uint8_t*)ret_conv_12_arr) + 8); + uint64_tArray ret_conv_12_arr = NULL; + ret_conv_12_arr = init_uint64_tArray(ret_conv_12_var.datalen, __LINE__); + uint64_t *ret_conv_12_arr_ptr = (uint64_t*)(((uint8_t*)ret_conv_12_arr) + 8); for (size_t k = 0; k < ret_conv_12_var.datalen; k++) { LDKRouteHop ret_conv_12_conv_10_var = ret_conv_12_var.data[k]; - uint32_t ret_conv_12_conv_10_ref = 0; - 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. + uint64_t ret_conv_12_conv_10_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_12_conv_10_var); - 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; - } + ret_conv_12_conv_10_ref = tag_ptr(ret_conv_12_conv_10_var.inner, ret_conv_12_conv_10_var.is_owned); ret_conv_12_arr_ptr[k] = ret_conv_12_conv_10_ref; } @@ -41561,32 +39763,33 @@ ptrArray __attribute__((export_name("TS_Route_get_paths"))) TS_Route_get_paths( return ret_arr; } -void __attribute__((export_name("TS_Route_set_paths"))) TS_Route_set_paths(uint32_t this_ptr, ptrArray val) { +void __attribute__((export_name("TS_Route_set_paths"))) TS_Route_set_paths(uint64_t this_ptr, ptrArray val) { LDKRoute this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_CVec_RouteHopZZ val_constr; val_constr.datalen = val->arr_len; if (val_constr.datalen > 0) 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; + uint64_tArray* val_vals = (void*) val->elems; for (size_t m = 0; m < val_constr.datalen; m++) { - uint32_tArray val_conv_12 = val_vals[m]; + uint64_tArray val_conv_12 = val_vals[m]; LDKCVec_RouteHopZ val_conv_12_constr; val_conv_12_constr.datalen = val_conv_12->arr_len; if (val_conv_12_constr.datalen > 0) 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; + uint64_t* val_conv_12_vals = val_conv_12->elems; for (size_t k = 0; k < val_conv_12_constr.datalen; k++) { - uint32_t val_conv_12_conv_10 = val_conv_12_vals[k]; + uint64_t val_conv_12_conv_10 = val_conv_12_vals[k]; LDKRouteHop val_conv_12_conv_10_conv; - val_conv_12_conv_10_conv.inner = (void*)(val_conv_12_conv_10 & (~1)); - val_conv_12_conv_10_conv.is_owned = (val_conv_12_conv_10 & 1) || (val_conv_12_conv_10 == 0); + val_conv_12_conv_10_conv.inner = untag_ptr(val_conv_12_conv_10); + val_conv_12_conv_10_conv.is_owned = ptr_is_owned(val_conv_12_conv_10); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv_12_conv_10_conv); val_conv_12_conv_10_conv = RouteHop_clone(&val_conv_12_conv_10_conv); val_conv_12_constr.data[k] = val_conv_12_conv_10_conv; @@ -41598,60 +39801,55 @@ void __attribute__((export_name("TS_Route_set_paths"))) TS_Route_set_paths(uint Route_set_paths(&this_ptr_conv, val_constr); } -uint32_t __attribute__((export_name("TS_Route_get_payment_params"))) TS_Route_get_payment_params(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_Route_get_payment_params"))) TS_Route_get_payment_params(uint64_t this_ptr) { LDKRoute this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPaymentParameters ret_var = Route_get_payment_params(&this_ptr_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_Route_set_payment_params"))) TS_Route_set_payment_params(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_Route_set_payment_params"))) TS_Route_set_payment_params(uint64_t this_ptr, uint64_t val) { LDKRoute this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPaymentParameters val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = PaymentParameters_clone(&val_conv); Route_set_payment_params(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_Route_new"))) TS_Route_new(ptrArray paths_arg, uint32_t payment_params_arg) { +uint64_t __attribute__((export_name("TS_Route_new"))) TS_Route_new(ptrArray paths_arg, uint64_t payment_params_arg) { LDKCVec_CVec_RouteHopZZ paths_arg_constr; paths_arg_constr.datalen = paths_arg->arr_len; if (paths_arg_constr.datalen > 0) 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; + uint64_tArray* paths_arg_vals = (void*) paths_arg->elems; for (size_t m = 0; m < paths_arg_constr.datalen; m++) { - uint32_tArray paths_arg_conv_12 = paths_arg_vals[m]; + uint64_tArray paths_arg_conv_12 = paths_arg_vals[m]; LDKCVec_RouteHopZ paths_arg_conv_12_constr; paths_arg_conv_12_constr.datalen = paths_arg_conv_12->arr_len; if (paths_arg_conv_12_constr.datalen > 0) 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; + uint64_t* paths_arg_conv_12_vals = paths_arg_conv_12->elems; for (size_t k = 0; k < paths_arg_conv_12_constr.datalen; k++) { - uint32_t paths_arg_conv_12_conv_10 = paths_arg_conv_12_vals[k]; + uint64_t paths_arg_conv_12_conv_10 = paths_arg_conv_12_vals[k]; LDKRouteHop paths_arg_conv_12_conv_10_conv; - paths_arg_conv_12_conv_10_conv.inner = (void*)(paths_arg_conv_12_conv_10 & (~1)); - paths_arg_conv_12_conv_10_conv.is_owned = (paths_arg_conv_12_conv_10 & 1) || (paths_arg_conv_12_conv_10 == 0); + paths_arg_conv_12_conv_10_conv.inner = untag_ptr(paths_arg_conv_12_conv_10); + paths_arg_conv_12_conv_10_conv.is_owned = ptr_is_owned(paths_arg_conv_12_conv_10); CHECK_INNER_FIELD_ACCESS_OR_NULL(paths_arg_conv_12_conv_10_conv); paths_arg_conv_12_conv_10_conv = RouteHop_clone(&paths_arg_conv_12_conv_10_conv); paths_arg_conv_12_constr.data[k] = paths_arg_conv_12_conv_10_conv; @@ -41661,105 +39859,98 @@ uint32_t __attribute__((export_name("TS_Route_new"))) TS_Route_new(ptrArray pat } FREE(paths_arg); LDKPaymentParameters payment_params_arg_conv; - payment_params_arg_conv.inner = (void*)(payment_params_arg & (~1)); - payment_params_arg_conv.is_owned = (payment_params_arg & 1) || (payment_params_arg == 0); + payment_params_arg_conv.inner = untag_ptr(payment_params_arg); + payment_params_arg_conv.is_owned = ptr_is_owned(payment_params_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(payment_params_arg_conv); payment_params_arg_conv = PaymentParameters_clone(&payment_params_arg_conv); LDKRoute ret_var = Route_new(paths_arg_constr, payment_params_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t Route_clone_ptr(LDKRoute *NONNULL_PTR arg) { +static inline uint64_t Route_clone_ptr(LDKRoute *NONNULL_PTR arg) { LDKRoute ret_var = Route_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_Route_clone_ptr"))) TS_Route_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_Route_clone_ptr"))) TS_Route_clone_ptr(uint64_t arg) { LDKRoute arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = Route_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = Route_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_Route_clone"))) TS_Route_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_Route_clone"))) TS_Route_clone(uint64_t orig) { LDKRoute orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKRoute ret_var = Route_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int64_t __attribute__((export_name("TS_Route_hash"))) TS_Route_hash(uint32_t o) { +int64_t __attribute__((export_name("TS_Route_hash"))) TS_Route_hash(uint64_t o) { LDKRoute o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = false; + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); + o_conv.is_owned = false; int64_t ret_conv = Route_hash(&o_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_Route_eq"))) TS_Route_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_Route_eq"))) TS_Route_eq(uint64_t a, uint64_t b) { LDKRoute a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKRoute b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = Route_eq(&a_conv, &b_conv); return ret_conv; } -int64_t __attribute__((export_name("TS_Route_get_total_fees"))) TS_Route_get_total_fees(uint32_t this_arg) { +int64_t __attribute__((export_name("TS_Route_get_total_fees"))) TS_Route_get_total_fees(uint64_t this_arg) { LDKRoute this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int64_t ret_conv = Route_get_total_fees(&this_arg_conv); return ret_conv; } -int64_t __attribute__((export_name("TS_Route_get_total_amount"))) TS_Route_get_total_amount(uint32_t this_arg) { +int64_t __attribute__((export_name("TS_Route_get_total_amount"))) TS_Route_get_total_amount(uint64_t this_arg) { LDKRoute this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int64_t ret_conv = Route_get_total_amount(&this_arg_conv); return ret_conv; } -int8_tArray __attribute__((export_name("TS_Route_write"))) TS_Route_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_Route_write"))) TS_Route_write(uint64_t obj) { LDKRoute obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = Route_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -41767,149 +39958,138 @@ int8_tArray __attribute__((export_name("TS_Route_write"))) TS_Route_write(uint3 return ret_arr; } -uint32_t __attribute__((export_name("TS_Route_read"))) TS_Route_read(int8_tArray ser) { +uint64_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; LDKCResult_RouteDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteDecodeErrorZ), "LDKCResult_RouteDecodeErrorZ"); *ret_conv = Route_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_RouteParameters_free"))) TS_RouteParameters_free(uint32_t this_obj) { +void __attribute__((export_name("TS_RouteParameters_free"))) TS_RouteParameters_free(uint64_t this_obj) { LDKRouteParameters this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); RouteParameters_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_RouteParameters_get_payment_params"))) TS_RouteParameters_get_payment_params(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_RouteParameters_get_payment_params"))) TS_RouteParameters_get_payment_params(uint64_t this_ptr) { LDKRouteParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPaymentParameters ret_var = RouteParameters_get_payment_params(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_RouteParameters_set_payment_params"))) TS_RouteParameters_set_payment_params(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_RouteParameters_set_payment_params"))) TS_RouteParameters_set_payment_params(uint64_t this_ptr, uint64_t val) { LDKRouteParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPaymentParameters val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = PaymentParameters_clone(&val_conv); RouteParameters_set_payment_params(&this_ptr_conv, val_conv); } -int64_t __attribute__((export_name("TS_RouteParameters_get_final_value_msat"))) TS_RouteParameters_get_final_value_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_RouteParameters_get_final_value_msat"))) TS_RouteParameters_get_final_value_msat(uint64_t this_ptr) { LDKRouteParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = RouteParameters_get_final_value_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_RouteParameters_set_final_value_msat"))) TS_RouteParameters_set_final_value_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_RouteParameters_set_final_value_msat"))) TS_RouteParameters_set_final_value_msat(uint64_t this_ptr, int64_t val) { LDKRouteParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; RouteParameters_set_final_value_msat(&this_ptr_conv, val); } -int32_t __attribute__((export_name("TS_RouteParameters_get_final_cltv_expiry_delta"))) TS_RouteParameters_get_final_cltv_expiry_delta(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_RouteParameters_get_final_cltv_expiry_delta"))) TS_RouteParameters_get_final_cltv_expiry_delta(uint64_t this_ptr) { LDKRouteParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = RouteParameters_get_final_cltv_expiry_delta(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_RouteParameters_set_final_cltv_expiry_delta"))) TS_RouteParameters_set_final_cltv_expiry_delta(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_RouteParameters_set_final_cltv_expiry_delta"))) TS_RouteParameters_set_final_cltv_expiry_delta(uint64_t this_ptr, int32_t val) { LDKRouteParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; RouteParameters_set_final_cltv_expiry_delta(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_RouteParameters_new"))) TS_RouteParameters_new(uint32_t payment_params_arg, int64_t final_value_msat_arg, int32_t final_cltv_expiry_delta_arg) { +uint64_t __attribute__((export_name("TS_RouteParameters_new"))) TS_RouteParameters_new(uint64_t payment_params_arg, int64_t final_value_msat_arg, int32_t final_cltv_expiry_delta_arg) { LDKPaymentParameters payment_params_arg_conv; - payment_params_arg_conv.inner = (void*)(payment_params_arg & (~1)); - payment_params_arg_conv.is_owned = (payment_params_arg & 1) || (payment_params_arg == 0); + payment_params_arg_conv.inner = untag_ptr(payment_params_arg); + payment_params_arg_conv.is_owned = ptr_is_owned(payment_params_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(payment_params_arg_conv); payment_params_arg_conv = PaymentParameters_clone(&payment_params_arg_conv); LDKRouteParameters ret_var = RouteParameters_new(payment_params_arg_conv, final_value_msat_arg, final_cltv_expiry_delta_arg); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t RouteParameters_clone_ptr(LDKRouteParameters *NONNULL_PTR arg) { +static inline uint64_t RouteParameters_clone_ptr(LDKRouteParameters *NONNULL_PTR arg) { LDKRouteParameters ret_var = RouteParameters_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_RouteParameters_clone_ptr"))) TS_RouteParameters_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_RouteParameters_clone_ptr"))) TS_RouteParameters_clone_ptr(uint64_t arg) { LDKRouteParameters arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = RouteParameters_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = RouteParameters_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_RouteParameters_clone"))) TS_RouteParameters_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_RouteParameters_clone"))) TS_RouteParameters_clone(uint64_t orig) { LDKRouteParameters orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKRouteParameters ret_var = RouteParameters_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_RouteParameters_write"))) TS_RouteParameters_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_RouteParameters_write"))) TS_RouteParameters_write(uint64_t obj) { LDKRouteParameters obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = RouteParameters_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -41917,96 +40097,89 @@ int8_tArray __attribute__((export_name("TS_RouteParameters_write"))) TS_RoutePa return ret_arr; } -uint32_t __attribute__((export_name("TS_RouteParameters_read"))) TS_RouteParameters_read(int8_tArray ser) { +uint64_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; LDKCResult_RouteParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteParametersDecodeErrorZ), "LDKCResult_RouteParametersDecodeErrorZ"); *ret_conv = RouteParameters_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_PaymentParameters_free"))) TS_PaymentParameters_free(uint32_t this_obj) { +void __attribute__((export_name("TS_PaymentParameters_free"))) TS_PaymentParameters_free(uint64_t this_obj) { LDKPaymentParameters this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); PaymentParameters_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_PaymentParameters_get_payee_pubkey"))) TS_PaymentParameters_get_payee_pubkey(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_PaymentParameters_get_payee_pubkey"))) TS_PaymentParameters_get_payee_pubkey(uint64_t this_ptr) { LDKPaymentParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, PaymentParameters_get_payee_pubkey(&this_ptr_conv).compressed_form, 33); return ret_arr; } -void __attribute__((export_name("TS_PaymentParameters_set_payee_pubkey"))) TS_PaymentParameters_set_payee_pubkey(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_PaymentParameters_set_payee_pubkey"))) TS_PaymentParameters_set_payee_pubkey(uint64_t this_ptr, int8_tArray val) { LDKPaymentParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); PaymentParameters_set_payee_pubkey(&this_ptr_conv, val_ref); } -uint32_t __attribute__((export_name("TS_PaymentParameters_get_features"))) TS_PaymentParameters_get_features(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_PaymentParameters_get_features"))) TS_PaymentParameters_get_features(uint64_t this_ptr) { LDKPaymentParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKInvoiceFeatures ret_var = PaymentParameters_get_features(&this_ptr_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_PaymentParameters_set_features"))) TS_PaymentParameters_set_features(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_PaymentParameters_set_features"))) TS_PaymentParameters_set_features(uint64_t this_ptr, uint64_t val) { LDKPaymentParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKInvoiceFeatures val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = InvoiceFeatures_clone(&val_conv); PaymentParameters_set_features(&this_ptr_conv, val_conv); } -uint32_tArray __attribute__((export_name("TS_PaymentParameters_get_route_hints"))) TS_PaymentParameters_get_route_hints(uint32_t this_ptr) { +uint64_tArray __attribute__((export_name("TS_PaymentParameters_get_route_hints"))) TS_PaymentParameters_get_route_hints(uint64_t this_ptr) { LDKPaymentParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_RouteHintZ ret_var = PaymentParameters_get_route_hints(&this_ptr_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t l = 0; l < ret_var.datalen; l++) { LDKRouteHint ret_conv_11_var = ret_var.data[l]; - uint32_t ret_conv_11_ref = 0; - 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. + uint64_t ret_conv_11_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_11_var); - ret_conv_11_ref = (uintptr_t)ret_conv_11_var.inner; - if (ret_conv_11_var.is_owned) { - ret_conv_11_ref |= 1; - } + ret_conv_11_ref = tag_ptr(ret_conv_11_var.inner, ret_conv_11_var.is_owned); ret_arr_ptr[l] = ret_conv_11_ref; } @@ -42014,23 +40187,24 @@ uint32_tArray __attribute__((export_name("TS_PaymentParameters_get_route_hints" return ret_arr; } -void __attribute__((export_name("TS_PaymentParameters_set_route_hints"))) TS_PaymentParameters_set_route_hints(uint32_t this_ptr, uint32_tArray val) { +void __attribute__((export_name("TS_PaymentParameters_set_route_hints"))) TS_PaymentParameters_set_route_hints(uint64_t this_ptr, uint64_tArray val) { LDKPaymentParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_RouteHintZ val_constr; val_constr.datalen = val->arr_len; if (val_constr.datalen > 0) val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKRouteHint), "LDKCVec_RouteHintZ Elements"); else val_constr.data = NULL; - uint32_t* val_vals = val->elems; + uint64_t* val_vals = val->elems; for (size_t l = 0; l < val_constr.datalen; l++) { - uint32_t val_conv_11 = val_vals[l]; + uint64_t val_conv_11 = val_vals[l]; LDKRouteHint val_conv_11_conv; - val_conv_11_conv.inner = (void*)(val_conv_11 & (~1)); - val_conv_11_conv.is_owned = (val_conv_11 & 1) || (val_conv_11 == 0); + val_conv_11_conv.inner = untag_ptr(val_conv_11); + val_conv_11_conv.is_owned = ptr_is_owned(val_conv_11); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv_11_conv); val_conv_11_conv = RouteHint_clone(&val_conv_11_conv); val_constr.data[l] = val_conv_11_conv; @@ -42039,85 +40213,94 @@ void __attribute__((export_name("TS_PaymentParameters_set_route_hints"))) TS_Pa PaymentParameters_set_route_hints(&this_ptr_conv, val_constr); } -uint32_t __attribute__((export_name("TS_PaymentParameters_get_expiry_time"))) TS_PaymentParameters_get_expiry_time(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_PaymentParameters_get_expiry_time"))) TS_PaymentParameters_get_expiry_time(uint64_t this_ptr) { LDKPaymentParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = PaymentParameters_get_expiry_time(&this_ptr_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_PaymentParameters_set_expiry_time"))) TS_PaymentParameters_set_expiry_time(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_PaymentParameters_set_expiry_time"))) TS_PaymentParameters_set_expiry_time(uint64_t this_ptr, uint64_t val) { LDKPaymentParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr); - val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1)); + val_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(val)); PaymentParameters_set_expiry_time(&this_ptr_conv, val_conv); } -int32_t __attribute__((export_name("TS_PaymentParameters_get_max_total_cltv_expiry_delta"))) TS_PaymentParameters_get_max_total_cltv_expiry_delta(uint32_t this_ptr) { +int32_t __attribute__((export_name("TS_PaymentParameters_get_max_total_cltv_expiry_delta"))) TS_PaymentParameters_get_max_total_cltv_expiry_delta(uint64_t this_ptr) { LDKPaymentParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int32_t ret_conv = PaymentParameters_get_max_total_cltv_expiry_delta(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_PaymentParameters_set_max_total_cltv_expiry_delta"))) TS_PaymentParameters_set_max_total_cltv_expiry_delta(uint32_t this_ptr, int32_t val) { +void __attribute__((export_name("TS_PaymentParameters_set_max_total_cltv_expiry_delta"))) TS_PaymentParameters_set_max_total_cltv_expiry_delta(uint64_t this_ptr, int32_t val) { LDKPaymentParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; PaymentParameters_set_max_total_cltv_expiry_delta(&this_ptr_conv, val); } -int8_t __attribute__((export_name("TS_PaymentParameters_get_max_path_count"))) TS_PaymentParameters_get_max_path_count(uint32_t this_ptr) { +int8_t __attribute__((export_name("TS_PaymentParameters_get_max_path_count"))) TS_PaymentParameters_get_max_path_count(uint64_t this_ptr) { LDKPaymentParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_t ret_conv = PaymentParameters_get_max_path_count(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_PaymentParameters_set_max_path_count"))) TS_PaymentParameters_set_max_path_count(uint32_t this_ptr, int8_t val) { +void __attribute__((export_name("TS_PaymentParameters_set_max_path_count"))) TS_PaymentParameters_set_max_path_count(uint64_t this_ptr, int8_t val) { LDKPaymentParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; PaymentParameters_set_max_path_count(&this_ptr_conv, val); } -int8_t __attribute__((export_name("TS_PaymentParameters_get_max_channel_saturation_power_of_half"))) TS_PaymentParameters_get_max_channel_saturation_power_of_half(uint32_t this_ptr) { +int8_t __attribute__((export_name("TS_PaymentParameters_get_max_channel_saturation_power_of_half"))) TS_PaymentParameters_get_max_channel_saturation_power_of_half(uint64_t this_ptr) { LDKPaymentParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_t ret_conv = PaymentParameters_get_max_channel_saturation_power_of_half(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_PaymentParameters_set_max_channel_saturation_power_of_half"))) TS_PaymentParameters_set_max_channel_saturation_power_of_half(uint32_t this_ptr, int8_t val) { +void __attribute__((export_name("TS_PaymentParameters_set_max_channel_saturation_power_of_half"))) TS_PaymentParameters_set_max_channel_saturation_power_of_half(uint64_t this_ptr, int8_t val) { LDKPaymentParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; PaymentParameters_set_max_channel_saturation_power_of_half(&this_ptr_conv, val); } -int64_tArray __attribute__((export_name("TS_PaymentParameters_get_previously_failed_channels"))) TS_PaymentParameters_get_previously_failed_channels(uint32_t this_ptr) { +int64_tArray __attribute__((export_name("TS_PaymentParameters_get_previously_failed_channels"))) TS_PaymentParameters_get_previously_failed_channels(uint64_t this_ptr) { LDKPaymentParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_u64Z ret_var = PaymentParameters_get_previously_failed_channels(&this_ptr_conv); int64_tArray ret_arr = NULL; ret_arr = init_int64_tArray(ret_var.datalen, __LINE__); @@ -42131,11 +40314,12 @@ int64_tArray __attribute__((export_name("TS_PaymentParameters_get_previously_fa return ret_arr; } -void __attribute__((export_name("TS_PaymentParameters_set_previously_failed_channels"))) TS_PaymentParameters_set_previously_failed_channels(uint32_t this_ptr, int64_tArray val) { +void __attribute__((export_name("TS_PaymentParameters_set_previously_failed_channels"))) TS_PaymentParameters_set_previously_failed_channels(uint64_t this_ptr, int64_tArray val) { LDKPaymentParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_u64Z val_constr; val_constr.datalen = val->arr_len; if (val_constr.datalen > 0) @@ -42151,13 +40335,13 @@ void __attribute__((export_name("TS_PaymentParameters_set_previously_failed_cha PaymentParameters_set_previously_failed_channels(&this_ptr_conv, val_constr); } -uint32_t __attribute__((export_name("TS_PaymentParameters_new"))) TS_PaymentParameters_new(int8_tArray payee_pubkey_arg, uint32_t features_arg, uint32_tArray route_hints_arg, uint32_t expiry_time_arg, int32_t max_total_cltv_expiry_delta_arg, int8_t max_path_count_arg, int8_t max_channel_saturation_power_of_half_arg, int64_tArray previously_failed_channels_arg) { +uint64_t __attribute__((export_name("TS_PaymentParameters_new"))) TS_PaymentParameters_new(int8_tArray payee_pubkey_arg, uint64_t features_arg, uint64_tArray route_hints_arg, uint64_t expiry_time_arg, int32_t max_total_cltv_expiry_delta_arg, int8_t max_path_count_arg, int8_t max_channel_saturation_power_of_half_arg, int64_tArray previously_failed_channels_arg) { LDKPublicKey payee_pubkey_arg_ref; CHECK(payee_pubkey_arg->arr_len == 33); memcpy(payee_pubkey_arg_ref.compressed_form, payee_pubkey_arg->elems, 33); FREE(payee_pubkey_arg); LDKInvoiceFeatures features_arg_conv; - features_arg_conv.inner = (void*)(features_arg & (~1)); - features_arg_conv.is_owned = (features_arg & 1) || (features_arg == 0); + features_arg_conv.inner = untag_ptr(features_arg); + features_arg_conv.is_owned = ptr_is_owned(features_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(features_arg_conv); features_arg_conv = InvoiceFeatures_clone(&features_arg_conv); LDKCVec_RouteHintZ route_hints_arg_constr; @@ -42166,21 +40350,21 @@ uint32_t __attribute__((export_name("TS_PaymentParameters_new"))) TS_PaymentPar route_hints_arg_constr.data = MALLOC(route_hints_arg_constr.datalen * sizeof(LDKRouteHint), "LDKCVec_RouteHintZ Elements"); else route_hints_arg_constr.data = NULL; - uint32_t* route_hints_arg_vals = route_hints_arg->elems; + uint64_t* route_hints_arg_vals = route_hints_arg->elems; for (size_t l = 0; l < route_hints_arg_constr.datalen; l++) { - uint32_t route_hints_arg_conv_11 = route_hints_arg_vals[l]; + uint64_t route_hints_arg_conv_11 = route_hints_arg_vals[l]; LDKRouteHint route_hints_arg_conv_11_conv; - route_hints_arg_conv_11_conv.inner = (void*)(route_hints_arg_conv_11 & (~1)); - route_hints_arg_conv_11_conv.is_owned = (route_hints_arg_conv_11 & 1) || (route_hints_arg_conv_11 == 0); + route_hints_arg_conv_11_conv.inner = untag_ptr(route_hints_arg_conv_11); + route_hints_arg_conv_11_conv.is_owned = ptr_is_owned(route_hints_arg_conv_11); CHECK_INNER_FIELD_ACCESS_OR_NULL(route_hints_arg_conv_11_conv); route_hints_arg_conv_11_conv = RouteHint_clone(&route_hints_arg_conv_11_conv); route_hints_arg_constr.data[l] = route_hints_arg_conv_11_conv; } FREE(route_hints_arg); - void* expiry_time_arg_ptr = (void*)(((uintptr_t)expiry_time_arg) & ~1); + void* expiry_time_arg_ptr = untag_ptr(expiry_time_arg); CHECK_ACCESS(expiry_time_arg_ptr); LDKCOption_u64Z expiry_time_arg_conv = *(LDKCOption_u64Z*)(expiry_time_arg_ptr); - expiry_time_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)expiry_time_arg) & ~1)); + expiry_time_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(expiry_time_arg)); LDKCVec_u64Z previously_failed_channels_arg_constr; previously_failed_channels_arg_constr.datalen = previously_failed_channels_arg->arr_len; if (previously_failed_channels_arg_constr.datalen > 0) @@ -42194,82 +40378,73 @@ uint32_t __attribute__((export_name("TS_PaymentParameters_new"))) TS_PaymentPar } FREE(previously_failed_channels_arg); LDKPaymentParameters ret_var = PaymentParameters_new(payee_pubkey_arg_ref, features_arg_conv, route_hints_arg_constr, expiry_time_arg_conv, max_total_cltv_expiry_delta_arg, max_path_count_arg, max_channel_saturation_power_of_half_arg, previously_failed_channels_arg_constr); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t PaymentParameters_clone_ptr(LDKPaymentParameters *NONNULL_PTR arg) { +static inline uint64_t PaymentParameters_clone_ptr(LDKPaymentParameters *NONNULL_PTR arg) { LDKPaymentParameters ret_var = PaymentParameters_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_PaymentParameters_clone_ptr"))) TS_PaymentParameters_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_PaymentParameters_clone_ptr"))) TS_PaymentParameters_clone_ptr(uint64_t arg) { LDKPaymentParameters arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = PaymentParameters_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = PaymentParameters_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_PaymentParameters_clone"))) TS_PaymentParameters_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_PaymentParameters_clone"))) TS_PaymentParameters_clone(uint64_t orig) { LDKPaymentParameters orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKPaymentParameters ret_var = PaymentParameters_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int64_t __attribute__((export_name("TS_PaymentParameters_hash"))) TS_PaymentParameters_hash(uint32_t o) { +int64_t __attribute__((export_name("TS_PaymentParameters_hash"))) TS_PaymentParameters_hash(uint64_t o) { LDKPaymentParameters o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = false; + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); + o_conv.is_owned = false; int64_t ret_conv = PaymentParameters_hash(&o_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_PaymentParameters_eq"))) TS_PaymentParameters_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_PaymentParameters_eq"))) TS_PaymentParameters_eq(uint64_t a, uint64_t b) { LDKPaymentParameters a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKPaymentParameters b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = PaymentParameters_eq(&a_conv, &b_conv); return ret_conv; } -int8_tArray __attribute__((export_name("TS_PaymentParameters_write"))) TS_PaymentParameters_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_PaymentParameters_write"))) TS_PaymentParameters_write(uint64_t obj) { LDKPaymentParameters obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = PaymentParameters_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -42277,75 +40452,61 @@ int8_tArray __attribute__((export_name("TS_PaymentParameters_write"))) TS_Payme return ret_arr; } -uint32_t __attribute__((export_name("TS_PaymentParameters_read"))) TS_PaymentParameters_read(int8_tArray ser) { +uint64_t __attribute__((export_name("TS_PaymentParameters_read"))) TS_PaymentParameters_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; ser_ref.data = ser->elems; LDKCResult_PaymentParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentParametersDecodeErrorZ), "LDKCResult_PaymentParametersDecodeErrorZ"); *ret_conv = PaymentParameters_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_PaymentParameters_from_node_id"))) TS_PaymentParameters_from_node_id(int8_tArray payee_pubkey) { +uint64_t __attribute__((export_name("TS_PaymentParameters_from_node_id"))) TS_PaymentParameters_from_node_id(int8_tArray payee_pubkey) { LDKPublicKey payee_pubkey_ref; CHECK(payee_pubkey->arr_len == 33); memcpy(payee_pubkey_ref.compressed_form, payee_pubkey->elems, 33); FREE(payee_pubkey); LDKPaymentParameters ret_var = PaymentParameters_from_node_id(payee_pubkey_ref); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_PaymentParameters_for_keysend"))) TS_PaymentParameters_for_keysend(int8_tArray payee_pubkey) { +uint64_t __attribute__((export_name("TS_PaymentParameters_for_keysend"))) TS_PaymentParameters_for_keysend(int8_tArray payee_pubkey) { LDKPublicKey payee_pubkey_ref; CHECK(payee_pubkey->arr_len == 33); memcpy(payee_pubkey_ref.compressed_form, payee_pubkey->elems, 33); FREE(payee_pubkey); LDKPaymentParameters ret_var = PaymentParameters_for_keysend(payee_pubkey_ref); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_RouteHint_free"))) TS_RouteHint_free(uint32_t this_obj) { +void __attribute__((export_name("TS_RouteHint_free"))) TS_RouteHint_free(uint64_t this_obj) { LDKRouteHint this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); RouteHint_free(this_obj_conv); } -uint32_tArray __attribute__((export_name("TS_RouteHint_get_a"))) TS_RouteHint_get_a(uint32_t this_ptr) { +uint64_tArray __attribute__((export_name("TS_RouteHint_get_a"))) TS_RouteHint_get_a(uint64_t this_ptr) { LDKRouteHint this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_RouteHintHopZ ret_var = RouteHint_get_a(&this_ptr_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t o = 0; o < ret_var.datalen; o++) { LDKRouteHintHop ret_conv_14_var = ret_var.data[o]; - uint32_t ret_conv_14_ref = 0; - 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. + uint64_t ret_conv_14_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_14_var); - ret_conv_14_ref = (uintptr_t)ret_conv_14_var.inner; - if (ret_conv_14_var.is_owned) { - ret_conv_14_ref |= 1; - } + ret_conv_14_ref = tag_ptr(ret_conv_14_var.inner, ret_conv_14_var.is_owned); ret_arr_ptr[o] = ret_conv_14_ref; } @@ -42353,23 +40514,24 @@ uint32_tArray __attribute__((export_name("TS_RouteHint_get_a"))) TS_RouteHint_g return ret_arr; } -void __attribute__((export_name("TS_RouteHint_set_a"))) TS_RouteHint_set_a(uint32_t this_ptr, uint32_tArray val) { +void __attribute__((export_name("TS_RouteHint_set_a"))) TS_RouteHint_set_a(uint64_t this_ptr, uint64_tArray val) { LDKRouteHint this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCVec_RouteHintHopZ val_constr; val_constr.datalen = val->arr_len; if (val_constr.datalen > 0) val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKRouteHintHop), "LDKCVec_RouteHintHopZ Elements"); else val_constr.data = NULL; - uint32_t* val_vals = val->elems; + uint64_t* val_vals = val->elems; for (size_t o = 0; o < val_constr.datalen; o++) { - uint32_t val_conv_14 = val_vals[o]; + uint64_t val_conv_14 = val_vals[o]; LDKRouteHintHop val_conv_14_conv; - val_conv_14_conv.inner = (void*)(val_conv_14 & (~1)); - val_conv_14_conv.is_owned = (val_conv_14 & 1) || (val_conv_14 == 0); + val_conv_14_conv.inner = untag_ptr(val_conv_14); + val_conv_14_conv.is_owned = ptr_is_owned(val_conv_14); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv_14_conv); val_conv_14_conv = RouteHintHop_clone(&val_conv_14_conv); val_constr.data[o] = val_conv_14_conv; @@ -42378,101 +40540,92 @@ void __attribute__((export_name("TS_RouteHint_set_a"))) TS_RouteHint_set_a(uint RouteHint_set_a(&this_ptr_conv, val_constr); } -uint32_t __attribute__((export_name("TS_RouteHint_new"))) TS_RouteHint_new(uint32_tArray a_arg) { +uint64_t __attribute__((export_name("TS_RouteHint_new"))) TS_RouteHint_new(uint64_tArray a_arg) { LDKCVec_RouteHintHopZ a_arg_constr; a_arg_constr.datalen = a_arg->arr_len; if (a_arg_constr.datalen > 0) 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; + uint64_t* a_arg_vals = a_arg->elems; for (size_t o = 0; o < a_arg_constr.datalen; o++) { - uint32_t a_arg_conv_14 = a_arg_vals[o]; + uint64_t a_arg_conv_14 = a_arg_vals[o]; LDKRouteHintHop a_arg_conv_14_conv; - a_arg_conv_14_conv.inner = (void*)(a_arg_conv_14 & (~1)); - a_arg_conv_14_conv.is_owned = (a_arg_conv_14 & 1) || (a_arg_conv_14 == 0); + a_arg_conv_14_conv.inner = untag_ptr(a_arg_conv_14); + a_arg_conv_14_conv.is_owned = ptr_is_owned(a_arg_conv_14); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_arg_conv_14_conv); a_arg_conv_14_conv = RouteHintHop_clone(&a_arg_conv_14_conv); a_arg_constr.data[o] = a_arg_conv_14_conv; } FREE(a_arg); LDKRouteHint ret_var = RouteHint_new(a_arg_constr); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t RouteHint_clone_ptr(LDKRouteHint *NONNULL_PTR arg) { +static inline uint64_t RouteHint_clone_ptr(LDKRouteHint *NONNULL_PTR arg) { LDKRouteHint ret_var = RouteHint_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_RouteHint_clone_ptr"))) TS_RouteHint_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_RouteHint_clone_ptr"))) TS_RouteHint_clone_ptr(uint64_t arg) { LDKRouteHint arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = RouteHint_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = RouteHint_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_RouteHint_clone"))) TS_RouteHint_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_RouteHint_clone"))) TS_RouteHint_clone(uint64_t orig) { LDKRouteHint orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKRouteHint ret_var = RouteHint_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int64_t __attribute__((export_name("TS_RouteHint_hash"))) TS_RouteHint_hash(uint32_t o) { +int64_t __attribute__((export_name("TS_RouteHint_hash"))) TS_RouteHint_hash(uint64_t o) { LDKRouteHint o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = false; + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); + o_conv.is_owned = false; int64_t ret_conv = RouteHint_hash(&o_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_RouteHint_eq"))) TS_RouteHint_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_RouteHint_eq"))) TS_RouteHint_eq(uint64_t a, uint64_t b) { LDKRouteHint a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKRouteHint b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = RouteHint_eq(&a_conv, &b_conv); return ret_conv; } -int8_tArray __attribute__((export_name("TS_RouteHint_write"))) TS_RouteHint_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_RouteHint_write"))) TS_RouteHint_write(uint64_t obj) { LDKRouteHint obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = RouteHint_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -42480,249 +40633,247 @@ int8_tArray __attribute__((export_name("TS_RouteHint_write"))) TS_RouteHint_wri return ret_arr; } -uint32_t __attribute__((export_name("TS_RouteHint_read"))) TS_RouteHint_read(int8_tArray ser) { +uint64_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; LDKCResult_RouteHintDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintDecodeErrorZ), "LDKCResult_RouteHintDecodeErrorZ"); *ret_conv = RouteHint_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_RouteHintHop_free"))) TS_RouteHintHop_free(uint32_t this_obj) { +void __attribute__((export_name("TS_RouteHintHop_free"))) TS_RouteHintHop_free(uint64_t this_obj) { LDKRouteHintHop this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); RouteHintHop_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_RouteHintHop_get_src_node_id"))) TS_RouteHintHop_get_src_node_id(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_RouteHintHop_get_src_node_id"))) TS_RouteHintHop_get_src_node_id(uint64_t this_ptr) { LDKRouteHintHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; 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; } -void __attribute__((export_name("TS_RouteHintHop_set_src_node_id"))) TS_RouteHintHop_set_src_node_id(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_RouteHintHop_set_src_node_id"))) TS_RouteHintHop_set_src_node_id(uint64_t this_ptr, int8_tArray val) { LDKRouteHintHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); RouteHintHop_set_src_node_id(&this_ptr_conv, val_ref); } -int64_t __attribute__((export_name("TS_RouteHintHop_get_short_channel_id"))) TS_RouteHintHop_get_short_channel_id(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_RouteHintHop_get_short_channel_id"))) TS_RouteHintHop_get_short_channel_id(uint64_t this_ptr) { LDKRouteHintHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = RouteHintHop_get_short_channel_id(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_RouteHintHop_set_short_channel_id"))) TS_RouteHintHop_set_short_channel_id(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_RouteHintHop_set_short_channel_id"))) TS_RouteHintHop_set_short_channel_id(uint64_t this_ptr, int64_t val) { LDKRouteHintHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; RouteHintHop_set_short_channel_id(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_RouteHintHop_get_fees"))) TS_RouteHintHop_get_fees(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_RouteHintHop_get_fees"))) TS_RouteHintHop_get_fees(uint64_t this_ptr) { LDKRouteHintHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKRoutingFees ret_var = RouteHintHop_get_fees(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_RouteHintHop_set_fees"))) TS_RouteHintHop_set_fees(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_RouteHintHop_set_fees"))) TS_RouteHintHop_set_fees(uint64_t this_ptr, uint64_t val) { LDKRouteHintHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKRoutingFees val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = RoutingFees_clone(&val_conv); RouteHintHop_set_fees(&this_ptr_conv, val_conv); } -int16_t __attribute__((export_name("TS_RouteHintHop_get_cltv_expiry_delta"))) TS_RouteHintHop_get_cltv_expiry_delta(uint32_t this_ptr) { +int16_t __attribute__((export_name("TS_RouteHintHop_get_cltv_expiry_delta"))) TS_RouteHintHop_get_cltv_expiry_delta(uint64_t this_ptr) { LDKRouteHintHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int16_t ret_conv = RouteHintHop_get_cltv_expiry_delta(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_RouteHintHop_set_cltv_expiry_delta"))) TS_RouteHintHop_set_cltv_expiry_delta(uint32_t this_ptr, int16_t val) { +void __attribute__((export_name("TS_RouteHintHop_set_cltv_expiry_delta"))) TS_RouteHintHop_set_cltv_expiry_delta(uint64_t this_ptr, int16_t val) { LDKRouteHintHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; RouteHintHop_set_cltv_expiry_delta(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_RouteHintHop_get_htlc_minimum_msat"))) TS_RouteHintHop_get_htlc_minimum_msat(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_RouteHintHop_get_htlc_minimum_msat"))) TS_RouteHintHop_get_htlc_minimum_msat(uint64_t this_ptr) { LDKRouteHintHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = RouteHintHop_get_htlc_minimum_msat(&this_ptr_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_RouteHintHop_set_htlc_minimum_msat"))) TS_RouteHintHop_set_htlc_minimum_msat(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_RouteHintHop_set_htlc_minimum_msat"))) TS_RouteHintHop_set_htlc_minimum_msat(uint64_t this_ptr, uint64_t val) { LDKRouteHintHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr); - val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1)); + val_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(val)); RouteHintHop_set_htlc_minimum_msat(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_RouteHintHop_get_htlc_maximum_msat"))) TS_RouteHintHop_get_htlc_maximum_msat(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_RouteHintHop_get_htlc_maximum_msat"))) TS_RouteHintHop_get_htlc_maximum_msat(uint64_t this_ptr) { LDKRouteHintHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = RouteHintHop_get_htlc_maximum_msat(&this_ptr_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_RouteHintHop_set_htlc_maximum_msat"))) TS_RouteHintHop_set_htlc_maximum_msat(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_RouteHintHop_set_htlc_maximum_msat"))) TS_RouteHintHop_set_htlc_maximum_msat(uint64_t this_ptr, uint64_t val) { LDKRouteHintHop this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr); - val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1)); + val_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(val)); 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) { +uint64_t __attribute__((export_name("TS_RouteHintHop_new"))) TS_RouteHintHop_new(int8_tArray src_node_id_arg, int64_t short_channel_id_arg, uint64_t fees_arg, int16_t cltv_expiry_delta_arg, uint64_t htlc_minimum_msat_arg, uint64_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); 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); + fees_arg_conv.inner = untag_ptr(fees_arg); + fees_arg_conv.is_owned = ptr_is_owned(fees_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(fees_arg_conv); fees_arg_conv = RoutingFees_clone(&fees_arg_conv); - void* htlc_minimum_msat_arg_ptr = (void*)(((uintptr_t)htlc_minimum_msat_arg) & ~1); + void* htlc_minimum_msat_arg_ptr = untag_ptr(htlc_minimum_msat_arg); 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*)(((uintptr_t)htlc_minimum_msat_arg) & ~1)); - void* htlc_maximum_msat_arg_ptr = (void*)(((uintptr_t)htlc_maximum_msat_arg) & ~1); + htlc_minimum_msat_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(htlc_minimum_msat_arg)); + void* htlc_maximum_msat_arg_ptr = untag_ptr(htlc_maximum_msat_arg); CHECK_ACCESS(htlc_maximum_msat_arg_ptr); LDKCOption_u64Z htlc_maximum_msat_arg_conv = *(LDKCOption_u64Z*)(htlc_maximum_msat_arg_ptr); - htlc_maximum_msat_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)htlc_maximum_msat_arg) & ~1)); + htlc_maximum_msat_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(htlc_maximum_msat_arg)); 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); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t RouteHintHop_clone_ptr(LDKRouteHintHop *NONNULL_PTR arg) { +static inline uint64_t RouteHintHop_clone_ptr(LDKRouteHintHop *NONNULL_PTR arg) { LDKRouteHintHop ret_var = RouteHintHop_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_RouteHintHop_clone_ptr"))) TS_RouteHintHop_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_RouteHintHop_clone_ptr"))) TS_RouteHintHop_clone_ptr(uint64_t arg) { LDKRouteHintHop arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = RouteHintHop_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = RouteHintHop_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_RouteHintHop_clone"))) TS_RouteHintHop_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_RouteHintHop_clone"))) TS_RouteHintHop_clone(uint64_t orig) { LDKRouteHintHop orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKRouteHintHop ret_var = RouteHintHop_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int64_t __attribute__((export_name("TS_RouteHintHop_hash"))) TS_RouteHintHop_hash(uint32_t o) { +int64_t __attribute__((export_name("TS_RouteHintHop_hash"))) TS_RouteHintHop_hash(uint64_t o) { LDKRouteHintHop o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = false; + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); + o_conv.is_owned = false; int64_t ret_conv = RouteHintHop_hash(&o_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_RouteHintHop_eq"))) TS_RouteHintHop_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_RouteHintHop_eq"))) TS_RouteHintHop_eq(uint64_t a, uint64_t b) { LDKRouteHintHop a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKRouteHintHop b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = RouteHintHop_eq(&a_conv, &b_conv); return ret_conv; } -int8_tArray __attribute__((export_name("TS_RouteHintHop_write"))) TS_RouteHintHop_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_RouteHintHop_write"))) TS_RouteHintHop_write(uint64_t obj) { LDKRouteHintHop obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = RouteHintHop_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -42730,28 +40881,30 @@ int8_tArray __attribute__((export_name("TS_RouteHintHop_write"))) TS_RouteHintH return ret_arr; } -uint32_t __attribute__((export_name("TS_RouteHintHop_read"))) TS_RouteHintHop_read(int8_tArray ser) { +uint64_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; LDKCResult_RouteHintHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintHopDecodeErrorZ), "LDKCResult_RouteHintHopDecodeErrorZ"); *ret_conv = RouteHintHop_read(ser_ref); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_find_route"))) TS_find_route(int8_tArray our_node_pubkey, uint32_t route_params, uint32_t network_graph, uint32_tArray first_hops, uint32_t logger, uint32_t scorer, int8_tArray random_seed_bytes) { +uint64_t __attribute__((export_name("TS_find_route"))) TS_find_route(int8_tArray our_node_pubkey, uint64_t route_params, uint64_t network_graph, uint64_tArray first_hops, uint64_t logger, uint64_t scorer, int8_tArray random_seed_bytes) { LDKPublicKey our_node_pubkey_ref; CHECK(our_node_pubkey->arr_len == 33); memcpy(our_node_pubkey_ref.compressed_form, our_node_pubkey->elems, 33); FREE(our_node_pubkey); LDKRouteParameters route_params_conv; - route_params_conv.inner = (void*)(route_params & (~1)); - route_params_conv.is_owned = false; + route_params_conv.inner = untag_ptr(route_params); + route_params_conv.is_owned = ptr_is_owned(route_params); CHECK_INNER_FIELD_ACCESS_OR_NULL(route_params_conv); + route_params_conv.is_owned = false; LDKNetworkGraph network_graph_conv; - network_graph_conv.inner = (void*)(network_graph & (~1)); - network_graph_conv.is_owned = false; + network_graph_conv.inner = untag_ptr(network_graph); + network_graph_conv.is_owned = ptr_is_owned(network_graph); CHECK_INNER_FIELD_ACCESS_OR_NULL(network_graph_conv); + network_graph_conv.is_owned = false; LDKCVec_ChannelDetailsZ first_hops_constr; LDKCVec_ChannelDetailsZ *first_hops_ptr = NULL; if (first_hops != 0) { @@ -42760,27 +40913,28 @@ 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; + uint64_t* first_hops_vals = first_hops->elems; for (size_t q = 0; q < first_hops_constr.datalen; q++) { - uint32_t first_hops_conv_16 = first_hops_vals[q]; + uint64_t first_hops_conv_16 = first_hops_vals[q]; LDKChannelDetails first_hops_conv_16_conv; - first_hops_conv_16_conv.inner = (void*)(first_hops_conv_16 & (~1)); - first_hops_conv_16_conv.is_owned = (first_hops_conv_16 & 1) || (first_hops_conv_16 == 0); + first_hops_conv_16_conv.inner = untag_ptr(first_hops_conv_16); + first_hops_conv_16_conv.is_owned = ptr_is_owned(first_hops_conv_16); CHECK_INNER_FIELD_ACCESS_OR_NULL(first_hops_conv_16_conv); + first_hops_conv_16_conv.is_owned = false; first_hops_constr.data[q] = first_hops_conv_16_conv; } FREE(first_hops); first_hops_ptr = &first_hops_constr; } - void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); + void* logger_ptr = untag_ptr(logger); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); if (logger_conv.free == LDKLogger_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKLogger_JCalls_cloned(&logger_conv); } - void* scorer_ptr = (void*)(((uintptr_t)scorer) & ~1); - if (!(scorer & 1)) { CHECK_ACCESS(scorer_ptr); } + void* scorer_ptr = untag_ptr(scorer); + if (ptr_is_owned(scorer)) { CHECK_ACCESS(scorer_ptr); } LDKScore* scorer_conv = (LDKScore*)scorer_ptr; unsigned char random_seed_bytes_arr[32]; CHECK(random_seed_bytes->arr_len == 32); @@ -42789,10 +40943,10 @@ uint32_t __attribute__((export_name("TS_find_route"))) TS_find_route(int8_tArra LDKCResult_RouteLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteLightningErrorZ), "LDKCResult_RouteLightningErrorZ"); *ret_conv = find_route(our_node_pubkey_ref, &route_params_conv, &network_graph_conv, first_hops_ptr, logger_conv, scorer_conv, random_seed_bytes_ref); if (first_hops_ptr != NULL) { FREE(first_hops_constr.data); } - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_build_route_from_hops"))) TS_build_route_from_hops(int8_tArray our_node_pubkey, ptrArray hops, uint32_t route_params, uint32_t network_graph, uint32_t logger, int8_tArray random_seed_bytes) { +uint64_t __attribute__((export_name("TS_build_route_from_hops"))) TS_build_route_from_hops(int8_tArray our_node_pubkey, ptrArray hops, uint64_t route_params, uint64_t network_graph, uint64_t logger, int8_tArray random_seed_bytes) { LDKPublicKey our_node_pubkey_ref; CHECK(our_node_pubkey->arr_len == 33); memcpy(our_node_pubkey_ref.compressed_form, our_node_pubkey->elems, 33); FREE(our_node_pubkey); @@ -42812,14 +40966,16 @@ uint32_t __attribute__((export_name("TS_build_route_from_hops"))) TS_build_rout } FREE(hops); LDKRouteParameters route_params_conv; - route_params_conv.inner = (void*)(route_params & (~1)); - route_params_conv.is_owned = false; + route_params_conv.inner = untag_ptr(route_params); + route_params_conv.is_owned = ptr_is_owned(route_params); CHECK_INNER_FIELD_ACCESS_OR_NULL(route_params_conv); + route_params_conv.is_owned = false; LDKNetworkGraph network_graph_conv; - network_graph_conv.inner = (void*)(network_graph & (~1)); - network_graph_conv.is_owned = false; + network_graph_conv.inner = untag_ptr(network_graph); + network_graph_conv.is_owned = ptr_is_owned(network_graph); CHECK_INNER_FIELD_ACCESS_OR_NULL(network_graph_conv); - void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); + network_graph_conv.is_owned = false; + void* logger_ptr = untag_ptr(logger); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); if (logger_conv.free == LDKLogger_JCalls_free) { @@ -42832,40 +40988,41 @@ uint32_t __attribute__((export_name("TS_build_route_from_hops"))) TS_build_rout unsigned char (*random_seed_bytes_ref)[32] = &random_seed_bytes_arr; LDKCResult_RouteLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteLightningErrorZ), "LDKCResult_RouteLightningErrorZ"); *ret_conv = build_route_from_hops(our_node_pubkey_ref, hops_constr, &route_params_conv, &network_graph_conv, logger_conv, random_seed_bytes_ref); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_Score_free"))) TS_Score_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKScore this_ptr_conv = *(LDKScore*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); Score_free(this_ptr_conv); } -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*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_LockableScore_free"))) TS_LockableScore_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKLockableScore this_ptr_conv = *(LDKLockableScore*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); LockableScore_free(this_ptr_conv); } -void __attribute__((export_name("TS_MultiThreadedLockableScore_free"))) TS_MultiThreadedLockableScore_free(uint32_t this_obj) { +void __attribute__((export_name("TS_MultiThreadedLockableScore_free"))) TS_MultiThreadedLockableScore_free(uint64_t this_obj) { LDKMultiThreadedLockableScore this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); MultiThreadedLockableScore_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_MultiThreadedLockableScore_write"))) TS_MultiThreadedLockableScore_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_MultiThreadedLockableScore_write"))) TS_MultiThreadedLockableScore_write(uint64_t obj) { LDKMultiThreadedLockableScore obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = MultiThreadedLockableScore_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -42873,8 +41030,8 @@ int8_tArray __attribute__((export_name("TS_MultiThreadedLockableScore_write"))) return ret_arr; } -uint32_t __attribute__((export_name("TS_MultiThreadedLockableScore_new"))) TS_MultiThreadedLockableScore_new(uint32_t score) { - void* score_ptr = (void*)(((uintptr_t)score) & ~1); +uint64_t __attribute__((export_name("TS_MultiThreadedLockableScore_new"))) TS_MultiThreadedLockableScore_new(uint64_t score) { + void* score_ptr = untag_ptr(score); CHECK_ACCESS(score_ptr); LDKScore score_conv = *(LDKScore*)(score_ptr); if (score_conv.free == LDKScore_JCalls_free) { @@ -42882,211 +41039,188 @@ uint32_t __attribute__((export_name("TS_MultiThreadedLockableScore_new"))) TS_M LDKScore_JCalls_cloned(&score_conv); } LDKMultiThreadedLockableScore ret_var = MultiThreadedLockableScore_new(score_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ChannelUsage_free"))) TS_ChannelUsage_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ChannelUsage_free"))) TS_ChannelUsage_free(uint64_t this_obj) { LDKChannelUsage this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ChannelUsage_free(this_obj_conv); } -int64_t __attribute__((export_name("TS_ChannelUsage_get_amount_msat"))) TS_ChannelUsage_get_amount_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelUsage_get_amount_msat"))) TS_ChannelUsage_get_amount_msat(uint64_t this_ptr) { LDKChannelUsage this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelUsage_get_amount_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelUsage_set_amount_msat"))) TS_ChannelUsage_set_amount_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelUsage_set_amount_msat"))) TS_ChannelUsage_set_amount_msat(uint64_t this_ptr, int64_t val) { LDKChannelUsage this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelUsage_set_amount_msat(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ChannelUsage_get_inflight_htlc_msat"))) TS_ChannelUsage_get_inflight_htlc_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelUsage_get_inflight_htlc_msat"))) TS_ChannelUsage_get_inflight_htlc_msat(uint64_t this_ptr) { LDKChannelUsage this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ChannelUsage_get_inflight_htlc_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ChannelUsage_set_inflight_htlc_msat"))) TS_ChannelUsage_set_inflight_htlc_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ChannelUsage_set_inflight_htlc_msat"))) TS_ChannelUsage_set_inflight_htlc_msat(uint64_t this_ptr, int64_t val) { LDKChannelUsage this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ChannelUsage_set_inflight_htlc_msat(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_ChannelUsage_get_effective_capacity"))) TS_ChannelUsage_get_effective_capacity(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_ChannelUsage_get_effective_capacity"))) TS_ChannelUsage_get_effective_capacity(uint64_t this_ptr) { LDKChannelUsage this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKEffectiveCapacity *ret_copy = MALLOC(sizeof(LDKEffectiveCapacity), "LDKEffectiveCapacity"); *ret_copy = ChannelUsage_get_effective_capacity(&this_ptr_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_ChannelUsage_set_effective_capacity"))) TS_ChannelUsage_set_effective_capacity(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelUsage_set_effective_capacity"))) TS_ChannelUsage_set_effective_capacity(uint64_t this_ptr, uint64_t val) { LDKChannelUsage this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); + this_ptr_conv.is_owned = false; + void* val_ptr = untag_ptr(val); CHECK_ACCESS(val_ptr); LDKEffectiveCapacity val_conv = *(LDKEffectiveCapacity*)(val_ptr); - val_conv = EffectiveCapacity_clone((LDKEffectiveCapacity*)(((uintptr_t)val) & ~1)); + val_conv = EffectiveCapacity_clone((LDKEffectiveCapacity*)untag_ptr(val)); ChannelUsage_set_effective_capacity(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelUsage_new"))) TS_ChannelUsage_new(int64_t amount_msat_arg, int64_t inflight_htlc_msat_arg, uint32_t effective_capacity_arg) { - void* effective_capacity_arg_ptr = (void*)(((uintptr_t)effective_capacity_arg) & ~1); +uint64_t __attribute__((export_name("TS_ChannelUsage_new"))) TS_ChannelUsage_new(int64_t amount_msat_arg, int64_t inflight_htlc_msat_arg, uint64_t effective_capacity_arg) { + void* effective_capacity_arg_ptr = untag_ptr(effective_capacity_arg); CHECK_ACCESS(effective_capacity_arg_ptr); LDKEffectiveCapacity effective_capacity_arg_conv = *(LDKEffectiveCapacity*)(effective_capacity_arg_ptr); - effective_capacity_arg_conv = EffectiveCapacity_clone((LDKEffectiveCapacity*)(((uintptr_t)effective_capacity_arg) & ~1)); + effective_capacity_arg_conv = EffectiveCapacity_clone((LDKEffectiveCapacity*)untag_ptr(effective_capacity_arg)); LDKChannelUsage ret_var = ChannelUsage_new(amount_msat_arg, inflight_htlc_msat_arg, effective_capacity_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t ChannelUsage_clone_ptr(LDKChannelUsage *NONNULL_PTR arg) { +static inline uint64_t ChannelUsage_clone_ptr(LDKChannelUsage *NONNULL_PTR arg) { LDKChannelUsage ret_var = ChannelUsage_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ChannelUsage_clone_ptr"))) TS_ChannelUsage_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ChannelUsage_clone_ptr"))) TS_ChannelUsage_clone_ptr(uint64_t arg) { LDKChannelUsage arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ChannelUsage_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ChannelUsage_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelUsage_clone"))) TS_ChannelUsage_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ChannelUsage_clone"))) TS_ChannelUsage_clone(uint64_t orig) { LDKChannelUsage orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKChannelUsage ret_var = ChannelUsage_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_FixedPenaltyScorer_free"))) TS_FixedPenaltyScorer_free(uint32_t this_obj) { +void __attribute__((export_name("TS_FixedPenaltyScorer_free"))) TS_FixedPenaltyScorer_free(uint64_t this_obj) { LDKFixedPenaltyScorer this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); FixedPenaltyScorer_free(this_obj_conv); } -static inline uintptr_t FixedPenaltyScorer_clone_ptr(LDKFixedPenaltyScorer *NONNULL_PTR arg) { +static inline uint64_t FixedPenaltyScorer_clone_ptr(LDKFixedPenaltyScorer *NONNULL_PTR arg) { LDKFixedPenaltyScorer ret_var = FixedPenaltyScorer_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_FixedPenaltyScorer_clone_ptr"))) TS_FixedPenaltyScorer_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_FixedPenaltyScorer_clone_ptr"))) TS_FixedPenaltyScorer_clone_ptr(uint64_t arg) { LDKFixedPenaltyScorer arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = FixedPenaltyScorer_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = FixedPenaltyScorer_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_FixedPenaltyScorer_clone"))) TS_FixedPenaltyScorer_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_FixedPenaltyScorer_clone"))) TS_FixedPenaltyScorer_clone(uint64_t orig) { LDKFixedPenaltyScorer orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKFixedPenaltyScorer ret_var = FixedPenaltyScorer_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_FixedPenaltyScorer_with_penalty"))) TS_FixedPenaltyScorer_with_penalty(int64_t penalty_msat) { +uint64_t __attribute__((export_name("TS_FixedPenaltyScorer_with_penalty"))) TS_FixedPenaltyScorer_with_penalty(int64_t penalty_msat) { LDKFixedPenaltyScorer ret_var = FixedPenaltyScorer_with_penalty(penalty_msat); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_FixedPenaltyScorer_as_Score"))) TS_FixedPenaltyScorer_as_Score(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_FixedPenaltyScorer_as_Score"))) TS_FixedPenaltyScorer_as_Score(uint64_t this_arg) { LDKFixedPenaltyScorer this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKScore* ret_ret = MALLOC(sizeof(LDKScore), "LDKScore"); *ret_ret = FixedPenaltyScorer_as_Score(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -int8_tArray __attribute__((export_name("TS_FixedPenaltyScorer_write"))) TS_FixedPenaltyScorer_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_FixedPenaltyScorer_write"))) TS_FixedPenaltyScorer_write(uint64_t obj) { LDKFixedPenaltyScorer obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = FixedPenaltyScorer_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -43094,200 +41228,207 @@ int8_tArray __attribute__((export_name("TS_FixedPenaltyScorer_write"))) TS_Fixe return ret_arr; } -uint32_t __attribute__((export_name("TS_FixedPenaltyScorer_read"))) TS_FixedPenaltyScorer_read(int8_tArray ser, int64_t arg) { +uint64_t __attribute__((export_name("TS_FixedPenaltyScorer_read"))) TS_FixedPenaltyScorer_read(int8_tArray ser, int64_t arg) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; ser_ref.data = ser->elems; LDKCResult_FixedPenaltyScorerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FixedPenaltyScorerDecodeErrorZ), "LDKCResult_FixedPenaltyScorerDecodeErrorZ"); *ret_conv = FixedPenaltyScorer_read(ser_ref, arg); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_ProbabilisticScorer_free"))) TS_ProbabilisticScorer_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ProbabilisticScorer_free"))) TS_ProbabilisticScorer_free(uint64_t this_obj) { LDKProbabilisticScorer this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ProbabilisticScorer_free(this_obj_conv); } -void __attribute__((export_name("TS_ProbabilisticScoringParameters_free"))) TS_ProbabilisticScoringParameters_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ProbabilisticScoringParameters_free"))) TS_ProbabilisticScoringParameters_free(uint64_t this_obj) { LDKProbabilisticScoringParameters this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ProbabilisticScoringParameters_free(this_obj_conv); } -int64_t __attribute__((export_name("TS_ProbabilisticScoringParameters_get_base_penalty_msat"))) TS_ProbabilisticScoringParameters_get_base_penalty_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ProbabilisticScoringParameters_get_base_penalty_msat"))) TS_ProbabilisticScoringParameters_get_base_penalty_msat(uint64_t this_ptr) { LDKProbabilisticScoringParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ProbabilisticScoringParameters_get_base_penalty_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ProbabilisticScoringParameters_set_base_penalty_msat"))) TS_ProbabilisticScoringParameters_set_base_penalty_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ProbabilisticScoringParameters_set_base_penalty_msat"))) TS_ProbabilisticScoringParameters_set_base_penalty_msat(uint64_t this_ptr, int64_t val) { LDKProbabilisticScoringParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ProbabilisticScoringParameters_set_base_penalty_msat(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ProbabilisticScoringParameters_get_base_penalty_amount_multiplier_msat"))) TS_ProbabilisticScoringParameters_get_base_penalty_amount_multiplier_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ProbabilisticScoringParameters_get_base_penalty_amount_multiplier_msat"))) TS_ProbabilisticScoringParameters_get_base_penalty_amount_multiplier_msat(uint64_t this_ptr) { LDKProbabilisticScoringParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ProbabilisticScoringParameters_get_base_penalty_amount_multiplier_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ProbabilisticScoringParameters_set_base_penalty_amount_multiplier_msat"))) TS_ProbabilisticScoringParameters_set_base_penalty_amount_multiplier_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ProbabilisticScoringParameters_set_base_penalty_amount_multiplier_msat"))) TS_ProbabilisticScoringParameters_set_base_penalty_amount_multiplier_msat(uint64_t this_ptr, int64_t val) { LDKProbabilisticScoringParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ProbabilisticScoringParameters_set_base_penalty_amount_multiplier_msat(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ProbabilisticScoringParameters_get_liquidity_penalty_multiplier_msat"))) TS_ProbabilisticScoringParameters_get_liquidity_penalty_multiplier_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ProbabilisticScoringParameters_get_liquidity_penalty_multiplier_msat"))) TS_ProbabilisticScoringParameters_get_liquidity_penalty_multiplier_msat(uint64_t this_ptr) { LDKProbabilisticScoringParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ProbabilisticScoringParameters_get_liquidity_penalty_multiplier_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ProbabilisticScoringParameters_set_liquidity_penalty_multiplier_msat"))) TS_ProbabilisticScoringParameters_set_liquidity_penalty_multiplier_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ProbabilisticScoringParameters_set_liquidity_penalty_multiplier_msat"))) TS_ProbabilisticScoringParameters_set_liquidity_penalty_multiplier_msat(uint64_t this_ptr, int64_t val) { LDKProbabilisticScoringParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ProbabilisticScoringParameters_set_liquidity_penalty_multiplier_msat(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ProbabilisticScoringParameters_get_liquidity_offset_half_life"))) TS_ProbabilisticScoringParameters_get_liquidity_offset_half_life(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ProbabilisticScoringParameters_get_liquidity_offset_half_life"))) TS_ProbabilisticScoringParameters_get_liquidity_offset_half_life(uint64_t this_ptr) { LDKProbabilisticScoringParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ProbabilisticScoringParameters_get_liquidity_offset_half_life(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ProbabilisticScoringParameters_set_liquidity_offset_half_life"))) TS_ProbabilisticScoringParameters_set_liquidity_offset_half_life(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ProbabilisticScoringParameters_set_liquidity_offset_half_life"))) TS_ProbabilisticScoringParameters_set_liquidity_offset_half_life(uint64_t this_ptr, int64_t val) { LDKProbabilisticScoringParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ProbabilisticScoringParameters_set_liquidity_offset_half_life(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ProbabilisticScoringParameters_get_liquidity_penalty_amount_multiplier_msat"))) TS_ProbabilisticScoringParameters_get_liquidity_penalty_amount_multiplier_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ProbabilisticScoringParameters_get_liquidity_penalty_amount_multiplier_msat"))) TS_ProbabilisticScoringParameters_get_liquidity_penalty_amount_multiplier_msat(uint64_t this_ptr) { LDKProbabilisticScoringParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ProbabilisticScoringParameters_get_liquidity_penalty_amount_multiplier_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ProbabilisticScoringParameters_set_liquidity_penalty_amount_multiplier_msat"))) TS_ProbabilisticScoringParameters_set_liquidity_penalty_amount_multiplier_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ProbabilisticScoringParameters_set_liquidity_penalty_amount_multiplier_msat"))) TS_ProbabilisticScoringParameters_set_liquidity_penalty_amount_multiplier_msat(uint64_t this_ptr, int64_t val) { LDKProbabilisticScoringParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ProbabilisticScoringParameters_set_liquidity_penalty_amount_multiplier_msat(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ProbabilisticScoringParameters_get_anti_probing_penalty_msat"))) TS_ProbabilisticScoringParameters_get_anti_probing_penalty_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ProbabilisticScoringParameters_get_anti_probing_penalty_msat"))) TS_ProbabilisticScoringParameters_get_anti_probing_penalty_msat(uint64_t this_ptr) { LDKProbabilisticScoringParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ProbabilisticScoringParameters_get_anti_probing_penalty_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ProbabilisticScoringParameters_set_anti_probing_penalty_msat"))) TS_ProbabilisticScoringParameters_set_anti_probing_penalty_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ProbabilisticScoringParameters_set_anti_probing_penalty_msat"))) TS_ProbabilisticScoringParameters_set_anti_probing_penalty_msat(uint64_t this_ptr, int64_t val) { LDKProbabilisticScoringParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ProbabilisticScoringParameters_set_anti_probing_penalty_msat(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ProbabilisticScoringParameters_get_considered_impossible_penalty_msat"))) TS_ProbabilisticScoringParameters_get_considered_impossible_penalty_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ProbabilisticScoringParameters_get_considered_impossible_penalty_msat"))) TS_ProbabilisticScoringParameters_get_considered_impossible_penalty_msat(uint64_t this_ptr) { LDKProbabilisticScoringParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = ProbabilisticScoringParameters_get_considered_impossible_penalty_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ProbabilisticScoringParameters_set_considered_impossible_penalty_msat"))) TS_ProbabilisticScoringParameters_set_considered_impossible_penalty_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ProbabilisticScoringParameters_set_considered_impossible_penalty_msat"))) TS_ProbabilisticScoringParameters_set_considered_impossible_penalty_msat(uint64_t this_ptr, int64_t val) { LDKProbabilisticScoringParameters this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; ProbabilisticScoringParameters_set_considered_impossible_penalty_msat(&this_ptr_conv, val); } -static inline uintptr_t ProbabilisticScoringParameters_clone_ptr(LDKProbabilisticScoringParameters *NONNULL_PTR arg) { +static inline uint64_t ProbabilisticScoringParameters_clone_ptr(LDKProbabilisticScoringParameters *NONNULL_PTR arg) { LDKProbabilisticScoringParameters ret_var = ProbabilisticScoringParameters_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ProbabilisticScoringParameters_clone_ptr"))) TS_ProbabilisticScoringParameters_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ProbabilisticScoringParameters_clone_ptr"))) TS_ProbabilisticScoringParameters_clone_ptr(uint64_t arg) { LDKProbabilisticScoringParameters arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ProbabilisticScoringParameters_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ProbabilisticScoringParameters_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ProbabilisticScoringParameters_clone"))) TS_ProbabilisticScoringParameters_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ProbabilisticScoringParameters_clone"))) TS_ProbabilisticScoringParameters_clone(uint64_t orig) { LDKProbabilisticScoringParameters orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKProbabilisticScoringParameters ret_var = ProbabilisticScoringParameters_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ProbabilisticScorer_new"))) TS_ProbabilisticScorer_new(uint32_t params, uint32_t network_graph, uint32_t logger) { +uint64_t __attribute__((export_name("TS_ProbabilisticScorer_new"))) TS_ProbabilisticScorer_new(uint64_t params, uint64_t network_graph, uint64_t logger) { LDKProbabilisticScoringParameters params_conv; - params_conv.inner = (void*)(params & (~1)); - params_conv.is_owned = (params & 1) || (params == 0); + params_conv.inner = untag_ptr(params); + params_conv.is_owned = ptr_is_owned(params); CHECK_INNER_FIELD_ACCESS_OR_NULL(params_conv); params_conv = ProbabilisticScoringParameters_clone(¶ms_conv); LDKNetworkGraph network_graph_conv; - network_graph_conv.inner = (void*)(network_graph & (~1)); - network_graph_conv.is_owned = false; + network_graph_conv.inner = untag_ptr(network_graph); + network_graph_conv.is_owned = ptr_is_owned(network_graph); CHECK_INNER_FIELD_ACCESS_OR_NULL(network_graph_conv); - void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); + network_graph_conv.is_owned = false; + void* logger_ptr = untag_ptr(logger); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); if (logger_conv.free == LDKLogger_JCalls_free) { @@ -43295,113 +41436,121 @@ uint32_t __attribute__((export_name("TS_ProbabilisticScorer_new"))) TS_Probabil LDKLogger_JCalls_cloned(&logger_conv); } LDKProbabilisticScorer ret_var = ProbabilisticScorer_new(params_conv, &network_graph_conv, logger_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_ProbabilisticScorer_debug_log_liquidity_stats"))) TS_ProbabilisticScorer_debug_log_liquidity_stats(uint32_t this_arg) { +void __attribute__((export_name("TS_ProbabilisticScorer_debug_log_liquidity_stats"))) TS_ProbabilisticScorer_debug_log_liquidity_stats(uint64_t this_arg) { LDKProbabilisticScorer this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; ProbabilisticScorer_debug_log_liquidity_stats(&this_arg_conv); } -uint32_t __attribute__((export_name("TS_ProbabilisticScorer_estimated_channel_liquidity_range"))) TS_ProbabilisticScorer_estimated_channel_liquidity_range(uint32_t this_arg, int64_t scid, uint32_t target) { +uint64_t __attribute__((export_name("TS_ProbabilisticScorer_estimated_channel_liquidity_range"))) TS_ProbabilisticScorer_estimated_channel_liquidity_range(uint64_t this_arg, int64_t scid, uint64_t target) { LDKProbabilisticScorer this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKNodeId target_conv; - target_conv.inner = (void*)(target & (~1)); - target_conv.is_owned = false; + target_conv.inner = untag_ptr(target); + target_conv.is_owned = ptr_is_owned(target); CHECK_INNER_FIELD_ACCESS_OR_NULL(target_conv); + target_conv.is_owned = false; LDKCOption_C2Tuple_u64u64ZZ *ret_copy = MALLOC(sizeof(LDKCOption_C2Tuple_u64u64ZZ), "LDKCOption_C2Tuple_u64u64ZZ"); *ret_copy = ProbabilisticScorer_estimated_channel_liquidity_range(&this_arg_conv, scid, &target_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_ProbabilisticScorer_add_banned"))) TS_ProbabilisticScorer_add_banned(uint32_t this_arg, uint32_t node_id) { +void __attribute__((export_name("TS_ProbabilisticScorer_add_banned"))) TS_ProbabilisticScorer_add_banned(uint64_t this_arg, uint64_t node_id) { LDKProbabilisticScorer this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKNodeId node_id_conv; - node_id_conv.inner = (void*)(node_id & (~1)); - node_id_conv.is_owned = false; + node_id_conv.inner = untag_ptr(node_id); + node_id_conv.is_owned = ptr_is_owned(node_id); CHECK_INNER_FIELD_ACCESS_OR_NULL(node_id_conv); + node_id_conv.is_owned = false; ProbabilisticScorer_add_banned(&this_arg_conv, &node_id_conv); } -void __attribute__((export_name("TS_ProbabilisticScorer_remove_banned"))) TS_ProbabilisticScorer_remove_banned(uint32_t this_arg, uint32_t node_id) { +void __attribute__((export_name("TS_ProbabilisticScorer_remove_banned"))) TS_ProbabilisticScorer_remove_banned(uint64_t this_arg, uint64_t node_id) { LDKProbabilisticScorer this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKNodeId node_id_conv; - node_id_conv.inner = (void*)(node_id & (~1)); - node_id_conv.is_owned = false; + node_id_conv.inner = untag_ptr(node_id); + node_id_conv.is_owned = ptr_is_owned(node_id); CHECK_INNER_FIELD_ACCESS_OR_NULL(node_id_conv); + node_id_conv.is_owned = false; ProbabilisticScorer_remove_banned(&this_arg_conv, &node_id_conv); } -void __attribute__((export_name("TS_ProbabilisticScorer_set_manual_penalty"))) TS_ProbabilisticScorer_set_manual_penalty(uint32_t this_arg, uint32_t node_id, int64_t penalty) { +void __attribute__((export_name("TS_ProbabilisticScorer_set_manual_penalty"))) TS_ProbabilisticScorer_set_manual_penalty(uint64_t this_arg, uint64_t node_id, int64_t penalty) { LDKProbabilisticScorer this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKNodeId node_id_conv; - node_id_conv.inner = (void*)(node_id & (~1)); - node_id_conv.is_owned = false; + node_id_conv.inner = untag_ptr(node_id); + node_id_conv.is_owned = ptr_is_owned(node_id); CHECK_INNER_FIELD_ACCESS_OR_NULL(node_id_conv); + node_id_conv.is_owned = false; ProbabilisticScorer_set_manual_penalty(&this_arg_conv, &node_id_conv, penalty); } -void __attribute__((export_name("TS_ProbabilisticScorer_remove_manual_penalty"))) TS_ProbabilisticScorer_remove_manual_penalty(uint32_t this_arg, uint32_t node_id) { +void __attribute__((export_name("TS_ProbabilisticScorer_remove_manual_penalty"))) TS_ProbabilisticScorer_remove_manual_penalty(uint64_t this_arg, uint64_t node_id) { LDKProbabilisticScorer this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKNodeId node_id_conv; - node_id_conv.inner = (void*)(node_id & (~1)); - node_id_conv.is_owned = false; + node_id_conv.inner = untag_ptr(node_id); + node_id_conv.is_owned = ptr_is_owned(node_id); CHECK_INNER_FIELD_ACCESS_OR_NULL(node_id_conv); + node_id_conv.is_owned = false; ProbabilisticScorer_remove_manual_penalty(&this_arg_conv, &node_id_conv); } -void __attribute__((export_name("TS_ProbabilisticScorer_clear_manual_penalties"))) TS_ProbabilisticScorer_clear_manual_penalties(uint32_t this_arg) { +void __attribute__((export_name("TS_ProbabilisticScorer_clear_manual_penalties"))) TS_ProbabilisticScorer_clear_manual_penalties(uint64_t this_arg) { LDKProbabilisticScorer this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; ProbabilisticScorer_clear_manual_penalties(&this_arg_conv); } -void __attribute__((export_name("TS_ProbabilisticScoringParameters_add_banned_from_list"))) TS_ProbabilisticScoringParameters_add_banned_from_list(uint32_t this_arg, uint32_tArray node_ids) { +void __attribute__((export_name("TS_ProbabilisticScoringParameters_add_banned_from_list"))) TS_ProbabilisticScoringParameters_add_banned_from_list(uint64_t this_arg, uint64_tArray node_ids) { LDKProbabilisticScoringParameters this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCVec_NodeIdZ node_ids_constr; node_ids_constr.datalen = node_ids->arr_len; if (node_ids_constr.datalen > 0) node_ids_constr.data = MALLOC(node_ids_constr.datalen * sizeof(LDKNodeId), "LDKCVec_NodeIdZ Elements"); else node_ids_constr.data = NULL; - uint32_t* node_ids_vals = node_ids->elems; + uint64_t* node_ids_vals = node_ids->elems; for (size_t i = 0; i < node_ids_constr.datalen; i++) { - uint32_t node_ids_conv_8 = node_ids_vals[i]; + uint64_t node_ids_conv_8 = node_ids_vals[i]; LDKNodeId node_ids_conv_8_conv; - node_ids_conv_8_conv.inner = (void*)(node_ids_conv_8 & (~1)); - node_ids_conv_8_conv.is_owned = (node_ids_conv_8 & 1) || (node_ids_conv_8 == 0); + node_ids_conv_8_conv.inner = untag_ptr(node_ids_conv_8); + node_ids_conv_8_conv.is_owned = ptr_is_owned(node_ids_conv_8); CHECK_INNER_FIELD_ACCESS_OR_NULL(node_ids_conv_8_conv); node_ids_conv_8_conv = NodeId_clone(&node_ids_conv_8_conv); node_ids_constr.data[i] = node_ids_conv_8_conv; @@ -43410,34 +41559,31 @@ void __attribute__((export_name("TS_ProbabilisticScoringParameters_add_banned_f ProbabilisticScoringParameters_add_banned_from_list(&this_arg_conv, node_ids_constr); } -uint32_t __attribute__((export_name("TS_ProbabilisticScoringParameters_default"))) TS_ProbabilisticScoringParameters_default() { +uint64_t __attribute__((export_name("TS_ProbabilisticScoringParameters_default"))) TS_ProbabilisticScoringParameters_default() { LDKProbabilisticScoringParameters ret_var = ProbabilisticScoringParameters_default(); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ProbabilisticScorer_as_Score"))) TS_ProbabilisticScorer_as_Score(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ProbabilisticScorer_as_Score"))) TS_ProbabilisticScorer_as_Score(uint64_t this_arg) { LDKProbabilisticScorer this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKScore* ret_ret = MALLOC(sizeof(LDKScore), "LDKScore"); *ret_ret = ProbabilisticScorer_as_Score(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -int8_tArray __attribute__((export_name("TS_ProbabilisticScorer_write"))) TS_ProbabilisticScorer_write(uint32_t obj) { +int8_tArray __attribute__((export_name("TS_ProbabilisticScorer_write"))) TS_ProbabilisticScorer_write(uint64_t obj) { LDKProbabilisticScorer obj_conv; - obj_conv.inner = (void*)(obj & (~1)); - obj_conv.is_owned = false; + obj_conv.inner = untag_ptr(obj); + obj_conv.is_owned = ptr_is_owned(obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + obj_conv.is_owned = false; LDKCVec_u8Z ret_var = ProbabilisticScorer_write(&obj_conv); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); @@ -43445,20 +41591,21 @@ int8_tArray __attribute__((export_name("TS_ProbabilisticScorer_write"))) TS_Pro return ret_arr; } -uint32_t __attribute__((export_name("TS_ProbabilisticScorer_read"))) TS_ProbabilisticScorer_read(int8_tArray ser, uint32_t arg_a, uint32_t arg_b, uint32_t arg_c) { +uint64_t __attribute__((export_name("TS_ProbabilisticScorer_read"))) TS_ProbabilisticScorer_read(int8_tArray ser, uint64_t arg_a, uint64_t arg_b, uint64_t arg_c) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; ser_ref.data = ser->elems; LDKProbabilisticScoringParameters arg_a_conv; - arg_a_conv.inner = (void*)(arg_a & (~1)); - arg_a_conv.is_owned = (arg_a & 1) || (arg_a == 0); + arg_a_conv.inner = untag_ptr(arg_a); + arg_a_conv.is_owned = ptr_is_owned(arg_a); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_a_conv); arg_a_conv = ProbabilisticScoringParameters_clone(&arg_a_conv); LDKNetworkGraph arg_b_conv; - arg_b_conv.inner = (void*)(arg_b & (~1)); - arg_b_conv.is_owned = false; + arg_b_conv.inner = untag_ptr(arg_b); + arg_b_conv.is_owned = ptr_is_owned(arg_b); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_b_conv); - void* arg_c_ptr = (void*)(((uintptr_t)arg_c) & ~1); + arg_b_conv.is_owned = false; + void* arg_c_ptr = untag_ptr(arg_c); CHECK_ACCESS(arg_c_ptr); LDKLogger arg_c_conv = *(LDKLogger*)(arg_c_ptr); if (arg_c_conv.free == LDKLogger_JCalls_free) { @@ -43468,577 +41615,541 @@ uint32_t __attribute__((export_name("TS_ProbabilisticScorer_read"))) TS_Probabi LDKCResult_ProbabilisticScorerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ProbabilisticScorerDecodeErrorZ), "LDKCResult_ProbabilisticScorerDecodeErrorZ"); *ret_conv = ProbabilisticScorer_read(ser_ref, arg_a_conv, &arg_b_conv, arg_c_conv); FREE(ser); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_ParseError_free"))) TS_ParseError_free(uint32_t this_ptr) { - if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_ParseError_free"))) TS_ParseError_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKParseError this_ptr_conv = *(LDKParseError*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); ParseError_free(this_ptr_conv); } -static inline uintptr_t ParseError_clone_ptr(LDKParseError *NONNULL_PTR arg) { +static inline uint64_t ParseError_clone_ptr(LDKParseError *NONNULL_PTR arg) { LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = ParseError_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseError_clone_ptr"))) TS_ParseError_clone_ptr(uint32_t arg) { - LDKParseError* arg_conv = (LDKParseError*)arg; - uint32_t ret_conv = ParseError_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_ParseError_clone_ptr"))) TS_ParseError_clone_ptr(uint64_t arg) { + LDKParseError* arg_conv = (LDKParseError*)untag_ptr(arg); + int64_t ret_conv = ParseError_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ParseError_clone"))) TS_ParseError_clone(uint32_t orig) { - LDKParseError* orig_conv = (LDKParseError*)orig; +uint64_t __attribute__((export_name("TS_ParseError_clone"))) TS_ParseError_clone(uint64_t orig) { + LDKParseError* orig_conv = (LDKParseError*)untag_ptr(orig); LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = ParseError_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseError_bech32_error"))) TS_ParseError_bech32_error(uint32_t a) { - void* a_ptr = (void*)(((uintptr_t)a) & ~1); +uint64_t __attribute__((export_name("TS_ParseError_bech32_error"))) TS_ParseError_bech32_error(uint64_t a) { + void* a_ptr = untag_ptr(a); CHECK_ACCESS(a_ptr); LDKBech32Error a_conv = *(LDKBech32Error*)(a_ptr); - a_conv = Bech32Error_clone((LDKBech32Error*)(((uintptr_t)a) & ~1)); + a_conv = Bech32Error_clone((LDKBech32Error*)untag_ptr(a)); LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = ParseError_bech32_error(a_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseError_parse_amount_error"))) TS_ParseError_parse_amount_error(int32_t a) { +uint64_t __attribute__((export_name("TS_ParseError_parse_amount_error"))) TS_ParseError_parse_amount_error(int32_t a) { LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = ParseError_parse_amount_error((LDKError){ ._dummy = 0 }); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseError_malformed_signature"))) TS_ParseError_malformed_signature(uint32_t a) { +uint64_t __attribute__((export_name("TS_ParseError_malformed_signature"))) TS_ParseError_malformed_signature(uint32_t a) { LDKSecp256k1Error a_conv = LDKSecp256k1Error_from_js(a); LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = ParseError_malformed_signature(a_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseError_bad_prefix"))) TS_ParseError_bad_prefix() { +uint64_t __attribute__((export_name("TS_ParseError_bad_prefix"))) TS_ParseError_bad_prefix() { LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = ParseError_bad_prefix(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseError_unknown_currency"))) TS_ParseError_unknown_currency() { +uint64_t __attribute__((export_name("TS_ParseError_unknown_currency"))) TS_ParseError_unknown_currency() { LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = ParseError_unknown_currency(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseError_unknown_si_prefix"))) TS_ParseError_unknown_si_prefix() { +uint64_t __attribute__((export_name("TS_ParseError_unknown_si_prefix"))) TS_ParseError_unknown_si_prefix() { LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = ParseError_unknown_si_prefix(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseError_malformed_hrp"))) TS_ParseError_malformed_hrp() { +uint64_t __attribute__((export_name("TS_ParseError_malformed_hrp"))) TS_ParseError_malformed_hrp() { LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = ParseError_malformed_hrp(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseError_too_short_data_part"))) TS_ParseError_too_short_data_part() { +uint64_t __attribute__((export_name("TS_ParseError_too_short_data_part"))) TS_ParseError_too_short_data_part() { LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = ParseError_too_short_data_part(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseError_unexpected_end_of_tagged_fields"))) TS_ParseError_unexpected_end_of_tagged_fields() { +uint64_t __attribute__((export_name("TS_ParseError_unexpected_end_of_tagged_fields"))) TS_ParseError_unexpected_end_of_tagged_fields() { LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = ParseError_unexpected_end_of_tagged_fields(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseError_description_decode_error"))) TS_ParseError_description_decode_error(int32_t a) { +uint64_t __attribute__((export_name("TS_ParseError_description_decode_error"))) TS_ParseError_description_decode_error(int32_t a) { LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = ParseError_description_decode_error((LDKError){ ._dummy = 0 }); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseError_padding_error"))) TS_ParseError_padding_error() { +uint64_t __attribute__((export_name("TS_ParseError_padding_error"))) TS_ParseError_padding_error() { LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = ParseError_padding_error(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseError_integer_overflow_error"))) TS_ParseError_integer_overflow_error() { +uint64_t __attribute__((export_name("TS_ParseError_integer_overflow_error"))) TS_ParseError_integer_overflow_error() { LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = ParseError_integer_overflow_error(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseError_invalid_seg_wit_program_length"))) TS_ParseError_invalid_seg_wit_program_length() { +uint64_t __attribute__((export_name("TS_ParseError_invalid_seg_wit_program_length"))) TS_ParseError_invalid_seg_wit_program_length() { LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = ParseError_invalid_seg_wit_program_length(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseError_invalid_pub_key_hash_length"))) TS_ParseError_invalid_pub_key_hash_length() { +uint64_t __attribute__((export_name("TS_ParseError_invalid_pub_key_hash_length"))) TS_ParseError_invalid_pub_key_hash_length() { LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = ParseError_invalid_pub_key_hash_length(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseError_invalid_script_hash_length"))) TS_ParseError_invalid_script_hash_length() { +uint64_t __attribute__((export_name("TS_ParseError_invalid_script_hash_length"))) TS_ParseError_invalid_script_hash_length() { LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = ParseError_invalid_script_hash_length(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseError_invalid_recovery_id"))) TS_ParseError_invalid_recovery_id() { +uint64_t __attribute__((export_name("TS_ParseError_invalid_recovery_id"))) TS_ParseError_invalid_recovery_id() { LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = ParseError_invalid_recovery_id(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseError_invalid_slice_length"))) TS_ParseError_invalid_slice_length(jstring a) { +uint64_t __attribute__((export_name("TS_ParseError_invalid_slice_length"))) TS_ParseError_invalid_slice_length(jstring a) { LDKStr a_conv = str_ref_to_owned_c(a); LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = ParseError_invalid_slice_length(a_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseError_skip"))) TS_ParseError_skip() { +uint64_t __attribute__((export_name("TS_ParseError_skip"))) TS_ParseError_skip() { LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError"); *ret_copy = ParseError_skip(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_ParseOrSemanticError_free"))) TS_ParseOrSemanticError_free(uint32_t this_ptr) { - if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_ParseOrSemanticError_free"))) TS_ParseOrSemanticError_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKParseOrSemanticError this_ptr_conv = *(LDKParseOrSemanticError*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); ParseOrSemanticError_free(this_ptr_conv); } -static inline uintptr_t ParseOrSemanticError_clone_ptr(LDKParseOrSemanticError *NONNULL_PTR arg) { +static inline uint64_t ParseOrSemanticError_clone_ptr(LDKParseOrSemanticError *NONNULL_PTR arg) { LDKParseOrSemanticError *ret_copy = MALLOC(sizeof(LDKParseOrSemanticError), "LDKParseOrSemanticError"); *ret_copy = ParseOrSemanticError_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseOrSemanticError_clone_ptr"))) TS_ParseOrSemanticError_clone_ptr(uint32_t arg) { - LDKParseOrSemanticError* arg_conv = (LDKParseOrSemanticError*)arg; - uint32_t ret_conv = ParseOrSemanticError_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_ParseOrSemanticError_clone_ptr"))) TS_ParseOrSemanticError_clone_ptr(uint64_t arg) { + LDKParseOrSemanticError* arg_conv = (LDKParseOrSemanticError*)untag_ptr(arg); + int64_t ret_conv = ParseOrSemanticError_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ParseOrSemanticError_clone"))) TS_ParseOrSemanticError_clone(uint32_t orig) { - LDKParseOrSemanticError* orig_conv = (LDKParseOrSemanticError*)orig; +uint64_t __attribute__((export_name("TS_ParseOrSemanticError_clone"))) TS_ParseOrSemanticError_clone(uint64_t orig) { + LDKParseOrSemanticError* orig_conv = (LDKParseOrSemanticError*)untag_ptr(orig); LDKParseOrSemanticError *ret_copy = MALLOC(sizeof(LDKParseOrSemanticError), "LDKParseOrSemanticError"); *ret_copy = ParseOrSemanticError_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseOrSemanticError_parse_error"))) TS_ParseOrSemanticError_parse_error(uint32_t a) { - void* a_ptr = (void*)(((uintptr_t)a) & ~1); +uint64_t __attribute__((export_name("TS_ParseOrSemanticError_parse_error"))) TS_ParseOrSemanticError_parse_error(uint64_t a) { + void* a_ptr = untag_ptr(a); CHECK_ACCESS(a_ptr); LDKParseError a_conv = *(LDKParseError*)(a_ptr); - a_conv = ParseError_clone((LDKParseError*)(((uintptr_t)a) & ~1)); + a_conv = ParseError_clone((LDKParseError*)untag_ptr(a)); LDKParseOrSemanticError *ret_copy = MALLOC(sizeof(LDKParseOrSemanticError), "LDKParseOrSemanticError"); *ret_copy = ParseOrSemanticError_parse_error(a_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_ParseOrSemanticError_semantic_error"))) TS_ParseOrSemanticError_semantic_error(uint32_t a) { +uint64_t __attribute__((export_name("TS_ParseOrSemanticError_semantic_error"))) TS_ParseOrSemanticError_semantic_error(uint32_t a) { LDKSemanticError a_conv = LDKSemanticError_from_js(a); LDKParseOrSemanticError *ret_copy = MALLOC(sizeof(LDKParseOrSemanticError), "LDKParseOrSemanticError"); *ret_copy = ParseOrSemanticError_semantic_error(a_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -void __attribute__((export_name("TS_Invoice_free"))) TS_Invoice_free(uint32_t this_obj) { +void __attribute__((export_name("TS_Invoice_free"))) TS_Invoice_free(uint64_t this_obj) { LDKInvoice this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); Invoice_free(this_obj_conv); } -jboolean __attribute__((export_name("TS_Invoice_eq"))) TS_Invoice_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_Invoice_eq"))) TS_Invoice_eq(uint64_t a, uint64_t b) { LDKInvoice a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKInvoice b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = Invoice_eq(&a_conv, &b_conv); return ret_conv; } -static inline uintptr_t Invoice_clone_ptr(LDKInvoice *NONNULL_PTR arg) { +static inline uint64_t Invoice_clone_ptr(LDKInvoice *NONNULL_PTR arg) { LDKInvoice ret_var = Invoice_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_Invoice_clone_ptr"))) TS_Invoice_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_Invoice_clone_ptr"))) TS_Invoice_clone_ptr(uint64_t arg) { LDKInvoice arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = Invoice_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = Invoice_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_Invoice_clone"))) TS_Invoice_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_Invoice_clone"))) TS_Invoice_clone(uint64_t orig) { LDKInvoice orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKInvoice ret_var = Invoice_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_SignedRawInvoice_free"))) TS_SignedRawInvoice_free(uint32_t this_obj) { +void __attribute__((export_name("TS_SignedRawInvoice_free"))) TS_SignedRawInvoice_free(uint64_t this_obj) { LDKSignedRawInvoice this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); SignedRawInvoice_free(this_obj_conv); } -jboolean __attribute__((export_name("TS_SignedRawInvoice_eq"))) TS_SignedRawInvoice_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_SignedRawInvoice_eq"))) TS_SignedRawInvoice_eq(uint64_t a, uint64_t b) { LDKSignedRawInvoice a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKSignedRawInvoice b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = SignedRawInvoice_eq(&a_conv, &b_conv); return ret_conv; } -static inline uintptr_t SignedRawInvoice_clone_ptr(LDKSignedRawInvoice *NONNULL_PTR arg) { +static inline uint64_t SignedRawInvoice_clone_ptr(LDKSignedRawInvoice *NONNULL_PTR arg) { LDKSignedRawInvoice ret_var = SignedRawInvoice_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_SignedRawInvoice_clone_ptr"))) TS_SignedRawInvoice_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_SignedRawInvoice_clone_ptr"))) TS_SignedRawInvoice_clone_ptr(uint64_t arg) { LDKSignedRawInvoice arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = SignedRawInvoice_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = SignedRawInvoice_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_SignedRawInvoice_clone"))) TS_SignedRawInvoice_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_SignedRawInvoice_clone"))) TS_SignedRawInvoice_clone(uint64_t orig) { LDKSignedRawInvoice orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKSignedRawInvoice ret_var = SignedRawInvoice_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_RawInvoice_free"))) TS_RawInvoice_free(uint32_t this_obj) { +void __attribute__((export_name("TS_RawInvoice_free"))) TS_RawInvoice_free(uint64_t this_obj) { LDKRawInvoice this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); RawInvoice_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_RawInvoice_get_data"))) TS_RawInvoice_get_data(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_RawInvoice_get_data"))) TS_RawInvoice_get_data(uint64_t this_ptr) { LDKRawInvoice this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKRawDataPart ret_var = RawInvoice_get_data(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_RawInvoice_set_data"))) TS_RawInvoice_set_data(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_RawInvoice_set_data"))) TS_RawInvoice_set_data(uint64_t this_ptr, uint64_t val) { LDKRawInvoice this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKRawDataPart val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = RawDataPart_clone(&val_conv); RawInvoice_set_data(&this_ptr_conv, val_conv); } -jboolean __attribute__((export_name("TS_RawInvoice_eq"))) TS_RawInvoice_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_RawInvoice_eq"))) TS_RawInvoice_eq(uint64_t a, uint64_t b) { LDKRawInvoice a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKRawInvoice b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = RawInvoice_eq(&a_conv, &b_conv); return ret_conv; } -static inline uintptr_t RawInvoice_clone_ptr(LDKRawInvoice *NONNULL_PTR arg) { +static inline uint64_t RawInvoice_clone_ptr(LDKRawInvoice *NONNULL_PTR arg) { LDKRawInvoice ret_var = RawInvoice_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_RawInvoice_clone_ptr"))) TS_RawInvoice_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_RawInvoice_clone_ptr"))) TS_RawInvoice_clone_ptr(uint64_t arg) { LDKRawInvoice arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = RawInvoice_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = RawInvoice_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_RawInvoice_clone"))) TS_RawInvoice_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_RawInvoice_clone"))) TS_RawInvoice_clone(uint64_t orig) { LDKRawInvoice orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKRawInvoice ret_var = RawInvoice_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_RawDataPart_free"))) TS_RawDataPart_free(uint32_t this_obj) { +void __attribute__((export_name("TS_RawDataPart_free"))) TS_RawDataPart_free(uint64_t this_obj) { LDKRawDataPart this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); RawDataPart_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_RawDataPart_get_timestamp"))) TS_RawDataPart_get_timestamp(uint32_t this_ptr) { +uint64_t __attribute__((export_name("TS_RawDataPart_get_timestamp"))) TS_RawDataPart_get_timestamp(uint64_t this_ptr) { LDKRawDataPart this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPositiveTimestamp ret_var = RawDataPart_get_timestamp(&this_ptr_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_RawDataPart_set_timestamp"))) TS_RawDataPart_set_timestamp(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_RawDataPart_set_timestamp"))) TS_RawDataPart_set_timestamp(uint64_t this_ptr, uint64_t val) { LDKRawDataPart this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPositiveTimestamp val_conv; - val_conv.inner = (void*)(val & (~1)); - val_conv.is_owned = (val & 1) || (val == 0); + val_conv.inner = untag_ptr(val); + val_conv.is_owned = ptr_is_owned(val); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = PositiveTimestamp_clone(&val_conv); RawDataPart_set_timestamp(&this_ptr_conv, val_conv); } -jboolean __attribute__((export_name("TS_RawDataPart_eq"))) TS_RawDataPart_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_RawDataPart_eq"))) TS_RawDataPart_eq(uint64_t a, uint64_t b) { LDKRawDataPart a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKRawDataPart b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = RawDataPart_eq(&a_conv, &b_conv); return ret_conv; } -static inline uintptr_t RawDataPart_clone_ptr(LDKRawDataPart *NONNULL_PTR arg) { +static inline uint64_t RawDataPart_clone_ptr(LDKRawDataPart *NONNULL_PTR arg) { LDKRawDataPart ret_var = RawDataPart_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_RawDataPart_clone_ptr"))) TS_RawDataPart_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_RawDataPart_clone_ptr"))) TS_RawDataPart_clone_ptr(uint64_t arg) { LDKRawDataPart arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = RawDataPart_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = RawDataPart_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_RawDataPart_clone"))) TS_RawDataPart_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_RawDataPart_clone"))) TS_RawDataPart_clone(uint64_t orig) { LDKRawDataPart orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKRawDataPart ret_var = RawDataPart_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -void __attribute__((export_name("TS_PositiveTimestamp_free"))) TS_PositiveTimestamp_free(uint32_t this_obj) { +void __attribute__((export_name("TS_PositiveTimestamp_free"))) TS_PositiveTimestamp_free(uint64_t this_obj) { LDKPositiveTimestamp this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); PositiveTimestamp_free(this_obj_conv); } -jboolean __attribute__((export_name("TS_PositiveTimestamp_eq"))) TS_PositiveTimestamp_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_PositiveTimestamp_eq"))) TS_PositiveTimestamp_eq(uint64_t a, uint64_t b) { LDKPositiveTimestamp a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKPositiveTimestamp b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = PositiveTimestamp_eq(&a_conv, &b_conv); return ret_conv; } -static inline uintptr_t PositiveTimestamp_clone_ptr(LDKPositiveTimestamp *NONNULL_PTR arg) { +static inline uint64_t PositiveTimestamp_clone_ptr(LDKPositiveTimestamp *NONNULL_PTR arg) { LDKPositiveTimestamp ret_var = PositiveTimestamp_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_PositiveTimestamp_clone_ptr"))) TS_PositiveTimestamp_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_PositiveTimestamp_clone_ptr"))) TS_PositiveTimestamp_clone_ptr(uint64_t arg) { LDKPositiveTimestamp arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = PositiveTimestamp_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = PositiveTimestamp_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_PositiveTimestamp_clone"))) TS_PositiveTimestamp_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_PositiveTimestamp_clone"))) TS_PositiveTimestamp_clone(uint64_t orig) { LDKPositiveTimestamp orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKPositiveTimestamp ret_var = PositiveTimestamp_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_SiPrefix_clone"))) TS_SiPrefix_clone(uint32_t orig) { - LDKSiPrefix* orig_conv = (LDKSiPrefix*)(orig & ~1); +uint32_t __attribute__((export_name("TS_SiPrefix_clone"))) TS_SiPrefix_clone(uint64_t orig) { + LDKSiPrefix* orig_conv = (LDKSiPrefix*)untag_ptr(orig); uint32_t ret_conv = LDKSiPrefix_to_js(SiPrefix_clone(orig_conv)); return ret_conv; } @@ -44063,21 +42174,21 @@ uint32_t __attribute__((export_name("TS_SiPrefix_pico"))) TS_SiPrefix_pico() { return ret_conv; } -jboolean __attribute__((export_name("TS_SiPrefix_eq"))) TS_SiPrefix_eq(uint32_t a, uint32_t b) { - LDKSiPrefix* a_conv = (LDKSiPrefix*)(a & ~1); - LDKSiPrefix* b_conv = (LDKSiPrefix*)(b & ~1); +jboolean __attribute__((export_name("TS_SiPrefix_eq"))) TS_SiPrefix_eq(uint64_t a, uint64_t b) { + LDKSiPrefix* a_conv = (LDKSiPrefix*)untag_ptr(a); + LDKSiPrefix* b_conv = (LDKSiPrefix*)untag_ptr(b); jboolean ret_conv = SiPrefix_eq(a_conv, b_conv); return ret_conv; } -int64_t __attribute__((export_name("TS_SiPrefix_multiplier"))) TS_SiPrefix_multiplier(uint32_t this_arg) { - LDKSiPrefix* this_arg_conv = (LDKSiPrefix*)(this_arg & ~1); +int64_t __attribute__((export_name("TS_SiPrefix_multiplier"))) TS_SiPrefix_multiplier(uint64_t this_arg) { + LDKSiPrefix* this_arg_conv = (LDKSiPrefix*)untag_ptr(this_arg); int64_t ret_conv = SiPrefix_multiplier(this_arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_Currency_clone"))) TS_Currency_clone(uint32_t orig) { - LDKCurrency* orig_conv = (LDKCurrency*)(orig & ~1); +uint32_t __attribute__((export_name("TS_Currency_clone"))) TS_Currency_clone(uint64_t orig) { + LDKCurrency* orig_conv = (LDKCurrency*)untag_ptr(orig); uint32_t ret_conv = LDKCurrency_to_js(Currency_clone(orig_conv)); return ret_conv; } @@ -44107,456 +42218,425 @@ uint32_t __attribute__((export_name("TS_Currency_signet"))) TS_Currency_signet( return ret_conv; } -int64_t __attribute__((export_name("TS_Currency_hash"))) TS_Currency_hash(uint32_t o) { - LDKCurrency* o_conv = (LDKCurrency*)(o & ~1); +int64_t __attribute__((export_name("TS_Currency_hash"))) TS_Currency_hash(uint64_t o) { + LDKCurrency* o_conv = (LDKCurrency*)untag_ptr(o); int64_t ret_conv = Currency_hash(o_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_Currency_eq"))) TS_Currency_eq(uint32_t a, uint32_t b) { - LDKCurrency* a_conv = (LDKCurrency*)(a & ~1); - LDKCurrency* b_conv = (LDKCurrency*)(b & ~1); +jboolean __attribute__((export_name("TS_Currency_eq"))) TS_Currency_eq(uint64_t a, uint64_t b) { + LDKCurrency* a_conv = (LDKCurrency*)untag_ptr(a); + LDKCurrency* b_conv = (LDKCurrency*)untag_ptr(b); jboolean ret_conv = Currency_eq(a_conv, b_conv); return ret_conv; } -void __attribute__((export_name("TS_Sha256_free"))) TS_Sha256_free(uint32_t this_obj) { +void __attribute__((export_name("TS_Sha256_free"))) TS_Sha256_free(uint64_t this_obj) { LDKSha256 this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); Sha256_free(this_obj_conv); } -static inline uintptr_t Sha256_clone_ptr(LDKSha256 *NONNULL_PTR arg) { +static inline uint64_t Sha256_clone_ptr(LDKSha256 *NONNULL_PTR arg) { LDKSha256 ret_var = Sha256_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_Sha256_clone_ptr"))) TS_Sha256_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_Sha256_clone_ptr"))) TS_Sha256_clone_ptr(uint64_t arg) { LDKSha256 arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = Sha256_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = Sha256_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_Sha256_clone"))) TS_Sha256_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_Sha256_clone"))) TS_Sha256_clone(uint64_t orig) { LDKSha256 orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKSha256 ret_var = Sha256_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int64_t __attribute__((export_name("TS_Sha256_hash"))) TS_Sha256_hash(uint32_t o) { +int64_t __attribute__((export_name("TS_Sha256_hash"))) TS_Sha256_hash(uint64_t o) { LDKSha256 o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = false; + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); + o_conv.is_owned = false; int64_t ret_conv = Sha256_hash(&o_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_Sha256_eq"))) TS_Sha256_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_Sha256_eq"))) TS_Sha256_eq(uint64_t a, uint64_t b) { LDKSha256 a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKSha256 b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = Sha256_eq(&a_conv, &b_conv); return ret_conv; } -void __attribute__((export_name("TS_Description_free"))) TS_Description_free(uint32_t this_obj) { +void __attribute__((export_name("TS_Description_free"))) TS_Description_free(uint64_t this_obj) { LDKDescription this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); Description_free(this_obj_conv); } -static inline uintptr_t Description_clone_ptr(LDKDescription *NONNULL_PTR arg) { +static inline uint64_t Description_clone_ptr(LDKDescription *NONNULL_PTR arg) { LDKDescription ret_var = Description_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_Description_clone_ptr"))) TS_Description_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_Description_clone_ptr"))) TS_Description_clone_ptr(uint64_t arg) { LDKDescription arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = Description_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = Description_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_Description_clone"))) TS_Description_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_Description_clone"))) TS_Description_clone(uint64_t orig) { LDKDescription orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKDescription ret_var = Description_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int64_t __attribute__((export_name("TS_Description_hash"))) TS_Description_hash(uint32_t o) { +int64_t __attribute__((export_name("TS_Description_hash"))) TS_Description_hash(uint64_t o) { LDKDescription o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = false; + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); + o_conv.is_owned = false; int64_t ret_conv = Description_hash(&o_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_Description_eq"))) TS_Description_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_Description_eq"))) TS_Description_eq(uint64_t a, uint64_t b) { LDKDescription a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKDescription b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = Description_eq(&a_conv, &b_conv); return ret_conv; } -void __attribute__((export_name("TS_PayeePubKey_free"))) TS_PayeePubKey_free(uint32_t this_obj) { +void __attribute__((export_name("TS_PayeePubKey_free"))) TS_PayeePubKey_free(uint64_t this_obj) { LDKPayeePubKey this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); PayeePubKey_free(this_obj_conv); } -int8_tArray __attribute__((export_name("TS_PayeePubKey_get_a"))) TS_PayeePubKey_get_a(uint32_t this_ptr) { +int8_tArray __attribute__((export_name("TS_PayeePubKey_get_a"))) TS_PayeePubKey_get_a(uint64_t this_ptr) { LDKPayeePubKey this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, PayeePubKey_get_a(&this_ptr_conv).compressed_form, 33); return ret_arr; } -void __attribute__((export_name("TS_PayeePubKey_set_a"))) TS_PayeePubKey_set_a(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_PayeePubKey_set_a"))) TS_PayeePubKey_set_a(uint64_t this_ptr, int8_tArray val) { LDKPayeePubKey this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; LDKPublicKey val_ref; CHECK(val->arr_len == 33); memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); PayeePubKey_set_a(&this_ptr_conv, val_ref); } -uint32_t __attribute__((export_name("TS_PayeePubKey_new"))) TS_PayeePubKey_new(int8_tArray a_arg) { +uint64_t __attribute__((export_name("TS_PayeePubKey_new"))) TS_PayeePubKey_new(int8_tArray a_arg) { LDKPublicKey a_arg_ref; CHECK(a_arg->arr_len == 33); memcpy(a_arg_ref.compressed_form, a_arg->elems, 33); FREE(a_arg); LDKPayeePubKey ret_var = PayeePubKey_new(a_arg_ref); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t PayeePubKey_clone_ptr(LDKPayeePubKey *NONNULL_PTR arg) { +static inline uint64_t PayeePubKey_clone_ptr(LDKPayeePubKey *NONNULL_PTR arg) { LDKPayeePubKey ret_var = PayeePubKey_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_PayeePubKey_clone_ptr"))) TS_PayeePubKey_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_PayeePubKey_clone_ptr"))) TS_PayeePubKey_clone_ptr(uint64_t arg) { LDKPayeePubKey arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = PayeePubKey_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = PayeePubKey_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_PayeePubKey_clone"))) TS_PayeePubKey_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_PayeePubKey_clone"))) TS_PayeePubKey_clone(uint64_t orig) { LDKPayeePubKey orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKPayeePubKey ret_var = PayeePubKey_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int64_t __attribute__((export_name("TS_PayeePubKey_hash"))) TS_PayeePubKey_hash(uint32_t o) { +int64_t __attribute__((export_name("TS_PayeePubKey_hash"))) TS_PayeePubKey_hash(uint64_t o) { LDKPayeePubKey o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = false; + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); + o_conv.is_owned = false; int64_t ret_conv = PayeePubKey_hash(&o_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_PayeePubKey_eq"))) TS_PayeePubKey_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_PayeePubKey_eq"))) TS_PayeePubKey_eq(uint64_t a, uint64_t b) { LDKPayeePubKey a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKPayeePubKey b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = PayeePubKey_eq(&a_conv, &b_conv); return ret_conv; } -void __attribute__((export_name("TS_ExpiryTime_free"))) TS_ExpiryTime_free(uint32_t this_obj) { +void __attribute__((export_name("TS_ExpiryTime_free"))) TS_ExpiryTime_free(uint64_t this_obj) { LDKExpiryTime this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); ExpiryTime_free(this_obj_conv); } -static inline uintptr_t ExpiryTime_clone_ptr(LDKExpiryTime *NONNULL_PTR arg) { +static inline uint64_t ExpiryTime_clone_ptr(LDKExpiryTime *NONNULL_PTR arg) { LDKExpiryTime ret_var = ExpiryTime_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ExpiryTime_clone_ptr"))) TS_ExpiryTime_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_ExpiryTime_clone_ptr"))) TS_ExpiryTime_clone_ptr(uint64_t arg) { LDKExpiryTime arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = ExpiryTime_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = ExpiryTime_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_ExpiryTime_clone"))) TS_ExpiryTime_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_ExpiryTime_clone"))) TS_ExpiryTime_clone(uint64_t orig) { LDKExpiryTime orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKExpiryTime ret_var = ExpiryTime_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int64_t __attribute__((export_name("TS_ExpiryTime_hash"))) TS_ExpiryTime_hash(uint32_t o) { +int64_t __attribute__((export_name("TS_ExpiryTime_hash"))) TS_ExpiryTime_hash(uint64_t o) { LDKExpiryTime o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = false; + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); + o_conv.is_owned = false; int64_t ret_conv = ExpiryTime_hash(&o_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_ExpiryTime_eq"))) TS_ExpiryTime_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_ExpiryTime_eq"))) TS_ExpiryTime_eq(uint64_t a, uint64_t b) { LDKExpiryTime a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKExpiryTime b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = ExpiryTime_eq(&a_conv, &b_conv); return ret_conv; } -void __attribute__((export_name("TS_MinFinalCltvExpiry_free"))) TS_MinFinalCltvExpiry_free(uint32_t this_obj) { +void __attribute__((export_name("TS_MinFinalCltvExpiry_free"))) TS_MinFinalCltvExpiry_free(uint64_t this_obj) { LDKMinFinalCltvExpiry this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); MinFinalCltvExpiry_free(this_obj_conv); } -int64_t __attribute__((export_name("TS_MinFinalCltvExpiry_get_a"))) TS_MinFinalCltvExpiry_get_a(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_MinFinalCltvExpiry_get_a"))) TS_MinFinalCltvExpiry_get_a(uint64_t this_ptr) { LDKMinFinalCltvExpiry this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; int64_t ret_conv = MinFinalCltvExpiry_get_a(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_MinFinalCltvExpiry_set_a"))) TS_MinFinalCltvExpiry_set_a(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_MinFinalCltvExpiry_set_a"))) TS_MinFinalCltvExpiry_set_a(uint64_t this_ptr, int64_t val) { LDKMinFinalCltvExpiry this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; + this_ptr_conv.inner = untag_ptr(this_ptr); + this_ptr_conv.is_owned = ptr_is_owned(this_ptr); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + this_ptr_conv.is_owned = false; MinFinalCltvExpiry_set_a(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_MinFinalCltvExpiry_new"))) TS_MinFinalCltvExpiry_new(int64_t a_arg) { +uint64_t __attribute__((export_name("TS_MinFinalCltvExpiry_new"))) TS_MinFinalCltvExpiry_new(int64_t a_arg) { LDKMinFinalCltvExpiry ret_var = MinFinalCltvExpiry_new(a_arg); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -static inline uintptr_t MinFinalCltvExpiry_clone_ptr(LDKMinFinalCltvExpiry *NONNULL_PTR arg) { +static inline uint64_t MinFinalCltvExpiry_clone_ptr(LDKMinFinalCltvExpiry *NONNULL_PTR arg) { LDKMinFinalCltvExpiry ret_var = MinFinalCltvExpiry_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_MinFinalCltvExpiry_clone_ptr"))) TS_MinFinalCltvExpiry_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_MinFinalCltvExpiry_clone_ptr"))) TS_MinFinalCltvExpiry_clone_ptr(uint64_t arg) { LDKMinFinalCltvExpiry arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = MinFinalCltvExpiry_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = MinFinalCltvExpiry_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_MinFinalCltvExpiry_clone"))) TS_MinFinalCltvExpiry_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_MinFinalCltvExpiry_clone"))) TS_MinFinalCltvExpiry_clone(uint64_t orig) { LDKMinFinalCltvExpiry orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKMinFinalCltvExpiry ret_var = MinFinalCltvExpiry_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int64_t __attribute__((export_name("TS_MinFinalCltvExpiry_hash"))) TS_MinFinalCltvExpiry_hash(uint32_t o) { +int64_t __attribute__((export_name("TS_MinFinalCltvExpiry_hash"))) TS_MinFinalCltvExpiry_hash(uint64_t o) { LDKMinFinalCltvExpiry o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = false; + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); + o_conv.is_owned = false; int64_t ret_conv = MinFinalCltvExpiry_hash(&o_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_MinFinalCltvExpiry_eq"))) TS_MinFinalCltvExpiry_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_MinFinalCltvExpiry_eq"))) TS_MinFinalCltvExpiry_eq(uint64_t a, uint64_t b) { LDKMinFinalCltvExpiry a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKMinFinalCltvExpiry b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = MinFinalCltvExpiry_eq(&a_conv, &b_conv); return ret_conv; } -void __attribute__((export_name("TS_Fallback_free"))) TS_Fallback_free(uint32_t this_ptr) { - if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_Fallback_free"))) TS_Fallback_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKFallback this_ptr_conv = *(LDKFallback*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); Fallback_free(this_ptr_conv); } -static inline uintptr_t Fallback_clone_ptr(LDKFallback *NONNULL_PTR arg) { +static inline uint64_t Fallback_clone_ptr(LDKFallback *NONNULL_PTR arg) { LDKFallback *ret_copy = MALLOC(sizeof(LDKFallback), "LDKFallback"); *ret_copy = Fallback_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Fallback_clone_ptr"))) TS_Fallback_clone_ptr(uint32_t arg) { - LDKFallback* arg_conv = (LDKFallback*)arg; - uint32_t ret_conv = Fallback_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_Fallback_clone_ptr"))) TS_Fallback_clone_ptr(uint64_t arg) { + LDKFallback* arg_conv = (LDKFallback*)untag_ptr(arg); + int64_t ret_conv = Fallback_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_Fallback_clone"))) TS_Fallback_clone(uint32_t orig) { - LDKFallback* orig_conv = (LDKFallback*)orig; +uint64_t __attribute__((export_name("TS_Fallback_clone"))) TS_Fallback_clone(uint64_t orig) { + LDKFallback* orig_conv = (LDKFallback*)untag_ptr(orig); LDKFallback *ret_copy = MALLOC(sizeof(LDKFallback), "LDKFallback"); *ret_copy = Fallback_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Fallback_seg_wit_program"))) TS_Fallback_seg_wit_program(int8_t version, int8_tArray program) { +uint64_t __attribute__((export_name("TS_Fallback_seg_wit_program"))) TS_Fallback_seg_wit_program(int8_t version, int8_tArray program) { LDKCVec_u8Z program_ref; program_ref.datalen = program->arr_len; @@ -44564,416 +42644,356 @@ uint32_t __attribute__((export_name("TS_Fallback_seg_wit_program"))) TS_Fallbac memcpy(program_ref.data, program->elems, program_ref.datalen); FREE(program); LDKFallback *ret_copy = MALLOC(sizeof(LDKFallback), "LDKFallback"); *ret_copy = Fallback_seg_wit_program((LDKu5){ ._0 = version }, program_ref); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Fallback_pub_key_hash"))) TS_Fallback_pub_key_hash(int8_tArray a) { +uint64_t __attribute__((export_name("TS_Fallback_pub_key_hash"))) TS_Fallback_pub_key_hash(int8_tArray a) { LDKTwentyBytes a_ref; CHECK(a->arr_len == 20); memcpy(a_ref.data, a->elems, 20); FREE(a); LDKFallback *ret_copy = MALLOC(sizeof(LDKFallback), "LDKFallback"); *ret_copy = Fallback_pub_key_hash(a_ref); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Fallback_script_hash"))) TS_Fallback_script_hash(int8_tArray a) { +uint64_t __attribute__((export_name("TS_Fallback_script_hash"))) TS_Fallback_script_hash(int8_tArray a) { LDKTwentyBytes a_ref; CHECK(a->arr_len == 20); memcpy(a_ref.data, a->elems, 20); FREE(a); LDKFallback *ret_copy = MALLOC(sizeof(LDKFallback), "LDKFallback"); *ret_copy = Fallback_script_hash(a_ref); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -int64_t __attribute__((export_name("TS_Fallback_hash"))) TS_Fallback_hash(uint32_t o) { - LDKFallback* o_conv = (LDKFallback*)o; +int64_t __attribute__((export_name("TS_Fallback_hash"))) TS_Fallback_hash(uint64_t o) { + LDKFallback* o_conv = (LDKFallback*)untag_ptr(o); int64_t ret_conv = Fallback_hash(o_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_Fallback_eq"))) TS_Fallback_eq(uint32_t a, uint32_t b) { - LDKFallback* a_conv = (LDKFallback*)a; - LDKFallback* b_conv = (LDKFallback*)b; +jboolean __attribute__((export_name("TS_Fallback_eq"))) TS_Fallback_eq(uint64_t a, uint64_t b) { + LDKFallback* a_conv = (LDKFallback*)untag_ptr(a); + LDKFallback* b_conv = (LDKFallback*)untag_ptr(b); jboolean ret_conv = Fallback_eq(a_conv, b_conv); return ret_conv; } -void __attribute__((export_name("TS_InvoiceSignature_free"))) TS_InvoiceSignature_free(uint32_t this_obj) { +void __attribute__((export_name("TS_InvoiceSignature_free"))) TS_InvoiceSignature_free(uint64_t this_obj) { LDKInvoiceSignature this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); InvoiceSignature_free(this_obj_conv); } -static inline uintptr_t InvoiceSignature_clone_ptr(LDKInvoiceSignature *NONNULL_PTR arg) { +static inline uint64_t InvoiceSignature_clone_ptr(LDKInvoiceSignature *NONNULL_PTR arg) { LDKInvoiceSignature ret_var = InvoiceSignature_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_InvoiceSignature_clone_ptr"))) TS_InvoiceSignature_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_InvoiceSignature_clone_ptr"))) TS_InvoiceSignature_clone_ptr(uint64_t arg) { LDKInvoiceSignature arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = InvoiceSignature_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = InvoiceSignature_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_InvoiceSignature_clone"))) TS_InvoiceSignature_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_InvoiceSignature_clone"))) TS_InvoiceSignature_clone(uint64_t orig) { LDKInvoiceSignature orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKInvoiceSignature ret_var = InvoiceSignature_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -jboolean __attribute__((export_name("TS_InvoiceSignature_eq"))) TS_InvoiceSignature_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_InvoiceSignature_eq"))) TS_InvoiceSignature_eq(uint64_t a, uint64_t b) { LDKInvoiceSignature a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKInvoiceSignature b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = InvoiceSignature_eq(&a_conv, &b_conv); return ret_conv; } -void __attribute__((export_name("TS_PrivateRoute_free"))) TS_PrivateRoute_free(uint32_t this_obj) { +void __attribute__((export_name("TS_PrivateRoute_free"))) TS_PrivateRoute_free(uint64_t this_obj) { LDKPrivateRoute this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); PrivateRoute_free(this_obj_conv); } -static inline uintptr_t PrivateRoute_clone_ptr(LDKPrivateRoute *NONNULL_PTR arg) { +static inline uint64_t PrivateRoute_clone_ptr(LDKPrivateRoute *NONNULL_PTR arg) { LDKPrivateRoute ret_var = PrivateRoute_clone(arg); -uint32_t ret_ref = 0; -CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. -CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); -ret_ref = (uintptr_t)ret_var.inner; -if (ret_var.is_owned) { - ret_ref |= 1; -} + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_PrivateRoute_clone_ptr"))) TS_PrivateRoute_clone_ptr(uint32_t arg) { +int64_t __attribute__((export_name("TS_PrivateRoute_clone_ptr"))) TS_PrivateRoute_clone_ptr(uint64_t arg) { LDKPrivateRoute arg_conv; - arg_conv.inner = (void*)(arg & (~1)); - arg_conv.is_owned = false; + arg_conv.inner = untag_ptr(arg); + arg_conv.is_owned = ptr_is_owned(arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - uint32_t ret_conv = PrivateRoute_clone_ptr(&arg_conv); + arg_conv.is_owned = false; + int64_t ret_conv = PrivateRoute_clone_ptr(&arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_PrivateRoute_clone"))) TS_PrivateRoute_clone(uint32_t orig) { +uint64_t __attribute__((export_name("TS_PrivateRoute_clone"))) TS_PrivateRoute_clone(uint64_t orig) { LDKPrivateRoute orig_conv; - orig_conv.inner = (void*)(orig & (~1)); - orig_conv.is_owned = false; + orig_conv.inner = untag_ptr(orig); + orig_conv.is_owned = ptr_is_owned(orig); CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + orig_conv.is_owned = false; LDKPrivateRoute ret_var = PrivateRoute_clone(&orig_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int64_t __attribute__((export_name("TS_PrivateRoute_hash"))) TS_PrivateRoute_hash(uint32_t o) { +int64_t __attribute__((export_name("TS_PrivateRoute_hash"))) TS_PrivateRoute_hash(uint64_t o) { LDKPrivateRoute o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = false; + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); + o_conv.is_owned = false; int64_t ret_conv = PrivateRoute_hash(&o_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_PrivateRoute_eq"))) TS_PrivateRoute_eq(uint32_t a, uint32_t b) { +jboolean __attribute__((export_name("TS_PrivateRoute_eq"))) TS_PrivateRoute_eq(uint64_t a, uint64_t b) { LDKPrivateRoute a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = false; + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); + a_conv.is_owned = false; LDKPrivateRoute b_conv; - b_conv.inner = (void*)(b & (~1)); - b_conv.is_owned = false; + b_conv.inner = untag_ptr(b); + b_conv.is_owned = ptr_is_owned(b); CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv); + b_conv.is_owned = false; jboolean ret_conv = PrivateRoute_eq(&a_conv, &b_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_SignedRawInvoice_into_parts"))) TS_SignedRawInvoice_into_parts(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_SignedRawInvoice_into_parts"))) TS_SignedRawInvoice_into_parts(uint64_t this_arg) { LDKSignedRawInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0); + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); this_arg_conv = SignedRawInvoice_clone(&this_arg_conv); LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* ret_conv = MALLOC(sizeof(LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ), "LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ"); *ret_conv = SignedRawInvoice_into_parts(this_arg_conv); - return ((uint32_t)ret_conv); + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_SignedRawInvoice_raw_invoice"))) TS_SignedRawInvoice_raw_invoice(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_SignedRawInvoice_raw_invoice"))) TS_SignedRawInvoice_raw_invoice(uint64_t this_arg) { LDKSignedRawInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKRawInvoice ret_var = SignedRawInvoice_raw_invoice(&this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_SignedRawInvoice_hash"))) TS_SignedRawInvoice_hash(uint32_t this_arg) { +int8_tArray __attribute__((export_name("TS_SignedRawInvoice_hash"))) TS_SignedRawInvoice_hash(uint64_t this_arg) { LDKSignedRawInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *SignedRawInvoice_hash(&this_arg_conv), 32); return ret_arr; } -uint32_t __attribute__((export_name("TS_SignedRawInvoice_signature"))) TS_SignedRawInvoice_signature(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_SignedRawInvoice_signature"))) TS_SignedRawInvoice_signature(uint64_t this_arg) { LDKSignedRawInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKInvoiceSignature ret_var = SignedRawInvoice_signature(&this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_SignedRawInvoice_recover_payee_pub_key"))) TS_SignedRawInvoice_recover_payee_pub_key(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_SignedRawInvoice_recover_payee_pub_key"))) TS_SignedRawInvoice_recover_payee_pub_key(uint64_t this_arg) { LDKSignedRawInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCResult_PayeePubKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PayeePubKeyErrorZ), "LDKCResult_PayeePubKeyErrorZ"); *ret_conv = SignedRawInvoice_recover_payee_pub_key(&this_arg_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jboolean __attribute__((export_name("TS_SignedRawInvoice_check_signature"))) TS_SignedRawInvoice_check_signature(uint32_t this_arg) { +jboolean __attribute__((export_name("TS_SignedRawInvoice_check_signature"))) TS_SignedRawInvoice_check_signature(uint64_t this_arg) { LDKSignedRawInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = SignedRawInvoice_check_signature(&this_arg_conv); return ret_conv; } -int8_tArray __attribute__((export_name("TS_RawInvoice_hash"))) TS_RawInvoice_hash(uint32_t this_arg) { +int8_tArray __attribute__((export_name("TS_RawInvoice_hash"))) TS_RawInvoice_hash(uint64_t this_arg) { LDKRawInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, RawInvoice_hash(&this_arg_conv).data, 32); return ret_arr; } -uint32_t __attribute__((export_name("TS_RawInvoice_payment_hash"))) TS_RawInvoice_payment_hash(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_RawInvoice_payment_hash"))) TS_RawInvoice_payment_hash(uint64_t this_arg) { LDKRawInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKSha256 ret_var = RawInvoice_payment_hash(&this_arg_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_RawInvoice_description"))) TS_RawInvoice_description(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_RawInvoice_description"))) TS_RawInvoice_description(uint64_t this_arg) { LDKRawInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKDescription ret_var = RawInvoice_description(&this_arg_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_RawInvoice_payee_pub_key"))) TS_RawInvoice_payee_pub_key(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_RawInvoice_payee_pub_key"))) TS_RawInvoice_payee_pub_key(uint64_t this_arg) { LDKRawInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKPayeePubKey ret_var = RawInvoice_payee_pub_key(&this_arg_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_RawInvoice_description_hash"))) TS_RawInvoice_description_hash(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_RawInvoice_description_hash"))) TS_RawInvoice_description_hash(uint64_t this_arg) { LDKRawInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKSha256 ret_var = RawInvoice_description_hash(&this_arg_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_RawInvoice_expiry_time"))) TS_RawInvoice_expiry_time(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_RawInvoice_expiry_time"))) TS_RawInvoice_expiry_time(uint64_t this_arg) { LDKRawInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKExpiryTime ret_var = RawInvoice_expiry_time(&this_arg_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_RawInvoice_min_final_cltv_expiry"))) TS_RawInvoice_min_final_cltv_expiry(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_RawInvoice_min_final_cltv_expiry"))) TS_RawInvoice_min_final_cltv_expiry(uint64_t this_arg) { LDKRawInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKMinFinalCltvExpiry ret_var = RawInvoice_min_final_cltv_expiry(&this_arg_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_RawInvoice_payment_secret"))) TS_RawInvoice_payment_secret(uint32_t this_arg) { +int8_tArray __attribute__((export_name("TS_RawInvoice_payment_secret"))) TS_RawInvoice_payment_secret(uint64_t this_arg) { LDKRawInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, RawInvoice_payment_secret(&this_arg_conv).data, 32); return ret_arr; } -uint32_t __attribute__((export_name("TS_RawInvoice_features"))) TS_RawInvoice_features(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_RawInvoice_features"))) TS_RawInvoice_features(uint64_t this_arg) { LDKRawInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKInvoiceFeatures ret_var = RawInvoice_features(&this_arg_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_tArray __attribute__((export_name("TS_RawInvoice_private_routes"))) TS_RawInvoice_private_routes(uint32_t this_arg) { +uint64_tArray __attribute__((export_name("TS_RawInvoice_private_routes"))) TS_RawInvoice_private_routes(uint64_t this_arg) { LDKRawInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCVec_PrivateRouteZ ret_var = RawInvoice_private_routes(&this_arg_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t o = 0; o < ret_var.datalen; o++) { LDKPrivateRoute ret_conv_14_var = ret_var.data[o]; - uint32_t ret_conv_14_ref = 0; - 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. + uint64_t ret_conv_14_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_14_var); - ret_conv_14_ref = (uintptr_t)ret_conv_14_var.inner; - if (ret_conv_14_var.is_owned) { - ret_conv_14_ref |= 1; - } + ret_conv_14_ref = tag_ptr(ret_conv_14_var.inner, ret_conv_14_var.is_owned); ret_arr_ptr[o] = ret_conv_14_ref; } @@ -44981,209 +43001,207 @@ uint32_tArray __attribute__((export_name("TS_RawInvoice_private_routes"))) TS_R return ret_arr; } -uint32_t __attribute__((export_name("TS_RawInvoice_amount_pico_btc"))) TS_RawInvoice_amount_pico_btc(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_RawInvoice_amount_pico_btc"))) TS_RawInvoice_amount_pico_btc(uint64_t this_arg) { LDKRawInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = RawInvoice_amount_pico_btc(&this_arg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_RawInvoice_currency"))) TS_RawInvoice_currency(uint32_t this_arg) { +uint32_t __attribute__((export_name("TS_RawInvoice_currency"))) TS_RawInvoice_currency(uint64_t this_arg) { LDKRawInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; uint32_t ret_conv = LDKCurrency_to_js(RawInvoice_currency(&this_arg_conv)); return ret_conv; } -uint32_t __attribute__((export_name("TS_PositiveTimestamp_from_unix_timestamp"))) TS_PositiveTimestamp_from_unix_timestamp(int64_t unix_seconds) { +uint64_t __attribute__((export_name("TS_PositiveTimestamp_from_unix_timestamp"))) TS_PositiveTimestamp_from_unix_timestamp(int64_t unix_seconds) { LDKCResult_PositiveTimestampCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PositiveTimestampCreationErrorZ), "LDKCResult_PositiveTimestampCreationErrorZ"); *ret_conv = PositiveTimestamp_from_unix_timestamp(unix_seconds); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_PositiveTimestamp_from_duration_since_epoch"))) TS_PositiveTimestamp_from_duration_since_epoch(int64_t duration) { +uint64_t __attribute__((export_name("TS_PositiveTimestamp_from_duration_since_epoch"))) TS_PositiveTimestamp_from_duration_since_epoch(int64_t duration) { LDKCResult_PositiveTimestampCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PositiveTimestampCreationErrorZ), "LDKCResult_PositiveTimestampCreationErrorZ"); *ret_conv = PositiveTimestamp_from_duration_since_epoch(duration); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int64_t __attribute__((export_name("TS_PositiveTimestamp_as_unix_timestamp"))) TS_PositiveTimestamp_as_unix_timestamp(uint32_t this_arg) { +int64_t __attribute__((export_name("TS_PositiveTimestamp_as_unix_timestamp"))) TS_PositiveTimestamp_as_unix_timestamp(uint64_t this_arg) { LDKPositiveTimestamp this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int64_t ret_conv = PositiveTimestamp_as_unix_timestamp(&this_arg_conv); return ret_conv; } -int64_t __attribute__((export_name("TS_PositiveTimestamp_as_duration_since_epoch"))) TS_PositiveTimestamp_as_duration_since_epoch(uint32_t this_arg) { +int64_t __attribute__((export_name("TS_PositiveTimestamp_as_duration_since_epoch"))) TS_PositiveTimestamp_as_duration_since_epoch(uint64_t this_arg) { LDKPositiveTimestamp this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int64_t ret_conv = PositiveTimestamp_as_duration_since_epoch(&this_arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_Invoice_into_signed_raw"))) TS_Invoice_into_signed_raw(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_Invoice_into_signed_raw"))) TS_Invoice_into_signed_raw(uint64_t this_arg) { LDKInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0); + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); this_arg_conv = Invoice_clone(&this_arg_conv); LDKSignedRawInvoice ret_var = Invoice_into_signed_raw(this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_Invoice_check_signature"))) TS_Invoice_check_signature(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_Invoice_check_signature"))) TS_Invoice_check_signature(uint64_t this_arg) { LDKInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCResult_NoneSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneSemanticErrorZ), "LDKCResult_NoneSemanticErrorZ"); *ret_conv = Invoice_check_signature(&this_arg_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_Invoice_from_signed"))) TS_Invoice_from_signed(uint32_t signed_invoice) { +uint64_t __attribute__((export_name("TS_Invoice_from_signed"))) TS_Invoice_from_signed(uint64_t signed_invoice) { LDKSignedRawInvoice signed_invoice_conv; - signed_invoice_conv.inner = (void*)(signed_invoice & (~1)); - signed_invoice_conv.is_owned = (signed_invoice & 1) || (signed_invoice == 0); + signed_invoice_conv.inner = untag_ptr(signed_invoice); + signed_invoice_conv.is_owned = ptr_is_owned(signed_invoice); CHECK_INNER_FIELD_ACCESS_OR_NULL(signed_invoice_conv); signed_invoice_conv = SignedRawInvoice_clone(&signed_invoice_conv); LDKCResult_InvoiceSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceSemanticErrorZ), "LDKCResult_InvoiceSemanticErrorZ"); *ret_conv = Invoice_from_signed(signed_invoice_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -int64_t __attribute__((export_name("TS_Invoice_duration_since_epoch"))) TS_Invoice_duration_since_epoch(uint32_t this_arg) { +int64_t __attribute__((export_name("TS_Invoice_duration_since_epoch"))) TS_Invoice_duration_since_epoch(uint64_t this_arg) { LDKInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int64_t ret_conv = Invoice_duration_since_epoch(&this_arg_conv); return ret_conv; } -int8_tArray __attribute__((export_name("TS_Invoice_payment_hash"))) TS_Invoice_payment_hash(uint32_t this_arg) { +int8_tArray __attribute__((export_name("TS_Invoice_payment_hash"))) TS_Invoice_payment_hash(uint64_t this_arg) { LDKInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *Invoice_payment_hash(&this_arg_conv), 32); return ret_arr; } -int8_tArray __attribute__((export_name("TS_Invoice_payee_pub_key"))) TS_Invoice_payee_pub_key(uint32_t this_arg) { +int8_tArray __attribute__((export_name("TS_Invoice_payee_pub_key"))) TS_Invoice_payee_pub_key(uint64_t this_arg) { LDKInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, Invoice_payee_pub_key(&this_arg_conv).compressed_form, 33); return ret_arr; } -int8_tArray __attribute__((export_name("TS_Invoice_payment_secret"))) TS_Invoice_payment_secret(uint32_t this_arg) { +int8_tArray __attribute__((export_name("TS_Invoice_payment_secret"))) TS_Invoice_payment_secret(uint64_t this_arg) { LDKInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *Invoice_payment_secret(&this_arg_conv), 32); return ret_arr; } -uint32_t __attribute__((export_name("TS_Invoice_features"))) TS_Invoice_features(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_Invoice_features"))) TS_Invoice_features(uint64_t this_arg) { LDKInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKInvoiceFeatures ret_var = Invoice_features(&this_arg_conv); - uint32_t ret_ref = 0; - if ((uintptr_t)ret_var.inner > 4096) { - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - } + uint64_t ret_ref = 0; + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int8_tArray __attribute__((export_name("TS_Invoice_recover_payee_pub_key"))) TS_Invoice_recover_payee_pub_key(uint32_t this_arg) { +int8_tArray __attribute__((export_name("TS_Invoice_recover_payee_pub_key"))) TS_Invoice_recover_payee_pub_key(uint64_t this_arg) { LDKInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, Invoice_recover_payee_pub_key(&this_arg_conv).compressed_form, 33); return ret_arr; } -int64_t __attribute__((export_name("TS_Invoice_expiry_time"))) TS_Invoice_expiry_time(uint32_t this_arg) { +int64_t __attribute__((export_name("TS_Invoice_expiry_time"))) TS_Invoice_expiry_time(uint64_t this_arg) { LDKInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int64_t ret_conv = Invoice_expiry_time(&this_arg_conv); return ret_conv; } -jboolean __attribute__((export_name("TS_Invoice_would_expire"))) TS_Invoice_would_expire(uint32_t this_arg, int64_t at_time) { +jboolean __attribute__((export_name("TS_Invoice_would_expire"))) TS_Invoice_would_expire(uint64_t this_arg, int64_t at_time) { LDKInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; jboolean ret_conv = Invoice_would_expire(&this_arg_conv, at_time); return ret_conv; } -int64_t __attribute__((export_name("TS_Invoice_min_final_cltv_expiry"))) TS_Invoice_min_final_cltv_expiry(uint32_t this_arg) { +int64_t __attribute__((export_name("TS_Invoice_min_final_cltv_expiry"))) TS_Invoice_min_final_cltv_expiry(uint64_t this_arg) { LDKInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int64_t ret_conv = Invoice_min_final_cltv_expiry(&this_arg_conv); return ret_conv; } -uint32_tArray __attribute__((export_name("TS_Invoice_private_routes"))) TS_Invoice_private_routes(uint32_t this_arg) { +uint64_tArray __attribute__((export_name("TS_Invoice_private_routes"))) TS_Invoice_private_routes(uint64_t this_arg) { LDKInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCVec_PrivateRouteZ ret_var = Invoice_private_routes(&this_arg_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t o = 0; o < ret_var.datalen; o++) { LDKPrivateRoute ret_conv_14_var = ret_var.data[o]; - uint32_t ret_conv_14_ref = 0; - 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. + uint64_t ret_conv_14_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_14_var); - ret_conv_14_ref = (uintptr_t)ret_conv_14_var.inner; - if (ret_conv_14_var.is_owned) { - ret_conv_14_ref |= 1; - } + ret_conv_14_ref = tag_ptr(ret_conv_14_var.inner, ret_conv_14_var.is_owned); ret_arr_ptr[o] = ret_conv_14_ref; } @@ -45191,25 +43209,21 @@ uint32_tArray __attribute__((export_name("TS_Invoice_private_routes"))) TS_Invo return ret_arr; } -uint32_tArray __attribute__((export_name("TS_Invoice_route_hints"))) TS_Invoice_route_hints(uint32_t this_arg) { +uint64_tArray __attribute__((export_name("TS_Invoice_route_hints"))) TS_Invoice_route_hints(uint64_t this_arg) { LDKInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCVec_RouteHintZ ret_var = Invoice_route_hints(&this_arg_conv); - uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + uint64_tArray ret_arr = NULL; + ret_arr = init_uint64_tArray(ret_var.datalen, __LINE__); + uint64_t *ret_arr_ptr = (uint64_t*)(((uint8_t*)ret_arr) + 8); for (size_t l = 0; l < ret_var.datalen; l++) { LDKRouteHint ret_conv_11_var = ret_var.data[l]; - uint32_t ret_conv_11_ref = 0; - 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. + uint64_t ret_conv_11_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_11_var); - ret_conv_11_ref = (uintptr_t)ret_conv_11_var.inner; - if (ret_conv_11_var.is_owned) { - ret_conv_11_ref |= 1; - } + ret_conv_11_ref = tag_ptr(ret_conv_11_var.inner, ret_conv_11_var.is_owned); ret_arr_ptr[l] = ret_conv_11_ref; } @@ -45217,37 +43231,39 @@ uint32_tArray __attribute__((export_name("TS_Invoice_route_hints"))) TS_Invoice return ret_arr; } -uint32_t __attribute__((export_name("TS_Invoice_currency"))) TS_Invoice_currency(uint32_t this_arg) { +uint32_t __attribute__((export_name("TS_Invoice_currency"))) TS_Invoice_currency(uint64_t this_arg) { LDKInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; uint32_t ret_conv = LDKCurrency_to_js(Invoice_currency(&this_arg_conv)); return ret_conv; } -uint32_t __attribute__((export_name("TS_Invoice_amount_milli_satoshis"))) TS_Invoice_amount_milli_satoshis(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_Invoice_amount_milli_satoshis"))) TS_Invoice_amount_milli_satoshis(uint64_t this_arg) { LDKInvoice this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = Invoice_amount_milli_satoshis(&this_arg_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Description_new"))) TS_Description_new(jstring description) { +uint64_t __attribute__((export_name("TS_Description_new"))) TS_Description_new(jstring description) { LDKStr description_conv = str_ref_to_owned_c(description); LDKCResult_DescriptionCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DescriptionCreationErrorZ), "LDKCResult_DescriptionCreationErrorZ"); *ret_conv = Description_new(description_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jstring __attribute__((export_name("TS_Description_into_inner"))) TS_Description_into_inner(uint32_t this_arg) { +jstring __attribute__((export_name("TS_Description_into_inner"))) TS_Description_into_inner(uint64_t this_arg) { LDKDescription this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0); + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); this_arg_conv = Description_clone(&this_arg_conv); LDKStr ret_str = Description_into_inner(this_arg_conv); @@ -45256,81 +43272,68 @@ jstring __attribute__((export_name("TS_Description_into_inner"))) TS_Descriptio return ret_conv; } -uint32_t __attribute__((export_name("TS_ExpiryTime_from_seconds"))) TS_ExpiryTime_from_seconds(int64_t seconds) { +uint64_t __attribute__((export_name("TS_ExpiryTime_from_seconds"))) TS_ExpiryTime_from_seconds(int64_t seconds) { LDKExpiryTime ret_var = ExpiryTime_from_seconds(seconds); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_ExpiryTime_from_duration"))) TS_ExpiryTime_from_duration(int64_t duration) { +uint64_t __attribute__((export_name("TS_ExpiryTime_from_duration"))) TS_ExpiryTime_from_duration(int64_t duration) { LDKExpiryTime ret_var = ExpiryTime_from_duration(duration); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -int64_t __attribute__((export_name("TS_ExpiryTime_as_seconds"))) TS_ExpiryTime_as_seconds(uint32_t this_arg) { +int64_t __attribute__((export_name("TS_ExpiryTime_as_seconds"))) TS_ExpiryTime_as_seconds(uint64_t this_arg) { LDKExpiryTime this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int64_t ret_conv = ExpiryTime_as_seconds(&this_arg_conv); return ret_conv; } -int64_t __attribute__((export_name("TS_ExpiryTime_as_duration"))) TS_ExpiryTime_as_duration(uint32_t this_arg) { +int64_t __attribute__((export_name("TS_ExpiryTime_as_duration"))) TS_ExpiryTime_as_duration(uint64_t this_arg) { LDKExpiryTime this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; int64_t ret_conv = ExpiryTime_as_duration(&this_arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_PrivateRoute_new"))) TS_PrivateRoute_new(uint32_t hops) { +uint64_t __attribute__((export_name("TS_PrivateRoute_new"))) TS_PrivateRoute_new(uint64_t hops) { LDKRouteHint hops_conv; - hops_conv.inner = (void*)(hops & (~1)); - hops_conv.is_owned = (hops & 1) || (hops == 0); + hops_conv.inner = untag_ptr(hops); + hops_conv.is_owned = ptr_is_owned(hops); CHECK_INNER_FIELD_ACCESS_OR_NULL(hops_conv); hops_conv = RouteHint_clone(&hops_conv); LDKCResult_PrivateRouteCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PrivateRouteCreationErrorZ), "LDKCResult_PrivateRouteCreationErrorZ"); *ret_conv = PrivateRoute_new(hops_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_PrivateRoute_into_inner"))) TS_PrivateRoute_into_inner(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_PrivateRoute_into_inner"))) TS_PrivateRoute_into_inner(uint64_t this_arg) { LDKPrivateRoute this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0); + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); this_arg_conv = PrivateRoute_clone(&this_arg_conv); LDKRouteHint ret_var = PrivateRoute_into_inner(this_arg_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_CreationError_clone"))) TS_CreationError_clone(uint32_t orig) { - LDKCreationError* orig_conv = (LDKCreationError*)(orig & ~1); +uint32_t __attribute__((export_name("TS_CreationError_clone"))) TS_CreationError_clone(uint64_t orig) { + LDKCreationError* orig_conv = (LDKCreationError*)untag_ptr(orig); uint32_t ret_conv = LDKCreationError_to_js(CreationError_clone(orig_conv)); return ret_conv; } @@ -45360,23 +43363,23 @@ uint32_t __attribute__((export_name("TS_CreationError_missing_route_hints"))) T return ret_conv; } -jboolean __attribute__((export_name("TS_CreationError_eq"))) TS_CreationError_eq(uint32_t a, uint32_t b) { - LDKCreationError* a_conv = (LDKCreationError*)(a & ~1); - LDKCreationError* b_conv = (LDKCreationError*)(b & ~1); +jboolean __attribute__((export_name("TS_CreationError_eq"))) TS_CreationError_eq(uint64_t a, uint64_t b) { + LDKCreationError* a_conv = (LDKCreationError*)untag_ptr(a); + LDKCreationError* b_conv = (LDKCreationError*)untag_ptr(b); jboolean ret_conv = CreationError_eq(a_conv, b_conv); return ret_conv; } -jstring __attribute__((export_name("TS_CreationError_to_str"))) TS_CreationError_to_str(uint32_t o) { - LDKCreationError* o_conv = (LDKCreationError*)(o & ~1); +jstring __attribute__((export_name("TS_CreationError_to_str"))) TS_CreationError_to_str(uint64_t o) { + LDKCreationError* o_conv = (LDKCreationError*)untag_ptr(o); LDKStr ret_str = CreationError_to_str(o_conv); jstring ret_conv = str_ref_to_ts(ret_str.chars, ret_str.len); Str_free(ret_str); return ret_conv; } -uint32_t __attribute__((export_name("TS_SemanticError_clone"))) TS_SemanticError_clone(uint32_t orig) { - LDKSemanticError* orig_conv = (LDKSemanticError*)(orig & ~1); +uint32_t __attribute__((export_name("TS_SemanticError_clone"))) TS_SemanticError_clone(uint64_t orig) { + LDKSemanticError* orig_conv = (LDKSemanticError*)untag_ptr(orig); uint32_t ret_conv = LDKSemanticError_to_js(SemanticError_clone(orig_conv)); return ret_conv; } @@ -45431,224 +43434,224 @@ uint32_t __attribute__((export_name("TS_SemanticError_imprecise_amount"))) TS_S return ret_conv; } -jboolean __attribute__((export_name("TS_SemanticError_eq"))) TS_SemanticError_eq(uint32_t a, uint32_t b) { - LDKSemanticError* a_conv = (LDKSemanticError*)(a & ~1); - LDKSemanticError* b_conv = (LDKSemanticError*)(b & ~1); +jboolean __attribute__((export_name("TS_SemanticError_eq"))) TS_SemanticError_eq(uint64_t a, uint64_t b) { + LDKSemanticError* a_conv = (LDKSemanticError*)untag_ptr(a); + LDKSemanticError* b_conv = (LDKSemanticError*)untag_ptr(b); jboolean ret_conv = SemanticError_eq(a_conv, b_conv); return ret_conv; } -jstring __attribute__((export_name("TS_SemanticError_to_str"))) TS_SemanticError_to_str(uint32_t o) { - LDKSemanticError* o_conv = (LDKSemanticError*)(o & ~1); +jstring __attribute__((export_name("TS_SemanticError_to_str"))) TS_SemanticError_to_str(uint64_t o) { + LDKSemanticError* o_conv = (LDKSemanticError*)untag_ptr(o); LDKStr ret_str = SemanticError_to_str(o_conv); jstring ret_conv = str_ref_to_ts(ret_str.chars, ret_str.len); Str_free(ret_str); return ret_conv; } -void __attribute__((export_name("TS_SignOrCreationError_free"))) TS_SignOrCreationError_free(uint32_t this_ptr) { - if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_SignOrCreationError_free"))) TS_SignOrCreationError_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKSignOrCreationError this_ptr_conv = *(LDKSignOrCreationError*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); SignOrCreationError_free(this_ptr_conv); } -static inline uintptr_t SignOrCreationError_clone_ptr(LDKSignOrCreationError *NONNULL_PTR arg) { +static inline uint64_t SignOrCreationError_clone_ptr(LDKSignOrCreationError *NONNULL_PTR arg) { LDKSignOrCreationError *ret_copy = MALLOC(sizeof(LDKSignOrCreationError), "LDKSignOrCreationError"); *ret_copy = SignOrCreationError_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_SignOrCreationError_clone_ptr"))) TS_SignOrCreationError_clone_ptr(uint32_t arg) { - LDKSignOrCreationError* arg_conv = (LDKSignOrCreationError*)arg; - uint32_t ret_conv = SignOrCreationError_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_SignOrCreationError_clone_ptr"))) TS_SignOrCreationError_clone_ptr(uint64_t arg) { + LDKSignOrCreationError* arg_conv = (LDKSignOrCreationError*)untag_ptr(arg); + int64_t ret_conv = SignOrCreationError_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_SignOrCreationError_clone"))) TS_SignOrCreationError_clone(uint32_t orig) { - LDKSignOrCreationError* orig_conv = (LDKSignOrCreationError*)orig; +uint64_t __attribute__((export_name("TS_SignOrCreationError_clone"))) TS_SignOrCreationError_clone(uint64_t orig) { + LDKSignOrCreationError* orig_conv = (LDKSignOrCreationError*)untag_ptr(orig); LDKSignOrCreationError *ret_copy = MALLOC(sizeof(LDKSignOrCreationError), "LDKSignOrCreationError"); *ret_copy = SignOrCreationError_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_SignOrCreationError_sign_error"))) TS_SignOrCreationError_sign_error() { +uint64_t __attribute__((export_name("TS_SignOrCreationError_sign_error"))) TS_SignOrCreationError_sign_error() { LDKSignOrCreationError *ret_copy = MALLOC(sizeof(LDKSignOrCreationError), "LDKSignOrCreationError"); *ret_copy = SignOrCreationError_sign_error(); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_SignOrCreationError_creation_error"))) TS_SignOrCreationError_creation_error(uint32_t a) { +uint64_t __attribute__((export_name("TS_SignOrCreationError_creation_error"))) TS_SignOrCreationError_creation_error(uint32_t a) { LDKCreationError a_conv = LDKCreationError_from_js(a); LDKSignOrCreationError *ret_copy = MALLOC(sizeof(LDKSignOrCreationError), "LDKSignOrCreationError"); *ret_copy = SignOrCreationError_creation_error(a_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -jboolean __attribute__((export_name("TS_SignOrCreationError_eq"))) TS_SignOrCreationError_eq(uint32_t a, uint32_t b) { - LDKSignOrCreationError* a_conv = (LDKSignOrCreationError*)a; - LDKSignOrCreationError* b_conv = (LDKSignOrCreationError*)b; +jboolean __attribute__((export_name("TS_SignOrCreationError_eq"))) TS_SignOrCreationError_eq(uint64_t a, uint64_t b) { + LDKSignOrCreationError* a_conv = (LDKSignOrCreationError*)untag_ptr(a); + LDKSignOrCreationError* b_conv = (LDKSignOrCreationError*)untag_ptr(b); jboolean ret_conv = SignOrCreationError_eq(a_conv, b_conv); return ret_conv; } -jstring __attribute__((export_name("TS_SignOrCreationError_to_str"))) TS_SignOrCreationError_to_str(uint32_t o) { - LDKSignOrCreationError* o_conv = (LDKSignOrCreationError*)o; +jstring __attribute__((export_name("TS_SignOrCreationError_to_str"))) TS_SignOrCreationError_to_str(uint64_t o) { + LDKSignOrCreationError* o_conv = (LDKSignOrCreationError*)untag_ptr(o); LDKStr ret_str = SignOrCreationError_to_str(o_conv); jstring ret_conv = str_ref_to_ts(ret_str.chars, ret_str.len); Str_free(ret_str); return ret_conv; } -void __attribute__((export_name("TS_InvoicePayer_free"))) TS_InvoicePayer_free(uint32_t this_obj) { +void __attribute__((export_name("TS_InvoicePayer_free"))) TS_InvoicePayer_free(uint64_t this_obj) { LDKInvoicePayer this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); InvoicePayer_free(this_obj_conv); } -void __attribute__((export_name("TS_Payer_free"))) TS_Payer_free(uint32_t this_ptr) { - if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_Payer_free"))) TS_Payer_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKPayer this_ptr_conv = *(LDKPayer*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); Payer_free(this_ptr_conv); } -void __attribute__((export_name("TS_Router_free"))) TS_Router_free(uint32_t this_ptr) { - if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_Router_free"))) TS_Router_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKRouter this_ptr_conv = *(LDKRouter*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); Router_free(this_ptr_conv); } -void __attribute__((export_name("TS_Retry_free"))) TS_Retry_free(uint32_t this_ptr) { - if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_Retry_free"))) TS_Retry_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKRetry this_ptr_conv = *(LDKRetry*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); Retry_free(this_ptr_conv); } -static inline uintptr_t Retry_clone_ptr(LDKRetry *NONNULL_PTR arg) { +static inline uint64_t Retry_clone_ptr(LDKRetry *NONNULL_PTR arg) { LDKRetry *ret_copy = MALLOC(sizeof(LDKRetry), "LDKRetry"); *ret_copy = Retry_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Retry_clone_ptr"))) TS_Retry_clone_ptr(uint32_t arg) { - LDKRetry* arg_conv = (LDKRetry*)arg; - uint32_t ret_conv = Retry_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_Retry_clone_ptr"))) TS_Retry_clone_ptr(uint64_t arg) { + LDKRetry* arg_conv = (LDKRetry*)untag_ptr(arg); + int64_t ret_conv = Retry_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_Retry_clone"))) TS_Retry_clone(uint32_t orig) { - LDKRetry* orig_conv = (LDKRetry*)orig; +uint64_t __attribute__((export_name("TS_Retry_clone"))) TS_Retry_clone(uint64_t orig) { + LDKRetry* orig_conv = (LDKRetry*)untag_ptr(orig); LDKRetry *ret_copy = MALLOC(sizeof(LDKRetry), "LDKRetry"); *ret_copy = Retry_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_Retry_attempts"))) TS_Retry_attempts(uint32_t a) { +uint64_t __attribute__((export_name("TS_Retry_attempts"))) TS_Retry_attempts(uint32_t a) { LDKRetry *ret_copy = MALLOC(sizeof(LDKRetry), "LDKRetry"); *ret_copy = Retry_attempts(a); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -jboolean __attribute__((export_name("TS_Retry_eq"))) TS_Retry_eq(uint32_t a, uint32_t b) { - LDKRetry* a_conv = (LDKRetry*)a; - LDKRetry* b_conv = (LDKRetry*)b; +jboolean __attribute__((export_name("TS_Retry_eq"))) TS_Retry_eq(uint64_t a, uint64_t b) { + LDKRetry* a_conv = (LDKRetry*)untag_ptr(a); + LDKRetry* b_conv = (LDKRetry*)untag_ptr(b); jboolean ret_conv = Retry_eq(a_conv, b_conv); return ret_conv; } -int64_t __attribute__((export_name("TS_Retry_hash"))) TS_Retry_hash(uint32_t o) { - LDKRetry* o_conv = (LDKRetry*)o; +int64_t __attribute__((export_name("TS_Retry_hash"))) TS_Retry_hash(uint64_t o) { + LDKRetry* o_conv = (LDKRetry*)untag_ptr(o); int64_t ret_conv = Retry_hash(o_conv); return ret_conv; } -void __attribute__((export_name("TS_PaymentError_free"))) TS_PaymentError_free(uint32_t this_ptr) { - if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); +void __attribute__((export_name("TS_PaymentError_free"))) TS_PaymentError_free(uint64_t this_ptr) { + if (!ptr_is_owned(this_ptr)) return; + void* this_ptr_ptr = untag_ptr(this_ptr); CHECK_ACCESS(this_ptr_ptr); LDKPaymentError this_ptr_conv = *(LDKPaymentError*)(this_ptr_ptr); - FREE((void*)this_ptr); + FREE(untag_ptr(this_ptr)); PaymentError_free(this_ptr_conv); } -static inline uintptr_t PaymentError_clone_ptr(LDKPaymentError *NONNULL_PTR arg) { +static inline uint64_t PaymentError_clone_ptr(LDKPaymentError *NONNULL_PTR arg) { LDKPaymentError *ret_copy = MALLOC(sizeof(LDKPaymentError), "LDKPaymentError"); *ret_copy = PaymentError_clone(arg); -uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_PaymentError_clone_ptr"))) TS_PaymentError_clone_ptr(uint32_t arg) { - LDKPaymentError* arg_conv = (LDKPaymentError*)arg; - uint32_t ret_conv = PaymentError_clone_ptr(arg_conv); +int64_t __attribute__((export_name("TS_PaymentError_clone_ptr"))) TS_PaymentError_clone_ptr(uint64_t arg) { + LDKPaymentError* arg_conv = (LDKPaymentError*)untag_ptr(arg); + int64_t ret_conv = PaymentError_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_PaymentError_clone"))) TS_PaymentError_clone(uint32_t orig) { - LDKPaymentError* orig_conv = (LDKPaymentError*)orig; +uint64_t __attribute__((export_name("TS_PaymentError_clone"))) TS_PaymentError_clone(uint64_t orig) { + LDKPaymentError* orig_conv = (LDKPaymentError*)untag_ptr(orig); LDKPaymentError *ret_copy = MALLOC(sizeof(LDKPaymentError), "LDKPaymentError"); *ret_copy = PaymentError_clone(orig_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_PaymentError_invoice"))) TS_PaymentError_invoice(jstring a) { +uint64_t __attribute__((export_name("TS_PaymentError_invoice"))) TS_PaymentError_invoice(jstring a) { LDKStr a_conv = str_ref_to_owned_c(a); LDKPaymentError *ret_copy = MALLOC(sizeof(LDKPaymentError), "LDKPaymentError"); *ret_copy = PaymentError_invoice(a_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_PaymentError_routing"))) TS_PaymentError_routing(uint32_t a) { +uint64_t __attribute__((export_name("TS_PaymentError_routing"))) TS_PaymentError_routing(uint64_t a) { LDKLightningError a_conv; - a_conv.inner = (void*)(a & (~1)); - a_conv.is_owned = (a & 1) || (a == 0); + a_conv.inner = untag_ptr(a); + a_conv.is_owned = ptr_is_owned(a); CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv); a_conv = LightningError_clone(&a_conv); LDKPaymentError *ret_copy = MALLOC(sizeof(LDKPaymentError), "LDKPaymentError"); *ret_copy = PaymentError_routing(a_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_PaymentError_sending"))) TS_PaymentError_sending(uint32_t a) { - void* a_ptr = (void*)(((uintptr_t)a) & ~1); +uint64_t __attribute__((export_name("TS_PaymentError_sending"))) TS_PaymentError_sending(uint64_t a) { + void* a_ptr = untag_ptr(a); CHECK_ACCESS(a_ptr); LDKPaymentSendFailure a_conv = *(LDKPaymentSendFailure*)(a_ptr); - a_conv = PaymentSendFailure_clone((LDKPaymentSendFailure*)(((uintptr_t)a) & ~1)); + a_conv = PaymentSendFailure_clone((LDKPaymentSendFailure*)untag_ptr(a)); LDKPaymentError *ret_copy = MALLOC(sizeof(LDKPaymentError), "LDKPaymentError"); *ret_copy = PaymentError_sending(a_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; + uint64_t ret_ref = tag_ptr(ret_copy, true); return ret_ref; } -uint32_t __attribute__((export_name("TS_InvoicePayer_new"))) TS_InvoicePayer_new(uint32_t payer, uint32_t router, uint32_t scorer, uint32_t logger, uint32_t event_handler, uint32_t retry) { - void* payer_ptr = (void*)(((uintptr_t)payer) & ~1); +uint64_t __attribute__((export_name("TS_InvoicePayer_new"))) TS_InvoicePayer_new(uint64_t payer, uint64_t router, uint64_t scorer, uint64_t logger, uint64_t event_handler, uint64_t retry) { + void* payer_ptr = untag_ptr(payer); CHECK_ACCESS(payer_ptr); LDKPayer payer_conv = *(LDKPayer*)(payer_ptr); if (payer_conv.free == LDKPayer_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKPayer_JCalls_cloned(&payer_conv); } - void* router_ptr = (void*)(((uintptr_t)router) & ~1); + void* router_ptr = untag_ptr(router); CHECK_ACCESS(router_ptr); LDKRouter router_conv = *(LDKRouter*)(router_ptr); if (router_conv.free == LDKRouter_JCalls_free) { @@ -45656,72 +43659,73 @@ uint32_t __attribute__((export_name("TS_InvoicePayer_new"))) TS_InvoicePayer_ne LDKRouter_JCalls_cloned(&router_conv); } LDKMultiThreadedLockableScore scorer_conv; - scorer_conv.inner = (void*)(scorer & (~1)); - scorer_conv.is_owned = false; + scorer_conv.inner = untag_ptr(scorer); + scorer_conv.is_owned = ptr_is_owned(scorer); CHECK_INNER_FIELD_ACCESS_OR_NULL(scorer_conv); - void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); + scorer_conv.is_owned = false; + void* logger_ptr = untag_ptr(logger); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); if (logger_conv.free == LDKLogger_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKLogger_JCalls_cloned(&logger_conv); } - void* event_handler_ptr = (void*)(((uintptr_t)event_handler) & ~1); + void* event_handler_ptr = untag_ptr(event_handler); CHECK_ACCESS(event_handler_ptr); LDKEventHandler event_handler_conv = *(LDKEventHandler*)(event_handler_ptr); if (event_handler_conv.free == LDKEventHandler_JCalls_free) { // If this_arg is a JCalls struct, then we need to increment the refcnt in it. LDKEventHandler_JCalls_cloned(&event_handler_conv); } - void* retry_ptr = (void*)(((uintptr_t)retry) & ~1); + void* retry_ptr = untag_ptr(retry); CHECK_ACCESS(retry_ptr); LDKRetry retry_conv = *(LDKRetry*)(retry_ptr); - retry_conv = Retry_clone((LDKRetry*)(((uintptr_t)retry) & ~1)); + retry_conv = Retry_clone((LDKRetry*)untag_ptr(retry)); LDKInvoicePayer ret_var = InvoicePayer_new(payer_conv, router_conv, &scorer_conv, logger_conv, event_handler_conv, retry_conv); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_InvoicePayer_pay_invoice"))) TS_InvoicePayer_pay_invoice(uint32_t this_arg, uint32_t invoice) { +uint64_t __attribute__((export_name("TS_InvoicePayer_pay_invoice"))) TS_InvoicePayer_pay_invoice(uint64_t this_arg, uint64_t invoice) { LDKInvoicePayer this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKInvoice invoice_conv; - invoice_conv.inner = (void*)(invoice & (~1)); - invoice_conv.is_owned = false; + invoice_conv.inner = untag_ptr(invoice); + invoice_conv.is_owned = ptr_is_owned(invoice); CHECK_INNER_FIELD_ACCESS_OR_NULL(invoice_conv); + invoice_conv.is_owned = false; LDKCResult_PaymentIdPaymentErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentErrorZ), "LDKCResult_PaymentIdPaymentErrorZ"); *ret_conv = InvoicePayer_pay_invoice(&this_arg_conv, &invoice_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_InvoicePayer_pay_zero_value_invoice"))) TS_InvoicePayer_pay_zero_value_invoice(uint32_t this_arg, uint32_t invoice, int64_t amount_msats) { +uint64_t __attribute__((export_name("TS_InvoicePayer_pay_zero_value_invoice"))) TS_InvoicePayer_pay_zero_value_invoice(uint64_t this_arg, uint64_t invoice, int64_t amount_msats) { LDKInvoicePayer this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKInvoice invoice_conv; - invoice_conv.inner = (void*)(invoice & (~1)); - invoice_conv.is_owned = false; + invoice_conv.inner = untag_ptr(invoice); + invoice_conv.is_owned = ptr_is_owned(invoice); CHECK_INNER_FIELD_ACCESS_OR_NULL(invoice_conv); + invoice_conv.is_owned = false; LDKCResult_PaymentIdPaymentErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentErrorZ), "LDKCResult_PaymentIdPaymentErrorZ"); *ret_conv = InvoicePayer_pay_zero_value_invoice(&this_arg_conv, &invoice_conv, amount_msats); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_InvoicePayer_pay_pubkey"))) TS_InvoicePayer_pay_pubkey(uint32_t this_arg, int8_tArray pubkey, int8_tArray payment_preimage, int64_t amount_msats, int32_t final_cltv_expiry_delta) { +uint64_t __attribute__((export_name("TS_InvoicePayer_pay_pubkey"))) TS_InvoicePayer_pay_pubkey(uint64_t this_arg, int8_tArray pubkey, int8_tArray payment_preimage, int64_t amount_msats, int32_t final_cltv_expiry_delta) { LDKInvoicePayer this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKPublicKey pubkey_ref; CHECK(pubkey->arr_len == 33); memcpy(pubkey_ref.compressed_form, pubkey->elems, 33); FREE(pubkey); @@ -45730,14 +43734,15 @@ uint32_t __attribute__((export_name("TS_InvoicePayer_pay_pubkey"))) TS_InvoiceP memcpy(payment_preimage_ref.data, payment_preimage->elems, 32); FREE(payment_preimage); LDKCResult_PaymentIdPaymentErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentErrorZ), "LDKCResult_PaymentIdPaymentErrorZ"); *ret_conv = InvoicePayer_pay_pubkey(&this_arg_conv, pubkey_ref, payment_preimage_ref, amount_msats, final_cltv_expiry_delta); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_InvoicePayer_remove_cached_payment"))) TS_InvoicePayer_remove_cached_payment(uint32_t this_arg, int8_tArray payment_hash) { +void __attribute__((export_name("TS_InvoicePayer_remove_cached_payment"))) TS_InvoicePayer_remove_cached_payment(uint64_t this_arg, int8_tArray payment_hash) { LDKInvoicePayer this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; unsigned char payment_hash_arr[32]; CHECK(payment_hash->arr_len == 32); memcpy(payment_hash_arr, payment_hash->elems, 32); FREE(payment_hash); @@ -45745,22 +43750,24 @@ void __attribute__((export_name("TS_InvoicePayer_remove_cached_payment"))) TS_I InvoicePayer_remove_cached_payment(&this_arg_conv, payment_hash_ref); } -uint32_t __attribute__((export_name("TS_InvoicePayer_as_EventHandler"))) TS_InvoicePayer_as_EventHandler(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_InvoicePayer_as_EventHandler"))) TS_InvoicePayer_as_EventHandler(uint64_t this_arg) { LDKInvoicePayer this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKEventHandler* ret_ret = MALLOC(sizeof(LDKEventHandler), "LDKEventHandler"); *ret_ret = InvoicePayer_as_EventHandler(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_t __attribute__((export_name("TS_create_invoice_from_channelmanager_with_description_hash_and_duration_since_epoch"))) TS_create_invoice_from_channelmanager_with_description_hash_and_duration_since_epoch(uint32_t channelmanager, uint32_t keys_manager, uint32_t network, uint32_t amt_msat, uint32_t description_hash, int64_t duration_since_epoch, int32_t invoice_expiry_delta_secs) { +uint64_t __attribute__((export_name("TS_create_invoice_from_channelmanager_with_description_hash_and_duration_since_epoch"))) TS_create_invoice_from_channelmanager_with_description_hash_and_duration_since_epoch(uint64_t channelmanager, uint64_t keys_manager, uint32_t network, uint64_t amt_msat, uint64_t description_hash, int64_t duration_since_epoch, int32_t invoice_expiry_delta_secs) { LDKChannelManager channelmanager_conv; - channelmanager_conv.inner = (void*)(channelmanager & (~1)); - channelmanager_conv.is_owned = false; + channelmanager_conv.inner = untag_ptr(channelmanager); + channelmanager_conv.is_owned = ptr_is_owned(channelmanager); CHECK_INNER_FIELD_ACCESS_OR_NULL(channelmanager_conv); - void* keys_manager_ptr = (void*)(((uintptr_t)keys_manager) & ~1); + channelmanager_conv.is_owned = false; + void* keys_manager_ptr = untag_ptr(keys_manager); CHECK_ACCESS(keys_manager_ptr); LDKKeysInterface keys_manager_conv = *(LDKKeysInterface*)(keys_manager_ptr); if (keys_manager_conv.free == LDKKeysInterface_JCalls_free) { @@ -45768,26 +43775,27 @@ uint32_t __attribute__((export_name("TS_create_invoice_from_channelmanager_with LDKKeysInterface_JCalls_cloned(&keys_manager_conv); } LDKCurrency network_conv = LDKCurrency_from_js(network); - void* amt_msat_ptr = (void*)(((uintptr_t)amt_msat) & ~1); + void* amt_msat_ptr = untag_ptr(amt_msat); CHECK_ACCESS(amt_msat_ptr); LDKCOption_u64Z amt_msat_conv = *(LDKCOption_u64Z*)(amt_msat_ptr); - amt_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)amt_msat) & ~1)); + amt_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(amt_msat)); LDKSha256 description_hash_conv; - description_hash_conv.inner = (void*)(description_hash & (~1)); - description_hash_conv.is_owned = (description_hash & 1) || (description_hash == 0); + description_hash_conv.inner = untag_ptr(description_hash); + description_hash_conv.is_owned = ptr_is_owned(description_hash); CHECK_INNER_FIELD_ACCESS_OR_NULL(description_hash_conv); description_hash_conv = Sha256_clone(&description_hash_conv); LDKCResult_InvoiceSignOrCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceSignOrCreationErrorZ), "LDKCResult_InvoiceSignOrCreationErrorZ"); *ret_conv = create_invoice_from_channelmanager_with_description_hash_and_duration_since_epoch(&channelmanager_conv, keys_manager_conv, network_conv, amt_msat_conv, description_hash_conv, duration_since_epoch, invoice_expiry_delta_secs); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_create_invoice_from_channelmanager_and_duration_since_epoch"))) TS_create_invoice_from_channelmanager_and_duration_since_epoch(uint32_t channelmanager, uint32_t keys_manager, uint32_t network, uint32_t amt_msat, jstring description, int64_t duration_since_epoch, int32_t invoice_expiry_delta_secs) { +uint64_t __attribute__((export_name("TS_create_invoice_from_channelmanager_and_duration_since_epoch"))) TS_create_invoice_from_channelmanager_and_duration_since_epoch(uint64_t channelmanager, uint64_t keys_manager, uint32_t network, uint64_t amt_msat, jstring description, int64_t duration_since_epoch, int32_t invoice_expiry_delta_secs) { LDKChannelManager channelmanager_conv; - channelmanager_conv.inner = (void*)(channelmanager & (~1)); - channelmanager_conv.is_owned = false; + channelmanager_conv.inner = untag_ptr(channelmanager); + channelmanager_conv.is_owned = ptr_is_owned(channelmanager); CHECK_INNER_FIELD_ACCESS_OR_NULL(channelmanager_conv); - void* keys_manager_ptr = (void*)(((uintptr_t)keys_manager) & ~1); + channelmanager_conv.is_owned = false; + void* keys_manager_ptr = untag_ptr(keys_manager); CHECK_ACCESS(keys_manager_ptr); LDKKeysInterface keys_manager_conv = *(LDKKeysInterface*)(keys_manager_ptr); if (keys_manager_conv.free == LDKKeysInterface_JCalls_free) { @@ -45795,30 +43803,31 @@ uint32_t __attribute__((export_name("TS_create_invoice_from_channelmanager_and_ LDKKeysInterface_JCalls_cloned(&keys_manager_conv); } LDKCurrency network_conv = LDKCurrency_from_js(network); - void* amt_msat_ptr = (void*)(((uintptr_t)amt_msat) & ~1); + void* amt_msat_ptr = untag_ptr(amt_msat); CHECK_ACCESS(amt_msat_ptr); LDKCOption_u64Z amt_msat_conv = *(LDKCOption_u64Z*)(amt_msat_ptr); - amt_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)amt_msat) & ~1)); + amt_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)untag_ptr(amt_msat)); LDKStr description_conv = str_ref_to_owned_c(description); LDKCResult_InvoiceSignOrCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceSignOrCreationErrorZ), "LDKCResult_InvoiceSignOrCreationErrorZ"); *ret_conv = create_invoice_from_channelmanager_and_duration_since_epoch(&channelmanager_conv, keys_manager_conv, network_conv, amt_msat_conv, description_conv, duration_since_epoch, invoice_expiry_delta_secs); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -void __attribute__((export_name("TS_DefaultRouter_free"))) TS_DefaultRouter_free(uint32_t this_obj) { +void __attribute__((export_name("TS_DefaultRouter_free"))) TS_DefaultRouter_free(uint64_t this_obj) { LDKDefaultRouter this_obj_conv; - this_obj_conv.inner = (void*)(this_obj & (~1)); - this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + this_obj_conv.inner = untag_ptr(this_obj); + this_obj_conv.is_owned = ptr_is_owned(this_obj); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); DefaultRouter_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_DefaultRouter_new"))) TS_DefaultRouter_new(uint32_t network_graph, uint32_t logger, int8_tArray random_seed_bytes) { +uint64_t __attribute__((export_name("TS_DefaultRouter_new"))) TS_DefaultRouter_new(uint64_t network_graph, uint64_t logger, int8_tArray random_seed_bytes) { LDKNetworkGraph network_graph_conv; - network_graph_conv.inner = (void*)(network_graph & (~1)); - network_graph_conv.is_owned = false; + network_graph_conv.inner = untag_ptr(network_graph); + network_graph_conv.is_owned = ptr_is_owned(network_graph); CHECK_INNER_FIELD_ACCESS_OR_NULL(network_graph_conv); - void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); + network_graph_conv.is_owned = false; + void* logger_ptr = untag_ptr(logger); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); if (logger_conv.free == LDKLogger_JCalls_free) { @@ -45829,106 +43838,105 @@ uint32_t __attribute__((export_name("TS_DefaultRouter_new"))) TS_DefaultRouter_ CHECK(random_seed_bytes->arr_len == 32); memcpy(random_seed_bytes_ref.data, random_seed_bytes->elems, 32); FREE(random_seed_bytes); LDKDefaultRouter ret_var = DefaultRouter_new(&network_graph_conv, logger_conv, random_seed_bytes_ref); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uint64_t ret_ref = 0; CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } + ret_ref = tag_ptr(ret_var.inner, ret_var.is_owned); return ret_ref; } -uint32_t __attribute__((export_name("TS_DefaultRouter_as_Router"))) TS_DefaultRouter_as_Router(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_DefaultRouter_as_Router"))) TS_DefaultRouter_as_Router(uint64_t this_arg) { LDKDefaultRouter this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKRouter* ret_ret = MALLOC(sizeof(LDKRouter), "LDKRouter"); *ret_ret = DefaultRouter_as_Router(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_t __attribute__((export_name("TS_ChannelManager_as_Payer"))) TS_ChannelManager_as_Payer(uint32_t this_arg) { +uint64_t __attribute__((export_name("TS_ChannelManager_as_Payer"))) TS_ChannelManager_as_Payer(uint64_t this_arg) { LDKChannelManager this_arg_conv; - this_arg_conv.inner = (void*)(this_arg & (~1)); - this_arg_conv.is_owned = false; + this_arg_conv.inner = untag_ptr(this_arg); + this_arg_conv.is_owned = ptr_is_owned(this_arg); CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + this_arg_conv.is_owned = false; LDKPayer* ret_ret = MALLOC(sizeof(LDKPayer), "LDKPayer"); *ret_ret = ChannelManager_as_Payer(&this_arg_conv); - return (uint32_t)ret_ret; + return tag_ptr(ret_ret, true); } -uint32_t __attribute__((export_name("TS_SiPrefix_from_str"))) TS_SiPrefix_from_str(jstring s) { +uint64_t __attribute__((export_name("TS_SiPrefix_from_str"))) TS_SiPrefix_from_str(jstring s) { LDKStr s_conv = str_ref_to_owned_c(s); LDKCResult_SiPrefixParseErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SiPrefixParseErrorZ), "LDKCResult_SiPrefixParseErrorZ"); *ret_conv = SiPrefix_from_str(s_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_Invoice_from_str"))) TS_Invoice_from_str(jstring s) { +uint64_t __attribute__((export_name("TS_Invoice_from_str"))) TS_Invoice_from_str(jstring s) { LDKStr s_conv = str_ref_to_owned_c(s); LDKCResult_InvoiceParseOrSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceParseOrSemanticErrorZ), "LDKCResult_InvoiceParseOrSemanticErrorZ"); *ret_conv = Invoice_from_str(s_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -uint32_t __attribute__((export_name("TS_SignedRawInvoice_from_str"))) TS_SignedRawInvoice_from_str(jstring s) { +uint64_t __attribute__((export_name("TS_SignedRawInvoice_from_str"))) TS_SignedRawInvoice_from_str(jstring s) { LDKStr s_conv = str_ref_to_owned_c(s); LDKCResult_SignedRawInvoiceParseErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SignedRawInvoiceParseErrorZ), "LDKCResult_SignedRawInvoiceParseErrorZ"); *ret_conv = SignedRawInvoice_from_str(s_conv); - return (uint32_t)ret_conv; + return tag_ptr(ret_conv, true); } -jstring __attribute__((export_name("TS_ParseError_to_str"))) TS_ParseError_to_str(uint32_t o) { - LDKParseError* o_conv = (LDKParseError*)o; +jstring __attribute__((export_name("TS_ParseError_to_str"))) TS_ParseError_to_str(uint64_t o) { + LDKParseError* o_conv = (LDKParseError*)untag_ptr(o); LDKStr ret_str = ParseError_to_str(o_conv); jstring ret_conv = str_ref_to_ts(ret_str.chars, ret_str.len); Str_free(ret_str); return ret_conv; } -jstring __attribute__((export_name("TS_ParseOrSemanticError_to_str"))) TS_ParseOrSemanticError_to_str(uint32_t o) { - LDKParseOrSemanticError* o_conv = (LDKParseOrSemanticError*)o; +jstring __attribute__((export_name("TS_ParseOrSemanticError_to_str"))) TS_ParseOrSemanticError_to_str(uint64_t o) { + LDKParseOrSemanticError* o_conv = (LDKParseOrSemanticError*)untag_ptr(o); LDKStr ret_str = ParseOrSemanticError_to_str(o_conv); jstring ret_conv = str_ref_to_ts(ret_str.chars, ret_str.len); Str_free(ret_str); return ret_conv; } -jstring __attribute__((export_name("TS_Invoice_to_str"))) TS_Invoice_to_str(uint32_t o) { +jstring __attribute__((export_name("TS_Invoice_to_str"))) TS_Invoice_to_str(uint64_t o) { LDKInvoice o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = false; + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); + o_conv.is_owned = false; LDKStr ret_str = Invoice_to_str(&o_conv); jstring ret_conv = str_ref_to_ts(ret_str.chars, ret_str.len); Str_free(ret_str); return ret_conv; } -jstring __attribute__((export_name("TS_SignedRawInvoice_to_str"))) TS_SignedRawInvoice_to_str(uint32_t o) { +jstring __attribute__((export_name("TS_SignedRawInvoice_to_str"))) TS_SignedRawInvoice_to_str(uint64_t o) { LDKSignedRawInvoice o_conv; - o_conv.inner = (void*)(o & (~1)); - o_conv.is_owned = false; + o_conv.inner = untag_ptr(o); + o_conv.is_owned = ptr_is_owned(o); CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); + o_conv.is_owned = false; LDKStr ret_str = SignedRawInvoice_to_str(&o_conv); jstring ret_conv = str_ref_to_ts(ret_str.chars, ret_str.len); Str_free(ret_str); return ret_conv; } -jstring __attribute__((export_name("TS_Currency_to_str"))) TS_Currency_to_str(uint32_t o) { - LDKCurrency* o_conv = (LDKCurrency*)(o & ~1); +jstring __attribute__((export_name("TS_Currency_to_str"))) TS_Currency_to_str(uint64_t o) { + LDKCurrency* o_conv = (LDKCurrency*)untag_ptr(o); LDKStr ret_str = Currency_to_str(o_conv); jstring ret_conv = str_ref_to_ts(ret_str.chars, ret_str.len); Str_free(ret_str); return ret_conv; } -jstring __attribute__((export_name("TS_SiPrefix_to_str"))) TS_SiPrefix_to_str(uint32_t o) { - LDKSiPrefix* o_conv = (LDKSiPrefix*)(o & ~1); +jstring __attribute__((export_name("TS_SiPrefix_to_str"))) TS_SiPrefix_to_str(uint64_t o) { + LDKSiPrefix* o_conv = (LDKSiPrefix*)untag_ptr(o); LDKStr ret_str = SiPrefix_to_str(o_conv); jstring ret_conv = str_ref_to_ts(ret_str.chars, ret_str.len); Str_free(ret_str); diff --git a/ts/bindings.mts b/ts/bindings.mts index 0c831201..e40ab49b 100644 --- a/ts/bindings.mts +++ b/ts/bindings.mts @@ -89,7 +89,8 @@ async function finishInitializeWasm(wasmInstance: WebAssembly.Instance) { isWasmInitialized = true; } -const fn_list = ["uuuuuu", "buuuuu", "bbbbbb", "ubuuuu", "uubuuu"]; +const fn_list = ["uuuuuu", "buuuuu", "bbuuuu", "bbbuuu", "bbbbuu", + "bbbbbb", "ubuubu", "ubuuuu", "ubbuuu", "uubuuu", "uububu"]; /* @internal */ export async function initializeWasmFromUint8Array(wasmBinary: Uint8Array) { @@ -215,6 +216,12 @@ export function decodeUint64Array (arrayPointer: number, free = true): bigint[] export function freeWasmMemory(pointer: number) { wasm.TS_free(pointer); } +/* @internal */ +export function getU64ArrayElem(arrayPointer: number, idx: number): bigint { + const actualArrayViewer = new BigUint64Array(wasm.memory.buffer, arrayPointer + 8, idx + 1); + return actualArrayViewer[idx]; +} + /* @internal */ export function getU32ArrayElem(arrayPointer: number, idx: number): number { const actualArrayViewer = new Uint32Array(wasm.memory.buffer, arrayPointer + 8, idx + 1); @@ -653,7 +660,7 @@ export class LDKBech32Error { protected constructor() {} } /* @internal */ -export function LDKBech32Error_ty_from_ptr(ptr: number): number { +export function LDKBech32Error_ty_from_ptr(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -661,7 +668,7 @@ export function LDKBech32Error_ty_from_ptr(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKBech32Error_InvalidChar_get_invalid_char(ptr: number): number { +export function LDKBech32Error_InvalidChar_get_invalid_char(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -669,7 +676,7 @@ export function LDKBech32Error_InvalidChar_get_invalid_char(ptr: number): number return nativeResponseValue; } /* @internal */ -export function LDKBech32Error_InvalidData_get_invalid_data(ptr: number): number { +export function LDKBech32Error_InvalidData_get_invalid_data(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -678,7 +685,7 @@ export function LDKBech32Error_InvalidData_get_invalid_data(ptr: number): number } // struct LDKCVec_u8Z TxOut_get_script_pubkey (struct LDKTxOut* thing) /* @internal */ -export function TxOut_get_script_pubkey(thing: number): number { +export function TxOut_get_script_pubkey(thing: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -687,7 +694,7 @@ export function TxOut_get_script_pubkey(thing: number): number { } // uint64_t TxOut_get_value (struct LDKTxOut* thing) /* @internal */ -export function TxOut_get_value(thing: number): bigint { +export function TxOut_get_value(thing: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -696,7 +703,7 @@ export function TxOut_get_value(thing: number): bigint { } // void CResult_NoneNoneZ_get_ok(LDKCResult_NoneNoneZ *NONNULL_PTR owner); /* @internal */ -export function CResult_NoneNoneZ_get_ok(owner: number): void { +export function CResult_NoneNoneZ_get_ok(owner: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -705,7 +712,7 @@ export function CResult_NoneNoneZ_get_ok(owner: number): void { } // void CResult_NoneNoneZ_get_err(LDKCResult_NoneNoneZ *NONNULL_PTR owner); /* @internal */ -export function CResult_NoneNoneZ_get_err(owner: number): void { +export function CResult_NoneNoneZ_get_err(owner: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -714,7 +721,7 @@ export function CResult_NoneNoneZ_get_err(owner: number): void { } // struct LDKCounterpartyCommitmentSecrets CResult_CounterpartyCommitmentSecretsDecodeErrorZ_get_ok(LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_CounterpartyCommitmentSecretsDecodeErrorZ_get_ok(owner: number): number { +export function CResult_CounterpartyCommitmentSecretsDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -723,7 +730,7 @@ export function CResult_CounterpartyCommitmentSecretsDecodeErrorZ_get_ok(owner: } // struct LDKDecodeError CResult_CounterpartyCommitmentSecretsDecodeErrorZ_get_err(LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_CounterpartyCommitmentSecretsDecodeErrorZ_get_err(owner: number): number { +export function CResult_CounterpartyCommitmentSecretsDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -732,7 +739,7 @@ export function CResult_CounterpartyCommitmentSecretsDecodeErrorZ_get_err(owner: } // struct LDKSecretKey CResult_SecretKeyErrorZ_get_ok(LDKCResult_SecretKeyErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_SecretKeyErrorZ_get_ok(owner: number): number { +export function CResult_SecretKeyErrorZ_get_ok(owner: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -741,7 +748,7 @@ export function CResult_SecretKeyErrorZ_get_ok(owner: number): number { } // enum LDKSecp256k1Error CResult_SecretKeyErrorZ_get_err(LDKCResult_SecretKeyErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_SecretKeyErrorZ_get_err(owner: number): Secp256k1Error { +export function CResult_SecretKeyErrorZ_get_err(owner: bigint): Secp256k1Error { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -750,7 +757,7 @@ export function CResult_SecretKeyErrorZ_get_err(owner: number): Secp256k1Error { } // struct LDKPublicKey CResult_PublicKeyErrorZ_get_ok(LDKCResult_PublicKeyErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_PublicKeyErrorZ_get_ok(owner: number): number { +export function CResult_PublicKeyErrorZ_get_ok(owner: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -759,7 +766,7 @@ export function CResult_PublicKeyErrorZ_get_ok(owner: number): number { } // enum LDKSecp256k1Error CResult_PublicKeyErrorZ_get_err(LDKCResult_PublicKeyErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_PublicKeyErrorZ_get_err(owner: number): Secp256k1Error { +export function CResult_PublicKeyErrorZ_get_err(owner: bigint): Secp256k1Error { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -768,7 +775,7 @@ export function CResult_PublicKeyErrorZ_get_err(owner: number): Secp256k1Error { } // struct LDKTxCreationKeys CResult_TxCreationKeysDecodeErrorZ_get_ok(LDKCResult_TxCreationKeysDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_TxCreationKeysDecodeErrorZ_get_ok(owner: number): number { +export function CResult_TxCreationKeysDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -777,7 +784,7 @@ export function CResult_TxCreationKeysDecodeErrorZ_get_ok(owner: number): number } // struct LDKDecodeError CResult_TxCreationKeysDecodeErrorZ_get_err(LDKCResult_TxCreationKeysDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_TxCreationKeysDecodeErrorZ_get_err(owner: number): number { +export function CResult_TxCreationKeysDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -786,7 +793,7 @@ export function CResult_TxCreationKeysDecodeErrorZ_get_err(owner: number): numbe } // struct LDKChannelPublicKeys CResult_ChannelPublicKeysDecodeErrorZ_get_ok(LDKCResult_ChannelPublicKeysDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ChannelPublicKeysDecodeErrorZ_get_ok(owner: number): number { +export function CResult_ChannelPublicKeysDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -795,7 +802,7 @@ export function CResult_ChannelPublicKeysDecodeErrorZ_get_ok(owner: number): num } // struct LDKDecodeError CResult_ChannelPublicKeysDecodeErrorZ_get_err(LDKCResult_ChannelPublicKeysDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ChannelPublicKeysDecodeErrorZ_get_err(owner: number): number { +export function CResult_ChannelPublicKeysDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -804,7 +811,7 @@ export function CResult_ChannelPublicKeysDecodeErrorZ_get_err(owner: number): nu } // struct LDKTxCreationKeys CResult_TxCreationKeysErrorZ_get_ok(LDKCResult_TxCreationKeysErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_TxCreationKeysErrorZ_get_ok(owner: number): number { +export function CResult_TxCreationKeysErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -813,7 +820,7 @@ export function CResult_TxCreationKeysErrorZ_get_ok(owner: number): number { } // enum LDKSecp256k1Error CResult_TxCreationKeysErrorZ_get_err(LDKCResult_TxCreationKeysErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_TxCreationKeysErrorZ_get_err(owner: number): Secp256k1Error { +export function CResult_TxCreationKeysErrorZ_get_err(owner: bigint): Secp256k1Error { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -825,7 +832,7 @@ export class LDKCOption_u32Z { protected constructor() {} } /* @internal */ -export function LDKCOption_u32Z_ty_from_ptr(ptr: number): number { +export function LDKCOption_u32Z_ty_from_ptr(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -833,7 +840,7 @@ export function LDKCOption_u32Z_ty_from_ptr(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKCOption_u32Z_Some_get_some(ptr: number): number { +export function LDKCOption_u32Z_Some_get_some(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -842,7 +849,7 @@ export function LDKCOption_u32Z_Some_get_some(ptr: number): number { } // struct LDKHTLCOutputInCommitment CResult_HTLCOutputInCommitmentDecodeErrorZ_get_ok(LDKCResult_HTLCOutputInCommitmentDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_HTLCOutputInCommitmentDecodeErrorZ_get_ok(owner: number): number { +export function CResult_HTLCOutputInCommitmentDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -851,7 +858,7 @@ export function CResult_HTLCOutputInCommitmentDecodeErrorZ_get_ok(owner: number) } // struct LDKDecodeError CResult_HTLCOutputInCommitmentDecodeErrorZ_get_err(LDKCResult_HTLCOutputInCommitmentDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_HTLCOutputInCommitmentDecodeErrorZ_get_err(owner: number): number { +export function CResult_HTLCOutputInCommitmentDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -860,7 +867,7 @@ export function CResult_HTLCOutputInCommitmentDecodeErrorZ_get_err(owner: number } // struct LDKCounterpartyChannelTransactionParameters CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_get_ok(LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_get_ok(owner: number): number { +export function CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -869,7 +876,7 @@ export function CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_get } // struct LDKDecodeError CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_get_err(LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_get_err(owner: number): number { +export function CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -878,7 +885,7 @@ export function CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_get } // struct LDKChannelTransactionParameters CResult_ChannelTransactionParametersDecodeErrorZ_get_ok(LDKCResult_ChannelTransactionParametersDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ChannelTransactionParametersDecodeErrorZ_get_ok(owner: number): number { +export function CResult_ChannelTransactionParametersDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -887,7 +894,7 @@ export function CResult_ChannelTransactionParametersDecodeErrorZ_get_ok(owner: n } // struct LDKDecodeError CResult_ChannelTransactionParametersDecodeErrorZ_get_err(LDKCResult_ChannelTransactionParametersDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ChannelTransactionParametersDecodeErrorZ_get_err(owner: number): number { +export function CResult_ChannelTransactionParametersDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -896,7 +903,7 @@ export function CResult_ChannelTransactionParametersDecodeErrorZ_get_err(owner: } // struct LDKHolderCommitmentTransaction CResult_HolderCommitmentTransactionDecodeErrorZ_get_ok(LDKCResult_HolderCommitmentTransactionDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_HolderCommitmentTransactionDecodeErrorZ_get_ok(owner: number): number { +export function CResult_HolderCommitmentTransactionDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -905,7 +912,7 @@ export function CResult_HolderCommitmentTransactionDecodeErrorZ_get_ok(owner: nu } // struct LDKDecodeError CResult_HolderCommitmentTransactionDecodeErrorZ_get_err(LDKCResult_HolderCommitmentTransactionDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_HolderCommitmentTransactionDecodeErrorZ_get_err(owner: number): number { +export function CResult_HolderCommitmentTransactionDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -914,7 +921,7 @@ export function CResult_HolderCommitmentTransactionDecodeErrorZ_get_err(owner: n } // struct LDKBuiltCommitmentTransaction CResult_BuiltCommitmentTransactionDecodeErrorZ_get_ok(LDKCResult_BuiltCommitmentTransactionDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_BuiltCommitmentTransactionDecodeErrorZ_get_ok(owner: number): number { +export function CResult_BuiltCommitmentTransactionDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -923,7 +930,7 @@ export function CResult_BuiltCommitmentTransactionDecodeErrorZ_get_ok(owner: num } // struct LDKDecodeError CResult_BuiltCommitmentTransactionDecodeErrorZ_get_err(LDKCResult_BuiltCommitmentTransactionDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_BuiltCommitmentTransactionDecodeErrorZ_get_err(owner: number): number { +export function CResult_BuiltCommitmentTransactionDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -932,7 +939,7 @@ export function CResult_BuiltCommitmentTransactionDecodeErrorZ_get_err(owner: nu } // struct LDKTrustedClosingTransaction *CResult_TrustedClosingTransactionNoneZ_get_ok(LDKCResult_TrustedClosingTransactionNoneZ *NONNULL_PTR owner); /* @internal */ -export function CResult_TrustedClosingTransactionNoneZ_get_ok(owner: number): number { +export function CResult_TrustedClosingTransactionNoneZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -941,7 +948,7 @@ export function CResult_TrustedClosingTransactionNoneZ_get_ok(owner: number): nu } // void CResult_TrustedClosingTransactionNoneZ_get_err(LDKCResult_TrustedClosingTransactionNoneZ *NONNULL_PTR owner); /* @internal */ -export function CResult_TrustedClosingTransactionNoneZ_get_err(owner: number): void { +export function CResult_TrustedClosingTransactionNoneZ_get_err(owner: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -950,7 +957,7 @@ export function CResult_TrustedClosingTransactionNoneZ_get_err(owner: number): v } // struct LDKCommitmentTransaction CResult_CommitmentTransactionDecodeErrorZ_get_ok(LDKCResult_CommitmentTransactionDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_CommitmentTransactionDecodeErrorZ_get_ok(owner: number): number { +export function CResult_CommitmentTransactionDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -959,7 +966,7 @@ export function CResult_CommitmentTransactionDecodeErrorZ_get_ok(owner: number): } // struct LDKDecodeError CResult_CommitmentTransactionDecodeErrorZ_get_err(LDKCResult_CommitmentTransactionDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_CommitmentTransactionDecodeErrorZ_get_err(owner: number): number { +export function CResult_CommitmentTransactionDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -968,7 +975,7 @@ export function CResult_CommitmentTransactionDecodeErrorZ_get_err(owner: number) } // struct LDKTrustedCommitmentTransaction *CResult_TrustedCommitmentTransactionNoneZ_get_ok(LDKCResult_TrustedCommitmentTransactionNoneZ *NONNULL_PTR owner); /* @internal */ -export function CResult_TrustedCommitmentTransactionNoneZ_get_ok(owner: number): number { +export function CResult_TrustedCommitmentTransactionNoneZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -977,7 +984,7 @@ export function CResult_TrustedCommitmentTransactionNoneZ_get_ok(owner: number): } // void CResult_TrustedCommitmentTransactionNoneZ_get_err(LDKCResult_TrustedCommitmentTransactionNoneZ *NONNULL_PTR owner); /* @internal */ -export function CResult_TrustedCommitmentTransactionNoneZ_get_err(owner: number): void { +export function CResult_TrustedCommitmentTransactionNoneZ_get_err(owner: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -986,7 +993,7 @@ export function CResult_TrustedCommitmentTransactionNoneZ_get_err(owner: number) } // struct LDKCVec_SignatureZ CResult_CVec_SignatureZNoneZ_get_ok(LDKCResult_CVec_SignatureZNoneZ *NONNULL_PTR owner); /* @internal */ -export function CResult_CVec_SignatureZNoneZ_get_ok(owner: number): number { +export function CResult_CVec_SignatureZNoneZ_get_ok(owner: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -995,7 +1002,7 @@ export function CResult_CVec_SignatureZNoneZ_get_ok(owner: number): number { } // void CResult_CVec_SignatureZNoneZ_get_err(LDKCResult_CVec_SignatureZNoneZ *NONNULL_PTR owner); /* @internal */ -export function CResult_CVec_SignatureZNoneZ_get_err(owner: number): void { +export function CResult_CVec_SignatureZNoneZ_get_err(owner: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1004,7 +1011,7 @@ export function CResult_CVec_SignatureZNoneZ_get_err(owner: number): void { } // struct LDKShutdownScript CResult_ShutdownScriptDecodeErrorZ_get_ok(LDKCResult_ShutdownScriptDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ShutdownScriptDecodeErrorZ_get_ok(owner: number): number { +export function CResult_ShutdownScriptDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1013,7 +1020,7 @@ export function CResult_ShutdownScriptDecodeErrorZ_get_ok(owner: number): number } // struct LDKDecodeError CResult_ShutdownScriptDecodeErrorZ_get_err(LDKCResult_ShutdownScriptDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ShutdownScriptDecodeErrorZ_get_err(owner: number): number { +export function CResult_ShutdownScriptDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1022,7 +1029,7 @@ export function CResult_ShutdownScriptDecodeErrorZ_get_err(owner: number): numbe } // struct LDKShutdownScript CResult_ShutdownScriptInvalidShutdownScriptZ_get_ok(LDKCResult_ShutdownScriptInvalidShutdownScriptZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ShutdownScriptInvalidShutdownScriptZ_get_ok(owner: number): number { +export function CResult_ShutdownScriptInvalidShutdownScriptZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1031,7 +1038,7 @@ export function CResult_ShutdownScriptInvalidShutdownScriptZ_get_ok(owner: numbe } // struct LDKInvalidShutdownScript CResult_ShutdownScriptInvalidShutdownScriptZ_get_err(LDKCResult_ShutdownScriptInvalidShutdownScriptZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ShutdownScriptInvalidShutdownScriptZ_get_err(owner: number): number { +export function CResult_ShutdownScriptInvalidShutdownScriptZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1040,7 +1047,7 @@ export function CResult_ShutdownScriptInvalidShutdownScriptZ_get_err(owner: numb } // struct LDKRouteHop CResult_RouteHopDecodeErrorZ_get_ok(LDKCResult_RouteHopDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_RouteHopDecodeErrorZ_get_ok(owner: number): number { +export function CResult_RouteHopDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1049,7 +1056,7 @@ export function CResult_RouteHopDecodeErrorZ_get_ok(owner: number): number { } // struct LDKDecodeError CResult_RouteHopDecodeErrorZ_get_err(LDKCResult_RouteHopDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_RouteHopDecodeErrorZ_get_err(owner: number): number { +export function CResult_RouteHopDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1058,7 +1065,7 @@ export function CResult_RouteHopDecodeErrorZ_get_err(owner: number): number { } // struct LDKRoute CResult_RouteDecodeErrorZ_get_ok(LDKCResult_RouteDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_RouteDecodeErrorZ_get_ok(owner: number): number { +export function CResult_RouteDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1067,7 +1074,7 @@ export function CResult_RouteDecodeErrorZ_get_ok(owner: number): number { } // struct LDKDecodeError CResult_RouteDecodeErrorZ_get_err(LDKCResult_RouteDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_RouteDecodeErrorZ_get_err(owner: number): number { +export function CResult_RouteDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1076,7 +1083,7 @@ export function CResult_RouteDecodeErrorZ_get_err(owner: number): number { } // struct LDKRouteParameters CResult_RouteParametersDecodeErrorZ_get_ok(LDKCResult_RouteParametersDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_RouteParametersDecodeErrorZ_get_ok(owner: number): number { +export function CResult_RouteParametersDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1085,7 +1092,7 @@ export function CResult_RouteParametersDecodeErrorZ_get_ok(owner: number): numbe } // struct LDKDecodeError CResult_RouteParametersDecodeErrorZ_get_err(LDKCResult_RouteParametersDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_RouteParametersDecodeErrorZ_get_err(owner: number): number { +export function CResult_RouteParametersDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1097,7 +1104,7 @@ export class LDKCOption_u64Z { protected constructor() {} } /* @internal */ -export function LDKCOption_u64Z_ty_from_ptr(ptr: number): number { +export function LDKCOption_u64Z_ty_from_ptr(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1105,7 +1112,7 @@ export function LDKCOption_u64Z_ty_from_ptr(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKCOption_u64Z_Some_get_some(ptr: number): bigint { +export function LDKCOption_u64Z_Some_get_some(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1114,7 +1121,7 @@ export function LDKCOption_u64Z_Some_get_some(ptr: number): bigint { } // struct LDKPaymentParameters CResult_PaymentParametersDecodeErrorZ_get_ok(LDKCResult_PaymentParametersDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_PaymentParametersDecodeErrorZ_get_ok(owner: number): number { +export function CResult_PaymentParametersDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1123,7 +1130,7 @@ export function CResult_PaymentParametersDecodeErrorZ_get_ok(owner: number): num } // struct LDKDecodeError CResult_PaymentParametersDecodeErrorZ_get_err(LDKCResult_PaymentParametersDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_PaymentParametersDecodeErrorZ_get_err(owner: number): number { +export function CResult_PaymentParametersDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1132,7 +1139,7 @@ export function CResult_PaymentParametersDecodeErrorZ_get_err(owner: number): nu } // struct LDKRouteHint CResult_RouteHintDecodeErrorZ_get_ok(LDKCResult_RouteHintDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_RouteHintDecodeErrorZ_get_ok(owner: number): number { +export function CResult_RouteHintDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1141,7 +1148,7 @@ export function CResult_RouteHintDecodeErrorZ_get_ok(owner: number): number { } // struct LDKDecodeError CResult_RouteHintDecodeErrorZ_get_err(LDKCResult_RouteHintDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_RouteHintDecodeErrorZ_get_err(owner: number): number { +export function CResult_RouteHintDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1150,7 +1157,7 @@ export function CResult_RouteHintDecodeErrorZ_get_err(owner: number): number { } // struct LDKRouteHintHop CResult_RouteHintHopDecodeErrorZ_get_ok(LDKCResult_RouteHintHopDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_RouteHintHopDecodeErrorZ_get_ok(owner: number): number { +export function CResult_RouteHintHopDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1159,7 +1166,7 @@ export function CResult_RouteHintHopDecodeErrorZ_get_ok(owner: number): number { } // struct LDKDecodeError CResult_RouteHintHopDecodeErrorZ_get_err(LDKCResult_RouteHintHopDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_RouteHintHopDecodeErrorZ_get_err(owner: number): number { +export function CResult_RouteHintHopDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1168,7 +1175,7 @@ export function CResult_RouteHintHopDecodeErrorZ_get_err(owner: number): number } // struct LDKRoute CResult_RouteLightningErrorZ_get_ok(LDKCResult_RouteLightningErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_RouteLightningErrorZ_get_ok(owner: number): number { +export function CResult_RouteLightningErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1177,7 +1184,7 @@ export function CResult_RouteLightningErrorZ_get_ok(owner: number): number { } // struct LDKLightningError CResult_RouteLightningErrorZ_get_err(LDKCResult_RouteLightningErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_RouteLightningErrorZ_get_err(owner: number): number { +export function CResult_RouteLightningErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1189,7 +1196,7 @@ export class LDKPaymentPurpose { protected constructor() {} } /* @internal */ -export function LDKPaymentPurpose_ty_from_ptr(ptr: number): number { +export function LDKPaymentPurpose_ty_from_ptr(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1197,7 +1204,7 @@ export function LDKPaymentPurpose_ty_from_ptr(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKPaymentPurpose_InvoicePayment_get_payment_preimage(ptr: number): number { +export function LDKPaymentPurpose_InvoicePayment_get_payment_preimage(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1205,7 +1212,7 @@ export function LDKPaymentPurpose_InvoicePayment_get_payment_preimage(ptr: numbe return nativeResponseValue; } /* @internal */ -export function LDKPaymentPurpose_InvoicePayment_get_payment_secret(ptr: number): number { +export function LDKPaymentPurpose_InvoicePayment_get_payment_secret(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1213,7 +1220,7 @@ export function LDKPaymentPurpose_InvoicePayment_get_payment_secret(ptr: number) return nativeResponseValue; } /* @internal */ -export function LDKPaymentPurpose_SpontaneousPayment_get_spontaneous_payment(ptr: number): number { +export function LDKPaymentPurpose_SpontaneousPayment_get_spontaneous_payment(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1222,7 +1229,7 @@ export function LDKPaymentPurpose_SpontaneousPayment_get_spontaneous_payment(ptr } // struct LDKPaymentPurpose CResult_PaymentPurposeDecodeErrorZ_get_ok(LDKCResult_PaymentPurposeDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_PaymentPurposeDecodeErrorZ_get_ok(owner: number): number { +export function CResult_PaymentPurposeDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1231,7 +1238,7 @@ export function CResult_PaymentPurposeDecodeErrorZ_get_ok(owner: number): number } // struct LDKDecodeError CResult_PaymentPurposeDecodeErrorZ_get_err(LDKCResult_PaymentPurposeDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_PaymentPurposeDecodeErrorZ_get_err(owner: number): number { +export function CResult_PaymentPurposeDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1243,7 +1250,7 @@ export class LDKClosureReason { protected constructor() {} } /* @internal */ -export function LDKClosureReason_ty_from_ptr(ptr: number): number { +export function LDKClosureReason_ty_from_ptr(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1251,7 +1258,7 @@ export function LDKClosureReason_ty_from_ptr(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKClosureReason_CounterpartyForceClosed_get_peer_msg(ptr: number): number { +export function LDKClosureReason_CounterpartyForceClosed_get_peer_msg(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1259,7 +1266,7 @@ export function LDKClosureReason_CounterpartyForceClosed_get_peer_msg(ptr: numbe return nativeResponseValue; } /* @internal */ -export function LDKClosureReason_ProcessingError_get_err(ptr: number): number { +export function LDKClosureReason_ProcessingError_get_err(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1271,7 +1278,7 @@ export class LDKCOption_ClosureReasonZ { protected constructor() {} } /* @internal */ -export function LDKCOption_ClosureReasonZ_ty_from_ptr(ptr: number): number { +export function LDKCOption_ClosureReasonZ_ty_from_ptr(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1279,7 +1286,7 @@ export function LDKCOption_ClosureReasonZ_ty_from_ptr(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKCOption_ClosureReasonZ_Some_get_some(ptr: number): number { +export function LDKCOption_ClosureReasonZ_Some_get_some(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1288,7 +1295,7 @@ export function LDKCOption_ClosureReasonZ_Some_get_some(ptr: number): number { } // struct LDKCOption_ClosureReasonZ CResult_COption_ClosureReasonZDecodeErrorZ_get_ok(LDKCResult_COption_ClosureReasonZDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_COption_ClosureReasonZDecodeErrorZ_get_ok(owner: number): number { +export function CResult_COption_ClosureReasonZDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1297,7 +1304,7 @@ export function CResult_COption_ClosureReasonZDecodeErrorZ_get_ok(owner: number) } // struct LDKDecodeError CResult_COption_ClosureReasonZDecodeErrorZ_get_err(LDKCResult_COption_ClosureReasonZDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_COption_ClosureReasonZDecodeErrorZ_get_err(owner: number): number { +export function CResult_COption_ClosureReasonZDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1309,7 +1316,7 @@ export class LDKHTLCDestination { protected constructor() {} } /* @internal */ -export function LDKHTLCDestination_ty_from_ptr(ptr: number): number { +export function LDKHTLCDestination_ty_from_ptr(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1317,7 +1324,7 @@ export function LDKHTLCDestination_ty_from_ptr(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKHTLCDestination_NextHopChannel_get_node_id(ptr: number): number { +export function LDKHTLCDestination_NextHopChannel_get_node_id(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1325,7 +1332,7 @@ export function LDKHTLCDestination_NextHopChannel_get_node_id(ptr: number): numb return nativeResponseValue; } /* @internal */ -export function LDKHTLCDestination_NextHopChannel_get_channel_id(ptr: number): number { +export function LDKHTLCDestination_NextHopChannel_get_channel_id(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1333,7 +1340,7 @@ export function LDKHTLCDestination_NextHopChannel_get_channel_id(ptr: number): n return nativeResponseValue; } /* @internal */ -export function LDKHTLCDestination_UnknownNextHop_get_requested_forward_scid(ptr: number): bigint { +export function LDKHTLCDestination_UnknownNextHop_get_requested_forward_scid(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1341,7 +1348,7 @@ export function LDKHTLCDestination_UnknownNextHop_get_requested_forward_scid(ptr return nativeResponseValue; } /* @internal */ -export function LDKHTLCDestination_FailedPayment_get_payment_hash(ptr: number): number { +export function LDKHTLCDestination_FailedPayment_get_payment_hash(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1353,7 +1360,7 @@ export class LDKCOption_HTLCDestinationZ { protected constructor() {} } /* @internal */ -export function LDKCOption_HTLCDestinationZ_ty_from_ptr(ptr: number): number { +export function LDKCOption_HTLCDestinationZ_ty_from_ptr(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1361,7 +1368,7 @@ export function LDKCOption_HTLCDestinationZ_ty_from_ptr(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKCOption_HTLCDestinationZ_Some_get_some(ptr: number): number { +export function LDKCOption_HTLCDestinationZ_Some_get_some(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1370,7 +1377,7 @@ export function LDKCOption_HTLCDestinationZ_Some_get_some(ptr: number): number { } // struct LDKCOption_HTLCDestinationZ CResult_COption_HTLCDestinationZDecodeErrorZ_get_ok(LDKCResult_COption_HTLCDestinationZDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_COption_HTLCDestinationZDecodeErrorZ_get_ok(owner: number): number { +export function CResult_COption_HTLCDestinationZDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1379,7 +1386,7 @@ export function CResult_COption_HTLCDestinationZDecodeErrorZ_get_ok(owner: numbe } // struct LDKDecodeError CResult_COption_HTLCDestinationZDecodeErrorZ_get_err(LDKCResult_COption_HTLCDestinationZDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_COption_HTLCDestinationZDecodeErrorZ_get_err(owner: number): number { +export function CResult_COption_HTLCDestinationZDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1391,7 +1398,7 @@ export class LDKNetworkUpdate { protected constructor() {} } /* @internal */ -export function LDKNetworkUpdate_ty_from_ptr(ptr: number): number { +export function LDKNetworkUpdate_ty_from_ptr(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1399,7 +1406,7 @@ export function LDKNetworkUpdate_ty_from_ptr(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKNetworkUpdate_ChannelUpdateMessage_get_msg(ptr: number): number { +export function LDKNetworkUpdate_ChannelUpdateMessage_get_msg(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1407,7 +1414,7 @@ export function LDKNetworkUpdate_ChannelUpdateMessage_get_msg(ptr: number): numb return nativeResponseValue; } /* @internal */ -export function LDKNetworkUpdate_ChannelFailure_get_short_channel_id(ptr: number): bigint { +export function LDKNetworkUpdate_ChannelFailure_get_short_channel_id(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1415,7 +1422,7 @@ export function LDKNetworkUpdate_ChannelFailure_get_short_channel_id(ptr: number return nativeResponseValue; } /* @internal */ -export function LDKNetworkUpdate_ChannelFailure_get_is_permanent(ptr: number): boolean { +export function LDKNetworkUpdate_ChannelFailure_get_is_permanent(ptr: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1423,7 +1430,7 @@ export function LDKNetworkUpdate_ChannelFailure_get_is_permanent(ptr: number): b return nativeResponseValue; } /* @internal */ -export function LDKNetworkUpdate_NodeFailure_get_node_id(ptr: number): number { +export function LDKNetworkUpdate_NodeFailure_get_node_id(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1431,7 +1438,7 @@ export function LDKNetworkUpdate_NodeFailure_get_node_id(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKNetworkUpdate_NodeFailure_get_is_permanent(ptr: number): boolean { +export function LDKNetworkUpdate_NodeFailure_get_is_permanent(ptr: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1443,7 +1450,7 @@ export class LDKCOption_NetworkUpdateZ { protected constructor() {} } /* @internal */ -export function LDKCOption_NetworkUpdateZ_ty_from_ptr(ptr: number): number { +export function LDKCOption_NetworkUpdateZ_ty_from_ptr(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1451,7 +1458,7 @@ export function LDKCOption_NetworkUpdateZ_ty_from_ptr(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKCOption_NetworkUpdateZ_Some_get_some(ptr: number): number { +export function LDKCOption_NetworkUpdateZ_Some_get_some(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1463,7 +1470,7 @@ export class LDKSpendableOutputDescriptor { protected constructor() {} } /* @internal */ -export function LDKSpendableOutputDescriptor_ty_from_ptr(ptr: number): number { +export function LDKSpendableOutputDescriptor_ty_from_ptr(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1471,7 +1478,7 @@ export function LDKSpendableOutputDescriptor_ty_from_ptr(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKSpendableOutputDescriptor_StaticOutput_get_outpoint(ptr: number): number { +export function LDKSpendableOutputDescriptor_StaticOutput_get_outpoint(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1479,7 +1486,7 @@ export function LDKSpendableOutputDescriptor_StaticOutput_get_outpoint(ptr: numb return nativeResponseValue; } /* @internal */ -export function LDKSpendableOutputDescriptor_StaticOutput_get_output(ptr: number): number { +export function LDKSpendableOutputDescriptor_StaticOutput_get_output(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1487,7 +1494,7 @@ export function LDKSpendableOutputDescriptor_StaticOutput_get_output(ptr: number return nativeResponseValue; } /* @internal */ -export function LDKSpendableOutputDescriptor_DelayedPaymentOutput_get_delayed_payment_output(ptr: number): number { +export function LDKSpendableOutputDescriptor_DelayedPaymentOutput_get_delayed_payment_output(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1495,7 +1502,7 @@ export function LDKSpendableOutputDescriptor_DelayedPaymentOutput_get_delayed_pa return nativeResponseValue; } /* @internal */ -export function LDKSpendableOutputDescriptor_StaticPaymentOutput_get_static_payment_output(ptr: number): number { +export function LDKSpendableOutputDescriptor_StaticPaymentOutput_get_static_payment_output(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1507,7 +1514,7 @@ export class LDKEvent { protected constructor() {} } /* @internal */ -export function LDKEvent_ty_from_ptr(ptr: number): number { +export function LDKEvent_ty_from_ptr(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1515,7 +1522,7 @@ export function LDKEvent_ty_from_ptr(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKEvent_FundingGenerationReady_get_temporary_channel_id(ptr: number): number { +export function LDKEvent_FundingGenerationReady_get_temporary_channel_id(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1523,7 +1530,7 @@ export function LDKEvent_FundingGenerationReady_get_temporary_channel_id(ptr: nu return nativeResponseValue; } /* @internal */ -export function LDKEvent_FundingGenerationReady_get_counterparty_node_id(ptr: number): number { +export function LDKEvent_FundingGenerationReady_get_counterparty_node_id(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1531,7 +1538,7 @@ export function LDKEvent_FundingGenerationReady_get_counterparty_node_id(ptr: nu return nativeResponseValue; } /* @internal */ -export function LDKEvent_FundingGenerationReady_get_channel_value_satoshis(ptr: number): bigint { +export function LDKEvent_FundingGenerationReady_get_channel_value_satoshis(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1539,7 +1546,7 @@ export function LDKEvent_FundingGenerationReady_get_channel_value_satoshis(ptr: return nativeResponseValue; } /* @internal */ -export function LDKEvent_FundingGenerationReady_get_output_script(ptr: number): number { +export function LDKEvent_FundingGenerationReady_get_output_script(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1547,7 +1554,7 @@ export function LDKEvent_FundingGenerationReady_get_output_script(ptr: number): return nativeResponseValue; } /* @internal */ -export function LDKEvent_FundingGenerationReady_get_user_channel_id(ptr: number): bigint { +export function LDKEvent_FundingGenerationReady_get_user_channel_id(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1555,7 +1562,7 @@ export function LDKEvent_FundingGenerationReady_get_user_channel_id(ptr: number) return nativeResponseValue; } /* @internal */ -export function LDKEvent_PaymentReceived_get_payment_hash(ptr: number): number { +export function LDKEvent_PaymentReceived_get_payment_hash(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1563,7 +1570,7 @@ export function LDKEvent_PaymentReceived_get_payment_hash(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKEvent_PaymentReceived_get_amount_msat(ptr: number): bigint { +export function LDKEvent_PaymentReceived_get_amount_msat(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1571,7 +1578,7 @@ export function LDKEvent_PaymentReceived_get_amount_msat(ptr: number): bigint { return nativeResponseValue; } /* @internal */ -export function LDKEvent_PaymentReceived_get_purpose(ptr: number): number { +export function LDKEvent_PaymentReceived_get_purpose(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1579,7 +1586,7 @@ export function LDKEvent_PaymentReceived_get_purpose(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKEvent_PaymentClaimed_get_payment_hash(ptr: number): number { +export function LDKEvent_PaymentClaimed_get_payment_hash(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1587,7 +1594,7 @@ export function LDKEvent_PaymentClaimed_get_payment_hash(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKEvent_PaymentClaimed_get_amount_msat(ptr: number): bigint { +export function LDKEvent_PaymentClaimed_get_amount_msat(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1595,7 +1602,7 @@ export function LDKEvent_PaymentClaimed_get_amount_msat(ptr: number): bigint { return nativeResponseValue; } /* @internal */ -export function LDKEvent_PaymentClaimed_get_purpose(ptr: number): number { +export function LDKEvent_PaymentClaimed_get_purpose(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1603,7 +1610,7 @@ export function LDKEvent_PaymentClaimed_get_purpose(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKEvent_PaymentSent_get_payment_id(ptr: number): number { +export function LDKEvent_PaymentSent_get_payment_id(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1611,7 +1618,7 @@ export function LDKEvent_PaymentSent_get_payment_id(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKEvent_PaymentSent_get_payment_preimage(ptr: number): number { +export function LDKEvent_PaymentSent_get_payment_preimage(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1619,7 +1626,7 @@ export function LDKEvent_PaymentSent_get_payment_preimage(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKEvent_PaymentSent_get_payment_hash(ptr: number): number { +export function LDKEvent_PaymentSent_get_payment_hash(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1627,7 +1634,7 @@ export function LDKEvent_PaymentSent_get_payment_hash(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKEvent_PaymentSent_get_fee_paid_msat(ptr: number): number { +export function LDKEvent_PaymentSent_get_fee_paid_msat(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1635,7 +1642,7 @@ export function LDKEvent_PaymentSent_get_fee_paid_msat(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKEvent_PaymentFailed_get_payment_id(ptr: number): number { +export function LDKEvent_PaymentFailed_get_payment_id(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1643,7 +1650,7 @@ export function LDKEvent_PaymentFailed_get_payment_id(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKEvent_PaymentFailed_get_payment_hash(ptr: number): number { +export function LDKEvent_PaymentFailed_get_payment_hash(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1651,7 +1658,7 @@ export function LDKEvent_PaymentFailed_get_payment_hash(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKEvent_PaymentPathSuccessful_get_payment_id(ptr: number): number { +export function LDKEvent_PaymentPathSuccessful_get_payment_id(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1659,7 +1666,7 @@ export function LDKEvent_PaymentPathSuccessful_get_payment_id(ptr: number): numb return nativeResponseValue; } /* @internal */ -export function LDKEvent_PaymentPathSuccessful_get_payment_hash(ptr: number): number { +export function LDKEvent_PaymentPathSuccessful_get_payment_hash(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1667,7 +1674,7 @@ export function LDKEvent_PaymentPathSuccessful_get_payment_hash(ptr: number): nu return nativeResponseValue; } /* @internal */ -export function LDKEvent_PaymentPathSuccessful_get_path(ptr: number): number { +export function LDKEvent_PaymentPathSuccessful_get_path(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1675,7 +1682,7 @@ export function LDKEvent_PaymentPathSuccessful_get_path(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKEvent_PaymentPathFailed_get_payment_id(ptr: number): number { +export function LDKEvent_PaymentPathFailed_get_payment_id(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1683,7 +1690,7 @@ export function LDKEvent_PaymentPathFailed_get_payment_id(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKEvent_PaymentPathFailed_get_payment_hash(ptr: number): number { +export function LDKEvent_PaymentPathFailed_get_payment_hash(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1691,7 +1698,7 @@ export function LDKEvent_PaymentPathFailed_get_payment_hash(ptr: number): number return nativeResponseValue; } /* @internal */ -export function LDKEvent_PaymentPathFailed_get_rejected_by_dest(ptr: number): boolean { +export function LDKEvent_PaymentPathFailed_get_rejected_by_dest(ptr: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1699,7 +1706,7 @@ export function LDKEvent_PaymentPathFailed_get_rejected_by_dest(ptr: number): bo return nativeResponseValue; } /* @internal */ -export function LDKEvent_PaymentPathFailed_get_network_update(ptr: number): number { +export function LDKEvent_PaymentPathFailed_get_network_update(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1707,7 +1714,7 @@ export function LDKEvent_PaymentPathFailed_get_network_update(ptr: number): numb return nativeResponseValue; } /* @internal */ -export function LDKEvent_PaymentPathFailed_get_all_paths_failed(ptr: number): boolean { +export function LDKEvent_PaymentPathFailed_get_all_paths_failed(ptr: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1715,7 +1722,7 @@ export function LDKEvent_PaymentPathFailed_get_all_paths_failed(ptr: number): bo return nativeResponseValue; } /* @internal */ -export function LDKEvent_PaymentPathFailed_get_path(ptr: number): number { +export function LDKEvent_PaymentPathFailed_get_path(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1723,7 +1730,7 @@ export function LDKEvent_PaymentPathFailed_get_path(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKEvent_PaymentPathFailed_get_short_channel_id(ptr: number): number { +export function LDKEvent_PaymentPathFailed_get_short_channel_id(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1731,7 +1738,7 @@ export function LDKEvent_PaymentPathFailed_get_short_channel_id(ptr: number): nu return nativeResponseValue; } /* @internal */ -export function LDKEvent_PaymentPathFailed_get_retry(ptr: number): number { +export function LDKEvent_PaymentPathFailed_get_retry(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1739,7 +1746,7 @@ export function LDKEvent_PaymentPathFailed_get_retry(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKEvent_ProbeSuccessful_get_payment_id(ptr: number): number { +export function LDKEvent_ProbeSuccessful_get_payment_id(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1747,7 +1754,7 @@ export function LDKEvent_ProbeSuccessful_get_payment_id(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKEvent_ProbeSuccessful_get_payment_hash(ptr: number): number { +export function LDKEvent_ProbeSuccessful_get_payment_hash(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1755,7 +1762,7 @@ export function LDKEvent_ProbeSuccessful_get_payment_hash(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKEvent_ProbeSuccessful_get_path(ptr: number): number { +export function LDKEvent_ProbeSuccessful_get_path(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1763,7 +1770,7 @@ export function LDKEvent_ProbeSuccessful_get_path(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKEvent_ProbeFailed_get_payment_id(ptr: number): number { +export function LDKEvent_ProbeFailed_get_payment_id(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1771,7 +1778,7 @@ export function LDKEvent_ProbeFailed_get_payment_id(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKEvent_ProbeFailed_get_payment_hash(ptr: number): number { +export function LDKEvent_ProbeFailed_get_payment_hash(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1779,7 +1786,7 @@ export function LDKEvent_ProbeFailed_get_payment_hash(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKEvent_ProbeFailed_get_path(ptr: number): number { +export function LDKEvent_ProbeFailed_get_path(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1787,7 +1794,7 @@ export function LDKEvent_ProbeFailed_get_path(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKEvent_ProbeFailed_get_short_channel_id(ptr: number): number { +export function LDKEvent_ProbeFailed_get_short_channel_id(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1795,7 +1802,7 @@ export function LDKEvent_ProbeFailed_get_short_channel_id(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKEvent_PendingHTLCsForwardable_get_time_forwardable(ptr: number): bigint { +export function LDKEvent_PendingHTLCsForwardable_get_time_forwardable(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1803,7 +1810,7 @@ export function LDKEvent_PendingHTLCsForwardable_get_time_forwardable(ptr: numbe return nativeResponseValue; } /* @internal */ -export function LDKEvent_SpendableOutputs_get_outputs(ptr: number): number { +export function LDKEvent_SpendableOutputs_get_outputs(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1811,7 +1818,7 @@ export function LDKEvent_SpendableOutputs_get_outputs(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKEvent_PaymentForwarded_get_prev_channel_id(ptr: number): number { +export function LDKEvent_PaymentForwarded_get_prev_channel_id(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1819,7 +1826,7 @@ export function LDKEvent_PaymentForwarded_get_prev_channel_id(ptr: number): numb return nativeResponseValue; } /* @internal */ -export function LDKEvent_PaymentForwarded_get_next_channel_id(ptr: number): number { +export function LDKEvent_PaymentForwarded_get_next_channel_id(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1827,7 +1834,7 @@ export function LDKEvent_PaymentForwarded_get_next_channel_id(ptr: number): numb return nativeResponseValue; } /* @internal */ -export function LDKEvent_PaymentForwarded_get_fee_earned_msat(ptr: number): number { +export function LDKEvent_PaymentForwarded_get_fee_earned_msat(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1835,7 +1842,7 @@ export function LDKEvent_PaymentForwarded_get_fee_earned_msat(ptr: number): numb return nativeResponseValue; } /* @internal */ -export function LDKEvent_PaymentForwarded_get_claim_from_onchain_tx(ptr: number): boolean { +export function LDKEvent_PaymentForwarded_get_claim_from_onchain_tx(ptr: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1843,7 +1850,7 @@ export function LDKEvent_PaymentForwarded_get_claim_from_onchain_tx(ptr: number) return nativeResponseValue; } /* @internal */ -export function LDKEvent_ChannelClosed_get_channel_id(ptr: number): number { +export function LDKEvent_ChannelClosed_get_channel_id(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1851,7 +1858,7 @@ export function LDKEvent_ChannelClosed_get_channel_id(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKEvent_ChannelClosed_get_user_channel_id(ptr: number): bigint { +export function LDKEvent_ChannelClosed_get_user_channel_id(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1859,7 +1866,7 @@ export function LDKEvent_ChannelClosed_get_user_channel_id(ptr: number): bigint return nativeResponseValue; } /* @internal */ -export function LDKEvent_ChannelClosed_get_reason(ptr: number): number { +export function LDKEvent_ChannelClosed_get_reason(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1867,7 +1874,7 @@ export function LDKEvent_ChannelClosed_get_reason(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKEvent_DiscardFunding_get_channel_id(ptr: number): number { +export function LDKEvent_DiscardFunding_get_channel_id(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1875,7 +1882,7 @@ export function LDKEvent_DiscardFunding_get_channel_id(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKEvent_DiscardFunding_get_transaction(ptr: number): number { +export function LDKEvent_DiscardFunding_get_transaction(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1883,7 +1890,7 @@ export function LDKEvent_DiscardFunding_get_transaction(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKEvent_OpenChannelRequest_get_temporary_channel_id(ptr: number): number { +export function LDKEvent_OpenChannelRequest_get_temporary_channel_id(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1891,7 +1898,7 @@ export function LDKEvent_OpenChannelRequest_get_temporary_channel_id(ptr: number return nativeResponseValue; } /* @internal */ -export function LDKEvent_OpenChannelRequest_get_counterparty_node_id(ptr: number): number { +export function LDKEvent_OpenChannelRequest_get_counterparty_node_id(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1899,7 +1906,7 @@ export function LDKEvent_OpenChannelRequest_get_counterparty_node_id(ptr: number return nativeResponseValue; } /* @internal */ -export function LDKEvent_OpenChannelRequest_get_funding_satoshis(ptr: number): bigint { +export function LDKEvent_OpenChannelRequest_get_funding_satoshis(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1907,7 +1914,7 @@ export function LDKEvent_OpenChannelRequest_get_funding_satoshis(ptr: number): b return nativeResponseValue; } /* @internal */ -export function LDKEvent_OpenChannelRequest_get_push_msat(ptr: number): bigint { +export function LDKEvent_OpenChannelRequest_get_push_msat(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1915,7 +1922,7 @@ export function LDKEvent_OpenChannelRequest_get_push_msat(ptr: number): bigint { return nativeResponseValue; } /* @internal */ -export function LDKEvent_OpenChannelRequest_get_channel_type(ptr: number): number { +export function LDKEvent_OpenChannelRequest_get_channel_type(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1923,7 +1930,7 @@ export function LDKEvent_OpenChannelRequest_get_channel_type(ptr: number): numbe return nativeResponseValue; } /* @internal */ -export function LDKEvent_HTLCHandlingFailed_get_prev_channel_id(ptr: number): number { +export function LDKEvent_HTLCHandlingFailed_get_prev_channel_id(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1931,7 +1938,7 @@ export function LDKEvent_HTLCHandlingFailed_get_prev_channel_id(ptr: number): nu return nativeResponseValue; } /* @internal */ -export function LDKEvent_HTLCHandlingFailed_get_failed_next_destination(ptr: number): number { +export function LDKEvent_HTLCHandlingFailed_get_failed_next_destination(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1943,7 +1950,7 @@ export class LDKCOption_EventZ { protected constructor() {} } /* @internal */ -export function LDKCOption_EventZ_ty_from_ptr(ptr: number): number { +export function LDKCOption_EventZ_ty_from_ptr(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1951,7 +1958,7 @@ export function LDKCOption_EventZ_ty_from_ptr(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKCOption_EventZ_Some_get_some(ptr: number): number { +export function LDKCOption_EventZ_Some_get_some(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1960,7 +1967,7 @@ export function LDKCOption_EventZ_Some_get_some(ptr: number): number { } // struct LDKCOption_EventZ CResult_COption_EventZDecodeErrorZ_get_ok(LDKCResult_COption_EventZDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_COption_EventZDecodeErrorZ_get_ok(owner: number): number { +export function CResult_COption_EventZDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1969,7 +1976,7 @@ export function CResult_COption_EventZDecodeErrorZ_get_ok(owner: number): number } // struct LDKDecodeError CResult_COption_EventZDecodeErrorZ_get_err(LDKCResult_COption_EventZDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_COption_EventZDecodeErrorZ_get_err(owner: number): number { +export function CResult_COption_EventZDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1981,7 +1988,7 @@ export class LDKErrorAction { protected constructor() {} } /* @internal */ -export function LDKErrorAction_ty_from_ptr(ptr: number): number { +export function LDKErrorAction_ty_from_ptr(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1989,7 +1996,7 @@ export function LDKErrorAction_ty_from_ptr(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKErrorAction_DisconnectPeer_get_msg(ptr: number): number { +export function LDKErrorAction_DisconnectPeer_get_msg(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -1997,7 +2004,7 @@ export function LDKErrorAction_DisconnectPeer_get_msg(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKErrorAction_IgnoreAndLog_get_ignore_and_log(ptr: number): Level { +export function LDKErrorAction_IgnoreAndLog_get_ignore_and_log(ptr: bigint): Level { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2005,7 +2012,7 @@ export function LDKErrorAction_IgnoreAndLog_get_ignore_and_log(ptr: number): Lev return nativeResponseValue; } /* @internal */ -export function LDKErrorAction_SendErrorMessage_get_msg(ptr: number): number { +export function LDKErrorAction_SendErrorMessage_get_msg(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2013,7 +2020,7 @@ export function LDKErrorAction_SendErrorMessage_get_msg(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKErrorAction_SendWarningMessage_get_msg(ptr: number): number { +export function LDKErrorAction_SendWarningMessage_get_msg(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2021,7 +2028,7 @@ export function LDKErrorAction_SendWarningMessage_get_msg(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKErrorAction_SendWarningMessage_get_log_level(ptr: number): Level { +export function LDKErrorAction_SendWarningMessage_get_log_level(ptr: bigint): Level { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2033,7 +2040,7 @@ export class LDKMessageSendEvent { protected constructor() {} } /* @internal */ -export function LDKMessageSendEvent_ty_from_ptr(ptr: number): number { +export function LDKMessageSendEvent_ty_from_ptr(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2041,7 +2048,7 @@ export function LDKMessageSendEvent_ty_from_ptr(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKMessageSendEvent_SendAcceptChannel_get_node_id(ptr: number): number { +export function LDKMessageSendEvent_SendAcceptChannel_get_node_id(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2049,7 +2056,7 @@ export function LDKMessageSendEvent_SendAcceptChannel_get_node_id(ptr: number): return nativeResponseValue; } /* @internal */ -export function LDKMessageSendEvent_SendAcceptChannel_get_msg(ptr: number): number { +export function LDKMessageSendEvent_SendAcceptChannel_get_msg(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2057,7 +2064,7 @@ export function LDKMessageSendEvent_SendAcceptChannel_get_msg(ptr: number): numb return nativeResponseValue; } /* @internal */ -export function LDKMessageSendEvent_SendOpenChannel_get_node_id(ptr: number): number { +export function LDKMessageSendEvent_SendOpenChannel_get_node_id(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2065,7 +2072,7 @@ export function LDKMessageSendEvent_SendOpenChannel_get_node_id(ptr: number): nu return nativeResponseValue; } /* @internal */ -export function LDKMessageSendEvent_SendOpenChannel_get_msg(ptr: number): number { +export function LDKMessageSendEvent_SendOpenChannel_get_msg(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2073,7 +2080,7 @@ export function LDKMessageSendEvent_SendOpenChannel_get_msg(ptr: number): number return nativeResponseValue; } /* @internal */ -export function LDKMessageSendEvent_SendFundingCreated_get_node_id(ptr: number): number { +export function LDKMessageSendEvent_SendFundingCreated_get_node_id(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2081,7 +2088,7 @@ export function LDKMessageSendEvent_SendFundingCreated_get_node_id(ptr: number): return nativeResponseValue; } /* @internal */ -export function LDKMessageSendEvent_SendFundingCreated_get_msg(ptr: number): number { +export function LDKMessageSendEvent_SendFundingCreated_get_msg(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2089,7 +2096,7 @@ export function LDKMessageSendEvent_SendFundingCreated_get_msg(ptr: number): num return nativeResponseValue; } /* @internal */ -export function LDKMessageSendEvent_SendFundingSigned_get_node_id(ptr: number): number { +export function LDKMessageSendEvent_SendFundingSigned_get_node_id(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2097,7 +2104,7 @@ export function LDKMessageSendEvent_SendFundingSigned_get_node_id(ptr: number): return nativeResponseValue; } /* @internal */ -export function LDKMessageSendEvent_SendFundingSigned_get_msg(ptr: number): number { +export function LDKMessageSendEvent_SendFundingSigned_get_msg(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2105,7 +2112,7 @@ export function LDKMessageSendEvent_SendFundingSigned_get_msg(ptr: number): numb return nativeResponseValue; } /* @internal */ -export function LDKMessageSendEvent_SendChannelReady_get_node_id(ptr: number): number { +export function LDKMessageSendEvent_SendChannelReady_get_node_id(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2113,7 +2120,7 @@ export function LDKMessageSendEvent_SendChannelReady_get_node_id(ptr: number): n return nativeResponseValue; } /* @internal */ -export function LDKMessageSendEvent_SendChannelReady_get_msg(ptr: number): number { +export function LDKMessageSendEvent_SendChannelReady_get_msg(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2121,7 +2128,7 @@ export function LDKMessageSendEvent_SendChannelReady_get_msg(ptr: number): numbe return nativeResponseValue; } /* @internal */ -export function LDKMessageSendEvent_SendAnnouncementSignatures_get_node_id(ptr: number): number { +export function LDKMessageSendEvent_SendAnnouncementSignatures_get_node_id(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2129,7 +2136,7 @@ export function LDKMessageSendEvent_SendAnnouncementSignatures_get_node_id(ptr: return nativeResponseValue; } /* @internal */ -export function LDKMessageSendEvent_SendAnnouncementSignatures_get_msg(ptr: number): number { +export function LDKMessageSendEvent_SendAnnouncementSignatures_get_msg(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2137,7 +2144,7 @@ export function LDKMessageSendEvent_SendAnnouncementSignatures_get_msg(ptr: numb return nativeResponseValue; } /* @internal */ -export function LDKMessageSendEvent_UpdateHTLCs_get_node_id(ptr: number): number { +export function LDKMessageSendEvent_UpdateHTLCs_get_node_id(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2145,7 +2152,7 @@ export function LDKMessageSendEvent_UpdateHTLCs_get_node_id(ptr: number): number return nativeResponseValue; } /* @internal */ -export function LDKMessageSendEvent_UpdateHTLCs_get_updates(ptr: number): number { +export function LDKMessageSendEvent_UpdateHTLCs_get_updates(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2153,7 +2160,7 @@ export function LDKMessageSendEvent_UpdateHTLCs_get_updates(ptr: number): number return nativeResponseValue; } /* @internal */ -export function LDKMessageSendEvent_SendRevokeAndACK_get_node_id(ptr: number): number { +export function LDKMessageSendEvent_SendRevokeAndACK_get_node_id(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2161,7 +2168,7 @@ export function LDKMessageSendEvent_SendRevokeAndACK_get_node_id(ptr: number): n return nativeResponseValue; } /* @internal */ -export function LDKMessageSendEvent_SendRevokeAndACK_get_msg(ptr: number): number { +export function LDKMessageSendEvent_SendRevokeAndACK_get_msg(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2169,7 +2176,7 @@ export function LDKMessageSendEvent_SendRevokeAndACK_get_msg(ptr: number): numbe return nativeResponseValue; } /* @internal */ -export function LDKMessageSendEvent_SendClosingSigned_get_node_id(ptr: number): number { +export function LDKMessageSendEvent_SendClosingSigned_get_node_id(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2177,7 +2184,7 @@ export function LDKMessageSendEvent_SendClosingSigned_get_node_id(ptr: number): return nativeResponseValue; } /* @internal */ -export function LDKMessageSendEvent_SendClosingSigned_get_msg(ptr: number): number { +export function LDKMessageSendEvent_SendClosingSigned_get_msg(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2185,7 +2192,7 @@ export function LDKMessageSendEvent_SendClosingSigned_get_msg(ptr: number): numb return nativeResponseValue; } /* @internal */ -export function LDKMessageSendEvent_SendShutdown_get_node_id(ptr: number): number { +export function LDKMessageSendEvent_SendShutdown_get_node_id(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2193,7 +2200,7 @@ export function LDKMessageSendEvent_SendShutdown_get_node_id(ptr: number): numbe return nativeResponseValue; } /* @internal */ -export function LDKMessageSendEvent_SendShutdown_get_msg(ptr: number): number { +export function LDKMessageSendEvent_SendShutdown_get_msg(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2201,7 +2208,7 @@ export function LDKMessageSendEvent_SendShutdown_get_msg(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKMessageSendEvent_SendChannelReestablish_get_node_id(ptr: number): number { +export function LDKMessageSendEvent_SendChannelReestablish_get_node_id(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2209,7 +2216,7 @@ export function LDKMessageSendEvent_SendChannelReestablish_get_node_id(ptr: numb return nativeResponseValue; } /* @internal */ -export function LDKMessageSendEvent_SendChannelReestablish_get_msg(ptr: number): number { +export function LDKMessageSendEvent_SendChannelReestablish_get_msg(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2217,7 +2224,7 @@ export function LDKMessageSendEvent_SendChannelReestablish_get_msg(ptr: number): return nativeResponseValue; } /* @internal */ -export function LDKMessageSendEvent_BroadcastChannelAnnouncement_get_msg(ptr: number): number { +export function LDKMessageSendEvent_BroadcastChannelAnnouncement_get_msg(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2225,7 +2232,7 @@ export function LDKMessageSendEvent_BroadcastChannelAnnouncement_get_msg(ptr: nu return nativeResponseValue; } /* @internal */ -export function LDKMessageSendEvent_BroadcastChannelAnnouncement_get_update_msg(ptr: number): number { +export function LDKMessageSendEvent_BroadcastChannelAnnouncement_get_update_msg(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2233,7 +2240,7 @@ export function LDKMessageSendEvent_BroadcastChannelAnnouncement_get_update_msg( return nativeResponseValue; } /* @internal */ -export function LDKMessageSendEvent_BroadcastNodeAnnouncement_get_msg(ptr: number): number { +export function LDKMessageSendEvent_BroadcastNodeAnnouncement_get_msg(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2241,7 +2248,7 @@ export function LDKMessageSendEvent_BroadcastNodeAnnouncement_get_msg(ptr: numbe return nativeResponseValue; } /* @internal */ -export function LDKMessageSendEvent_BroadcastChannelUpdate_get_msg(ptr: number): number { +export function LDKMessageSendEvent_BroadcastChannelUpdate_get_msg(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2249,7 +2256,7 @@ export function LDKMessageSendEvent_BroadcastChannelUpdate_get_msg(ptr: number): return nativeResponseValue; } /* @internal */ -export function LDKMessageSendEvent_SendChannelUpdate_get_node_id(ptr: number): number { +export function LDKMessageSendEvent_SendChannelUpdate_get_node_id(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2257,7 +2264,7 @@ export function LDKMessageSendEvent_SendChannelUpdate_get_node_id(ptr: number): return nativeResponseValue; } /* @internal */ -export function LDKMessageSendEvent_SendChannelUpdate_get_msg(ptr: number): number { +export function LDKMessageSendEvent_SendChannelUpdate_get_msg(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2265,7 +2272,7 @@ export function LDKMessageSendEvent_SendChannelUpdate_get_msg(ptr: number): numb return nativeResponseValue; } /* @internal */ -export function LDKMessageSendEvent_HandleError_get_node_id(ptr: number): number { +export function LDKMessageSendEvent_HandleError_get_node_id(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2273,7 +2280,7 @@ export function LDKMessageSendEvent_HandleError_get_node_id(ptr: number): number return nativeResponseValue; } /* @internal */ -export function LDKMessageSendEvent_HandleError_get_action(ptr: number): number { +export function LDKMessageSendEvent_HandleError_get_action(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2281,7 +2288,7 @@ export function LDKMessageSendEvent_HandleError_get_action(ptr: number): number return nativeResponseValue; } /* @internal */ -export function LDKMessageSendEvent_SendChannelRangeQuery_get_node_id(ptr: number): number { +export function LDKMessageSendEvent_SendChannelRangeQuery_get_node_id(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2289,7 +2296,7 @@ export function LDKMessageSendEvent_SendChannelRangeQuery_get_node_id(ptr: numbe return nativeResponseValue; } /* @internal */ -export function LDKMessageSendEvent_SendChannelRangeQuery_get_msg(ptr: number): number { +export function LDKMessageSendEvent_SendChannelRangeQuery_get_msg(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2297,7 +2304,7 @@ export function LDKMessageSendEvent_SendChannelRangeQuery_get_msg(ptr: number): return nativeResponseValue; } /* @internal */ -export function LDKMessageSendEvent_SendShortIdsQuery_get_node_id(ptr: number): number { +export function LDKMessageSendEvent_SendShortIdsQuery_get_node_id(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2305,7 +2312,7 @@ export function LDKMessageSendEvent_SendShortIdsQuery_get_node_id(ptr: number): return nativeResponseValue; } /* @internal */ -export function LDKMessageSendEvent_SendShortIdsQuery_get_msg(ptr: number): number { +export function LDKMessageSendEvent_SendShortIdsQuery_get_msg(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2313,7 +2320,7 @@ export function LDKMessageSendEvent_SendShortIdsQuery_get_msg(ptr: number): numb return nativeResponseValue; } /* @internal */ -export function LDKMessageSendEvent_SendReplyChannelRange_get_node_id(ptr: number): number { +export function LDKMessageSendEvent_SendReplyChannelRange_get_node_id(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2321,7 +2328,7 @@ export function LDKMessageSendEvent_SendReplyChannelRange_get_node_id(ptr: numbe return nativeResponseValue; } /* @internal */ -export function LDKMessageSendEvent_SendReplyChannelRange_get_msg(ptr: number): number { +export function LDKMessageSendEvent_SendReplyChannelRange_get_msg(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2329,7 +2336,7 @@ export function LDKMessageSendEvent_SendReplyChannelRange_get_msg(ptr: number): return nativeResponseValue; } /* @internal */ -export function LDKMessageSendEvent_SendGossipTimestampFilter_get_node_id(ptr: number): number { +export function LDKMessageSendEvent_SendGossipTimestampFilter_get_node_id(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2337,7 +2344,7 @@ export function LDKMessageSendEvent_SendGossipTimestampFilter_get_node_id(ptr: n return nativeResponseValue; } /* @internal */ -export function LDKMessageSendEvent_SendGossipTimestampFilter_get_msg(ptr: number): number { +export function LDKMessageSendEvent_SendGossipTimestampFilter_get_msg(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2346,7 +2353,7 @@ export function LDKMessageSendEvent_SendGossipTimestampFilter_get_msg(ptr: numbe } // struct LDKTxOut CResult_TxOutAccessErrorZ_get_ok(LDKCResult_TxOutAccessErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_TxOutAccessErrorZ_get_ok(owner: number): number { +export function CResult_TxOutAccessErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2355,7 +2362,7 @@ export function CResult_TxOutAccessErrorZ_get_ok(owner: number): number { } // enum LDKAccessError CResult_TxOutAccessErrorZ_get_err(LDKCResult_TxOutAccessErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_TxOutAccessErrorZ_get_err(owner: number): AccessError { +export function CResult_TxOutAccessErrorZ_get_err(owner: bigint): AccessError { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2364,7 +2371,7 @@ export function CResult_TxOutAccessErrorZ_get_err(owner: number): AccessError { } // uintptr_t C2Tuple_usizeTransactionZ_get_a(LDKC2Tuple_usizeTransactionZ *NONNULL_PTR owner); /* @internal */ -export function C2Tuple_usizeTransactionZ_get_a(owner: number): number { +export function C2Tuple_usizeTransactionZ_get_a(owner: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2373,7 +2380,7 @@ export function C2Tuple_usizeTransactionZ_get_a(owner: number): number { } // struct LDKTransaction C2Tuple_usizeTransactionZ_get_b(LDKC2Tuple_usizeTransactionZ *NONNULL_PTR owner); /* @internal */ -export function C2Tuple_usizeTransactionZ_get_b(owner: number): number { +export function C2Tuple_usizeTransactionZ_get_b(owner: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2382,7 +2389,7 @@ export function C2Tuple_usizeTransactionZ_get_b(owner: number): number { } // void CResult_NoneChannelMonitorUpdateErrZ_get_ok(LDKCResult_NoneChannelMonitorUpdateErrZ *NONNULL_PTR owner); /* @internal */ -export function CResult_NoneChannelMonitorUpdateErrZ_get_ok(owner: number): void { +export function CResult_NoneChannelMonitorUpdateErrZ_get_ok(owner: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2391,7 +2398,7 @@ export function CResult_NoneChannelMonitorUpdateErrZ_get_ok(owner: number): void } // enum LDKChannelMonitorUpdateErr CResult_NoneChannelMonitorUpdateErrZ_get_err(LDKCResult_NoneChannelMonitorUpdateErrZ *NONNULL_PTR owner); /* @internal */ -export function CResult_NoneChannelMonitorUpdateErrZ_get_err(owner: number): ChannelMonitorUpdateErr { +export function CResult_NoneChannelMonitorUpdateErrZ_get_err(owner: bigint): ChannelMonitorUpdateErr { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2403,7 +2410,7 @@ export class LDKMonitorEvent { protected constructor() {} } /* @internal */ -export function LDKMonitorEvent_ty_from_ptr(ptr: number): number { +export function LDKMonitorEvent_ty_from_ptr(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2411,7 +2418,7 @@ export function LDKMonitorEvent_ty_from_ptr(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKMonitorEvent_HTLCEvent_get_htlc_event(ptr: number): number { +export function LDKMonitorEvent_HTLCEvent_get_htlc_event(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2419,7 +2426,7 @@ export function LDKMonitorEvent_HTLCEvent_get_htlc_event(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKMonitorEvent_CommitmentTxConfirmed_get_commitment_tx_confirmed(ptr: number): number { +export function LDKMonitorEvent_CommitmentTxConfirmed_get_commitment_tx_confirmed(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2427,7 +2434,7 @@ export function LDKMonitorEvent_CommitmentTxConfirmed_get_commitment_tx_confirme return nativeResponseValue; } /* @internal */ -export function LDKMonitorEvent_UpdateCompleted_get_funding_txo(ptr: number): number { +export function LDKMonitorEvent_UpdateCompleted_get_funding_txo(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2435,7 +2442,7 @@ export function LDKMonitorEvent_UpdateCompleted_get_funding_txo(ptr: number): nu return nativeResponseValue; } /* @internal */ -export function LDKMonitorEvent_UpdateCompleted_get_monitor_update_id(ptr: number): bigint { +export function LDKMonitorEvent_UpdateCompleted_get_monitor_update_id(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2443,7 +2450,7 @@ export function LDKMonitorEvent_UpdateCompleted_get_monitor_update_id(ptr: numbe return nativeResponseValue; } /* @internal */ -export function LDKMonitorEvent_UpdateFailed_get_update_failed(ptr: number): number { +export function LDKMonitorEvent_UpdateFailed_get_update_failed(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2452,7 +2459,7 @@ export function LDKMonitorEvent_UpdateFailed_get_update_failed(ptr: number): num } // struct LDKOutPoint C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_a(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ *NONNULL_PTR owner); /* @internal */ -export function C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_a(owner: number): number { +export function C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_a(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2461,7 +2468,7 @@ export function C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_a(owner: number } // struct LDKCVec_MonitorEventZ C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_b(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ *NONNULL_PTR owner); /* @internal */ -export function C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_b(owner: number): number { +export function C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_b(owner: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2470,7 +2477,7 @@ export function C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_b(owner: number } // struct LDKPublicKey C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_c(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ *NONNULL_PTR owner); /* @internal */ -export function C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_c(owner: number): number { +export function C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_c(owner: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2482,7 +2489,7 @@ export class LDKCOption_C2Tuple_usizeTransactionZZ { protected constructor() {} } /* @internal */ -export function LDKCOption_C2Tuple_usizeTransactionZZ_ty_from_ptr(ptr: number): number { +export function LDKCOption_C2Tuple_usizeTransactionZZ_ty_from_ptr(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2490,7 +2497,7 @@ export function LDKCOption_C2Tuple_usizeTransactionZZ_ty_from_ptr(ptr: number): return nativeResponseValue; } /* @internal */ -export function LDKCOption_C2Tuple_usizeTransactionZZ_Some_get_some(ptr: number): number { +export function LDKCOption_C2Tuple_usizeTransactionZZ_Some_get_some(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2499,7 +2506,7 @@ export function LDKCOption_C2Tuple_usizeTransactionZZ_Some_get_some(ptr: number) } // struct LDKFixedPenaltyScorer CResult_FixedPenaltyScorerDecodeErrorZ_get_ok(LDKCResult_FixedPenaltyScorerDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_FixedPenaltyScorerDecodeErrorZ_get_ok(owner: number): number { +export function CResult_FixedPenaltyScorerDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2508,7 +2515,7 @@ export function CResult_FixedPenaltyScorerDecodeErrorZ_get_ok(owner: number): nu } // struct LDKDecodeError CResult_FixedPenaltyScorerDecodeErrorZ_get_err(LDKCResult_FixedPenaltyScorerDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_FixedPenaltyScorerDecodeErrorZ_get_err(owner: number): number { +export function CResult_FixedPenaltyScorerDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2517,7 +2524,7 @@ export function CResult_FixedPenaltyScorerDecodeErrorZ_get_err(owner: number): n } // uint64_t C2Tuple_u64u64Z_get_a(LDKC2Tuple_u64u64Z *NONNULL_PTR owner); /* @internal */ -export function C2Tuple_u64u64Z_get_a(owner: number): bigint { +export function C2Tuple_u64u64Z_get_a(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2526,7 +2533,7 @@ export function C2Tuple_u64u64Z_get_a(owner: number): bigint { } // uint64_t C2Tuple_u64u64Z_get_b(LDKC2Tuple_u64u64Z *NONNULL_PTR owner); /* @internal */ -export function C2Tuple_u64u64Z_get_b(owner: number): bigint { +export function C2Tuple_u64u64Z_get_b(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2538,7 +2545,7 @@ export class LDKCOption_C2Tuple_u64u64ZZ { protected constructor() {} } /* @internal */ -export function LDKCOption_C2Tuple_u64u64ZZ_ty_from_ptr(ptr: number): number { +export function LDKCOption_C2Tuple_u64u64ZZ_ty_from_ptr(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2546,7 +2553,7 @@ export function LDKCOption_C2Tuple_u64u64ZZ_ty_from_ptr(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKCOption_C2Tuple_u64u64ZZ_Some_get_some(ptr: number): number { +export function LDKCOption_C2Tuple_u64u64ZZ_Some_get_some(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2555,11 +2562,11 @@ export function LDKCOption_C2Tuple_u64u64ZZ_Some_get_some(ptr: number): number { } /* @internal */ export interface LDKLogger { - log (record: number): void; + log (record: bigint): void; } /* @internal */ -export function LDKLogger_new(impl: LDKLogger): number { +export function LDKLogger_new(impl: LDKLogger): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2572,7 +2579,7 @@ export function LDKLogger_new(impl: LDKLogger): number { } // struct LDKProbabilisticScorer *CResult_ProbabilisticScorerDecodeErrorZ_get_ok(LDKCResult_ProbabilisticScorerDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ProbabilisticScorerDecodeErrorZ_get_ok(owner: number): number { +export function CResult_ProbabilisticScorerDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2581,7 +2588,7 @@ export function CResult_ProbabilisticScorerDecodeErrorZ_get_ok(owner: number): n } // struct LDKDecodeError CResult_ProbabilisticScorerDecodeErrorZ_get_err(LDKCResult_ProbabilisticScorerDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ProbabilisticScorerDecodeErrorZ_get_err(owner: number): number { +export function CResult_ProbabilisticScorerDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2590,7 +2597,7 @@ export function CResult_ProbabilisticScorerDecodeErrorZ_get_err(owner: number): } // struct LDKInitFeatures CResult_InitFeaturesDecodeErrorZ_get_ok(LDKCResult_InitFeaturesDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_InitFeaturesDecodeErrorZ_get_ok(owner: number): number { +export function CResult_InitFeaturesDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2599,7 +2606,7 @@ export function CResult_InitFeaturesDecodeErrorZ_get_ok(owner: number): number { } // struct LDKDecodeError CResult_InitFeaturesDecodeErrorZ_get_err(LDKCResult_InitFeaturesDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_InitFeaturesDecodeErrorZ_get_err(owner: number): number { +export function CResult_InitFeaturesDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2608,7 +2615,7 @@ export function CResult_InitFeaturesDecodeErrorZ_get_err(owner: number): number } // struct LDKChannelFeatures CResult_ChannelFeaturesDecodeErrorZ_get_ok(LDKCResult_ChannelFeaturesDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ChannelFeaturesDecodeErrorZ_get_ok(owner: number): number { +export function CResult_ChannelFeaturesDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2617,7 +2624,7 @@ export function CResult_ChannelFeaturesDecodeErrorZ_get_ok(owner: number): numbe } // struct LDKDecodeError CResult_ChannelFeaturesDecodeErrorZ_get_err(LDKCResult_ChannelFeaturesDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ChannelFeaturesDecodeErrorZ_get_err(owner: number): number { +export function CResult_ChannelFeaturesDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2626,7 +2633,7 @@ export function CResult_ChannelFeaturesDecodeErrorZ_get_err(owner: number): numb } // struct LDKNodeFeatures CResult_NodeFeaturesDecodeErrorZ_get_ok(LDKCResult_NodeFeaturesDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_NodeFeaturesDecodeErrorZ_get_ok(owner: number): number { +export function CResult_NodeFeaturesDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2635,7 +2642,7 @@ export function CResult_NodeFeaturesDecodeErrorZ_get_ok(owner: number): number { } // struct LDKDecodeError CResult_NodeFeaturesDecodeErrorZ_get_err(LDKCResult_NodeFeaturesDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_NodeFeaturesDecodeErrorZ_get_err(owner: number): number { +export function CResult_NodeFeaturesDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2644,7 +2651,7 @@ export function CResult_NodeFeaturesDecodeErrorZ_get_err(owner: number): number } // struct LDKInvoiceFeatures CResult_InvoiceFeaturesDecodeErrorZ_get_ok(LDKCResult_InvoiceFeaturesDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_InvoiceFeaturesDecodeErrorZ_get_ok(owner: number): number { +export function CResult_InvoiceFeaturesDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2653,7 +2660,7 @@ export function CResult_InvoiceFeaturesDecodeErrorZ_get_ok(owner: number): numbe } // struct LDKDecodeError CResult_InvoiceFeaturesDecodeErrorZ_get_err(LDKCResult_InvoiceFeaturesDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_InvoiceFeaturesDecodeErrorZ_get_err(owner: number): number { +export function CResult_InvoiceFeaturesDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2662,7 +2669,7 @@ export function CResult_InvoiceFeaturesDecodeErrorZ_get_err(owner: number): numb } // struct LDKChannelTypeFeatures CResult_ChannelTypeFeaturesDecodeErrorZ_get_ok(LDKCResult_ChannelTypeFeaturesDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ChannelTypeFeaturesDecodeErrorZ_get_ok(owner: number): number { +export function CResult_ChannelTypeFeaturesDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2671,7 +2678,7 @@ export function CResult_ChannelTypeFeaturesDecodeErrorZ_get_ok(owner: number): n } // struct LDKDecodeError CResult_ChannelTypeFeaturesDecodeErrorZ_get_err(LDKCResult_ChannelTypeFeaturesDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ChannelTypeFeaturesDecodeErrorZ_get_err(owner: number): number { +export function CResult_ChannelTypeFeaturesDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2680,7 +2687,7 @@ export function CResult_ChannelTypeFeaturesDecodeErrorZ_get_err(owner: number): } // struct LDKNodeId CResult_NodeIdDecodeErrorZ_get_ok(LDKCResult_NodeIdDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_NodeIdDecodeErrorZ_get_ok(owner: number): number { +export function CResult_NodeIdDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2689,7 +2696,7 @@ export function CResult_NodeIdDecodeErrorZ_get_ok(owner: number): number { } // struct LDKDecodeError CResult_NodeIdDecodeErrorZ_get_err(LDKCResult_NodeIdDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_NodeIdDecodeErrorZ_get_err(owner: number): number { +export function CResult_NodeIdDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2698,7 +2705,7 @@ export function CResult_NodeIdDecodeErrorZ_get_err(owner: number): number { } // struct LDKCOption_NetworkUpdateZ CResult_COption_NetworkUpdateZDecodeErrorZ_get_ok(LDKCResult_COption_NetworkUpdateZDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_COption_NetworkUpdateZDecodeErrorZ_get_ok(owner: number): number { +export function CResult_COption_NetworkUpdateZDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2707,7 +2714,7 @@ export function CResult_COption_NetworkUpdateZDecodeErrorZ_get_ok(owner: number) } // struct LDKDecodeError CResult_COption_NetworkUpdateZDecodeErrorZ_get_err(LDKCResult_COption_NetworkUpdateZDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_COption_NetworkUpdateZDecodeErrorZ_get_err(owner: number): number { +export function CResult_COption_NetworkUpdateZDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2716,11 +2723,11 @@ export function CResult_COption_NetworkUpdateZDecodeErrorZ_get_err(owner: number } /* @internal */ export interface LDKAccess { - get_utxo (genesis_hash: number, short_channel_id: bigint): number; + get_utxo (genesis_hash: number, short_channel_id: bigint): bigint; } /* @internal */ -export function LDKAccess_new(impl: LDKAccess): number { +export function LDKAccess_new(impl: LDKAccess): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2733,7 +2740,7 @@ export function LDKAccess_new(impl: LDKAccess): number { } // LDKCResult_TxOutAccessErrorZ Access_get_utxo LDKAccess *NONNULL_PTR this_arg, const uint8_t (*genesis_hash)[32], uint64_t short_channel_id /* @internal */ -export function Access_get_utxo(this_arg: number, genesis_hash: number, short_channel_id: bigint): number { +export function Access_get_utxo(this_arg: bigint, genesis_hash: number, short_channel_id: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2745,7 +2752,7 @@ export class LDKCOption_AccessZ { protected constructor() {} } /* @internal */ -export function LDKCOption_AccessZ_ty_from_ptr(ptr: number): number { +export function LDKCOption_AccessZ_ty_from_ptr(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2753,7 +2760,7 @@ export function LDKCOption_AccessZ_ty_from_ptr(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKCOption_AccessZ_Some_get_some(ptr: number): number { +export function LDKCOption_AccessZ_Some_get_some(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2762,7 +2769,7 @@ export function LDKCOption_AccessZ_Some_get_some(ptr: number): number { } // bool CResult_boolLightningErrorZ_get_ok(LDKCResult_boolLightningErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_boolLightningErrorZ_get_ok(owner: number): boolean { +export function CResult_boolLightningErrorZ_get_ok(owner: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2771,7 +2778,7 @@ export function CResult_boolLightningErrorZ_get_ok(owner: number): boolean { } // struct LDKLightningError CResult_boolLightningErrorZ_get_err(LDKCResult_boolLightningErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_boolLightningErrorZ_get_err(owner: number): number { +export function CResult_boolLightningErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2780,7 +2787,7 @@ export function CResult_boolLightningErrorZ_get_err(owner: number): number { } // struct LDKChannelAnnouncement C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_a(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ *NONNULL_PTR owner); /* @internal */ -export function C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_a(owner: number): number { +export function C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_a(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2789,7 +2796,7 @@ export function C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_a(own } // struct LDKChannelUpdate C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_b(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ *NONNULL_PTR owner); /* @internal */ -export function C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_b(owner: number): number { +export function C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_b(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2798,7 +2805,7 @@ export function C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_b(own } // struct LDKChannelUpdate C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_c(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ *NONNULL_PTR owner); /* @internal */ -export function C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_c(owner: number): number { +export function C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_c(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2807,7 +2814,7 @@ export function C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_c(own } // void CResult_NoneLightningErrorZ_get_ok(LDKCResult_NoneLightningErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_NoneLightningErrorZ_get_ok(owner: number): void { +export function CResult_NoneLightningErrorZ_get_ok(owner: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2816,7 +2823,7 @@ export function CResult_NoneLightningErrorZ_get_ok(owner: number): void { } // struct LDKLightningError CResult_NoneLightningErrorZ_get_err(LDKCResult_NoneLightningErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_NoneLightningErrorZ_get_err(owner: number): number { +export function CResult_NoneLightningErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2825,7 +2832,7 @@ export function CResult_NoneLightningErrorZ_get_err(owner: number): number { } // struct LDKChannelUpdateInfo CResult_ChannelUpdateInfoDecodeErrorZ_get_ok(LDKCResult_ChannelUpdateInfoDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ChannelUpdateInfoDecodeErrorZ_get_ok(owner: number): number { +export function CResult_ChannelUpdateInfoDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2834,7 +2841,7 @@ export function CResult_ChannelUpdateInfoDecodeErrorZ_get_ok(owner: number): num } // struct LDKDecodeError CResult_ChannelUpdateInfoDecodeErrorZ_get_err(LDKCResult_ChannelUpdateInfoDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ChannelUpdateInfoDecodeErrorZ_get_err(owner: number): number { +export function CResult_ChannelUpdateInfoDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2843,7 +2850,7 @@ export function CResult_ChannelUpdateInfoDecodeErrorZ_get_err(owner: number): nu } // struct LDKChannelInfo CResult_ChannelInfoDecodeErrorZ_get_ok(LDKCResult_ChannelInfoDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ChannelInfoDecodeErrorZ_get_ok(owner: number): number { +export function CResult_ChannelInfoDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2852,7 +2859,7 @@ export function CResult_ChannelInfoDecodeErrorZ_get_ok(owner: number): number { } // struct LDKDecodeError CResult_ChannelInfoDecodeErrorZ_get_err(LDKCResult_ChannelInfoDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ChannelInfoDecodeErrorZ_get_err(owner: number): number { +export function CResult_ChannelInfoDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2861,7 +2868,7 @@ export function CResult_ChannelInfoDecodeErrorZ_get_err(owner: number): number { } // struct LDKRoutingFees CResult_RoutingFeesDecodeErrorZ_get_ok(LDKCResult_RoutingFeesDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_RoutingFeesDecodeErrorZ_get_ok(owner: number): number { +export function CResult_RoutingFeesDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2870,7 +2877,7 @@ export function CResult_RoutingFeesDecodeErrorZ_get_ok(owner: number): number { } // struct LDKDecodeError CResult_RoutingFeesDecodeErrorZ_get_err(LDKCResult_RoutingFeesDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_RoutingFeesDecodeErrorZ_get_err(owner: number): number { +export function CResult_RoutingFeesDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2882,7 +2889,7 @@ export class LDKNetAddress { protected constructor() {} } /* @internal */ -export function LDKNetAddress_ty_from_ptr(ptr: number): number { +export function LDKNetAddress_ty_from_ptr(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2890,7 +2897,7 @@ export function LDKNetAddress_ty_from_ptr(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKNetAddress_IPv4_get_addr(ptr: number): number { +export function LDKNetAddress_IPv4_get_addr(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2898,7 +2905,7 @@ export function LDKNetAddress_IPv4_get_addr(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKNetAddress_IPv4_get_port(ptr: number): number { +export function LDKNetAddress_IPv4_get_port(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2906,7 +2913,7 @@ export function LDKNetAddress_IPv4_get_port(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKNetAddress_IPv6_get_addr(ptr: number): number { +export function LDKNetAddress_IPv6_get_addr(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2914,7 +2921,7 @@ export function LDKNetAddress_IPv6_get_addr(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKNetAddress_IPv6_get_port(ptr: number): number { +export function LDKNetAddress_IPv6_get_port(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2922,7 +2929,7 @@ export function LDKNetAddress_IPv6_get_port(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKNetAddress_OnionV2_get_onion_v2(ptr: number): number { +export function LDKNetAddress_OnionV2_get_onion_v2(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2930,7 +2937,7 @@ export function LDKNetAddress_OnionV2_get_onion_v2(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKNetAddress_OnionV3_get_ed25519_pubkey(ptr: number): number { +export function LDKNetAddress_OnionV3_get_ed25519_pubkey(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2938,7 +2945,7 @@ export function LDKNetAddress_OnionV3_get_ed25519_pubkey(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKNetAddress_OnionV3_get_checksum(ptr: number): number { +export function LDKNetAddress_OnionV3_get_checksum(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2946,7 +2953,7 @@ export function LDKNetAddress_OnionV3_get_checksum(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKNetAddress_OnionV3_get_version(ptr: number): number { +export function LDKNetAddress_OnionV3_get_version(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2954,7 +2961,7 @@ export function LDKNetAddress_OnionV3_get_version(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKNetAddress_OnionV3_get_port(ptr: number): number { +export function LDKNetAddress_OnionV3_get_port(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2962,7 +2969,7 @@ export function LDKNetAddress_OnionV3_get_port(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKNetAddress_Hostname_get_hostname(ptr: number): number { +export function LDKNetAddress_Hostname_get_hostname(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2970,7 +2977,7 @@ export function LDKNetAddress_Hostname_get_hostname(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKNetAddress_Hostname_get_port(ptr: number): number { +export function LDKNetAddress_Hostname_get_port(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2979,7 +2986,7 @@ export function LDKNetAddress_Hostname_get_port(ptr: number): number { } // struct LDKNodeAnnouncementInfo CResult_NodeAnnouncementInfoDecodeErrorZ_get_ok(LDKCResult_NodeAnnouncementInfoDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_NodeAnnouncementInfoDecodeErrorZ_get_ok(owner: number): number { +export function CResult_NodeAnnouncementInfoDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2988,7 +2995,7 @@ export function CResult_NodeAnnouncementInfoDecodeErrorZ_get_ok(owner: number): } // struct LDKDecodeError CResult_NodeAnnouncementInfoDecodeErrorZ_get_err(LDKCResult_NodeAnnouncementInfoDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_NodeAnnouncementInfoDecodeErrorZ_get_err(owner: number): number { +export function CResult_NodeAnnouncementInfoDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -2997,7 +3004,7 @@ export function CResult_NodeAnnouncementInfoDecodeErrorZ_get_err(owner: number): } // struct LDKNodeAlias CResult_NodeAliasDecodeErrorZ_get_ok(LDKCResult_NodeAliasDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_NodeAliasDecodeErrorZ_get_ok(owner: number): number { +export function CResult_NodeAliasDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3006,7 +3013,7 @@ export function CResult_NodeAliasDecodeErrorZ_get_ok(owner: number): number { } // struct LDKDecodeError CResult_NodeAliasDecodeErrorZ_get_err(LDKCResult_NodeAliasDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_NodeAliasDecodeErrorZ_get_err(owner: number): number { +export function CResult_NodeAliasDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3015,7 +3022,7 @@ export function CResult_NodeAliasDecodeErrorZ_get_err(owner: number): number { } // struct LDKNodeInfo CResult_NodeInfoDecodeErrorZ_get_ok(LDKCResult_NodeInfoDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_NodeInfoDecodeErrorZ_get_ok(owner: number): number { +export function CResult_NodeInfoDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3024,7 +3031,7 @@ export function CResult_NodeInfoDecodeErrorZ_get_ok(owner: number): number { } // struct LDKDecodeError CResult_NodeInfoDecodeErrorZ_get_err(LDKCResult_NodeInfoDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_NodeInfoDecodeErrorZ_get_err(owner: number): number { +export function CResult_NodeInfoDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3033,7 +3040,7 @@ export function CResult_NodeInfoDecodeErrorZ_get_err(owner: number): number { } // struct LDKNetworkGraph *CResult_NetworkGraphDecodeErrorZ_get_ok(LDKCResult_NetworkGraphDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_NetworkGraphDecodeErrorZ_get_ok(owner: number): number { +export function CResult_NetworkGraphDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3042,7 +3049,7 @@ export function CResult_NetworkGraphDecodeErrorZ_get_ok(owner: number): number { } // struct LDKDecodeError CResult_NetworkGraphDecodeErrorZ_get_err(LDKCResult_NetworkGraphDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_NetworkGraphDecodeErrorZ_get_err(owner: number): number { +export function CResult_NetworkGraphDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3054,7 +3061,7 @@ export class LDKCOption_CVec_NetAddressZZ { protected constructor() {} } /* @internal */ -export function LDKCOption_CVec_NetAddressZZ_ty_from_ptr(ptr: number): number { +export function LDKCOption_CVec_NetAddressZZ_ty_from_ptr(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3062,7 +3069,7 @@ export function LDKCOption_CVec_NetAddressZZ_ty_from_ptr(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKCOption_CVec_NetAddressZZ_Some_get_some(ptr: number): number { +export function LDKCOption_CVec_NetAddressZZ_Some_get_some(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3071,7 +3078,7 @@ export function LDKCOption_CVec_NetAddressZZ_Some_get_some(ptr: number): number } // struct LDKDelayedPaymentOutputDescriptor CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_ok(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_ok(owner: number): number { +export function CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3080,7 +3087,7 @@ export function CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_ok(owner: } // struct LDKDecodeError CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_err(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_err(owner: number): number { +export function CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3089,7 +3096,7 @@ export function CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_err(owner } // struct LDKStaticPaymentOutputDescriptor CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_ok(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_ok(owner: number): number { +export function CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3098,7 +3105,7 @@ export function CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_ok(owner: } // struct LDKDecodeError CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_err(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_err(owner: number): number { +export function CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3107,7 +3114,7 @@ export function CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_err(owner: } // struct LDKSpendableOutputDescriptor CResult_SpendableOutputDescriptorDecodeErrorZ_get_ok(LDKCResult_SpendableOutputDescriptorDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_SpendableOutputDescriptorDecodeErrorZ_get_ok(owner: number): number { +export function CResult_SpendableOutputDescriptorDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3116,7 +3123,7 @@ export function CResult_SpendableOutputDescriptorDecodeErrorZ_get_ok(owner: numb } // struct LDKDecodeError CResult_SpendableOutputDescriptorDecodeErrorZ_get_err(LDKCResult_SpendableOutputDescriptorDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_SpendableOutputDescriptorDecodeErrorZ_get_err(owner: number): number { +export function CResult_SpendableOutputDescriptorDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3125,7 +3132,7 @@ export function CResult_SpendableOutputDescriptorDecodeErrorZ_get_err(owner: num } // struct LDKSignature C2Tuple_SignatureCVec_SignatureZZ_get_a(LDKC2Tuple_SignatureCVec_SignatureZZ *NONNULL_PTR owner); /* @internal */ -export function C2Tuple_SignatureCVec_SignatureZZ_get_a(owner: number): number { +export function C2Tuple_SignatureCVec_SignatureZZ_get_a(owner: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3134,7 +3141,7 @@ export function C2Tuple_SignatureCVec_SignatureZZ_get_a(owner: number): number { } // struct LDKCVec_SignatureZ C2Tuple_SignatureCVec_SignatureZZ_get_b(LDKC2Tuple_SignatureCVec_SignatureZZ *NONNULL_PTR owner); /* @internal */ -export function C2Tuple_SignatureCVec_SignatureZZ_get_b(owner: number): number { +export function C2Tuple_SignatureCVec_SignatureZZ_get_b(owner: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3143,7 +3150,7 @@ export function C2Tuple_SignatureCVec_SignatureZZ_get_b(owner: number): number { } // struct LDKC2Tuple_SignatureCVec_SignatureZZ CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_ok(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ *NONNULL_PTR owner); /* @internal */ -export function CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_ok(owner: number): number { +export function CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3152,7 +3159,7 @@ export function CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_ok(owner: num } // void CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_err(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ *NONNULL_PTR owner); /* @internal */ -export function CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_err(owner: number): void { +export function CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_err(owner: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3161,7 +3168,7 @@ export function CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_err(owner: nu } // struct LDKSignature CResult_SignatureNoneZ_get_ok(LDKCResult_SignatureNoneZ *NONNULL_PTR owner); /* @internal */ -export function CResult_SignatureNoneZ_get_ok(owner: number): number { +export function CResult_SignatureNoneZ_get_ok(owner: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3170,7 +3177,7 @@ export function CResult_SignatureNoneZ_get_ok(owner: number): number { } // void CResult_SignatureNoneZ_get_err(LDKCResult_SignatureNoneZ *NONNULL_PTR owner); /* @internal */ -export function CResult_SignatureNoneZ_get_err(owner: number): void { +export function CResult_SignatureNoneZ_get_err(owner: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3179,7 +3186,7 @@ export function CResult_SignatureNoneZ_get_err(owner: number): void { } // struct LDKSignature C2Tuple_SignatureSignatureZ_get_a(LDKC2Tuple_SignatureSignatureZ *NONNULL_PTR owner); /* @internal */ -export function C2Tuple_SignatureSignatureZ_get_a(owner: number): number { +export function C2Tuple_SignatureSignatureZ_get_a(owner: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3188,7 +3195,7 @@ export function C2Tuple_SignatureSignatureZ_get_a(owner: number): number { } // struct LDKSignature C2Tuple_SignatureSignatureZ_get_b(LDKC2Tuple_SignatureSignatureZ *NONNULL_PTR owner); /* @internal */ -export function C2Tuple_SignatureSignatureZ_get_b(owner: number): number { +export function C2Tuple_SignatureSignatureZ_get_b(owner: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3197,7 +3204,7 @@ export function C2Tuple_SignatureSignatureZ_get_b(owner: number): number { } // struct LDKC2Tuple_SignatureSignatureZ CResult_C2Tuple_SignatureSignatureZNoneZ_get_ok(LDKCResult_C2Tuple_SignatureSignatureZNoneZ *NONNULL_PTR owner); /* @internal */ -export function CResult_C2Tuple_SignatureSignatureZNoneZ_get_ok(owner: number): number { +export function CResult_C2Tuple_SignatureSignatureZNoneZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3206,7 +3213,7 @@ export function CResult_C2Tuple_SignatureSignatureZNoneZ_get_ok(owner: number): } // void CResult_C2Tuple_SignatureSignatureZNoneZ_get_err(LDKCResult_C2Tuple_SignatureSignatureZNoneZ *NONNULL_PTR owner); /* @internal */ -export function CResult_C2Tuple_SignatureSignatureZNoneZ_get_err(owner: number): void { +export function CResult_C2Tuple_SignatureSignatureZNoneZ_get_err(owner: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3215,7 +3222,7 @@ export function CResult_C2Tuple_SignatureSignatureZNoneZ_get_err(owner: number): } // struct LDKSecretKey CResult_SecretKeyNoneZ_get_ok(LDKCResult_SecretKeyNoneZ *NONNULL_PTR owner); /* @internal */ -export function CResult_SecretKeyNoneZ_get_ok(owner: number): number { +export function CResult_SecretKeyNoneZ_get_ok(owner: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3224,7 +3231,7 @@ export function CResult_SecretKeyNoneZ_get_ok(owner: number): number { } // void CResult_SecretKeyNoneZ_get_err(LDKCResult_SecretKeyNoneZ *NONNULL_PTR owner); /* @internal */ -export function CResult_SecretKeyNoneZ_get_err(owner: number): void { +export function CResult_SecretKeyNoneZ_get_err(owner: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3235,21 +3242,21 @@ export function CResult_SecretKeyNoneZ_get_err(owner: number): void { export interface LDKBaseSign { get_per_commitment_point (idx: bigint): number; release_commitment_secret (idx: bigint): number; - validate_holder_commitment (holder_tx: number, preimages: number): number; + validate_holder_commitment (holder_tx: bigint, preimages: number): bigint; channel_keys_id (): number; - sign_counterparty_commitment (commitment_tx: number, preimages: number): number; - validate_counterparty_revocation (idx: bigint, secret: number): number; - sign_holder_commitment_and_htlcs (commitment_tx: number): number; - sign_justice_revoked_output (justice_tx: number, input: number, amount: bigint, per_commitment_key: number): number; - sign_justice_revoked_htlc (justice_tx: number, input: number, amount: bigint, per_commitment_key: number, htlc: number): number; - sign_counterparty_htlc_transaction (htlc_tx: number, input: number, amount: bigint, per_commitment_point: number, htlc: number): number; - sign_closing_transaction (closing_tx: number): number; - sign_channel_announcement (msg: number): number; - ready_channel (channel_parameters: number): void; + sign_counterparty_commitment (commitment_tx: bigint, preimages: number): bigint; + validate_counterparty_revocation (idx: bigint, secret: number): bigint; + sign_holder_commitment_and_htlcs (commitment_tx: bigint): bigint; + sign_justice_revoked_output (justice_tx: number, input: number, amount: bigint, per_commitment_key: number): bigint; + sign_justice_revoked_htlc (justice_tx: number, input: number, amount: bigint, per_commitment_key: number, htlc: bigint): bigint; + sign_counterparty_htlc_transaction (htlc_tx: number, input: number, amount: bigint, per_commitment_point: number, htlc: bigint): bigint; + sign_closing_transaction (closing_tx: bigint): bigint; + sign_channel_announcement (msg: bigint): bigint; + ready_channel (channel_parameters: bigint): void; } /* @internal */ -export function LDKBaseSign_new(impl: LDKBaseSign, pubkeys: number): number { +export function LDKBaseSign_new(impl: LDKBaseSign, pubkeys: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3262,7 +3269,7 @@ export function LDKBaseSign_new(impl: LDKBaseSign, pubkeys: number): number { } // LDKPublicKey BaseSign_get_per_commitment_point LDKBaseSign *NONNULL_PTR this_arg, uint64_t idx /* @internal */ -export function BaseSign_get_per_commitment_point(this_arg: number, idx: bigint): number { +export function BaseSign_get_per_commitment_point(this_arg: bigint, idx: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3271,7 +3278,7 @@ export function BaseSign_get_per_commitment_point(this_arg: number, idx: bigint) } // LDKThirtyTwoBytes BaseSign_release_commitment_secret LDKBaseSign *NONNULL_PTR this_arg, uint64_t idx /* @internal */ -export function BaseSign_release_commitment_secret(this_arg: number, idx: bigint): number { +export function BaseSign_release_commitment_secret(this_arg: bigint, idx: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3280,7 +3287,7 @@ export function BaseSign_release_commitment_secret(this_arg: number, idx: bigint } // LDKCResult_NoneNoneZ BaseSign_validate_holder_commitment LDKBaseSign *NONNULL_PTR this_arg, const struct LDKHolderCommitmentTransaction *NONNULL_PTR holder_tx, struct LDKCVec_PaymentPreimageZ preimages /* @internal */ -export function BaseSign_validate_holder_commitment(this_arg: number, holder_tx: number, preimages: number): number { +export function BaseSign_validate_holder_commitment(this_arg: bigint, holder_tx: bigint, preimages: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3289,7 +3296,7 @@ export function BaseSign_validate_holder_commitment(this_arg: number, holder_tx: } // LDKThirtyTwoBytes BaseSign_channel_keys_id LDKBaseSign *NONNULL_PTR this_arg /* @internal */ -export function BaseSign_channel_keys_id(this_arg: number): number { +export function BaseSign_channel_keys_id(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3298,7 +3305,7 @@ export function BaseSign_channel_keys_id(this_arg: number): number { } // LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ BaseSign_sign_counterparty_commitment LDKBaseSign *NONNULL_PTR this_arg, const struct LDKCommitmentTransaction *NONNULL_PTR commitment_tx, struct LDKCVec_PaymentPreimageZ preimages /* @internal */ -export function BaseSign_sign_counterparty_commitment(this_arg: number, commitment_tx: number, preimages: number): number { +export function BaseSign_sign_counterparty_commitment(this_arg: bigint, commitment_tx: bigint, preimages: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3307,7 +3314,7 @@ export function BaseSign_sign_counterparty_commitment(this_arg: number, commitme } // LDKCResult_NoneNoneZ BaseSign_validate_counterparty_revocation LDKBaseSign *NONNULL_PTR this_arg, uint64_t idx, const uint8_t (*secret)[32] /* @internal */ -export function BaseSign_validate_counterparty_revocation(this_arg: number, idx: bigint, secret: number): number { +export function BaseSign_validate_counterparty_revocation(this_arg: bigint, idx: bigint, secret: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3316,7 +3323,7 @@ export function BaseSign_validate_counterparty_revocation(this_arg: number, idx: } // LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ BaseSign_sign_holder_commitment_and_htlcs LDKBaseSign *NONNULL_PTR this_arg, const struct LDKHolderCommitmentTransaction *NONNULL_PTR commitment_tx /* @internal */ -export function BaseSign_sign_holder_commitment_and_htlcs(this_arg: number, commitment_tx: number): number { +export function BaseSign_sign_holder_commitment_and_htlcs(this_arg: bigint, commitment_tx: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3325,7 +3332,7 @@ export function BaseSign_sign_holder_commitment_and_htlcs(this_arg: number, comm } // LDKCResult_SignatureNoneZ BaseSign_sign_justice_revoked_output LDKBaseSign *NONNULL_PTR this_arg, struct LDKTransaction justice_tx, uintptr_t input, uint64_t amount, const uint8_t (*per_commitment_key)[32] /* @internal */ -export function BaseSign_sign_justice_revoked_output(this_arg: number, justice_tx: number, input: number, amount: bigint, per_commitment_key: number): number { +export function BaseSign_sign_justice_revoked_output(this_arg: bigint, justice_tx: number, input: number, amount: bigint, per_commitment_key: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3334,7 +3341,7 @@ export function BaseSign_sign_justice_revoked_output(this_arg: number, justice_t } // LDKCResult_SignatureNoneZ BaseSign_sign_justice_revoked_htlc LDKBaseSign *NONNULL_PTR this_arg, struct LDKTransaction justice_tx, uintptr_t input, uint64_t amount, const uint8_t (*per_commitment_key)[32], const struct LDKHTLCOutputInCommitment *NONNULL_PTR htlc /* @internal */ -export function BaseSign_sign_justice_revoked_htlc(this_arg: number, justice_tx: number, input: number, amount: bigint, per_commitment_key: number, htlc: number): number { +export function BaseSign_sign_justice_revoked_htlc(this_arg: bigint, justice_tx: number, input: number, amount: bigint, per_commitment_key: number, htlc: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3343,7 +3350,7 @@ export function BaseSign_sign_justice_revoked_htlc(this_arg: number, justice_tx: } // LDKCResult_SignatureNoneZ BaseSign_sign_counterparty_htlc_transaction LDKBaseSign *NONNULL_PTR this_arg, struct LDKTransaction htlc_tx, uintptr_t input, uint64_t amount, struct LDKPublicKey per_commitment_point, const struct LDKHTLCOutputInCommitment *NONNULL_PTR htlc /* @internal */ -export function BaseSign_sign_counterparty_htlc_transaction(this_arg: number, htlc_tx: number, input: number, amount: bigint, per_commitment_point: number, htlc: number): number { +export function BaseSign_sign_counterparty_htlc_transaction(this_arg: bigint, htlc_tx: number, input: number, amount: bigint, per_commitment_point: number, htlc: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3352,7 +3359,7 @@ export function BaseSign_sign_counterparty_htlc_transaction(this_arg: number, ht } // LDKCResult_SignatureNoneZ BaseSign_sign_closing_transaction LDKBaseSign *NONNULL_PTR this_arg, const struct LDKClosingTransaction *NONNULL_PTR closing_tx /* @internal */ -export function BaseSign_sign_closing_transaction(this_arg: number, closing_tx: number): number { +export function BaseSign_sign_closing_transaction(this_arg: bigint, closing_tx: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3361,7 +3368,7 @@ export function BaseSign_sign_closing_transaction(this_arg: number, closing_tx: } // LDKCResult_C2Tuple_SignatureSignatureZNoneZ BaseSign_sign_channel_announcement LDKBaseSign *NONNULL_PTR this_arg, const struct LDKUnsignedChannelAnnouncement *NONNULL_PTR msg /* @internal */ -export function BaseSign_sign_channel_announcement(this_arg: number, msg: number): number { +export function BaseSign_sign_channel_announcement(this_arg: bigint, msg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3370,7 +3377,7 @@ export function BaseSign_sign_channel_announcement(this_arg: number, msg: number } // void BaseSign_ready_channel LDKBaseSign *NONNULL_PTR this_arg, const struct LDKChannelTransactionParameters *NONNULL_PTR channel_parameters /* @internal */ -export function BaseSign_ready_channel(this_arg: number, channel_parameters: number): void { +export function BaseSign_ready_channel(this_arg: bigint, channel_parameters: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3379,7 +3386,7 @@ export function BaseSign_ready_channel(this_arg: number, channel_parameters: num } // LDKChannelPublicKeys BaseSign_get_pubkeys LDKBaseSign *NONNULL_PTR this_arg /* @internal */ -export function BaseSign_get_pubkeys(this_arg: number): number { +export function BaseSign_get_pubkeys(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3392,7 +3399,7 @@ export interface LDKSign { } /* @internal */ -export function LDKSign_new(impl: LDKSign, BaseSign: LDKBaseSign, pubkeys: number): number { +export function LDKSign_new(impl: LDKSign, BaseSign: LDKBaseSign, pubkeys: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3405,7 +3412,7 @@ export function LDKSign_new(impl: LDKSign, BaseSign: LDKBaseSign, pubkeys: numbe } // LDKCVec_u8Z Sign_write LDKSign *NONNULL_PTR this_arg /* @internal */ -export function Sign_write(this_arg: number): number { +export function Sign_write(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3414,7 +3421,7 @@ export function Sign_write(this_arg: number): number { } // struct LDKSign CResult_SignDecodeErrorZ_get_ok(LDKCResult_SignDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_SignDecodeErrorZ_get_ok(owner: number): number { +export function CResult_SignDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3423,7 +3430,7 @@ export function CResult_SignDecodeErrorZ_get_ok(owner: number): number { } // struct LDKDecodeError CResult_SignDecodeErrorZ_get_err(LDKCResult_SignDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_SignDecodeErrorZ_get_err(owner: number): number { +export function CResult_SignDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3432,7 +3439,7 @@ export function CResult_SignDecodeErrorZ_get_err(owner: number): number { } // struct LDKRecoverableSignature CResult_RecoverableSignatureNoneZ_get_ok(LDKCResult_RecoverableSignatureNoneZ *NONNULL_PTR owner); /* @internal */ -export function CResult_RecoverableSignatureNoneZ_get_ok(owner: number): number { +export function CResult_RecoverableSignatureNoneZ_get_ok(owner: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3441,7 +3448,7 @@ export function CResult_RecoverableSignatureNoneZ_get_ok(owner: number): number } // void CResult_RecoverableSignatureNoneZ_get_err(LDKCResult_RecoverableSignatureNoneZ *NONNULL_PTR owner); /* @internal */ -export function CResult_RecoverableSignatureNoneZ_get_err(owner: number): void { +export function CResult_RecoverableSignatureNoneZ_get_err(owner: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3450,7 +3457,7 @@ export function CResult_RecoverableSignatureNoneZ_get_err(owner: number): void { } // struct LDKCVec_CVec_u8ZZ CResult_CVec_CVec_u8ZZNoneZ_get_ok(LDKCResult_CVec_CVec_u8ZZNoneZ *NONNULL_PTR owner); /* @internal */ -export function CResult_CVec_CVec_u8ZZNoneZ_get_ok(owner: number): number { +export function CResult_CVec_CVec_u8ZZNoneZ_get_ok(owner: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3459,7 +3466,7 @@ export function CResult_CVec_CVec_u8ZZNoneZ_get_ok(owner: number): number { } // void CResult_CVec_CVec_u8ZZNoneZ_get_err(LDKCResult_CVec_CVec_u8ZZNoneZ *NONNULL_PTR owner); /* @internal */ -export function CResult_CVec_CVec_u8ZZNoneZ_get_err(owner: number): void { +export function CResult_CVec_CVec_u8ZZNoneZ_get_err(owner: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3468,7 +3475,7 @@ export function CResult_CVec_CVec_u8ZZNoneZ_get_err(owner: number): void { } // struct LDKInMemorySigner CResult_InMemorySignerDecodeErrorZ_get_ok(LDKCResult_InMemorySignerDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_InMemorySignerDecodeErrorZ_get_ok(owner: number): number { +export function CResult_InMemorySignerDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3477,7 +3484,7 @@ export function CResult_InMemorySignerDecodeErrorZ_get_ok(owner: number): number } // struct LDKDecodeError CResult_InMemorySignerDecodeErrorZ_get_err(LDKCResult_InMemorySignerDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_InMemorySignerDecodeErrorZ_get_err(owner: number): number { +export function CResult_InMemorySignerDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3486,7 +3493,7 @@ export function CResult_InMemorySignerDecodeErrorZ_get_err(owner: number): numbe } // struct LDKTransaction CResult_TransactionNoneZ_get_ok(LDKCResult_TransactionNoneZ *NONNULL_PTR owner); /* @internal */ -export function CResult_TransactionNoneZ_get_ok(owner: number): number { +export function CResult_TransactionNoneZ_get_ok(owner: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3495,7 +3502,7 @@ export function CResult_TransactionNoneZ_get_ok(owner: number): number { } // void CResult_TransactionNoneZ_get_err(LDKCResult_TransactionNoneZ *NONNULL_PTR owner); /* @internal */ -export function CResult_TransactionNoneZ_get_err(owner: number): void { +export function CResult_TransactionNoneZ_get_err(owner: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3507,7 +3514,7 @@ export class LDKCOption_u16Z { protected constructor() {} } /* @internal */ -export function LDKCOption_u16Z_ty_from_ptr(ptr: number): number { +export function LDKCOption_u16Z_ty_from_ptr(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3515,7 +3522,7 @@ export function LDKCOption_u16Z_ty_from_ptr(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKCOption_u16Z_Some_get_some(ptr: number): number { +export function LDKCOption_u16Z_Some_get_some(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3527,7 +3534,7 @@ export class LDKAPIError { protected constructor() {} } /* @internal */ -export function LDKAPIError_ty_from_ptr(ptr: number): number { +export function LDKAPIError_ty_from_ptr(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3535,7 +3542,7 @@ export function LDKAPIError_ty_from_ptr(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKAPIError_APIMisuseError_get_err(ptr: number): number { +export function LDKAPIError_APIMisuseError_get_err(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3543,7 +3550,7 @@ export function LDKAPIError_APIMisuseError_get_err(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKAPIError_FeeRateTooHigh_get_err(ptr: number): number { +export function LDKAPIError_FeeRateTooHigh_get_err(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3551,7 +3558,7 @@ export function LDKAPIError_FeeRateTooHigh_get_err(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKAPIError_FeeRateTooHigh_get_feerate(ptr: number): number { +export function LDKAPIError_FeeRateTooHigh_get_feerate(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3559,7 +3566,7 @@ export function LDKAPIError_FeeRateTooHigh_get_feerate(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKAPIError_RouteError_get_err(ptr: number): number { +export function LDKAPIError_RouteError_get_err(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3567,7 +3574,7 @@ export function LDKAPIError_RouteError_get_err(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKAPIError_ChannelUnavailable_get_err(ptr: number): number { +export function LDKAPIError_ChannelUnavailable_get_err(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3575,7 +3582,7 @@ export function LDKAPIError_ChannelUnavailable_get_err(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKAPIError_IncompatibleShutdownScript_get_script(ptr: number): number { +export function LDKAPIError_IncompatibleShutdownScript_get_script(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3584,7 +3591,7 @@ export function LDKAPIError_IncompatibleShutdownScript_get_script(ptr: number): } // void CResult_NoneAPIErrorZ_get_ok(LDKCResult_NoneAPIErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_NoneAPIErrorZ_get_ok(owner: number): void { +export function CResult_NoneAPIErrorZ_get_ok(owner: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3593,7 +3600,7 @@ export function CResult_NoneAPIErrorZ_get_ok(owner: number): void { } // struct LDKAPIError CResult_NoneAPIErrorZ_get_err(LDKCResult_NoneAPIErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_NoneAPIErrorZ_get_err(owner: number): number { +export function CResult_NoneAPIErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3602,7 +3609,7 @@ export function CResult_NoneAPIErrorZ_get_err(owner: number): number { } // struct LDKThirtyTwoBytes CResult__u832APIErrorZ_get_ok(LDKCResult__u832APIErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult__u832APIErrorZ_get_ok(owner: number): number { +export function CResult__u832APIErrorZ_get_ok(owner: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3611,7 +3618,7 @@ export function CResult__u832APIErrorZ_get_ok(owner: number): number { } // struct LDKAPIError CResult__u832APIErrorZ_get_err(LDKCResult__u832APIErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult__u832APIErrorZ_get_err(owner: number): number { +export function CResult__u832APIErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3623,7 +3630,7 @@ export class LDKPaymentSendFailure { protected constructor() {} } /* @internal */ -export function LDKPaymentSendFailure_ty_from_ptr(ptr: number): number { +export function LDKPaymentSendFailure_ty_from_ptr(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3631,7 +3638,7 @@ export function LDKPaymentSendFailure_ty_from_ptr(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKPaymentSendFailure_ParameterError_get_parameter_error(ptr: number): number { +export function LDKPaymentSendFailure_ParameterError_get_parameter_error(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3639,7 +3646,7 @@ export function LDKPaymentSendFailure_ParameterError_get_parameter_error(ptr: nu return nativeResponseValue; } /* @internal */ -export function LDKPaymentSendFailure_PathParameterError_get_path_parameter_error(ptr: number): number { +export function LDKPaymentSendFailure_PathParameterError_get_path_parameter_error(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3647,7 +3654,7 @@ export function LDKPaymentSendFailure_PathParameterError_get_path_parameter_erro return nativeResponseValue; } /* @internal */ -export function LDKPaymentSendFailure_AllFailedRetrySafe_get_all_failed_retry_safe(ptr: number): number { +export function LDKPaymentSendFailure_AllFailedRetrySafe_get_all_failed_retry_safe(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3655,7 +3662,7 @@ export function LDKPaymentSendFailure_AllFailedRetrySafe_get_all_failed_retry_sa return nativeResponseValue; } /* @internal */ -export function LDKPaymentSendFailure_PartialFailure_get_results(ptr: number): number { +export function LDKPaymentSendFailure_PartialFailure_get_results(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3663,7 +3670,7 @@ export function LDKPaymentSendFailure_PartialFailure_get_results(ptr: number): n return nativeResponseValue; } /* @internal */ -export function LDKPaymentSendFailure_PartialFailure_get_failed_paths_retry(ptr: number): number { +export function LDKPaymentSendFailure_PartialFailure_get_failed_paths_retry(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3671,7 +3678,7 @@ export function LDKPaymentSendFailure_PartialFailure_get_failed_paths_retry(ptr: return nativeResponseValue; } /* @internal */ -export function LDKPaymentSendFailure_PartialFailure_get_payment_id(ptr: number): number { +export function LDKPaymentSendFailure_PartialFailure_get_payment_id(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3680,7 +3687,7 @@ export function LDKPaymentSendFailure_PartialFailure_get_payment_id(ptr: number) } // struct LDKThirtyTwoBytes CResult_PaymentIdPaymentSendFailureZ_get_ok(LDKCResult_PaymentIdPaymentSendFailureZ *NONNULL_PTR owner); /* @internal */ -export function CResult_PaymentIdPaymentSendFailureZ_get_ok(owner: number): number { +export function CResult_PaymentIdPaymentSendFailureZ_get_ok(owner: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3689,7 +3696,7 @@ export function CResult_PaymentIdPaymentSendFailureZ_get_ok(owner: number): numb } // struct LDKPaymentSendFailure CResult_PaymentIdPaymentSendFailureZ_get_err(LDKCResult_PaymentIdPaymentSendFailureZ *NONNULL_PTR owner); /* @internal */ -export function CResult_PaymentIdPaymentSendFailureZ_get_err(owner: number): number { +export function CResult_PaymentIdPaymentSendFailureZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3698,7 +3705,7 @@ export function CResult_PaymentIdPaymentSendFailureZ_get_err(owner: number): num } // void CResult_NonePaymentSendFailureZ_get_ok(LDKCResult_NonePaymentSendFailureZ *NONNULL_PTR owner); /* @internal */ -export function CResult_NonePaymentSendFailureZ_get_ok(owner: number): void { +export function CResult_NonePaymentSendFailureZ_get_ok(owner: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3707,7 +3714,7 @@ export function CResult_NonePaymentSendFailureZ_get_ok(owner: number): void { } // struct LDKPaymentSendFailure CResult_NonePaymentSendFailureZ_get_err(LDKCResult_NonePaymentSendFailureZ *NONNULL_PTR owner); /* @internal */ -export function CResult_NonePaymentSendFailureZ_get_err(owner: number): number { +export function CResult_NonePaymentSendFailureZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3716,7 +3723,7 @@ export function CResult_NonePaymentSendFailureZ_get_err(owner: number): number { } // struct LDKThirtyTwoBytes C2Tuple_PaymentHashPaymentIdZ_get_a(LDKC2Tuple_PaymentHashPaymentIdZ *NONNULL_PTR owner); /* @internal */ -export function C2Tuple_PaymentHashPaymentIdZ_get_a(owner: number): number { +export function C2Tuple_PaymentHashPaymentIdZ_get_a(owner: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3725,7 +3732,7 @@ export function C2Tuple_PaymentHashPaymentIdZ_get_a(owner: number): number { } // struct LDKThirtyTwoBytes C2Tuple_PaymentHashPaymentIdZ_get_b(LDKC2Tuple_PaymentHashPaymentIdZ *NONNULL_PTR owner); /* @internal */ -export function C2Tuple_PaymentHashPaymentIdZ_get_b(owner: number): number { +export function C2Tuple_PaymentHashPaymentIdZ_get_b(owner: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3734,7 +3741,7 @@ export function C2Tuple_PaymentHashPaymentIdZ_get_b(owner: number): number { } // struct LDKC2Tuple_PaymentHashPaymentIdZ CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_ok(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ *NONNULL_PTR owner); /* @internal */ -export function CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_ok(owner: number): number { +export function CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3743,7 +3750,7 @@ export function CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_ok( } // struct LDKPaymentSendFailure CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_err(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ *NONNULL_PTR owner); /* @internal */ -export function CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_err(owner: number): number { +export function CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3752,7 +3759,7 @@ export function CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_err } // struct LDKThirtyTwoBytes C2Tuple_PaymentHashPaymentSecretZ_get_a(LDKC2Tuple_PaymentHashPaymentSecretZ *NONNULL_PTR owner); /* @internal */ -export function C2Tuple_PaymentHashPaymentSecretZ_get_a(owner: number): number { +export function C2Tuple_PaymentHashPaymentSecretZ_get_a(owner: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3761,7 +3768,7 @@ export function C2Tuple_PaymentHashPaymentSecretZ_get_a(owner: number): number { } // struct LDKThirtyTwoBytes C2Tuple_PaymentHashPaymentSecretZ_get_b(LDKC2Tuple_PaymentHashPaymentSecretZ *NONNULL_PTR owner); /* @internal */ -export function C2Tuple_PaymentHashPaymentSecretZ_get_b(owner: number): number { +export function C2Tuple_PaymentHashPaymentSecretZ_get_b(owner: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3770,7 +3777,7 @@ export function C2Tuple_PaymentHashPaymentSecretZ_get_b(owner: number): number { } // struct LDKC2Tuple_PaymentHashPaymentSecretZ CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_ok(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ *NONNULL_PTR owner); /* @internal */ -export function CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_ok(owner: number): number { +export function CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3779,7 +3786,7 @@ export function CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_ok(owner: num } // void CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_err(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ *NONNULL_PTR owner); /* @internal */ -export function CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_err(owner: number): void { +export function CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_err(owner: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3788,7 +3795,7 @@ export function CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_err(owner: nu } // struct LDKC2Tuple_PaymentHashPaymentSecretZ CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_ok(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_ok(owner: number): number { +export function CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3797,7 +3804,7 @@ export function CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_ok(owner: } // struct LDKAPIError CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_err(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_err(owner: number): number { +export function CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3806,7 +3813,7 @@ export function CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_err(owner } // struct LDKThirtyTwoBytes CResult_PaymentSecretNoneZ_get_ok(LDKCResult_PaymentSecretNoneZ *NONNULL_PTR owner); /* @internal */ -export function CResult_PaymentSecretNoneZ_get_ok(owner: number): number { +export function CResult_PaymentSecretNoneZ_get_ok(owner: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3815,7 +3822,7 @@ export function CResult_PaymentSecretNoneZ_get_ok(owner: number): number { } // void CResult_PaymentSecretNoneZ_get_err(LDKCResult_PaymentSecretNoneZ *NONNULL_PTR owner); /* @internal */ -export function CResult_PaymentSecretNoneZ_get_err(owner: number): void { +export function CResult_PaymentSecretNoneZ_get_err(owner: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3824,7 +3831,7 @@ export function CResult_PaymentSecretNoneZ_get_err(owner: number): void { } // struct LDKThirtyTwoBytes CResult_PaymentSecretAPIErrorZ_get_ok(LDKCResult_PaymentSecretAPIErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_PaymentSecretAPIErrorZ_get_ok(owner: number): number { +export function CResult_PaymentSecretAPIErrorZ_get_ok(owner: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3833,7 +3840,7 @@ export function CResult_PaymentSecretAPIErrorZ_get_ok(owner: number): number { } // struct LDKAPIError CResult_PaymentSecretAPIErrorZ_get_err(LDKCResult_PaymentSecretAPIErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_PaymentSecretAPIErrorZ_get_err(owner: number): number { +export function CResult_PaymentSecretAPIErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3842,7 +3849,7 @@ export function CResult_PaymentSecretAPIErrorZ_get_err(owner: number): number { } // struct LDKThirtyTwoBytes CResult_PaymentPreimageAPIErrorZ_get_ok(LDKCResult_PaymentPreimageAPIErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_PaymentPreimageAPIErrorZ_get_ok(owner: number): number { +export function CResult_PaymentPreimageAPIErrorZ_get_ok(owner: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3851,7 +3858,7 @@ export function CResult_PaymentPreimageAPIErrorZ_get_ok(owner: number): number { } // struct LDKAPIError CResult_PaymentPreimageAPIErrorZ_get_err(LDKCResult_PaymentPreimageAPIErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_PaymentPreimageAPIErrorZ_get_err(owner: number): number { +export function CResult_PaymentPreimageAPIErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3860,7 +3867,7 @@ export function CResult_PaymentPreimageAPIErrorZ_get_err(owner: number): number } // struct LDKCounterpartyForwardingInfo CResult_CounterpartyForwardingInfoDecodeErrorZ_get_ok(LDKCResult_CounterpartyForwardingInfoDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_CounterpartyForwardingInfoDecodeErrorZ_get_ok(owner: number): number { +export function CResult_CounterpartyForwardingInfoDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3869,7 +3876,7 @@ export function CResult_CounterpartyForwardingInfoDecodeErrorZ_get_ok(owner: num } // struct LDKDecodeError CResult_CounterpartyForwardingInfoDecodeErrorZ_get_err(LDKCResult_CounterpartyForwardingInfoDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_CounterpartyForwardingInfoDecodeErrorZ_get_err(owner: number): number { +export function CResult_CounterpartyForwardingInfoDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3878,7 +3885,7 @@ export function CResult_CounterpartyForwardingInfoDecodeErrorZ_get_err(owner: nu } // struct LDKChannelCounterparty CResult_ChannelCounterpartyDecodeErrorZ_get_ok(LDKCResult_ChannelCounterpartyDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ChannelCounterpartyDecodeErrorZ_get_ok(owner: number): number { +export function CResult_ChannelCounterpartyDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3887,7 +3894,7 @@ export function CResult_ChannelCounterpartyDecodeErrorZ_get_ok(owner: number): n } // struct LDKDecodeError CResult_ChannelCounterpartyDecodeErrorZ_get_err(LDKCResult_ChannelCounterpartyDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ChannelCounterpartyDecodeErrorZ_get_err(owner: number): number { +export function CResult_ChannelCounterpartyDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3896,7 +3903,7 @@ export function CResult_ChannelCounterpartyDecodeErrorZ_get_err(owner: number): } // struct LDKChannelDetails CResult_ChannelDetailsDecodeErrorZ_get_ok(LDKCResult_ChannelDetailsDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ChannelDetailsDecodeErrorZ_get_ok(owner: number): number { +export function CResult_ChannelDetailsDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3905,7 +3912,7 @@ export function CResult_ChannelDetailsDecodeErrorZ_get_ok(owner: number): number } // struct LDKDecodeError CResult_ChannelDetailsDecodeErrorZ_get_err(LDKCResult_ChannelDetailsDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ChannelDetailsDecodeErrorZ_get_err(owner: number): number { +export function CResult_ChannelDetailsDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3914,7 +3921,7 @@ export function CResult_ChannelDetailsDecodeErrorZ_get_err(owner: number): numbe } // struct LDKPhantomRouteHints CResult_PhantomRouteHintsDecodeErrorZ_get_ok(LDKCResult_PhantomRouteHintsDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_PhantomRouteHintsDecodeErrorZ_get_ok(owner: number): number { +export function CResult_PhantomRouteHintsDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3923,7 +3930,7 @@ export function CResult_PhantomRouteHintsDecodeErrorZ_get_ok(owner: number): num } // struct LDKDecodeError CResult_PhantomRouteHintsDecodeErrorZ_get_err(LDKCResult_PhantomRouteHintsDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_PhantomRouteHintsDecodeErrorZ_get_err(owner: number): number { +export function CResult_PhantomRouteHintsDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3932,13 +3939,13 @@ export function CResult_PhantomRouteHintsDecodeErrorZ_get_err(owner: number): nu } /* @internal */ export interface LDKWatch { - watch_channel (funding_txo: number, monitor: number): number; - update_channel (funding_txo: number, update: number): number; + watch_channel (funding_txo: bigint, monitor: bigint): bigint; + update_channel (funding_txo: bigint, update: bigint): bigint; release_pending_monitor_events (): number; } /* @internal */ -export function LDKWatch_new(impl: LDKWatch): number { +export function LDKWatch_new(impl: LDKWatch): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3951,7 +3958,7 @@ export function LDKWatch_new(impl: LDKWatch): number { } // LDKCResult_NoneChannelMonitorUpdateErrZ Watch_watch_channel LDKWatch *NONNULL_PTR this_arg, struct LDKOutPoint funding_txo, struct LDKChannelMonitor monitor /* @internal */ -export function Watch_watch_channel(this_arg: number, funding_txo: number, monitor: number): number { +export function Watch_watch_channel(this_arg: bigint, funding_txo: bigint, monitor: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3960,7 +3967,7 @@ export function Watch_watch_channel(this_arg: number, funding_txo: number, monit } // LDKCResult_NoneChannelMonitorUpdateErrZ Watch_update_channel LDKWatch *NONNULL_PTR this_arg, struct LDKOutPoint funding_txo, struct LDKChannelMonitorUpdate update /* @internal */ -export function Watch_update_channel(this_arg: number, funding_txo: number, update: number): number { +export function Watch_update_channel(this_arg: bigint, funding_txo: bigint, update: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3969,7 +3976,7 @@ export function Watch_update_channel(this_arg: number, funding_txo: number, upda } // LDKCVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ Watch_release_pending_monitor_events LDKWatch *NONNULL_PTR this_arg /* @internal */ -export function Watch_release_pending_monitor_events(this_arg: number): number { +export function Watch_release_pending_monitor_events(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3982,7 +3989,7 @@ export interface LDKBroadcasterInterface { } /* @internal */ -export function LDKBroadcasterInterface_new(impl: LDKBroadcasterInterface): number { +export function LDKBroadcasterInterface_new(impl: LDKBroadcasterInterface): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -3995,7 +4002,7 @@ export function LDKBroadcasterInterface_new(impl: LDKBroadcasterInterface): numb } // void BroadcasterInterface_broadcast_transaction LDKBroadcasterInterface *NONNULL_PTR this_arg, struct LDKTransaction tx /* @internal */ -export function BroadcasterInterface_broadcast_transaction(this_arg: number, tx: number): void { +export function BroadcasterInterface_broadcast_transaction(this_arg: bigint, tx: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4004,18 +4011,18 @@ export function BroadcasterInterface_broadcast_transaction(this_arg: number, tx: } /* @internal */ export interface LDKKeysInterface { - get_node_secret (recipient: Recipient): number; + get_node_secret (recipient: Recipient): bigint; get_destination_script (): number; - get_shutdown_scriptpubkey (): number; - get_channel_signer (inbound: boolean, channel_value_satoshis: bigint): number; + get_shutdown_scriptpubkey (): bigint; + get_channel_signer (inbound: boolean, channel_value_satoshis: bigint): bigint; get_secure_random_bytes (): number; - read_chan_signer (reader: number): number; - sign_invoice (hrp_bytes: number, invoice_data: number, receipient: Recipient): number; + read_chan_signer (reader: number): bigint; + sign_invoice (hrp_bytes: number, invoice_data: number, receipient: Recipient): bigint; get_inbound_payment_key_material (): number; } /* @internal */ -export function LDKKeysInterface_new(impl: LDKKeysInterface): number { +export function LDKKeysInterface_new(impl: LDKKeysInterface): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4028,7 +4035,7 @@ export function LDKKeysInterface_new(impl: LDKKeysInterface): number { } // LDKCResult_SecretKeyNoneZ KeysInterface_get_node_secret LDKKeysInterface *NONNULL_PTR this_arg, enum LDKRecipient recipient /* @internal */ -export function KeysInterface_get_node_secret(this_arg: number, recipient: Recipient): number { +export function KeysInterface_get_node_secret(this_arg: bigint, recipient: Recipient): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4037,7 +4044,7 @@ export function KeysInterface_get_node_secret(this_arg: number, recipient: Recip } // LDKCVec_u8Z KeysInterface_get_destination_script LDKKeysInterface *NONNULL_PTR this_arg /* @internal */ -export function KeysInterface_get_destination_script(this_arg: number): number { +export function KeysInterface_get_destination_script(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4046,7 +4053,7 @@ export function KeysInterface_get_destination_script(this_arg: number): number { } // LDKShutdownScript KeysInterface_get_shutdown_scriptpubkey LDKKeysInterface *NONNULL_PTR this_arg /* @internal */ -export function KeysInterface_get_shutdown_scriptpubkey(this_arg: number): number { +export function KeysInterface_get_shutdown_scriptpubkey(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4055,7 +4062,7 @@ export function KeysInterface_get_shutdown_scriptpubkey(this_arg: number): numbe } // LDKSign KeysInterface_get_channel_signer LDKKeysInterface *NONNULL_PTR this_arg, bool inbound, uint64_t channel_value_satoshis /* @internal */ -export function KeysInterface_get_channel_signer(this_arg: number, inbound: boolean, channel_value_satoshis: bigint): number { +export function KeysInterface_get_channel_signer(this_arg: bigint, inbound: boolean, channel_value_satoshis: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4064,7 +4071,7 @@ export function KeysInterface_get_channel_signer(this_arg: number, inbound: bool } // LDKThirtyTwoBytes KeysInterface_get_secure_random_bytes LDKKeysInterface *NONNULL_PTR this_arg /* @internal */ -export function KeysInterface_get_secure_random_bytes(this_arg: number): number { +export function KeysInterface_get_secure_random_bytes(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4073,7 +4080,7 @@ export function KeysInterface_get_secure_random_bytes(this_arg: number): number } // LDKCResult_SignDecodeErrorZ KeysInterface_read_chan_signer LDKKeysInterface *NONNULL_PTR this_arg, struct LDKu8slice reader /* @internal */ -export function KeysInterface_read_chan_signer(this_arg: number, reader: number): number { +export function KeysInterface_read_chan_signer(this_arg: bigint, reader: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4082,7 +4089,7 @@ export function KeysInterface_read_chan_signer(this_arg: number, reader: number) } // LDKCResult_RecoverableSignatureNoneZ KeysInterface_sign_invoice LDKKeysInterface *NONNULL_PTR this_arg, struct LDKu8slice hrp_bytes, struct LDKCVec_u5Z invoice_data, enum LDKRecipient receipient /* @internal */ -export function KeysInterface_sign_invoice(this_arg: number, hrp_bytes: number, invoice_data: number, receipient: Recipient): number { +export function KeysInterface_sign_invoice(this_arg: bigint, hrp_bytes: number, invoice_data: number, receipient: Recipient): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4091,7 +4098,7 @@ export function KeysInterface_sign_invoice(this_arg: number, hrp_bytes: number, } // LDKThirtyTwoBytes KeysInterface_get_inbound_payment_key_material LDKKeysInterface *NONNULL_PTR this_arg /* @internal */ -export function KeysInterface_get_inbound_payment_key_material(this_arg: number): number { +export function KeysInterface_get_inbound_payment_key_material(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4104,7 +4111,7 @@ export interface LDKFeeEstimator { } /* @internal */ -export function LDKFeeEstimator_new(impl: LDKFeeEstimator): number { +export function LDKFeeEstimator_new(impl: LDKFeeEstimator): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4117,7 +4124,7 @@ export function LDKFeeEstimator_new(impl: LDKFeeEstimator): number { } // uint32_t FeeEstimator_get_est_sat_per_1000_weight LDKFeeEstimator *NONNULL_PTR this_arg, enum LDKConfirmationTarget confirmation_target /* @internal */ -export function FeeEstimator_get_est_sat_per_1000_weight(this_arg: number, confirmation_target: ConfirmationTarget): number { +export function FeeEstimator_get_est_sat_per_1000_weight(this_arg: bigint, confirmation_target: ConfirmationTarget): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4126,7 +4133,7 @@ export function FeeEstimator_get_est_sat_per_1000_weight(this_arg: number, confi } // struct LDKThirtyTwoBytes C2Tuple_BlockHashChannelManagerZ_get_a(LDKC2Tuple_BlockHashChannelManagerZ *NONNULL_PTR owner); /* @internal */ -export function C2Tuple_BlockHashChannelManagerZ_get_a(owner: number): number { +export function C2Tuple_BlockHashChannelManagerZ_get_a(owner: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4135,7 +4142,7 @@ export function C2Tuple_BlockHashChannelManagerZ_get_a(owner: number): number { } // struct LDKChannelManager *C2Tuple_BlockHashChannelManagerZ_get_b(LDKC2Tuple_BlockHashChannelManagerZ *NONNULL_PTR owner); /* @internal */ -export function C2Tuple_BlockHashChannelManagerZ_get_b(owner: number): number { +export function C2Tuple_BlockHashChannelManagerZ_get_b(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4144,7 +4151,7 @@ export function C2Tuple_BlockHashChannelManagerZ_get_b(owner: number): number { } // struct LDKC2Tuple_BlockHashChannelManagerZ *CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_ok(LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_ok(owner: number): number { +export function CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4153,7 +4160,7 @@ export function CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_ok(owne } // struct LDKDecodeError CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_err(LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_err(owner: number): number { +export function CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4162,7 +4169,7 @@ export function CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_err(own } // struct LDKChannelConfig CResult_ChannelConfigDecodeErrorZ_get_ok(LDKCResult_ChannelConfigDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ChannelConfigDecodeErrorZ_get_ok(owner: number): number { +export function CResult_ChannelConfigDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4171,7 +4178,7 @@ export function CResult_ChannelConfigDecodeErrorZ_get_ok(owner: number): number } // struct LDKDecodeError CResult_ChannelConfigDecodeErrorZ_get_err(LDKCResult_ChannelConfigDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ChannelConfigDecodeErrorZ_get_err(owner: number): number { +export function CResult_ChannelConfigDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4180,7 +4187,7 @@ export function CResult_ChannelConfigDecodeErrorZ_get_err(owner: number): number } // struct LDKOutPoint CResult_OutPointDecodeErrorZ_get_ok(LDKCResult_OutPointDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_OutPointDecodeErrorZ_get_ok(owner: number): number { +export function CResult_OutPointDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4189,7 +4196,7 @@ export function CResult_OutPointDecodeErrorZ_get_ok(owner: number): number { } // struct LDKDecodeError CResult_OutPointDecodeErrorZ_get_err(LDKCResult_OutPointDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_OutPointDecodeErrorZ_get_err(owner: number): number { +export function CResult_OutPointDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4204,7 +4211,7 @@ export interface LDKType { } /* @internal */ -export function LDKType_new(impl: LDKType): number { +export function LDKType_new(impl: LDKType): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4217,7 +4224,7 @@ export function LDKType_new(impl: LDKType): number { } // uint16_t Type_type_id LDKType *NONNULL_PTR this_arg /* @internal */ -export function Type_type_id(this_arg: number): number { +export function Type_type_id(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4226,7 +4233,7 @@ export function Type_type_id(this_arg: number): number { } // LDKStr Type_debug_str LDKType *NONNULL_PTR this_arg /* @internal */ -export function Type_debug_str(this_arg: number): number { +export function Type_debug_str(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4235,7 +4242,7 @@ export function Type_debug_str(this_arg: number): number { } // LDKCVec_u8Z Type_write LDKType *NONNULL_PTR this_arg /* @internal */ -export function Type_write(this_arg: number): number { +export function Type_write(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4247,7 +4254,7 @@ export class LDKCOption_TypeZ { protected constructor() {} } /* @internal */ -export function LDKCOption_TypeZ_ty_from_ptr(ptr: number): number { +export function LDKCOption_TypeZ_ty_from_ptr(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4255,7 +4262,7 @@ export function LDKCOption_TypeZ_ty_from_ptr(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKCOption_TypeZ_Some_get_some(ptr: number): number { +export function LDKCOption_TypeZ_Some_get_some(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4264,7 +4271,7 @@ export function LDKCOption_TypeZ_Some_get_some(ptr: number): number { } // struct LDKCOption_TypeZ CResult_COption_TypeZDecodeErrorZ_get_ok(LDKCResult_COption_TypeZDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_COption_TypeZDecodeErrorZ_get_ok(owner: number): number { +export function CResult_COption_TypeZDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4273,7 +4280,7 @@ export function CResult_COption_TypeZDecodeErrorZ_get_ok(owner: number): number } // struct LDKDecodeError CResult_COption_TypeZDecodeErrorZ_get_err(LDKCResult_COption_TypeZDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_COption_TypeZDecodeErrorZ_get_err(owner: number): number { +export function CResult_COption_TypeZDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4285,7 +4292,7 @@ export class LDKPaymentError { protected constructor() {} } /* @internal */ -export function LDKPaymentError_ty_from_ptr(ptr: number): number { +export function LDKPaymentError_ty_from_ptr(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4293,7 +4300,7 @@ export function LDKPaymentError_ty_from_ptr(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKPaymentError_Invoice_get_invoice(ptr: number): number { +export function LDKPaymentError_Invoice_get_invoice(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4301,7 +4308,7 @@ export function LDKPaymentError_Invoice_get_invoice(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKPaymentError_Routing_get_routing(ptr: number): number { +export function LDKPaymentError_Routing_get_routing(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4309,7 +4316,7 @@ export function LDKPaymentError_Routing_get_routing(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKPaymentError_Sending_get_sending(ptr: number): number { +export function LDKPaymentError_Sending_get_sending(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4318,7 +4325,7 @@ export function LDKPaymentError_Sending_get_sending(ptr: number): number { } // struct LDKThirtyTwoBytes CResult_PaymentIdPaymentErrorZ_get_ok(LDKCResult_PaymentIdPaymentErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_PaymentIdPaymentErrorZ_get_ok(owner: number): number { +export function CResult_PaymentIdPaymentErrorZ_get_ok(owner: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4327,7 +4334,7 @@ export function CResult_PaymentIdPaymentErrorZ_get_ok(owner: number): number { } // struct LDKPaymentError CResult_PaymentIdPaymentErrorZ_get_err(LDKCResult_PaymentIdPaymentErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_PaymentIdPaymentErrorZ_get_err(owner: number): number { +export function CResult_PaymentIdPaymentErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4339,7 +4346,7 @@ export class LDKParseError { protected constructor() {} } /* @internal */ -export function LDKParseError_ty_from_ptr(ptr: number): number { +export function LDKParseError_ty_from_ptr(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4347,7 +4354,7 @@ export function LDKParseError_ty_from_ptr(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKParseError_Bech32Error_get_bech32_error(ptr: number): number { +export function LDKParseError_Bech32Error_get_bech32_error(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4355,7 +4362,7 @@ export function LDKParseError_Bech32Error_get_bech32_error(ptr: number): number return nativeResponseValue; } /* @internal */ -export function LDKParseError_ParseAmountError_get_parse_amount_error(ptr: number): number { +export function LDKParseError_ParseAmountError_get_parse_amount_error(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4363,7 +4370,7 @@ export function LDKParseError_ParseAmountError_get_parse_amount_error(ptr: numbe return nativeResponseValue; } /* @internal */ -export function LDKParseError_MalformedSignature_get_malformed_signature(ptr: number): Secp256k1Error { +export function LDKParseError_MalformedSignature_get_malformed_signature(ptr: bigint): Secp256k1Error { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4371,7 +4378,7 @@ export function LDKParseError_MalformedSignature_get_malformed_signature(ptr: nu return nativeResponseValue; } /* @internal */ -export function LDKParseError_DescriptionDecodeError_get_description_decode_error(ptr: number): number { +export function LDKParseError_DescriptionDecodeError_get_description_decode_error(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4379,7 +4386,7 @@ export function LDKParseError_DescriptionDecodeError_get_description_decode_erro return nativeResponseValue; } /* @internal */ -export function LDKParseError_InvalidSliceLength_get_invalid_slice_length(ptr: number): number { +export function LDKParseError_InvalidSliceLength_get_invalid_slice_length(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4388,7 +4395,7 @@ export function LDKParseError_InvalidSliceLength_get_invalid_slice_length(ptr: n } // enum LDKSiPrefix CResult_SiPrefixParseErrorZ_get_ok(LDKCResult_SiPrefixParseErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_SiPrefixParseErrorZ_get_ok(owner: number): SiPrefix { +export function CResult_SiPrefixParseErrorZ_get_ok(owner: bigint): SiPrefix { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4397,7 +4404,7 @@ export function CResult_SiPrefixParseErrorZ_get_ok(owner: number): SiPrefix { } // struct LDKParseError CResult_SiPrefixParseErrorZ_get_err(LDKCResult_SiPrefixParseErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_SiPrefixParseErrorZ_get_err(owner: number): number { +export function CResult_SiPrefixParseErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4409,7 +4416,7 @@ export class LDKParseOrSemanticError { protected constructor() {} } /* @internal */ -export function LDKParseOrSemanticError_ty_from_ptr(ptr: number): number { +export function LDKParseOrSemanticError_ty_from_ptr(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4417,7 +4424,7 @@ export function LDKParseOrSemanticError_ty_from_ptr(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKParseOrSemanticError_ParseError_get_parse_error(ptr: number): number { +export function LDKParseOrSemanticError_ParseError_get_parse_error(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4425,7 +4432,7 @@ export function LDKParseOrSemanticError_ParseError_get_parse_error(ptr: number): return nativeResponseValue; } /* @internal */ -export function LDKParseOrSemanticError_SemanticError_get_semantic_error(ptr: number): SemanticError { +export function LDKParseOrSemanticError_SemanticError_get_semantic_error(ptr: bigint): SemanticError { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4434,7 +4441,7 @@ export function LDKParseOrSemanticError_SemanticError_get_semantic_error(ptr: nu } // struct LDKInvoice CResult_InvoiceParseOrSemanticErrorZ_get_ok(LDKCResult_InvoiceParseOrSemanticErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_InvoiceParseOrSemanticErrorZ_get_ok(owner: number): number { +export function CResult_InvoiceParseOrSemanticErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4443,7 +4450,7 @@ export function CResult_InvoiceParseOrSemanticErrorZ_get_ok(owner: number): numb } // struct LDKParseOrSemanticError CResult_InvoiceParseOrSemanticErrorZ_get_err(LDKCResult_InvoiceParseOrSemanticErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_InvoiceParseOrSemanticErrorZ_get_err(owner: number): number { +export function CResult_InvoiceParseOrSemanticErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4452,7 +4459,7 @@ export function CResult_InvoiceParseOrSemanticErrorZ_get_err(owner: number): num } // struct LDKSignedRawInvoice CResult_SignedRawInvoiceParseErrorZ_get_ok(LDKCResult_SignedRawInvoiceParseErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_SignedRawInvoiceParseErrorZ_get_ok(owner: number): number { +export function CResult_SignedRawInvoiceParseErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4461,7 +4468,7 @@ export function CResult_SignedRawInvoiceParseErrorZ_get_ok(owner: number): numbe } // struct LDKParseError CResult_SignedRawInvoiceParseErrorZ_get_err(LDKCResult_SignedRawInvoiceParseErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_SignedRawInvoiceParseErrorZ_get_err(owner: number): number { +export function CResult_SignedRawInvoiceParseErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4470,7 +4477,7 @@ export function CResult_SignedRawInvoiceParseErrorZ_get_err(owner: number): numb } // struct LDKRawInvoice C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_a(LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ *NONNULL_PTR owner); /* @internal */ -export function C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_a(owner: number): number { +export function C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_a(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4479,7 +4486,7 @@ export function C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_a(owner: number): n } // struct LDKThirtyTwoBytes C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_b(LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ *NONNULL_PTR owner); /* @internal */ -export function C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_b(owner: number): number { +export function C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_b(owner: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4488,7 +4495,7 @@ export function C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_b(owner: number): n } // struct LDKInvoiceSignature C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_c(LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ *NONNULL_PTR owner); /* @internal */ -export function C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_c(owner: number): number { +export function C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_c(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4497,7 +4504,7 @@ export function C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_c(owner: number): n } // struct LDKPayeePubKey CResult_PayeePubKeyErrorZ_get_ok(LDKCResult_PayeePubKeyErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_PayeePubKeyErrorZ_get_ok(owner: number): number { +export function CResult_PayeePubKeyErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4506,7 +4513,7 @@ export function CResult_PayeePubKeyErrorZ_get_ok(owner: number): number { } // enum LDKSecp256k1Error CResult_PayeePubKeyErrorZ_get_err(LDKCResult_PayeePubKeyErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_PayeePubKeyErrorZ_get_err(owner: number): Secp256k1Error { +export function CResult_PayeePubKeyErrorZ_get_err(owner: bigint): Secp256k1Error { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4515,7 +4522,7 @@ export function CResult_PayeePubKeyErrorZ_get_err(owner: number): Secp256k1Error } // struct LDKPositiveTimestamp CResult_PositiveTimestampCreationErrorZ_get_ok(LDKCResult_PositiveTimestampCreationErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_PositiveTimestampCreationErrorZ_get_ok(owner: number): number { +export function CResult_PositiveTimestampCreationErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4524,7 +4531,7 @@ export function CResult_PositiveTimestampCreationErrorZ_get_ok(owner: number): n } // enum LDKCreationError CResult_PositiveTimestampCreationErrorZ_get_err(LDKCResult_PositiveTimestampCreationErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_PositiveTimestampCreationErrorZ_get_err(owner: number): CreationError { +export function CResult_PositiveTimestampCreationErrorZ_get_err(owner: bigint): CreationError { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4533,7 +4540,7 @@ export function CResult_PositiveTimestampCreationErrorZ_get_err(owner: number): } // void CResult_NoneSemanticErrorZ_get_ok(LDKCResult_NoneSemanticErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_NoneSemanticErrorZ_get_ok(owner: number): void { +export function CResult_NoneSemanticErrorZ_get_ok(owner: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4542,7 +4549,7 @@ export function CResult_NoneSemanticErrorZ_get_ok(owner: number): void { } // enum LDKSemanticError CResult_NoneSemanticErrorZ_get_err(LDKCResult_NoneSemanticErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_NoneSemanticErrorZ_get_err(owner: number): SemanticError { +export function CResult_NoneSemanticErrorZ_get_err(owner: bigint): SemanticError { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4551,7 +4558,7 @@ export function CResult_NoneSemanticErrorZ_get_err(owner: number): SemanticError } // struct LDKInvoice CResult_InvoiceSemanticErrorZ_get_ok(LDKCResult_InvoiceSemanticErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_InvoiceSemanticErrorZ_get_ok(owner: number): number { +export function CResult_InvoiceSemanticErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4560,7 +4567,7 @@ export function CResult_InvoiceSemanticErrorZ_get_ok(owner: number): number { } // enum LDKSemanticError CResult_InvoiceSemanticErrorZ_get_err(LDKCResult_InvoiceSemanticErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_InvoiceSemanticErrorZ_get_err(owner: number): SemanticError { +export function CResult_InvoiceSemanticErrorZ_get_err(owner: bigint): SemanticError { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4569,7 +4576,7 @@ export function CResult_InvoiceSemanticErrorZ_get_err(owner: number): SemanticEr } // struct LDKDescription CResult_DescriptionCreationErrorZ_get_ok(LDKCResult_DescriptionCreationErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_DescriptionCreationErrorZ_get_ok(owner: number): number { +export function CResult_DescriptionCreationErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4578,7 +4585,7 @@ export function CResult_DescriptionCreationErrorZ_get_ok(owner: number): number } // enum LDKCreationError CResult_DescriptionCreationErrorZ_get_err(LDKCResult_DescriptionCreationErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_DescriptionCreationErrorZ_get_err(owner: number): CreationError { +export function CResult_DescriptionCreationErrorZ_get_err(owner: bigint): CreationError { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4587,7 +4594,7 @@ export function CResult_DescriptionCreationErrorZ_get_err(owner: number): Creati } // struct LDKPrivateRoute CResult_PrivateRouteCreationErrorZ_get_ok(LDKCResult_PrivateRouteCreationErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_PrivateRouteCreationErrorZ_get_ok(owner: number): number { +export function CResult_PrivateRouteCreationErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4596,7 +4603,7 @@ export function CResult_PrivateRouteCreationErrorZ_get_ok(owner: number): number } // enum LDKCreationError CResult_PrivateRouteCreationErrorZ_get_err(LDKCResult_PrivateRouteCreationErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_PrivateRouteCreationErrorZ_get_err(owner: number): CreationError { +export function CResult_PrivateRouteCreationErrorZ_get_err(owner: bigint): CreationError { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4605,7 +4612,7 @@ export function CResult_PrivateRouteCreationErrorZ_get_err(owner: number): Creat } // struct LDKStr CResult_StringErrorZ_get_ok(LDKCResult_StringErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_StringErrorZ_get_ok(owner: number): number { +export function CResult_StringErrorZ_get_ok(owner: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4614,7 +4621,7 @@ export function CResult_StringErrorZ_get_ok(owner: number): number { } // enum LDKSecp256k1Error CResult_StringErrorZ_get_err(LDKCResult_StringErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_StringErrorZ_get_err(owner: number): Secp256k1Error { +export function CResult_StringErrorZ_get_err(owner: bigint): Secp256k1Error { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4623,7 +4630,7 @@ export function CResult_StringErrorZ_get_err(owner: number): Secp256k1Error { } // struct LDKChannelMonitorUpdate CResult_ChannelMonitorUpdateDecodeErrorZ_get_ok(LDKCResult_ChannelMonitorUpdateDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ChannelMonitorUpdateDecodeErrorZ_get_ok(owner: number): number { +export function CResult_ChannelMonitorUpdateDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4632,7 +4639,7 @@ export function CResult_ChannelMonitorUpdateDecodeErrorZ_get_ok(owner: number): } // struct LDKDecodeError CResult_ChannelMonitorUpdateDecodeErrorZ_get_err(LDKCResult_ChannelMonitorUpdateDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ChannelMonitorUpdateDecodeErrorZ_get_err(owner: number): number { +export function CResult_ChannelMonitorUpdateDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4644,7 +4651,7 @@ export class LDKCOption_MonitorEventZ { protected constructor() {} } /* @internal */ -export function LDKCOption_MonitorEventZ_ty_from_ptr(ptr: number): number { +export function LDKCOption_MonitorEventZ_ty_from_ptr(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4652,7 +4659,7 @@ export function LDKCOption_MonitorEventZ_ty_from_ptr(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKCOption_MonitorEventZ_Some_get_some(ptr: number): number { +export function LDKCOption_MonitorEventZ_Some_get_some(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4661,7 +4668,7 @@ export function LDKCOption_MonitorEventZ_Some_get_some(ptr: number): number { } // struct LDKCOption_MonitorEventZ CResult_COption_MonitorEventZDecodeErrorZ_get_ok(LDKCResult_COption_MonitorEventZDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_COption_MonitorEventZDecodeErrorZ_get_ok(owner: number): number { +export function CResult_COption_MonitorEventZDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4670,7 +4677,7 @@ export function CResult_COption_MonitorEventZDecodeErrorZ_get_ok(owner: number): } // struct LDKDecodeError CResult_COption_MonitorEventZDecodeErrorZ_get_err(LDKCResult_COption_MonitorEventZDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_COption_MonitorEventZDecodeErrorZ_get_err(owner: number): number { +export function CResult_COption_MonitorEventZDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4679,7 +4686,7 @@ export function CResult_COption_MonitorEventZDecodeErrorZ_get_err(owner: number) } // struct LDKHTLCUpdate CResult_HTLCUpdateDecodeErrorZ_get_ok(LDKCResult_HTLCUpdateDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_HTLCUpdateDecodeErrorZ_get_ok(owner: number): number { +export function CResult_HTLCUpdateDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4688,7 +4695,7 @@ export function CResult_HTLCUpdateDecodeErrorZ_get_ok(owner: number): number { } // struct LDKDecodeError CResult_HTLCUpdateDecodeErrorZ_get_err(LDKCResult_HTLCUpdateDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_HTLCUpdateDecodeErrorZ_get_err(owner: number): number { +export function CResult_HTLCUpdateDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4697,7 +4704,7 @@ export function CResult_HTLCUpdateDecodeErrorZ_get_err(owner: number): number { } // struct LDKOutPoint C2Tuple_OutPointScriptZ_get_a(LDKC2Tuple_OutPointScriptZ *NONNULL_PTR owner); /* @internal */ -export function C2Tuple_OutPointScriptZ_get_a(owner: number): number { +export function C2Tuple_OutPointScriptZ_get_a(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4706,7 +4713,7 @@ export function C2Tuple_OutPointScriptZ_get_a(owner: number): number { } // struct LDKCVec_u8Z C2Tuple_OutPointScriptZ_get_b(LDKC2Tuple_OutPointScriptZ *NONNULL_PTR owner); /* @internal */ -export function C2Tuple_OutPointScriptZ_get_b(owner: number): number { +export function C2Tuple_OutPointScriptZ_get_b(owner: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4715,7 +4722,7 @@ export function C2Tuple_OutPointScriptZ_get_b(owner: number): number { } // uint32_t C2Tuple_u32ScriptZ_get_a(LDKC2Tuple_u32ScriptZ *NONNULL_PTR owner); /* @internal */ -export function C2Tuple_u32ScriptZ_get_a(owner: number): number { +export function C2Tuple_u32ScriptZ_get_a(owner: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4724,7 +4731,7 @@ export function C2Tuple_u32ScriptZ_get_a(owner: number): number { } // struct LDKCVec_u8Z C2Tuple_u32ScriptZ_get_b(LDKC2Tuple_u32ScriptZ *NONNULL_PTR owner); /* @internal */ -export function C2Tuple_u32ScriptZ_get_b(owner: number): number { +export function C2Tuple_u32ScriptZ_get_b(owner: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4733,7 +4740,7 @@ export function C2Tuple_u32ScriptZ_get_b(owner: number): number { } // struct LDKThirtyTwoBytes C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_get_a(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ *NONNULL_PTR owner); /* @internal */ -export function C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_get_a(owner: number): number { +export function C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_get_a(owner: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4742,7 +4749,7 @@ export function C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_get_a(owner: number): numb } // struct LDKCVec_C2Tuple_u32ScriptZZ C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_get_b(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ *NONNULL_PTR owner); /* @internal */ -export function C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_get_b(owner: number): number { +export function C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_get_b(owner: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4751,7 +4758,7 @@ export function C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_get_b(owner: number): numb } // uint32_t C2Tuple_u32TxOutZ_get_a(LDKC2Tuple_u32TxOutZ *NONNULL_PTR owner); /* @internal */ -export function C2Tuple_u32TxOutZ_get_a(owner: number): number { +export function C2Tuple_u32TxOutZ_get_a(owner: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4760,7 +4767,7 @@ export function C2Tuple_u32TxOutZ_get_a(owner: number): number { } // struct LDKTxOut C2Tuple_u32TxOutZ_get_b(LDKC2Tuple_u32TxOutZ *NONNULL_PTR owner); /* @internal */ -export function C2Tuple_u32TxOutZ_get_b(owner: number): number { +export function C2Tuple_u32TxOutZ_get_b(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4769,7 +4776,7 @@ export function C2Tuple_u32TxOutZ_get_b(owner: number): number { } // struct LDKThirtyTwoBytes C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_a(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ *NONNULL_PTR owner); /* @internal */ -export function C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_a(owner: number): number { +export function C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_a(owner: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4778,7 +4785,7 @@ export function C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_a(owner: number): numbe } // struct LDKCVec_C2Tuple_u32TxOutZZ C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_b(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ *NONNULL_PTR owner); /* @internal */ -export function C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_b(owner: number): number { +export function C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_b(owner: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4790,7 +4797,7 @@ export class LDKBalance { protected constructor() {} } /* @internal */ -export function LDKBalance_ty_from_ptr(ptr: number): number { +export function LDKBalance_ty_from_ptr(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4798,7 +4805,7 @@ export function LDKBalance_ty_from_ptr(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKBalance_ClaimableOnChannelClose_get_claimable_amount_satoshis(ptr: number): bigint { +export function LDKBalance_ClaimableOnChannelClose_get_claimable_amount_satoshis(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4806,7 +4813,7 @@ export function LDKBalance_ClaimableOnChannelClose_get_claimable_amount_satoshis return nativeResponseValue; } /* @internal */ -export function LDKBalance_ClaimableAwaitingConfirmations_get_claimable_amount_satoshis(ptr: number): bigint { +export function LDKBalance_ClaimableAwaitingConfirmations_get_claimable_amount_satoshis(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4814,7 +4821,7 @@ export function LDKBalance_ClaimableAwaitingConfirmations_get_claimable_amount_s return nativeResponseValue; } /* @internal */ -export function LDKBalance_ClaimableAwaitingConfirmations_get_confirmation_height(ptr: number): number { +export function LDKBalance_ClaimableAwaitingConfirmations_get_confirmation_height(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4822,7 +4829,7 @@ export function LDKBalance_ClaimableAwaitingConfirmations_get_confirmation_heigh return nativeResponseValue; } /* @internal */ -export function LDKBalance_ContentiousClaimable_get_claimable_amount_satoshis(ptr: number): bigint { +export function LDKBalance_ContentiousClaimable_get_claimable_amount_satoshis(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4830,7 +4837,7 @@ export function LDKBalance_ContentiousClaimable_get_claimable_amount_satoshis(pt return nativeResponseValue; } /* @internal */ -export function LDKBalance_ContentiousClaimable_get_timeout_height(ptr: number): number { +export function LDKBalance_ContentiousClaimable_get_timeout_height(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4838,7 +4845,7 @@ export function LDKBalance_ContentiousClaimable_get_timeout_height(ptr: number): return nativeResponseValue; } /* @internal */ -export function LDKBalance_MaybeClaimableHTLCAwaitingTimeout_get_claimable_amount_satoshis(ptr: number): bigint { +export function LDKBalance_MaybeClaimableHTLCAwaitingTimeout_get_claimable_amount_satoshis(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4846,7 +4853,7 @@ export function LDKBalance_MaybeClaimableHTLCAwaitingTimeout_get_claimable_amoun return nativeResponseValue; } /* @internal */ -export function LDKBalance_MaybeClaimableHTLCAwaitingTimeout_get_claimable_height(ptr: number): number { +export function LDKBalance_MaybeClaimableHTLCAwaitingTimeout_get_claimable_height(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4855,7 +4862,7 @@ export function LDKBalance_MaybeClaimableHTLCAwaitingTimeout_get_claimable_heigh } // struct LDKThirtyTwoBytes C2Tuple_BlockHashChannelMonitorZ_get_a(LDKC2Tuple_BlockHashChannelMonitorZ *NONNULL_PTR owner); /* @internal */ -export function C2Tuple_BlockHashChannelMonitorZ_get_a(owner: number): number { +export function C2Tuple_BlockHashChannelMonitorZ_get_a(owner: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4864,7 +4871,7 @@ export function C2Tuple_BlockHashChannelMonitorZ_get_a(owner: number): number { } // struct LDKChannelMonitor C2Tuple_BlockHashChannelMonitorZ_get_b(LDKC2Tuple_BlockHashChannelMonitorZ *NONNULL_PTR owner); /* @internal */ -export function C2Tuple_BlockHashChannelMonitorZ_get_b(owner: number): number { +export function C2Tuple_BlockHashChannelMonitorZ_get_b(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4873,7 +4880,7 @@ export function C2Tuple_BlockHashChannelMonitorZ_get_b(owner: number): number { } // struct LDKC2Tuple_BlockHashChannelMonitorZ CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_ok(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_ok(owner: number): number { +export function CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4882,7 +4889,7 @@ export function CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_ok(owne } // struct LDKDecodeError CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_err(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_err(owner: number): number { +export function CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4891,7 +4898,7 @@ export function CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_err(own } // struct LDKPublicKey C2Tuple_PublicKeyTypeZ_get_a(LDKC2Tuple_PublicKeyTypeZ *NONNULL_PTR owner); /* @internal */ -export function C2Tuple_PublicKeyTypeZ_get_a(owner: number): number { +export function C2Tuple_PublicKeyTypeZ_get_a(owner: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4900,7 +4907,7 @@ export function C2Tuple_PublicKeyTypeZ_get_a(owner: number): number { } // struct LDKType C2Tuple_PublicKeyTypeZ_get_b(LDKC2Tuple_PublicKeyTypeZ *NONNULL_PTR owner); /* @internal */ -export function C2Tuple_PublicKeyTypeZ_get_b(owner: number): number { +export function C2Tuple_PublicKeyTypeZ_get_b(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4912,7 +4919,7 @@ export class LDKCOption_NetAddressZ { protected constructor() {} } /* @internal */ -export function LDKCOption_NetAddressZ_ty_from_ptr(ptr: number): number { +export function LDKCOption_NetAddressZ_ty_from_ptr(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4920,7 +4927,7 @@ export function LDKCOption_NetAddressZ_ty_from_ptr(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKCOption_NetAddressZ_Some_get_some(ptr: number): number { +export function LDKCOption_NetAddressZ_Some_get_some(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4929,7 +4936,7 @@ export function LDKCOption_NetAddressZ_Some_get_some(ptr: number): number { } // struct LDKCVec_u8Z CResult_CVec_u8ZPeerHandleErrorZ_get_ok(LDKCResult_CVec_u8ZPeerHandleErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_CVec_u8ZPeerHandleErrorZ_get_ok(owner: number): number { +export function CResult_CVec_u8ZPeerHandleErrorZ_get_ok(owner: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4938,7 +4945,7 @@ export function CResult_CVec_u8ZPeerHandleErrorZ_get_ok(owner: number): number { } // struct LDKPeerHandleError CResult_CVec_u8ZPeerHandleErrorZ_get_err(LDKCResult_CVec_u8ZPeerHandleErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_CVec_u8ZPeerHandleErrorZ_get_err(owner: number): number { +export function CResult_CVec_u8ZPeerHandleErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4947,7 +4954,7 @@ export function CResult_CVec_u8ZPeerHandleErrorZ_get_err(owner: number): number } // void CResult_NonePeerHandleErrorZ_get_ok(LDKCResult_NonePeerHandleErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_NonePeerHandleErrorZ_get_ok(owner: number): void { +export function CResult_NonePeerHandleErrorZ_get_ok(owner: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4956,7 +4963,7 @@ export function CResult_NonePeerHandleErrorZ_get_ok(owner: number): void { } // struct LDKPeerHandleError CResult_NonePeerHandleErrorZ_get_err(LDKCResult_NonePeerHandleErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_NonePeerHandleErrorZ_get_err(owner: number): number { +export function CResult_NonePeerHandleErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4965,7 +4972,7 @@ export function CResult_NonePeerHandleErrorZ_get_err(owner: number): number { } // bool CResult_boolPeerHandleErrorZ_get_ok(LDKCResult_boolPeerHandleErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_boolPeerHandleErrorZ_get_ok(owner: number): boolean { +export function CResult_boolPeerHandleErrorZ_get_ok(owner: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4974,7 +4981,7 @@ export function CResult_boolPeerHandleErrorZ_get_ok(owner: number): boolean { } // struct LDKPeerHandleError CResult_boolPeerHandleErrorZ_get_err(LDKCResult_boolPeerHandleErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_boolPeerHandleErrorZ_get_err(owner: number): number { +export function CResult_boolPeerHandleErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4983,7 +4990,7 @@ export function CResult_boolPeerHandleErrorZ_get_err(owner: number): number { } // void CResult_NoneErrorZ_get_ok(LDKCResult_NoneErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_NoneErrorZ_get_ok(owner: number): void { +export function CResult_NoneErrorZ_get_ok(owner: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -4992,7 +4999,7 @@ export function CResult_NoneErrorZ_get_ok(owner: number): void { } // enum LDKIOError CResult_NoneErrorZ_get_err(LDKCResult_NoneErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_NoneErrorZ_get_err(owner: number): IOError { +export function CResult_NoneErrorZ_get_err(owner: bigint): IOError { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5001,7 +5008,7 @@ export function CResult_NoneErrorZ_get_err(owner: number): IOError { } // struct LDKNetAddress CResult_NetAddressDecodeErrorZ_get_ok(LDKCResult_NetAddressDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_NetAddressDecodeErrorZ_get_ok(owner: number): number { +export function CResult_NetAddressDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5010,7 +5017,7 @@ export function CResult_NetAddressDecodeErrorZ_get_ok(owner: number): number { } // struct LDKDecodeError CResult_NetAddressDecodeErrorZ_get_err(LDKCResult_NetAddressDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_NetAddressDecodeErrorZ_get_err(owner: number): number { +export function CResult_NetAddressDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5019,7 +5026,7 @@ export function CResult_NetAddressDecodeErrorZ_get_err(owner: number): number { } // struct LDKAcceptChannel CResult_AcceptChannelDecodeErrorZ_get_ok(LDKCResult_AcceptChannelDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_AcceptChannelDecodeErrorZ_get_ok(owner: number): number { +export function CResult_AcceptChannelDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5028,7 +5035,7 @@ export function CResult_AcceptChannelDecodeErrorZ_get_ok(owner: number): number } // struct LDKDecodeError CResult_AcceptChannelDecodeErrorZ_get_err(LDKCResult_AcceptChannelDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_AcceptChannelDecodeErrorZ_get_err(owner: number): number { +export function CResult_AcceptChannelDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5037,7 +5044,7 @@ export function CResult_AcceptChannelDecodeErrorZ_get_err(owner: number): number } // struct LDKAnnouncementSignatures CResult_AnnouncementSignaturesDecodeErrorZ_get_ok(LDKCResult_AnnouncementSignaturesDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_AnnouncementSignaturesDecodeErrorZ_get_ok(owner: number): number { +export function CResult_AnnouncementSignaturesDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5046,7 +5053,7 @@ export function CResult_AnnouncementSignaturesDecodeErrorZ_get_ok(owner: number) } // struct LDKDecodeError CResult_AnnouncementSignaturesDecodeErrorZ_get_err(LDKCResult_AnnouncementSignaturesDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_AnnouncementSignaturesDecodeErrorZ_get_err(owner: number): number { +export function CResult_AnnouncementSignaturesDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5055,7 +5062,7 @@ export function CResult_AnnouncementSignaturesDecodeErrorZ_get_err(owner: number } // struct LDKChannelReestablish CResult_ChannelReestablishDecodeErrorZ_get_ok(LDKCResult_ChannelReestablishDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ChannelReestablishDecodeErrorZ_get_ok(owner: number): number { +export function CResult_ChannelReestablishDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5064,7 +5071,7 @@ export function CResult_ChannelReestablishDecodeErrorZ_get_ok(owner: number): nu } // struct LDKDecodeError CResult_ChannelReestablishDecodeErrorZ_get_err(LDKCResult_ChannelReestablishDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ChannelReestablishDecodeErrorZ_get_err(owner: number): number { +export function CResult_ChannelReestablishDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5073,7 +5080,7 @@ export function CResult_ChannelReestablishDecodeErrorZ_get_err(owner: number): n } // struct LDKClosingSigned CResult_ClosingSignedDecodeErrorZ_get_ok(LDKCResult_ClosingSignedDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ClosingSignedDecodeErrorZ_get_ok(owner: number): number { +export function CResult_ClosingSignedDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5082,7 +5089,7 @@ export function CResult_ClosingSignedDecodeErrorZ_get_ok(owner: number): number } // struct LDKDecodeError CResult_ClosingSignedDecodeErrorZ_get_err(LDKCResult_ClosingSignedDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ClosingSignedDecodeErrorZ_get_err(owner: number): number { +export function CResult_ClosingSignedDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5091,7 +5098,7 @@ export function CResult_ClosingSignedDecodeErrorZ_get_err(owner: number): number } // struct LDKClosingSignedFeeRange CResult_ClosingSignedFeeRangeDecodeErrorZ_get_ok(LDKCResult_ClosingSignedFeeRangeDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ClosingSignedFeeRangeDecodeErrorZ_get_ok(owner: number): number { +export function CResult_ClosingSignedFeeRangeDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5100,7 +5107,7 @@ export function CResult_ClosingSignedFeeRangeDecodeErrorZ_get_ok(owner: number): } // struct LDKDecodeError CResult_ClosingSignedFeeRangeDecodeErrorZ_get_err(LDKCResult_ClosingSignedFeeRangeDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ClosingSignedFeeRangeDecodeErrorZ_get_err(owner: number): number { +export function CResult_ClosingSignedFeeRangeDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5109,7 +5116,7 @@ export function CResult_ClosingSignedFeeRangeDecodeErrorZ_get_err(owner: number) } // struct LDKCommitmentSigned CResult_CommitmentSignedDecodeErrorZ_get_ok(LDKCResult_CommitmentSignedDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_CommitmentSignedDecodeErrorZ_get_ok(owner: number): number { +export function CResult_CommitmentSignedDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5118,7 +5125,7 @@ export function CResult_CommitmentSignedDecodeErrorZ_get_ok(owner: number): numb } // struct LDKDecodeError CResult_CommitmentSignedDecodeErrorZ_get_err(LDKCResult_CommitmentSignedDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_CommitmentSignedDecodeErrorZ_get_err(owner: number): number { +export function CResult_CommitmentSignedDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5127,7 +5134,7 @@ export function CResult_CommitmentSignedDecodeErrorZ_get_err(owner: number): num } // struct LDKFundingCreated CResult_FundingCreatedDecodeErrorZ_get_ok(LDKCResult_FundingCreatedDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_FundingCreatedDecodeErrorZ_get_ok(owner: number): number { +export function CResult_FundingCreatedDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5136,7 +5143,7 @@ export function CResult_FundingCreatedDecodeErrorZ_get_ok(owner: number): number } // struct LDKDecodeError CResult_FundingCreatedDecodeErrorZ_get_err(LDKCResult_FundingCreatedDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_FundingCreatedDecodeErrorZ_get_err(owner: number): number { +export function CResult_FundingCreatedDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5145,7 +5152,7 @@ export function CResult_FundingCreatedDecodeErrorZ_get_err(owner: number): numbe } // struct LDKFundingSigned CResult_FundingSignedDecodeErrorZ_get_ok(LDKCResult_FundingSignedDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_FundingSignedDecodeErrorZ_get_ok(owner: number): number { +export function CResult_FundingSignedDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5154,7 +5161,7 @@ export function CResult_FundingSignedDecodeErrorZ_get_ok(owner: number): number } // struct LDKDecodeError CResult_FundingSignedDecodeErrorZ_get_err(LDKCResult_FundingSignedDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_FundingSignedDecodeErrorZ_get_err(owner: number): number { +export function CResult_FundingSignedDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5163,7 +5170,7 @@ export function CResult_FundingSignedDecodeErrorZ_get_err(owner: number): number } // struct LDKChannelReady CResult_ChannelReadyDecodeErrorZ_get_ok(LDKCResult_ChannelReadyDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ChannelReadyDecodeErrorZ_get_ok(owner: number): number { +export function CResult_ChannelReadyDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5172,7 +5179,7 @@ export function CResult_ChannelReadyDecodeErrorZ_get_ok(owner: number): number { } // struct LDKDecodeError CResult_ChannelReadyDecodeErrorZ_get_err(LDKCResult_ChannelReadyDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ChannelReadyDecodeErrorZ_get_err(owner: number): number { +export function CResult_ChannelReadyDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5181,7 +5188,7 @@ export function CResult_ChannelReadyDecodeErrorZ_get_err(owner: number): number } // struct LDKInit CResult_InitDecodeErrorZ_get_ok(LDKCResult_InitDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_InitDecodeErrorZ_get_ok(owner: number): number { +export function CResult_InitDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5190,7 +5197,7 @@ export function CResult_InitDecodeErrorZ_get_ok(owner: number): number { } // struct LDKDecodeError CResult_InitDecodeErrorZ_get_err(LDKCResult_InitDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_InitDecodeErrorZ_get_err(owner: number): number { +export function CResult_InitDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5199,7 +5206,7 @@ export function CResult_InitDecodeErrorZ_get_err(owner: number): number { } // struct LDKOpenChannel CResult_OpenChannelDecodeErrorZ_get_ok(LDKCResult_OpenChannelDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_OpenChannelDecodeErrorZ_get_ok(owner: number): number { +export function CResult_OpenChannelDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5208,7 +5215,7 @@ export function CResult_OpenChannelDecodeErrorZ_get_ok(owner: number): number { } // struct LDKDecodeError CResult_OpenChannelDecodeErrorZ_get_err(LDKCResult_OpenChannelDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_OpenChannelDecodeErrorZ_get_err(owner: number): number { +export function CResult_OpenChannelDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5217,7 +5224,7 @@ export function CResult_OpenChannelDecodeErrorZ_get_err(owner: number): number { } // struct LDKRevokeAndACK CResult_RevokeAndACKDecodeErrorZ_get_ok(LDKCResult_RevokeAndACKDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_RevokeAndACKDecodeErrorZ_get_ok(owner: number): number { +export function CResult_RevokeAndACKDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5226,7 +5233,7 @@ export function CResult_RevokeAndACKDecodeErrorZ_get_ok(owner: number): number { } // struct LDKDecodeError CResult_RevokeAndACKDecodeErrorZ_get_err(LDKCResult_RevokeAndACKDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_RevokeAndACKDecodeErrorZ_get_err(owner: number): number { +export function CResult_RevokeAndACKDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5235,7 +5242,7 @@ export function CResult_RevokeAndACKDecodeErrorZ_get_err(owner: number): number } // struct LDKShutdown CResult_ShutdownDecodeErrorZ_get_ok(LDKCResult_ShutdownDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ShutdownDecodeErrorZ_get_ok(owner: number): number { +export function CResult_ShutdownDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5244,7 +5251,7 @@ export function CResult_ShutdownDecodeErrorZ_get_ok(owner: number): number { } // struct LDKDecodeError CResult_ShutdownDecodeErrorZ_get_err(LDKCResult_ShutdownDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ShutdownDecodeErrorZ_get_err(owner: number): number { +export function CResult_ShutdownDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5253,7 +5260,7 @@ export function CResult_ShutdownDecodeErrorZ_get_err(owner: number): number { } // struct LDKUpdateFailHTLC CResult_UpdateFailHTLCDecodeErrorZ_get_ok(LDKCResult_UpdateFailHTLCDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_UpdateFailHTLCDecodeErrorZ_get_ok(owner: number): number { +export function CResult_UpdateFailHTLCDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5262,7 +5269,7 @@ export function CResult_UpdateFailHTLCDecodeErrorZ_get_ok(owner: number): number } // struct LDKDecodeError CResult_UpdateFailHTLCDecodeErrorZ_get_err(LDKCResult_UpdateFailHTLCDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_UpdateFailHTLCDecodeErrorZ_get_err(owner: number): number { +export function CResult_UpdateFailHTLCDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5271,7 +5278,7 @@ export function CResult_UpdateFailHTLCDecodeErrorZ_get_err(owner: number): numbe } // struct LDKUpdateFailMalformedHTLC CResult_UpdateFailMalformedHTLCDecodeErrorZ_get_ok(LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_UpdateFailMalformedHTLCDecodeErrorZ_get_ok(owner: number): number { +export function CResult_UpdateFailMalformedHTLCDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5280,7 +5287,7 @@ export function CResult_UpdateFailMalformedHTLCDecodeErrorZ_get_ok(owner: number } // struct LDKDecodeError CResult_UpdateFailMalformedHTLCDecodeErrorZ_get_err(LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_UpdateFailMalformedHTLCDecodeErrorZ_get_err(owner: number): number { +export function CResult_UpdateFailMalformedHTLCDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5289,7 +5296,7 @@ export function CResult_UpdateFailMalformedHTLCDecodeErrorZ_get_err(owner: numbe } // struct LDKUpdateFee CResult_UpdateFeeDecodeErrorZ_get_ok(LDKCResult_UpdateFeeDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_UpdateFeeDecodeErrorZ_get_ok(owner: number): number { +export function CResult_UpdateFeeDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5298,7 +5305,7 @@ export function CResult_UpdateFeeDecodeErrorZ_get_ok(owner: number): number { } // struct LDKDecodeError CResult_UpdateFeeDecodeErrorZ_get_err(LDKCResult_UpdateFeeDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_UpdateFeeDecodeErrorZ_get_err(owner: number): number { +export function CResult_UpdateFeeDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5307,7 +5314,7 @@ export function CResult_UpdateFeeDecodeErrorZ_get_err(owner: number): number { } // struct LDKUpdateFulfillHTLC CResult_UpdateFulfillHTLCDecodeErrorZ_get_ok(LDKCResult_UpdateFulfillHTLCDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_UpdateFulfillHTLCDecodeErrorZ_get_ok(owner: number): number { +export function CResult_UpdateFulfillHTLCDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5316,7 +5323,7 @@ export function CResult_UpdateFulfillHTLCDecodeErrorZ_get_ok(owner: number): num } // struct LDKDecodeError CResult_UpdateFulfillHTLCDecodeErrorZ_get_err(LDKCResult_UpdateFulfillHTLCDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_UpdateFulfillHTLCDecodeErrorZ_get_err(owner: number): number { +export function CResult_UpdateFulfillHTLCDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5325,7 +5332,7 @@ export function CResult_UpdateFulfillHTLCDecodeErrorZ_get_err(owner: number): nu } // struct LDKUpdateAddHTLC CResult_UpdateAddHTLCDecodeErrorZ_get_ok(LDKCResult_UpdateAddHTLCDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_UpdateAddHTLCDecodeErrorZ_get_ok(owner: number): number { +export function CResult_UpdateAddHTLCDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5334,7 +5341,7 @@ export function CResult_UpdateAddHTLCDecodeErrorZ_get_ok(owner: number): number } // struct LDKDecodeError CResult_UpdateAddHTLCDecodeErrorZ_get_err(LDKCResult_UpdateAddHTLCDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_UpdateAddHTLCDecodeErrorZ_get_err(owner: number): number { +export function CResult_UpdateAddHTLCDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5343,7 +5350,7 @@ export function CResult_UpdateAddHTLCDecodeErrorZ_get_err(owner: number): number } // struct LDKPing CResult_PingDecodeErrorZ_get_ok(LDKCResult_PingDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_PingDecodeErrorZ_get_ok(owner: number): number { +export function CResult_PingDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5352,7 +5359,7 @@ export function CResult_PingDecodeErrorZ_get_ok(owner: number): number { } // struct LDKDecodeError CResult_PingDecodeErrorZ_get_err(LDKCResult_PingDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_PingDecodeErrorZ_get_err(owner: number): number { +export function CResult_PingDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5361,7 +5368,7 @@ export function CResult_PingDecodeErrorZ_get_err(owner: number): number { } // struct LDKPong CResult_PongDecodeErrorZ_get_ok(LDKCResult_PongDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_PongDecodeErrorZ_get_ok(owner: number): number { +export function CResult_PongDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5370,7 +5377,7 @@ export function CResult_PongDecodeErrorZ_get_ok(owner: number): number { } // struct LDKDecodeError CResult_PongDecodeErrorZ_get_err(LDKCResult_PongDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_PongDecodeErrorZ_get_err(owner: number): number { +export function CResult_PongDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5379,7 +5386,7 @@ export function CResult_PongDecodeErrorZ_get_err(owner: number): number { } // struct LDKUnsignedChannelAnnouncement CResult_UnsignedChannelAnnouncementDecodeErrorZ_get_ok(LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_UnsignedChannelAnnouncementDecodeErrorZ_get_ok(owner: number): number { +export function CResult_UnsignedChannelAnnouncementDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5388,7 +5395,7 @@ export function CResult_UnsignedChannelAnnouncementDecodeErrorZ_get_ok(owner: nu } // struct LDKDecodeError CResult_UnsignedChannelAnnouncementDecodeErrorZ_get_err(LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_UnsignedChannelAnnouncementDecodeErrorZ_get_err(owner: number): number { +export function CResult_UnsignedChannelAnnouncementDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5397,7 +5404,7 @@ export function CResult_UnsignedChannelAnnouncementDecodeErrorZ_get_err(owner: n } // struct LDKChannelAnnouncement CResult_ChannelAnnouncementDecodeErrorZ_get_ok(LDKCResult_ChannelAnnouncementDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ChannelAnnouncementDecodeErrorZ_get_ok(owner: number): number { +export function CResult_ChannelAnnouncementDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5406,7 +5413,7 @@ export function CResult_ChannelAnnouncementDecodeErrorZ_get_ok(owner: number): n } // struct LDKDecodeError CResult_ChannelAnnouncementDecodeErrorZ_get_err(LDKCResult_ChannelAnnouncementDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ChannelAnnouncementDecodeErrorZ_get_err(owner: number): number { +export function CResult_ChannelAnnouncementDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5415,7 +5422,7 @@ export function CResult_ChannelAnnouncementDecodeErrorZ_get_err(owner: number): } // struct LDKUnsignedChannelUpdate CResult_UnsignedChannelUpdateDecodeErrorZ_get_ok(LDKCResult_UnsignedChannelUpdateDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_UnsignedChannelUpdateDecodeErrorZ_get_ok(owner: number): number { +export function CResult_UnsignedChannelUpdateDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5424,7 +5431,7 @@ export function CResult_UnsignedChannelUpdateDecodeErrorZ_get_ok(owner: number): } // struct LDKDecodeError CResult_UnsignedChannelUpdateDecodeErrorZ_get_err(LDKCResult_UnsignedChannelUpdateDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_UnsignedChannelUpdateDecodeErrorZ_get_err(owner: number): number { +export function CResult_UnsignedChannelUpdateDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5433,7 +5440,7 @@ export function CResult_UnsignedChannelUpdateDecodeErrorZ_get_err(owner: number) } // struct LDKChannelUpdate CResult_ChannelUpdateDecodeErrorZ_get_ok(LDKCResult_ChannelUpdateDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ChannelUpdateDecodeErrorZ_get_ok(owner: number): number { +export function CResult_ChannelUpdateDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5442,7 +5449,7 @@ export function CResult_ChannelUpdateDecodeErrorZ_get_ok(owner: number): number } // struct LDKDecodeError CResult_ChannelUpdateDecodeErrorZ_get_err(LDKCResult_ChannelUpdateDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ChannelUpdateDecodeErrorZ_get_err(owner: number): number { +export function CResult_ChannelUpdateDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5451,7 +5458,7 @@ export function CResult_ChannelUpdateDecodeErrorZ_get_err(owner: number): number } // struct LDKErrorMessage CResult_ErrorMessageDecodeErrorZ_get_ok(LDKCResult_ErrorMessageDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ErrorMessageDecodeErrorZ_get_ok(owner: number): number { +export function CResult_ErrorMessageDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5460,7 +5467,7 @@ export function CResult_ErrorMessageDecodeErrorZ_get_ok(owner: number): number { } // struct LDKDecodeError CResult_ErrorMessageDecodeErrorZ_get_err(LDKCResult_ErrorMessageDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ErrorMessageDecodeErrorZ_get_err(owner: number): number { +export function CResult_ErrorMessageDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5469,7 +5476,7 @@ export function CResult_ErrorMessageDecodeErrorZ_get_err(owner: number): number } // struct LDKWarningMessage CResult_WarningMessageDecodeErrorZ_get_ok(LDKCResult_WarningMessageDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_WarningMessageDecodeErrorZ_get_ok(owner: number): number { +export function CResult_WarningMessageDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5478,7 +5485,7 @@ export function CResult_WarningMessageDecodeErrorZ_get_ok(owner: number): number } // struct LDKDecodeError CResult_WarningMessageDecodeErrorZ_get_err(LDKCResult_WarningMessageDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_WarningMessageDecodeErrorZ_get_err(owner: number): number { +export function CResult_WarningMessageDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5487,7 +5494,7 @@ export function CResult_WarningMessageDecodeErrorZ_get_err(owner: number): numbe } // struct LDKUnsignedNodeAnnouncement CResult_UnsignedNodeAnnouncementDecodeErrorZ_get_ok(LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_UnsignedNodeAnnouncementDecodeErrorZ_get_ok(owner: number): number { +export function CResult_UnsignedNodeAnnouncementDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5496,7 +5503,7 @@ export function CResult_UnsignedNodeAnnouncementDecodeErrorZ_get_ok(owner: numbe } // struct LDKDecodeError CResult_UnsignedNodeAnnouncementDecodeErrorZ_get_err(LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_UnsignedNodeAnnouncementDecodeErrorZ_get_err(owner: number): number { +export function CResult_UnsignedNodeAnnouncementDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5505,7 +5512,7 @@ export function CResult_UnsignedNodeAnnouncementDecodeErrorZ_get_err(owner: numb } // struct LDKNodeAnnouncement CResult_NodeAnnouncementDecodeErrorZ_get_ok(LDKCResult_NodeAnnouncementDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_NodeAnnouncementDecodeErrorZ_get_ok(owner: number): number { +export function CResult_NodeAnnouncementDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5514,7 +5521,7 @@ export function CResult_NodeAnnouncementDecodeErrorZ_get_ok(owner: number): numb } // struct LDKDecodeError CResult_NodeAnnouncementDecodeErrorZ_get_err(LDKCResult_NodeAnnouncementDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_NodeAnnouncementDecodeErrorZ_get_err(owner: number): number { +export function CResult_NodeAnnouncementDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5523,7 +5530,7 @@ export function CResult_NodeAnnouncementDecodeErrorZ_get_err(owner: number): num } // struct LDKQueryShortChannelIds CResult_QueryShortChannelIdsDecodeErrorZ_get_ok(LDKCResult_QueryShortChannelIdsDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_QueryShortChannelIdsDecodeErrorZ_get_ok(owner: number): number { +export function CResult_QueryShortChannelIdsDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5532,7 +5539,7 @@ export function CResult_QueryShortChannelIdsDecodeErrorZ_get_ok(owner: number): } // struct LDKDecodeError CResult_QueryShortChannelIdsDecodeErrorZ_get_err(LDKCResult_QueryShortChannelIdsDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_QueryShortChannelIdsDecodeErrorZ_get_err(owner: number): number { +export function CResult_QueryShortChannelIdsDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5541,7 +5548,7 @@ export function CResult_QueryShortChannelIdsDecodeErrorZ_get_err(owner: number): } // struct LDKReplyShortChannelIdsEnd CResult_ReplyShortChannelIdsEndDecodeErrorZ_get_ok(LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ReplyShortChannelIdsEndDecodeErrorZ_get_ok(owner: number): number { +export function CResult_ReplyShortChannelIdsEndDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5550,7 +5557,7 @@ export function CResult_ReplyShortChannelIdsEndDecodeErrorZ_get_ok(owner: number } // struct LDKDecodeError CResult_ReplyShortChannelIdsEndDecodeErrorZ_get_err(LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ReplyShortChannelIdsEndDecodeErrorZ_get_err(owner: number): number { +export function CResult_ReplyShortChannelIdsEndDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5559,7 +5566,7 @@ export function CResult_ReplyShortChannelIdsEndDecodeErrorZ_get_err(owner: numbe } // struct LDKQueryChannelRange CResult_QueryChannelRangeDecodeErrorZ_get_ok(LDKCResult_QueryChannelRangeDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_QueryChannelRangeDecodeErrorZ_get_ok(owner: number): number { +export function CResult_QueryChannelRangeDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5568,7 +5575,7 @@ export function CResult_QueryChannelRangeDecodeErrorZ_get_ok(owner: number): num } // struct LDKDecodeError CResult_QueryChannelRangeDecodeErrorZ_get_err(LDKCResult_QueryChannelRangeDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_QueryChannelRangeDecodeErrorZ_get_err(owner: number): number { +export function CResult_QueryChannelRangeDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5577,7 +5584,7 @@ export function CResult_QueryChannelRangeDecodeErrorZ_get_err(owner: number): nu } // struct LDKReplyChannelRange CResult_ReplyChannelRangeDecodeErrorZ_get_ok(LDKCResult_ReplyChannelRangeDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ReplyChannelRangeDecodeErrorZ_get_ok(owner: number): number { +export function CResult_ReplyChannelRangeDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5586,7 +5593,7 @@ export function CResult_ReplyChannelRangeDecodeErrorZ_get_ok(owner: number): num } // struct LDKDecodeError CResult_ReplyChannelRangeDecodeErrorZ_get_err(LDKCResult_ReplyChannelRangeDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_ReplyChannelRangeDecodeErrorZ_get_err(owner: number): number { +export function CResult_ReplyChannelRangeDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5595,7 +5602,7 @@ export function CResult_ReplyChannelRangeDecodeErrorZ_get_err(owner: number): nu } // struct LDKGossipTimestampFilter CResult_GossipTimestampFilterDecodeErrorZ_get_ok(LDKCResult_GossipTimestampFilterDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_GossipTimestampFilterDecodeErrorZ_get_ok(owner: number): number { +export function CResult_GossipTimestampFilterDecodeErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5604,7 +5611,7 @@ export function CResult_GossipTimestampFilterDecodeErrorZ_get_ok(owner: number): } // struct LDKDecodeError CResult_GossipTimestampFilterDecodeErrorZ_get_err(LDKCResult_GossipTimestampFilterDecodeErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_GossipTimestampFilterDecodeErrorZ_get_err(owner: number): number { +export function CResult_GossipTimestampFilterDecodeErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5616,7 +5623,7 @@ export class LDKSignOrCreationError { protected constructor() {} } /* @internal */ -export function LDKSignOrCreationError_ty_from_ptr(ptr: number): number { +export function LDKSignOrCreationError_ty_from_ptr(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5624,7 +5631,7 @@ export function LDKSignOrCreationError_ty_from_ptr(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKSignOrCreationError_CreationError_get_creation_error(ptr: number): CreationError { +export function LDKSignOrCreationError_CreationError_get_creation_error(ptr: bigint): CreationError { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5633,7 +5640,7 @@ export function LDKSignOrCreationError_CreationError_get_creation_error(ptr: num } // struct LDKInvoice CResult_InvoiceSignOrCreationErrorZ_get_ok(LDKCResult_InvoiceSignOrCreationErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_InvoiceSignOrCreationErrorZ_get_ok(owner: number): number { +export function CResult_InvoiceSignOrCreationErrorZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5642,7 +5649,7 @@ export function CResult_InvoiceSignOrCreationErrorZ_get_ok(owner: number): numbe } // struct LDKSignOrCreationError CResult_InvoiceSignOrCreationErrorZ_get_err(LDKCResult_InvoiceSignOrCreationErrorZ *NONNULL_PTR owner); /* @internal */ -export function CResult_InvoiceSignOrCreationErrorZ_get_err(owner: number): number { +export function CResult_InvoiceSignOrCreationErrorZ_get_err(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5652,11 +5659,11 @@ export function CResult_InvoiceSignOrCreationErrorZ_get_err(owner: number): numb /* @internal */ export interface LDKFilter { register_tx (txid: number, script_pubkey: number): void; - register_output (output: number): number; + register_output (output: bigint): bigint; } /* @internal */ -export function LDKFilter_new(impl: LDKFilter): number { +export function LDKFilter_new(impl: LDKFilter): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5669,7 +5676,7 @@ export function LDKFilter_new(impl: LDKFilter): number { } // void Filter_register_tx LDKFilter *NONNULL_PTR this_arg, const uint8_t (*txid)[32], struct LDKu8slice script_pubkey /* @internal */ -export function Filter_register_tx(this_arg: number, txid: number, script_pubkey: number): void { +export function Filter_register_tx(this_arg: bigint, txid: number, script_pubkey: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5678,7 +5685,7 @@ export function Filter_register_tx(this_arg: number, txid: number, script_pubkey } // LDKCOption_C2Tuple_usizeTransactionZZ Filter_register_output LDKFilter *NONNULL_PTR this_arg, struct LDKWatchedOutput output /* @internal */ -export function Filter_register_output(this_arg: number, output: number): number { +export function Filter_register_output(this_arg: bigint, output: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5690,7 +5697,7 @@ export class LDKCOption_FilterZ { protected constructor() {} } /* @internal */ -export function LDKCOption_FilterZ_ty_from_ptr(ptr: number): number { +export function LDKCOption_FilterZ_ty_from_ptr(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5698,7 +5705,7 @@ export function LDKCOption_FilterZ_ty_from_ptr(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKCOption_FilterZ_Some_get_some(ptr: number): number { +export function LDKCOption_FilterZ_Some_get_some(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5707,7 +5714,7 @@ export function LDKCOption_FilterZ_Some_get_some(ptr: number): number { } // struct LDKLockedChannelMonitor *CResult_LockedChannelMonitorNoneZ_get_ok(LDKCResult_LockedChannelMonitorNoneZ *NONNULL_PTR owner); /* @internal */ -export function CResult_LockedChannelMonitorNoneZ_get_ok(owner: number): number { +export function CResult_LockedChannelMonitorNoneZ_get_ok(owner: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5716,7 +5723,7 @@ export function CResult_LockedChannelMonitorNoneZ_get_ok(owner: number): number } // void CResult_LockedChannelMonitorNoneZ_get_err(LDKCResult_LockedChannelMonitorNoneZ *NONNULL_PTR owner); /* @internal */ -export function CResult_LockedChannelMonitorNoneZ_get_err(owner: number): void { +export function CResult_LockedChannelMonitorNoneZ_get_err(owner: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5729,7 +5736,7 @@ export interface LDKMessageSendEventsProvider { } /* @internal */ -export function LDKMessageSendEventsProvider_new(impl: LDKMessageSendEventsProvider): number { +export function LDKMessageSendEventsProvider_new(impl: LDKMessageSendEventsProvider): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5742,7 +5749,7 @@ export function LDKMessageSendEventsProvider_new(impl: LDKMessageSendEventsProvi } // LDKCVec_MessageSendEventZ MessageSendEventsProvider_get_and_clear_pending_msg_events LDKMessageSendEventsProvider *NONNULL_PTR this_arg /* @internal */ -export function MessageSendEventsProvider_get_and_clear_pending_msg_events(this_arg: number): number { +export function MessageSendEventsProvider_get_and_clear_pending_msg_events(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5751,11 +5758,11 @@ export function MessageSendEventsProvider_get_and_clear_pending_msg_events(this_ } /* @internal */ export interface LDKEventHandler { - handle_event (event: number): void; + handle_event (event: bigint): void; } /* @internal */ -export function LDKEventHandler_new(impl: LDKEventHandler): number { +export function LDKEventHandler_new(impl: LDKEventHandler): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5768,7 +5775,7 @@ export function LDKEventHandler_new(impl: LDKEventHandler): number { } // void EventHandler_handle_event LDKEventHandler *NONNULL_PTR this_arg, const struct LDKEvent *NONNULL_PTR event /* @internal */ -export function EventHandler_handle_event(this_arg: number, event: number): void { +export function EventHandler_handle_event(this_arg: bigint, event: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5777,11 +5784,11 @@ export function EventHandler_handle_event(this_arg: number, event: number): void } /* @internal */ export interface LDKEventsProvider { - process_pending_events (handler: number): void; + process_pending_events (handler: bigint): void; } /* @internal */ -export function LDKEventsProvider_new(impl: LDKEventsProvider): number { +export function LDKEventsProvider_new(impl: LDKEventsProvider): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5794,7 +5801,7 @@ export function LDKEventsProvider_new(impl: LDKEventsProvider): number { } // void EventsProvider_process_pending_events LDKEventsProvider *NONNULL_PTR this_arg, struct LDKEventHandler handler /* @internal */ -export function EventsProvider_process_pending_events(this_arg: number, handler: number): void { +export function EventsProvider_process_pending_events(this_arg: bigint, handler: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5803,7 +5810,7 @@ export function EventsProvider_process_pending_events(this_arg: number, handler: } /* @internal */ export interface LDKScore { - channel_penalty_msat (short_channel_id: bigint, source: number, target: number, usage: number): bigint; + channel_penalty_msat (short_channel_id: bigint, source: bigint, target: bigint, usage: bigint): bigint; payment_path_failed (path: number, short_channel_id: bigint): void; payment_path_successful (path: number): void; probe_failed (path: number, short_channel_id: bigint): void; @@ -5812,7 +5819,7 @@ export interface LDKScore { } /* @internal */ -export function LDKScore_new(impl: LDKScore): number { +export function LDKScore_new(impl: LDKScore): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5825,7 +5832,7 @@ export function LDKScore_new(impl: LDKScore): number { } // uint64_t Score_channel_penalty_msat LDKScore *NONNULL_PTR this_arg, uint64_t short_channel_id, const struct LDKNodeId *NONNULL_PTR source, const struct LDKNodeId *NONNULL_PTR target, struct LDKChannelUsage usage /* @internal */ -export function Score_channel_penalty_msat(this_arg: number, short_channel_id: bigint, source: number, target: number, usage: number): bigint { +export function Score_channel_penalty_msat(this_arg: bigint, short_channel_id: bigint, source: bigint, target: bigint, usage: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5834,7 +5841,7 @@ export function Score_channel_penalty_msat(this_arg: number, short_channel_id: b } // void Score_payment_path_failed LDKScore *NONNULL_PTR this_arg, struct LDKCVec_RouteHopZ path, uint64_t short_channel_id /* @internal */ -export function Score_payment_path_failed(this_arg: number, path: number, short_channel_id: bigint): void { +export function Score_payment_path_failed(this_arg: bigint, path: number, short_channel_id: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5843,7 +5850,7 @@ export function Score_payment_path_failed(this_arg: number, path: number, short_ } // void Score_payment_path_successful LDKScore *NONNULL_PTR this_arg, struct LDKCVec_RouteHopZ path /* @internal */ -export function Score_payment_path_successful(this_arg: number, path: number): void { +export function Score_payment_path_successful(this_arg: bigint, path: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5852,7 +5859,7 @@ export function Score_payment_path_successful(this_arg: number, path: number): v } // void Score_probe_failed LDKScore *NONNULL_PTR this_arg, struct LDKCVec_RouteHopZ path, uint64_t short_channel_id /* @internal */ -export function Score_probe_failed(this_arg: number, path: number, short_channel_id: bigint): void { +export function Score_probe_failed(this_arg: bigint, path: number, short_channel_id: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5861,7 +5868,7 @@ export function Score_probe_failed(this_arg: number, path: number, short_channel } // void Score_probe_successful LDKScore *NONNULL_PTR this_arg, struct LDKCVec_RouteHopZ path /* @internal */ -export function Score_probe_successful(this_arg: number, path: number): void { +export function Score_probe_successful(this_arg: bigint, path: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5870,7 +5877,7 @@ export function Score_probe_successful(this_arg: number, path: number): void { } // LDKCVec_u8Z Score_write LDKScore *NONNULL_PTR this_arg /* @internal */ -export function Score_write(this_arg: number): number { +export function Score_write(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5879,13 +5886,13 @@ export function Score_write(this_arg: number): number { } /* @internal */ export interface LDKPersister { - persist_manager (channel_manager: number): number; - persist_graph (network_graph: number): number; - persist_scorer (scorer: number): number; + persist_manager (channel_manager: bigint): bigint; + persist_graph (network_graph: bigint): bigint; + persist_scorer (scorer: bigint): bigint; } /* @internal */ -export function LDKPersister_new(impl: LDKPersister): number { +export function LDKPersister_new(impl: LDKPersister): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5898,7 +5905,7 @@ export function LDKPersister_new(impl: LDKPersister): number { } // LDKCResult_NoneErrorZ Persister_persist_manager LDKPersister *NONNULL_PTR this_arg, const struct LDKChannelManager *NONNULL_PTR channel_manager /* @internal */ -export function Persister_persist_manager(this_arg: number, channel_manager: number): number { +export function Persister_persist_manager(this_arg: bigint, channel_manager: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5907,7 +5914,7 @@ export function Persister_persist_manager(this_arg: number, channel_manager: num } // LDKCResult_NoneErrorZ Persister_persist_graph LDKPersister *NONNULL_PTR this_arg, const struct LDKNetworkGraph *NONNULL_PTR network_graph /* @internal */ -export function Persister_persist_graph(this_arg: number, network_graph: number): number { +export function Persister_persist_graph(this_arg: bigint, network_graph: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5916,7 +5923,7 @@ export function Persister_persist_graph(this_arg: number, network_graph: number) } // LDKCResult_NoneErrorZ Persister_persist_scorer LDKPersister *NONNULL_PTR this_arg, const struct LDKMultiThreadedLockableScore *NONNULL_PTR scorer /* @internal */ -export function Persister_persist_scorer(this_arg: number, scorer: number): number { +export function Persister_persist_scorer(this_arg: bigint, scorer: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5931,7 +5938,7 @@ export interface LDKListen { } /* @internal */ -export function LDKListen_new(impl: LDKListen): number { +export function LDKListen_new(impl: LDKListen): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5944,7 +5951,7 @@ export function LDKListen_new(impl: LDKListen): number { } // void Listen_filtered_block_connected LDKListen *NONNULL_PTR this_arg, const uint8_t (*header)[80], struct LDKCVec_C2Tuple_usizeTransactionZZ txdata, uint32_t height /* @internal */ -export function Listen_filtered_block_connected(this_arg: number, header: number, txdata: number, height: number): void { +export function Listen_filtered_block_connected(this_arg: bigint, header: number, txdata: number, height: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5953,7 +5960,7 @@ export function Listen_filtered_block_connected(this_arg: number, header: number } // void Listen_block_connected LDKListen *NONNULL_PTR this_arg, struct LDKu8slice block, uint32_t height /* @internal */ -export function Listen_block_connected(this_arg: number, block: number, height: number): void { +export function Listen_block_connected(this_arg: bigint, block: number, height: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5962,7 +5969,7 @@ export function Listen_block_connected(this_arg: number, block: number, height: } // void Listen_block_disconnected LDKListen *NONNULL_PTR this_arg, const uint8_t (*header)[80], uint32_t height /* @internal */ -export function Listen_block_disconnected(this_arg: number, header: number, height: number): void { +export function Listen_block_disconnected(this_arg: bigint, header: number, height: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5978,7 +5985,7 @@ export interface LDKConfirm { } /* @internal */ -export function LDKConfirm_new(impl: LDKConfirm): number { +export function LDKConfirm_new(impl: LDKConfirm): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -5991,7 +5998,7 @@ export function LDKConfirm_new(impl: LDKConfirm): number { } // void Confirm_transactions_confirmed LDKConfirm *NONNULL_PTR this_arg, const uint8_t (*header)[80], struct LDKCVec_C2Tuple_usizeTransactionZZ txdata, uint32_t height /* @internal */ -export function Confirm_transactions_confirmed(this_arg: number, header: number, txdata: number, height: number): void { +export function Confirm_transactions_confirmed(this_arg: bigint, header: number, txdata: number, height: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6000,7 +6007,7 @@ export function Confirm_transactions_confirmed(this_arg: number, header: number, } // void Confirm_transaction_unconfirmed LDKConfirm *NONNULL_PTR this_arg, const uint8_t (*txid)[32] /* @internal */ -export function Confirm_transaction_unconfirmed(this_arg: number, txid: number): void { +export function Confirm_transaction_unconfirmed(this_arg: bigint, txid: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6009,7 +6016,7 @@ export function Confirm_transaction_unconfirmed(this_arg: number, txid: number): } // void Confirm_best_block_updated LDKConfirm *NONNULL_PTR this_arg, const uint8_t (*header)[80], uint32_t height /* @internal */ -export function Confirm_best_block_updated(this_arg: number, header: number, height: number): void { +export function Confirm_best_block_updated(this_arg: bigint, header: number, height: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6018,7 +6025,7 @@ export function Confirm_best_block_updated(this_arg: number, header: number, hei } // LDKCVec_TxidZ Confirm_get_relevant_txids LDKConfirm *NONNULL_PTR this_arg /* @internal */ -export function Confirm_get_relevant_txids(this_arg: number): number { +export function Confirm_get_relevant_txids(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6027,12 +6034,12 @@ export function Confirm_get_relevant_txids(this_arg: number): number { } /* @internal */ export interface LDKPersist { - persist_new_channel (channel_id: number, data: number, update_id: number): number; - update_persisted_channel (channel_id: number, update: number, data: number, update_id: number): number; + persist_new_channel (channel_id: bigint, data: bigint, update_id: bigint): bigint; + update_persisted_channel (channel_id: bigint, update: bigint, data: bigint, update_id: bigint): bigint; } /* @internal */ -export function LDKPersist_new(impl: LDKPersist): number { +export function LDKPersist_new(impl: LDKPersist): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6045,7 +6052,7 @@ export function LDKPersist_new(impl: LDKPersist): number { } // LDKCResult_NoneChannelMonitorUpdateErrZ Persist_persist_new_channel LDKPersist *NONNULL_PTR this_arg, struct LDKOutPoint channel_id, const struct LDKChannelMonitor *NONNULL_PTR data, struct LDKMonitorUpdateId update_id /* @internal */ -export function Persist_persist_new_channel(this_arg: number, channel_id: number, data: number, update_id: number): number { +export function Persist_persist_new_channel(this_arg: bigint, channel_id: bigint, data: bigint, update_id: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6054,7 +6061,7 @@ export function Persist_persist_new_channel(this_arg: number, channel_id: number } // LDKCResult_NoneChannelMonitorUpdateErrZ Persist_update_persisted_channel LDKPersist *NONNULL_PTR this_arg, struct LDKOutPoint channel_id, const struct LDKChannelMonitorUpdate *NONNULL_PTR update, const struct LDKChannelMonitor *NONNULL_PTR data, struct LDKMonitorUpdateId update_id /* @internal */ -export function Persist_update_persisted_channel(this_arg: number, channel_id: number, update: number, data: number, update_id: number): number { +export function Persist_update_persisted_channel(this_arg: bigint, channel_id: bigint, update: bigint, data: bigint, update_id: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6063,30 +6070,30 @@ export function Persist_update_persisted_channel(this_arg: number, channel_id: n } /* @internal */ export interface LDKChannelMessageHandler { - handle_open_channel (their_node_id: number, their_features: number, msg: number): void; - handle_accept_channel (their_node_id: number, their_features: number, msg: number): void; - handle_funding_created (their_node_id: number, msg: number): void; - handle_funding_signed (their_node_id: number, msg: number): void; - handle_channel_ready (their_node_id: number, msg: number): void; - handle_shutdown (their_node_id: number, their_features: number, msg: number): void; - handle_closing_signed (their_node_id: number, msg: number): void; - handle_update_add_htlc (their_node_id: number, msg: number): void; - handle_update_fulfill_htlc (their_node_id: number, msg: number): void; - handle_update_fail_htlc (their_node_id: number, msg: number): void; - handle_update_fail_malformed_htlc (their_node_id: number, msg: number): void; - handle_commitment_signed (their_node_id: number, msg: number): void; - handle_revoke_and_ack (their_node_id: number, msg: number): void; - handle_update_fee (their_node_id: number, msg: number): void; - handle_announcement_signatures (their_node_id: number, msg: number): void; + handle_open_channel (their_node_id: number, their_features: bigint, msg: bigint): void; + handle_accept_channel (their_node_id: number, their_features: bigint, msg: bigint): void; + handle_funding_created (their_node_id: number, msg: bigint): void; + handle_funding_signed (their_node_id: number, msg: bigint): void; + handle_channel_ready (their_node_id: number, msg: bigint): void; + handle_shutdown (their_node_id: number, their_features: bigint, msg: bigint): void; + handle_closing_signed (their_node_id: number, msg: bigint): void; + handle_update_add_htlc (their_node_id: number, msg: bigint): void; + handle_update_fulfill_htlc (their_node_id: number, msg: bigint): void; + handle_update_fail_htlc (their_node_id: number, msg: bigint): void; + handle_update_fail_malformed_htlc (their_node_id: number, msg: bigint): void; + handle_commitment_signed (their_node_id: number, msg: bigint): void; + handle_revoke_and_ack (their_node_id: number, msg: bigint): void; + handle_update_fee (their_node_id: number, msg: bigint): void; + handle_announcement_signatures (their_node_id: number, msg: bigint): void; peer_disconnected (their_node_id: number, no_connection_possible: boolean): void; - peer_connected (their_node_id: number, msg: number): void; - handle_channel_reestablish (their_node_id: number, msg: number): void; - handle_channel_update (their_node_id: number, msg: number): void; - handle_error (their_node_id: number, msg: number): void; + peer_connected (their_node_id: number, msg: bigint): void; + handle_channel_reestablish (their_node_id: number, msg: bigint): void; + handle_channel_update (their_node_id: number, msg: bigint): void; + handle_error (their_node_id: number, msg: bigint): void; } /* @internal */ -export function LDKChannelMessageHandler_new(impl: LDKChannelMessageHandler, MessageSendEventsProvider: LDKMessageSendEventsProvider): number { +export function LDKChannelMessageHandler_new(impl: LDKChannelMessageHandler, MessageSendEventsProvider: LDKMessageSendEventsProvider): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6099,7 +6106,7 @@ export function LDKChannelMessageHandler_new(impl: LDKChannelMessageHandler, Mes } // void ChannelMessageHandler_handle_open_channel LDKChannelMessageHandler *NONNULL_PTR this_arg, struct LDKPublicKey their_node_id, struct LDKInitFeatures their_features, const struct LDKOpenChannel *NONNULL_PTR msg /* @internal */ -export function ChannelMessageHandler_handle_open_channel(this_arg: number, their_node_id: number, their_features: number, msg: number): void { +export function ChannelMessageHandler_handle_open_channel(this_arg: bigint, their_node_id: number, their_features: bigint, msg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6108,7 +6115,7 @@ export function ChannelMessageHandler_handle_open_channel(this_arg: number, thei } // void ChannelMessageHandler_handle_accept_channel LDKChannelMessageHandler *NONNULL_PTR this_arg, struct LDKPublicKey their_node_id, struct LDKInitFeatures their_features, const struct LDKAcceptChannel *NONNULL_PTR msg /* @internal */ -export function ChannelMessageHandler_handle_accept_channel(this_arg: number, their_node_id: number, their_features: number, msg: number): void { +export function ChannelMessageHandler_handle_accept_channel(this_arg: bigint, their_node_id: number, their_features: bigint, msg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6117,7 +6124,7 @@ export function ChannelMessageHandler_handle_accept_channel(this_arg: number, th } // void ChannelMessageHandler_handle_funding_created LDKChannelMessageHandler *NONNULL_PTR this_arg, struct LDKPublicKey their_node_id, const struct LDKFundingCreated *NONNULL_PTR msg /* @internal */ -export function ChannelMessageHandler_handle_funding_created(this_arg: number, their_node_id: number, msg: number): void { +export function ChannelMessageHandler_handle_funding_created(this_arg: bigint, their_node_id: number, msg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6126,7 +6133,7 @@ export function ChannelMessageHandler_handle_funding_created(this_arg: number, t } // void ChannelMessageHandler_handle_funding_signed LDKChannelMessageHandler *NONNULL_PTR this_arg, struct LDKPublicKey their_node_id, const struct LDKFundingSigned *NONNULL_PTR msg /* @internal */ -export function ChannelMessageHandler_handle_funding_signed(this_arg: number, their_node_id: number, msg: number): void { +export function ChannelMessageHandler_handle_funding_signed(this_arg: bigint, their_node_id: number, msg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6135,7 +6142,7 @@ export function ChannelMessageHandler_handle_funding_signed(this_arg: number, th } // void ChannelMessageHandler_handle_channel_ready LDKChannelMessageHandler *NONNULL_PTR this_arg, struct LDKPublicKey their_node_id, const struct LDKChannelReady *NONNULL_PTR msg /* @internal */ -export function ChannelMessageHandler_handle_channel_ready(this_arg: number, their_node_id: number, msg: number): void { +export function ChannelMessageHandler_handle_channel_ready(this_arg: bigint, their_node_id: number, msg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6144,7 +6151,7 @@ export function ChannelMessageHandler_handle_channel_ready(this_arg: number, the } // void ChannelMessageHandler_handle_shutdown LDKChannelMessageHandler *NONNULL_PTR this_arg, struct LDKPublicKey their_node_id, const struct LDKInitFeatures *NONNULL_PTR their_features, const struct LDKShutdown *NONNULL_PTR msg /* @internal */ -export function ChannelMessageHandler_handle_shutdown(this_arg: number, their_node_id: number, their_features: number, msg: number): void { +export function ChannelMessageHandler_handle_shutdown(this_arg: bigint, their_node_id: number, their_features: bigint, msg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6153,7 +6160,7 @@ export function ChannelMessageHandler_handle_shutdown(this_arg: number, their_no } // void ChannelMessageHandler_handle_closing_signed LDKChannelMessageHandler *NONNULL_PTR this_arg, struct LDKPublicKey their_node_id, const struct LDKClosingSigned *NONNULL_PTR msg /* @internal */ -export function ChannelMessageHandler_handle_closing_signed(this_arg: number, their_node_id: number, msg: number): void { +export function ChannelMessageHandler_handle_closing_signed(this_arg: bigint, their_node_id: number, msg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6162,7 +6169,7 @@ export function ChannelMessageHandler_handle_closing_signed(this_arg: number, th } // void ChannelMessageHandler_handle_update_add_htlc LDKChannelMessageHandler *NONNULL_PTR this_arg, struct LDKPublicKey their_node_id, const struct LDKUpdateAddHTLC *NONNULL_PTR msg /* @internal */ -export function ChannelMessageHandler_handle_update_add_htlc(this_arg: number, their_node_id: number, msg: number): void { +export function ChannelMessageHandler_handle_update_add_htlc(this_arg: bigint, their_node_id: number, msg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6171,7 +6178,7 @@ export function ChannelMessageHandler_handle_update_add_htlc(this_arg: number, t } // void ChannelMessageHandler_handle_update_fulfill_htlc LDKChannelMessageHandler *NONNULL_PTR this_arg, struct LDKPublicKey their_node_id, const struct LDKUpdateFulfillHTLC *NONNULL_PTR msg /* @internal */ -export function ChannelMessageHandler_handle_update_fulfill_htlc(this_arg: number, their_node_id: number, msg: number): void { +export function ChannelMessageHandler_handle_update_fulfill_htlc(this_arg: bigint, their_node_id: number, msg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6180,7 +6187,7 @@ export function ChannelMessageHandler_handle_update_fulfill_htlc(this_arg: numbe } // void ChannelMessageHandler_handle_update_fail_htlc LDKChannelMessageHandler *NONNULL_PTR this_arg, struct LDKPublicKey their_node_id, const struct LDKUpdateFailHTLC *NONNULL_PTR msg /* @internal */ -export function ChannelMessageHandler_handle_update_fail_htlc(this_arg: number, their_node_id: number, msg: number): void { +export function ChannelMessageHandler_handle_update_fail_htlc(this_arg: bigint, their_node_id: number, msg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6189,7 +6196,7 @@ export function ChannelMessageHandler_handle_update_fail_htlc(this_arg: number, } // void ChannelMessageHandler_handle_update_fail_malformed_htlc LDKChannelMessageHandler *NONNULL_PTR this_arg, struct LDKPublicKey their_node_id, const struct LDKUpdateFailMalformedHTLC *NONNULL_PTR msg /* @internal */ -export function ChannelMessageHandler_handle_update_fail_malformed_htlc(this_arg: number, their_node_id: number, msg: number): void { +export function ChannelMessageHandler_handle_update_fail_malformed_htlc(this_arg: bigint, their_node_id: number, msg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6198,7 +6205,7 @@ export function ChannelMessageHandler_handle_update_fail_malformed_htlc(this_arg } // void ChannelMessageHandler_handle_commitment_signed LDKChannelMessageHandler *NONNULL_PTR this_arg, struct LDKPublicKey their_node_id, const struct LDKCommitmentSigned *NONNULL_PTR msg /* @internal */ -export function ChannelMessageHandler_handle_commitment_signed(this_arg: number, their_node_id: number, msg: number): void { +export function ChannelMessageHandler_handle_commitment_signed(this_arg: bigint, their_node_id: number, msg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6207,7 +6214,7 @@ export function ChannelMessageHandler_handle_commitment_signed(this_arg: number, } // void ChannelMessageHandler_handle_revoke_and_ack LDKChannelMessageHandler *NONNULL_PTR this_arg, struct LDKPublicKey their_node_id, const struct LDKRevokeAndACK *NONNULL_PTR msg /* @internal */ -export function ChannelMessageHandler_handle_revoke_and_ack(this_arg: number, their_node_id: number, msg: number): void { +export function ChannelMessageHandler_handle_revoke_and_ack(this_arg: bigint, their_node_id: number, msg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6216,7 +6223,7 @@ export function ChannelMessageHandler_handle_revoke_and_ack(this_arg: number, th } // void ChannelMessageHandler_handle_update_fee LDKChannelMessageHandler *NONNULL_PTR this_arg, struct LDKPublicKey their_node_id, const struct LDKUpdateFee *NONNULL_PTR msg /* @internal */ -export function ChannelMessageHandler_handle_update_fee(this_arg: number, their_node_id: number, msg: number): void { +export function ChannelMessageHandler_handle_update_fee(this_arg: bigint, their_node_id: number, msg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6225,7 +6232,7 @@ export function ChannelMessageHandler_handle_update_fee(this_arg: number, their_ } // void ChannelMessageHandler_handle_announcement_signatures LDKChannelMessageHandler *NONNULL_PTR this_arg, struct LDKPublicKey their_node_id, const struct LDKAnnouncementSignatures *NONNULL_PTR msg /* @internal */ -export function ChannelMessageHandler_handle_announcement_signatures(this_arg: number, their_node_id: number, msg: number): void { +export function ChannelMessageHandler_handle_announcement_signatures(this_arg: bigint, their_node_id: number, msg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6234,7 +6241,7 @@ export function ChannelMessageHandler_handle_announcement_signatures(this_arg: n } // void ChannelMessageHandler_peer_disconnected LDKChannelMessageHandler *NONNULL_PTR this_arg, struct LDKPublicKey their_node_id, bool no_connection_possible /* @internal */ -export function ChannelMessageHandler_peer_disconnected(this_arg: number, their_node_id: number, no_connection_possible: boolean): void { +export function ChannelMessageHandler_peer_disconnected(this_arg: bigint, their_node_id: number, no_connection_possible: boolean): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6243,7 +6250,7 @@ export function ChannelMessageHandler_peer_disconnected(this_arg: number, their_ } // void ChannelMessageHandler_peer_connected LDKChannelMessageHandler *NONNULL_PTR this_arg, struct LDKPublicKey their_node_id, const struct LDKInit *NONNULL_PTR msg /* @internal */ -export function ChannelMessageHandler_peer_connected(this_arg: number, their_node_id: number, msg: number): void { +export function ChannelMessageHandler_peer_connected(this_arg: bigint, their_node_id: number, msg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6252,7 +6259,7 @@ export function ChannelMessageHandler_peer_connected(this_arg: number, their_nod } // void ChannelMessageHandler_handle_channel_reestablish LDKChannelMessageHandler *NONNULL_PTR this_arg, struct LDKPublicKey their_node_id, const struct LDKChannelReestablish *NONNULL_PTR msg /* @internal */ -export function ChannelMessageHandler_handle_channel_reestablish(this_arg: number, their_node_id: number, msg: number): void { +export function ChannelMessageHandler_handle_channel_reestablish(this_arg: bigint, their_node_id: number, msg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6261,7 +6268,7 @@ export function ChannelMessageHandler_handle_channel_reestablish(this_arg: numbe } // void ChannelMessageHandler_handle_channel_update LDKChannelMessageHandler *NONNULL_PTR this_arg, struct LDKPublicKey their_node_id, const struct LDKChannelUpdate *NONNULL_PTR msg /* @internal */ -export function ChannelMessageHandler_handle_channel_update(this_arg: number, their_node_id: number, msg: number): void { +export function ChannelMessageHandler_handle_channel_update(this_arg: bigint, their_node_id: number, msg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6270,7 +6277,7 @@ export function ChannelMessageHandler_handle_channel_update(this_arg: number, th } // void ChannelMessageHandler_handle_error LDKChannelMessageHandler *NONNULL_PTR this_arg, struct LDKPublicKey their_node_id, const struct LDKErrorMessage *NONNULL_PTR msg /* @internal */ -export function ChannelMessageHandler_handle_error(this_arg: number, their_node_id: number, msg: number): void { +export function ChannelMessageHandler_handle_error(this_arg: bigint, their_node_id: number, msg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6279,20 +6286,20 @@ export function ChannelMessageHandler_handle_error(this_arg: number, their_node_ } /* @internal */ export interface LDKRoutingMessageHandler { - handle_node_announcement (msg: number): number; - handle_channel_announcement (msg: number): number; - handle_channel_update (msg: number): number; + handle_node_announcement (msg: bigint): bigint; + handle_channel_announcement (msg: bigint): bigint; + handle_channel_update (msg: bigint): bigint; get_next_channel_announcements (starting_point: bigint, batch_amount: number): number; get_next_node_announcements (starting_point: number, batch_amount: number): number; - peer_connected (their_node_id: number, init: number): void; - handle_reply_channel_range (their_node_id: number, msg: number): number; - handle_reply_short_channel_ids_end (their_node_id: number, msg: number): number; - handle_query_channel_range (their_node_id: number, msg: number): number; - handle_query_short_channel_ids (their_node_id: number, msg: number): number; + peer_connected (their_node_id: number, init: bigint): void; + handle_reply_channel_range (their_node_id: number, msg: bigint): bigint; + handle_reply_short_channel_ids_end (their_node_id: number, msg: bigint): bigint; + handle_query_channel_range (their_node_id: number, msg: bigint): bigint; + handle_query_short_channel_ids (their_node_id: number, msg: bigint): bigint; } /* @internal */ -export function LDKRoutingMessageHandler_new(impl: LDKRoutingMessageHandler, MessageSendEventsProvider: LDKMessageSendEventsProvider): number { +export function LDKRoutingMessageHandler_new(impl: LDKRoutingMessageHandler, MessageSendEventsProvider: LDKMessageSendEventsProvider): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6305,7 +6312,7 @@ export function LDKRoutingMessageHandler_new(impl: LDKRoutingMessageHandler, Mes } // LDKCResult_boolLightningErrorZ RoutingMessageHandler_handle_node_announcement LDKRoutingMessageHandler *NONNULL_PTR this_arg, const struct LDKNodeAnnouncement *NONNULL_PTR msg /* @internal */ -export function RoutingMessageHandler_handle_node_announcement(this_arg: number, msg: number): number { +export function RoutingMessageHandler_handle_node_announcement(this_arg: bigint, msg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6314,7 +6321,7 @@ export function RoutingMessageHandler_handle_node_announcement(this_arg: number, } // LDKCResult_boolLightningErrorZ RoutingMessageHandler_handle_channel_announcement LDKRoutingMessageHandler *NONNULL_PTR this_arg, const struct LDKChannelAnnouncement *NONNULL_PTR msg /* @internal */ -export function RoutingMessageHandler_handle_channel_announcement(this_arg: number, msg: number): number { +export function RoutingMessageHandler_handle_channel_announcement(this_arg: bigint, msg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6323,7 +6330,7 @@ export function RoutingMessageHandler_handle_channel_announcement(this_arg: numb } // LDKCResult_boolLightningErrorZ RoutingMessageHandler_handle_channel_update LDKRoutingMessageHandler *NONNULL_PTR this_arg, const struct LDKChannelUpdate *NONNULL_PTR msg /* @internal */ -export function RoutingMessageHandler_handle_channel_update(this_arg: number, msg: number): number { +export function RoutingMessageHandler_handle_channel_update(this_arg: bigint, msg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6332,7 +6339,7 @@ export function RoutingMessageHandler_handle_channel_update(this_arg: number, ms } // LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ RoutingMessageHandler_get_next_channel_announcements LDKRoutingMessageHandler *NONNULL_PTR this_arg, uint64_t starting_point, uint8_t batch_amount /* @internal */ -export function RoutingMessageHandler_get_next_channel_announcements(this_arg: number, starting_point: bigint, batch_amount: number): number { +export function RoutingMessageHandler_get_next_channel_announcements(this_arg: bigint, starting_point: bigint, batch_amount: number): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6341,7 +6348,7 @@ export function RoutingMessageHandler_get_next_channel_announcements(this_arg: n } // LDKCVec_NodeAnnouncementZ RoutingMessageHandler_get_next_node_announcements LDKRoutingMessageHandler *NONNULL_PTR this_arg, struct LDKPublicKey starting_point, uint8_t batch_amount /* @internal */ -export function RoutingMessageHandler_get_next_node_announcements(this_arg: number, starting_point: number, batch_amount: number): number { +export function RoutingMessageHandler_get_next_node_announcements(this_arg: bigint, starting_point: number, batch_amount: number): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6350,7 +6357,7 @@ export function RoutingMessageHandler_get_next_node_announcements(this_arg: numb } // void RoutingMessageHandler_peer_connected LDKRoutingMessageHandler *NONNULL_PTR this_arg, struct LDKPublicKey their_node_id, const struct LDKInit *NONNULL_PTR init /* @internal */ -export function RoutingMessageHandler_peer_connected(this_arg: number, their_node_id: number, init: number): void { +export function RoutingMessageHandler_peer_connected(this_arg: bigint, their_node_id: number, init: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6359,7 +6366,7 @@ export function RoutingMessageHandler_peer_connected(this_arg: number, their_nod } // LDKCResult_NoneLightningErrorZ RoutingMessageHandler_handle_reply_channel_range LDKRoutingMessageHandler *NONNULL_PTR this_arg, struct LDKPublicKey their_node_id, struct LDKReplyChannelRange msg /* @internal */ -export function RoutingMessageHandler_handle_reply_channel_range(this_arg: number, their_node_id: number, msg: number): number { +export function RoutingMessageHandler_handle_reply_channel_range(this_arg: bigint, their_node_id: number, msg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6368,7 +6375,7 @@ export function RoutingMessageHandler_handle_reply_channel_range(this_arg: numbe } // LDKCResult_NoneLightningErrorZ RoutingMessageHandler_handle_reply_short_channel_ids_end LDKRoutingMessageHandler *NONNULL_PTR this_arg, struct LDKPublicKey their_node_id, struct LDKReplyShortChannelIdsEnd msg /* @internal */ -export function RoutingMessageHandler_handle_reply_short_channel_ids_end(this_arg: number, their_node_id: number, msg: number): number { +export function RoutingMessageHandler_handle_reply_short_channel_ids_end(this_arg: bigint, their_node_id: number, msg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6377,7 +6384,7 @@ export function RoutingMessageHandler_handle_reply_short_channel_ids_end(this_ar } // LDKCResult_NoneLightningErrorZ RoutingMessageHandler_handle_query_channel_range LDKRoutingMessageHandler *NONNULL_PTR this_arg, struct LDKPublicKey their_node_id, struct LDKQueryChannelRange msg /* @internal */ -export function RoutingMessageHandler_handle_query_channel_range(this_arg: number, their_node_id: number, msg: number): number { +export function RoutingMessageHandler_handle_query_channel_range(this_arg: bigint, their_node_id: number, msg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6386,7 +6393,7 @@ export function RoutingMessageHandler_handle_query_channel_range(this_arg: numbe } // LDKCResult_NoneLightningErrorZ RoutingMessageHandler_handle_query_short_channel_ids LDKRoutingMessageHandler *NONNULL_PTR this_arg, struct LDKPublicKey their_node_id, struct LDKQueryShortChannelIds msg /* @internal */ -export function RoutingMessageHandler_handle_query_short_channel_ids(this_arg: number, their_node_id: number, msg: number): number { +export function RoutingMessageHandler_handle_query_short_channel_ids(this_arg: bigint, their_node_id: number, msg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6395,11 +6402,11 @@ export function RoutingMessageHandler_handle_query_short_channel_ids(this_arg: n } /* @internal */ export interface LDKCustomMessageReader { - read (message_type: number, buffer: number): number; + read (message_type: number, buffer: number): bigint; } /* @internal */ -export function LDKCustomMessageReader_new(impl: LDKCustomMessageReader): number { +export function LDKCustomMessageReader_new(impl: LDKCustomMessageReader): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6412,7 +6419,7 @@ export function LDKCustomMessageReader_new(impl: LDKCustomMessageReader): number } // LDKCResult_COption_TypeZDecodeErrorZ CustomMessageReader_read LDKCustomMessageReader *NONNULL_PTR this_arg, uint16_t message_type, struct LDKu8slice buffer /* @internal */ -export function CustomMessageReader_read(this_arg: number, message_type: number, buffer: number): number { +export function CustomMessageReader_read(this_arg: bigint, message_type: number, buffer: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6421,12 +6428,12 @@ export function CustomMessageReader_read(this_arg: number, message_type: number, } /* @internal */ export interface LDKCustomMessageHandler { - handle_custom_message (msg: number, sender_node_id: number): number; + handle_custom_message (msg: bigint, sender_node_id: number): bigint; get_and_clear_pending_msg (): number; } /* @internal */ -export function LDKCustomMessageHandler_new(impl: LDKCustomMessageHandler, CustomMessageReader: LDKCustomMessageReader): number { +export function LDKCustomMessageHandler_new(impl: LDKCustomMessageHandler, CustomMessageReader: LDKCustomMessageReader): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6439,7 +6446,7 @@ export function LDKCustomMessageHandler_new(impl: LDKCustomMessageHandler, Custo } // LDKCResult_NoneLightningErrorZ CustomMessageHandler_handle_custom_message LDKCustomMessageHandler *NONNULL_PTR this_arg, struct LDKType msg, struct LDKPublicKey sender_node_id /* @internal */ -export function CustomMessageHandler_handle_custom_message(this_arg: number, msg: number, sender_node_id: number): number { +export function CustomMessageHandler_handle_custom_message(this_arg: bigint, msg: bigint, sender_node_id: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6448,7 +6455,7 @@ export function CustomMessageHandler_handle_custom_message(this_arg: number, msg } // LDKCVec_C2Tuple_PublicKeyTypeZZ CustomMessageHandler_get_and_clear_pending_msg LDKCustomMessageHandler *NONNULL_PTR this_arg /* @internal */ -export function CustomMessageHandler_get_and_clear_pending_msg(this_arg: number): number { +export function CustomMessageHandler_get_and_clear_pending_msg(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6459,12 +6466,12 @@ export function CustomMessageHandler_get_and_clear_pending_msg(this_arg: number) export interface LDKSocketDescriptor { send_data (data: number, resume_read: boolean): number; disconnect_socket (): void; - eq (other_arg: number): boolean; + eq (other_arg: bigint): boolean; hash (): bigint; } /* @internal */ -export function LDKSocketDescriptor_new(impl: LDKSocketDescriptor): number { +export function LDKSocketDescriptor_new(impl: LDKSocketDescriptor): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6477,7 +6484,7 @@ export function LDKSocketDescriptor_new(impl: LDKSocketDescriptor): number { } // uintptr_t SocketDescriptor_send_data LDKSocketDescriptor *NONNULL_PTR this_arg, struct LDKu8slice data, bool resume_read /* @internal */ -export function SocketDescriptor_send_data(this_arg: number, data: number, resume_read: boolean): number { +export function SocketDescriptor_send_data(this_arg: bigint, data: number, resume_read: boolean): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6486,7 +6493,7 @@ export function SocketDescriptor_send_data(this_arg: number, data: number, resum } // void SocketDescriptor_disconnect_socket LDKSocketDescriptor *NONNULL_PTR this_arg /* @internal */ -export function SocketDescriptor_disconnect_socket(this_arg: number): void { +export function SocketDescriptor_disconnect_socket(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6495,7 +6502,7 @@ export function SocketDescriptor_disconnect_socket(this_arg: number): void { } // uint64_t SocketDescriptor_hash LDKSocketDescriptor *NONNULL_PTR this_arg /* @internal */ -export function SocketDescriptor_hash(this_arg: number): bigint { +export function SocketDescriptor_hash(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6507,7 +6514,7 @@ export class LDKEffectiveCapacity { protected constructor() {} } /* @internal */ -export function LDKEffectiveCapacity_ty_from_ptr(ptr: number): number { +export function LDKEffectiveCapacity_ty_from_ptr(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6515,7 +6522,7 @@ export function LDKEffectiveCapacity_ty_from_ptr(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKEffectiveCapacity_ExactLiquidity_get_liquidity_msat(ptr: number): bigint { +export function LDKEffectiveCapacity_ExactLiquidity_get_liquidity_msat(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6523,7 +6530,7 @@ export function LDKEffectiveCapacity_ExactLiquidity_get_liquidity_msat(ptr: numb return nativeResponseValue; } /* @internal */ -export function LDKEffectiveCapacity_MaximumHTLC_get_amount_msat(ptr: number): bigint { +export function LDKEffectiveCapacity_MaximumHTLC_get_amount_msat(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6531,7 +6538,7 @@ export function LDKEffectiveCapacity_MaximumHTLC_get_amount_msat(ptr: number): b return nativeResponseValue; } /* @internal */ -export function LDKEffectiveCapacity_Total_get_capacity_msat(ptr: number): bigint { +export function LDKEffectiveCapacity_Total_get_capacity_msat(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6539,7 +6546,7 @@ export function LDKEffectiveCapacity_Total_get_capacity_msat(ptr: number): bigin return nativeResponseValue; } /* @internal */ -export function LDKEffectiveCapacity_Total_get_htlc_maximum_msat(ptr: number): number { +export function LDKEffectiveCapacity_Total_get_htlc_maximum_msat(ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6548,11 +6555,11 @@ export function LDKEffectiveCapacity_Total_get_htlc_maximum_msat(ptr: number): n } /* @internal */ export interface LDKLockableScore { - lock (): number; + lock (): bigint; } /* @internal */ -export function LDKLockableScore_new(impl: LDKLockableScore): number { +export function LDKLockableScore_new(impl: LDKLockableScore): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6565,7 +6572,7 @@ export function LDKLockableScore_new(impl: LDKLockableScore): number { } // LDKScore LockableScore_lock LDKLockableScore *NONNULL_PTR this_arg /* @internal */ -export function LockableScore_lock(this_arg: number): number { +export function LockableScore_lock(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6577,7 +6584,7 @@ export class LDKFallback { protected constructor() {} } /* @internal */ -export function LDKFallback_ty_from_ptr(ptr: number): number { +export function LDKFallback_ty_from_ptr(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6585,7 +6592,7 @@ export function LDKFallback_ty_from_ptr(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKFallback_SegWitProgram_get_version(ptr: number): number { +export function LDKFallback_SegWitProgram_get_version(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6593,7 +6600,7 @@ export function LDKFallback_SegWitProgram_get_version(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKFallback_SegWitProgram_get_program(ptr: number): number { +export function LDKFallback_SegWitProgram_get_program(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6601,7 +6608,7 @@ export function LDKFallback_SegWitProgram_get_program(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKFallback_PubKeyHash_get_pub_key_hash(ptr: number): number { +export function LDKFallback_PubKeyHash_get_pub_key_hash(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6609,7 +6616,7 @@ export function LDKFallback_PubKeyHash_get_pub_key_hash(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKFallback_ScriptHash_get_script_hash(ptr: number): number { +export function LDKFallback_ScriptHash_get_script_hash(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6620,14 +6627,14 @@ export function LDKFallback_ScriptHash_get_script_hash(ptr: number): number { export interface LDKPayer { node_id (): number; first_hops (): number; - send_payment (route: number, payment_hash: number, payment_secret: number): number; - send_spontaneous_payment (route: number, payment_preimage: number): number; - retry_payment (route: number, payment_id: number): number; + send_payment (route: bigint, payment_hash: number, payment_secret: number): bigint; + send_spontaneous_payment (route: bigint, payment_preimage: number): bigint; + retry_payment (route: bigint, payment_id: number): bigint; abandon_payment (payment_id: number): void; } /* @internal */ -export function LDKPayer_new(impl: LDKPayer): number { +export function LDKPayer_new(impl: LDKPayer): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6640,7 +6647,7 @@ export function LDKPayer_new(impl: LDKPayer): number { } // LDKPublicKey Payer_node_id LDKPayer *NONNULL_PTR this_arg /* @internal */ -export function Payer_node_id(this_arg: number): number { +export function Payer_node_id(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6649,7 +6656,7 @@ export function Payer_node_id(this_arg: number): number { } // LDKCVec_ChannelDetailsZ Payer_first_hops LDKPayer *NONNULL_PTR this_arg /* @internal */ -export function Payer_first_hops(this_arg: number): number { +export function Payer_first_hops(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6658,7 +6665,7 @@ export function Payer_first_hops(this_arg: number): number { } // LDKCResult_PaymentIdPaymentSendFailureZ Payer_send_payment LDKPayer *NONNULL_PTR this_arg, const struct LDKRoute *NONNULL_PTR route, struct LDKThirtyTwoBytes payment_hash, struct LDKThirtyTwoBytes payment_secret /* @internal */ -export function Payer_send_payment(this_arg: number, route: number, payment_hash: number, payment_secret: number): number { +export function Payer_send_payment(this_arg: bigint, route: bigint, payment_hash: number, payment_secret: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6667,7 +6674,7 @@ export function Payer_send_payment(this_arg: number, route: number, payment_hash } // LDKCResult_PaymentIdPaymentSendFailureZ Payer_send_spontaneous_payment LDKPayer *NONNULL_PTR this_arg, const struct LDKRoute *NONNULL_PTR route, struct LDKThirtyTwoBytes payment_preimage /* @internal */ -export function Payer_send_spontaneous_payment(this_arg: number, route: number, payment_preimage: number): number { +export function Payer_send_spontaneous_payment(this_arg: bigint, route: bigint, payment_preimage: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6676,7 +6683,7 @@ export function Payer_send_spontaneous_payment(this_arg: number, route: number, } // LDKCResult_NonePaymentSendFailureZ Payer_retry_payment LDKPayer *NONNULL_PTR this_arg, const struct LDKRoute *NONNULL_PTR route, struct LDKThirtyTwoBytes payment_id /* @internal */ -export function Payer_retry_payment(this_arg: number, route: number, payment_id: number): number { +export function Payer_retry_payment(this_arg: bigint, route: bigint, payment_id: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6685,7 +6692,7 @@ export function Payer_retry_payment(this_arg: number, route: number, payment_id: } // void Payer_abandon_payment LDKPayer *NONNULL_PTR this_arg, struct LDKThirtyTwoBytes payment_id /* @internal */ -export function Payer_abandon_payment(this_arg: number, payment_id: number): void { +export function Payer_abandon_payment(this_arg: bigint, payment_id: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6694,11 +6701,11 @@ export function Payer_abandon_payment(this_arg: number, payment_id: number): voi } /* @internal */ export interface LDKRouter { - find_route (payer: number, route_params: number, payment_hash: number, first_hops: number, scorer: number): number; + find_route (payer: number, route_params: bigint, payment_hash: number, first_hops: number, scorer: bigint): bigint; } /* @internal */ -export function LDKRouter_new(impl: LDKRouter): number { +export function LDKRouter_new(impl: LDKRouter): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6711,7 +6718,7 @@ export function LDKRouter_new(impl: LDKRouter): number { } // LDKCResult_RouteLightningErrorZ Router_find_route LDKRouter *NONNULL_PTR this_arg, struct LDKPublicKey payer, const struct LDKRouteParameters *NONNULL_PTR route_params, const uint8_t (*payment_hash)[32], struct LDKCVec_ChannelDetailsZ *first_hops, const struct LDKScore *NONNULL_PTR scorer /* @internal */ -export function Router_find_route(this_arg: number, payer: number, route_params: number, payment_hash: number, first_hops: number, scorer: number): number { +export function Router_find_route(this_arg: bigint, payer: number, route_params: bigint, payment_hash: number, first_hops: number, scorer: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6723,7 +6730,7 @@ export class LDKRetry { protected constructor() {} } /* @internal */ -export function LDKRetry_ty_from_ptr(ptr: number): number { +export function LDKRetry_ty_from_ptr(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6731,7 +6738,7 @@ export function LDKRetry_ty_from_ptr(ptr: number): number { return nativeResponseValue; } /* @internal */ -export function LDKRetry_Attempts_get_attempts(ptr: number): number { +export function LDKRetry_Attempts_get_attempts(ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6756,9 +6763,9 @@ export function _ldk_c_bindings_get_compiled_version(): number { const nativeResponseValue = wasm.TS__ldk_c_bindings_get_compiled_version(); return nativeResponseValue; } - // uintptr_t Bech32Error_clone_ptr(LDKBech32Error *NONNULL_PTR arg); + // uint64_t Bech32Error_clone_ptr(LDKBech32Error *NONNULL_PTR arg); /* @internal */ -export function Bech32Error_clone_ptr(arg: number): number { +export function Bech32Error_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6767,7 +6774,7 @@ export function Bech32Error_clone_ptr(arg: number): number { } // struct LDKBech32Error Bech32Error_clone(const struct LDKBech32Error *NONNULL_PTR orig); /* @internal */ -export function Bech32Error_clone(orig: number): number { +export function Bech32Error_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6776,7 +6783,7 @@ export function Bech32Error_clone(orig: number): number { } // void Bech32Error_free(struct LDKBech32Error o); /* @internal */ -export function Bech32Error_free(o: number): void { +export function Bech32Error_free(o: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6794,7 +6801,7 @@ export function Transaction_free(_res: number): void { } // struct LDKTxOut TxOut_new(struct LDKCVec_u8Z script_pubkey, uint64_t value); /* @internal */ -export function TxOut_new(script_pubkey: number, value: bigint): number { +export function TxOut_new(script_pubkey: number, value: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6803,16 +6810,16 @@ export function TxOut_new(script_pubkey: number, value: bigint): number { } // void TxOut_free(struct LDKTxOut _res); /* @internal */ -export function TxOut_free(_res: number): void { +export function TxOut_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_TxOut_free(_res); // debug statements here } - // uintptr_t TxOut_clone_ptr(LDKTxOut *NONNULL_PTR arg); + // uint64_t TxOut_clone_ptr(LDKTxOut *NONNULL_PTR arg); /* @internal */ -export function TxOut_clone_ptr(arg: number): number { +export function TxOut_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6821,7 +6828,7 @@ export function TxOut_clone_ptr(arg: number): number { } // struct LDKTxOut TxOut_clone(const struct LDKTxOut *NONNULL_PTR orig); /* @internal */ -export function TxOut_clone(orig: number): number { +export function TxOut_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6839,7 +6846,7 @@ export function Str_free(_res: number): void { } // struct LDKCResult_NoneNoneZ CResult_NoneNoneZ_ok(void); /* @internal */ -export function CResult_NoneNoneZ_ok(): number { +export function CResult_NoneNoneZ_ok(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6848,7 +6855,7 @@ export function CResult_NoneNoneZ_ok(): number { } // struct LDKCResult_NoneNoneZ CResult_NoneNoneZ_err(void); /* @internal */ -export function CResult_NoneNoneZ_err(): number { +export function CResult_NoneNoneZ_err(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6857,7 +6864,7 @@ export function CResult_NoneNoneZ_err(): number { } // bool CResult_NoneNoneZ_is_ok(const struct LDKCResult_NoneNoneZ *NONNULL_PTR o); /* @internal */ -export function CResult_NoneNoneZ_is_ok(o: number): boolean { +export function CResult_NoneNoneZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6866,16 +6873,16 @@ export function CResult_NoneNoneZ_is_ok(o: number): boolean { } // void CResult_NoneNoneZ_free(struct LDKCResult_NoneNoneZ _res); /* @internal */ -export function CResult_NoneNoneZ_free(_res: number): void { +export function CResult_NoneNoneZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_NoneNoneZ_free(_res); // debug statements here } - // uintptr_t CResult_NoneNoneZ_clone_ptr(LDKCResult_NoneNoneZ *NONNULL_PTR arg); + // uint64_t CResult_NoneNoneZ_clone_ptr(LDKCResult_NoneNoneZ *NONNULL_PTR arg); /* @internal */ -export function CResult_NoneNoneZ_clone_ptr(arg: number): number { +export function CResult_NoneNoneZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6884,7 +6891,7 @@ export function CResult_NoneNoneZ_clone_ptr(arg: number): number { } // struct LDKCResult_NoneNoneZ CResult_NoneNoneZ_clone(const struct LDKCResult_NoneNoneZ *NONNULL_PTR orig); /* @internal */ -export function CResult_NoneNoneZ_clone(orig: number): number { +export function CResult_NoneNoneZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6893,7 +6900,7 @@ export function CResult_NoneNoneZ_clone(orig: number): number { } // struct LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ CResult_CounterpartyCommitmentSecretsDecodeErrorZ_ok(struct LDKCounterpartyCommitmentSecrets o); /* @internal */ -export function CResult_CounterpartyCommitmentSecretsDecodeErrorZ_ok(o: number): number { +export function CResult_CounterpartyCommitmentSecretsDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6902,7 +6909,7 @@ export function CResult_CounterpartyCommitmentSecretsDecodeErrorZ_ok(o: number): } // struct LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ CResult_CounterpartyCommitmentSecretsDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_CounterpartyCommitmentSecretsDecodeErrorZ_err(e: number): number { +export function CResult_CounterpartyCommitmentSecretsDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6911,7 +6918,7 @@ export function CResult_CounterpartyCommitmentSecretsDecodeErrorZ_err(e: number) } // bool CResult_CounterpartyCommitmentSecretsDecodeErrorZ_is_ok(const struct LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_CounterpartyCommitmentSecretsDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_CounterpartyCommitmentSecretsDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6920,16 +6927,16 @@ export function CResult_CounterpartyCommitmentSecretsDecodeErrorZ_is_ok(o: numbe } // void CResult_CounterpartyCommitmentSecretsDecodeErrorZ_free(struct LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ _res); /* @internal */ -export function CResult_CounterpartyCommitmentSecretsDecodeErrorZ_free(_res: number): void { +export function CResult_CounterpartyCommitmentSecretsDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone_ptr(LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone_ptr(LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6938,7 +6945,7 @@ export function CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone_ptr(arg: } // struct LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone(const struct LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone(orig: number): number { +export function CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6947,7 +6954,7 @@ export function CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone(orig: nu } // struct LDKCResult_SecretKeyErrorZ CResult_SecretKeyErrorZ_ok(struct LDKSecretKey o); /* @internal */ -export function CResult_SecretKeyErrorZ_ok(o: number): number { +export function CResult_SecretKeyErrorZ_ok(o: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6956,7 +6963,7 @@ export function CResult_SecretKeyErrorZ_ok(o: number): number { } // struct LDKCResult_SecretKeyErrorZ CResult_SecretKeyErrorZ_err(enum LDKSecp256k1Error e); /* @internal */ -export function CResult_SecretKeyErrorZ_err(e: Secp256k1Error): number { +export function CResult_SecretKeyErrorZ_err(e: Secp256k1Error): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6965,7 +6972,7 @@ export function CResult_SecretKeyErrorZ_err(e: Secp256k1Error): number { } // bool CResult_SecretKeyErrorZ_is_ok(const struct LDKCResult_SecretKeyErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_SecretKeyErrorZ_is_ok(o: number): boolean { +export function CResult_SecretKeyErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6974,16 +6981,16 @@ export function CResult_SecretKeyErrorZ_is_ok(o: number): boolean { } // void CResult_SecretKeyErrorZ_free(struct LDKCResult_SecretKeyErrorZ _res); /* @internal */ -export function CResult_SecretKeyErrorZ_free(_res: number): void { +export function CResult_SecretKeyErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_SecretKeyErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_SecretKeyErrorZ_clone_ptr(LDKCResult_SecretKeyErrorZ *NONNULL_PTR arg); + // uint64_t CResult_SecretKeyErrorZ_clone_ptr(LDKCResult_SecretKeyErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_SecretKeyErrorZ_clone_ptr(arg: number): number { +export function CResult_SecretKeyErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -6992,7 +6999,7 @@ export function CResult_SecretKeyErrorZ_clone_ptr(arg: number): number { } // struct LDKCResult_SecretKeyErrorZ CResult_SecretKeyErrorZ_clone(const struct LDKCResult_SecretKeyErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_SecretKeyErrorZ_clone(orig: number): number { +export function CResult_SecretKeyErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7001,7 +7008,7 @@ export function CResult_SecretKeyErrorZ_clone(orig: number): number { } // struct LDKCResult_PublicKeyErrorZ CResult_PublicKeyErrorZ_ok(struct LDKPublicKey o); /* @internal */ -export function CResult_PublicKeyErrorZ_ok(o: number): number { +export function CResult_PublicKeyErrorZ_ok(o: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7010,7 +7017,7 @@ export function CResult_PublicKeyErrorZ_ok(o: number): number { } // struct LDKCResult_PublicKeyErrorZ CResult_PublicKeyErrorZ_err(enum LDKSecp256k1Error e); /* @internal */ -export function CResult_PublicKeyErrorZ_err(e: Secp256k1Error): number { +export function CResult_PublicKeyErrorZ_err(e: Secp256k1Error): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7019,7 +7026,7 @@ export function CResult_PublicKeyErrorZ_err(e: Secp256k1Error): number { } // bool CResult_PublicKeyErrorZ_is_ok(const struct LDKCResult_PublicKeyErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_PublicKeyErrorZ_is_ok(o: number): boolean { +export function CResult_PublicKeyErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7028,16 +7035,16 @@ export function CResult_PublicKeyErrorZ_is_ok(o: number): boolean { } // void CResult_PublicKeyErrorZ_free(struct LDKCResult_PublicKeyErrorZ _res); /* @internal */ -export function CResult_PublicKeyErrorZ_free(_res: number): void { +export function CResult_PublicKeyErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_PublicKeyErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_PublicKeyErrorZ_clone_ptr(LDKCResult_PublicKeyErrorZ *NONNULL_PTR arg); + // uint64_t CResult_PublicKeyErrorZ_clone_ptr(LDKCResult_PublicKeyErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_PublicKeyErrorZ_clone_ptr(arg: number): number { +export function CResult_PublicKeyErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7046,7 +7053,7 @@ export function CResult_PublicKeyErrorZ_clone_ptr(arg: number): number { } // struct LDKCResult_PublicKeyErrorZ CResult_PublicKeyErrorZ_clone(const struct LDKCResult_PublicKeyErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_PublicKeyErrorZ_clone(orig: number): number { +export function CResult_PublicKeyErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7055,7 +7062,7 @@ export function CResult_PublicKeyErrorZ_clone(orig: number): number { } // struct LDKCResult_TxCreationKeysDecodeErrorZ CResult_TxCreationKeysDecodeErrorZ_ok(struct LDKTxCreationKeys o); /* @internal */ -export function CResult_TxCreationKeysDecodeErrorZ_ok(o: number): number { +export function CResult_TxCreationKeysDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7064,7 +7071,7 @@ export function CResult_TxCreationKeysDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_TxCreationKeysDecodeErrorZ CResult_TxCreationKeysDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_TxCreationKeysDecodeErrorZ_err(e: number): number { +export function CResult_TxCreationKeysDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7073,7 +7080,7 @@ export function CResult_TxCreationKeysDecodeErrorZ_err(e: number): number { } // bool CResult_TxCreationKeysDecodeErrorZ_is_ok(const struct LDKCResult_TxCreationKeysDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_TxCreationKeysDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_TxCreationKeysDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7082,16 +7089,16 @@ export function CResult_TxCreationKeysDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_TxCreationKeysDecodeErrorZ_free(struct LDKCResult_TxCreationKeysDecodeErrorZ _res); /* @internal */ -export function CResult_TxCreationKeysDecodeErrorZ_free(_res: number): void { +export function CResult_TxCreationKeysDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_TxCreationKeysDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_TxCreationKeysDecodeErrorZ_clone_ptr(LDKCResult_TxCreationKeysDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_TxCreationKeysDecodeErrorZ_clone_ptr(LDKCResult_TxCreationKeysDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_TxCreationKeysDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_TxCreationKeysDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7100,7 +7107,7 @@ export function CResult_TxCreationKeysDecodeErrorZ_clone_ptr(arg: number): numbe } // struct LDKCResult_TxCreationKeysDecodeErrorZ CResult_TxCreationKeysDecodeErrorZ_clone(const struct LDKCResult_TxCreationKeysDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_TxCreationKeysDecodeErrorZ_clone(orig: number): number { +export function CResult_TxCreationKeysDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7109,7 +7116,7 @@ export function CResult_TxCreationKeysDecodeErrorZ_clone(orig: number): number { } // struct LDKCResult_ChannelPublicKeysDecodeErrorZ CResult_ChannelPublicKeysDecodeErrorZ_ok(struct LDKChannelPublicKeys o); /* @internal */ -export function CResult_ChannelPublicKeysDecodeErrorZ_ok(o: number): number { +export function CResult_ChannelPublicKeysDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7118,7 +7125,7 @@ export function CResult_ChannelPublicKeysDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_ChannelPublicKeysDecodeErrorZ CResult_ChannelPublicKeysDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_ChannelPublicKeysDecodeErrorZ_err(e: number): number { +export function CResult_ChannelPublicKeysDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7127,7 +7134,7 @@ export function CResult_ChannelPublicKeysDecodeErrorZ_err(e: number): number { } // bool CResult_ChannelPublicKeysDecodeErrorZ_is_ok(const struct LDKCResult_ChannelPublicKeysDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_ChannelPublicKeysDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_ChannelPublicKeysDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7136,16 +7143,16 @@ export function CResult_ChannelPublicKeysDecodeErrorZ_is_ok(o: number): boolean } // void CResult_ChannelPublicKeysDecodeErrorZ_free(struct LDKCResult_ChannelPublicKeysDecodeErrorZ _res); /* @internal */ -export function CResult_ChannelPublicKeysDecodeErrorZ_free(_res: number): void { +export function CResult_ChannelPublicKeysDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_ChannelPublicKeysDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_ChannelPublicKeysDecodeErrorZ_clone_ptr(LDKCResult_ChannelPublicKeysDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_ChannelPublicKeysDecodeErrorZ_clone_ptr(LDKCResult_ChannelPublicKeysDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_ChannelPublicKeysDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_ChannelPublicKeysDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7154,7 +7161,7 @@ export function CResult_ChannelPublicKeysDecodeErrorZ_clone_ptr(arg: number): nu } // struct LDKCResult_ChannelPublicKeysDecodeErrorZ CResult_ChannelPublicKeysDecodeErrorZ_clone(const struct LDKCResult_ChannelPublicKeysDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_ChannelPublicKeysDecodeErrorZ_clone(orig: number): number { +export function CResult_ChannelPublicKeysDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7163,7 +7170,7 @@ export function CResult_ChannelPublicKeysDecodeErrorZ_clone(orig: number): numbe } // struct LDKCResult_TxCreationKeysErrorZ CResult_TxCreationKeysErrorZ_ok(struct LDKTxCreationKeys o); /* @internal */ -export function CResult_TxCreationKeysErrorZ_ok(o: number): number { +export function CResult_TxCreationKeysErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7172,7 +7179,7 @@ export function CResult_TxCreationKeysErrorZ_ok(o: number): number { } // struct LDKCResult_TxCreationKeysErrorZ CResult_TxCreationKeysErrorZ_err(enum LDKSecp256k1Error e); /* @internal */ -export function CResult_TxCreationKeysErrorZ_err(e: Secp256k1Error): number { +export function CResult_TxCreationKeysErrorZ_err(e: Secp256k1Error): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7181,7 +7188,7 @@ export function CResult_TxCreationKeysErrorZ_err(e: Secp256k1Error): number { } // bool CResult_TxCreationKeysErrorZ_is_ok(const struct LDKCResult_TxCreationKeysErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_TxCreationKeysErrorZ_is_ok(o: number): boolean { +export function CResult_TxCreationKeysErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7190,16 +7197,16 @@ export function CResult_TxCreationKeysErrorZ_is_ok(o: number): boolean { } // void CResult_TxCreationKeysErrorZ_free(struct LDKCResult_TxCreationKeysErrorZ _res); /* @internal */ -export function CResult_TxCreationKeysErrorZ_free(_res: number): void { +export function CResult_TxCreationKeysErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_TxCreationKeysErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_TxCreationKeysErrorZ_clone_ptr(LDKCResult_TxCreationKeysErrorZ *NONNULL_PTR arg); + // uint64_t CResult_TxCreationKeysErrorZ_clone_ptr(LDKCResult_TxCreationKeysErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_TxCreationKeysErrorZ_clone_ptr(arg: number): number { +export function CResult_TxCreationKeysErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7208,7 +7215,7 @@ export function CResult_TxCreationKeysErrorZ_clone_ptr(arg: number): number { } // struct LDKCResult_TxCreationKeysErrorZ CResult_TxCreationKeysErrorZ_clone(const struct LDKCResult_TxCreationKeysErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_TxCreationKeysErrorZ_clone(orig: number): number { +export function CResult_TxCreationKeysErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7217,7 +7224,7 @@ export function CResult_TxCreationKeysErrorZ_clone(orig: number): number { } // struct LDKCOption_u32Z COption_u32Z_some(uint32_t o); /* @internal */ -export function COption_u32Z_some(o: number): number { +export function COption_u32Z_some(o: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7226,7 +7233,7 @@ export function COption_u32Z_some(o: number): number { } // struct LDKCOption_u32Z COption_u32Z_none(void); /* @internal */ -export function COption_u32Z_none(): number { +export function COption_u32Z_none(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7235,16 +7242,16 @@ export function COption_u32Z_none(): number { } // void COption_u32Z_free(struct LDKCOption_u32Z _res); /* @internal */ -export function COption_u32Z_free(_res: number): void { +export function COption_u32Z_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_COption_u32Z_free(_res); // debug statements here } - // uintptr_t COption_u32Z_clone_ptr(LDKCOption_u32Z *NONNULL_PTR arg); + // uint64_t COption_u32Z_clone_ptr(LDKCOption_u32Z *NONNULL_PTR arg); /* @internal */ -export function COption_u32Z_clone_ptr(arg: number): number { +export function COption_u32Z_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7253,7 +7260,7 @@ export function COption_u32Z_clone_ptr(arg: number): number { } // struct LDKCOption_u32Z COption_u32Z_clone(const struct LDKCOption_u32Z *NONNULL_PTR orig); /* @internal */ -export function COption_u32Z_clone(orig: number): number { +export function COption_u32Z_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7262,7 +7269,7 @@ export function COption_u32Z_clone(orig: number): number { } // struct LDKCResult_HTLCOutputInCommitmentDecodeErrorZ CResult_HTLCOutputInCommitmentDecodeErrorZ_ok(struct LDKHTLCOutputInCommitment o); /* @internal */ -export function CResult_HTLCOutputInCommitmentDecodeErrorZ_ok(o: number): number { +export function CResult_HTLCOutputInCommitmentDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7271,7 +7278,7 @@ export function CResult_HTLCOutputInCommitmentDecodeErrorZ_ok(o: number): number } // struct LDKCResult_HTLCOutputInCommitmentDecodeErrorZ CResult_HTLCOutputInCommitmentDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_HTLCOutputInCommitmentDecodeErrorZ_err(e: number): number { +export function CResult_HTLCOutputInCommitmentDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7280,7 +7287,7 @@ export function CResult_HTLCOutputInCommitmentDecodeErrorZ_err(e: number): numbe } // bool CResult_HTLCOutputInCommitmentDecodeErrorZ_is_ok(const struct LDKCResult_HTLCOutputInCommitmentDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_HTLCOutputInCommitmentDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_HTLCOutputInCommitmentDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7289,16 +7296,16 @@ export function CResult_HTLCOutputInCommitmentDecodeErrorZ_is_ok(o: number): boo } // void CResult_HTLCOutputInCommitmentDecodeErrorZ_free(struct LDKCResult_HTLCOutputInCommitmentDecodeErrorZ _res); /* @internal */ -export function CResult_HTLCOutputInCommitmentDecodeErrorZ_free(_res: number): void { +export function CResult_HTLCOutputInCommitmentDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_HTLCOutputInCommitmentDecodeErrorZ_clone_ptr(LDKCResult_HTLCOutputInCommitmentDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_HTLCOutputInCommitmentDecodeErrorZ_clone_ptr(LDKCResult_HTLCOutputInCommitmentDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_HTLCOutputInCommitmentDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_HTLCOutputInCommitmentDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7307,7 +7314,7 @@ export function CResult_HTLCOutputInCommitmentDecodeErrorZ_clone_ptr(arg: number } // struct LDKCResult_HTLCOutputInCommitmentDecodeErrorZ CResult_HTLCOutputInCommitmentDecodeErrorZ_clone(const struct LDKCResult_HTLCOutputInCommitmentDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_HTLCOutputInCommitmentDecodeErrorZ_clone(orig: number): number { +export function CResult_HTLCOutputInCommitmentDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7343,7 +7350,7 @@ export function COption_NoneZ_free(_res: COption_NoneZ): void { } // struct LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_ok(struct LDKCounterpartyChannelTransactionParameters o); /* @internal */ -export function CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_ok(o: number): number { +export function CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7352,7 +7359,7 @@ export function CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_ok( } // struct LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_err(e: number): number { +export function CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7361,7 +7368,7 @@ export function CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_err } // bool CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_is_ok(const struct LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7370,16 +7377,16 @@ export function CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_is_ } // void CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_free(struct LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ _res); /* @internal */ -export function CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_free(_res: number): void { +export function CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone_ptr(LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone_ptr(LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7388,7 +7395,7 @@ export function CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clo } // struct LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone(const struct LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone(orig: number): number { +export function CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7397,7 +7404,7 @@ export function CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clo } // struct LDKCResult_ChannelTransactionParametersDecodeErrorZ CResult_ChannelTransactionParametersDecodeErrorZ_ok(struct LDKChannelTransactionParameters o); /* @internal */ -export function CResult_ChannelTransactionParametersDecodeErrorZ_ok(o: number): number { +export function CResult_ChannelTransactionParametersDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7406,7 +7413,7 @@ export function CResult_ChannelTransactionParametersDecodeErrorZ_ok(o: number): } // struct LDKCResult_ChannelTransactionParametersDecodeErrorZ CResult_ChannelTransactionParametersDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_ChannelTransactionParametersDecodeErrorZ_err(e: number): number { +export function CResult_ChannelTransactionParametersDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7415,7 +7422,7 @@ export function CResult_ChannelTransactionParametersDecodeErrorZ_err(e: number): } // bool CResult_ChannelTransactionParametersDecodeErrorZ_is_ok(const struct LDKCResult_ChannelTransactionParametersDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_ChannelTransactionParametersDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_ChannelTransactionParametersDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7424,16 +7431,16 @@ export function CResult_ChannelTransactionParametersDecodeErrorZ_is_ok(o: number } // void CResult_ChannelTransactionParametersDecodeErrorZ_free(struct LDKCResult_ChannelTransactionParametersDecodeErrorZ _res); /* @internal */ -export function CResult_ChannelTransactionParametersDecodeErrorZ_free(_res: number): void { +export function CResult_ChannelTransactionParametersDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_ChannelTransactionParametersDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_ChannelTransactionParametersDecodeErrorZ_clone_ptr(LDKCResult_ChannelTransactionParametersDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_ChannelTransactionParametersDecodeErrorZ_clone_ptr(LDKCResult_ChannelTransactionParametersDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_ChannelTransactionParametersDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_ChannelTransactionParametersDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7442,7 +7449,7 @@ export function CResult_ChannelTransactionParametersDecodeErrorZ_clone_ptr(arg: } // struct LDKCResult_ChannelTransactionParametersDecodeErrorZ CResult_ChannelTransactionParametersDecodeErrorZ_clone(const struct LDKCResult_ChannelTransactionParametersDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_ChannelTransactionParametersDecodeErrorZ_clone(orig: number): number { +export function CResult_ChannelTransactionParametersDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7460,7 +7467,7 @@ export function CVec_SignatureZ_free(_res: number): void { } // struct LDKCResult_HolderCommitmentTransactionDecodeErrorZ CResult_HolderCommitmentTransactionDecodeErrorZ_ok(struct LDKHolderCommitmentTransaction o); /* @internal */ -export function CResult_HolderCommitmentTransactionDecodeErrorZ_ok(o: number): number { +export function CResult_HolderCommitmentTransactionDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7469,7 +7476,7 @@ export function CResult_HolderCommitmentTransactionDecodeErrorZ_ok(o: number): n } // struct LDKCResult_HolderCommitmentTransactionDecodeErrorZ CResult_HolderCommitmentTransactionDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_HolderCommitmentTransactionDecodeErrorZ_err(e: number): number { +export function CResult_HolderCommitmentTransactionDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7478,7 +7485,7 @@ export function CResult_HolderCommitmentTransactionDecodeErrorZ_err(e: number): } // bool CResult_HolderCommitmentTransactionDecodeErrorZ_is_ok(const struct LDKCResult_HolderCommitmentTransactionDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_HolderCommitmentTransactionDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_HolderCommitmentTransactionDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7487,16 +7494,16 @@ export function CResult_HolderCommitmentTransactionDecodeErrorZ_is_ok(o: number) } // void CResult_HolderCommitmentTransactionDecodeErrorZ_free(struct LDKCResult_HolderCommitmentTransactionDecodeErrorZ _res); /* @internal */ -export function CResult_HolderCommitmentTransactionDecodeErrorZ_free(_res: number): void { +export function CResult_HolderCommitmentTransactionDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_HolderCommitmentTransactionDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_HolderCommitmentTransactionDecodeErrorZ_clone_ptr(LDKCResult_HolderCommitmentTransactionDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_HolderCommitmentTransactionDecodeErrorZ_clone_ptr(LDKCResult_HolderCommitmentTransactionDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_HolderCommitmentTransactionDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_HolderCommitmentTransactionDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7505,7 +7512,7 @@ export function CResult_HolderCommitmentTransactionDecodeErrorZ_clone_ptr(arg: n } // struct LDKCResult_HolderCommitmentTransactionDecodeErrorZ CResult_HolderCommitmentTransactionDecodeErrorZ_clone(const struct LDKCResult_HolderCommitmentTransactionDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_HolderCommitmentTransactionDecodeErrorZ_clone(orig: number): number { +export function CResult_HolderCommitmentTransactionDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7514,7 +7521,7 @@ export function CResult_HolderCommitmentTransactionDecodeErrorZ_clone(orig: numb } // struct LDKCResult_BuiltCommitmentTransactionDecodeErrorZ CResult_BuiltCommitmentTransactionDecodeErrorZ_ok(struct LDKBuiltCommitmentTransaction o); /* @internal */ -export function CResult_BuiltCommitmentTransactionDecodeErrorZ_ok(o: number): number { +export function CResult_BuiltCommitmentTransactionDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7523,7 +7530,7 @@ export function CResult_BuiltCommitmentTransactionDecodeErrorZ_ok(o: number): nu } // struct LDKCResult_BuiltCommitmentTransactionDecodeErrorZ CResult_BuiltCommitmentTransactionDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_BuiltCommitmentTransactionDecodeErrorZ_err(e: number): number { +export function CResult_BuiltCommitmentTransactionDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7532,7 +7539,7 @@ export function CResult_BuiltCommitmentTransactionDecodeErrorZ_err(e: number): n } // bool CResult_BuiltCommitmentTransactionDecodeErrorZ_is_ok(const struct LDKCResult_BuiltCommitmentTransactionDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_BuiltCommitmentTransactionDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_BuiltCommitmentTransactionDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7541,16 +7548,16 @@ export function CResult_BuiltCommitmentTransactionDecodeErrorZ_is_ok(o: number): } // void CResult_BuiltCommitmentTransactionDecodeErrorZ_free(struct LDKCResult_BuiltCommitmentTransactionDecodeErrorZ _res); /* @internal */ -export function CResult_BuiltCommitmentTransactionDecodeErrorZ_free(_res: number): void { +export function CResult_BuiltCommitmentTransactionDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_BuiltCommitmentTransactionDecodeErrorZ_clone_ptr(LDKCResult_BuiltCommitmentTransactionDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_BuiltCommitmentTransactionDecodeErrorZ_clone_ptr(LDKCResult_BuiltCommitmentTransactionDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_BuiltCommitmentTransactionDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_BuiltCommitmentTransactionDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7559,7 +7566,7 @@ export function CResult_BuiltCommitmentTransactionDecodeErrorZ_clone_ptr(arg: nu } // struct LDKCResult_BuiltCommitmentTransactionDecodeErrorZ CResult_BuiltCommitmentTransactionDecodeErrorZ_clone(const struct LDKCResult_BuiltCommitmentTransactionDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_BuiltCommitmentTransactionDecodeErrorZ_clone(orig: number): number { +export function CResult_BuiltCommitmentTransactionDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7568,7 +7575,7 @@ export function CResult_BuiltCommitmentTransactionDecodeErrorZ_clone(orig: numbe } // struct LDKCResult_TrustedClosingTransactionNoneZ CResult_TrustedClosingTransactionNoneZ_ok(struct LDKTrustedClosingTransaction o); /* @internal */ -export function CResult_TrustedClosingTransactionNoneZ_ok(o: number): number { +export function CResult_TrustedClosingTransactionNoneZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7577,7 +7584,7 @@ export function CResult_TrustedClosingTransactionNoneZ_ok(o: number): number { } // struct LDKCResult_TrustedClosingTransactionNoneZ CResult_TrustedClosingTransactionNoneZ_err(void); /* @internal */ -export function CResult_TrustedClosingTransactionNoneZ_err(): number { +export function CResult_TrustedClosingTransactionNoneZ_err(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7586,7 +7593,7 @@ export function CResult_TrustedClosingTransactionNoneZ_err(): number { } // bool CResult_TrustedClosingTransactionNoneZ_is_ok(const struct LDKCResult_TrustedClosingTransactionNoneZ *NONNULL_PTR o); /* @internal */ -export function CResult_TrustedClosingTransactionNoneZ_is_ok(o: number): boolean { +export function CResult_TrustedClosingTransactionNoneZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7595,7 +7602,7 @@ export function CResult_TrustedClosingTransactionNoneZ_is_ok(o: number): boolean } // void CResult_TrustedClosingTransactionNoneZ_free(struct LDKCResult_TrustedClosingTransactionNoneZ _res); /* @internal */ -export function CResult_TrustedClosingTransactionNoneZ_free(_res: number): void { +export function CResult_TrustedClosingTransactionNoneZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7604,7 +7611,7 @@ export function CResult_TrustedClosingTransactionNoneZ_free(_res: number): void } // struct LDKCResult_CommitmentTransactionDecodeErrorZ CResult_CommitmentTransactionDecodeErrorZ_ok(struct LDKCommitmentTransaction o); /* @internal */ -export function CResult_CommitmentTransactionDecodeErrorZ_ok(o: number): number { +export function CResult_CommitmentTransactionDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7613,7 +7620,7 @@ export function CResult_CommitmentTransactionDecodeErrorZ_ok(o: number): number } // struct LDKCResult_CommitmentTransactionDecodeErrorZ CResult_CommitmentTransactionDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_CommitmentTransactionDecodeErrorZ_err(e: number): number { +export function CResult_CommitmentTransactionDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7622,7 +7629,7 @@ export function CResult_CommitmentTransactionDecodeErrorZ_err(e: number): number } // bool CResult_CommitmentTransactionDecodeErrorZ_is_ok(const struct LDKCResult_CommitmentTransactionDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_CommitmentTransactionDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_CommitmentTransactionDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7631,16 +7638,16 @@ export function CResult_CommitmentTransactionDecodeErrorZ_is_ok(o: number): bool } // void CResult_CommitmentTransactionDecodeErrorZ_free(struct LDKCResult_CommitmentTransactionDecodeErrorZ _res); /* @internal */ -export function CResult_CommitmentTransactionDecodeErrorZ_free(_res: number): void { +export function CResult_CommitmentTransactionDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_CommitmentTransactionDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_CommitmentTransactionDecodeErrorZ_clone_ptr(LDKCResult_CommitmentTransactionDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_CommitmentTransactionDecodeErrorZ_clone_ptr(LDKCResult_CommitmentTransactionDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_CommitmentTransactionDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_CommitmentTransactionDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7649,7 +7656,7 @@ export function CResult_CommitmentTransactionDecodeErrorZ_clone_ptr(arg: number) } // struct LDKCResult_CommitmentTransactionDecodeErrorZ CResult_CommitmentTransactionDecodeErrorZ_clone(const struct LDKCResult_CommitmentTransactionDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_CommitmentTransactionDecodeErrorZ_clone(orig: number): number { +export function CResult_CommitmentTransactionDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7658,7 +7665,7 @@ export function CResult_CommitmentTransactionDecodeErrorZ_clone(orig: number): n } // struct LDKCResult_TrustedCommitmentTransactionNoneZ CResult_TrustedCommitmentTransactionNoneZ_ok(struct LDKTrustedCommitmentTransaction o); /* @internal */ -export function CResult_TrustedCommitmentTransactionNoneZ_ok(o: number): number { +export function CResult_TrustedCommitmentTransactionNoneZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7667,7 +7674,7 @@ export function CResult_TrustedCommitmentTransactionNoneZ_ok(o: number): number } // struct LDKCResult_TrustedCommitmentTransactionNoneZ CResult_TrustedCommitmentTransactionNoneZ_err(void); /* @internal */ -export function CResult_TrustedCommitmentTransactionNoneZ_err(): number { +export function CResult_TrustedCommitmentTransactionNoneZ_err(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7676,7 +7683,7 @@ export function CResult_TrustedCommitmentTransactionNoneZ_err(): number { } // bool CResult_TrustedCommitmentTransactionNoneZ_is_ok(const struct LDKCResult_TrustedCommitmentTransactionNoneZ *NONNULL_PTR o); /* @internal */ -export function CResult_TrustedCommitmentTransactionNoneZ_is_ok(o: number): boolean { +export function CResult_TrustedCommitmentTransactionNoneZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7685,7 +7692,7 @@ export function CResult_TrustedCommitmentTransactionNoneZ_is_ok(o: number): bool } // void CResult_TrustedCommitmentTransactionNoneZ_free(struct LDKCResult_TrustedCommitmentTransactionNoneZ _res); /* @internal */ -export function CResult_TrustedCommitmentTransactionNoneZ_free(_res: number): void { +export function CResult_TrustedCommitmentTransactionNoneZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7694,7 +7701,7 @@ export function CResult_TrustedCommitmentTransactionNoneZ_free(_res: number): vo } // struct LDKCResult_CVec_SignatureZNoneZ CResult_CVec_SignatureZNoneZ_ok(struct LDKCVec_SignatureZ o); /* @internal */ -export function CResult_CVec_SignatureZNoneZ_ok(o: number): number { +export function CResult_CVec_SignatureZNoneZ_ok(o: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7703,7 +7710,7 @@ export function CResult_CVec_SignatureZNoneZ_ok(o: number): number { } // struct LDKCResult_CVec_SignatureZNoneZ CResult_CVec_SignatureZNoneZ_err(void); /* @internal */ -export function CResult_CVec_SignatureZNoneZ_err(): number { +export function CResult_CVec_SignatureZNoneZ_err(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7712,7 +7719,7 @@ export function CResult_CVec_SignatureZNoneZ_err(): number { } // bool CResult_CVec_SignatureZNoneZ_is_ok(const struct LDKCResult_CVec_SignatureZNoneZ *NONNULL_PTR o); /* @internal */ -export function CResult_CVec_SignatureZNoneZ_is_ok(o: number): boolean { +export function CResult_CVec_SignatureZNoneZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7721,16 +7728,16 @@ export function CResult_CVec_SignatureZNoneZ_is_ok(o: number): boolean { } // void CResult_CVec_SignatureZNoneZ_free(struct LDKCResult_CVec_SignatureZNoneZ _res); /* @internal */ -export function CResult_CVec_SignatureZNoneZ_free(_res: number): void { +export function CResult_CVec_SignatureZNoneZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_CVec_SignatureZNoneZ_free(_res); // debug statements here } - // uintptr_t CResult_CVec_SignatureZNoneZ_clone_ptr(LDKCResult_CVec_SignatureZNoneZ *NONNULL_PTR arg); + // uint64_t CResult_CVec_SignatureZNoneZ_clone_ptr(LDKCResult_CVec_SignatureZNoneZ *NONNULL_PTR arg); /* @internal */ -export function CResult_CVec_SignatureZNoneZ_clone_ptr(arg: number): number { +export function CResult_CVec_SignatureZNoneZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7739,7 +7746,7 @@ export function CResult_CVec_SignatureZNoneZ_clone_ptr(arg: number): number { } // struct LDKCResult_CVec_SignatureZNoneZ CResult_CVec_SignatureZNoneZ_clone(const struct LDKCResult_CVec_SignatureZNoneZ *NONNULL_PTR orig); /* @internal */ -export function CResult_CVec_SignatureZNoneZ_clone(orig: number): number { +export function CResult_CVec_SignatureZNoneZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7748,7 +7755,7 @@ export function CResult_CVec_SignatureZNoneZ_clone(orig: number): number { } // struct LDKCResult_ShutdownScriptDecodeErrorZ CResult_ShutdownScriptDecodeErrorZ_ok(struct LDKShutdownScript o); /* @internal */ -export function CResult_ShutdownScriptDecodeErrorZ_ok(o: number): number { +export function CResult_ShutdownScriptDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7757,7 +7764,7 @@ export function CResult_ShutdownScriptDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_ShutdownScriptDecodeErrorZ CResult_ShutdownScriptDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_ShutdownScriptDecodeErrorZ_err(e: number): number { +export function CResult_ShutdownScriptDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7766,7 +7773,7 @@ export function CResult_ShutdownScriptDecodeErrorZ_err(e: number): number { } // bool CResult_ShutdownScriptDecodeErrorZ_is_ok(const struct LDKCResult_ShutdownScriptDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_ShutdownScriptDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_ShutdownScriptDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7775,16 +7782,16 @@ export function CResult_ShutdownScriptDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_ShutdownScriptDecodeErrorZ_free(struct LDKCResult_ShutdownScriptDecodeErrorZ _res); /* @internal */ -export function CResult_ShutdownScriptDecodeErrorZ_free(_res: number): void { +export function CResult_ShutdownScriptDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_ShutdownScriptDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_ShutdownScriptDecodeErrorZ_clone_ptr(LDKCResult_ShutdownScriptDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_ShutdownScriptDecodeErrorZ_clone_ptr(LDKCResult_ShutdownScriptDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_ShutdownScriptDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_ShutdownScriptDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7793,7 +7800,7 @@ export function CResult_ShutdownScriptDecodeErrorZ_clone_ptr(arg: number): numbe } // struct LDKCResult_ShutdownScriptDecodeErrorZ CResult_ShutdownScriptDecodeErrorZ_clone(const struct LDKCResult_ShutdownScriptDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_ShutdownScriptDecodeErrorZ_clone(orig: number): number { +export function CResult_ShutdownScriptDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7802,7 +7809,7 @@ export function CResult_ShutdownScriptDecodeErrorZ_clone(orig: number): number { } // struct LDKCResult_ShutdownScriptInvalidShutdownScriptZ CResult_ShutdownScriptInvalidShutdownScriptZ_ok(struct LDKShutdownScript o); /* @internal */ -export function CResult_ShutdownScriptInvalidShutdownScriptZ_ok(o: number): number { +export function CResult_ShutdownScriptInvalidShutdownScriptZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7811,7 +7818,7 @@ export function CResult_ShutdownScriptInvalidShutdownScriptZ_ok(o: number): numb } // struct LDKCResult_ShutdownScriptInvalidShutdownScriptZ CResult_ShutdownScriptInvalidShutdownScriptZ_err(struct LDKInvalidShutdownScript e); /* @internal */ -export function CResult_ShutdownScriptInvalidShutdownScriptZ_err(e: number): number { +export function CResult_ShutdownScriptInvalidShutdownScriptZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7820,7 +7827,7 @@ export function CResult_ShutdownScriptInvalidShutdownScriptZ_err(e: number): num } // bool CResult_ShutdownScriptInvalidShutdownScriptZ_is_ok(const struct LDKCResult_ShutdownScriptInvalidShutdownScriptZ *NONNULL_PTR o); /* @internal */ -export function CResult_ShutdownScriptInvalidShutdownScriptZ_is_ok(o: number): boolean { +export function CResult_ShutdownScriptInvalidShutdownScriptZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7829,16 +7836,16 @@ export function CResult_ShutdownScriptInvalidShutdownScriptZ_is_ok(o: number): b } // void CResult_ShutdownScriptInvalidShutdownScriptZ_free(struct LDKCResult_ShutdownScriptInvalidShutdownScriptZ _res); /* @internal */ -export function CResult_ShutdownScriptInvalidShutdownScriptZ_free(_res: number): void { +export function CResult_ShutdownScriptInvalidShutdownScriptZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_ShutdownScriptInvalidShutdownScriptZ_free(_res); // debug statements here } - // uintptr_t CResult_ShutdownScriptInvalidShutdownScriptZ_clone_ptr(LDKCResult_ShutdownScriptInvalidShutdownScriptZ *NONNULL_PTR arg); + // uint64_t CResult_ShutdownScriptInvalidShutdownScriptZ_clone_ptr(LDKCResult_ShutdownScriptInvalidShutdownScriptZ *NONNULL_PTR arg); /* @internal */ -export function CResult_ShutdownScriptInvalidShutdownScriptZ_clone_ptr(arg: number): number { +export function CResult_ShutdownScriptInvalidShutdownScriptZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7847,7 +7854,7 @@ export function CResult_ShutdownScriptInvalidShutdownScriptZ_clone_ptr(arg: numb } // struct LDKCResult_ShutdownScriptInvalidShutdownScriptZ CResult_ShutdownScriptInvalidShutdownScriptZ_clone(const struct LDKCResult_ShutdownScriptInvalidShutdownScriptZ *NONNULL_PTR orig); /* @internal */ -export function CResult_ShutdownScriptInvalidShutdownScriptZ_clone(orig: number): number { +export function CResult_ShutdownScriptInvalidShutdownScriptZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7856,7 +7863,7 @@ export function CResult_ShutdownScriptInvalidShutdownScriptZ_clone(orig: number) } // struct LDKCResult_RouteHopDecodeErrorZ CResult_RouteHopDecodeErrorZ_ok(struct LDKRouteHop o); /* @internal */ -export function CResult_RouteHopDecodeErrorZ_ok(o: number): number { +export function CResult_RouteHopDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7865,7 +7872,7 @@ export function CResult_RouteHopDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_RouteHopDecodeErrorZ CResult_RouteHopDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_RouteHopDecodeErrorZ_err(e: number): number { +export function CResult_RouteHopDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7874,7 +7881,7 @@ export function CResult_RouteHopDecodeErrorZ_err(e: number): number { } // bool CResult_RouteHopDecodeErrorZ_is_ok(const struct LDKCResult_RouteHopDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_RouteHopDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_RouteHopDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7883,16 +7890,16 @@ export function CResult_RouteHopDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_RouteHopDecodeErrorZ_free(struct LDKCResult_RouteHopDecodeErrorZ _res); /* @internal */ -export function CResult_RouteHopDecodeErrorZ_free(_res: number): void { +export function CResult_RouteHopDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_RouteHopDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_RouteHopDecodeErrorZ_clone_ptr(LDKCResult_RouteHopDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_RouteHopDecodeErrorZ_clone_ptr(LDKCResult_RouteHopDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_RouteHopDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_RouteHopDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7901,7 +7908,7 @@ export function CResult_RouteHopDecodeErrorZ_clone_ptr(arg: number): number { } // struct LDKCResult_RouteHopDecodeErrorZ CResult_RouteHopDecodeErrorZ_clone(const struct LDKCResult_RouteHopDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_RouteHopDecodeErrorZ_clone(orig: number): number { +export function CResult_RouteHopDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7928,7 +7935,7 @@ export function CVec_CVec_RouteHopZZ_free(_res: number): void { } // struct LDKCResult_RouteDecodeErrorZ CResult_RouteDecodeErrorZ_ok(struct LDKRoute o); /* @internal */ -export function CResult_RouteDecodeErrorZ_ok(o: number): number { +export function CResult_RouteDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7937,7 +7944,7 @@ export function CResult_RouteDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_RouteDecodeErrorZ CResult_RouteDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_RouteDecodeErrorZ_err(e: number): number { +export function CResult_RouteDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7946,7 +7953,7 @@ export function CResult_RouteDecodeErrorZ_err(e: number): number { } // bool CResult_RouteDecodeErrorZ_is_ok(const struct LDKCResult_RouteDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_RouteDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_RouteDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7955,16 +7962,16 @@ export function CResult_RouteDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_RouteDecodeErrorZ_free(struct LDKCResult_RouteDecodeErrorZ _res); /* @internal */ -export function CResult_RouteDecodeErrorZ_free(_res: number): void { +export function CResult_RouteDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_RouteDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_RouteDecodeErrorZ_clone_ptr(LDKCResult_RouteDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_RouteDecodeErrorZ_clone_ptr(LDKCResult_RouteDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_RouteDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_RouteDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7973,7 +7980,7 @@ export function CResult_RouteDecodeErrorZ_clone_ptr(arg: number): number { } // struct LDKCResult_RouteDecodeErrorZ CResult_RouteDecodeErrorZ_clone(const struct LDKCResult_RouteDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_RouteDecodeErrorZ_clone(orig: number): number { +export function CResult_RouteDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7982,7 +7989,7 @@ export function CResult_RouteDecodeErrorZ_clone(orig: number): number { } // struct LDKCResult_RouteParametersDecodeErrorZ CResult_RouteParametersDecodeErrorZ_ok(struct LDKRouteParameters o); /* @internal */ -export function CResult_RouteParametersDecodeErrorZ_ok(o: number): number { +export function CResult_RouteParametersDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -7991,7 +7998,7 @@ export function CResult_RouteParametersDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_RouteParametersDecodeErrorZ CResult_RouteParametersDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_RouteParametersDecodeErrorZ_err(e: number): number { +export function CResult_RouteParametersDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8000,7 +8007,7 @@ export function CResult_RouteParametersDecodeErrorZ_err(e: number): number { } // bool CResult_RouteParametersDecodeErrorZ_is_ok(const struct LDKCResult_RouteParametersDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_RouteParametersDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_RouteParametersDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8009,16 +8016,16 @@ export function CResult_RouteParametersDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_RouteParametersDecodeErrorZ_free(struct LDKCResult_RouteParametersDecodeErrorZ _res); /* @internal */ -export function CResult_RouteParametersDecodeErrorZ_free(_res: number): void { +export function CResult_RouteParametersDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_RouteParametersDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_RouteParametersDecodeErrorZ_clone_ptr(LDKCResult_RouteParametersDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_RouteParametersDecodeErrorZ_clone_ptr(LDKCResult_RouteParametersDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_RouteParametersDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_RouteParametersDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8027,7 +8034,7 @@ export function CResult_RouteParametersDecodeErrorZ_clone_ptr(arg: number): numb } // struct LDKCResult_RouteParametersDecodeErrorZ CResult_RouteParametersDecodeErrorZ_clone(const struct LDKCResult_RouteParametersDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_RouteParametersDecodeErrorZ_clone(orig: number): number { +export function CResult_RouteParametersDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8045,7 +8052,7 @@ export function CVec_RouteHintZ_free(_res: number): void { } // struct LDKCOption_u64Z COption_u64Z_some(uint64_t o); /* @internal */ -export function COption_u64Z_some(o: bigint): number { +export function COption_u64Z_some(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8054,7 +8061,7 @@ export function COption_u64Z_some(o: bigint): number { } // struct LDKCOption_u64Z COption_u64Z_none(void); /* @internal */ -export function COption_u64Z_none(): number { +export function COption_u64Z_none(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8063,16 +8070,16 @@ export function COption_u64Z_none(): number { } // void COption_u64Z_free(struct LDKCOption_u64Z _res); /* @internal */ -export function COption_u64Z_free(_res: number): void { +export function COption_u64Z_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_COption_u64Z_free(_res); // debug statements here } - // uintptr_t COption_u64Z_clone_ptr(LDKCOption_u64Z *NONNULL_PTR arg); + // uint64_t COption_u64Z_clone_ptr(LDKCOption_u64Z *NONNULL_PTR arg); /* @internal */ -export function COption_u64Z_clone_ptr(arg: number): number { +export function COption_u64Z_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8081,7 +8088,7 @@ export function COption_u64Z_clone_ptr(arg: number): number { } // struct LDKCOption_u64Z COption_u64Z_clone(const struct LDKCOption_u64Z *NONNULL_PTR orig); /* @internal */ -export function COption_u64Z_clone(orig: number): number { +export function COption_u64Z_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8099,7 +8106,7 @@ export function CVec_u64Z_free(_res: number): void { } // struct LDKCResult_PaymentParametersDecodeErrorZ CResult_PaymentParametersDecodeErrorZ_ok(struct LDKPaymentParameters o); /* @internal */ -export function CResult_PaymentParametersDecodeErrorZ_ok(o: number): number { +export function CResult_PaymentParametersDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8108,7 +8115,7 @@ export function CResult_PaymentParametersDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_PaymentParametersDecodeErrorZ CResult_PaymentParametersDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_PaymentParametersDecodeErrorZ_err(e: number): number { +export function CResult_PaymentParametersDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8117,7 +8124,7 @@ export function CResult_PaymentParametersDecodeErrorZ_err(e: number): number { } // bool CResult_PaymentParametersDecodeErrorZ_is_ok(const struct LDKCResult_PaymentParametersDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_PaymentParametersDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_PaymentParametersDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8126,16 +8133,16 @@ export function CResult_PaymentParametersDecodeErrorZ_is_ok(o: number): boolean } // void CResult_PaymentParametersDecodeErrorZ_free(struct LDKCResult_PaymentParametersDecodeErrorZ _res); /* @internal */ -export function CResult_PaymentParametersDecodeErrorZ_free(_res: number): void { +export function CResult_PaymentParametersDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_PaymentParametersDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_PaymentParametersDecodeErrorZ_clone_ptr(LDKCResult_PaymentParametersDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_PaymentParametersDecodeErrorZ_clone_ptr(LDKCResult_PaymentParametersDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_PaymentParametersDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_PaymentParametersDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8144,7 +8151,7 @@ export function CResult_PaymentParametersDecodeErrorZ_clone_ptr(arg: number): nu } // struct LDKCResult_PaymentParametersDecodeErrorZ CResult_PaymentParametersDecodeErrorZ_clone(const struct LDKCResult_PaymentParametersDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_PaymentParametersDecodeErrorZ_clone(orig: number): number { +export function CResult_PaymentParametersDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8162,7 +8169,7 @@ export function CVec_RouteHintHopZ_free(_res: number): void { } // struct LDKCResult_RouteHintDecodeErrorZ CResult_RouteHintDecodeErrorZ_ok(struct LDKRouteHint o); /* @internal */ -export function CResult_RouteHintDecodeErrorZ_ok(o: number): number { +export function CResult_RouteHintDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8171,7 +8178,7 @@ export function CResult_RouteHintDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_RouteHintDecodeErrorZ CResult_RouteHintDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_RouteHintDecodeErrorZ_err(e: number): number { +export function CResult_RouteHintDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8180,7 +8187,7 @@ export function CResult_RouteHintDecodeErrorZ_err(e: number): number { } // bool CResult_RouteHintDecodeErrorZ_is_ok(const struct LDKCResult_RouteHintDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_RouteHintDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_RouteHintDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8189,16 +8196,16 @@ export function CResult_RouteHintDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_RouteHintDecodeErrorZ_free(struct LDKCResult_RouteHintDecodeErrorZ _res); /* @internal */ -export function CResult_RouteHintDecodeErrorZ_free(_res: number): void { +export function CResult_RouteHintDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_RouteHintDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_RouteHintDecodeErrorZ_clone_ptr(LDKCResult_RouteHintDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_RouteHintDecodeErrorZ_clone_ptr(LDKCResult_RouteHintDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_RouteHintDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_RouteHintDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8207,7 +8214,7 @@ export function CResult_RouteHintDecodeErrorZ_clone_ptr(arg: number): number { } // struct LDKCResult_RouteHintDecodeErrorZ CResult_RouteHintDecodeErrorZ_clone(const struct LDKCResult_RouteHintDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_RouteHintDecodeErrorZ_clone(orig: number): number { +export function CResult_RouteHintDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8216,7 +8223,7 @@ export function CResult_RouteHintDecodeErrorZ_clone(orig: number): number { } // struct LDKCResult_RouteHintHopDecodeErrorZ CResult_RouteHintHopDecodeErrorZ_ok(struct LDKRouteHintHop o); /* @internal */ -export function CResult_RouteHintHopDecodeErrorZ_ok(o: number): number { +export function CResult_RouteHintHopDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8225,7 +8232,7 @@ export function CResult_RouteHintHopDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_RouteHintHopDecodeErrorZ CResult_RouteHintHopDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_RouteHintHopDecodeErrorZ_err(e: number): number { +export function CResult_RouteHintHopDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8234,7 +8241,7 @@ export function CResult_RouteHintHopDecodeErrorZ_err(e: number): number { } // bool CResult_RouteHintHopDecodeErrorZ_is_ok(const struct LDKCResult_RouteHintHopDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_RouteHintHopDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_RouteHintHopDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8243,16 +8250,16 @@ export function CResult_RouteHintHopDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_RouteHintHopDecodeErrorZ_free(struct LDKCResult_RouteHintHopDecodeErrorZ _res); /* @internal */ -export function CResult_RouteHintHopDecodeErrorZ_free(_res: number): void { +export function CResult_RouteHintHopDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_RouteHintHopDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_RouteHintHopDecodeErrorZ_clone_ptr(LDKCResult_RouteHintHopDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_RouteHintHopDecodeErrorZ_clone_ptr(LDKCResult_RouteHintHopDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_RouteHintHopDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_RouteHintHopDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8261,7 +8268,7 @@ export function CResult_RouteHintHopDecodeErrorZ_clone_ptr(arg: number): number } // struct LDKCResult_RouteHintHopDecodeErrorZ CResult_RouteHintHopDecodeErrorZ_clone(const struct LDKCResult_RouteHintHopDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_RouteHintHopDecodeErrorZ_clone(orig: number): number { +export function CResult_RouteHintHopDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8279,7 +8286,7 @@ export function CVec_ChannelDetailsZ_free(_res: number): void { } // struct LDKCResult_RouteLightningErrorZ CResult_RouteLightningErrorZ_ok(struct LDKRoute o); /* @internal */ -export function CResult_RouteLightningErrorZ_ok(o: number): number { +export function CResult_RouteLightningErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8288,7 +8295,7 @@ export function CResult_RouteLightningErrorZ_ok(o: number): number { } // struct LDKCResult_RouteLightningErrorZ CResult_RouteLightningErrorZ_err(struct LDKLightningError e); /* @internal */ -export function CResult_RouteLightningErrorZ_err(e: number): number { +export function CResult_RouteLightningErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8297,7 +8304,7 @@ export function CResult_RouteLightningErrorZ_err(e: number): number { } // bool CResult_RouteLightningErrorZ_is_ok(const struct LDKCResult_RouteLightningErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_RouteLightningErrorZ_is_ok(o: number): boolean { +export function CResult_RouteLightningErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8306,16 +8313,16 @@ export function CResult_RouteLightningErrorZ_is_ok(o: number): boolean { } // void CResult_RouteLightningErrorZ_free(struct LDKCResult_RouteLightningErrorZ _res); /* @internal */ -export function CResult_RouteLightningErrorZ_free(_res: number): void { +export function CResult_RouteLightningErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_RouteLightningErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_RouteLightningErrorZ_clone_ptr(LDKCResult_RouteLightningErrorZ *NONNULL_PTR arg); + // uint64_t CResult_RouteLightningErrorZ_clone_ptr(LDKCResult_RouteLightningErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_RouteLightningErrorZ_clone_ptr(arg: number): number { +export function CResult_RouteLightningErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8324,7 +8331,7 @@ export function CResult_RouteLightningErrorZ_clone_ptr(arg: number): number { } // struct LDKCResult_RouteLightningErrorZ CResult_RouteLightningErrorZ_clone(const struct LDKCResult_RouteLightningErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_RouteLightningErrorZ_clone(orig: number): number { +export function CResult_RouteLightningErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8342,7 +8349,7 @@ export function CVec_PublicKeyZ_free(_res: number): void { } // struct LDKCResult_PaymentPurposeDecodeErrorZ CResult_PaymentPurposeDecodeErrorZ_ok(struct LDKPaymentPurpose o); /* @internal */ -export function CResult_PaymentPurposeDecodeErrorZ_ok(o: number): number { +export function CResult_PaymentPurposeDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8351,7 +8358,7 @@ export function CResult_PaymentPurposeDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_PaymentPurposeDecodeErrorZ CResult_PaymentPurposeDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_PaymentPurposeDecodeErrorZ_err(e: number): number { +export function CResult_PaymentPurposeDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8360,7 +8367,7 @@ export function CResult_PaymentPurposeDecodeErrorZ_err(e: number): number { } // bool CResult_PaymentPurposeDecodeErrorZ_is_ok(const struct LDKCResult_PaymentPurposeDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_PaymentPurposeDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_PaymentPurposeDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8369,16 +8376,16 @@ export function CResult_PaymentPurposeDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_PaymentPurposeDecodeErrorZ_free(struct LDKCResult_PaymentPurposeDecodeErrorZ _res); /* @internal */ -export function CResult_PaymentPurposeDecodeErrorZ_free(_res: number): void { +export function CResult_PaymentPurposeDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_PaymentPurposeDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_PaymentPurposeDecodeErrorZ_clone_ptr(LDKCResult_PaymentPurposeDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_PaymentPurposeDecodeErrorZ_clone_ptr(LDKCResult_PaymentPurposeDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_PaymentPurposeDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_PaymentPurposeDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8387,7 +8394,7 @@ export function CResult_PaymentPurposeDecodeErrorZ_clone_ptr(arg: number): numbe } // struct LDKCResult_PaymentPurposeDecodeErrorZ CResult_PaymentPurposeDecodeErrorZ_clone(const struct LDKCResult_PaymentPurposeDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_PaymentPurposeDecodeErrorZ_clone(orig: number): number { +export function CResult_PaymentPurposeDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8396,7 +8403,7 @@ export function CResult_PaymentPurposeDecodeErrorZ_clone(orig: number): number { } // struct LDKCOption_ClosureReasonZ COption_ClosureReasonZ_some(struct LDKClosureReason o); /* @internal */ -export function COption_ClosureReasonZ_some(o: number): number { +export function COption_ClosureReasonZ_some(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8405,7 +8412,7 @@ export function COption_ClosureReasonZ_some(o: number): number { } // struct LDKCOption_ClosureReasonZ COption_ClosureReasonZ_none(void); /* @internal */ -export function COption_ClosureReasonZ_none(): number { +export function COption_ClosureReasonZ_none(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8414,16 +8421,16 @@ export function COption_ClosureReasonZ_none(): number { } // void COption_ClosureReasonZ_free(struct LDKCOption_ClosureReasonZ _res); /* @internal */ -export function COption_ClosureReasonZ_free(_res: number): void { +export function COption_ClosureReasonZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_COption_ClosureReasonZ_free(_res); // debug statements here } - // uintptr_t COption_ClosureReasonZ_clone_ptr(LDKCOption_ClosureReasonZ *NONNULL_PTR arg); + // uint64_t COption_ClosureReasonZ_clone_ptr(LDKCOption_ClosureReasonZ *NONNULL_PTR arg); /* @internal */ -export function COption_ClosureReasonZ_clone_ptr(arg: number): number { +export function COption_ClosureReasonZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8432,7 +8439,7 @@ export function COption_ClosureReasonZ_clone_ptr(arg: number): number { } // struct LDKCOption_ClosureReasonZ COption_ClosureReasonZ_clone(const struct LDKCOption_ClosureReasonZ *NONNULL_PTR orig); /* @internal */ -export function COption_ClosureReasonZ_clone(orig: number): number { +export function COption_ClosureReasonZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8441,7 +8448,7 @@ export function COption_ClosureReasonZ_clone(orig: number): number { } // struct LDKCResult_COption_ClosureReasonZDecodeErrorZ CResult_COption_ClosureReasonZDecodeErrorZ_ok(struct LDKCOption_ClosureReasonZ o); /* @internal */ -export function CResult_COption_ClosureReasonZDecodeErrorZ_ok(o: number): number { +export function CResult_COption_ClosureReasonZDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8450,7 +8457,7 @@ export function CResult_COption_ClosureReasonZDecodeErrorZ_ok(o: number): number } // struct LDKCResult_COption_ClosureReasonZDecodeErrorZ CResult_COption_ClosureReasonZDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_COption_ClosureReasonZDecodeErrorZ_err(e: number): number { +export function CResult_COption_ClosureReasonZDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8459,7 +8466,7 @@ export function CResult_COption_ClosureReasonZDecodeErrorZ_err(e: number): numbe } // bool CResult_COption_ClosureReasonZDecodeErrorZ_is_ok(const struct LDKCResult_COption_ClosureReasonZDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_COption_ClosureReasonZDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_COption_ClosureReasonZDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8468,16 +8475,16 @@ export function CResult_COption_ClosureReasonZDecodeErrorZ_is_ok(o: number): boo } // void CResult_COption_ClosureReasonZDecodeErrorZ_free(struct LDKCResult_COption_ClosureReasonZDecodeErrorZ _res); /* @internal */ -export function CResult_COption_ClosureReasonZDecodeErrorZ_free(_res: number): void { +export function CResult_COption_ClosureReasonZDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_COption_ClosureReasonZDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_COption_ClosureReasonZDecodeErrorZ_clone_ptr(LDKCResult_COption_ClosureReasonZDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_COption_ClosureReasonZDecodeErrorZ_clone_ptr(LDKCResult_COption_ClosureReasonZDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_COption_ClosureReasonZDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_COption_ClosureReasonZDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8486,7 +8493,7 @@ export function CResult_COption_ClosureReasonZDecodeErrorZ_clone_ptr(arg: number } // struct LDKCResult_COption_ClosureReasonZDecodeErrorZ CResult_COption_ClosureReasonZDecodeErrorZ_clone(const struct LDKCResult_COption_ClosureReasonZDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_COption_ClosureReasonZDecodeErrorZ_clone(orig: number): number { +export function CResult_COption_ClosureReasonZDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8495,7 +8502,7 @@ export function CResult_COption_ClosureReasonZDecodeErrorZ_clone(orig: number): } // struct LDKCOption_HTLCDestinationZ COption_HTLCDestinationZ_some(struct LDKHTLCDestination o); /* @internal */ -export function COption_HTLCDestinationZ_some(o: number): number { +export function COption_HTLCDestinationZ_some(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8504,7 +8511,7 @@ export function COption_HTLCDestinationZ_some(o: number): number { } // struct LDKCOption_HTLCDestinationZ COption_HTLCDestinationZ_none(void); /* @internal */ -export function COption_HTLCDestinationZ_none(): number { +export function COption_HTLCDestinationZ_none(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8513,16 +8520,16 @@ export function COption_HTLCDestinationZ_none(): number { } // void COption_HTLCDestinationZ_free(struct LDKCOption_HTLCDestinationZ _res); /* @internal */ -export function COption_HTLCDestinationZ_free(_res: number): void { +export function COption_HTLCDestinationZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_COption_HTLCDestinationZ_free(_res); // debug statements here } - // uintptr_t COption_HTLCDestinationZ_clone_ptr(LDKCOption_HTLCDestinationZ *NONNULL_PTR arg); + // uint64_t COption_HTLCDestinationZ_clone_ptr(LDKCOption_HTLCDestinationZ *NONNULL_PTR arg); /* @internal */ -export function COption_HTLCDestinationZ_clone_ptr(arg: number): number { +export function COption_HTLCDestinationZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8531,7 +8538,7 @@ export function COption_HTLCDestinationZ_clone_ptr(arg: number): number { } // struct LDKCOption_HTLCDestinationZ COption_HTLCDestinationZ_clone(const struct LDKCOption_HTLCDestinationZ *NONNULL_PTR orig); /* @internal */ -export function COption_HTLCDestinationZ_clone(orig: number): number { +export function COption_HTLCDestinationZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8540,7 +8547,7 @@ export function COption_HTLCDestinationZ_clone(orig: number): number { } // struct LDKCResult_COption_HTLCDestinationZDecodeErrorZ CResult_COption_HTLCDestinationZDecodeErrorZ_ok(struct LDKCOption_HTLCDestinationZ o); /* @internal */ -export function CResult_COption_HTLCDestinationZDecodeErrorZ_ok(o: number): number { +export function CResult_COption_HTLCDestinationZDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8549,7 +8556,7 @@ export function CResult_COption_HTLCDestinationZDecodeErrorZ_ok(o: number): numb } // struct LDKCResult_COption_HTLCDestinationZDecodeErrorZ CResult_COption_HTLCDestinationZDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_COption_HTLCDestinationZDecodeErrorZ_err(e: number): number { +export function CResult_COption_HTLCDestinationZDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8558,7 +8565,7 @@ export function CResult_COption_HTLCDestinationZDecodeErrorZ_err(e: number): num } // bool CResult_COption_HTLCDestinationZDecodeErrorZ_is_ok(const struct LDKCResult_COption_HTLCDestinationZDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_COption_HTLCDestinationZDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_COption_HTLCDestinationZDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8567,16 +8574,16 @@ export function CResult_COption_HTLCDestinationZDecodeErrorZ_is_ok(o: number): b } // void CResult_COption_HTLCDestinationZDecodeErrorZ_free(struct LDKCResult_COption_HTLCDestinationZDecodeErrorZ _res); /* @internal */ -export function CResult_COption_HTLCDestinationZDecodeErrorZ_free(_res: number): void { +export function CResult_COption_HTLCDestinationZDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_COption_HTLCDestinationZDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_COption_HTLCDestinationZDecodeErrorZ_clone_ptr(LDKCResult_COption_HTLCDestinationZDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_COption_HTLCDestinationZDecodeErrorZ_clone_ptr(LDKCResult_COption_HTLCDestinationZDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_COption_HTLCDestinationZDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_COption_HTLCDestinationZDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8585,7 +8592,7 @@ export function CResult_COption_HTLCDestinationZDecodeErrorZ_clone_ptr(arg: numb } // struct LDKCResult_COption_HTLCDestinationZDecodeErrorZ CResult_COption_HTLCDestinationZDecodeErrorZ_clone(const struct LDKCResult_COption_HTLCDestinationZDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_COption_HTLCDestinationZDecodeErrorZ_clone(orig: number): number { +export function CResult_COption_HTLCDestinationZDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8594,7 +8601,7 @@ export function CResult_COption_HTLCDestinationZDecodeErrorZ_clone(orig: number) } // struct LDKCOption_NetworkUpdateZ COption_NetworkUpdateZ_some(struct LDKNetworkUpdate o); /* @internal */ -export function COption_NetworkUpdateZ_some(o: number): number { +export function COption_NetworkUpdateZ_some(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8603,7 +8610,7 @@ export function COption_NetworkUpdateZ_some(o: number): number { } // struct LDKCOption_NetworkUpdateZ COption_NetworkUpdateZ_none(void); /* @internal */ -export function COption_NetworkUpdateZ_none(): number { +export function COption_NetworkUpdateZ_none(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8612,16 +8619,16 @@ export function COption_NetworkUpdateZ_none(): number { } // void COption_NetworkUpdateZ_free(struct LDKCOption_NetworkUpdateZ _res); /* @internal */ -export function COption_NetworkUpdateZ_free(_res: number): void { +export function COption_NetworkUpdateZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_COption_NetworkUpdateZ_free(_res); // debug statements here } - // uintptr_t COption_NetworkUpdateZ_clone_ptr(LDKCOption_NetworkUpdateZ *NONNULL_PTR arg); + // uint64_t COption_NetworkUpdateZ_clone_ptr(LDKCOption_NetworkUpdateZ *NONNULL_PTR arg); /* @internal */ -export function COption_NetworkUpdateZ_clone_ptr(arg: number): number { +export function COption_NetworkUpdateZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8630,7 +8637,7 @@ export function COption_NetworkUpdateZ_clone_ptr(arg: number): number { } // struct LDKCOption_NetworkUpdateZ COption_NetworkUpdateZ_clone(const struct LDKCOption_NetworkUpdateZ *NONNULL_PTR orig); /* @internal */ -export function COption_NetworkUpdateZ_clone(orig: number): number { +export function COption_NetworkUpdateZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8648,7 +8655,7 @@ export function CVec_SpendableOutputDescriptorZ_free(_res: number): void { } // struct LDKCOption_EventZ COption_EventZ_some(struct LDKEvent o); /* @internal */ -export function COption_EventZ_some(o: number): number { +export function COption_EventZ_some(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8657,7 +8664,7 @@ export function COption_EventZ_some(o: number): number { } // struct LDKCOption_EventZ COption_EventZ_none(void); /* @internal */ -export function COption_EventZ_none(): number { +export function COption_EventZ_none(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8666,16 +8673,16 @@ export function COption_EventZ_none(): number { } // void COption_EventZ_free(struct LDKCOption_EventZ _res); /* @internal */ -export function COption_EventZ_free(_res: number): void { +export function COption_EventZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_COption_EventZ_free(_res); // debug statements here } - // uintptr_t COption_EventZ_clone_ptr(LDKCOption_EventZ *NONNULL_PTR arg); + // uint64_t COption_EventZ_clone_ptr(LDKCOption_EventZ *NONNULL_PTR arg); /* @internal */ -export function COption_EventZ_clone_ptr(arg: number): number { +export function COption_EventZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8684,7 +8691,7 @@ export function COption_EventZ_clone_ptr(arg: number): number { } // struct LDKCOption_EventZ COption_EventZ_clone(const struct LDKCOption_EventZ *NONNULL_PTR orig); /* @internal */ -export function COption_EventZ_clone(orig: number): number { +export function COption_EventZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8693,7 +8700,7 @@ export function COption_EventZ_clone(orig: number): number { } // struct LDKCResult_COption_EventZDecodeErrorZ CResult_COption_EventZDecodeErrorZ_ok(struct LDKCOption_EventZ o); /* @internal */ -export function CResult_COption_EventZDecodeErrorZ_ok(o: number): number { +export function CResult_COption_EventZDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8702,7 +8709,7 @@ export function CResult_COption_EventZDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_COption_EventZDecodeErrorZ CResult_COption_EventZDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_COption_EventZDecodeErrorZ_err(e: number): number { +export function CResult_COption_EventZDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8711,7 +8718,7 @@ export function CResult_COption_EventZDecodeErrorZ_err(e: number): number { } // bool CResult_COption_EventZDecodeErrorZ_is_ok(const struct LDKCResult_COption_EventZDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_COption_EventZDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_COption_EventZDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8720,16 +8727,16 @@ export function CResult_COption_EventZDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_COption_EventZDecodeErrorZ_free(struct LDKCResult_COption_EventZDecodeErrorZ _res); /* @internal */ -export function CResult_COption_EventZDecodeErrorZ_free(_res: number): void { +export function CResult_COption_EventZDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_COption_EventZDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_COption_EventZDecodeErrorZ_clone_ptr(LDKCResult_COption_EventZDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_COption_EventZDecodeErrorZ_clone_ptr(LDKCResult_COption_EventZDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_COption_EventZDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_COption_EventZDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8738,7 +8745,7 @@ export function CResult_COption_EventZDecodeErrorZ_clone_ptr(arg: number): numbe } // struct LDKCResult_COption_EventZDecodeErrorZ CResult_COption_EventZDecodeErrorZ_clone(const struct LDKCResult_COption_EventZDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_COption_EventZDecodeErrorZ_clone(orig: number): number { +export function CResult_COption_EventZDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8756,7 +8763,7 @@ export function CVec_MessageSendEventZ_free(_res: number): void { } // struct LDKCResult_TxOutAccessErrorZ CResult_TxOutAccessErrorZ_ok(struct LDKTxOut o); /* @internal */ -export function CResult_TxOutAccessErrorZ_ok(o: number): number { +export function CResult_TxOutAccessErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8765,7 +8772,7 @@ export function CResult_TxOutAccessErrorZ_ok(o: number): number { } // struct LDKCResult_TxOutAccessErrorZ CResult_TxOutAccessErrorZ_err(enum LDKAccessError e); /* @internal */ -export function CResult_TxOutAccessErrorZ_err(e: AccessError): number { +export function CResult_TxOutAccessErrorZ_err(e: AccessError): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8774,7 +8781,7 @@ export function CResult_TxOutAccessErrorZ_err(e: AccessError): number { } // bool CResult_TxOutAccessErrorZ_is_ok(const struct LDKCResult_TxOutAccessErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_TxOutAccessErrorZ_is_ok(o: number): boolean { +export function CResult_TxOutAccessErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8783,16 +8790,16 @@ export function CResult_TxOutAccessErrorZ_is_ok(o: number): boolean { } // void CResult_TxOutAccessErrorZ_free(struct LDKCResult_TxOutAccessErrorZ _res); /* @internal */ -export function CResult_TxOutAccessErrorZ_free(_res: number): void { +export function CResult_TxOutAccessErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_TxOutAccessErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_TxOutAccessErrorZ_clone_ptr(LDKCResult_TxOutAccessErrorZ *NONNULL_PTR arg); + // uint64_t CResult_TxOutAccessErrorZ_clone_ptr(LDKCResult_TxOutAccessErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_TxOutAccessErrorZ_clone_ptr(arg: number): number { +export function CResult_TxOutAccessErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8801,16 +8808,16 @@ export function CResult_TxOutAccessErrorZ_clone_ptr(arg: number): number { } // struct LDKCResult_TxOutAccessErrorZ CResult_TxOutAccessErrorZ_clone(const struct LDKCResult_TxOutAccessErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_TxOutAccessErrorZ_clone(orig: number): number { +export function CResult_TxOutAccessErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_TxOutAccessErrorZ_clone(orig); return nativeResponseValue; } - // uintptr_t C2Tuple_usizeTransactionZ_clone_ptr(LDKC2Tuple_usizeTransactionZ *NONNULL_PTR arg); + // uint64_t C2Tuple_usizeTransactionZ_clone_ptr(LDKC2Tuple_usizeTransactionZ *NONNULL_PTR arg); /* @internal */ -export function C2Tuple_usizeTransactionZ_clone_ptr(arg: number): number { +export function C2Tuple_usizeTransactionZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8819,7 +8826,7 @@ export function C2Tuple_usizeTransactionZ_clone_ptr(arg: number): number { } // struct LDKC2Tuple_usizeTransactionZ C2Tuple_usizeTransactionZ_clone(const struct LDKC2Tuple_usizeTransactionZ *NONNULL_PTR orig); /* @internal */ -export function C2Tuple_usizeTransactionZ_clone(orig: number): number { +export function C2Tuple_usizeTransactionZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8828,7 +8835,7 @@ export function C2Tuple_usizeTransactionZ_clone(orig: number): number { } // struct LDKC2Tuple_usizeTransactionZ C2Tuple_usizeTransactionZ_new(uintptr_t a, struct LDKTransaction b); /* @internal */ -export function C2Tuple_usizeTransactionZ_new(a: number, b: number): number { +export function C2Tuple_usizeTransactionZ_new(a: number, b: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8837,7 +8844,7 @@ export function C2Tuple_usizeTransactionZ_new(a: number, b: number): number { } // void C2Tuple_usizeTransactionZ_free(struct LDKC2Tuple_usizeTransactionZ _res); /* @internal */ -export function C2Tuple_usizeTransactionZ_free(_res: number): void { +export function C2Tuple_usizeTransactionZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8864,7 +8871,7 @@ export function CVec_TxidZ_free(_res: number): void { } // struct LDKCResult_NoneChannelMonitorUpdateErrZ CResult_NoneChannelMonitorUpdateErrZ_ok(void); /* @internal */ -export function CResult_NoneChannelMonitorUpdateErrZ_ok(): number { +export function CResult_NoneChannelMonitorUpdateErrZ_ok(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8873,7 +8880,7 @@ export function CResult_NoneChannelMonitorUpdateErrZ_ok(): number { } // struct LDKCResult_NoneChannelMonitorUpdateErrZ CResult_NoneChannelMonitorUpdateErrZ_err(enum LDKChannelMonitorUpdateErr e); /* @internal */ -export function CResult_NoneChannelMonitorUpdateErrZ_err(e: ChannelMonitorUpdateErr): number { +export function CResult_NoneChannelMonitorUpdateErrZ_err(e: ChannelMonitorUpdateErr): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8882,7 +8889,7 @@ export function CResult_NoneChannelMonitorUpdateErrZ_err(e: ChannelMonitorUpdate } // bool CResult_NoneChannelMonitorUpdateErrZ_is_ok(const struct LDKCResult_NoneChannelMonitorUpdateErrZ *NONNULL_PTR o); /* @internal */ -export function CResult_NoneChannelMonitorUpdateErrZ_is_ok(o: number): boolean { +export function CResult_NoneChannelMonitorUpdateErrZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8891,16 +8898,16 @@ export function CResult_NoneChannelMonitorUpdateErrZ_is_ok(o: number): boolean { } // void CResult_NoneChannelMonitorUpdateErrZ_free(struct LDKCResult_NoneChannelMonitorUpdateErrZ _res); /* @internal */ -export function CResult_NoneChannelMonitorUpdateErrZ_free(_res: number): void { +export function CResult_NoneChannelMonitorUpdateErrZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_NoneChannelMonitorUpdateErrZ_free(_res); // debug statements here } - // uintptr_t CResult_NoneChannelMonitorUpdateErrZ_clone_ptr(LDKCResult_NoneChannelMonitorUpdateErrZ *NONNULL_PTR arg); + // uint64_t CResult_NoneChannelMonitorUpdateErrZ_clone_ptr(LDKCResult_NoneChannelMonitorUpdateErrZ *NONNULL_PTR arg); /* @internal */ -export function CResult_NoneChannelMonitorUpdateErrZ_clone_ptr(arg: number): number { +export function CResult_NoneChannelMonitorUpdateErrZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8909,7 +8916,7 @@ export function CResult_NoneChannelMonitorUpdateErrZ_clone_ptr(arg: number): num } // struct LDKCResult_NoneChannelMonitorUpdateErrZ CResult_NoneChannelMonitorUpdateErrZ_clone(const struct LDKCResult_NoneChannelMonitorUpdateErrZ *NONNULL_PTR orig); /* @internal */ -export function CResult_NoneChannelMonitorUpdateErrZ_clone(orig: number): number { +export function CResult_NoneChannelMonitorUpdateErrZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8925,9 +8932,9 @@ export function CVec_MonitorEventZ_free(_res: number): void { const nativeResponseValue = wasm.TS_CVec_MonitorEventZ_free(_res); // debug statements here } - // uintptr_t C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone_ptr(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ *NONNULL_PTR arg); + // uint64_t C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone_ptr(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ *NONNULL_PTR arg); /* @internal */ -export function C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone_ptr(arg: number): number { +export function C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8936,7 +8943,7 @@ export function C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone_ptr(arg: numb } // struct LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone(const struct LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ *NONNULL_PTR orig); /* @internal */ -export function C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone(orig: number): number { +export function C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8945,7 +8952,7 @@ export function C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone(orig: number) } // struct LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_new(struct LDKOutPoint a, struct LDKCVec_MonitorEventZ b, struct LDKPublicKey c); /* @internal */ -export function C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_new(a: number, b: number, c: number): number { +export function C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_new(a: bigint, b: number, c: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8954,7 +8961,7 @@ export function C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_new(a: number, b: n } // void C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_free(struct LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ _res); /* @internal */ -export function C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_free(_res: number): void { +export function C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8972,7 +8979,7 @@ export function CVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ_free(_res: nu } // struct LDKCOption_C2Tuple_usizeTransactionZZ COption_C2Tuple_usizeTransactionZZ_some(struct LDKC2Tuple_usizeTransactionZ o); /* @internal */ -export function COption_C2Tuple_usizeTransactionZZ_some(o: number): number { +export function COption_C2Tuple_usizeTransactionZZ_some(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8981,7 +8988,7 @@ export function COption_C2Tuple_usizeTransactionZZ_some(o: number): number { } // struct LDKCOption_C2Tuple_usizeTransactionZZ COption_C2Tuple_usizeTransactionZZ_none(void); /* @internal */ -export function COption_C2Tuple_usizeTransactionZZ_none(): number { +export function COption_C2Tuple_usizeTransactionZZ_none(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -8990,16 +8997,16 @@ export function COption_C2Tuple_usizeTransactionZZ_none(): number { } // void COption_C2Tuple_usizeTransactionZZ_free(struct LDKCOption_C2Tuple_usizeTransactionZZ _res); /* @internal */ -export function COption_C2Tuple_usizeTransactionZZ_free(_res: number): void { +export function COption_C2Tuple_usizeTransactionZZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_COption_C2Tuple_usizeTransactionZZ_free(_res); // debug statements here } - // uintptr_t COption_C2Tuple_usizeTransactionZZ_clone_ptr(LDKCOption_C2Tuple_usizeTransactionZZ *NONNULL_PTR arg); + // uint64_t COption_C2Tuple_usizeTransactionZZ_clone_ptr(LDKCOption_C2Tuple_usizeTransactionZZ *NONNULL_PTR arg); /* @internal */ -export function COption_C2Tuple_usizeTransactionZZ_clone_ptr(arg: number): number { +export function COption_C2Tuple_usizeTransactionZZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9008,7 +9015,7 @@ export function COption_C2Tuple_usizeTransactionZZ_clone_ptr(arg: number): numbe } // struct LDKCOption_C2Tuple_usizeTransactionZZ COption_C2Tuple_usizeTransactionZZ_clone(const struct LDKCOption_C2Tuple_usizeTransactionZZ *NONNULL_PTR orig); /* @internal */ -export function COption_C2Tuple_usizeTransactionZZ_clone(orig: number): number { +export function COption_C2Tuple_usizeTransactionZZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9017,7 +9024,7 @@ export function COption_C2Tuple_usizeTransactionZZ_clone(orig: number): number { } // struct LDKCResult_FixedPenaltyScorerDecodeErrorZ CResult_FixedPenaltyScorerDecodeErrorZ_ok(struct LDKFixedPenaltyScorer o); /* @internal */ -export function CResult_FixedPenaltyScorerDecodeErrorZ_ok(o: number): number { +export function CResult_FixedPenaltyScorerDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9026,7 +9033,7 @@ export function CResult_FixedPenaltyScorerDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_FixedPenaltyScorerDecodeErrorZ CResult_FixedPenaltyScorerDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_FixedPenaltyScorerDecodeErrorZ_err(e: number): number { +export function CResult_FixedPenaltyScorerDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9035,7 +9042,7 @@ export function CResult_FixedPenaltyScorerDecodeErrorZ_err(e: number): number { } // bool CResult_FixedPenaltyScorerDecodeErrorZ_is_ok(const struct LDKCResult_FixedPenaltyScorerDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_FixedPenaltyScorerDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_FixedPenaltyScorerDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9044,16 +9051,16 @@ export function CResult_FixedPenaltyScorerDecodeErrorZ_is_ok(o: number): boolean } // void CResult_FixedPenaltyScorerDecodeErrorZ_free(struct LDKCResult_FixedPenaltyScorerDecodeErrorZ _res); /* @internal */ -export function CResult_FixedPenaltyScorerDecodeErrorZ_free(_res: number): void { +export function CResult_FixedPenaltyScorerDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_FixedPenaltyScorerDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_FixedPenaltyScorerDecodeErrorZ_clone_ptr(LDKCResult_FixedPenaltyScorerDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_FixedPenaltyScorerDecodeErrorZ_clone_ptr(LDKCResult_FixedPenaltyScorerDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_FixedPenaltyScorerDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_FixedPenaltyScorerDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9062,16 +9069,16 @@ export function CResult_FixedPenaltyScorerDecodeErrorZ_clone_ptr(arg: number): n } // struct LDKCResult_FixedPenaltyScorerDecodeErrorZ CResult_FixedPenaltyScorerDecodeErrorZ_clone(const struct LDKCResult_FixedPenaltyScorerDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_FixedPenaltyScorerDecodeErrorZ_clone(orig: number): number { +export function CResult_FixedPenaltyScorerDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_FixedPenaltyScorerDecodeErrorZ_clone(orig); return nativeResponseValue; } - // uintptr_t C2Tuple_u64u64Z_clone_ptr(LDKC2Tuple_u64u64Z *NONNULL_PTR arg); + // uint64_t C2Tuple_u64u64Z_clone_ptr(LDKC2Tuple_u64u64Z *NONNULL_PTR arg); /* @internal */ -export function C2Tuple_u64u64Z_clone_ptr(arg: number): number { +export function C2Tuple_u64u64Z_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9080,7 +9087,7 @@ export function C2Tuple_u64u64Z_clone_ptr(arg: number): number { } // struct LDKC2Tuple_u64u64Z C2Tuple_u64u64Z_clone(const struct LDKC2Tuple_u64u64Z *NONNULL_PTR orig); /* @internal */ -export function C2Tuple_u64u64Z_clone(orig: number): number { +export function C2Tuple_u64u64Z_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9089,7 +9096,7 @@ export function C2Tuple_u64u64Z_clone(orig: number): number { } // struct LDKC2Tuple_u64u64Z C2Tuple_u64u64Z_new(uint64_t a, uint64_t b); /* @internal */ -export function C2Tuple_u64u64Z_new(a: bigint, b: bigint): number { +export function C2Tuple_u64u64Z_new(a: bigint, b: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9098,7 +9105,7 @@ export function C2Tuple_u64u64Z_new(a: bigint, b: bigint): number { } // void C2Tuple_u64u64Z_free(struct LDKC2Tuple_u64u64Z _res); /* @internal */ -export function C2Tuple_u64u64Z_free(_res: number): void { +export function C2Tuple_u64u64Z_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9107,7 +9114,7 @@ export function C2Tuple_u64u64Z_free(_res: number): void { } // struct LDKCOption_C2Tuple_u64u64ZZ COption_C2Tuple_u64u64ZZ_some(struct LDKC2Tuple_u64u64Z o); /* @internal */ -export function COption_C2Tuple_u64u64ZZ_some(o: number): number { +export function COption_C2Tuple_u64u64ZZ_some(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9116,7 +9123,7 @@ export function COption_C2Tuple_u64u64ZZ_some(o: number): number { } // struct LDKCOption_C2Tuple_u64u64ZZ COption_C2Tuple_u64u64ZZ_none(void); /* @internal */ -export function COption_C2Tuple_u64u64ZZ_none(): number { +export function COption_C2Tuple_u64u64ZZ_none(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9125,16 +9132,16 @@ export function COption_C2Tuple_u64u64ZZ_none(): number { } // void COption_C2Tuple_u64u64ZZ_free(struct LDKCOption_C2Tuple_u64u64ZZ _res); /* @internal */ -export function COption_C2Tuple_u64u64ZZ_free(_res: number): void { +export function COption_C2Tuple_u64u64ZZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_COption_C2Tuple_u64u64ZZ_free(_res); // debug statements here } - // uintptr_t COption_C2Tuple_u64u64ZZ_clone_ptr(LDKCOption_C2Tuple_u64u64ZZ *NONNULL_PTR arg); + // uint64_t COption_C2Tuple_u64u64ZZ_clone_ptr(LDKCOption_C2Tuple_u64u64ZZ *NONNULL_PTR arg); /* @internal */ -export function COption_C2Tuple_u64u64ZZ_clone_ptr(arg: number): number { +export function COption_C2Tuple_u64u64ZZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9143,7 +9150,7 @@ export function COption_C2Tuple_u64u64ZZ_clone_ptr(arg: number): number { } // struct LDKCOption_C2Tuple_u64u64ZZ COption_C2Tuple_u64u64ZZ_clone(const struct LDKCOption_C2Tuple_u64u64ZZ *NONNULL_PTR orig); /* @internal */ -export function COption_C2Tuple_u64u64ZZ_clone(orig: number): number { +export function COption_C2Tuple_u64u64ZZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9161,7 +9168,7 @@ export function CVec_NodeIdZ_free(_res: number): void { } // struct LDKCResult_ProbabilisticScorerDecodeErrorZ CResult_ProbabilisticScorerDecodeErrorZ_ok(struct LDKProbabilisticScorer o); /* @internal */ -export function CResult_ProbabilisticScorerDecodeErrorZ_ok(o: number): number { +export function CResult_ProbabilisticScorerDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9170,7 +9177,7 @@ export function CResult_ProbabilisticScorerDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_ProbabilisticScorerDecodeErrorZ CResult_ProbabilisticScorerDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_ProbabilisticScorerDecodeErrorZ_err(e: number): number { +export function CResult_ProbabilisticScorerDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9179,7 +9186,7 @@ export function CResult_ProbabilisticScorerDecodeErrorZ_err(e: number): number { } // bool CResult_ProbabilisticScorerDecodeErrorZ_is_ok(const struct LDKCResult_ProbabilisticScorerDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_ProbabilisticScorerDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_ProbabilisticScorerDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9188,7 +9195,7 @@ export function CResult_ProbabilisticScorerDecodeErrorZ_is_ok(o: number): boolea } // void CResult_ProbabilisticScorerDecodeErrorZ_free(struct LDKCResult_ProbabilisticScorerDecodeErrorZ _res); /* @internal */ -export function CResult_ProbabilisticScorerDecodeErrorZ_free(_res: number): void { +export function CResult_ProbabilisticScorerDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9197,7 +9204,7 @@ export function CResult_ProbabilisticScorerDecodeErrorZ_free(_res: number): void } // struct LDKCResult_InitFeaturesDecodeErrorZ CResult_InitFeaturesDecodeErrorZ_ok(struct LDKInitFeatures o); /* @internal */ -export function CResult_InitFeaturesDecodeErrorZ_ok(o: number): number { +export function CResult_InitFeaturesDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9206,7 +9213,7 @@ export function CResult_InitFeaturesDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_InitFeaturesDecodeErrorZ CResult_InitFeaturesDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_InitFeaturesDecodeErrorZ_err(e: number): number { +export function CResult_InitFeaturesDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9215,7 +9222,7 @@ export function CResult_InitFeaturesDecodeErrorZ_err(e: number): number { } // bool CResult_InitFeaturesDecodeErrorZ_is_ok(const struct LDKCResult_InitFeaturesDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_InitFeaturesDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_InitFeaturesDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9224,16 +9231,16 @@ export function CResult_InitFeaturesDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_InitFeaturesDecodeErrorZ_free(struct LDKCResult_InitFeaturesDecodeErrorZ _res); /* @internal */ -export function CResult_InitFeaturesDecodeErrorZ_free(_res: number): void { +export function CResult_InitFeaturesDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_InitFeaturesDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_InitFeaturesDecodeErrorZ_clone_ptr(LDKCResult_InitFeaturesDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_InitFeaturesDecodeErrorZ_clone_ptr(LDKCResult_InitFeaturesDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_InitFeaturesDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_InitFeaturesDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9242,7 +9249,7 @@ export function CResult_InitFeaturesDecodeErrorZ_clone_ptr(arg: number): number } // struct LDKCResult_InitFeaturesDecodeErrorZ CResult_InitFeaturesDecodeErrorZ_clone(const struct LDKCResult_InitFeaturesDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_InitFeaturesDecodeErrorZ_clone(orig: number): number { +export function CResult_InitFeaturesDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9251,7 +9258,7 @@ export function CResult_InitFeaturesDecodeErrorZ_clone(orig: number): number { } // struct LDKCResult_ChannelFeaturesDecodeErrorZ CResult_ChannelFeaturesDecodeErrorZ_ok(struct LDKChannelFeatures o); /* @internal */ -export function CResult_ChannelFeaturesDecodeErrorZ_ok(o: number): number { +export function CResult_ChannelFeaturesDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9260,7 +9267,7 @@ export function CResult_ChannelFeaturesDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_ChannelFeaturesDecodeErrorZ CResult_ChannelFeaturesDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_ChannelFeaturesDecodeErrorZ_err(e: number): number { +export function CResult_ChannelFeaturesDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9269,7 +9276,7 @@ export function CResult_ChannelFeaturesDecodeErrorZ_err(e: number): number { } // bool CResult_ChannelFeaturesDecodeErrorZ_is_ok(const struct LDKCResult_ChannelFeaturesDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_ChannelFeaturesDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_ChannelFeaturesDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9278,16 +9285,16 @@ export function CResult_ChannelFeaturesDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_ChannelFeaturesDecodeErrorZ_free(struct LDKCResult_ChannelFeaturesDecodeErrorZ _res); /* @internal */ -export function CResult_ChannelFeaturesDecodeErrorZ_free(_res: number): void { +export function CResult_ChannelFeaturesDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_ChannelFeaturesDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_ChannelFeaturesDecodeErrorZ_clone_ptr(LDKCResult_ChannelFeaturesDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_ChannelFeaturesDecodeErrorZ_clone_ptr(LDKCResult_ChannelFeaturesDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_ChannelFeaturesDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_ChannelFeaturesDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9296,7 +9303,7 @@ export function CResult_ChannelFeaturesDecodeErrorZ_clone_ptr(arg: number): numb } // struct LDKCResult_ChannelFeaturesDecodeErrorZ CResult_ChannelFeaturesDecodeErrorZ_clone(const struct LDKCResult_ChannelFeaturesDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_ChannelFeaturesDecodeErrorZ_clone(orig: number): number { +export function CResult_ChannelFeaturesDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9305,7 +9312,7 @@ export function CResult_ChannelFeaturesDecodeErrorZ_clone(orig: number): number } // struct LDKCResult_NodeFeaturesDecodeErrorZ CResult_NodeFeaturesDecodeErrorZ_ok(struct LDKNodeFeatures o); /* @internal */ -export function CResult_NodeFeaturesDecodeErrorZ_ok(o: number): number { +export function CResult_NodeFeaturesDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9314,7 +9321,7 @@ export function CResult_NodeFeaturesDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_NodeFeaturesDecodeErrorZ CResult_NodeFeaturesDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_NodeFeaturesDecodeErrorZ_err(e: number): number { +export function CResult_NodeFeaturesDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9323,7 +9330,7 @@ export function CResult_NodeFeaturesDecodeErrorZ_err(e: number): number { } // bool CResult_NodeFeaturesDecodeErrorZ_is_ok(const struct LDKCResult_NodeFeaturesDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_NodeFeaturesDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_NodeFeaturesDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9332,16 +9339,16 @@ export function CResult_NodeFeaturesDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_NodeFeaturesDecodeErrorZ_free(struct LDKCResult_NodeFeaturesDecodeErrorZ _res); /* @internal */ -export function CResult_NodeFeaturesDecodeErrorZ_free(_res: number): void { +export function CResult_NodeFeaturesDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_NodeFeaturesDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_NodeFeaturesDecodeErrorZ_clone_ptr(LDKCResult_NodeFeaturesDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_NodeFeaturesDecodeErrorZ_clone_ptr(LDKCResult_NodeFeaturesDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_NodeFeaturesDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_NodeFeaturesDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9350,7 +9357,7 @@ export function CResult_NodeFeaturesDecodeErrorZ_clone_ptr(arg: number): number } // struct LDKCResult_NodeFeaturesDecodeErrorZ CResult_NodeFeaturesDecodeErrorZ_clone(const struct LDKCResult_NodeFeaturesDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_NodeFeaturesDecodeErrorZ_clone(orig: number): number { +export function CResult_NodeFeaturesDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9359,7 +9366,7 @@ export function CResult_NodeFeaturesDecodeErrorZ_clone(orig: number): number { } // struct LDKCResult_InvoiceFeaturesDecodeErrorZ CResult_InvoiceFeaturesDecodeErrorZ_ok(struct LDKInvoiceFeatures o); /* @internal */ -export function CResult_InvoiceFeaturesDecodeErrorZ_ok(o: number): number { +export function CResult_InvoiceFeaturesDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9368,7 +9375,7 @@ export function CResult_InvoiceFeaturesDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_InvoiceFeaturesDecodeErrorZ CResult_InvoiceFeaturesDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_InvoiceFeaturesDecodeErrorZ_err(e: number): number { +export function CResult_InvoiceFeaturesDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9377,7 +9384,7 @@ export function CResult_InvoiceFeaturesDecodeErrorZ_err(e: number): number { } // bool CResult_InvoiceFeaturesDecodeErrorZ_is_ok(const struct LDKCResult_InvoiceFeaturesDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_InvoiceFeaturesDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_InvoiceFeaturesDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9386,16 +9393,16 @@ export function CResult_InvoiceFeaturesDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_InvoiceFeaturesDecodeErrorZ_free(struct LDKCResult_InvoiceFeaturesDecodeErrorZ _res); /* @internal */ -export function CResult_InvoiceFeaturesDecodeErrorZ_free(_res: number): void { +export function CResult_InvoiceFeaturesDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_InvoiceFeaturesDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_InvoiceFeaturesDecodeErrorZ_clone_ptr(LDKCResult_InvoiceFeaturesDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_InvoiceFeaturesDecodeErrorZ_clone_ptr(LDKCResult_InvoiceFeaturesDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_InvoiceFeaturesDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_InvoiceFeaturesDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9404,7 +9411,7 @@ export function CResult_InvoiceFeaturesDecodeErrorZ_clone_ptr(arg: number): numb } // struct LDKCResult_InvoiceFeaturesDecodeErrorZ CResult_InvoiceFeaturesDecodeErrorZ_clone(const struct LDKCResult_InvoiceFeaturesDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_InvoiceFeaturesDecodeErrorZ_clone(orig: number): number { +export function CResult_InvoiceFeaturesDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9413,7 +9420,7 @@ export function CResult_InvoiceFeaturesDecodeErrorZ_clone(orig: number): number } // struct LDKCResult_ChannelTypeFeaturesDecodeErrorZ CResult_ChannelTypeFeaturesDecodeErrorZ_ok(struct LDKChannelTypeFeatures o); /* @internal */ -export function CResult_ChannelTypeFeaturesDecodeErrorZ_ok(o: number): number { +export function CResult_ChannelTypeFeaturesDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9422,7 +9429,7 @@ export function CResult_ChannelTypeFeaturesDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_ChannelTypeFeaturesDecodeErrorZ CResult_ChannelTypeFeaturesDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_ChannelTypeFeaturesDecodeErrorZ_err(e: number): number { +export function CResult_ChannelTypeFeaturesDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9431,7 +9438,7 @@ export function CResult_ChannelTypeFeaturesDecodeErrorZ_err(e: number): number { } // bool CResult_ChannelTypeFeaturesDecodeErrorZ_is_ok(const struct LDKCResult_ChannelTypeFeaturesDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_ChannelTypeFeaturesDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_ChannelTypeFeaturesDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9440,16 +9447,16 @@ export function CResult_ChannelTypeFeaturesDecodeErrorZ_is_ok(o: number): boolea } // void CResult_ChannelTypeFeaturesDecodeErrorZ_free(struct LDKCResult_ChannelTypeFeaturesDecodeErrorZ _res); /* @internal */ -export function CResult_ChannelTypeFeaturesDecodeErrorZ_free(_res: number): void { +export function CResult_ChannelTypeFeaturesDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_ChannelTypeFeaturesDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_ChannelTypeFeaturesDecodeErrorZ_clone_ptr(LDKCResult_ChannelTypeFeaturesDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_ChannelTypeFeaturesDecodeErrorZ_clone_ptr(LDKCResult_ChannelTypeFeaturesDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_ChannelTypeFeaturesDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_ChannelTypeFeaturesDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9458,7 +9465,7 @@ export function CResult_ChannelTypeFeaturesDecodeErrorZ_clone_ptr(arg: number): } // struct LDKCResult_ChannelTypeFeaturesDecodeErrorZ CResult_ChannelTypeFeaturesDecodeErrorZ_clone(const struct LDKCResult_ChannelTypeFeaturesDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_ChannelTypeFeaturesDecodeErrorZ_clone(orig: number): number { +export function CResult_ChannelTypeFeaturesDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9467,7 +9474,7 @@ export function CResult_ChannelTypeFeaturesDecodeErrorZ_clone(orig: number): num } // struct LDKCResult_NodeIdDecodeErrorZ CResult_NodeIdDecodeErrorZ_ok(struct LDKNodeId o); /* @internal */ -export function CResult_NodeIdDecodeErrorZ_ok(o: number): number { +export function CResult_NodeIdDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9476,7 +9483,7 @@ export function CResult_NodeIdDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_NodeIdDecodeErrorZ CResult_NodeIdDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_NodeIdDecodeErrorZ_err(e: number): number { +export function CResult_NodeIdDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9485,7 +9492,7 @@ export function CResult_NodeIdDecodeErrorZ_err(e: number): number { } // bool CResult_NodeIdDecodeErrorZ_is_ok(const struct LDKCResult_NodeIdDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_NodeIdDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_NodeIdDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9494,16 +9501,16 @@ export function CResult_NodeIdDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_NodeIdDecodeErrorZ_free(struct LDKCResult_NodeIdDecodeErrorZ _res); /* @internal */ -export function CResult_NodeIdDecodeErrorZ_free(_res: number): void { +export function CResult_NodeIdDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_NodeIdDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_NodeIdDecodeErrorZ_clone_ptr(LDKCResult_NodeIdDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_NodeIdDecodeErrorZ_clone_ptr(LDKCResult_NodeIdDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_NodeIdDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_NodeIdDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9512,7 +9519,7 @@ export function CResult_NodeIdDecodeErrorZ_clone_ptr(arg: number): number { } // struct LDKCResult_NodeIdDecodeErrorZ CResult_NodeIdDecodeErrorZ_clone(const struct LDKCResult_NodeIdDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_NodeIdDecodeErrorZ_clone(orig: number): number { +export function CResult_NodeIdDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9521,7 +9528,7 @@ export function CResult_NodeIdDecodeErrorZ_clone(orig: number): number { } // struct LDKCResult_COption_NetworkUpdateZDecodeErrorZ CResult_COption_NetworkUpdateZDecodeErrorZ_ok(struct LDKCOption_NetworkUpdateZ o); /* @internal */ -export function CResult_COption_NetworkUpdateZDecodeErrorZ_ok(o: number): number { +export function CResult_COption_NetworkUpdateZDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9530,7 +9537,7 @@ export function CResult_COption_NetworkUpdateZDecodeErrorZ_ok(o: number): number } // struct LDKCResult_COption_NetworkUpdateZDecodeErrorZ CResult_COption_NetworkUpdateZDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_COption_NetworkUpdateZDecodeErrorZ_err(e: number): number { +export function CResult_COption_NetworkUpdateZDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9539,7 +9546,7 @@ export function CResult_COption_NetworkUpdateZDecodeErrorZ_err(e: number): numbe } // bool CResult_COption_NetworkUpdateZDecodeErrorZ_is_ok(const struct LDKCResult_COption_NetworkUpdateZDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_COption_NetworkUpdateZDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_COption_NetworkUpdateZDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9548,16 +9555,16 @@ export function CResult_COption_NetworkUpdateZDecodeErrorZ_is_ok(o: number): boo } // void CResult_COption_NetworkUpdateZDecodeErrorZ_free(struct LDKCResult_COption_NetworkUpdateZDecodeErrorZ _res); /* @internal */ -export function CResult_COption_NetworkUpdateZDecodeErrorZ_free(_res: number): void { +export function CResult_COption_NetworkUpdateZDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_COption_NetworkUpdateZDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_COption_NetworkUpdateZDecodeErrorZ_clone_ptr(LDKCResult_COption_NetworkUpdateZDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_COption_NetworkUpdateZDecodeErrorZ_clone_ptr(LDKCResult_COption_NetworkUpdateZDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_COption_NetworkUpdateZDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_COption_NetworkUpdateZDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9566,7 +9573,7 @@ export function CResult_COption_NetworkUpdateZDecodeErrorZ_clone_ptr(arg: number } // struct LDKCResult_COption_NetworkUpdateZDecodeErrorZ CResult_COption_NetworkUpdateZDecodeErrorZ_clone(const struct LDKCResult_COption_NetworkUpdateZDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_COption_NetworkUpdateZDecodeErrorZ_clone(orig: number): number { +export function CResult_COption_NetworkUpdateZDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9575,7 +9582,7 @@ export function CResult_COption_NetworkUpdateZDecodeErrorZ_clone(orig: number): } // struct LDKCOption_AccessZ COption_AccessZ_some(struct LDKAccess o); /* @internal */ -export function COption_AccessZ_some(o: number): number { +export function COption_AccessZ_some(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9584,7 +9591,7 @@ export function COption_AccessZ_some(o: number): number { } // struct LDKCOption_AccessZ COption_AccessZ_none(void); /* @internal */ -export function COption_AccessZ_none(): number { +export function COption_AccessZ_none(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9593,7 +9600,7 @@ export function COption_AccessZ_none(): number { } // void COption_AccessZ_free(struct LDKCOption_AccessZ _res); /* @internal */ -export function COption_AccessZ_free(_res: number): void { +export function COption_AccessZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9602,7 +9609,7 @@ export function COption_AccessZ_free(_res: number): void { } // struct LDKCResult_boolLightningErrorZ CResult_boolLightningErrorZ_ok(bool o); /* @internal */ -export function CResult_boolLightningErrorZ_ok(o: boolean): number { +export function CResult_boolLightningErrorZ_ok(o: boolean): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9611,7 +9618,7 @@ export function CResult_boolLightningErrorZ_ok(o: boolean): number { } // struct LDKCResult_boolLightningErrorZ CResult_boolLightningErrorZ_err(struct LDKLightningError e); /* @internal */ -export function CResult_boolLightningErrorZ_err(e: number): number { +export function CResult_boolLightningErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9620,7 +9627,7 @@ export function CResult_boolLightningErrorZ_err(e: number): number { } // bool CResult_boolLightningErrorZ_is_ok(const struct LDKCResult_boolLightningErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_boolLightningErrorZ_is_ok(o: number): boolean { +export function CResult_boolLightningErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9629,16 +9636,16 @@ export function CResult_boolLightningErrorZ_is_ok(o: number): boolean { } // void CResult_boolLightningErrorZ_free(struct LDKCResult_boolLightningErrorZ _res); /* @internal */ -export function CResult_boolLightningErrorZ_free(_res: number): void { +export function CResult_boolLightningErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_boolLightningErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_boolLightningErrorZ_clone_ptr(LDKCResult_boolLightningErrorZ *NONNULL_PTR arg); + // uint64_t CResult_boolLightningErrorZ_clone_ptr(LDKCResult_boolLightningErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_boolLightningErrorZ_clone_ptr(arg: number): number { +export function CResult_boolLightningErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9647,16 +9654,16 @@ export function CResult_boolLightningErrorZ_clone_ptr(arg: number): number { } // struct LDKCResult_boolLightningErrorZ CResult_boolLightningErrorZ_clone(const struct LDKCResult_boolLightningErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_boolLightningErrorZ_clone(orig: number): number { +export function CResult_boolLightningErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_boolLightningErrorZ_clone(orig); return nativeResponseValue; } - // uintptr_t C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone_ptr(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ *NONNULL_PTR arg); + // uint64_t C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone_ptr(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ *NONNULL_PTR arg); /* @internal */ -export function C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone_ptr(arg: number): number { +export function C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9665,7 +9672,7 @@ export function C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone_ptr } // struct LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone(const struct LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ *NONNULL_PTR orig); /* @internal */ -export function C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone(orig: number): number { +export function C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9674,7 +9681,7 @@ export function C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone(ori } // struct LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_new(struct LDKChannelAnnouncement a, struct LDKChannelUpdate b, struct LDKChannelUpdate c); /* @internal */ -export function C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_new(a: number, b: number, c: number): number { +export function C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_new(a: bigint, b: bigint, c: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9683,7 +9690,7 @@ export function C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_new(a: nu } // void C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_free(struct LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ _res); /* @internal */ -export function C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_free(_res: number): void { +export function C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9710,7 +9717,7 @@ export function CVec_NodeAnnouncementZ_free(_res: number): void { } // struct LDKCResult_NoneLightningErrorZ CResult_NoneLightningErrorZ_ok(void); /* @internal */ -export function CResult_NoneLightningErrorZ_ok(): number { +export function CResult_NoneLightningErrorZ_ok(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9719,7 +9726,7 @@ export function CResult_NoneLightningErrorZ_ok(): number { } // struct LDKCResult_NoneLightningErrorZ CResult_NoneLightningErrorZ_err(struct LDKLightningError e); /* @internal */ -export function CResult_NoneLightningErrorZ_err(e: number): number { +export function CResult_NoneLightningErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9728,7 +9735,7 @@ export function CResult_NoneLightningErrorZ_err(e: number): number { } // bool CResult_NoneLightningErrorZ_is_ok(const struct LDKCResult_NoneLightningErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_NoneLightningErrorZ_is_ok(o: number): boolean { +export function CResult_NoneLightningErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9737,16 +9744,16 @@ export function CResult_NoneLightningErrorZ_is_ok(o: number): boolean { } // void CResult_NoneLightningErrorZ_free(struct LDKCResult_NoneLightningErrorZ _res); /* @internal */ -export function CResult_NoneLightningErrorZ_free(_res: number): void { +export function CResult_NoneLightningErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_NoneLightningErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_NoneLightningErrorZ_clone_ptr(LDKCResult_NoneLightningErrorZ *NONNULL_PTR arg); + // uint64_t CResult_NoneLightningErrorZ_clone_ptr(LDKCResult_NoneLightningErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_NoneLightningErrorZ_clone_ptr(arg: number): number { +export function CResult_NoneLightningErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9755,7 +9762,7 @@ export function CResult_NoneLightningErrorZ_clone_ptr(arg: number): number { } // struct LDKCResult_NoneLightningErrorZ CResult_NoneLightningErrorZ_clone(const struct LDKCResult_NoneLightningErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_NoneLightningErrorZ_clone(orig: number): number { +export function CResult_NoneLightningErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9764,7 +9771,7 @@ export function CResult_NoneLightningErrorZ_clone(orig: number): number { } // struct LDKCResult_ChannelUpdateInfoDecodeErrorZ CResult_ChannelUpdateInfoDecodeErrorZ_ok(struct LDKChannelUpdateInfo o); /* @internal */ -export function CResult_ChannelUpdateInfoDecodeErrorZ_ok(o: number): number { +export function CResult_ChannelUpdateInfoDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9773,7 +9780,7 @@ export function CResult_ChannelUpdateInfoDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_ChannelUpdateInfoDecodeErrorZ CResult_ChannelUpdateInfoDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_ChannelUpdateInfoDecodeErrorZ_err(e: number): number { +export function CResult_ChannelUpdateInfoDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9782,7 +9789,7 @@ export function CResult_ChannelUpdateInfoDecodeErrorZ_err(e: number): number { } // bool CResult_ChannelUpdateInfoDecodeErrorZ_is_ok(const struct LDKCResult_ChannelUpdateInfoDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_ChannelUpdateInfoDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_ChannelUpdateInfoDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9791,16 +9798,16 @@ export function CResult_ChannelUpdateInfoDecodeErrorZ_is_ok(o: number): boolean } // void CResult_ChannelUpdateInfoDecodeErrorZ_free(struct LDKCResult_ChannelUpdateInfoDecodeErrorZ _res); /* @internal */ -export function CResult_ChannelUpdateInfoDecodeErrorZ_free(_res: number): void { +export function CResult_ChannelUpdateInfoDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_ChannelUpdateInfoDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_ChannelUpdateInfoDecodeErrorZ_clone_ptr(LDKCResult_ChannelUpdateInfoDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_ChannelUpdateInfoDecodeErrorZ_clone_ptr(LDKCResult_ChannelUpdateInfoDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_ChannelUpdateInfoDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_ChannelUpdateInfoDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9809,7 +9816,7 @@ export function CResult_ChannelUpdateInfoDecodeErrorZ_clone_ptr(arg: number): nu } // struct LDKCResult_ChannelUpdateInfoDecodeErrorZ CResult_ChannelUpdateInfoDecodeErrorZ_clone(const struct LDKCResult_ChannelUpdateInfoDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_ChannelUpdateInfoDecodeErrorZ_clone(orig: number): number { +export function CResult_ChannelUpdateInfoDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9818,7 +9825,7 @@ export function CResult_ChannelUpdateInfoDecodeErrorZ_clone(orig: number): numbe } // struct LDKCResult_ChannelInfoDecodeErrorZ CResult_ChannelInfoDecodeErrorZ_ok(struct LDKChannelInfo o); /* @internal */ -export function CResult_ChannelInfoDecodeErrorZ_ok(o: number): number { +export function CResult_ChannelInfoDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9827,7 +9834,7 @@ export function CResult_ChannelInfoDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_ChannelInfoDecodeErrorZ CResult_ChannelInfoDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_ChannelInfoDecodeErrorZ_err(e: number): number { +export function CResult_ChannelInfoDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9836,7 +9843,7 @@ export function CResult_ChannelInfoDecodeErrorZ_err(e: number): number { } // bool CResult_ChannelInfoDecodeErrorZ_is_ok(const struct LDKCResult_ChannelInfoDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_ChannelInfoDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_ChannelInfoDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9845,16 +9852,16 @@ export function CResult_ChannelInfoDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_ChannelInfoDecodeErrorZ_free(struct LDKCResult_ChannelInfoDecodeErrorZ _res); /* @internal */ -export function CResult_ChannelInfoDecodeErrorZ_free(_res: number): void { +export function CResult_ChannelInfoDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_ChannelInfoDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_ChannelInfoDecodeErrorZ_clone_ptr(LDKCResult_ChannelInfoDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_ChannelInfoDecodeErrorZ_clone_ptr(LDKCResult_ChannelInfoDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_ChannelInfoDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_ChannelInfoDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9863,7 +9870,7 @@ export function CResult_ChannelInfoDecodeErrorZ_clone_ptr(arg: number): number { } // struct LDKCResult_ChannelInfoDecodeErrorZ CResult_ChannelInfoDecodeErrorZ_clone(const struct LDKCResult_ChannelInfoDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_ChannelInfoDecodeErrorZ_clone(orig: number): number { +export function CResult_ChannelInfoDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9872,7 +9879,7 @@ export function CResult_ChannelInfoDecodeErrorZ_clone(orig: number): number { } // struct LDKCResult_RoutingFeesDecodeErrorZ CResult_RoutingFeesDecodeErrorZ_ok(struct LDKRoutingFees o); /* @internal */ -export function CResult_RoutingFeesDecodeErrorZ_ok(o: number): number { +export function CResult_RoutingFeesDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9881,7 +9888,7 @@ export function CResult_RoutingFeesDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_RoutingFeesDecodeErrorZ CResult_RoutingFeesDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_RoutingFeesDecodeErrorZ_err(e: number): number { +export function CResult_RoutingFeesDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9890,7 +9897,7 @@ export function CResult_RoutingFeesDecodeErrorZ_err(e: number): number { } // bool CResult_RoutingFeesDecodeErrorZ_is_ok(const struct LDKCResult_RoutingFeesDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_RoutingFeesDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_RoutingFeesDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9899,16 +9906,16 @@ export function CResult_RoutingFeesDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_RoutingFeesDecodeErrorZ_free(struct LDKCResult_RoutingFeesDecodeErrorZ _res); /* @internal */ -export function CResult_RoutingFeesDecodeErrorZ_free(_res: number): void { +export function CResult_RoutingFeesDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_RoutingFeesDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_RoutingFeesDecodeErrorZ_clone_ptr(LDKCResult_RoutingFeesDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_RoutingFeesDecodeErrorZ_clone_ptr(LDKCResult_RoutingFeesDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_RoutingFeesDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_RoutingFeesDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9917,7 +9924,7 @@ export function CResult_RoutingFeesDecodeErrorZ_clone_ptr(arg: number): number { } // struct LDKCResult_RoutingFeesDecodeErrorZ CResult_RoutingFeesDecodeErrorZ_clone(const struct LDKCResult_RoutingFeesDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_RoutingFeesDecodeErrorZ_clone(orig: number): number { +export function CResult_RoutingFeesDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9935,7 +9942,7 @@ export function CVec_NetAddressZ_free(_res: number): void { } // struct LDKCResult_NodeAnnouncementInfoDecodeErrorZ CResult_NodeAnnouncementInfoDecodeErrorZ_ok(struct LDKNodeAnnouncementInfo o); /* @internal */ -export function CResult_NodeAnnouncementInfoDecodeErrorZ_ok(o: number): number { +export function CResult_NodeAnnouncementInfoDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9944,7 +9951,7 @@ export function CResult_NodeAnnouncementInfoDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_NodeAnnouncementInfoDecodeErrorZ CResult_NodeAnnouncementInfoDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_NodeAnnouncementInfoDecodeErrorZ_err(e: number): number { +export function CResult_NodeAnnouncementInfoDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9953,7 +9960,7 @@ export function CResult_NodeAnnouncementInfoDecodeErrorZ_err(e: number): number } // bool CResult_NodeAnnouncementInfoDecodeErrorZ_is_ok(const struct LDKCResult_NodeAnnouncementInfoDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_NodeAnnouncementInfoDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_NodeAnnouncementInfoDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9962,16 +9969,16 @@ export function CResult_NodeAnnouncementInfoDecodeErrorZ_is_ok(o: number): boole } // void CResult_NodeAnnouncementInfoDecodeErrorZ_free(struct LDKCResult_NodeAnnouncementInfoDecodeErrorZ _res); /* @internal */ -export function CResult_NodeAnnouncementInfoDecodeErrorZ_free(_res: number): void { +export function CResult_NodeAnnouncementInfoDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_NodeAnnouncementInfoDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_NodeAnnouncementInfoDecodeErrorZ_clone_ptr(LDKCResult_NodeAnnouncementInfoDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_NodeAnnouncementInfoDecodeErrorZ_clone_ptr(LDKCResult_NodeAnnouncementInfoDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_NodeAnnouncementInfoDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_NodeAnnouncementInfoDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9980,7 +9987,7 @@ export function CResult_NodeAnnouncementInfoDecodeErrorZ_clone_ptr(arg: number): } // struct LDKCResult_NodeAnnouncementInfoDecodeErrorZ CResult_NodeAnnouncementInfoDecodeErrorZ_clone(const struct LDKCResult_NodeAnnouncementInfoDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_NodeAnnouncementInfoDecodeErrorZ_clone(orig: number): number { +export function CResult_NodeAnnouncementInfoDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9989,7 +9996,7 @@ export function CResult_NodeAnnouncementInfoDecodeErrorZ_clone(orig: number): nu } // struct LDKCResult_NodeAliasDecodeErrorZ CResult_NodeAliasDecodeErrorZ_ok(struct LDKNodeAlias o); /* @internal */ -export function CResult_NodeAliasDecodeErrorZ_ok(o: number): number { +export function CResult_NodeAliasDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -9998,7 +10005,7 @@ export function CResult_NodeAliasDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_NodeAliasDecodeErrorZ CResult_NodeAliasDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_NodeAliasDecodeErrorZ_err(e: number): number { +export function CResult_NodeAliasDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10007,7 +10014,7 @@ export function CResult_NodeAliasDecodeErrorZ_err(e: number): number { } // bool CResult_NodeAliasDecodeErrorZ_is_ok(const struct LDKCResult_NodeAliasDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_NodeAliasDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_NodeAliasDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10016,16 +10023,16 @@ export function CResult_NodeAliasDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_NodeAliasDecodeErrorZ_free(struct LDKCResult_NodeAliasDecodeErrorZ _res); /* @internal */ -export function CResult_NodeAliasDecodeErrorZ_free(_res: number): void { +export function CResult_NodeAliasDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_NodeAliasDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_NodeAliasDecodeErrorZ_clone_ptr(LDKCResult_NodeAliasDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_NodeAliasDecodeErrorZ_clone_ptr(LDKCResult_NodeAliasDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_NodeAliasDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_NodeAliasDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10034,7 +10041,7 @@ export function CResult_NodeAliasDecodeErrorZ_clone_ptr(arg: number): number { } // struct LDKCResult_NodeAliasDecodeErrorZ CResult_NodeAliasDecodeErrorZ_clone(const struct LDKCResult_NodeAliasDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_NodeAliasDecodeErrorZ_clone(orig: number): number { +export function CResult_NodeAliasDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10043,7 +10050,7 @@ export function CResult_NodeAliasDecodeErrorZ_clone(orig: number): number { } // struct LDKCResult_NodeInfoDecodeErrorZ CResult_NodeInfoDecodeErrorZ_ok(struct LDKNodeInfo o); /* @internal */ -export function CResult_NodeInfoDecodeErrorZ_ok(o: number): number { +export function CResult_NodeInfoDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10052,7 +10059,7 @@ export function CResult_NodeInfoDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_NodeInfoDecodeErrorZ CResult_NodeInfoDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_NodeInfoDecodeErrorZ_err(e: number): number { +export function CResult_NodeInfoDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10061,7 +10068,7 @@ export function CResult_NodeInfoDecodeErrorZ_err(e: number): number { } // bool CResult_NodeInfoDecodeErrorZ_is_ok(const struct LDKCResult_NodeInfoDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_NodeInfoDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_NodeInfoDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10070,16 +10077,16 @@ export function CResult_NodeInfoDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_NodeInfoDecodeErrorZ_free(struct LDKCResult_NodeInfoDecodeErrorZ _res); /* @internal */ -export function CResult_NodeInfoDecodeErrorZ_free(_res: number): void { +export function CResult_NodeInfoDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_NodeInfoDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_NodeInfoDecodeErrorZ_clone_ptr(LDKCResult_NodeInfoDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_NodeInfoDecodeErrorZ_clone_ptr(LDKCResult_NodeInfoDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_NodeInfoDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_NodeInfoDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10088,7 +10095,7 @@ export function CResult_NodeInfoDecodeErrorZ_clone_ptr(arg: number): number { } // struct LDKCResult_NodeInfoDecodeErrorZ CResult_NodeInfoDecodeErrorZ_clone(const struct LDKCResult_NodeInfoDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_NodeInfoDecodeErrorZ_clone(orig: number): number { +export function CResult_NodeInfoDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10097,7 +10104,7 @@ export function CResult_NodeInfoDecodeErrorZ_clone(orig: number): number { } // struct LDKCResult_NetworkGraphDecodeErrorZ CResult_NetworkGraphDecodeErrorZ_ok(struct LDKNetworkGraph o); /* @internal */ -export function CResult_NetworkGraphDecodeErrorZ_ok(o: number): number { +export function CResult_NetworkGraphDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10106,7 +10113,7 @@ export function CResult_NetworkGraphDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_NetworkGraphDecodeErrorZ CResult_NetworkGraphDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_NetworkGraphDecodeErrorZ_err(e: number): number { +export function CResult_NetworkGraphDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10115,7 +10122,7 @@ export function CResult_NetworkGraphDecodeErrorZ_err(e: number): number { } // bool CResult_NetworkGraphDecodeErrorZ_is_ok(const struct LDKCResult_NetworkGraphDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_NetworkGraphDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_NetworkGraphDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10124,7 +10131,7 @@ export function CResult_NetworkGraphDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_NetworkGraphDecodeErrorZ_free(struct LDKCResult_NetworkGraphDecodeErrorZ _res); /* @internal */ -export function CResult_NetworkGraphDecodeErrorZ_free(_res: number): void { +export function CResult_NetworkGraphDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10133,7 +10140,7 @@ export function CResult_NetworkGraphDecodeErrorZ_free(_res: number): void { } // struct LDKCOption_CVec_NetAddressZZ COption_CVec_NetAddressZZ_some(struct LDKCVec_NetAddressZ o); /* @internal */ -export function COption_CVec_NetAddressZZ_some(o: number): number { +export function COption_CVec_NetAddressZZ_some(o: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10142,7 +10149,7 @@ export function COption_CVec_NetAddressZZ_some(o: number): number { } // struct LDKCOption_CVec_NetAddressZZ COption_CVec_NetAddressZZ_none(void); /* @internal */ -export function COption_CVec_NetAddressZZ_none(): number { +export function COption_CVec_NetAddressZZ_none(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10151,16 +10158,16 @@ export function COption_CVec_NetAddressZZ_none(): number { } // void COption_CVec_NetAddressZZ_free(struct LDKCOption_CVec_NetAddressZZ _res); /* @internal */ -export function COption_CVec_NetAddressZZ_free(_res: number): void { +export function COption_CVec_NetAddressZZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_COption_CVec_NetAddressZZ_free(_res); // debug statements here } - // uintptr_t COption_CVec_NetAddressZZ_clone_ptr(LDKCOption_CVec_NetAddressZZ *NONNULL_PTR arg); + // uint64_t COption_CVec_NetAddressZZ_clone_ptr(LDKCOption_CVec_NetAddressZZ *NONNULL_PTR arg); /* @internal */ -export function COption_CVec_NetAddressZZ_clone_ptr(arg: number): number { +export function COption_CVec_NetAddressZZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10169,7 +10176,7 @@ export function COption_CVec_NetAddressZZ_clone_ptr(arg: number): number { } // struct LDKCOption_CVec_NetAddressZZ COption_CVec_NetAddressZZ_clone(const struct LDKCOption_CVec_NetAddressZZ *NONNULL_PTR orig); /* @internal */ -export function COption_CVec_NetAddressZZ_clone(orig: number): number { +export function COption_CVec_NetAddressZZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10178,7 +10185,7 @@ export function COption_CVec_NetAddressZZ_clone(orig: number): number { } // struct LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_ok(struct LDKDelayedPaymentOutputDescriptor o); /* @internal */ -export function CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_ok(o: number): number { +export function CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10187,7 +10194,7 @@ export function CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_ok(o: number) } // struct LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_err(e: number): number { +export function CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10196,7 +10203,7 @@ export function CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_err(e: number } // bool CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_is_ok(const struct LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10205,16 +10212,16 @@ export function CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_is_ok(o: numb } // void CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_free(struct LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ _res); /* @internal */ -export function CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_free(_res: number): void { +export function CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone_ptr(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone_ptr(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10223,7 +10230,7 @@ export function CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone_ptr(arg } // struct LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone(const struct LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone(orig: number): number { +export function CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10232,7 +10239,7 @@ export function CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone(orig: n } // struct LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ CResult_StaticPaymentOutputDescriptorDecodeErrorZ_ok(struct LDKStaticPaymentOutputDescriptor o); /* @internal */ -export function CResult_StaticPaymentOutputDescriptorDecodeErrorZ_ok(o: number): number { +export function CResult_StaticPaymentOutputDescriptorDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10241,7 +10248,7 @@ export function CResult_StaticPaymentOutputDescriptorDecodeErrorZ_ok(o: number): } // struct LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ CResult_StaticPaymentOutputDescriptorDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_StaticPaymentOutputDescriptorDecodeErrorZ_err(e: number): number { +export function CResult_StaticPaymentOutputDescriptorDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10250,7 +10257,7 @@ export function CResult_StaticPaymentOutputDescriptorDecodeErrorZ_err(e: number) } // bool CResult_StaticPaymentOutputDescriptorDecodeErrorZ_is_ok(const struct LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_StaticPaymentOutputDescriptorDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_StaticPaymentOutputDescriptorDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10259,16 +10266,16 @@ export function CResult_StaticPaymentOutputDescriptorDecodeErrorZ_is_ok(o: numbe } // void CResult_StaticPaymentOutputDescriptorDecodeErrorZ_free(struct LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ _res); /* @internal */ -export function CResult_StaticPaymentOutputDescriptorDecodeErrorZ_free(_res: number): void { +export function CResult_StaticPaymentOutputDescriptorDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone_ptr(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone_ptr(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10277,7 +10284,7 @@ export function CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone_ptr(arg: } // struct LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone(const struct LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone(orig: number): number { +export function CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10286,7 +10293,7 @@ export function CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone(orig: nu } // struct LDKCResult_SpendableOutputDescriptorDecodeErrorZ CResult_SpendableOutputDescriptorDecodeErrorZ_ok(struct LDKSpendableOutputDescriptor o); /* @internal */ -export function CResult_SpendableOutputDescriptorDecodeErrorZ_ok(o: number): number { +export function CResult_SpendableOutputDescriptorDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10295,7 +10302,7 @@ export function CResult_SpendableOutputDescriptorDecodeErrorZ_ok(o: number): num } // struct LDKCResult_SpendableOutputDescriptorDecodeErrorZ CResult_SpendableOutputDescriptorDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_SpendableOutputDescriptorDecodeErrorZ_err(e: number): number { +export function CResult_SpendableOutputDescriptorDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10304,7 +10311,7 @@ export function CResult_SpendableOutputDescriptorDecodeErrorZ_err(e: number): nu } // bool CResult_SpendableOutputDescriptorDecodeErrorZ_is_ok(const struct LDKCResult_SpendableOutputDescriptorDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_SpendableOutputDescriptorDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_SpendableOutputDescriptorDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10313,16 +10320,16 @@ export function CResult_SpendableOutputDescriptorDecodeErrorZ_is_ok(o: number): } // void CResult_SpendableOutputDescriptorDecodeErrorZ_free(struct LDKCResult_SpendableOutputDescriptorDecodeErrorZ _res); /* @internal */ -export function CResult_SpendableOutputDescriptorDecodeErrorZ_free(_res: number): void { +export function CResult_SpendableOutputDescriptorDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_SpendableOutputDescriptorDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_SpendableOutputDescriptorDecodeErrorZ_clone_ptr(LDKCResult_SpendableOutputDescriptorDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_SpendableOutputDescriptorDecodeErrorZ_clone_ptr(LDKCResult_SpendableOutputDescriptorDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_SpendableOutputDescriptorDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_SpendableOutputDescriptorDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10331,7 +10338,7 @@ export function CResult_SpendableOutputDescriptorDecodeErrorZ_clone_ptr(arg: num } // struct LDKCResult_SpendableOutputDescriptorDecodeErrorZ CResult_SpendableOutputDescriptorDecodeErrorZ_clone(const struct LDKCResult_SpendableOutputDescriptorDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_SpendableOutputDescriptorDecodeErrorZ_clone(orig: number): number { +export function CResult_SpendableOutputDescriptorDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10347,9 +10354,9 @@ export function CVec_PaymentPreimageZ_free(_res: number): void { const nativeResponseValue = wasm.TS_CVec_PaymentPreimageZ_free(_res); // debug statements here } - // uintptr_t C2Tuple_SignatureCVec_SignatureZZ_clone_ptr(LDKC2Tuple_SignatureCVec_SignatureZZ *NONNULL_PTR arg); + // uint64_t C2Tuple_SignatureCVec_SignatureZZ_clone_ptr(LDKC2Tuple_SignatureCVec_SignatureZZ *NONNULL_PTR arg); /* @internal */ -export function C2Tuple_SignatureCVec_SignatureZZ_clone_ptr(arg: number): number { +export function C2Tuple_SignatureCVec_SignatureZZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10358,7 +10365,7 @@ export function C2Tuple_SignatureCVec_SignatureZZ_clone_ptr(arg: number): number } // struct LDKC2Tuple_SignatureCVec_SignatureZZ C2Tuple_SignatureCVec_SignatureZZ_clone(const struct LDKC2Tuple_SignatureCVec_SignatureZZ *NONNULL_PTR orig); /* @internal */ -export function C2Tuple_SignatureCVec_SignatureZZ_clone(orig: number): number { +export function C2Tuple_SignatureCVec_SignatureZZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10367,7 +10374,7 @@ export function C2Tuple_SignatureCVec_SignatureZZ_clone(orig: number): number { } // struct LDKC2Tuple_SignatureCVec_SignatureZZ C2Tuple_SignatureCVec_SignatureZZ_new(struct LDKSignature a, struct LDKCVec_SignatureZ b); /* @internal */ -export function C2Tuple_SignatureCVec_SignatureZZ_new(a: number, b: number): number { +export function C2Tuple_SignatureCVec_SignatureZZ_new(a: number, b: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10376,7 +10383,7 @@ export function C2Tuple_SignatureCVec_SignatureZZ_new(a: number, b: number): num } // void C2Tuple_SignatureCVec_SignatureZZ_free(struct LDKC2Tuple_SignatureCVec_SignatureZZ _res); /* @internal */ -export function C2Tuple_SignatureCVec_SignatureZZ_free(_res: number): void { +export function C2Tuple_SignatureCVec_SignatureZZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10385,7 +10392,7 @@ export function C2Tuple_SignatureCVec_SignatureZZ_free(_res: number): void { } // struct LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_ok(struct LDKC2Tuple_SignatureCVec_SignatureZZ o); /* @internal */ -export function CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_ok(o: number): number { +export function CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10394,7 +10401,7 @@ export function CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_ok(o: number): nu } // struct LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_err(void); /* @internal */ -export function CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_err(): number { +export function CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_err(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10403,7 +10410,7 @@ export function CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_err(): number { } // bool CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_is_ok(const struct LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ *NONNULL_PTR o); /* @internal */ -export function CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_is_ok(o: number): boolean { +export function CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10412,16 +10419,16 @@ export function CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_is_ok(o: number): } // void CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_free(struct LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ _res); /* @internal */ -export function CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_free(_res: number): void { +export function CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_free(_res); // debug statements here } - // uintptr_t CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone_ptr(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ *NONNULL_PTR arg); + // uint64_t CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone_ptr(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ *NONNULL_PTR arg); /* @internal */ -export function CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone_ptr(arg: number): number { +export function CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10430,7 +10437,7 @@ export function CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone_ptr(arg: nu } // struct LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone(const struct LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ *NONNULL_PTR orig); /* @internal */ -export function CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone(orig: number): number { +export function CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10439,7 +10446,7 @@ export function CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone(orig: numbe } // struct LDKCResult_SignatureNoneZ CResult_SignatureNoneZ_ok(struct LDKSignature o); /* @internal */ -export function CResult_SignatureNoneZ_ok(o: number): number { +export function CResult_SignatureNoneZ_ok(o: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10448,7 +10455,7 @@ export function CResult_SignatureNoneZ_ok(o: number): number { } // struct LDKCResult_SignatureNoneZ CResult_SignatureNoneZ_err(void); /* @internal */ -export function CResult_SignatureNoneZ_err(): number { +export function CResult_SignatureNoneZ_err(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10457,7 +10464,7 @@ export function CResult_SignatureNoneZ_err(): number { } // bool CResult_SignatureNoneZ_is_ok(const struct LDKCResult_SignatureNoneZ *NONNULL_PTR o); /* @internal */ -export function CResult_SignatureNoneZ_is_ok(o: number): boolean { +export function CResult_SignatureNoneZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10466,16 +10473,16 @@ export function CResult_SignatureNoneZ_is_ok(o: number): boolean { } // void CResult_SignatureNoneZ_free(struct LDKCResult_SignatureNoneZ _res); /* @internal */ -export function CResult_SignatureNoneZ_free(_res: number): void { +export function CResult_SignatureNoneZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_SignatureNoneZ_free(_res); // debug statements here } - // uintptr_t CResult_SignatureNoneZ_clone_ptr(LDKCResult_SignatureNoneZ *NONNULL_PTR arg); + // uint64_t CResult_SignatureNoneZ_clone_ptr(LDKCResult_SignatureNoneZ *NONNULL_PTR arg); /* @internal */ -export function CResult_SignatureNoneZ_clone_ptr(arg: number): number { +export function CResult_SignatureNoneZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10484,16 +10491,16 @@ export function CResult_SignatureNoneZ_clone_ptr(arg: number): number { } // struct LDKCResult_SignatureNoneZ CResult_SignatureNoneZ_clone(const struct LDKCResult_SignatureNoneZ *NONNULL_PTR orig); /* @internal */ -export function CResult_SignatureNoneZ_clone(orig: number): number { +export function CResult_SignatureNoneZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_SignatureNoneZ_clone(orig); return nativeResponseValue; } - // uintptr_t C2Tuple_SignatureSignatureZ_clone_ptr(LDKC2Tuple_SignatureSignatureZ *NONNULL_PTR arg); + // uint64_t C2Tuple_SignatureSignatureZ_clone_ptr(LDKC2Tuple_SignatureSignatureZ *NONNULL_PTR arg); /* @internal */ -export function C2Tuple_SignatureSignatureZ_clone_ptr(arg: number): number { +export function C2Tuple_SignatureSignatureZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10502,7 +10509,7 @@ export function C2Tuple_SignatureSignatureZ_clone_ptr(arg: number): number { } // struct LDKC2Tuple_SignatureSignatureZ C2Tuple_SignatureSignatureZ_clone(const struct LDKC2Tuple_SignatureSignatureZ *NONNULL_PTR orig); /* @internal */ -export function C2Tuple_SignatureSignatureZ_clone(orig: number): number { +export function C2Tuple_SignatureSignatureZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10511,7 +10518,7 @@ export function C2Tuple_SignatureSignatureZ_clone(orig: number): number { } // struct LDKC2Tuple_SignatureSignatureZ C2Tuple_SignatureSignatureZ_new(struct LDKSignature a, struct LDKSignature b); /* @internal */ -export function C2Tuple_SignatureSignatureZ_new(a: number, b: number): number { +export function C2Tuple_SignatureSignatureZ_new(a: number, b: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10520,7 +10527,7 @@ export function C2Tuple_SignatureSignatureZ_new(a: number, b: number): number { } // void C2Tuple_SignatureSignatureZ_free(struct LDKC2Tuple_SignatureSignatureZ _res); /* @internal */ -export function C2Tuple_SignatureSignatureZ_free(_res: number): void { +export function C2Tuple_SignatureSignatureZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10529,7 +10536,7 @@ export function C2Tuple_SignatureSignatureZ_free(_res: number): void { } // struct LDKCResult_C2Tuple_SignatureSignatureZNoneZ CResult_C2Tuple_SignatureSignatureZNoneZ_ok(struct LDKC2Tuple_SignatureSignatureZ o); /* @internal */ -export function CResult_C2Tuple_SignatureSignatureZNoneZ_ok(o: number): number { +export function CResult_C2Tuple_SignatureSignatureZNoneZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10538,7 +10545,7 @@ export function CResult_C2Tuple_SignatureSignatureZNoneZ_ok(o: number): number { } // struct LDKCResult_C2Tuple_SignatureSignatureZNoneZ CResult_C2Tuple_SignatureSignatureZNoneZ_err(void); /* @internal */ -export function CResult_C2Tuple_SignatureSignatureZNoneZ_err(): number { +export function CResult_C2Tuple_SignatureSignatureZNoneZ_err(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10547,7 +10554,7 @@ export function CResult_C2Tuple_SignatureSignatureZNoneZ_err(): number { } // bool CResult_C2Tuple_SignatureSignatureZNoneZ_is_ok(const struct LDKCResult_C2Tuple_SignatureSignatureZNoneZ *NONNULL_PTR o); /* @internal */ -export function CResult_C2Tuple_SignatureSignatureZNoneZ_is_ok(o: number): boolean { +export function CResult_C2Tuple_SignatureSignatureZNoneZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10556,16 +10563,16 @@ export function CResult_C2Tuple_SignatureSignatureZNoneZ_is_ok(o: number): boole } // void CResult_C2Tuple_SignatureSignatureZNoneZ_free(struct LDKCResult_C2Tuple_SignatureSignatureZNoneZ _res); /* @internal */ -export function CResult_C2Tuple_SignatureSignatureZNoneZ_free(_res: number): void { +export function CResult_C2Tuple_SignatureSignatureZNoneZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_C2Tuple_SignatureSignatureZNoneZ_free(_res); // debug statements here } - // uintptr_t CResult_C2Tuple_SignatureSignatureZNoneZ_clone_ptr(LDKCResult_C2Tuple_SignatureSignatureZNoneZ *NONNULL_PTR arg); + // uint64_t CResult_C2Tuple_SignatureSignatureZNoneZ_clone_ptr(LDKCResult_C2Tuple_SignatureSignatureZNoneZ *NONNULL_PTR arg); /* @internal */ -export function CResult_C2Tuple_SignatureSignatureZNoneZ_clone_ptr(arg: number): number { +export function CResult_C2Tuple_SignatureSignatureZNoneZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10574,7 +10581,7 @@ export function CResult_C2Tuple_SignatureSignatureZNoneZ_clone_ptr(arg: number): } // struct LDKCResult_C2Tuple_SignatureSignatureZNoneZ CResult_C2Tuple_SignatureSignatureZNoneZ_clone(const struct LDKCResult_C2Tuple_SignatureSignatureZNoneZ *NONNULL_PTR orig); /* @internal */ -export function CResult_C2Tuple_SignatureSignatureZNoneZ_clone(orig: number): number { +export function CResult_C2Tuple_SignatureSignatureZNoneZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10583,7 +10590,7 @@ export function CResult_C2Tuple_SignatureSignatureZNoneZ_clone(orig: number): nu } // struct LDKCResult_SecretKeyNoneZ CResult_SecretKeyNoneZ_ok(struct LDKSecretKey o); /* @internal */ -export function CResult_SecretKeyNoneZ_ok(o: number): number { +export function CResult_SecretKeyNoneZ_ok(o: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10592,7 +10599,7 @@ export function CResult_SecretKeyNoneZ_ok(o: number): number { } // struct LDKCResult_SecretKeyNoneZ CResult_SecretKeyNoneZ_err(void); /* @internal */ -export function CResult_SecretKeyNoneZ_err(): number { +export function CResult_SecretKeyNoneZ_err(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10601,7 +10608,7 @@ export function CResult_SecretKeyNoneZ_err(): number { } // bool CResult_SecretKeyNoneZ_is_ok(const struct LDKCResult_SecretKeyNoneZ *NONNULL_PTR o); /* @internal */ -export function CResult_SecretKeyNoneZ_is_ok(o: number): boolean { +export function CResult_SecretKeyNoneZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10610,16 +10617,16 @@ export function CResult_SecretKeyNoneZ_is_ok(o: number): boolean { } // void CResult_SecretKeyNoneZ_free(struct LDKCResult_SecretKeyNoneZ _res); /* @internal */ -export function CResult_SecretKeyNoneZ_free(_res: number): void { +export function CResult_SecretKeyNoneZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_SecretKeyNoneZ_free(_res); // debug statements here } - // uintptr_t CResult_SecretKeyNoneZ_clone_ptr(LDKCResult_SecretKeyNoneZ *NONNULL_PTR arg); + // uint64_t CResult_SecretKeyNoneZ_clone_ptr(LDKCResult_SecretKeyNoneZ *NONNULL_PTR arg); /* @internal */ -export function CResult_SecretKeyNoneZ_clone_ptr(arg: number): number { +export function CResult_SecretKeyNoneZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10628,7 +10635,7 @@ export function CResult_SecretKeyNoneZ_clone_ptr(arg: number): number { } // struct LDKCResult_SecretKeyNoneZ CResult_SecretKeyNoneZ_clone(const struct LDKCResult_SecretKeyNoneZ *NONNULL_PTR orig); /* @internal */ -export function CResult_SecretKeyNoneZ_clone(orig: number): number { +export function CResult_SecretKeyNoneZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10637,7 +10644,7 @@ export function CResult_SecretKeyNoneZ_clone(orig: number): number { } // struct LDKCResult_SignDecodeErrorZ CResult_SignDecodeErrorZ_ok(struct LDKSign o); /* @internal */ -export function CResult_SignDecodeErrorZ_ok(o: number): number { +export function CResult_SignDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10646,7 +10653,7 @@ export function CResult_SignDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_SignDecodeErrorZ CResult_SignDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_SignDecodeErrorZ_err(e: number): number { +export function CResult_SignDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10655,7 +10662,7 @@ export function CResult_SignDecodeErrorZ_err(e: number): number { } // bool CResult_SignDecodeErrorZ_is_ok(const struct LDKCResult_SignDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_SignDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_SignDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10664,16 +10671,16 @@ export function CResult_SignDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_SignDecodeErrorZ_free(struct LDKCResult_SignDecodeErrorZ _res); /* @internal */ -export function CResult_SignDecodeErrorZ_free(_res: number): void { +export function CResult_SignDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_SignDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_SignDecodeErrorZ_clone_ptr(LDKCResult_SignDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_SignDecodeErrorZ_clone_ptr(LDKCResult_SignDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_SignDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_SignDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10682,7 +10689,7 @@ export function CResult_SignDecodeErrorZ_clone_ptr(arg: number): number { } // struct LDKCResult_SignDecodeErrorZ CResult_SignDecodeErrorZ_clone(const struct LDKCResult_SignDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_SignDecodeErrorZ_clone(orig: number): number { +export function CResult_SignDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10700,7 +10707,7 @@ export function CVec_u5Z_free(_res: number): void { } // struct LDKCResult_RecoverableSignatureNoneZ CResult_RecoverableSignatureNoneZ_ok(struct LDKRecoverableSignature o); /* @internal */ -export function CResult_RecoverableSignatureNoneZ_ok(o: number): number { +export function CResult_RecoverableSignatureNoneZ_ok(o: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10709,7 +10716,7 @@ export function CResult_RecoverableSignatureNoneZ_ok(o: number): number { } // struct LDKCResult_RecoverableSignatureNoneZ CResult_RecoverableSignatureNoneZ_err(void); /* @internal */ -export function CResult_RecoverableSignatureNoneZ_err(): number { +export function CResult_RecoverableSignatureNoneZ_err(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10718,7 +10725,7 @@ export function CResult_RecoverableSignatureNoneZ_err(): number { } // bool CResult_RecoverableSignatureNoneZ_is_ok(const struct LDKCResult_RecoverableSignatureNoneZ *NONNULL_PTR o); /* @internal */ -export function CResult_RecoverableSignatureNoneZ_is_ok(o: number): boolean { +export function CResult_RecoverableSignatureNoneZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10727,16 +10734,16 @@ export function CResult_RecoverableSignatureNoneZ_is_ok(o: number): boolean { } // void CResult_RecoverableSignatureNoneZ_free(struct LDKCResult_RecoverableSignatureNoneZ _res); /* @internal */ -export function CResult_RecoverableSignatureNoneZ_free(_res: number): void { +export function CResult_RecoverableSignatureNoneZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_RecoverableSignatureNoneZ_free(_res); // debug statements here } - // uintptr_t CResult_RecoverableSignatureNoneZ_clone_ptr(LDKCResult_RecoverableSignatureNoneZ *NONNULL_PTR arg); + // uint64_t CResult_RecoverableSignatureNoneZ_clone_ptr(LDKCResult_RecoverableSignatureNoneZ *NONNULL_PTR arg); /* @internal */ -export function CResult_RecoverableSignatureNoneZ_clone_ptr(arg: number): number { +export function CResult_RecoverableSignatureNoneZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10745,7 +10752,7 @@ export function CResult_RecoverableSignatureNoneZ_clone_ptr(arg: number): number } // struct LDKCResult_RecoverableSignatureNoneZ CResult_RecoverableSignatureNoneZ_clone(const struct LDKCResult_RecoverableSignatureNoneZ *NONNULL_PTR orig); /* @internal */ -export function CResult_RecoverableSignatureNoneZ_clone(orig: number): number { +export function CResult_RecoverableSignatureNoneZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10772,7 +10779,7 @@ export function CVec_CVec_u8ZZ_free(_res: number): void { } // struct LDKCResult_CVec_CVec_u8ZZNoneZ CResult_CVec_CVec_u8ZZNoneZ_ok(struct LDKCVec_CVec_u8ZZ o); /* @internal */ -export function CResult_CVec_CVec_u8ZZNoneZ_ok(o: number): number { +export function CResult_CVec_CVec_u8ZZNoneZ_ok(o: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10781,7 +10788,7 @@ export function CResult_CVec_CVec_u8ZZNoneZ_ok(o: number): number { } // struct LDKCResult_CVec_CVec_u8ZZNoneZ CResult_CVec_CVec_u8ZZNoneZ_err(void); /* @internal */ -export function CResult_CVec_CVec_u8ZZNoneZ_err(): number { +export function CResult_CVec_CVec_u8ZZNoneZ_err(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10790,7 +10797,7 @@ export function CResult_CVec_CVec_u8ZZNoneZ_err(): number { } // bool CResult_CVec_CVec_u8ZZNoneZ_is_ok(const struct LDKCResult_CVec_CVec_u8ZZNoneZ *NONNULL_PTR o); /* @internal */ -export function CResult_CVec_CVec_u8ZZNoneZ_is_ok(o: number): boolean { +export function CResult_CVec_CVec_u8ZZNoneZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10799,16 +10806,16 @@ export function CResult_CVec_CVec_u8ZZNoneZ_is_ok(o: number): boolean { } // void CResult_CVec_CVec_u8ZZNoneZ_free(struct LDKCResult_CVec_CVec_u8ZZNoneZ _res); /* @internal */ -export function CResult_CVec_CVec_u8ZZNoneZ_free(_res: number): void { +export function CResult_CVec_CVec_u8ZZNoneZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_CVec_CVec_u8ZZNoneZ_free(_res); // debug statements here } - // uintptr_t CResult_CVec_CVec_u8ZZNoneZ_clone_ptr(LDKCResult_CVec_CVec_u8ZZNoneZ *NONNULL_PTR arg); + // uint64_t CResult_CVec_CVec_u8ZZNoneZ_clone_ptr(LDKCResult_CVec_CVec_u8ZZNoneZ *NONNULL_PTR arg); /* @internal */ -export function CResult_CVec_CVec_u8ZZNoneZ_clone_ptr(arg: number): number { +export function CResult_CVec_CVec_u8ZZNoneZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10817,7 +10824,7 @@ export function CResult_CVec_CVec_u8ZZNoneZ_clone_ptr(arg: number): number { } // struct LDKCResult_CVec_CVec_u8ZZNoneZ CResult_CVec_CVec_u8ZZNoneZ_clone(const struct LDKCResult_CVec_CVec_u8ZZNoneZ *NONNULL_PTR orig); /* @internal */ -export function CResult_CVec_CVec_u8ZZNoneZ_clone(orig: number): number { +export function CResult_CVec_CVec_u8ZZNoneZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10826,7 +10833,7 @@ export function CResult_CVec_CVec_u8ZZNoneZ_clone(orig: number): number { } // struct LDKCResult_InMemorySignerDecodeErrorZ CResult_InMemorySignerDecodeErrorZ_ok(struct LDKInMemorySigner o); /* @internal */ -export function CResult_InMemorySignerDecodeErrorZ_ok(o: number): number { +export function CResult_InMemorySignerDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10835,7 +10842,7 @@ export function CResult_InMemorySignerDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_InMemorySignerDecodeErrorZ CResult_InMemorySignerDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_InMemorySignerDecodeErrorZ_err(e: number): number { +export function CResult_InMemorySignerDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10844,7 +10851,7 @@ export function CResult_InMemorySignerDecodeErrorZ_err(e: number): number { } // bool CResult_InMemorySignerDecodeErrorZ_is_ok(const struct LDKCResult_InMemorySignerDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_InMemorySignerDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_InMemorySignerDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10853,16 +10860,16 @@ export function CResult_InMemorySignerDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_InMemorySignerDecodeErrorZ_free(struct LDKCResult_InMemorySignerDecodeErrorZ _res); /* @internal */ -export function CResult_InMemorySignerDecodeErrorZ_free(_res: number): void { +export function CResult_InMemorySignerDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_InMemorySignerDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_InMemorySignerDecodeErrorZ_clone_ptr(LDKCResult_InMemorySignerDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_InMemorySignerDecodeErrorZ_clone_ptr(LDKCResult_InMemorySignerDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_InMemorySignerDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_InMemorySignerDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10871,7 +10878,7 @@ export function CResult_InMemorySignerDecodeErrorZ_clone_ptr(arg: number): numbe } // struct LDKCResult_InMemorySignerDecodeErrorZ CResult_InMemorySignerDecodeErrorZ_clone(const struct LDKCResult_InMemorySignerDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_InMemorySignerDecodeErrorZ_clone(orig: number): number { +export function CResult_InMemorySignerDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10889,7 +10896,7 @@ export function CVec_TxOutZ_free(_res: number): void { } // struct LDKCResult_TransactionNoneZ CResult_TransactionNoneZ_ok(struct LDKTransaction o); /* @internal */ -export function CResult_TransactionNoneZ_ok(o: number): number { +export function CResult_TransactionNoneZ_ok(o: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10898,7 +10905,7 @@ export function CResult_TransactionNoneZ_ok(o: number): number { } // struct LDKCResult_TransactionNoneZ CResult_TransactionNoneZ_err(void); /* @internal */ -export function CResult_TransactionNoneZ_err(): number { +export function CResult_TransactionNoneZ_err(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10907,7 +10914,7 @@ export function CResult_TransactionNoneZ_err(): number { } // bool CResult_TransactionNoneZ_is_ok(const struct LDKCResult_TransactionNoneZ *NONNULL_PTR o); /* @internal */ -export function CResult_TransactionNoneZ_is_ok(o: number): boolean { +export function CResult_TransactionNoneZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10916,16 +10923,16 @@ export function CResult_TransactionNoneZ_is_ok(o: number): boolean { } // void CResult_TransactionNoneZ_free(struct LDKCResult_TransactionNoneZ _res); /* @internal */ -export function CResult_TransactionNoneZ_free(_res: number): void { +export function CResult_TransactionNoneZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_TransactionNoneZ_free(_res); // debug statements here } - // uintptr_t CResult_TransactionNoneZ_clone_ptr(LDKCResult_TransactionNoneZ *NONNULL_PTR arg); + // uint64_t CResult_TransactionNoneZ_clone_ptr(LDKCResult_TransactionNoneZ *NONNULL_PTR arg); /* @internal */ -export function CResult_TransactionNoneZ_clone_ptr(arg: number): number { +export function CResult_TransactionNoneZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10934,7 +10941,7 @@ export function CResult_TransactionNoneZ_clone_ptr(arg: number): number { } // struct LDKCResult_TransactionNoneZ CResult_TransactionNoneZ_clone(const struct LDKCResult_TransactionNoneZ *NONNULL_PTR orig); /* @internal */ -export function CResult_TransactionNoneZ_clone(orig: number): number { +export function CResult_TransactionNoneZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10943,7 +10950,7 @@ export function CResult_TransactionNoneZ_clone(orig: number): number { } // struct LDKCOption_u16Z COption_u16Z_some(uint16_t o); /* @internal */ -export function COption_u16Z_some(o: number): number { +export function COption_u16Z_some(o: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10952,7 +10959,7 @@ export function COption_u16Z_some(o: number): number { } // struct LDKCOption_u16Z COption_u16Z_none(void); /* @internal */ -export function COption_u16Z_none(): number { +export function COption_u16Z_none(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10961,16 +10968,16 @@ export function COption_u16Z_none(): number { } // void COption_u16Z_free(struct LDKCOption_u16Z _res); /* @internal */ -export function COption_u16Z_free(_res: number): void { +export function COption_u16Z_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_COption_u16Z_free(_res); // debug statements here } - // uintptr_t COption_u16Z_clone_ptr(LDKCOption_u16Z *NONNULL_PTR arg); + // uint64_t COption_u16Z_clone_ptr(LDKCOption_u16Z *NONNULL_PTR arg); /* @internal */ -export function COption_u16Z_clone_ptr(arg: number): number { +export function COption_u16Z_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10979,7 +10986,7 @@ export function COption_u16Z_clone_ptr(arg: number): number { } // struct LDKCOption_u16Z COption_u16Z_clone(const struct LDKCOption_u16Z *NONNULL_PTR orig); /* @internal */ -export function COption_u16Z_clone(orig: number): number { +export function COption_u16Z_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10988,7 +10995,7 @@ export function COption_u16Z_clone(orig: number): number { } // struct LDKCResult_NoneAPIErrorZ CResult_NoneAPIErrorZ_ok(void); /* @internal */ -export function CResult_NoneAPIErrorZ_ok(): number { +export function CResult_NoneAPIErrorZ_ok(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -10997,7 +11004,7 @@ export function CResult_NoneAPIErrorZ_ok(): number { } // struct LDKCResult_NoneAPIErrorZ CResult_NoneAPIErrorZ_err(struct LDKAPIError e); /* @internal */ -export function CResult_NoneAPIErrorZ_err(e: number): number { +export function CResult_NoneAPIErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11006,7 +11013,7 @@ export function CResult_NoneAPIErrorZ_err(e: number): number { } // bool CResult_NoneAPIErrorZ_is_ok(const struct LDKCResult_NoneAPIErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_NoneAPIErrorZ_is_ok(o: number): boolean { +export function CResult_NoneAPIErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11015,16 +11022,16 @@ export function CResult_NoneAPIErrorZ_is_ok(o: number): boolean { } // void CResult_NoneAPIErrorZ_free(struct LDKCResult_NoneAPIErrorZ _res); /* @internal */ -export function CResult_NoneAPIErrorZ_free(_res: number): void { +export function CResult_NoneAPIErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_NoneAPIErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_NoneAPIErrorZ_clone_ptr(LDKCResult_NoneAPIErrorZ *NONNULL_PTR arg); + // uint64_t CResult_NoneAPIErrorZ_clone_ptr(LDKCResult_NoneAPIErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_NoneAPIErrorZ_clone_ptr(arg: number): number { +export function CResult_NoneAPIErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11033,7 +11040,7 @@ export function CResult_NoneAPIErrorZ_clone_ptr(arg: number): number { } // struct LDKCResult_NoneAPIErrorZ CResult_NoneAPIErrorZ_clone(const struct LDKCResult_NoneAPIErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_NoneAPIErrorZ_clone(orig: number): number { +export function CResult_NoneAPIErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11060,7 +11067,7 @@ export function CVec_APIErrorZ_free(_res: number): void { } // struct LDKCResult__u832APIErrorZ CResult__u832APIErrorZ_ok(struct LDKThirtyTwoBytes o); /* @internal */ -export function CResult__u832APIErrorZ_ok(o: number): number { +export function CResult__u832APIErrorZ_ok(o: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11069,7 +11076,7 @@ export function CResult__u832APIErrorZ_ok(o: number): number { } // struct LDKCResult__u832APIErrorZ CResult__u832APIErrorZ_err(struct LDKAPIError e); /* @internal */ -export function CResult__u832APIErrorZ_err(e: number): number { +export function CResult__u832APIErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11078,7 +11085,7 @@ export function CResult__u832APIErrorZ_err(e: number): number { } // bool CResult__u832APIErrorZ_is_ok(const struct LDKCResult__u832APIErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult__u832APIErrorZ_is_ok(o: number): boolean { +export function CResult__u832APIErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11087,16 +11094,16 @@ export function CResult__u832APIErrorZ_is_ok(o: number): boolean { } // void CResult__u832APIErrorZ_free(struct LDKCResult__u832APIErrorZ _res); /* @internal */ -export function CResult__u832APIErrorZ_free(_res: number): void { +export function CResult__u832APIErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult__u832APIErrorZ_free(_res); // debug statements here } - // uintptr_t CResult__u832APIErrorZ_clone_ptr(LDKCResult__u832APIErrorZ *NONNULL_PTR arg); + // uint64_t CResult__u832APIErrorZ_clone_ptr(LDKCResult__u832APIErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult__u832APIErrorZ_clone_ptr(arg: number): number { +export function CResult__u832APIErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11105,7 +11112,7 @@ export function CResult__u832APIErrorZ_clone_ptr(arg: number): number { } // struct LDKCResult__u832APIErrorZ CResult__u832APIErrorZ_clone(const struct LDKCResult__u832APIErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult__u832APIErrorZ_clone(orig: number): number { +export function CResult__u832APIErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11114,7 +11121,7 @@ export function CResult__u832APIErrorZ_clone(orig: number): number { } // struct LDKCResult_PaymentIdPaymentSendFailureZ CResult_PaymentIdPaymentSendFailureZ_ok(struct LDKThirtyTwoBytes o); /* @internal */ -export function CResult_PaymentIdPaymentSendFailureZ_ok(o: number): number { +export function CResult_PaymentIdPaymentSendFailureZ_ok(o: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11123,7 +11130,7 @@ export function CResult_PaymentIdPaymentSendFailureZ_ok(o: number): number { } // struct LDKCResult_PaymentIdPaymentSendFailureZ CResult_PaymentIdPaymentSendFailureZ_err(struct LDKPaymentSendFailure e); /* @internal */ -export function CResult_PaymentIdPaymentSendFailureZ_err(e: number): number { +export function CResult_PaymentIdPaymentSendFailureZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11132,7 +11139,7 @@ export function CResult_PaymentIdPaymentSendFailureZ_err(e: number): number { } // bool CResult_PaymentIdPaymentSendFailureZ_is_ok(const struct LDKCResult_PaymentIdPaymentSendFailureZ *NONNULL_PTR o); /* @internal */ -export function CResult_PaymentIdPaymentSendFailureZ_is_ok(o: number): boolean { +export function CResult_PaymentIdPaymentSendFailureZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11141,16 +11148,16 @@ export function CResult_PaymentIdPaymentSendFailureZ_is_ok(o: number): boolean { } // void CResult_PaymentIdPaymentSendFailureZ_free(struct LDKCResult_PaymentIdPaymentSendFailureZ _res); /* @internal */ -export function CResult_PaymentIdPaymentSendFailureZ_free(_res: number): void { +export function CResult_PaymentIdPaymentSendFailureZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_PaymentIdPaymentSendFailureZ_free(_res); // debug statements here } - // uintptr_t CResult_PaymentIdPaymentSendFailureZ_clone_ptr(LDKCResult_PaymentIdPaymentSendFailureZ *NONNULL_PTR arg); + // uint64_t CResult_PaymentIdPaymentSendFailureZ_clone_ptr(LDKCResult_PaymentIdPaymentSendFailureZ *NONNULL_PTR arg); /* @internal */ -export function CResult_PaymentIdPaymentSendFailureZ_clone_ptr(arg: number): number { +export function CResult_PaymentIdPaymentSendFailureZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11159,7 +11166,7 @@ export function CResult_PaymentIdPaymentSendFailureZ_clone_ptr(arg: number): num } // struct LDKCResult_PaymentIdPaymentSendFailureZ CResult_PaymentIdPaymentSendFailureZ_clone(const struct LDKCResult_PaymentIdPaymentSendFailureZ *NONNULL_PTR orig); /* @internal */ -export function CResult_PaymentIdPaymentSendFailureZ_clone(orig: number): number { +export function CResult_PaymentIdPaymentSendFailureZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11168,7 +11175,7 @@ export function CResult_PaymentIdPaymentSendFailureZ_clone(orig: number): number } // struct LDKCResult_NonePaymentSendFailureZ CResult_NonePaymentSendFailureZ_ok(void); /* @internal */ -export function CResult_NonePaymentSendFailureZ_ok(): number { +export function CResult_NonePaymentSendFailureZ_ok(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11177,7 +11184,7 @@ export function CResult_NonePaymentSendFailureZ_ok(): number { } // struct LDKCResult_NonePaymentSendFailureZ CResult_NonePaymentSendFailureZ_err(struct LDKPaymentSendFailure e); /* @internal */ -export function CResult_NonePaymentSendFailureZ_err(e: number): number { +export function CResult_NonePaymentSendFailureZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11186,7 +11193,7 @@ export function CResult_NonePaymentSendFailureZ_err(e: number): number { } // bool CResult_NonePaymentSendFailureZ_is_ok(const struct LDKCResult_NonePaymentSendFailureZ *NONNULL_PTR o); /* @internal */ -export function CResult_NonePaymentSendFailureZ_is_ok(o: number): boolean { +export function CResult_NonePaymentSendFailureZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11195,16 +11202,16 @@ export function CResult_NonePaymentSendFailureZ_is_ok(o: number): boolean { } // void CResult_NonePaymentSendFailureZ_free(struct LDKCResult_NonePaymentSendFailureZ _res); /* @internal */ -export function CResult_NonePaymentSendFailureZ_free(_res: number): void { +export function CResult_NonePaymentSendFailureZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_NonePaymentSendFailureZ_free(_res); // debug statements here } - // uintptr_t CResult_NonePaymentSendFailureZ_clone_ptr(LDKCResult_NonePaymentSendFailureZ *NONNULL_PTR arg); + // uint64_t CResult_NonePaymentSendFailureZ_clone_ptr(LDKCResult_NonePaymentSendFailureZ *NONNULL_PTR arg); /* @internal */ -export function CResult_NonePaymentSendFailureZ_clone_ptr(arg: number): number { +export function CResult_NonePaymentSendFailureZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11213,16 +11220,16 @@ export function CResult_NonePaymentSendFailureZ_clone_ptr(arg: number): number { } // struct LDKCResult_NonePaymentSendFailureZ CResult_NonePaymentSendFailureZ_clone(const struct LDKCResult_NonePaymentSendFailureZ *NONNULL_PTR orig); /* @internal */ -export function CResult_NonePaymentSendFailureZ_clone(orig: number): number { +export function CResult_NonePaymentSendFailureZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_NonePaymentSendFailureZ_clone(orig); return nativeResponseValue; } - // uintptr_t C2Tuple_PaymentHashPaymentIdZ_clone_ptr(LDKC2Tuple_PaymentHashPaymentIdZ *NONNULL_PTR arg); + // uint64_t C2Tuple_PaymentHashPaymentIdZ_clone_ptr(LDKC2Tuple_PaymentHashPaymentIdZ *NONNULL_PTR arg); /* @internal */ -export function C2Tuple_PaymentHashPaymentIdZ_clone_ptr(arg: number): number { +export function C2Tuple_PaymentHashPaymentIdZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11231,7 +11238,7 @@ export function C2Tuple_PaymentHashPaymentIdZ_clone_ptr(arg: number): number { } // struct LDKC2Tuple_PaymentHashPaymentIdZ C2Tuple_PaymentHashPaymentIdZ_clone(const struct LDKC2Tuple_PaymentHashPaymentIdZ *NONNULL_PTR orig); /* @internal */ -export function C2Tuple_PaymentHashPaymentIdZ_clone(orig: number): number { +export function C2Tuple_PaymentHashPaymentIdZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11240,7 +11247,7 @@ export function C2Tuple_PaymentHashPaymentIdZ_clone(orig: number): number { } // struct LDKC2Tuple_PaymentHashPaymentIdZ C2Tuple_PaymentHashPaymentIdZ_new(struct LDKThirtyTwoBytes a, struct LDKThirtyTwoBytes b); /* @internal */ -export function C2Tuple_PaymentHashPaymentIdZ_new(a: number, b: number): number { +export function C2Tuple_PaymentHashPaymentIdZ_new(a: number, b: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11249,7 +11256,7 @@ export function C2Tuple_PaymentHashPaymentIdZ_new(a: number, b: number): number } // void C2Tuple_PaymentHashPaymentIdZ_free(struct LDKC2Tuple_PaymentHashPaymentIdZ _res); /* @internal */ -export function C2Tuple_PaymentHashPaymentIdZ_free(_res: number): void { +export function C2Tuple_PaymentHashPaymentIdZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11258,7 +11265,7 @@ export function C2Tuple_PaymentHashPaymentIdZ_free(_res: number): void { } // struct LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_ok(struct LDKC2Tuple_PaymentHashPaymentIdZ o); /* @internal */ -export function CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_ok(o: number): number { +export function CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11267,7 +11274,7 @@ export function CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_ok(o: n } // struct LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_err(struct LDKPaymentSendFailure e); /* @internal */ -export function CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_err(e: number): number { +export function CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11276,7 +11283,7 @@ export function CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_err(e: } // bool CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_is_ok(const struct LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ *NONNULL_PTR o); /* @internal */ -export function CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_is_ok(o: number): boolean { +export function CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11285,16 +11292,16 @@ export function CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_is_ok(o } // void CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_free(struct LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ _res); /* @internal */ -export function CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_free(_res: number): void { +export function CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_free(_res); // debug statements here } - // uintptr_t CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone_ptr(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ *NONNULL_PTR arg); + // uint64_t CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone_ptr(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ *NONNULL_PTR arg); /* @internal */ -export function CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone_ptr(arg: number): number { +export function CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11303,7 +11310,7 @@ export function CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone_p } // struct LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone(const struct LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ *NONNULL_PTR orig); /* @internal */ -export function CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone(orig: number): number { +export function CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11319,9 +11326,9 @@ export function CVec_ThirtyTwoBytesZ_free(_res: number): void { const nativeResponseValue = wasm.TS_CVec_ThirtyTwoBytesZ_free(_res); // debug statements here } - // uintptr_t C2Tuple_PaymentHashPaymentSecretZ_clone_ptr(LDKC2Tuple_PaymentHashPaymentSecretZ *NONNULL_PTR arg); + // uint64_t C2Tuple_PaymentHashPaymentSecretZ_clone_ptr(LDKC2Tuple_PaymentHashPaymentSecretZ *NONNULL_PTR arg); /* @internal */ -export function C2Tuple_PaymentHashPaymentSecretZ_clone_ptr(arg: number): number { +export function C2Tuple_PaymentHashPaymentSecretZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11330,7 +11337,7 @@ export function C2Tuple_PaymentHashPaymentSecretZ_clone_ptr(arg: number): number } // struct LDKC2Tuple_PaymentHashPaymentSecretZ C2Tuple_PaymentHashPaymentSecretZ_clone(const struct LDKC2Tuple_PaymentHashPaymentSecretZ *NONNULL_PTR orig); /* @internal */ -export function C2Tuple_PaymentHashPaymentSecretZ_clone(orig: number): number { +export function C2Tuple_PaymentHashPaymentSecretZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11339,7 +11346,7 @@ export function C2Tuple_PaymentHashPaymentSecretZ_clone(orig: number): number { } // struct LDKC2Tuple_PaymentHashPaymentSecretZ C2Tuple_PaymentHashPaymentSecretZ_new(struct LDKThirtyTwoBytes a, struct LDKThirtyTwoBytes b); /* @internal */ -export function C2Tuple_PaymentHashPaymentSecretZ_new(a: number, b: number): number { +export function C2Tuple_PaymentHashPaymentSecretZ_new(a: number, b: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11348,7 +11355,7 @@ export function C2Tuple_PaymentHashPaymentSecretZ_new(a: number, b: number): num } // void C2Tuple_PaymentHashPaymentSecretZ_free(struct LDKC2Tuple_PaymentHashPaymentSecretZ _res); /* @internal */ -export function C2Tuple_PaymentHashPaymentSecretZ_free(_res: number): void { +export function C2Tuple_PaymentHashPaymentSecretZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11357,7 +11364,7 @@ export function C2Tuple_PaymentHashPaymentSecretZ_free(_res: number): void { } // struct LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_ok(struct LDKC2Tuple_PaymentHashPaymentSecretZ o); /* @internal */ -export function CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_ok(o: number): number { +export function CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11366,7 +11373,7 @@ export function CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_ok(o: number): nu } // struct LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_err(void); /* @internal */ -export function CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_err(): number { +export function CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_err(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11375,7 +11382,7 @@ export function CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_err(): number { } // bool CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_is_ok(const struct LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ *NONNULL_PTR o); /* @internal */ -export function CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_is_ok(o: number): boolean { +export function CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11384,16 +11391,16 @@ export function CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_is_ok(o: number): } // void CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_free(struct LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ _res); /* @internal */ -export function CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_free(_res: number): void { +export function CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_free(_res); // debug statements here } - // uintptr_t CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone_ptr(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ *NONNULL_PTR arg); + // uint64_t CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone_ptr(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ *NONNULL_PTR arg); /* @internal */ -export function CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone_ptr(arg: number): number { +export function CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11402,7 +11409,7 @@ export function CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone_ptr(arg: nu } // struct LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone(const struct LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ *NONNULL_PTR orig); /* @internal */ -export function CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone(orig: number): number { +export function CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11411,7 +11418,7 @@ export function CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone(orig: numbe } // struct LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_ok(struct LDKC2Tuple_PaymentHashPaymentSecretZ o); /* @internal */ -export function CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_ok(o: number): number { +export function CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11420,7 +11427,7 @@ export function CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_ok(o: number) } // struct LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_err(struct LDKAPIError e); /* @internal */ -export function CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_err(e: number): number { +export function CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11429,7 +11436,7 @@ export function CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_err(e: number } // bool CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_is_ok(const struct LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_is_ok(o: number): boolean { +export function CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11438,16 +11445,16 @@ export function CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_is_ok(o: numb } // void CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_free(struct LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ _res); /* @internal */ -export function CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_free(_res: number): void { +export function CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone_ptr(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ *NONNULL_PTR arg); + // uint64_t CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone_ptr(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone_ptr(arg: number): number { +export function CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11456,7 +11463,7 @@ export function CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone_ptr(arg } // struct LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone(const struct LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone(orig: number): number { +export function CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11465,7 +11472,7 @@ export function CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone(orig: n } // struct LDKCResult_PaymentSecretNoneZ CResult_PaymentSecretNoneZ_ok(struct LDKThirtyTwoBytes o); /* @internal */ -export function CResult_PaymentSecretNoneZ_ok(o: number): number { +export function CResult_PaymentSecretNoneZ_ok(o: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11474,7 +11481,7 @@ export function CResult_PaymentSecretNoneZ_ok(o: number): number { } // struct LDKCResult_PaymentSecretNoneZ CResult_PaymentSecretNoneZ_err(void); /* @internal */ -export function CResult_PaymentSecretNoneZ_err(): number { +export function CResult_PaymentSecretNoneZ_err(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11483,7 +11490,7 @@ export function CResult_PaymentSecretNoneZ_err(): number { } // bool CResult_PaymentSecretNoneZ_is_ok(const struct LDKCResult_PaymentSecretNoneZ *NONNULL_PTR o); /* @internal */ -export function CResult_PaymentSecretNoneZ_is_ok(o: number): boolean { +export function CResult_PaymentSecretNoneZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11492,16 +11499,16 @@ export function CResult_PaymentSecretNoneZ_is_ok(o: number): boolean { } // void CResult_PaymentSecretNoneZ_free(struct LDKCResult_PaymentSecretNoneZ _res); /* @internal */ -export function CResult_PaymentSecretNoneZ_free(_res: number): void { +export function CResult_PaymentSecretNoneZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_PaymentSecretNoneZ_free(_res); // debug statements here } - // uintptr_t CResult_PaymentSecretNoneZ_clone_ptr(LDKCResult_PaymentSecretNoneZ *NONNULL_PTR arg); + // uint64_t CResult_PaymentSecretNoneZ_clone_ptr(LDKCResult_PaymentSecretNoneZ *NONNULL_PTR arg); /* @internal */ -export function CResult_PaymentSecretNoneZ_clone_ptr(arg: number): number { +export function CResult_PaymentSecretNoneZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11510,7 +11517,7 @@ export function CResult_PaymentSecretNoneZ_clone_ptr(arg: number): number { } // struct LDKCResult_PaymentSecretNoneZ CResult_PaymentSecretNoneZ_clone(const struct LDKCResult_PaymentSecretNoneZ *NONNULL_PTR orig); /* @internal */ -export function CResult_PaymentSecretNoneZ_clone(orig: number): number { +export function CResult_PaymentSecretNoneZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11519,7 +11526,7 @@ export function CResult_PaymentSecretNoneZ_clone(orig: number): number { } // struct LDKCResult_PaymentSecretAPIErrorZ CResult_PaymentSecretAPIErrorZ_ok(struct LDKThirtyTwoBytes o); /* @internal */ -export function CResult_PaymentSecretAPIErrorZ_ok(o: number): number { +export function CResult_PaymentSecretAPIErrorZ_ok(o: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11528,7 +11535,7 @@ export function CResult_PaymentSecretAPIErrorZ_ok(o: number): number { } // struct LDKCResult_PaymentSecretAPIErrorZ CResult_PaymentSecretAPIErrorZ_err(struct LDKAPIError e); /* @internal */ -export function CResult_PaymentSecretAPIErrorZ_err(e: number): number { +export function CResult_PaymentSecretAPIErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11537,7 +11544,7 @@ export function CResult_PaymentSecretAPIErrorZ_err(e: number): number { } // bool CResult_PaymentSecretAPIErrorZ_is_ok(const struct LDKCResult_PaymentSecretAPIErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_PaymentSecretAPIErrorZ_is_ok(o: number): boolean { +export function CResult_PaymentSecretAPIErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11546,16 +11553,16 @@ export function CResult_PaymentSecretAPIErrorZ_is_ok(o: number): boolean { } // void CResult_PaymentSecretAPIErrorZ_free(struct LDKCResult_PaymentSecretAPIErrorZ _res); /* @internal */ -export function CResult_PaymentSecretAPIErrorZ_free(_res: number): void { +export function CResult_PaymentSecretAPIErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_PaymentSecretAPIErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_PaymentSecretAPIErrorZ_clone_ptr(LDKCResult_PaymentSecretAPIErrorZ *NONNULL_PTR arg); + // uint64_t CResult_PaymentSecretAPIErrorZ_clone_ptr(LDKCResult_PaymentSecretAPIErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_PaymentSecretAPIErrorZ_clone_ptr(arg: number): number { +export function CResult_PaymentSecretAPIErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11564,7 +11571,7 @@ export function CResult_PaymentSecretAPIErrorZ_clone_ptr(arg: number): number { } // struct LDKCResult_PaymentSecretAPIErrorZ CResult_PaymentSecretAPIErrorZ_clone(const struct LDKCResult_PaymentSecretAPIErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_PaymentSecretAPIErrorZ_clone(orig: number): number { +export function CResult_PaymentSecretAPIErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11573,7 +11580,7 @@ export function CResult_PaymentSecretAPIErrorZ_clone(orig: number): number { } // struct LDKCResult_PaymentPreimageAPIErrorZ CResult_PaymentPreimageAPIErrorZ_ok(struct LDKThirtyTwoBytes o); /* @internal */ -export function CResult_PaymentPreimageAPIErrorZ_ok(o: number): number { +export function CResult_PaymentPreimageAPIErrorZ_ok(o: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11582,7 +11589,7 @@ export function CResult_PaymentPreimageAPIErrorZ_ok(o: number): number { } // struct LDKCResult_PaymentPreimageAPIErrorZ CResult_PaymentPreimageAPIErrorZ_err(struct LDKAPIError e); /* @internal */ -export function CResult_PaymentPreimageAPIErrorZ_err(e: number): number { +export function CResult_PaymentPreimageAPIErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11591,7 +11598,7 @@ export function CResult_PaymentPreimageAPIErrorZ_err(e: number): number { } // bool CResult_PaymentPreimageAPIErrorZ_is_ok(const struct LDKCResult_PaymentPreimageAPIErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_PaymentPreimageAPIErrorZ_is_ok(o: number): boolean { +export function CResult_PaymentPreimageAPIErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11600,16 +11607,16 @@ export function CResult_PaymentPreimageAPIErrorZ_is_ok(o: number): boolean { } // void CResult_PaymentPreimageAPIErrorZ_free(struct LDKCResult_PaymentPreimageAPIErrorZ _res); /* @internal */ -export function CResult_PaymentPreimageAPIErrorZ_free(_res: number): void { +export function CResult_PaymentPreimageAPIErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_PaymentPreimageAPIErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_PaymentPreimageAPIErrorZ_clone_ptr(LDKCResult_PaymentPreimageAPIErrorZ *NONNULL_PTR arg); + // uint64_t CResult_PaymentPreimageAPIErrorZ_clone_ptr(LDKCResult_PaymentPreimageAPIErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_PaymentPreimageAPIErrorZ_clone_ptr(arg: number): number { +export function CResult_PaymentPreimageAPIErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11618,7 +11625,7 @@ export function CResult_PaymentPreimageAPIErrorZ_clone_ptr(arg: number): number } // struct LDKCResult_PaymentPreimageAPIErrorZ CResult_PaymentPreimageAPIErrorZ_clone(const struct LDKCResult_PaymentPreimageAPIErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_PaymentPreimageAPIErrorZ_clone(orig: number): number { +export function CResult_PaymentPreimageAPIErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11627,7 +11634,7 @@ export function CResult_PaymentPreimageAPIErrorZ_clone(orig: number): number { } // struct LDKCResult_CounterpartyForwardingInfoDecodeErrorZ CResult_CounterpartyForwardingInfoDecodeErrorZ_ok(struct LDKCounterpartyForwardingInfo o); /* @internal */ -export function CResult_CounterpartyForwardingInfoDecodeErrorZ_ok(o: number): number { +export function CResult_CounterpartyForwardingInfoDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11636,7 +11643,7 @@ export function CResult_CounterpartyForwardingInfoDecodeErrorZ_ok(o: number): nu } // struct LDKCResult_CounterpartyForwardingInfoDecodeErrorZ CResult_CounterpartyForwardingInfoDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_CounterpartyForwardingInfoDecodeErrorZ_err(e: number): number { +export function CResult_CounterpartyForwardingInfoDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11645,7 +11652,7 @@ export function CResult_CounterpartyForwardingInfoDecodeErrorZ_err(e: number): n } // bool CResult_CounterpartyForwardingInfoDecodeErrorZ_is_ok(const struct LDKCResult_CounterpartyForwardingInfoDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_CounterpartyForwardingInfoDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_CounterpartyForwardingInfoDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11654,16 +11661,16 @@ export function CResult_CounterpartyForwardingInfoDecodeErrorZ_is_ok(o: number): } // void CResult_CounterpartyForwardingInfoDecodeErrorZ_free(struct LDKCResult_CounterpartyForwardingInfoDecodeErrorZ _res); /* @internal */ -export function CResult_CounterpartyForwardingInfoDecodeErrorZ_free(_res: number): void { +export function CResult_CounterpartyForwardingInfoDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_CounterpartyForwardingInfoDecodeErrorZ_clone_ptr(LDKCResult_CounterpartyForwardingInfoDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_CounterpartyForwardingInfoDecodeErrorZ_clone_ptr(LDKCResult_CounterpartyForwardingInfoDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_CounterpartyForwardingInfoDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_CounterpartyForwardingInfoDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11672,7 +11679,7 @@ export function CResult_CounterpartyForwardingInfoDecodeErrorZ_clone_ptr(arg: nu } // struct LDKCResult_CounterpartyForwardingInfoDecodeErrorZ CResult_CounterpartyForwardingInfoDecodeErrorZ_clone(const struct LDKCResult_CounterpartyForwardingInfoDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_CounterpartyForwardingInfoDecodeErrorZ_clone(orig: number): number { +export function CResult_CounterpartyForwardingInfoDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11681,7 +11688,7 @@ export function CResult_CounterpartyForwardingInfoDecodeErrorZ_clone(orig: numbe } // struct LDKCResult_ChannelCounterpartyDecodeErrorZ CResult_ChannelCounterpartyDecodeErrorZ_ok(struct LDKChannelCounterparty o); /* @internal */ -export function CResult_ChannelCounterpartyDecodeErrorZ_ok(o: number): number { +export function CResult_ChannelCounterpartyDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11690,7 +11697,7 @@ export function CResult_ChannelCounterpartyDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_ChannelCounterpartyDecodeErrorZ CResult_ChannelCounterpartyDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_ChannelCounterpartyDecodeErrorZ_err(e: number): number { +export function CResult_ChannelCounterpartyDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11699,7 +11706,7 @@ export function CResult_ChannelCounterpartyDecodeErrorZ_err(e: number): number { } // bool CResult_ChannelCounterpartyDecodeErrorZ_is_ok(const struct LDKCResult_ChannelCounterpartyDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_ChannelCounterpartyDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_ChannelCounterpartyDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11708,16 +11715,16 @@ export function CResult_ChannelCounterpartyDecodeErrorZ_is_ok(o: number): boolea } // void CResult_ChannelCounterpartyDecodeErrorZ_free(struct LDKCResult_ChannelCounterpartyDecodeErrorZ _res); /* @internal */ -export function CResult_ChannelCounterpartyDecodeErrorZ_free(_res: number): void { +export function CResult_ChannelCounterpartyDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_ChannelCounterpartyDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_ChannelCounterpartyDecodeErrorZ_clone_ptr(LDKCResult_ChannelCounterpartyDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_ChannelCounterpartyDecodeErrorZ_clone_ptr(LDKCResult_ChannelCounterpartyDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_ChannelCounterpartyDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_ChannelCounterpartyDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11726,7 +11733,7 @@ export function CResult_ChannelCounterpartyDecodeErrorZ_clone_ptr(arg: number): } // struct LDKCResult_ChannelCounterpartyDecodeErrorZ CResult_ChannelCounterpartyDecodeErrorZ_clone(const struct LDKCResult_ChannelCounterpartyDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_ChannelCounterpartyDecodeErrorZ_clone(orig: number): number { +export function CResult_ChannelCounterpartyDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11735,7 +11742,7 @@ export function CResult_ChannelCounterpartyDecodeErrorZ_clone(orig: number): num } // struct LDKCResult_ChannelDetailsDecodeErrorZ CResult_ChannelDetailsDecodeErrorZ_ok(struct LDKChannelDetails o); /* @internal */ -export function CResult_ChannelDetailsDecodeErrorZ_ok(o: number): number { +export function CResult_ChannelDetailsDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11744,7 +11751,7 @@ export function CResult_ChannelDetailsDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_ChannelDetailsDecodeErrorZ CResult_ChannelDetailsDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_ChannelDetailsDecodeErrorZ_err(e: number): number { +export function CResult_ChannelDetailsDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11753,7 +11760,7 @@ export function CResult_ChannelDetailsDecodeErrorZ_err(e: number): number { } // bool CResult_ChannelDetailsDecodeErrorZ_is_ok(const struct LDKCResult_ChannelDetailsDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_ChannelDetailsDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_ChannelDetailsDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11762,16 +11769,16 @@ export function CResult_ChannelDetailsDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_ChannelDetailsDecodeErrorZ_free(struct LDKCResult_ChannelDetailsDecodeErrorZ _res); /* @internal */ -export function CResult_ChannelDetailsDecodeErrorZ_free(_res: number): void { +export function CResult_ChannelDetailsDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_ChannelDetailsDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_ChannelDetailsDecodeErrorZ_clone_ptr(LDKCResult_ChannelDetailsDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_ChannelDetailsDecodeErrorZ_clone_ptr(LDKCResult_ChannelDetailsDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_ChannelDetailsDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_ChannelDetailsDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11780,7 +11787,7 @@ export function CResult_ChannelDetailsDecodeErrorZ_clone_ptr(arg: number): numbe } // struct LDKCResult_ChannelDetailsDecodeErrorZ CResult_ChannelDetailsDecodeErrorZ_clone(const struct LDKCResult_ChannelDetailsDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_ChannelDetailsDecodeErrorZ_clone(orig: number): number { +export function CResult_ChannelDetailsDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11789,7 +11796,7 @@ export function CResult_ChannelDetailsDecodeErrorZ_clone(orig: number): number { } // struct LDKCResult_PhantomRouteHintsDecodeErrorZ CResult_PhantomRouteHintsDecodeErrorZ_ok(struct LDKPhantomRouteHints o); /* @internal */ -export function CResult_PhantomRouteHintsDecodeErrorZ_ok(o: number): number { +export function CResult_PhantomRouteHintsDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11798,7 +11805,7 @@ export function CResult_PhantomRouteHintsDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_PhantomRouteHintsDecodeErrorZ CResult_PhantomRouteHintsDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_PhantomRouteHintsDecodeErrorZ_err(e: number): number { +export function CResult_PhantomRouteHintsDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11807,7 +11814,7 @@ export function CResult_PhantomRouteHintsDecodeErrorZ_err(e: number): number { } // bool CResult_PhantomRouteHintsDecodeErrorZ_is_ok(const struct LDKCResult_PhantomRouteHintsDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_PhantomRouteHintsDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_PhantomRouteHintsDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11816,16 +11823,16 @@ export function CResult_PhantomRouteHintsDecodeErrorZ_is_ok(o: number): boolean } // void CResult_PhantomRouteHintsDecodeErrorZ_free(struct LDKCResult_PhantomRouteHintsDecodeErrorZ _res); /* @internal */ -export function CResult_PhantomRouteHintsDecodeErrorZ_free(_res: number): void { +export function CResult_PhantomRouteHintsDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_PhantomRouteHintsDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_PhantomRouteHintsDecodeErrorZ_clone_ptr(LDKCResult_PhantomRouteHintsDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_PhantomRouteHintsDecodeErrorZ_clone_ptr(LDKCResult_PhantomRouteHintsDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_PhantomRouteHintsDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_PhantomRouteHintsDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11834,7 +11841,7 @@ export function CResult_PhantomRouteHintsDecodeErrorZ_clone_ptr(arg: number): nu } // struct LDKCResult_PhantomRouteHintsDecodeErrorZ CResult_PhantomRouteHintsDecodeErrorZ_clone(const struct LDKCResult_PhantomRouteHintsDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_PhantomRouteHintsDecodeErrorZ_clone(orig: number): number { +export function CResult_PhantomRouteHintsDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11852,7 +11859,7 @@ export function CVec_ChannelMonitorZ_free(_res: number): void { } // struct LDKC2Tuple_BlockHashChannelManagerZ C2Tuple_BlockHashChannelManagerZ_new(struct LDKThirtyTwoBytes a, struct LDKChannelManager b); /* @internal */ -export function C2Tuple_BlockHashChannelManagerZ_new(a: number, b: number): number { +export function C2Tuple_BlockHashChannelManagerZ_new(a: number, b: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11861,7 +11868,7 @@ export function C2Tuple_BlockHashChannelManagerZ_new(a: number, b: number): numb } // void C2Tuple_BlockHashChannelManagerZ_free(struct LDKC2Tuple_BlockHashChannelManagerZ _res); /* @internal */ -export function C2Tuple_BlockHashChannelManagerZ_free(_res: number): void { +export function C2Tuple_BlockHashChannelManagerZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11870,7 +11877,7 @@ export function C2Tuple_BlockHashChannelManagerZ_free(_res: number): void { } // struct LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_ok(struct LDKC2Tuple_BlockHashChannelManagerZ o); /* @internal */ -export function CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_ok(o: number): number { +export function CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11879,7 +11886,7 @@ export function CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_ok(o: numbe } // struct LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_err(e: number): number { +export function CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11888,7 +11895,7 @@ export function CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_err(e: numb } // bool CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_is_ok(const struct LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11897,7 +11904,7 @@ export function CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_is_ok(o: nu } // void CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_free(struct LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ _res); /* @internal */ -export function CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_free(_res: number): void { +export function CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11906,7 +11913,7 @@ export function CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_free(_res: } // struct LDKCResult_ChannelConfigDecodeErrorZ CResult_ChannelConfigDecodeErrorZ_ok(struct LDKChannelConfig o); /* @internal */ -export function CResult_ChannelConfigDecodeErrorZ_ok(o: number): number { +export function CResult_ChannelConfigDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11915,7 +11922,7 @@ export function CResult_ChannelConfigDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_ChannelConfigDecodeErrorZ CResult_ChannelConfigDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_ChannelConfigDecodeErrorZ_err(e: number): number { +export function CResult_ChannelConfigDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11924,7 +11931,7 @@ export function CResult_ChannelConfigDecodeErrorZ_err(e: number): number { } // bool CResult_ChannelConfigDecodeErrorZ_is_ok(const struct LDKCResult_ChannelConfigDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_ChannelConfigDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_ChannelConfigDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11933,16 +11940,16 @@ export function CResult_ChannelConfigDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_ChannelConfigDecodeErrorZ_free(struct LDKCResult_ChannelConfigDecodeErrorZ _res); /* @internal */ -export function CResult_ChannelConfigDecodeErrorZ_free(_res: number): void { +export function CResult_ChannelConfigDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_ChannelConfigDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_ChannelConfigDecodeErrorZ_clone_ptr(LDKCResult_ChannelConfigDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_ChannelConfigDecodeErrorZ_clone_ptr(LDKCResult_ChannelConfigDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_ChannelConfigDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_ChannelConfigDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11951,7 +11958,7 @@ export function CResult_ChannelConfigDecodeErrorZ_clone_ptr(arg: number): number } // struct LDKCResult_ChannelConfigDecodeErrorZ CResult_ChannelConfigDecodeErrorZ_clone(const struct LDKCResult_ChannelConfigDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_ChannelConfigDecodeErrorZ_clone(orig: number): number { +export function CResult_ChannelConfigDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11960,7 +11967,7 @@ export function CResult_ChannelConfigDecodeErrorZ_clone(orig: number): number { } // struct LDKCResult_OutPointDecodeErrorZ CResult_OutPointDecodeErrorZ_ok(struct LDKOutPoint o); /* @internal */ -export function CResult_OutPointDecodeErrorZ_ok(o: number): number { +export function CResult_OutPointDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11969,7 +11976,7 @@ export function CResult_OutPointDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_OutPointDecodeErrorZ CResult_OutPointDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_OutPointDecodeErrorZ_err(e: number): number { +export function CResult_OutPointDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11978,7 +11985,7 @@ export function CResult_OutPointDecodeErrorZ_err(e: number): number { } // bool CResult_OutPointDecodeErrorZ_is_ok(const struct LDKCResult_OutPointDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_OutPointDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_OutPointDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -11987,16 +11994,16 @@ export function CResult_OutPointDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_OutPointDecodeErrorZ_free(struct LDKCResult_OutPointDecodeErrorZ _res); /* @internal */ -export function CResult_OutPointDecodeErrorZ_free(_res: number): void { +export function CResult_OutPointDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_OutPointDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_OutPointDecodeErrorZ_clone_ptr(LDKCResult_OutPointDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_OutPointDecodeErrorZ_clone_ptr(LDKCResult_OutPointDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_OutPointDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_OutPointDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12005,7 +12012,7 @@ export function CResult_OutPointDecodeErrorZ_clone_ptr(arg: number): number { } // struct LDKCResult_OutPointDecodeErrorZ CResult_OutPointDecodeErrorZ_clone(const struct LDKCResult_OutPointDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_OutPointDecodeErrorZ_clone(orig: number): number { +export function CResult_OutPointDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12014,7 +12021,7 @@ export function CResult_OutPointDecodeErrorZ_clone(orig: number): number { } // struct LDKCOption_TypeZ COption_TypeZ_some(struct LDKType o); /* @internal */ -export function COption_TypeZ_some(o: number): number { +export function COption_TypeZ_some(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12023,7 +12030,7 @@ export function COption_TypeZ_some(o: number): number { } // struct LDKCOption_TypeZ COption_TypeZ_none(void); /* @internal */ -export function COption_TypeZ_none(): number { +export function COption_TypeZ_none(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12032,16 +12039,16 @@ export function COption_TypeZ_none(): number { } // void COption_TypeZ_free(struct LDKCOption_TypeZ _res); /* @internal */ -export function COption_TypeZ_free(_res: number): void { +export function COption_TypeZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_COption_TypeZ_free(_res); // debug statements here } - // uintptr_t COption_TypeZ_clone_ptr(LDKCOption_TypeZ *NONNULL_PTR arg); + // uint64_t COption_TypeZ_clone_ptr(LDKCOption_TypeZ *NONNULL_PTR arg); /* @internal */ -export function COption_TypeZ_clone_ptr(arg: number): number { +export function COption_TypeZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12050,7 +12057,7 @@ export function COption_TypeZ_clone_ptr(arg: number): number { } // struct LDKCOption_TypeZ COption_TypeZ_clone(const struct LDKCOption_TypeZ *NONNULL_PTR orig); /* @internal */ -export function COption_TypeZ_clone(orig: number): number { +export function COption_TypeZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12059,7 +12066,7 @@ export function COption_TypeZ_clone(orig: number): number { } // struct LDKCResult_COption_TypeZDecodeErrorZ CResult_COption_TypeZDecodeErrorZ_ok(struct LDKCOption_TypeZ o); /* @internal */ -export function CResult_COption_TypeZDecodeErrorZ_ok(o: number): number { +export function CResult_COption_TypeZDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12068,7 +12075,7 @@ export function CResult_COption_TypeZDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_COption_TypeZDecodeErrorZ CResult_COption_TypeZDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_COption_TypeZDecodeErrorZ_err(e: number): number { +export function CResult_COption_TypeZDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12077,7 +12084,7 @@ export function CResult_COption_TypeZDecodeErrorZ_err(e: number): number { } // bool CResult_COption_TypeZDecodeErrorZ_is_ok(const struct LDKCResult_COption_TypeZDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_COption_TypeZDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_COption_TypeZDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12086,16 +12093,16 @@ export function CResult_COption_TypeZDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_COption_TypeZDecodeErrorZ_free(struct LDKCResult_COption_TypeZDecodeErrorZ _res); /* @internal */ -export function CResult_COption_TypeZDecodeErrorZ_free(_res: number): void { +export function CResult_COption_TypeZDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_COption_TypeZDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_COption_TypeZDecodeErrorZ_clone_ptr(LDKCResult_COption_TypeZDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_COption_TypeZDecodeErrorZ_clone_ptr(LDKCResult_COption_TypeZDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_COption_TypeZDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_COption_TypeZDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12104,7 +12111,7 @@ export function CResult_COption_TypeZDecodeErrorZ_clone_ptr(arg: number): number } // struct LDKCResult_COption_TypeZDecodeErrorZ CResult_COption_TypeZDecodeErrorZ_clone(const struct LDKCResult_COption_TypeZDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_COption_TypeZDecodeErrorZ_clone(orig: number): number { +export function CResult_COption_TypeZDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12113,7 +12120,7 @@ export function CResult_COption_TypeZDecodeErrorZ_clone(orig: number): number { } // struct LDKCResult_PaymentIdPaymentErrorZ CResult_PaymentIdPaymentErrorZ_ok(struct LDKThirtyTwoBytes o); /* @internal */ -export function CResult_PaymentIdPaymentErrorZ_ok(o: number): number { +export function CResult_PaymentIdPaymentErrorZ_ok(o: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12122,7 +12129,7 @@ export function CResult_PaymentIdPaymentErrorZ_ok(o: number): number { } // struct LDKCResult_PaymentIdPaymentErrorZ CResult_PaymentIdPaymentErrorZ_err(struct LDKPaymentError e); /* @internal */ -export function CResult_PaymentIdPaymentErrorZ_err(e: number): number { +export function CResult_PaymentIdPaymentErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12131,7 +12138,7 @@ export function CResult_PaymentIdPaymentErrorZ_err(e: number): number { } // bool CResult_PaymentIdPaymentErrorZ_is_ok(const struct LDKCResult_PaymentIdPaymentErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_PaymentIdPaymentErrorZ_is_ok(o: number): boolean { +export function CResult_PaymentIdPaymentErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12140,16 +12147,16 @@ export function CResult_PaymentIdPaymentErrorZ_is_ok(o: number): boolean { } // void CResult_PaymentIdPaymentErrorZ_free(struct LDKCResult_PaymentIdPaymentErrorZ _res); /* @internal */ -export function CResult_PaymentIdPaymentErrorZ_free(_res: number): void { +export function CResult_PaymentIdPaymentErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_PaymentIdPaymentErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_PaymentIdPaymentErrorZ_clone_ptr(LDKCResult_PaymentIdPaymentErrorZ *NONNULL_PTR arg); + // uint64_t CResult_PaymentIdPaymentErrorZ_clone_ptr(LDKCResult_PaymentIdPaymentErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_PaymentIdPaymentErrorZ_clone_ptr(arg: number): number { +export function CResult_PaymentIdPaymentErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12158,7 +12165,7 @@ export function CResult_PaymentIdPaymentErrorZ_clone_ptr(arg: number): number { } // struct LDKCResult_PaymentIdPaymentErrorZ CResult_PaymentIdPaymentErrorZ_clone(const struct LDKCResult_PaymentIdPaymentErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_PaymentIdPaymentErrorZ_clone(orig: number): number { +export function CResult_PaymentIdPaymentErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12167,7 +12174,7 @@ export function CResult_PaymentIdPaymentErrorZ_clone(orig: number): number { } // struct LDKCResult_SiPrefixParseErrorZ CResult_SiPrefixParseErrorZ_ok(enum LDKSiPrefix o); /* @internal */ -export function CResult_SiPrefixParseErrorZ_ok(o: SiPrefix): number { +export function CResult_SiPrefixParseErrorZ_ok(o: SiPrefix): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12176,7 +12183,7 @@ export function CResult_SiPrefixParseErrorZ_ok(o: SiPrefix): number { } // struct LDKCResult_SiPrefixParseErrorZ CResult_SiPrefixParseErrorZ_err(struct LDKParseError e); /* @internal */ -export function CResult_SiPrefixParseErrorZ_err(e: number): number { +export function CResult_SiPrefixParseErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12185,7 +12192,7 @@ export function CResult_SiPrefixParseErrorZ_err(e: number): number { } // bool CResult_SiPrefixParseErrorZ_is_ok(const struct LDKCResult_SiPrefixParseErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_SiPrefixParseErrorZ_is_ok(o: number): boolean { +export function CResult_SiPrefixParseErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12194,16 +12201,16 @@ export function CResult_SiPrefixParseErrorZ_is_ok(o: number): boolean { } // void CResult_SiPrefixParseErrorZ_free(struct LDKCResult_SiPrefixParseErrorZ _res); /* @internal */ -export function CResult_SiPrefixParseErrorZ_free(_res: number): void { +export function CResult_SiPrefixParseErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_SiPrefixParseErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_SiPrefixParseErrorZ_clone_ptr(LDKCResult_SiPrefixParseErrorZ *NONNULL_PTR arg); + // uint64_t CResult_SiPrefixParseErrorZ_clone_ptr(LDKCResult_SiPrefixParseErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_SiPrefixParseErrorZ_clone_ptr(arg: number): number { +export function CResult_SiPrefixParseErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12212,7 +12219,7 @@ export function CResult_SiPrefixParseErrorZ_clone_ptr(arg: number): number { } // struct LDKCResult_SiPrefixParseErrorZ CResult_SiPrefixParseErrorZ_clone(const struct LDKCResult_SiPrefixParseErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_SiPrefixParseErrorZ_clone(orig: number): number { +export function CResult_SiPrefixParseErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12221,7 +12228,7 @@ export function CResult_SiPrefixParseErrorZ_clone(orig: number): number { } // struct LDKCResult_InvoiceParseOrSemanticErrorZ CResult_InvoiceParseOrSemanticErrorZ_ok(struct LDKInvoice o); /* @internal */ -export function CResult_InvoiceParseOrSemanticErrorZ_ok(o: number): number { +export function CResult_InvoiceParseOrSemanticErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12230,7 +12237,7 @@ export function CResult_InvoiceParseOrSemanticErrorZ_ok(o: number): number { } // struct LDKCResult_InvoiceParseOrSemanticErrorZ CResult_InvoiceParseOrSemanticErrorZ_err(struct LDKParseOrSemanticError e); /* @internal */ -export function CResult_InvoiceParseOrSemanticErrorZ_err(e: number): number { +export function CResult_InvoiceParseOrSemanticErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12239,7 +12246,7 @@ export function CResult_InvoiceParseOrSemanticErrorZ_err(e: number): number { } // bool CResult_InvoiceParseOrSemanticErrorZ_is_ok(const struct LDKCResult_InvoiceParseOrSemanticErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_InvoiceParseOrSemanticErrorZ_is_ok(o: number): boolean { +export function CResult_InvoiceParseOrSemanticErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12248,16 +12255,16 @@ export function CResult_InvoiceParseOrSemanticErrorZ_is_ok(o: number): boolean { } // void CResult_InvoiceParseOrSemanticErrorZ_free(struct LDKCResult_InvoiceParseOrSemanticErrorZ _res); /* @internal */ -export function CResult_InvoiceParseOrSemanticErrorZ_free(_res: number): void { +export function CResult_InvoiceParseOrSemanticErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_InvoiceParseOrSemanticErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_InvoiceParseOrSemanticErrorZ_clone_ptr(LDKCResult_InvoiceParseOrSemanticErrorZ *NONNULL_PTR arg); + // uint64_t CResult_InvoiceParseOrSemanticErrorZ_clone_ptr(LDKCResult_InvoiceParseOrSemanticErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_InvoiceParseOrSemanticErrorZ_clone_ptr(arg: number): number { +export function CResult_InvoiceParseOrSemanticErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12266,7 +12273,7 @@ export function CResult_InvoiceParseOrSemanticErrorZ_clone_ptr(arg: number): num } // struct LDKCResult_InvoiceParseOrSemanticErrorZ CResult_InvoiceParseOrSemanticErrorZ_clone(const struct LDKCResult_InvoiceParseOrSemanticErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_InvoiceParseOrSemanticErrorZ_clone(orig: number): number { +export function CResult_InvoiceParseOrSemanticErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12275,7 +12282,7 @@ export function CResult_InvoiceParseOrSemanticErrorZ_clone(orig: number): number } // struct LDKCResult_SignedRawInvoiceParseErrorZ CResult_SignedRawInvoiceParseErrorZ_ok(struct LDKSignedRawInvoice o); /* @internal */ -export function CResult_SignedRawInvoiceParseErrorZ_ok(o: number): number { +export function CResult_SignedRawInvoiceParseErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12284,7 +12291,7 @@ export function CResult_SignedRawInvoiceParseErrorZ_ok(o: number): number { } // struct LDKCResult_SignedRawInvoiceParseErrorZ CResult_SignedRawInvoiceParseErrorZ_err(struct LDKParseError e); /* @internal */ -export function CResult_SignedRawInvoiceParseErrorZ_err(e: number): number { +export function CResult_SignedRawInvoiceParseErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12293,7 +12300,7 @@ export function CResult_SignedRawInvoiceParseErrorZ_err(e: number): number { } // bool CResult_SignedRawInvoiceParseErrorZ_is_ok(const struct LDKCResult_SignedRawInvoiceParseErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_SignedRawInvoiceParseErrorZ_is_ok(o: number): boolean { +export function CResult_SignedRawInvoiceParseErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12302,16 +12309,16 @@ export function CResult_SignedRawInvoiceParseErrorZ_is_ok(o: number): boolean { } // void CResult_SignedRawInvoiceParseErrorZ_free(struct LDKCResult_SignedRawInvoiceParseErrorZ _res); /* @internal */ -export function CResult_SignedRawInvoiceParseErrorZ_free(_res: number): void { +export function CResult_SignedRawInvoiceParseErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_SignedRawInvoiceParseErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_SignedRawInvoiceParseErrorZ_clone_ptr(LDKCResult_SignedRawInvoiceParseErrorZ *NONNULL_PTR arg); + // uint64_t CResult_SignedRawInvoiceParseErrorZ_clone_ptr(LDKCResult_SignedRawInvoiceParseErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_SignedRawInvoiceParseErrorZ_clone_ptr(arg: number): number { +export function CResult_SignedRawInvoiceParseErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12320,16 +12327,16 @@ export function CResult_SignedRawInvoiceParseErrorZ_clone_ptr(arg: number): numb } // struct LDKCResult_SignedRawInvoiceParseErrorZ CResult_SignedRawInvoiceParseErrorZ_clone(const struct LDKCResult_SignedRawInvoiceParseErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_SignedRawInvoiceParseErrorZ_clone(orig: number): number { +export function CResult_SignedRawInvoiceParseErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_SignedRawInvoiceParseErrorZ_clone(orig); return nativeResponseValue; } - // uintptr_t C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone_ptr(LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ *NONNULL_PTR arg); + // uint64_t C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone_ptr(LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ *NONNULL_PTR arg); /* @internal */ -export function C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone_ptr(arg: number): number { +export function C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12338,7 +12345,7 @@ export function C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone_ptr(arg: number): } // struct LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone(const struct LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ *NONNULL_PTR orig); /* @internal */ -export function C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone(orig: number): number { +export function C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12347,7 +12354,7 @@ export function C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone(orig: number): nu } // struct LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ C3Tuple_RawInvoice_u832InvoiceSignatureZ_new(struct LDKRawInvoice a, struct LDKThirtyTwoBytes b, struct LDKInvoiceSignature c); /* @internal */ -export function C3Tuple_RawInvoice_u832InvoiceSignatureZ_new(a: number, b: number, c: number): number { +export function C3Tuple_RawInvoice_u832InvoiceSignatureZ_new(a: bigint, b: number, c: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12356,7 +12363,7 @@ export function C3Tuple_RawInvoice_u832InvoiceSignatureZ_new(a: number, b: numbe } // void C3Tuple_RawInvoice_u832InvoiceSignatureZ_free(struct LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ _res); /* @internal */ -export function C3Tuple_RawInvoice_u832InvoiceSignatureZ_free(_res: number): void { +export function C3Tuple_RawInvoice_u832InvoiceSignatureZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12365,7 +12372,7 @@ export function C3Tuple_RawInvoice_u832InvoiceSignatureZ_free(_res: number): voi } // struct LDKCResult_PayeePubKeyErrorZ CResult_PayeePubKeyErrorZ_ok(struct LDKPayeePubKey o); /* @internal */ -export function CResult_PayeePubKeyErrorZ_ok(o: number): number { +export function CResult_PayeePubKeyErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12374,7 +12381,7 @@ export function CResult_PayeePubKeyErrorZ_ok(o: number): number { } // struct LDKCResult_PayeePubKeyErrorZ CResult_PayeePubKeyErrorZ_err(enum LDKSecp256k1Error e); /* @internal */ -export function CResult_PayeePubKeyErrorZ_err(e: Secp256k1Error): number { +export function CResult_PayeePubKeyErrorZ_err(e: Secp256k1Error): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12383,7 +12390,7 @@ export function CResult_PayeePubKeyErrorZ_err(e: Secp256k1Error): number { } // bool CResult_PayeePubKeyErrorZ_is_ok(const struct LDKCResult_PayeePubKeyErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_PayeePubKeyErrorZ_is_ok(o: number): boolean { +export function CResult_PayeePubKeyErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12392,16 +12399,16 @@ export function CResult_PayeePubKeyErrorZ_is_ok(o: number): boolean { } // void CResult_PayeePubKeyErrorZ_free(struct LDKCResult_PayeePubKeyErrorZ _res); /* @internal */ -export function CResult_PayeePubKeyErrorZ_free(_res: number): void { +export function CResult_PayeePubKeyErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_PayeePubKeyErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_PayeePubKeyErrorZ_clone_ptr(LDKCResult_PayeePubKeyErrorZ *NONNULL_PTR arg); + // uint64_t CResult_PayeePubKeyErrorZ_clone_ptr(LDKCResult_PayeePubKeyErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_PayeePubKeyErrorZ_clone_ptr(arg: number): number { +export function CResult_PayeePubKeyErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12410,7 +12417,7 @@ export function CResult_PayeePubKeyErrorZ_clone_ptr(arg: number): number { } // struct LDKCResult_PayeePubKeyErrorZ CResult_PayeePubKeyErrorZ_clone(const struct LDKCResult_PayeePubKeyErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_PayeePubKeyErrorZ_clone(orig: number): number { +export function CResult_PayeePubKeyErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12428,7 +12435,7 @@ export function CVec_PrivateRouteZ_free(_res: number): void { } // struct LDKCResult_PositiveTimestampCreationErrorZ CResult_PositiveTimestampCreationErrorZ_ok(struct LDKPositiveTimestamp o); /* @internal */ -export function CResult_PositiveTimestampCreationErrorZ_ok(o: number): number { +export function CResult_PositiveTimestampCreationErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12437,7 +12444,7 @@ export function CResult_PositiveTimestampCreationErrorZ_ok(o: number): number { } // struct LDKCResult_PositiveTimestampCreationErrorZ CResult_PositiveTimestampCreationErrorZ_err(enum LDKCreationError e); /* @internal */ -export function CResult_PositiveTimestampCreationErrorZ_err(e: CreationError): number { +export function CResult_PositiveTimestampCreationErrorZ_err(e: CreationError): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12446,7 +12453,7 @@ export function CResult_PositiveTimestampCreationErrorZ_err(e: CreationError): n } // bool CResult_PositiveTimestampCreationErrorZ_is_ok(const struct LDKCResult_PositiveTimestampCreationErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_PositiveTimestampCreationErrorZ_is_ok(o: number): boolean { +export function CResult_PositiveTimestampCreationErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12455,16 +12462,16 @@ export function CResult_PositiveTimestampCreationErrorZ_is_ok(o: number): boolea } // void CResult_PositiveTimestampCreationErrorZ_free(struct LDKCResult_PositiveTimestampCreationErrorZ _res); /* @internal */ -export function CResult_PositiveTimestampCreationErrorZ_free(_res: number): void { +export function CResult_PositiveTimestampCreationErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_PositiveTimestampCreationErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_PositiveTimestampCreationErrorZ_clone_ptr(LDKCResult_PositiveTimestampCreationErrorZ *NONNULL_PTR arg); + // uint64_t CResult_PositiveTimestampCreationErrorZ_clone_ptr(LDKCResult_PositiveTimestampCreationErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_PositiveTimestampCreationErrorZ_clone_ptr(arg: number): number { +export function CResult_PositiveTimestampCreationErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12473,7 +12480,7 @@ export function CResult_PositiveTimestampCreationErrorZ_clone_ptr(arg: number): } // struct LDKCResult_PositiveTimestampCreationErrorZ CResult_PositiveTimestampCreationErrorZ_clone(const struct LDKCResult_PositiveTimestampCreationErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_PositiveTimestampCreationErrorZ_clone(orig: number): number { +export function CResult_PositiveTimestampCreationErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12482,7 +12489,7 @@ export function CResult_PositiveTimestampCreationErrorZ_clone(orig: number): num } // struct LDKCResult_NoneSemanticErrorZ CResult_NoneSemanticErrorZ_ok(void); /* @internal */ -export function CResult_NoneSemanticErrorZ_ok(): number { +export function CResult_NoneSemanticErrorZ_ok(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12491,7 +12498,7 @@ export function CResult_NoneSemanticErrorZ_ok(): number { } // struct LDKCResult_NoneSemanticErrorZ CResult_NoneSemanticErrorZ_err(enum LDKSemanticError e); /* @internal */ -export function CResult_NoneSemanticErrorZ_err(e: SemanticError): number { +export function CResult_NoneSemanticErrorZ_err(e: SemanticError): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12500,7 +12507,7 @@ export function CResult_NoneSemanticErrorZ_err(e: SemanticError): number { } // bool CResult_NoneSemanticErrorZ_is_ok(const struct LDKCResult_NoneSemanticErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_NoneSemanticErrorZ_is_ok(o: number): boolean { +export function CResult_NoneSemanticErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12509,16 +12516,16 @@ export function CResult_NoneSemanticErrorZ_is_ok(o: number): boolean { } // void CResult_NoneSemanticErrorZ_free(struct LDKCResult_NoneSemanticErrorZ _res); /* @internal */ -export function CResult_NoneSemanticErrorZ_free(_res: number): void { +export function CResult_NoneSemanticErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_NoneSemanticErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_NoneSemanticErrorZ_clone_ptr(LDKCResult_NoneSemanticErrorZ *NONNULL_PTR arg); + // uint64_t CResult_NoneSemanticErrorZ_clone_ptr(LDKCResult_NoneSemanticErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_NoneSemanticErrorZ_clone_ptr(arg: number): number { +export function CResult_NoneSemanticErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12527,7 +12534,7 @@ export function CResult_NoneSemanticErrorZ_clone_ptr(arg: number): number { } // struct LDKCResult_NoneSemanticErrorZ CResult_NoneSemanticErrorZ_clone(const struct LDKCResult_NoneSemanticErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_NoneSemanticErrorZ_clone(orig: number): number { +export function CResult_NoneSemanticErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12536,7 +12543,7 @@ export function CResult_NoneSemanticErrorZ_clone(orig: number): number { } // struct LDKCResult_InvoiceSemanticErrorZ CResult_InvoiceSemanticErrorZ_ok(struct LDKInvoice o); /* @internal */ -export function CResult_InvoiceSemanticErrorZ_ok(o: number): number { +export function CResult_InvoiceSemanticErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12545,7 +12552,7 @@ export function CResult_InvoiceSemanticErrorZ_ok(o: number): number { } // struct LDKCResult_InvoiceSemanticErrorZ CResult_InvoiceSemanticErrorZ_err(enum LDKSemanticError e); /* @internal */ -export function CResult_InvoiceSemanticErrorZ_err(e: SemanticError): number { +export function CResult_InvoiceSemanticErrorZ_err(e: SemanticError): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12554,7 +12561,7 @@ export function CResult_InvoiceSemanticErrorZ_err(e: SemanticError): number { } // bool CResult_InvoiceSemanticErrorZ_is_ok(const struct LDKCResult_InvoiceSemanticErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_InvoiceSemanticErrorZ_is_ok(o: number): boolean { +export function CResult_InvoiceSemanticErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12563,16 +12570,16 @@ export function CResult_InvoiceSemanticErrorZ_is_ok(o: number): boolean { } // void CResult_InvoiceSemanticErrorZ_free(struct LDKCResult_InvoiceSemanticErrorZ _res); /* @internal */ -export function CResult_InvoiceSemanticErrorZ_free(_res: number): void { +export function CResult_InvoiceSemanticErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_InvoiceSemanticErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_InvoiceSemanticErrorZ_clone_ptr(LDKCResult_InvoiceSemanticErrorZ *NONNULL_PTR arg); + // uint64_t CResult_InvoiceSemanticErrorZ_clone_ptr(LDKCResult_InvoiceSemanticErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_InvoiceSemanticErrorZ_clone_ptr(arg: number): number { +export function CResult_InvoiceSemanticErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12581,7 +12588,7 @@ export function CResult_InvoiceSemanticErrorZ_clone_ptr(arg: number): number { } // struct LDKCResult_InvoiceSemanticErrorZ CResult_InvoiceSemanticErrorZ_clone(const struct LDKCResult_InvoiceSemanticErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_InvoiceSemanticErrorZ_clone(orig: number): number { +export function CResult_InvoiceSemanticErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12590,7 +12597,7 @@ export function CResult_InvoiceSemanticErrorZ_clone(orig: number): number { } // struct LDKCResult_DescriptionCreationErrorZ CResult_DescriptionCreationErrorZ_ok(struct LDKDescription o); /* @internal */ -export function CResult_DescriptionCreationErrorZ_ok(o: number): number { +export function CResult_DescriptionCreationErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12599,7 +12606,7 @@ export function CResult_DescriptionCreationErrorZ_ok(o: number): number { } // struct LDKCResult_DescriptionCreationErrorZ CResult_DescriptionCreationErrorZ_err(enum LDKCreationError e); /* @internal */ -export function CResult_DescriptionCreationErrorZ_err(e: CreationError): number { +export function CResult_DescriptionCreationErrorZ_err(e: CreationError): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12608,7 +12615,7 @@ export function CResult_DescriptionCreationErrorZ_err(e: CreationError): number } // bool CResult_DescriptionCreationErrorZ_is_ok(const struct LDKCResult_DescriptionCreationErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_DescriptionCreationErrorZ_is_ok(o: number): boolean { +export function CResult_DescriptionCreationErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12617,16 +12624,16 @@ export function CResult_DescriptionCreationErrorZ_is_ok(o: number): boolean { } // void CResult_DescriptionCreationErrorZ_free(struct LDKCResult_DescriptionCreationErrorZ _res); /* @internal */ -export function CResult_DescriptionCreationErrorZ_free(_res: number): void { +export function CResult_DescriptionCreationErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_DescriptionCreationErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_DescriptionCreationErrorZ_clone_ptr(LDKCResult_DescriptionCreationErrorZ *NONNULL_PTR arg); + // uint64_t CResult_DescriptionCreationErrorZ_clone_ptr(LDKCResult_DescriptionCreationErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_DescriptionCreationErrorZ_clone_ptr(arg: number): number { +export function CResult_DescriptionCreationErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12635,7 +12642,7 @@ export function CResult_DescriptionCreationErrorZ_clone_ptr(arg: number): number } // struct LDKCResult_DescriptionCreationErrorZ CResult_DescriptionCreationErrorZ_clone(const struct LDKCResult_DescriptionCreationErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_DescriptionCreationErrorZ_clone(orig: number): number { +export function CResult_DescriptionCreationErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12644,7 +12651,7 @@ export function CResult_DescriptionCreationErrorZ_clone(orig: number): number { } // struct LDKCResult_PrivateRouteCreationErrorZ CResult_PrivateRouteCreationErrorZ_ok(struct LDKPrivateRoute o); /* @internal */ -export function CResult_PrivateRouteCreationErrorZ_ok(o: number): number { +export function CResult_PrivateRouteCreationErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12653,7 +12660,7 @@ export function CResult_PrivateRouteCreationErrorZ_ok(o: number): number { } // struct LDKCResult_PrivateRouteCreationErrorZ CResult_PrivateRouteCreationErrorZ_err(enum LDKCreationError e); /* @internal */ -export function CResult_PrivateRouteCreationErrorZ_err(e: CreationError): number { +export function CResult_PrivateRouteCreationErrorZ_err(e: CreationError): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12662,7 +12669,7 @@ export function CResult_PrivateRouteCreationErrorZ_err(e: CreationError): number } // bool CResult_PrivateRouteCreationErrorZ_is_ok(const struct LDKCResult_PrivateRouteCreationErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_PrivateRouteCreationErrorZ_is_ok(o: number): boolean { +export function CResult_PrivateRouteCreationErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12671,16 +12678,16 @@ export function CResult_PrivateRouteCreationErrorZ_is_ok(o: number): boolean { } // void CResult_PrivateRouteCreationErrorZ_free(struct LDKCResult_PrivateRouteCreationErrorZ _res); /* @internal */ -export function CResult_PrivateRouteCreationErrorZ_free(_res: number): void { +export function CResult_PrivateRouteCreationErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_PrivateRouteCreationErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_PrivateRouteCreationErrorZ_clone_ptr(LDKCResult_PrivateRouteCreationErrorZ *NONNULL_PTR arg); + // uint64_t CResult_PrivateRouteCreationErrorZ_clone_ptr(LDKCResult_PrivateRouteCreationErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_PrivateRouteCreationErrorZ_clone_ptr(arg: number): number { +export function CResult_PrivateRouteCreationErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12689,7 +12696,7 @@ export function CResult_PrivateRouteCreationErrorZ_clone_ptr(arg: number): numbe } // struct LDKCResult_PrivateRouteCreationErrorZ CResult_PrivateRouteCreationErrorZ_clone(const struct LDKCResult_PrivateRouteCreationErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_PrivateRouteCreationErrorZ_clone(orig: number): number { +export function CResult_PrivateRouteCreationErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12698,7 +12705,7 @@ export function CResult_PrivateRouteCreationErrorZ_clone(orig: number): number { } // struct LDKCResult_StringErrorZ CResult_StringErrorZ_ok(struct LDKStr o); /* @internal */ -export function CResult_StringErrorZ_ok(o: number): number { +export function CResult_StringErrorZ_ok(o: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12707,7 +12714,7 @@ export function CResult_StringErrorZ_ok(o: number): number { } // struct LDKCResult_StringErrorZ CResult_StringErrorZ_err(enum LDKSecp256k1Error e); /* @internal */ -export function CResult_StringErrorZ_err(e: Secp256k1Error): number { +export function CResult_StringErrorZ_err(e: Secp256k1Error): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12716,7 +12723,7 @@ export function CResult_StringErrorZ_err(e: Secp256k1Error): number { } // bool CResult_StringErrorZ_is_ok(const struct LDKCResult_StringErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_StringErrorZ_is_ok(o: number): boolean { +export function CResult_StringErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12725,16 +12732,16 @@ export function CResult_StringErrorZ_is_ok(o: number): boolean { } // void CResult_StringErrorZ_free(struct LDKCResult_StringErrorZ _res); /* @internal */ -export function CResult_StringErrorZ_free(_res: number): void { +export function CResult_StringErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_StringErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_StringErrorZ_clone_ptr(LDKCResult_StringErrorZ *NONNULL_PTR arg); + // uint64_t CResult_StringErrorZ_clone_ptr(LDKCResult_StringErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_StringErrorZ_clone_ptr(arg: number): number { +export function CResult_StringErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12743,7 +12750,7 @@ export function CResult_StringErrorZ_clone_ptr(arg: number): number { } // struct LDKCResult_StringErrorZ CResult_StringErrorZ_clone(const struct LDKCResult_StringErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_StringErrorZ_clone(orig: number): number { +export function CResult_StringErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12752,7 +12759,7 @@ export function CResult_StringErrorZ_clone(orig: number): number { } // struct LDKCResult_ChannelMonitorUpdateDecodeErrorZ CResult_ChannelMonitorUpdateDecodeErrorZ_ok(struct LDKChannelMonitorUpdate o); /* @internal */ -export function CResult_ChannelMonitorUpdateDecodeErrorZ_ok(o: number): number { +export function CResult_ChannelMonitorUpdateDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12761,7 +12768,7 @@ export function CResult_ChannelMonitorUpdateDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_ChannelMonitorUpdateDecodeErrorZ CResult_ChannelMonitorUpdateDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_ChannelMonitorUpdateDecodeErrorZ_err(e: number): number { +export function CResult_ChannelMonitorUpdateDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12770,7 +12777,7 @@ export function CResult_ChannelMonitorUpdateDecodeErrorZ_err(e: number): number } // bool CResult_ChannelMonitorUpdateDecodeErrorZ_is_ok(const struct LDKCResult_ChannelMonitorUpdateDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_ChannelMonitorUpdateDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_ChannelMonitorUpdateDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12779,16 +12786,16 @@ export function CResult_ChannelMonitorUpdateDecodeErrorZ_is_ok(o: number): boole } // void CResult_ChannelMonitorUpdateDecodeErrorZ_free(struct LDKCResult_ChannelMonitorUpdateDecodeErrorZ _res); /* @internal */ -export function CResult_ChannelMonitorUpdateDecodeErrorZ_free(_res: number): void { +export function CResult_ChannelMonitorUpdateDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_ChannelMonitorUpdateDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_ChannelMonitorUpdateDecodeErrorZ_clone_ptr(LDKCResult_ChannelMonitorUpdateDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_ChannelMonitorUpdateDecodeErrorZ_clone_ptr(LDKCResult_ChannelMonitorUpdateDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_ChannelMonitorUpdateDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_ChannelMonitorUpdateDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12797,7 +12804,7 @@ export function CResult_ChannelMonitorUpdateDecodeErrorZ_clone_ptr(arg: number): } // struct LDKCResult_ChannelMonitorUpdateDecodeErrorZ CResult_ChannelMonitorUpdateDecodeErrorZ_clone(const struct LDKCResult_ChannelMonitorUpdateDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_ChannelMonitorUpdateDecodeErrorZ_clone(orig: number): number { +export function CResult_ChannelMonitorUpdateDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12806,7 +12813,7 @@ export function CResult_ChannelMonitorUpdateDecodeErrorZ_clone(orig: number): nu } // struct LDKCOption_MonitorEventZ COption_MonitorEventZ_some(struct LDKMonitorEvent o); /* @internal */ -export function COption_MonitorEventZ_some(o: number): number { +export function COption_MonitorEventZ_some(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12815,7 +12822,7 @@ export function COption_MonitorEventZ_some(o: number): number { } // struct LDKCOption_MonitorEventZ COption_MonitorEventZ_none(void); /* @internal */ -export function COption_MonitorEventZ_none(): number { +export function COption_MonitorEventZ_none(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12824,16 +12831,16 @@ export function COption_MonitorEventZ_none(): number { } // void COption_MonitorEventZ_free(struct LDKCOption_MonitorEventZ _res); /* @internal */ -export function COption_MonitorEventZ_free(_res: number): void { +export function COption_MonitorEventZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_COption_MonitorEventZ_free(_res); // debug statements here } - // uintptr_t COption_MonitorEventZ_clone_ptr(LDKCOption_MonitorEventZ *NONNULL_PTR arg); + // uint64_t COption_MonitorEventZ_clone_ptr(LDKCOption_MonitorEventZ *NONNULL_PTR arg); /* @internal */ -export function COption_MonitorEventZ_clone_ptr(arg: number): number { +export function COption_MonitorEventZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12842,7 +12849,7 @@ export function COption_MonitorEventZ_clone_ptr(arg: number): number { } // struct LDKCOption_MonitorEventZ COption_MonitorEventZ_clone(const struct LDKCOption_MonitorEventZ *NONNULL_PTR orig); /* @internal */ -export function COption_MonitorEventZ_clone(orig: number): number { +export function COption_MonitorEventZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12851,7 +12858,7 @@ export function COption_MonitorEventZ_clone(orig: number): number { } // struct LDKCResult_COption_MonitorEventZDecodeErrorZ CResult_COption_MonitorEventZDecodeErrorZ_ok(struct LDKCOption_MonitorEventZ o); /* @internal */ -export function CResult_COption_MonitorEventZDecodeErrorZ_ok(o: number): number { +export function CResult_COption_MonitorEventZDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12860,7 +12867,7 @@ export function CResult_COption_MonitorEventZDecodeErrorZ_ok(o: number): number } // struct LDKCResult_COption_MonitorEventZDecodeErrorZ CResult_COption_MonitorEventZDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_COption_MonitorEventZDecodeErrorZ_err(e: number): number { +export function CResult_COption_MonitorEventZDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12869,7 +12876,7 @@ export function CResult_COption_MonitorEventZDecodeErrorZ_err(e: number): number } // bool CResult_COption_MonitorEventZDecodeErrorZ_is_ok(const struct LDKCResult_COption_MonitorEventZDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_COption_MonitorEventZDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_COption_MonitorEventZDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12878,16 +12885,16 @@ export function CResult_COption_MonitorEventZDecodeErrorZ_is_ok(o: number): bool } // void CResult_COption_MonitorEventZDecodeErrorZ_free(struct LDKCResult_COption_MonitorEventZDecodeErrorZ _res); /* @internal */ -export function CResult_COption_MonitorEventZDecodeErrorZ_free(_res: number): void { +export function CResult_COption_MonitorEventZDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_COption_MonitorEventZDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_COption_MonitorEventZDecodeErrorZ_clone_ptr(LDKCResult_COption_MonitorEventZDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_COption_MonitorEventZDecodeErrorZ_clone_ptr(LDKCResult_COption_MonitorEventZDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_COption_MonitorEventZDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_COption_MonitorEventZDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12896,7 +12903,7 @@ export function CResult_COption_MonitorEventZDecodeErrorZ_clone_ptr(arg: number) } // struct LDKCResult_COption_MonitorEventZDecodeErrorZ CResult_COption_MonitorEventZDecodeErrorZ_clone(const struct LDKCResult_COption_MonitorEventZDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_COption_MonitorEventZDecodeErrorZ_clone(orig: number): number { +export function CResult_COption_MonitorEventZDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12905,7 +12912,7 @@ export function CResult_COption_MonitorEventZDecodeErrorZ_clone(orig: number): n } // struct LDKCResult_HTLCUpdateDecodeErrorZ CResult_HTLCUpdateDecodeErrorZ_ok(struct LDKHTLCUpdate o); /* @internal */ -export function CResult_HTLCUpdateDecodeErrorZ_ok(o: number): number { +export function CResult_HTLCUpdateDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12914,7 +12921,7 @@ export function CResult_HTLCUpdateDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_HTLCUpdateDecodeErrorZ CResult_HTLCUpdateDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_HTLCUpdateDecodeErrorZ_err(e: number): number { +export function CResult_HTLCUpdateDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12923,7 +12930,7 @@ export function CResult_HTLCUpdateDecodeErrorZ_err(e: number): number { } // bool CResult_HTLCUpdateDecodeErrorZ_is_ok(const struct LDKCResult_HTLCUpdateDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_HTLCUpdateDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_HTLCUpdateDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12932,16 +12939,16 @@ export function CResult_HTLCUpdateDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_HTLCUpdateDecodeErrorZ_free(struct LDKCResult_HTLCUpdateDecodeErrorZ _res); /* @internal */ -export function CResult_HTLCUpdateDecodeErrorZ_free(_res: number): void { +export function CResult_HTLCUpdateDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_HTLCUpdateDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_HTLCUpdateDecodeErrorZ_clone_ptr(LDKCResult_HTLCUpdateDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_HTLCUpdateDecodeErrorZ_clone_ptr(LDKCResult_HTLCUpdateDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_HTLCUpdateDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_HTLCUpdateDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12950,16 +12957,16 @@ export function CResult_HTLCUpdateDecodeErrorZ_clone_ptr(arg: number): number { } // struct LDKCResult_HTLCUpdateDecodeErrorZ CResult_HTLCUpdateDecodeErrorZ_clone(const struct LDKCResult_HTLCUpdateDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_HTLCUpdateDecodeErrorZ_clone(orig: number): number { +export function CResult_HTLCUpdateDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_HTLCUpdateDecodeErrorZ_clone(orig); return nativeResponseValue; } - // uintptr_t C2Tuple_OutPointScriptZ_clone_ptr(LDKC2Tuple_OutPointScriptZ *NONNULL_PTR arg); + // uint64_t C2Tuple_OutPointScriptZ_clone_ptr(LDKC2Tuple_OutPointScriptZ *NONNULL_PTR arg); /* @internal */ -export function C2Tuple_OutPointScriptZ_clone_ptr(arg: number): number { +export function C2Tuple_OutPointScriptZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12968,7 +12975,7 @@ export function C2Tuple_OutPointScriptZ_clone_ptr(arg: number): number { } // struct LDKC2Tuple_OutPointScriptZ C2Tuple_OutPointScriptZ_clone(const struct LDKC2Tuple_OutPointScriptZ *NONNULL_PTR orig); /* @internal */ -export function C2Tuple_OutPointScriptZ_clone(orig: number): number { +export function C2Tuple_OutPointScriptZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12977,7 +12984,7 @@ export function C2Tuple_OutPointScriptZ_clone(orig: number): number { } // struct LDKC2Tuple_OutPointScriptZ C2Tuple_OutPointScriptZ_new(struct LDKOutPoint a, struct LDKCVec_u8Z b); /* @internal */ -export function C2Tuple_OutPointScriptZ_new(a: number, b: number): number { +export function C2Tuple_OutPointScriptZ_new(a: bigint, b: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -12986,16 +12993,16 @@ export function C2Tuple_OutPointScriptZ_new(a: number, b: number): number { } // void C2Tuple_OutPointScriptZ_free(struct LDKC2Tuple_OutPointScriptZ _res); /* @internal */ -export function C2Tuple_OutPointScriptZ_free(_res: number): void { +export function C2Tuple_OutPointScriptZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_C2Tuple_OutPointScriptZ_free(_res); // debug statements here } - // uintptr_t C2Tuple_u32ScriptZ_clone_ptr(LDKC2Tuple_u32ScriptZ *NONNULL_PTR arg); + // uint64_t C2Tuple_u32ScriptZ_clone_ptr(LDKC2Tuple_u32ScriptZ *NONNULL_PTR arg); /* @internal */ -export function C2Tuple_u32ScriptZ_clone_ptr(arg: number): number { +export function C2Tuple_u32ScriptZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13004,7 +13011,7 @@ export function C2Tuple_u32ScriptZ_clone_ptr(arg: number): number { } // struct LDKC2Tuple_u32ScriptZ C2Tuple_u32ScriptZ_clone(const struct LDKC2Tuple_u32ScriptZ *NONNULL_PTR orig); /* @internal */ -export function C2Tuple_u32ScriptZ_clone(orig: number): number { +export function C2Tuple_u32ScriptZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13013,7 +13020,7 @@ export function C2Tuple_u32ScriptZ_clone(orig: number): number { } // struct LDKC2Tuple_u32ScriptZ C2Tuple_u32ScriptZ_new(uint32_t a, struct LDKCVec_u8Z b); /* @internal */ -export function C2Tuple_u32ScriptZ_new(a: number, b: number): number { +export function C2Tuple_u32ScriptZ_new(a: number, b: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13022,7 +13029,7 @@ export function C2Tuple_u32ScriptZ_new(a: number, b: number): number { } // void C2Tuple_u32ScriptZ_free(struct LDKC2Tuple_u32ScriptZ _res); /* @internal */ -export function C2Tuple_u32ScriptZ_free(_res: number): void { +export function C2Tuple_u32ScriptZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13038,9 +13045,9 @@ export function CVec_C2Tuple_u32ScriptZZ_free(_res: number): void { const nativeResponseValue = wasm.TS_CVec_C2Tuple_u32ScriptZZ_free(_res); // debug statements here } - // uintptr_t C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone_ptr(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ *NONNULL_PTR arg); + // uint64_t C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone_ptr(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ *NONNULL_PTR arg); /* @internal */ -export function C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone_ptr(arg: number): number { +export function C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13049,7 +13056,7 @@ export function C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone_ptr(arg: number): nu } // struct LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone(const struct LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ *NONNULL_PTR orig); /* @internal */ -export function C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone(orig: number): number { +export function C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13058,7 +13065,7 @@ export function C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone(orig: number): numbe } // struct LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_new(struct LDKThirtyTwoBytes a, struct LDKCVec_C2Tuple_u32ScriptZZ b); /* @internal */ -export function C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_new(a: number, b: number): number { +export function C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_new(a: number, b: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13067,7 +13074,7 @@ export function C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_new(a: number, b: number): } // void C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_free(struct LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ _res); /* @internal */ -export function C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_free(_res: number): void { +export function C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13101,9 +13108,9 @@ export function CVec_TransactionZ_free(_res: number): void { const nativeResponseValue = wasm.TS_CVec_TransactionZ_free(_res); // debug statements here } - // uintptr_t C2Tuple_u32TxOutZ_clone_ptr(LDKC2Tuple_u32TxOutZ *NONNULL_PTR arg); + // uint64_t C2Tuple_u32TxOutZ_clone_ptr(LDKC2Tuple_u32TxOutZ *NONNULL_PTR arg); /* @internal */ -export function C2Tuple_u32TxOutZ_clone_ptr(arg: number): number { +export function C2Tuple_u32TxOutZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13112,7 +13119,7 @@ export function C2Tuple_u32TxOutZ_clone_ptr(arg: number): number { } // struct LDKC2Tuple_u32TxOutZ C2Tuple_u32TxOutZ_clone(const struct LDKC2Tuple_u32TxOutZ *NONNULL_PTR orig); /* @internal */ -export function C2Tuple_u32TxOutZ_clone(orig: number): number { +export function C2Tuple_u32TxOutZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13121,7 +13128,7 @@ export function C2Tuple_u32TxOutZ_clone(orig: number): number { } // struct LDKC2Tuple_u32TxOutZ C2Tuple_u32TxOutZ_new(uint32_t a, struct LDKTxOut b); /* @internal */ -export function C2Tuple_u32TxOutZ_new(a: number, b: number): number { +export function C2Tuple_u32TxOutZ_new(a: number, b: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13130,7 +13137,7 @@ export function C2Tuple_u32TxOutZ_new(a: number, b: number): number { } // void C2Tuple_u32TxOutZ_free(struct LDKC2Tuple_u32TxOutZ _res); /* @internal */ -export function C2Tuple_u32TxOutZ_free(_res: number): void { +export function C2Tuple_u32TxOutZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13146,9 +13153,9 @@ export function CVec_C2Tuple_u32TxOutZZ_free(_res: number): void { const nativeResponseValue = wasm.TS_CVec_C2Tuple_u32TxOutZZ_free(_res); // debug statements here } - // uintptr_t C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone_ptr(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ *NONNULL_PTR arg); + // uint64_t C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone_ptr(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ *NONNULL_PTR arg); /* @internal */ -export function C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone_ptr(arg: number): number { +export function C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13157,7 +13164,7 @@ export function C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone_ptr(arg: number): num } // struct LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone(const struct LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ *NONNULL_PTR orig); /* @internal */ -export function C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone(orig: number): number { +export function C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13166,7 +13173,7 @@ export function C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone(orig: number): number } // struct LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_new(struct LDKThirtyTwoBytes a, struct LDKCVec_C2Tuple_u32TxOutZZ b); /* @internal */ -export function C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_new(a: number, b: number): number { +export function C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_new(a: number, b: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13175,7 +13182,7 @@ export function C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_new(a: number, b: number): } // void C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_free(struct LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ _res); /* @internal */ -export function C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_free(_res: number): void { +export function C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13200,9 +13207,9 @@ export function CVec_BalanceZ_free(_res: number): void { const nativeResponseValue = wasm.TS_CVec_BalanceZ_free(_res); // debug statements here } - // uintptr_t C2Tuple_BlockHashChannelMonitorZ_clone_ptr(LDKC2Tuple_BlockHashChannelMonitorZ *NONNULL_PTR arg); + // uint64_t C2Tuple_BlockHashChannelMonitorZ_clone_ptr(LDKC2Tuple_BlockHashChannelMonitorZ *NONNULL_PTR arg); /* @internal */ -export function C2Tuple_BlockHashChannelMonitorZ_clone_ptr(arg: number): number { +export function C2Tuple_BlockHashChannelMonitorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13211,7 +13218,7 @@ export function C2Tuple_BlockHashChannelMonitorZ_clone_ptr(arg: number): number } // struct LDKC2Tuple_BlockHashChannelMonitorZ C2Tuple_BlockHashChannelMonitorZ_clone(const struct LDKC2Tuple_BlockHashChannelMonitorZ *NONNULL_PTR orig); /* @internal */ -export function C2Tuple_BlockHashChannelMonitorZ_clone(orig: number): number { +export function C2Tuple_BlockHashChannelMonitorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13220,7 +13227,7 @@ export function C2Tuple_BlockHashChannelMonitorZ_clone(orig: number): number { } // struct LDKC2Tuple_BlockHashChannelMonitorZ C2Tuple_BlockHashChannelMonitorZ_new(struct LDKThirtyTwoBytes a, struct LDKChannelMonitor b); /* @internal */ -export function C2Tuple_BlockHashChannelMonitorZ_new(a: number, b: number): number { +export function C2Tuple_BlockHashChannelMonitorZ_new(a: number, b: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13229,7 +13236,7 @@ export function C2Tuple_BlockHashChannelMonitorZ_new(a: number, b: number): numb } // void C2Tuple_BlockHashChannelMonitorZ_free(struct LDKC2Tuple_BlockHashChannelMonitorZ _res); /* @internal */ -export function C2Tuple_BlockHashChannelMonitorZ_free(_res: number): void { +export function C2Tuple_BlockHashChannelMonitorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13238,7 +13245,7 @@ export function C2Tuple_BlockHashChannelMonitorZ_free(_res: number): void { } // struct LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_ok(struct LDKC2Tuple_BlockHashChannelMonitorZ o); /* @internal */ -export function CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_ok(o: number): number { +export function CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13247,7 +13254,7 @@ export function CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_ok(o: numbe } // struct LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_err(e: number): number { +export function CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13256,7 +13263,7 @@ export function CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_err(e: numb } // bool CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_is_ok(const struct LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13265,16 +13272,16 @@ export function CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_is_ok(o: nu } // void CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_free(struct LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ _res); /* @internal */ -export function CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_free(_res: number): void { +export function CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone_ptr(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone_ptr(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13283,16 +13290,16 @@ export function CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone_ptr(a } // struct LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone(const struct LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone(orig: number): number { +export function CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone(orig); return nativeResponseValue; } - // uintptr_t C2Tuple_PublicKeyTypeZ_clone_ptr(LDKC2Tuple_PublicKeyTypeZ *NONNULL_PTR arg); + // uint64_t C2Tuple_PublicKeyTypeZ_clone_ptr(LDKC2Tuple_PublicKeyTypeZ *NONNULL_PTR arg); /* @internal */ -export function C2Tuple_PublicKeyTypeZ_clone_ptr(arg: number): number { +export function C2Tuple_PublicKeyTypeZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13301,7 +13308,7 @@ export function C2Tuple_PublicKeyTypeZ_clone_ptr(arg: number): number { } // struct LDKC2Tuple_PublicKeyTypeZ C2Tuple_PublicKeyTypeZ_clone(const struct LDKC2Tuple_PublicKeyTypeZ *NONNULL_PTR orig); /* @internal */ -export function C2Tuple_PublicKeyTypeZ_clone(orig: number): number { +export function C2Tuple_PublicKeyTypeZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13310,7 +13317,7 @@ export function C2Tuple_PublicKeyTypeZ_clone(orig: number): number { } // struct LDKC2Tuple_PublicKeyTypeZ C2Tuple_PublicKeyTypeZ_new(struct LDKPublicKey a, struct LDKType b); /* @internal */ -export function C2Tuple_PublicKeyTypeZ_new(a: number, b: number): number { +export function C2Tuple_PublicKeyTypeZ_new(a: number, b: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13319,7 +13326,7 @@ export function C2Tuple_PublicKeyTypeZ_new(a: number, b: number): number { } // void C2Tuple_PublicKeyTypeZ_free(struct LDKC2Tuple_PublicKeyTypeZ _res); /* @internal */ -export function C2Tuple_PublicKeyTypeZ_free(_res: number): void { +export function C2Tuple_PublicKeyTypeZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13337,7 +13344,7 @@ export function CVec_C2Tuple_PublicKeyTypeZZ_free(_res: number): void { } // struct LDKCOption_NetAddressZ COption_NetAddressZ_some(struct LDKNetAddress o); /* @internal */ -export function COption_NetAddressZ_some(o: number): number { +export function COption_NetAddressZ_some(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13346,7 +13353,7 @@ export function COption_NetAddressZ_some(o: number): number { } // struct LDKCOption_NetAddressZ COption_NetAddressZ_none(void); /* @internal */ -export function COption_NetAddressZ_none(): number { +export function COption_NetAddressZ_none(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13355,16 +13362,16 @@ export function COption_NetAddressZ_none(): number { } // void COption_NetAddressZ_free(struct LDKCOption_NetAddressZ _res); /* @internal */ -export function COption_NetAddressZ_free(_res: number): void { +export function COption_NetAddressZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_COption_NetAddressZ_free(_res); // debug statements here } - // uintptr_t COption_NetAddressZ_clone_ptr(LDKCOption_NetAddressZ *NONNULL_PTR arg); + // uint64_t COption_NetAddressZ_clone_ptr(LDKCOption_NetAddressZ *NONNULL_PTR arg); /* @internal */ -export function COption_NetAddressZ_clone_ptr(arg: number): number { +export function COption_NetAddressZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13373,7 +13380,7 @@ export function COption_NetAddressZ_clone_ptr(arg: number): number { } // struct LDKCOption_NetAddressZ COption_NetAddressZ_clone(const struct LDKCOption_NetAddressZ *NONNULL_PTR orig); /* @internal */ -export function COption_NetAddressZ_clone(orig: number): number { +export function COption_NetAddressZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13382,7 +13389,7 @@ export function COption_NetAddressZ_clone(orig: number): number { } // struct LDKCResult_CVec_u8ZPeerHandleErrorZ CResult_CVec_u8ZPeerHandleErrorZ_ok(struct LDKCVec_u8Z o); /* @internal */ -export function CResult_CVec_u8ZPeerHandleErrorZ_ok(o: number): number { +export function CResult_CVec_u8ZPeerHandleErrorZ_ok(o: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13391,7 +13398,7 @@ export function CResult_CVec_u8ZPeerHandleErrorZ_ok(o: number): number { } // struct LDKCResult_CVec_u8ZPeerHandleErrorZ CResult_CVec_u8ZPeerHandleErrorZ_err(struct LDKPeerHandleError e); /* @internal */ -export function CResult_CVec_u8ZPeerHandleErrorZ_err(e: number): number { +export function CResult_CVec_u8ZPeerHandleErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13400,7 +13407,7 @@ export function CResult_CVec_u8ZPeerHandleErrorZ_err(e: number): number { } // bool CResult_CVec_u8ZPeerHandleErrorZ_is_ok(const struct LDKCResult_CVec_u8ZPeerHandleErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_CVec_u8ZPeerHandleErrorZ_is_ok(o: number): boolean { +export function CResult_CVec_u8ZPeerHandleErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13409,16 +13416,16 @@ export function CResult_CVec_u8ZPeerHandleErrorZ_is_ok(o: number): boolean { } // void CResult_CVec_u8ZPeerHandleErrorZ_free(struct LDKCResult_CVec_u8ZPeerHandleErrorZ _res); /* @internal */ -export function CResult_CVec_u8ZPeerHandleErrorZ_free(_res: number): void { +export function CResult_CVec_u8ZPeerHandleErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_CVec_u8ZPeerHandleErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_CVec_u8ZPeerHandleErrorZ_clone_ptr(LDKCResult_CVec_u8ZPeerHandleErrorZ *NONNULL_PTR arg); + // uint64_t CResult_CVec_u8ZPeerHandleErrorZ_clone_ptr(LDKCResult_CVec_u8ZPeerHandleErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_CVec_u8ZPeerHandleErrorZ_clone_ptr(arg: number): number { +export function CResult_CVec_u8ZPeerHandleErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13427,7 +13434,7 @@ export function CResult_CVec_u8ZPeerHandleErrorZ_clone_ptr(arg: number): number } // struct LDKCResult_CVec_u8ZPeerHandleErrorZ CResult_CVec_u8ZPeerHandleErrorZ_clone(const struct LDKCResult_CVec_u8ZPeerHandleErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_CVec_u8ZPeerHandleErrorZ_clone(orig: number): number { +export function CResult_CVec_u8ZPeerHandleErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13436,7 +13443,7 @@ export function CResult_CVec_u8ZPeerHandleErrorZ_clone(orig: number): number { } // struct LDKCResult_NonePeerHandleErrorZ CResult_NonePeerHandleErrorZ_ok(void); /* @internal */ -export function CResult_NonePeerHandleErrorZ_ok(): number { +export function CResult_NonePeerHandleErrorZ_ok(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13445,7 +13452,7 @@ export function CResult_NonePeerHandleErrorZ_ok(): number { } // struct LDKCResult_NonePeerHandleErrorZ CResult_NonePeerHandleErrorZ_err(struct LDKPeerHandleError e); /* @internal */ -export function CResult_NonePeerHandleErrorZ_err(e: number): number { +export function CResult_NonePeerHandleErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13454,7 +13461,7 @@ export function CResult_NonePeerHandleErrorZ_err(e: number): number { } // bool CResult_NonePeerHandleErrorZ_is_ok(const struct LDKCResult_NonePeerHandleErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_NonePeerHandleErrorZ_is_ok(o: number): boolean { +export function CResult_NonePeerHandleErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13463,16 +13470,16 @@ export function CResult_NonePeerHandleErrorZ_is_ok(o: number): boolean { } // void CResult_NonePeerHandleErrorZ_free(struct LDKCResult_NonePeerHandleErrorZ _res); /* @internal */ -export function CResult_NonePeerHandleErrorZ_free(_res: number): void { +export function CResult_NonePeerHandleErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_NonePeerHandleErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_NonePeerHandleErrorZ_clone_ptr(LDKCResult_NonePeerHandleErrorZ *NONNULL_PTR arg); + // uint64_t CResult_NonePeerHandleErrorZ_clone_ptr(LDKCResult_NonePeerHandleErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_NonePeerHandleErrorZ_clone_ptr(arg: number): number { +export function CResult_NonePeerHandleErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13481,7 +13488,7 @@ export function CResult_NonePeerHandleErrorZ_clone_ptr(arg: number): number { } // struct LDKCResult_NonePeerHandleErrorZ CResult_NonePeerHandleErrorZ_clone(const struct LDKCResult_NonePeerHandleErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_NonePeerHandleErrorZ_clone(orig: number): number { +export function CResult_NonePeerHandleErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13490,7 +13497,7 @@ export function CResult_NonePeerHandleErrorZ_clone(orig: number): number { } // struct LDKCResult_boolPeerHandleErrorZ CResult_boolPeerHandleErrorZ_ok(bool o); /* @internal */ -export function CResult_boolPeerHandleErrorZ_ok(o: boolean): number { +export function CResult_boolPeerHandleErrorZ_ok(o: boolean): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13499,7 +13506,7 @@ export function CResult_boolPeerHandleErrorZ_ok(o: boolean): number { } // struct LDKCResult_boolPeerHandleErrorZ CResult_boolPeerHandleErrorZ_err(struct LDKPeerHandleError e); /* @internal */ -export function CResult_boolPeerHandleErrorZ_err(e: number): number { +export function CResult_boolPeerHandleErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13508,7 +13515,7 @@ export function CResult_boolPeerHandleErrorZ_err(e: number): number { } // bool CResult_boolPeerHandleErrorZ_is_ok(const struct LDKCResult_boolPeerHandleErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_boolPeerHandleErrorZ_is_ok(o: number): boolean { +export function CResult_boolPeerHandleErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13517,16 +13524,16 @@ export function CResult_boolPeerHandleErrorZ_is_ok(o: number): boolean { } // void CResult_boolPeerHandleErrorZ_free(struct LDKCResult_boolPeerHandleErrorZ _res); /* @internal */ -export function CResult_boolPeerHandleErrorZ_free(_res: number): void { +export function CResult_boolPeerHandleErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_boolPeerHandleErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_boolPeerHandleErrorZ_clone_ptr(LDKCResult_boolPeerHandleErrorZ *NONNULL_PTR arg); + // uint64_t CResult_boolPeerHandleErrorZ_clone_ptr(LDKCResult_boolPeerHandleErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_boolPeerHandleErrorZ_clone_ptr(arg: number): number { +export function CResult_boolPeerHandleErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13535,7 +13542,7 @@ export function CResult_boolPeerHandleErrorZ_clone_ptr(arg: number): number { } // struct LDKCResult_boolPeerHandleErrorZ CResult_boolPeerHandleErrorZ_clone(const struct LDKCResult_boolPeerHandleErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_boolPeerHandleErrorZ_clone(orig: number): number { +export function CResult_boolPeerHandleErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13544,7 +13551,7 @@ export function CResult_boolPeerHandleErrorZ_clone(orig: number): number { } // struct LDKCResult_NoneErrorZ CResult_NoneErrorZ_ok(void); /* @internal */ -export function CResult_NoneErrorZ_ok(): number { +export function CResult_NoneErrorZ_ok(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13553,7 +13560,7 @@ export function CResult_NoneErrorZ_ok(): number { } // struct LDKCResult_NoneErrorZ CResult_NoneErrorZ_err(enum LDKIOError e); /* @internal */ -export function CResult_NoneErrorZ_err(e: IOError): number { +export function CResult_NoneErrorZ_err(e: IOError): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13562,7 +13569,7 @@ export function CResult_NoneErrorZ_err(e: IOError): number { } // bool CResult_NoneErrorZ_is_ok(const struct LDKCResult_NoneErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_NoneErrorZ_is_ok(o: number): boolean { +export function CResult_NoneErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13571,16 +13578,16 @@ export function CResult_NoneErrorZ_is_ok(o: number): boolean { } // void CResult_NoneErrorZ_free(struct LDKCResult_NoneErrorZ _res); /* @internal */ -export function CResult_NoneErrorZ_free(_res: number): void { +export function CResult_NoneErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_NoneErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_NoneErrorZ_clone_ptr(LDKCResult_NoneErrorZ *NONNULL_PTR arg); + // uint64_t CResult_NoneErrorZ_clone_ptr(LDKCResult_NoneErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_NoneErrorZ_clone_ptr(arg: number): number { +export function CResult_NoneErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13589,7 +13596,7 @@ export function CResult_NoneErrorZ_clone_ptr(arg: number): number { } // struct LDKCResult_NoneErrorZ CResult_NoneErrorZ_clone(const struct LDKCResult_NoneErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_NoneErrorZ_clone(orig: number): number { +export function CResult_NoneErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13598,7 +13605,7 @@ export function CResult_NoneErrorZ_clone(orig: number): number { } // struct LDKCResult_NetAddressDecodeErrorZ CResult_NetAddressDecodeErrorZ_ok(struct LDKNetAddress o); /* @internal */ -export function CResult_NetAddressDecodeErrorZ_ok(o: number): number { +export function CResult_NetAddressDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13607,7 +13614,7 @@ export function CResult_NetAddressDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_NetAddressDecodeErrorZ CResult_NetAddressDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_NetAddressDecodeErrorZ_err(e: number): number { +export function CResult_NetAddressDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13616,7 +13623,7 @@ export function CResult_NetAddressDecodeErrorZ_err(e: number): number { } // bool CResult_NetAddressDecodeErrorZ_is_ok(const struct LDKCResult_NetAddressDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_NetAddressDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_NetAddressDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13625,16 +13632,16 @@ export function CResult_NetAddressDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_NetAddressDecodeErrorZ_free(struct LDKCResult_NetAddressDecodeErrorZ _res); /* @internal */ -export function CResult_NetAddressDecodeErrorZ_free(_res: number): void { +export function CResult_NetAddressDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_NetAddressDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_NetAddressDecodeErrorZ_clone_ptr(LDKCResult_NetAddressDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_NetAddressDecodeErrorZ_clone_ptr(LDKCResult_NetAddressDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_NetAddressDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_NetAddressDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13643,7 +13650,7 @@ export function CResult_NetAddressDecodeErrorZ_clone_ptr(arg: number): number { } // struct LDKCResult_NetAddressDecodeErrorZ CResult_NetAddressDecodeErrorZ_clone(const struct LDKCResult_NetAddressDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_NetAddressDecodeErrorZ_clone(orig: number): number { +export function CResult_NetAddressDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13688,7 +13695,7 @@ export function CVec_UpdateFailMalformedHTLCZ_free(_res: number): void { } // struct LDKCResult_AcceptChannelDecodeErrorZ CResult_AcceptChannelDecodeErrorZ_ok(struct LDKAcceptChannel o); /* @internal */ -export function CResult_AcceptChannelDecodeErrorZ_ok(o: number): number { +export function CResult_AcceptChannelDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13697,7 +13704,7 @@ export function CResult_AcceptChannelDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_AcceptChannelDecodeErrorZ CResult_AcceptChannelDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_AcceptChannelDecodeErrorZ_err(e: number): number { +export function CResult_AcceptChannelDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13706,7 +13713,7 @@ export function CResult_AcceptChannelDecodeErrorZ_err(e: number): number { } // bool CResult_AcceptChannelDecodeErrorZ_is_ok(const struct LDKCResult_AcceptChannelDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_AcceptChannelDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_AcceptChannelDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13715,16 +13722,16 @@ export function CResult_AcceptChannelDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_AcceptChannelDecodeErrorZ_free(struct LDKCResult_AcceptChannelDecodeErrorZ _res); /* @internal */ -export function CResult_AcceptChannelDecodeErrorZ_free(_res: number): void { +export function CResult_AcceptChannelDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_AcceptChannelDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_AcceptChannelDecodeErrorZ_clone_ptr(LDKCResult_AcceptChannelDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_AcceptChannelDecodeErrorZ_clone_ptr(LDKCResult_AcceptChannelDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_AcceptChannelDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_AcceptChannelDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13733,7 +13740,7 @@ export function CResult_AcceptChannelDecodeErrorZ_clone_ptr(arg: number): number } // struct LDKCResult_AcceptChannelDecodeErrorZ CResult_AcceptChannelDecodeErrorZ_clone(const struct LDKCResult_AcceptChannelDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_AcceptChannelDecodeErrorZ_clone(orig: number): number { +export function CResult_AcceptChannelDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13742,7 +13749,7 @@ export function CResult_AcceptChannelDecodeErrorZ_clone(orig: number): number { } // struct LDKCResult_AnnouncementSignaturesDecodeErrorZ CResult_AnnouncementSignaturesDecodeErrorZ_ok(struct LDKAnnouncementSignatures o); /* @internal */ -export function CResult_AnnouncementSignaturesDecodeErrorZ_ok(o: number): number { +export function CResult_AnnouncementSignaturesDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13751,7 +13758,7 @@ export function CResult_AnnouncementSignaturesDecodeErrorZ_ok(o: number): number } // struct LDKCResult_AnnouncementSignaturesDecodeErrorZ CResult_AnnouncementSignaturesDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_AnnouncementSignaturesDecodeErrorZ_err(e: number): number { +export function CResult_AnnouncementSignaturesDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13760,7 +13767,7 @@ export function CResult_AnnouncementSignaturesDecodeErrorZ_err(e: number): numbe } // bool CResult_AnnouncementSignaturesDecodeErrorZ_is_ok(const struct LDKCResult_AnnouncementSignaturesDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_AnnouncementSignaturesDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_AnnouncementSignaturesDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13769,16 +13776,16 @@ export function CResult_AnnouncementSignaturesDecodeErrorZ_is_ok(o: number): boo } // void CResult_AnnouncementSignaturesDecodeErrorZ_free(struct LDKCResult_AnnouncementSignaturesDecodeErrorZ _res); /* @internal */ -export function CResult_AnnouncementSignaturesDecodeErrorZ_free(_res: number): void { +export function CResult_AnnouncementSignaturesDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_AnnouncementSignaturesDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_AnnouncementSignaturesDecodeErrorZ_clone_ptr(LDKCResult_AnnouncementSignaturesDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_AnnouncementSignaturesDecodeErrorZ_clone_ptr(LDKCResult_AnnouncementSignaturesDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_AnnouncementSignaturesDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_AnnouncementSignaturesDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13787,7 +13794,7 @@ export function CResult_AnnouncementSignaturesDecodeErrorZ_clone_ptr(arg: number } // struct LDKCResult_AnnouncementSignaturesDecodeErrorZ CResult_AnnouncementSignaturesDecodeErrorZ_clone(const struct LDKCResult_AnnouncementSignaturesDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_AnnouncementSignaturesDecodeErrorZ_clone(orig: number): number { +export function CResult_AnnouncementSignaturesDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13796,7 +13803,7 @@ export function CResult_AnnouncementSignaturesDecodeErrorZ_clone(orig: number): } // struct LDKCResult_ChannelReestablishDecodeErrorZ CResult_ChannelReestablishDecodeErrorZ_ok(struct LDKChannelReestablish o); /* @internal */ -export function CResult_ChannelReestablishDecodeErrorZ_ok(o: number): number { +export function CResult_ChannelReestablishDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13805,7 +13812,7 @@ export function CResult_ChannelReestablishDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_ChannelReestablishDecodeErrorZ CResult_ChannelReestablishDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_ChannelReestablishDecodeErrorZ_err(e: number): number { +export function CResult_ChannelReestablishDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13814,7 +13821,7 @@ export function CResult_ChannelReestablishDecodeErrorZ_err(e: number): number { } // bool CResult_ChannelReestablishDecodeErrorZ_is_ok(const struct LDKCResult_ChannelReestablishDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_ChannelReestablishDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_ChannelReestablishDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13823,16 +13830,16 @@ export function CResult_ChannelReestablishDecodeErrorZ_is_ok(o: number): boolean } // void CResult_ChannelReestablishDecodeErrorZ_free(struct LDKCResult_ChannelReestablishDecodeErrorZ _res); /* @internal */ -export function CResult_ChannelReestablishDecodeErrorZ_free(_res: number): void { +export function CResult_ChannelReestablishDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_ChannelReestablishDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_ChannelReestablishDecodeErrorZ_clone_ptr(LDKCResult_ChannelReestablishDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_ChannelReestablishDecodeErrorZ_clone_ptr(LDKCResult_ChannelReestablishDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_ChannelReestablishDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_ChannelReestablishDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13841,7 +13848,7 @@ export function CResult_ChannelReestablishDecodeErrorZ_clone_ptr(arg: number): n } // struct LDKCResult_ChannelReestablishDecodeErrorZ CResult_ChannelReestablishDecodeErrorZ_clone(const struct LDKCResult_ChannelReestablishDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_ChannelReestablishDecodeErrorZ_clone(orig: number): number { +export function CResult_ChannelReestablishDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13850,7 +13857,7 @@ export function CResult_ChannelReestablishDecodeErrorZ_clone(orig: number): numb } // struct LDKCResult_ClosingSignedDecodeErrorZ CResult_ClosingSignedDecodeErrorZ_ok(struct LDKClosingSigned o); /* @internal */ -export function CResult_ClosingSignedDecodeErrorZ_ok(o: number): number { +export function CResult_ClosingSignedDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13859,7 +13866,7 @@ export function CResult_ClosingSignedDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_ClosingSignedDecodeErrorZ CResult_ClosingSignedDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_ClosingSignedDecodeErrorZ_err(e: number): number { +export function CResult_ClosingSignedDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13868,7 +13875,7 @@ export function CResult_ClosingSignedDecodeErrorZ_err(e: number): number { } // bool CResult_ClosingSignedDecodeErrorZ_is_ok(const struct LDKCResult_ClosingSignedDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_ClosingSignedDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_ClosingSignedDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13877,16 +13884,16 @@ export function CResult_ClosingSignedDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_ClosingSignedDecodeErrorZ_free(struct LDKCResult_ClosingSignedDecodeErrorZ _res); /* @internal */ -export function CResult_ClosingSignedDecodeErrorZ_free(_res: number): void { +export function CResult_ClosingSignedDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_ClosingSignedDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_ClosingSignedDecodeErrorZ_clone_ptr(LDKCResult_ClosingSignedDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_ClosingSignedDecodeErrorZ_clone_ptr(LDKCResult_ClosingSignedDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_ClosingSignedDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_ClosingSignedDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13895,7 +13902,7 @@ export function CResult_ClosingSignedDecodeErrorZ_clone_ptr(arg: number): number } // struct LDKCResult_ClosingSignedDecodeErrorZ CResult_ClosingSignedDecodeErrorZ_clone(const struct LDKCResult_ClosingSignedDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_ClosingSignedDecodeErrorZ_clone(orig: number): number { +export function CResult_ClosingSignedDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13904,7 +13911,7 @@ export function CResult_ClosingSignedDecodeErrorZ_clone(orig: number): number { } // struct LDKCResult_ClosingSignedFeeRangeDecodeErrorZ CResult_ClosingSignedFeeRangeDecodeErrorZ_ok(struct LDKClosingSignedFeeRange o); /* @internal */ -export function CResult_ClosingSignedFeeRangeDecodeErrorZ_ok(o: number): number { +export function CResult_ClosingSignedFeeRangeDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13913,7 +13920,7 @@ export function CResult_ClosingSignedFeeRangeDecodeErrorZ_ok(o: number): number } // struct LDKCResult_ClosingSignedFeeRangeDecodeErrorZ CResult_ClosingSignedFeeRangeDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_ClosingSignedFeeRangeDecodeErrorZ_err(e: number): number { +export function CResult_ClosingSignedFeeRangeDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13922,7 +13929,7 @@ export function CResult_ClosingSignedFeeRangeDecodeErrorZ_err(e: number): number } // bool CResult_ClosingSignedFeeRangeDecodeErrorZ_is_ok(const struct LDKCResult_ClosingSignedFeeRangeDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_ClosingSignedFeeRangeDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_ClosingSignedFeeRangeDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13931,16 +13938,16 @@ export function CResult_ClosingSignedFeeRangeDecodeErrorZ_is_ok(o: number): bool } // void CResult_ClosingSignedFeeRangeDecodeErrorZ_free(struct LDKCResult_ClosingSignedFeeRangeDecodeErrorZ _res); /* @internal */ -export function CResult_ClosingSignedFeeRangeDecodeErrorZ_free(_res: number): void { +export function CResult_ClosingSignedFeeRangeDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_ClosingSignedFeeRangeDecodeErrorZ_clone_ptr(LDKCResult_ClosingSignedFeeRangeDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_ClosingSignedFeeRangeDecodeErrorZ_clone_ptr(LDKCResult_ClosingSignedFeeRangeDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_ClosingSignedFeeRangeDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_ClosingSignedFeeRangeDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13949,7 +13956,7 @@ export function CResult_ClosingSignedFeeRangeDecodeErrorZ_clone_ptr(arg: number) } // struct LDKCResult_ClosingSignedFeeRangeDecodeErrorZ CResult_ClosingSignedFeeRangeDecodeErrorZ_clone(const struct LDKCResult_ClosingSignedFeeRangeDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_ClosingSignedFeeRangeDecodeErrorZ_clone(orig: number): number { +export function CResult_ClosingSignedFeeRangeDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13958,7 +13965,7 @@ export function CResult_ClosingSignedFeeRangeDecodeErrorZ_clone(orig: number): n } // struct LDKCResult_CommitmentSignedDecodeErrorZ CResult_CommitmentSignedDecodeErrorZ_ok(struct LDKCommitmentSigned o); /* @internal */ -export function CResult_CommitmentSignedDecodeErrorZ_ok(o: number): number { +export function CResult_CommitmentSignedDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13967,7 +13974,7 @@ export function CResult_CommitmentSignedDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_CommitmentSignedDecodeErrorZ CResult_CommitmentSignedDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_CommitmentSignedDecodeErrorZ_err(e: number): number { +export function CResult_CommitmentSignedDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13976,7 +13983,7 @@ export function CResult_CommitmentSignedDecodeErrorZ_err(e: number): number { } // bool CResult_CommitmentSignedDecodeErrorZ_is_ok(const struct LDKCResult_CommitmentSignedDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_CommitmentSignedDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_CommitmentSignedDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -13985,16 +13992,16 @@ export function CResult_CommitmentSignedDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_CommitmentSignedDecodeErrorZ_free(struct LDKCResult_CommitmentSignedDecodeErrorZ _res); /* @internal */ -export function CResult_CommitmentSignedDecodeErrorZ_free(_res: number): void { +export function CResult_CommitmentSignedDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_CommitmentSignedDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_CommitmentSignedDecodeErrorZ_clone_ptr(LDKCResult_CommitmentSignedDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_CommitmentSignedDecodeErrorZ_clone_ptr(LDKCResult_CommitmentSignedDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_CommitmentSignedDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_CommitmentSignedDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14003,7 +14010,7 @@ export function CResult_CommitmentSignedDecodeErrorZ_clone_ptr(arg: number): num } // struct LDKCResult_CommitmentSignedDecodeErrorZ CResult_CommitmentSignedDecodeErrorZ_clone(const struct LDKCResult_CommitmentSignedDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_CommitmentSignedDecodeErrorZ_clone(orig: number): number { +export function CResult_CommitmentSignedDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14012,7 +14019,7 @@ export function CResult_CommitmentSignedDecodeErrorZ_clone(orig: number): number } // struct LDKCResult_FundingCreatedDecodeErrorZ CResult_FundingCreatedDecodeErrorZ_ok(struct LDKFundingCreated o); /* @internal */ -export function CResult_FundingCreatedDecodeErrorZ_ok(o: number): number { +export function CResult_FundingCreatedDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14021,7 +14028,7 @@ export function CResult_FundingCreatedDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_FundingCreatedDecodeErrorZ CResult_FundingCreatedDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_FundingCreatedDecodeErrorZ_err(e: number): number { +export function CResult_FundingCreatedDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14030,7 +14037,7 @@ export function CResult_FundingCreatedDecodeErrorZ_err(e: number): number { } // bool CResult_FundingCreatedDecodeErrorZ_is_ok(const struct LDKCResult_FundingCreatedDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_FundingCreatedDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_FundingCreatedDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14039,16 +14046,16 @@ export function CResult_FundingCreatedDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_FundingCreatedDecodeErrorZ_free(struct LDKCResult_FundingCreatedDecodeErrorZ _res); /* @internal */ -export function CResult_FundingCreatedDecodeErrorZ_free(_res: number): void { +export function CResult_FundingCreatedDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_FundingCreatedDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_FundingCreatedDecodeErrorZ_clone_ptr(LDKCResult_FundingCreatedDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_FundingCreatedDecodeErrorZ_clone_ptr(LDKCResult_FundingCreatedDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_FundingCreatedDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_FundingCreatedDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14057,7 +14064,7 @@ export function CResult_FundingCreatedDecodeErrorZ_clone_ptr(arg: number): numbe } // struct LDKCResult_FundingCreatedDecodeErrorZ CResult_FundingCreatedDecodeErrorZ_clone(const struct LDKCResult_FundingCreatedDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_FundingCreatedDecodeErrorZ_clone(orig: number): number { +export function CResult_FundingCreatedDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14066,7 +14073,7 @@ export function CResult_FundingCreatedDecodeErrorZ_clone(orig: number): number { } // struct LDKCResult_FundingSignedDecodeErrorZ CResult_FundingSignedDecodeErrorZ_ok(struct LDKFundingSigned o); /* @internal */ -export function CResult_FundingSignedDecodeErrorZ_ok(o: number): number { +export function CResult_FundingSignedDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14075,7 +14082,7 @@ export function CResult_FundingSignedDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_FundingSignedDecodeErrorZ CResult_FundingSignedDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_FundingSignedDecodeErrorZ_err(e: number): number { +export function CResult_FundingSignedDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14084,7 +14091,7 @@ export function CResult_FundingSignedDecodeErrorZ_err(e: number): number { } // bool CResult_FundingSignedDecodeErrorZ_is_ok(const struct LDKCResult_FundingSignedDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_FundingSignedDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_FundingSignedDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14093,16 +14100,16 @@ export function CResult_FundingSignedDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_FundingSignedDecodeErrorZ_free(struct LDKCResult_FundingSignedDecodeErrorZ _res); /* @internal */ -export function CResult_FundingSignedDecodeErrorZ_free(_res: number): void { +export function CResult_FundingSignedDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_FundingSignedDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_FundingSignedDecodeErrorZ_clone_ptr(LDKCResult_FundingSignedDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_FundingSignedDecodeErrorZ_clone_ptr(LDKCResult_FundingSignedDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_FundingSignedDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_FundingSignedDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14111,7 +14118,7 @@ export function CResult_FundingSignedDecodeErrorZ_clone_ptr(arg: number): number } // struct LDKCResult_FundingSignedDecodeErrorZ CResult_FundingSignedDecodeErrorZ_clone(const struct LDKCResult_FundingSignedDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_FundingSignedDecodeErrorZ_clone(orig: number): number { +export function CResult_FundingSignedDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14120,7 +14127,7 @@ export function CResult_FundingSignedDecodeErrorZ_clone(orig: number): number { } // struct LDKCResult_ChannelReadyDecodeErrorZ CResult_ChannelReadyDecodeErrorZ_ok(struct LDKChannelReady o); /* @internal */ -export function CResult_ChannelReadyDecodeErrorZ_ok(o: number): number { +export function CResult_ChannelReadyDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14129,7 +14136,7 @@ export function CResult_ChannelReadyDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_ChannelReadyDecodeErrorZ CResult_ChannelReadyDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_ChannelReadyDecodeErrorZ_err(e: number): number { +export function CResult_ChannelReadyDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14138,7 +14145,7 @@ export function CResult_ChannelReadyDecodeErrorZ_err(e: number): number { } // bool CResult_ChannelReadyDecodeErrorZ_is_ok(const struct LDKCResult_ChannelReadyDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_ChannelReadyDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_ChannelReadyDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14147,16 +14154,16 @@ export function CResult_ChannelReadyDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_ChannelReadyDecodeErrorZ_free(struct LDKCResult_ChannelReadyDecodeErrorZ _res); /* @internal */ -export function CResult_ChannelReadyDecodeErrorZ_free(_res: number): void { +export function CResult_ChannelReadyDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_ChannelReadyDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_ChannelReadyDecodeErrorZ_clone_ptr(LDKCResult_ChannelReadyDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_ChannelReadyDecodeErrorZ_clone_ptr(LDKCResult_ChannelReadyDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_ChannelReadyDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_ChannelReadyDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14165,7 +14172,7 @@ export function CResult_ChannelReadyDecodeErrorZ_clone_ptr(arg: number): number } // struct LDKCResult_ChannelReadyDecodeErrorZ CResult_ChannelReadyDecodeErrorZ_clone(const struct LDKCResult_ChannelReadyDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_ChannelReadyDecodeErrorZ_clone(orig: number): number { +export function CResult_ChannelReadyDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14174,7 +14181,7 @@ export function CResult_ChannelReadyDecodeErrorZ_clone(orig: number): number { } // struct LDKCResult_InitDecodeErrorZ CResult_InitDecodeErrorZ_ok(struct LDKInit o); /* @internal */ -export function CResult_InitDecodeErrorZ_ok(o: number): number { +export function CResult_InitDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14183,7 +14190,7 @@ export function CResult_InitDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_InitDecodeErrorZ CResult_InitDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_InitDecodeErrorZ_err(e: number): number { +export function CResult_InitDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14192,7 +14199,7 @@ export function CResult_InitDecodeErrorZ_err(e: number): number { } // bool CResult_InitDecodeErrorZ_is_ok(const struct LDKCResult_InitDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_InitDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_InitDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14201,16 +14208,16 @@ export function CResult_InitDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_InitDecodeErrorZ_free(struct LDKCResult_InitDecodeErrorZ _res); /* @internal */ -export function CResult_InitDecodeErrorZ_free(_res: number): void { +export function CResult_InitDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_InitDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_InitDecodeErrorZ_clone_ptr(LDKCResult_InitDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_InitDecodeErrorZ_clone_ptr(LDKCResult_InitDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_InitDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_InitDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14219,7 +14226,7 @@ export function CResult_InitDecodeErrorZ_clone_ptr(arg: number): number { } // struct LDKCResult_InitDecodeErrorZ CResult_InitDecodeErrorZ_clone(const struct LDKCResult_InitDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_InitDecodeErrorZ_clone(orig: number): number { +export function CResult_InitDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14228,7 +14235,7 @@ export function CResult_InitDecodeErrorZ_clone(orig: number): number { } // struct LDKCResult_OpenChannelDecodeErrorZ CResult_OpenChannelDecodeErrorZ_ok(struct LDKOpenChannel o); /* @internal */ -export function CResult_OpenChannelDecodeErrorZ_ok(o: number): number { +export function CResult_OpenChannelDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14237,7 +14244,7 @@ export function CResult_OpenChannelDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_OpenChannelDecodeErrorZ CResult_OpenChannelDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_OpenChannelDecodeErrorZ_err(e: number): number { +export function CResult_OpenChannelDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14246,7 +14253,7 @@ export function CResult_OpenChannelDecodeErrorZ_err(e: number): number { } // bool CResult_OpenChannelDecodeErrorZ_is_ok(const struct LDKCResult_OpenChannelDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_OpenChannelDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_OpenChannelDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14255,16 +14262,16 @@ export function CResult_OpenChannelDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_OpenChannelDecodeErrorZ_free(struct LDKCResult_OpenChannelDecodeErrorZ _res); /* @internal */ -export function CResult_OpenChannelDecodeErrorZ_free(_res: number): void { +export function CResult_OpenChannelDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_OpenChannelDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_OpenChannelDecodeErrorZ_clone_ptr(LDKCResult_OpenChannelDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_OpenChannelDecodeErrorZ_clone_ptr(LDKCResult_OpenChannelDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_OpenChannelDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_OpenChannelDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14273,7 +14280,7 @@ export function CResult_OpenChannelDecodeErrorZ_clone_ptr(arg: number): number { } // struct LDKCResult_OpenChannelDecodeErrorZ CResult_OpenChannelDecodeErrorZ_clone(const struct LDKCResult_OpenChannelDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_OpenChannelDecodeErrorZ_clone(orig: number): number { +export function CResult_OpenChannelDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14282,7 +14289,7 @@ export function CResult_OpenChannelDecodeErrorZ_clone(orig: number): number { } // struct LDKCResult_RevokeAndACKDecodeErrorZ CResult_RevokeAndACKDecodeErrorZ_ok(struct LDKRevokeAndACK o); /* @internal */ -export function CResult_RevokeAndACKDecodeErrorZ_ok(o: number): number { +export function CResult_RevokeAndACKDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14291,7 +14298,7 @@ export function CResult_RevokeAndACKDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_RevokeAndACKDecodeErrorZ CResult_RevokeAndACKDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_RevokeAndACKDecodeErrorZ_err(e: number): number { +export function CResult_RevokeAndACKDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14300,7 +14307,7 @@ export function CResult_RevokeAndACKDecodeErrorZ_err(e: number): number { } // bool CResult_RevokeAndACKDecodeErrorZ_is_ok(const struct LDKCResult_RevokeAndACKDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_RevokeAndACKDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_RevokeAndACKDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14309,16 +14316,16 @@ export function CResult_RevokeAndACKDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_RevokeAndACKDecodeErrorZ_free(struct LDKCResult_RevokeAndACKDecodeErrorZ _res); /* @internal */ -export function CResult_RevokeAndACKDecodeErrorZ_free(_res: number): void { +export function CResult_RevokeAndACKDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_RevokeAndACKDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_RevokeAndACKDecodeErrorZ_clone_ptr(LDKCResult_RevokeAndACKDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_RevokeAndACKDecodeErrorZ_clone_ptr(LDKCResult_RevokeAndACKDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_RevokeAndACKDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_RevokeAndACKDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14327,7 +14334,7 @@ export function CResult_RevokeAndACKDecodeErrorZ_clone_ptr(arg: number): number } // struct LDKCResult_RevokeAndACKDecodeErrorZ CResult_RevokeAndACKDecodeErrorZ_clone(const struct LDKCResult_RevokeAndACKDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_RevokeAndACKDecodeErrorZ_clone(orig: number): number { +export function CResult_RevokeAndACKDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14336,7 +14343,7 @@ export function CResult_RevokeAndACKDecodeErrorZ_clone(orig: number): number { } // struct LDKCResult_ShutdownDecodeErrorZ CResult_ShutdownDecodeErrorZ_ok(struct LDKShutdown o); /* @internal */ -export function CResult_ShutdownDecodeErrorZ_ok(o: number): number { +export function CResult_ShutdownDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14345,7 +14352,7 @@ export function CResult_ShutdownDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_ShutdownDecodeErrorZ CResult_ShutdownDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_ShutdownDecodeErrorZ_err(e: number): number { +export function CResult_ShutdownDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14354,7 +14361,7 @@ export function CResult_ShutdownDecodeErrorZ_err(e: number): number { } // bool CResult_ShutdownDecodeErrorZ_is_ok(const struct LDKCResult_ShutdownDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_ShutdownDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_ShutdownDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14363,16 +14370,16 @@ export function CResult_ShutdownDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_ShutdownDecodeErrorZ_free(struct LDKCResult_ShutdownDecodeErrorZ _res); /* @internal */ -export function CResult_ShutdownDecodeErrorZ_free(_res: number): void { +export function CResult_ShutdownDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_ShutdownDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_ShutdownDecodeErrorZ_clone_ptr(LDKCResult_ShutdownDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_ShutdownDecodeErrorZ_clone_ptr(LDKCResult_ShutdownDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_ShutdownDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_ShutdownDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14381,7 +14388,7 @@ export function CResult_ShutdownDecodeErrorZ_clone_ptr(arg: number): number { } // struct LDKCResult_ShutdownDecodeErrorZ CResult_ShutdownDecodeErrorZ_clone(const struct LDKCResult_ShutdownDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_ShutdownDecodeErrorZ_clone(orig: number): number { +export function CResult_ShutdownDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14390,7 +14397,7 @@ export function CResult_ShutdownDecodeErrorZ_clone(orig: number): number { } // struct LDKCResult_UpdateFailHTLCDecodeErrorZ CResult_UpdateFailHTLCDecodeErrorZ_ok(struct LDKUpdateFailHTLC o); /* @internal */ -export function CResult_UpdateFailHTLCDecodeErrorZ_ok(o: number): number { +export function CResult_UpdateFailHTLCDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14399,7 +14406,7 @@ export function CResult_UpdateFailHTLCDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_UpdateFailHTLCDecodeErrorZ CResult_UpdateFailHTLCDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_UpdateFailHTLCDecodeErrorZ_err(e: number): number { +export function CResult_UpdateFailHTLCDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14408,7 +14415,7 @@ export function CResult_UpdateFailHTLCDecodeErrorZ_err(e: number): number { } // bool CResult_UpdateFailHTLCDecodeErrorZ_is_ok(const struct LDKCResult_UpdateFailHTLCDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_UpdateFailHTLCDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_UpdateFailHTLCDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14417,16 +14424,16 @@ export function CResult_UpdateFailHTLCDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_UpdateFailHTLCDecodeErrorZ_free(struct LDKCResult_UpdateFailHTLCDecodeErrorZ _res); /* @internal */ -export function CResult_UpdateFailHTLCDecodeErrorZ_free(_res: number): void { +export function CResult_UpdateFailHTLCDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_UpdateFailHTLCDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_UpdateFailHTLCDecodeErrorZ_clone_ptr(LDKCResult_UpdateFailHTLCDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_UpdateFailHTLCDecodeErrorZ_clone_ptr(LDKCResult_UpdateFailHTLCDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_UpdateFailHTLCDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_UpdateFailHTLCDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14435,7 +14442,7 @@ export function CResult_UpdateFailHTLCDecodeErrorZ_clone_ptr(arg: number): numbe } // struct LDKCResult_UpdateFailHTLCDecodeErrorZ CResult_UpdateFailHTLCDecodeErrorZ_clone(const struct LDKCResult_UpdateFailHTLCDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_UpdateFailHTLCDecodeErrorZ_clone(orig: number): number { +export function CResult_UpdateFailHTLCDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14444,7 +14451,7 @@ export function CResult_UpdateFailHTLCDecodeErrorZ_clone(orig: number): number { } // struct LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ CResult_UpdateFailMalformedHTLCDecodeErrorZ_ok(struct LDKUpdateFailMalformedHTLC o); /* @internal */ -export function CResult_UpdateFailMalformedHTLCDecodeErrorZ_ok(o: number): number { +export function CResult_UpdateFailMalformedHTLCDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14453,7 +14460,7 @@ export function CResult_UpdateFailMalformedHTLCDecodeErrorZ_ok(o: number): numbe } // struct LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ CResult_UpdateFailMalformedHTLCDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_UpdateFailMalformedHTLCDecodeErrorZ_err(e: number): number { +export function CResult_UpdateFailMalformedHTLCDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14462,7 +14469,7 @@ export function CResult_UpdateFailMalformedHTLCDecodeErrorZ_err(e: number): numb } // bool CResult_UpdateFailMalformedHTLCDecodeErrorZ_is_ok(const struct LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_UpdateFailMalformedHTLCDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_UpdateFailMalformedHTLCDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14471,16 +14478,16 @@ export function CResult_UpdateFailMalformedHTLCDecodeErrorZ_is_ok(o: number): bo } // void CResult_UpdateFailMalformedHTLCDecodeErrorZ_free(struct LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ _res); /* @internal */ -export function CResult_UpdateFailMalformedHTLCDecodeErrorZ_free(_res: number): void { +export function CResult_UpdateFailMalformedHTLCDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone_ptr(LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone_ptr(LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14489,7 +14496,7 @@ export function CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone_ptr(arg: numbe } // struct LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone(const struct LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone(orig: number): number { +export function CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14498,7 +14505,7 @@ export function CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone(orig: number): } // struct LDKCResult_UpdateFeeDecodeErrorZ CResult_UpdateFeeDecodeErrorZ_ok(struct LDKUpdateFee o); /* @internal */ -export function CResult_UpdateFeeDecodeErrorZ_ok(o: number): number { +export function CResult_UpdateFeeDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14507,7 +14514,7 @@ export function CResult_UpdateFeeDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_UpdateFeeDecodeErrorZ CResult_UpdateFeeDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_UpdateFeeDecodeErrorZ_err(e: number): number { +export function CResult_UpdateFeeDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14516,7 +14523,7 @@ export function CResult_UpdateFeeDecodeErrorZ_err(e: number): number { } // bool CResult_UpdateFeeDecodeErrorZ_is_ok(const struct LDKCResult_UpdateFeeDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_UpdateFeeDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_UpdateFeeDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14525,16 +14532,16 @@ export function CResult_UpdateFeeDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_UpdateFeeDecodeErrorZ_free(struct LDKCResult_UpdateFeeDecodeErrorZ _res); /* @internal */ -export function CResult_UpdateFeeDecodeErrorZ_free(_res: number): void { +export function CResult_UpdateFeeDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_UpdateFeeDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_UpdateFeeDecodeErrorZ_clone_ptr(LDKCResult_UpdateFeeDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_UpdateFeeDecodeErrorZ_clone_ptr(LDKCResult_UpdateFeeDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_UpdateFeeDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_UpdateFeeDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14543,7 +14550,7 @@ export function CResult_UpdateFeeDecodeErrorZ_clone_ptr(arg: number): number { } // struct LDKCResult_UpdateFeeDecodeErrorZ CResult_UpdateFeeDecodeErrorZ_clone(const struct LDKCResult_UpdateFeeDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_UpdateFeeDecodeErrorZ_clone(orig: number): number { +export function CResult_UpdateFeeDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14552,7 +14559,7 @@ export function CResult_UpdateFeeDecodeErrorZ_clone(orig: number): number { } // struct LDKCResult_UpdateFulfillHTLCDecodeErrorZ CResult_UpdateFulfillHTLCDecodeErrorZ_ok(struct LDKUpdateFulfillHTLC o); /* @internal */ -export function CResult_UpdateFulfillHTLCDecodeErrorZ_ok(o: number): number { +export function CResult_UpdateFulfillHTLCDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14561,7 +14568,7 @@ export function CResult_UpdateFulfillHTLCDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_UpdateFulfillHTLCDecodeErrorZ CResult_UpdateFulfillHTLCDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_UpdateFulfillHTLCDecodeErrorZ_err(e: number): number { +export function CResult_UpdateFulfillHTLCDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14570,7 +14577,7 @@ export function CResult_UpdateFulfillHTLCDecodeErrorZ_err(e: number): number { } // bool CResult_UpdateFulfillHTLCDecodeErrorZ_is_ok(const struct LDKCResult_UpdateFulfillHTLCDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_UpdateFulfillHTLCDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_UpdateFulfillHTLCDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14579,16 +14586,16 @@ export function CResult_UpdateFulfillHTLCDecodeErrorZ_is_ok(o: number): boolean } // void CResult_UpdateFulfillHTLCDecodeErrorZ_free(struct LDKCResult_UpdateFulfillHTLCDecodeErrorZ _res); /* @internal */ -export function CResult_UpdateFulfillHTLCDecodeErrorZ_free(_res: number): void { +export function CResult_UpdateFulfillHTLCDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_UpdateFulfillHTLCDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_UpdateFulfillHTLCDecodeErrorZ_clone_ptr(LDKCResult_UpdateFulfillHTLCDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_UpdateFulfillHTLCDecodeErrorZ_clone_ptr(LDKCResult_UpdateFulfillHTLCDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_UpdateFulfillHTLCDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_UpdateFulfillHTLCDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14597,7 +14604,7 @@ export function CResult_UpdateFulfillHTLCDecodeErrorZ_clone_ptr(arg: number): nu } // struct LDKCResult_UpdateFulfillHTLCDecodeErrorZ CResult_UpdateFulfillHTLCDecodeErrorZ_clone(const struct LDKCResult_UpdateFulfillHTLCDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_UpdateFulfillHTLCDecodeErrorZ_clone(orig: number): number { +export function CResult_UpdateFulfillHTLCDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14606,7 +14613,7 @@ export function CResult_UpdateFulfillHTLCDecodeErrorZ_clone(orig: number): numbe } // struct LDKCResult_UpdateAddHTLCDecodeErrorZ CResult_UpdateAddHTLCDecodeErrorZ_ok(struct LDKUpdateAddHTLC o); /* @internal */ -export function CResult_UpdateAddHTLCDecodeErrorZ_ok(o: number): number { +export function CResult_UpdateAddHTLCDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14615,7 +14622,7 @@ export function CResult_UpdateAddHTLCDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_UpdateAddHTLCDecodeErrorZ CResult_UpdateAddHTLCDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_UpdateAddHTLCDecodeErrorZ_err(e: number): number { +export function CResult_UpdateAddHTLCDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14624,7 +14631,7 @@ export function CResult_UpdateAddHTLCDecodeErrorZ_err(e: number): number { } // bool CResult_UpdateAddHTLCDecodeErrorZ_is_ok(const struct LDKCResult_UpdateAddHTLCDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_UpdateAddHTLCDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_UpdateAddHTLCDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14633,16 +14640,16 @@ export function CResult_UpdateAddHTLCDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_UpdateAddHTLCDecodeErrorZ_free(struct LDKCResult_UpdateAddHTLCDecodeErrorZ _res); /* @internal */ -export function CResult_UpdateAddHTLCDecodeErrorZ_free(_res: number): void { +export function CResult_UpdateAddHTLCDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_UpdateAddHTLCDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_UpdateAddHTLCDecodeErrorZ_clone_ptr(LDKCResult_UpdateAddHTLCDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_UpdateAddHTLCDecodeErrorZ_clone_ptr(LDKCResult_UpdateAddHTLCDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_UpdateAddHTLCDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_UpdateAddHTLCDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14651,7 +14658,7 @@ export function CResult_UpdateAddHTLCDecodeErrorZ_clone_ptr(arg: number): number } // struct LDKCResult_UpdateAddHTLCDecodeErrorZ CResult_UpdateAddHTLCDecodeErrorZ_clone(const struct LDKCResult_UpdateAddHTLCDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_UpdateAddHTLCDecodeErrorZ_clone(orig: number): number { +export function CResult_UpdateAddHTLCDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14660,7 +14667,7 @@ export function CResult_UpdateAddHTLCDecodeErrorZ_clone(orig: number): number { } // struct LDKCResult_PingDecodeErrorZ CResult_PingDecodeErrorZ_ok(struct LDKPing o); /* @internal */ -export function CResult_PingDecodeErrorZ_ok(o: number): number { +export function CResult_PingDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14669,7 +14676,7 @@ export function CResult_PingDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_PingDecodeErrorZ CResult_PingDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_PingDecodeErrorZ_err(e: number): number { +export function CResult_PingDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14678,7 +14685,7 @@ export function CResult_PingDecodeErrorZ_err(e: number): number { } // bool CResult_PingDecodeErrorZ_is_ok(const struct LDKCResult_PingDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_PingDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_PingDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14687,16 +14694,16 @@ export function CResult_PingDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_PingDecodeErrorZ_free(struct LDKCResult_PingDecodeErrorZ _res); /* @internal */ -export function CResult_PingDecodeErrorZ_free(_res: number): void { +export function CResult_PingDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_PingDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_PingDecodeErrorZ_clone_ptr(LDKCResult_PingDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_PingDecodeErrorZ_clone_ptr(LDKCResult_PingDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_PingDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_PingDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14705,7 +14712,7 @@ export function CResult_PingDecodeErrorZ_clone_ptr(arg: number): number { } // struct LDKCResult_PingDecodeErrorZ CResult_PingDecodeErrorZ_clone(const struct LDKCResult_PingDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_PingDecodeErrorZ_clone(orig: number): number { +export function CResult_PingDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14714,7 +14721,7 @@ export function CResult_PingDecodeErrorZ_clone(orig: number): number { } // struct LDKCResult_PongDecodeErrorZ CResult_PongDecodeErrorZ_ok(struct LDKPong o); /* @internal */ -export function CResult_PongDecodeErrorZ_ok(o: number): number { +export function CResult_PongDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14723,7 +14730,7 @@ export function CResult_PongDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_PongDecodeErrorZ CResult_PongDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_PongDecodeErrorZ_err(e: number): number { +export function CResult_PongDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14732,7 +14739,7 @@ export function CResult_PongDecodeErrorZ_err(e: number): number { } // bool CResult_PongDecodeErrorZ_is_ok(const struct LDKCResult_PongDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_PongDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_PongDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14741,16 +14748,16 @@ export function CResult_PongDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_PongDecodeErrorZ_free(struct LDKCResult_PongDecodeErrorZ _res); /* @internal */ -export function CResult_PongDecodeErrorZ_free(_res: number): void { +export function CResult_PongDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_PongDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_PongDecodeErrorZ_clone_ptr(LDKCResult_PongDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_PongDecodeErrorZ_clone_ptr(LDKCResult_PongDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_PongDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_PongDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14759,7 +14766,7 @@ export function CResult_PongDecodeErrorZ_clone_ptr(arg: number): number { } // struct LDKCResult_PongDecodeErrorZ CResult_PongDecodeErrorZ_clone(const struct LDKCResult_PongDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_PongDecodeErrorZ_clone(orig: number): number { +export function CResult_PongDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14768,7 +14775,7 @@ export function CResult_PongDecodeErrorZ_clone(orig: number): number { } // struct LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ CResult_UnsignedChannelAnnouncementDecodeErrorZ_ok(struct LDKUnsignedChannelAnnouncement o); /* @internal */ -export function CResult_UnsignedChannelAnnouncementDecodeErrorZ_ok(o: number): number { +export function CResult_UnsignedChannelAnnouncementDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14777,7 +14784,7 @@ export function CResult_UnsignedChannelAnnouncementDecodeErrorZ_ok(o: number): n } // struct LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ CResult_UnsignedChannelAnnouncementDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_UnsignedChannelAnnouncementDecodeErrorZ_err(e: number): number { +export function CResult_UnsignedChannelAnnouncementDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14786,7 +14793,7 @@ export function CResult_UnsignedChannelAnnouncementDecodeErrorZ_err(e: number): } // bool CResult_UnsignedChannelAnnouncementDecodeErrorZ_is_ok(const struct LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_UnsignedChannelAnnouncementDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_UnsignedChannelAnnouncementDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14795,16 +14802,16 @@ export function CResult_UnsignedChannelAnnouncementDecodeErrorZ_is_ok(o: number) } // void CResult_UnsignedChannelAnnouncementDecodeErrorZ_free(struct LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ _res); /* @internal */ -export function CResult_UnsignedChannelAnnouncementDecodeErrorZ_free(_res: number): void { +export function CResult_UnsignedChannelAnnouncementDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone_ptr(LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone_ptr(LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14813,7 +14820,7 @@ export function CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone_ptr(arg: n } // struct LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone(const struct LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone(orig: number): number { +export function CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14822,7 +14829,7 @@ export function CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone(orig: numb } // struct LDKCResult_ChannelAnnouncementDecodeErrorZ CResult_ChannelAnnouncementDecodeErrorZ_ok(struct LDKChannelAnnouncement o); /* @internal */ -export function CResult_ChannelAnnouncementDecodeErrorZ_ok(o: number): number { +export function CResult_ChannelAnnouncementDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14831,7 +14838,7 @@ export function CResult_ChannelAnnouncementDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_ChannelAnnouncementDecodeErrorZ CResult_ChannelAnnouncementDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_ChannelAnnouncementDecodeErrorZ_err(e: number): number { +export function CResult_ChannelAnnouncementDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14840,7 +14847,7 @@ export function CResult_ChannelAnnouncementDecodeErrorZ_err(e: number): number { } // bool CResult_ChannelAnnouncementDecodeErrorZ_is_ok(const struct LDKCResult_ChannelAnnouncementDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_ChannelAnnouncementDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_ChannelAnnouncementDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14849,16 +14856,16 @@ export function CResult_ChannelAnnouncementDecodeErrorZ_is_ok(o: number): boolea } // void CResult_ChannelAnnouncementDecodeErrorZ_free(struct LDKCResult_ChannelAnnouncementDecodeErrorZ _res); /* @internal */ -export function CResult_ChannelAnnouncementDecodeErrorZ_free(_res: number): void { +export function CResult_ChannelAnnouncementDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_ChannelAnnouncementDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_ChannelAnnouncementDecodeErrorZ_clone_ptr(LDKCResult_ChannelAnnouncementDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_ChannelAnnouncementDecodeErrorZ_clone_ptr(LDKCResult_ChannelAnnouncementDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_ChannelAnnouncementDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_ChannelAnnouncementDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14867,7 +14874,7 @@ export function CResult_ChannelAnnouncementDecodeErrorZ_clone_ptr(arg: number): } // struct LDKCResult_ChannelAnnouncementDecodeErrorZ CResult_ChannelAnnouncementDecodeErrorZ_clone(const struct LDKCResult_ChannelAnnouncementDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_ChannelAnnouncementDecodeErrorZ_clone(orig: number): number { +export function CResult_ChannelAnnouncementDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14876,7 +14883,7 @@ export function CResult_ChannelAnnouncementDecodeErrorZ_clone(orig: number): num } // struct LDKCResult_UnsignedChannelUpdateDecodeErrorZ CResult_UnsignedChannelUpdateDecodeErrorZ_ok(struct LDKUnsignedChannelUpdate o); /* @internal */ -export function CResult_UnsignedChannelUpdateDecodeErrorZ_ok(o: number): number { +export function CResult_UnsignedChannelUpdateDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14885,7 +14892,7 @@ export function CResult_UnsignedChannelUpdateDecodeErrorZ_ok(o: number): number } // struct LDKCResult_UnsignedChannelUpdateDecodeErrorZ CResult_UnsignedChannelUpdateDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_UnsignedChannelUpdateDecodeErrorZ_err(e: number): number { +export function CResult_UnsignedChannelUpdateDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14894,7 +14901,7 @@ export function CResult_UnsignedChannelUpdateDecodeErrorZ_err(e: number): number } // bool CResult_UnsignedChannelUpdateDecodeErrorZ_is_ok(const struct LDKCResult_UnsignedChannelUpdateDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_UnsignedChannelUpdateDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_UnsignedChannelUpdateDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14903,16 +14910,16 @@ export function CResult_UnsignedChannelUpdateDecodeErrorZ_is_ok(o: number): bool } // void CResult_UnsignedChannelUpdateDecodeErrorZ_free(struct LDKCResult_UnsignedChannelUpdateDecodeErrorZ _res); /* @internal */ -export function CResult_UnsignedChannelUpdateDecodeErrorZ_free(_res: number): void { +export function CResult_UnsignedChannelUpdateDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_UnsignedChannelUpdateDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_UnsignedChannelUpdateDecodeErrorZ_clone_ptr(LDKCResult_UnsignedChannelUpdateDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_UnsignedChannelUpdateDecodeErrorZ_clone_ptr(LDKCResult_UnsignedChannelUpdateDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_UnsignedChannelUpdateDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_UnsignedChannelUpdateDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14921,7 +14928,7 @@ export function CResult_UnsignedChannelUpdateDecodeErrorZ_clone_ptr(arg: number) } // struct LDKCResult_UnsignedChannelUpdateDecodeErrorZ CResult_UnsignedChannelUpdateDecodeErrorZ_clone(const struct LDKCResult_UnsignedChannelUpdateDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_UnsignedChannelUpdateDecodeErrorZ_clone(orig: number): number { +export function CResult_UnsignedChannelUpdateDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14930,7 +14937,7 @@ export function CResult_UnsignedChannelUpdateDecodeErrorZ_clone(orig: number): n } // struct LDKCResult_ChannelUpdateDecodeErrorZ CResult_ChannelUpdateDecodeErrorZ_ok(struct LDKChannelUpdate o); /* @internal */ -export function CResult_ChannelUpdateDecodeErrorZ_ok(o: number): number { +export function CResult_ChannelUpdateDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14939,7 +14946,7 @@ export function CResult_ChannelUpdateDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_ChannelUpdateDecodeErrorZ CResult_ChannelUpdateDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_ChannelUpdateDecodeErrorZ_err(e: number): number { +export function CResult_ChannelUpdateDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14948,7 +14955,7 @@ export function CResult_ChannelUpdateDecodeErrorZ_err(e: number): number { } // bool CResult_ChannelUpdateDecodeErrorZ_is_ok(const struct LDKCResult_ChannelUpdateDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_ChannelUpdateDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_ChannelUpdateDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14957,16 +14964,16 @@ export function CResult_ChannelUpdateDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_ChannelUpdateDecodeErrorZ_free(struct LDKCResult_ChannelUpdateDecodeErrorZ _res); /* @internal */ -export function CResult_ChannelUpdateDecodeErrorZ_free(_res: number): void { +export function CResult_ChannelUpdateDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_ChannelUpdateDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_ChannelUpdateDecodeErrorZ_clone_ptr(LDKCResult_ChannelUpdateDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_ChannelUpdateDecodeErrorZ_clone_ptr(LDKCResult_ChannelUpdateDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_ChannelUpdateDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_ChannelUpdateDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14975,7 +14982,7 @@ export function CResult_ChannelUpdateDecodeErrorZ_clone_ptr(arg: number): number } // struct LDKCResult_ChannelUpdateDecodeErrorZ CResult_ChannelUpdateDecodeErrorZ_clone(const struct LDKCResult_ChannelUpdateDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_ChannelUpdateDecodeErrorZ_clone(orig: number): number { +export function CResult_ChannelUpdateDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14984,7 +14991,7 @@ export function CResult_ChannelUpdateDecodeErrorZ_clone(orig: number): number { } // struct LDKCResult_ErrorMessageDecodeErrorZ CResult_ErrorMessageDecodeErrorZ_ok(struct LDKErrorMessage o); /* @internal */ -export function CResult_ErrorMessageDecodeErrorZ_ok(o: number): number { +export function CResult_ErrorMessageDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -14993,7 +15000,7 @@ export function CResult_ErrorMessageDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_ErrorMessageDecodeErrorZ CResult_ErrorMessageDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_ErrorMessageDecodeErrorZ_err(e: number): number { +export function CResult_ErrorMessageDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15002,7 +15009,7 @@ export function CResult_ErrorMessageDecodeErrorZ_err(e: number): number { } // bool CResult_ErrorMessageDecodeErrorZ_is_ok(const struct LDKCResult_ErrorMessageDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_ErrorMessageDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_ErrorMessageDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15011,16 +15018,16 @@ export function CResult_ErrorMessageDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_ErrorMessageDecodeErrorZ_free(struct LDKCResult_ErrorMessageDecodeErrorZ _res); /* @internal */ -export function CResult_ErrorMessageDecodeErrorZ_free(_res: number): void { +export function CResult_ErrorMessageDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_ErrorMessageDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_ErrorMessageDecodeErrorZ_clone_ptr(LDKCResult_ErrorMessageDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_ErrorMessageDecodeErrorZ_clone_ptr(LDKCResult_ErrorMessageDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_ErrorMessageDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_ErrorMessageDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15029,7 +15036,7 @@ export function CResult_ErrorMessageDecodeErrorZ_clone_ptr(arg: number): number } // struct LDKCResult_ErrorMessageDecodeErrorZ CResult_ErrorMessageDecodeErrorZ_clone(const struct LDKCResult_ErrorMessageDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_ErrorMessageDecodeErrorZ_clone(orig: number): number { +export function CResult_ErrorMessageDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15038,7 +15045,7 @@ export function CResult_ErrorMessageDecodeErrorZ_clone(orig: number): number { } // struct LDKCResult_WarningMessageDecodeErrorZ CResult_WarningMessageDecodeErrorZ_ok(struct LDKWarningMessage o); /* @internal */ -export function CResult_WarningMessageDecodeErrorZ_ok(o: number): number { +export function CResult_WarningMessageDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15047,7 +15054,7 @@ export function CResult_WarningMessageDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_WarningMessageDecodeErrorZ CResult_WarningMessageDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_WarningMessageDecodeErrorZ_err(e: number): number { +export function CResult_WarningMessageDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15056,7 +15063,7 @@ export function CResult_WarningMessageDecodeErrorZ_err(e: number): number { } // bool CResult_WarningMessageDecodeErrorZ_is_ok(const struct LDKCResult_WarningMessageDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_WarningMessageDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_WarningMessageDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15065,16 +15072,16 @@ export function CResult_WarningMessageDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_WarningMessageDecodeErrorZ_free(struct LDKCResult_WarningMessageDecodeErrorZ _res); /* @internal */ -export function CResult_WarningMessageDecodeErrorZ_free(_res: number): void { +export function CResult_WarningMessageDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_WarningMessageDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_WarningMessageDecodeErrorZ_clone_ptr(LDKCResult_WarningMessageDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_WarningMessageDecodeErrorZ_clone_ptr(LDKCResult_WarningMessageDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_WarningMessageDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_WarningMessageDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15083,7 +15090,7 @@ export function CResult_WarningMessageDecodeErrorZ_clone_ptr(arg: number): numbe } // struct LDKCResult_WarningMessageDecodeErrorZ CResult_WarningMessageDecodeErrorZ_clone(const struct LDKCResult_WarningMessageDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_WarningMessageDecodeErrorZ_clone(orig: number): number { +export function CResult_WarningMessageDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15092,7 +15099,7 @@ export function CResult_WarningMessageDecodeErrorZ_clone(orig: number): number { } // struct LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ CResult_UnsignedNodeAnnouncementDecodeErrorZ_ok(struct LDKUnsignedNodeAnnouncement o); /* @internal */ -export function CResult_UnsignedNodeAnnouncementDecodeErrorZ_ok(o: number): number { +export function CResult_UnsignedNodeAnnouncementDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15101,7 +15108,7 @@ export function CResult_UnsignedNodeAnnouncementDecodeErrorZ_ok(o: number): numb } // struct LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ CResult_UnsignedNodeAnnouncementDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_UnsignedNodeAnnouncementDecodeErrorZ_err(e: number): number { +export function CResult_UnsignedNodeAnnouncementDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15110,7 +15117,7 @@ export function CResult_UnsignedNodeAnnouncementDecodeErrorZ_err(e: number): num } // bool CResult_UnsignedNodeAnnouncementDecodeErrorZ_is_ok(const struct LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_UnsignedNodeAnnouncementDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_UnsignedNodeAnnouncementDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15119,16 +15126,16 @@ export function CResult_UnsignedNodeAnnouncementDecodeErrorZ_is_ok(o: number): b } // void CResult_UnsignedNodeAnnouncementDecodeErrorZ_free(struct LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ _res); /* @internal */ -export function CResult_UnsignedNodeAnnouncementDecodeErrorZ_free(_res: number): void { +export function CResult_UnsignedNodeAnnouncementDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone_ptr(LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone_ptr(LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15137,7 +15144,7 @@ export function CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone_ptr(arg: numb } // struct LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone(const struct LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone(orig: number): number { +export function CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15146,7 +15153,7 @@ export function CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone(orig: number) } // struct LDKCResult_NodeAnnouncementDecodeErrorZ CResult_NodeAnnouncementDecodeErrorZ_ok(struct LDKNodeAnnouncement o); /* @internal */ -export function CResult_NodeAnnouncementDecodeErrorZ_ok(o: number): number { +export function CResult_NodeAnnouncementDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15155,7 +15162,7 @@ export function CResult_NodeAnnouncementDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_NodeAnnouncementDecodeErrorZ CResult_NodeAnnouncementDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_NodeAnnouncementDecodeErrorZ_err(e: number): number { +export function CResult_NodeAnnouncementDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15164,7 +15171,7 @@ export function CResult_NodeAnnouncementDecodeErrorZ_err(e: number): number { } // bool CResult_NodeAnnouncementDecodeErrorZ_is_ok(const struct LDKCResult_NodeAnnouncementDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_NodeAnnouncementDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_NodeAnnouncementDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15173,16 +15180,16 @@ export function CResult_NodeAnnouncementDecodeErrorZ_is_ok(o: number): boolean { } // void CResult_NodeAnnouncementDecodeErrorZ_free(struct LDKCResult_NodeAnnouncementDecodeErrorZ _res); /* @internal */ -export function CResult_NodeAnnouncementDecodeErrorZ_free(_res: number): void { +export function CResult_NodeAnnouncementDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_NodeAnnouncementDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_NodeAnnouncementDecodeErrorZ_clone_ptr(LDKCResult_NodeAnnouncementDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_NodeAnnouncementDecodeErrorZ_clone_ptr(LDKCResult_NodeAnnouncementDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_NodeAnnouncementDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_NodeAnnouncementDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15191,7 +15198,7 @@ export function CResult_NodeAnnouncementDecodeErrorZ_clone_ptr(arg: number): num } // struct LDKCResult_NodeAnnouncementDecodeErrorZ CResult_NodeAnnouncementDecodeErrorZ_clone(const struct LDKCResult_NodeAnnouncementDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_NodeAnnouncementDecodeErrorZ_clone(orig: number): number { +export function CResult_NodeAnnouncementDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15200,7 +15207,7 @@ export function CResult_NodeAnnouncementDecodeErrorZ_clone(orig: number): number } // struct LDKCResult_QueryShortChannelIdsDecodeErrorZ CResult_QueryShortChannelIdsDecodeErrorZ_ok(struct LDKQueryShortChannelIds o); /* @internal */ -export function CResult_QueryShortChannelIdsDecodeErrorZ_ok(o: number): number { +export function CResult_QueryShortChannelIdsDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15209,7 +15216,7 @@ export function CResult_QueryShortChannelIdsDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_QueryShortChannelIdsDecodeErrorZ CResult_QueryShortChannelIdsDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_QueryShortChannelIdsDecodeErrorZ_err(e: number): number { +export function CResult_QueryShortChannelIdsDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15218,7 +15225,7 @@ export function CResult_QueryShortChannelIdsDecodeErrorZ_err(e: number): number } // bool CResult_QueryShortChannelIdsDecodeErrorZ_is_ok(const struct LDKCResult_QueryShortChannelIdsDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_QueryShortChannelIdsDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_QueryShortChannelIdsDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15227,16 +15234,16 @@ export function CResult_QueryShortChannelIdsDecodeErrorZ_is_ok(o: number): boole } // void CResult_QueryShortChannelIdsDecodeErrorZ_free(struct LDKCResult_QueryShortChannelIdsDecodeErrorZ _res); /* @internal */ -export function CResult_QueryShortChannelIdsDecodeErrorZ_free(_res: number): void { +export function CResult_QueryShortChannelIdsDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_QueryShortChannelIdsDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_QueryShortChannelIdsDecodeErrorZ_clone_ptr(LDKCResult_QueryShortChannelIdsDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_QueryShortChannelIdsDecodeErrorZ_clone_ptr(LDKCResult_QueryShortChannelIdsDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_QueryShortChannelIdsDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_QueryShortChannelIdsDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15245,7 +15252,7 @@ export function CResult_QueryShortChannelIdsDecodeErrorZ_clone_ptr(arg: number): } // struct LDKCResult_QueryShortChannelIdsDecodeErrorZ CResult_QueryShortChannelIdsDecodeErrorZ_clone(const struct LDKCResult_QueryShortChannelIdsDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_QueryShortChannelIdsDecodeErrorZ_clone(orig: number): number { +export function CResult_QueryShortChannelIdsDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15254,7 +15261,7 @@ export function CResult_QueryShortChannelIdsDecodeErrorZ_clone(orig: number): nu } // struct LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ CResult_ReplyShortChannelIdsEndDecodeErrorZ_ok(struct LDKReplyShortChannelIdsEnd o); /* @internal */ -export function CResult_ReplyShortChannelIdsEndDecodeErrorZ_ok(o: number): number { +export function CResult_ReplyShortChannelIdsEndDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15263,7 +15270,7 @@ export function CResult_ReplyShortChannelIdsEndDecodeErrorZ_ok(o: number): numbe } // struct LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ CResult_ReplyShortChannelIdsEndDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_ReplyShortChannelIdsEndDecodeErrorZ_err(e: number): number { +export function CResult_ReplyShortChannelIdsEndDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15272,7 +15279,7 @@ export function CResult_ReplyShortChannelIdsEndDecodeErrorZ_err(e: number): numb } // bool CResult_ReplyShortChannelIdsEndDecodeErrorZ_is_ok(const struct LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_ReplyShortChannelIdsEndDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_ReplyShortChannelIdsEndDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15281,16 +15288,16 @@ export function CResult_ReplyShortChannelIdsEndDecodeErrorZ_is_ok(o: number): bo } // void CResult_ReplyShortChannelIdsEndDecodeErrorZ_free(struct LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ _res); /* @internal */ -export function CResult_ReplyShortChannelIdsEndDecodeErrorZ_free(_res: number): void { +export function CResult_ReplyShortChannelIdsEndDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone_ptr(LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone_ptr(LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15299,7 +15306,7 @@ export function CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone_ptr(arg: numbe } // struct LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone(const struct LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone(orig: number): number { +export function CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15308,7 +15315,7 @@ export function CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone(orig: number): } // struct LDKCResult_QueryChannelRangeDecodeErrorZ CResult_QueryChannelRangeDecodeErrorZ_ok(struct LDKQueryChannelRange o); /* @internal */ -export function CResult_QueryChannelRangeDecodeErrorZ_ok(o: number): number { +export function CResult_QueryChannelRangeDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15317,7 +15324,7 @@ export function CResult_QueryChannelRangeDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_QueryChannelRangeDecodeErrorZ CResult_QueryChannelRangeDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_QueryChannelRangeDecodeErrorZ_err(e: number): number { +export function CResult_QueryChannelRangeDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15326,7 +15333,7 @@ export function CResult_QueryChannelRangeDecodeErrorZ_err(e: number): number { } // bool CResult_QueryChannelRangeDecodeErrorZ_is_ok(const struct LDKCResult_QueryChannelRangeDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_QueryChannelRangeDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_QueryChannelRangeDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15335,16 +15342,16 @@ export function CResult_QueryChannelRangeDecodeErrorZ_is_ok(o: number): boolean } // void CResult_QueryChannelRangeDecodeErrorZ_free(struct LDKCResult_QueryChannelRangeDecodeErrorZ _res); /* @internal */ -export function CResult_QueryChannelRangeDecodeErrorZ_free(_res: number): void { +export function CResult_QueryChannelRangeDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_QueryChannelRangeDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_QueryChannelRangeDecodeErrorZ_clone_ptr(LDKCResult_QueryChannelRangeDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_QueryChannelRangeDecodeErrorZ_clone_ptr(LDKCResult_QueryChannelRangeDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_QueryChannelRangeDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_QueryChannelRangeDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15353,7 +15360,7 @@ export function CResult_QueryChannelRangeDecodeErrorZ_clone_ptr(arg: number): nu } // struct LDKCResult_QueryChannelRangeDecodeErrorZ CResult_QueryChannelRangeDecodeErrorZ_clone(const struct LDKCResult_QueryChannelRangeDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_QueryChannelRangeDecodeErrorZ_clone(orig: number): number { +export function CResult_QueryChannelRangeDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15362,7 +15369,7 @@ export function CResult_QueryChannelRangeDecodeErrorZ_clone(orig: number): numbe } // struct LDKCResult_ReplyChannelRangeDecodeErrorZ CResult_ReplyChannelRangeDecodeErrorZ_ok(struct LDKReplyChannelRange o); /* @internal */ -export function CResult_ReplyChannelRangeDecodeErrorZ_ok(o: number): number { +export function CResult_ReplyChannelRangeDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15371,7 +15378,7 @@ export function CResult_ReplyChannelRangeDecodeErrorZ_ok(o: number): number { } // struct LDKCResult_ReplyChannelRangeDecodeErrorZ CResult_ReplyChannelRangeDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_ReplyChannelRangeDecodeErrorZ_err(e: number): number { +export function CResult_ReplyChannelRangeDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15380,7 +15387,7 @@ export function CResult_ReplyChannelRangeDecodeErrorZ_err(e: number): number { } // bool CResult_ReplyChannelRangeDecodeErrorZ_is_ok(const struct LDKCResult_ReplyChannelRangeDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_ReplyChannelRangeDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_ReplyChannelRangeDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15389,16 +15396,16 @@ export function CResult_ReplyChannelRangeDecodeErrorZ_is_ok(o: number): boolean } // void CResult_ReplyChannelRangeDecodeErrorZ_free(struct LDKCResult_ReplyChannelRangeDecodeErrorZ _res); /* @internal */ -export function CResult_ReplyChannelRangeDecodeErrorZ_free(_res: number): void { +export function CResult_ReplyChannelRangeDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_ReplyChannelRangeDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_ReplyChannelRangeDecodeErrorZ_clone_ptr(LDKCResult_ReplyChannelRangeDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_ReplyChannelRangeDecodeErrorZ_clone_ptr(LDKCResult_ReplyChannelRangeDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_ReplyChannelRangeDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_ReplyChannelRangeDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15407,7 +15414,7 @@ export function CResult_ReplyChannelRangeDecodeErrorZ_clone_ptr(arg: number): nu } // struct LDKCResult_ReplyChannelRangeDecodeErrorZ CResult_ReplyChannelRangeDecodeErrorZ_clone(const struct LDKCResult_ReplyChannelRangeDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_ReplyChannelRangeDecodeErrorZ_clone(orig: number): number { +export function CResult_ReplyChannelRangeDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15416,7 +15423,7 @@ export function CResult_ReplyChannelRangeDecodeErrorZ_clone(orig: number): numbe } // struct LDKCResult_GossipTimestampFilterDecodeErrorZ CResult_GossipTimestampFilterDecodeErrorZ_ok(struct LDKGossipTimestampFilter o); /* @internal */ -export function CResult_GossipTimestampFilterDecodeErrorZ_ok(o: number): number { +export function CResult_GossipTimestampFilterDecodeErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15425,7 +15432,7 @@ export function CResult_GossipTimestampFilterDecodeErrorZ_ok(o: number): number } // struct LDKCResult_GossipTimestampFilterDecodeErrorZ CResult_GossipTimestampFilterDecodeErrorZ_err(struct LDKDecodeError e); /* @internal */ -export function CResult_GossipTimestampFilterDecodeErrorZ_err(e: number): number { +export function CResult_GossipTimestampFilterDecodeErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15434,7 +15441,7 @@ export function CResult_GossipTimestampFilterDecodeErrorZ_err(e: number): number } // bool CResult_GossipTimestampFilterDecodeErrorZ_is_ok(const struct LDKCResult_GossipTimestampFilterDecodeErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_GossipTimestampFilterDecodeErrorZ_is_ok(o: number): boolean { +export function CResult_GossipTimestampFilterDecodeErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15443,16 +15450,16 @@ export function CResult_GossipTimestampFilterDecodeErrorZ_is_ok(o: number): bool } // void CResult_GossipTimestampFilterDecodeErrorZ_free(struct LDKCResult_GossipTimestampFilterDecodeErrorZ _res); /* @internal */ -export function CResult_GossipTimestampFilterDecodeErrorZ_free(_res: number): void { +export function CResult_GossipTimestampFilterDecodeErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_GossipTimestampFilterDecodeErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_GossipTimestampFilterDecodeErrorZ_clone_ptr(LDKCResult_GossipTimestampFilterDecodeErrorZ *NONNULL_PTR arg); + // uint64_t CResult_GossipTimestampFilterDecodeErrorZ_clone_ptr(LDKCResult_GossipTimestampFilterDecodeErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_GossipTimestampFilterDecodeErrorZ_clone_ptr(arg: number): number { +export function CResult_GossipTimestampFilterDecodeErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15461,7 +15468,7 @@ export function CResult_GossipTimestampFilterDecodeErrorZ_clone_ptr(arg: number) } // struct LDKCResult_GossipTimestampFilterDecodeErrorZ CResult_GossipTimestampFilterDecodeErrorZ_clone(const struct LDKCResult_GossipTimestampFilterDecodeErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_GossipTimestampFilterDecodeErrorZ_clone(orig: number): number { +export function CResult_GossipTimestampFilterDecodeErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15470,7 +15477,7 @@ export function CResult_GossipTimestampFilterDecodeErrorZ_clone(orig: number): n } // struct LDKCResult_InvoiceSignOrCreationErrorZ CResult_InvoiceSignOrCreationErrorZ_ok(struct LDKInvoice o); /* @internal */ -export function CResult_InvoiceSignOrCreationErrorZ_ok(o: number): number { +export function CResult_InvoiceSignOrCreationErrorZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15479,7 +15486,7 @@ export function CResult_InvoiceSignOrCreationErrorZ_ok(o: number): number { } // struct LDKCResult_InvoiceSignOrCreationErrorZ CResult_InvoiceSignOrCreationErrorZ_err(struct LDKSignOrCreationError e); /* @internal */ -export function CResult_InvoiceSignOrCreationErrorZ_err(e: number): number { +export function CResult_InvoiceSignOrCreationErrorZ_err(e: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15488,7 +15495,7 @@ export function CResult_InvoiceSignOrCreationErrorZ_err(e: number): number { } // bool CResult_InvoiceSignOrCreationErrorZ_is_ok(const struct LDKCResult_InvoiceSignOrCreationErrorZ *NONNULL_PTR o); /* @internal */ -export function CResult_InvoiceSignOrCreationErrorZ_is_ok(o: number): boolean { +export function CResult_InvoiceSignOrCreationErrorZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15497,16 +15504,16 @@ export function CResult_InvoiceSignOrCreationErrorZ_is_ok(o: number): boolean { } // void CResult_InvoiceSignOrCreationErrorZ_free(struct LDKCResult_InvoiceSignOrCreationErrorZ _res); /* @internal */ -export function CResult_InvoiceSignOrCreationErrorZ_free(_res: number): void { +export function CResult_InvoiceSignOrCreationErrorZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CResult_InvoiceSignOrCreationErrorZ_free(_res); // debug statements here } - // uintptr_t CResult_InvoiceSignOrCreationErrorZ_clone_ptr(LDKCResult_InvoiceSignOrCreationErrorZ *NONNULL_PTR arg); + // uint64_t CResult_InvoiceSignOrCreationErrorZ_clone_ptr(LDKCResult_InvoiceSignOrCreationErrorZ *NONNULL_PTR arg); /* @internal */ -export function CResult_InvoiceSignOrCreationErrorZ_clone_ptr(arg: number): number { +export function CResult_InvoiceSignOrCreationErrorZ_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15515,7 +15522,7 @@ export function CResult_InvoiceSignOrCreationErrorZ_clone_ptr(arg: number): numb } // struct LDKCResult_InvoiceSignOrCreationErrorZ CResult_InvoiceSignOrCreationErrorZ_clone(const struct LDKCResult_InvoiceSignOrCreationErrorZ *NONNULL_PTR orig); /* @internal */ -export function CResult_InvoiceSignOrCreationErrorZ_clone(orig: number): number { +export function CResult_InvoiceSignOrCreationErrorZ_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15524,7 +15531,7 @@ export function CResult_InvoiceSignOrCreationErrorZ_clone(orig: number): number } // struct LDKCOption_FilterZ COption_FilterZ_some(struct LDKFilter o); /* @internal */ -export function COption_FilterZ_some(o: number): number { +export function COption_FilterZ_some(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15533,7 +15540,7 @@ export function COption_FilterZ_some(o: number): number { } // struct LDKCOption_FilterZ COption_FilterZ_none(void); /* @internal */ -export function COption_FilterZ_none(): number { +export function COption_FilterZ_none(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15542,7 +15549,7 @@ export function COption_FilterZ_none(): number { } // void COption_FilterZ_free(struct LDKCOption_FilterZ _res); /* @internal */ -export function COption_FilterZ_free(_res: number): void { +export function COption_FilterZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15551,7 +15558,7 @@ export function COption_FilterZ_free(_res: number): void { } // struct LDKCResult_LockedChannelMonitorNoneZ CResult_LockedChannelMonitorNoneZ_ok(struct LDKLockedChannelMonitor o); /* @internal */ -export function CResult_LockedChannelMonitorNoneZ_ok(o: number): number { +export function CResult_LockedChannelMonitorNoneZ_ok(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15560,7 +15567,7 @@ export function CResult_LockedChannelMonitorNoneZ_ok(o: number): number { } // struct LDKCResult_LockedChannelMonitorNoneZ CResult_LockedChannelMonitorNoneZ_err(void); /* @internal */ -export function CResult_LockedChannelMonitorNoneZ_err(): number { +export function CResult_LockedChannelMonitorNoneZ_err(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15569,7 +15576,7 @@ export function CResult_LockedChannelMonitorNoneZ_err(): number { } // bool CResult_LockedChannelMonitorNoneZ_is_ok(const struct LDKCResult_LockedChannelMonitorNoneZ *NONNULL_PTR o); /* @internal */ -export function CResult_LockedChannelMonitorNoneZ_is_ok(o: number): boolean { +export function CResult_LockedChannelMonitorNoneZ_is_ok(o: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15578,7 +15585,7 @@ export function CResult_LockedChannelMonitorNoneZ_is_ok(o: number): boolean { } // void CResult_LockedChannelMonitorNoneZ_free(struct LDKCResult_LockedChannelMonitorNoneZ _res); /* @internal */ -export function CResult_LockedChannelMonitorNoneZ_free(_res: number): void { +export function CResult_LockedChannelMonitorNoneZ_free(_res: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15596,16 +15603,16 @@ export function CVec_OutPointZ_free(_res: number): void { } // void PaymentPurpose_free(struct LDKPaymentPurpose this_ptr); /* @internal */ -export function PaymentPurpose_free(this_ptr: number): void { +export function PaymentPurpose_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_PaymentPurpose_free(this_ptr); // debug statements here } - // uintptr_t PaymentPurpose_clone_ptr(LDKPaymentPurpose *NONNULL_PTR arg); + // uint64_t PaymentPurpose_clone_ptr(LDKPaymentPurpose *NONNULL_PTR arg); /* @internal */ -export function PaymentPurpose_clone_ptr(arg: number): number { +export function PaymentPurpose_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15614,7 +15621,7 @@ export function PaymentPurpose_clone_ptr(arg: number): number { } // struct LDKPaymentPurpose PaymentPurpose_clone(const struct LDKPaymentPurpose *NONNULL_PTR orig); /* @internal */ -export function PaymentPurpose_clone(orig: number): number { +export function PaymentPurpose_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15623,7 +15630,7 @@ export function PaymentPurpose_clone(orig: number): number { } // struct LDKPaymentPurpose PaymentPurpose_invoice_payment(struct LDKThirtyTwoBytes payment_preimage, struct LDKThirtyTwoBytes payment_secret); /* @internal */ -export function PaymentPurpose_invoice_payment(payment_preimage: number, payment_secret: number): number { +export function PaymentPurpose_invoice_payment(payment_preimage: number, payment_secret: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15632,7 +15639,7 @@ export function PaymentPurpose_invoice_payment(payment_preimage: number, payment } // struct LDKPaymentPurpose PaymentPurpose_spontaneous_payment(struct LDKThirtyTwoBytes a); /* @internal */ -export function PaymentPurpose_spontaneous_payment(a: number): number { +export function PaymentPurpose_spontaneous_payment(a: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15641,7 +15648,7 @@ export function PaymentPurpose_spontaneous_payment(a: number): number { } // struct LDKCVec_u8Z PaymentPurpose_write(const struct LDKPaymentPurpose *NONNULL_PTR obj); /* @internal */ -export function PaymentPurpose_write(obj: number): number { +export function PaymentPurpose_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15650,7 +15657,7 @@ export function PaymentPurpose_write(obj: number): number { } // struct LDKCResult_PaymentPurposeDecodeErrorZ PaymentPurpose_read(struct LDKu8slice ser); /* @internal */ -export function PaymentPurpose_read(ser: number): number { +export function PaymentPurpose_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15659,16 +15666,16 @@ export function PaymentPurpose_read(ser: number): number { } // void ClosureReason_free(struct LDKClosureReason this_ptr); /* @internal */ -export function ClosureReason_free(this_ptr: number): void { +export function ClosureReason_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_ClosureReason_free(this_ptr); // debug statements here } - // uintptr_t ClosureReason_clone_ptr(LDKClosureReason *NONNULL_PTR arg); + // uint64_t ClosureReason_clone_ptr(LDKClosureReason *NONNULL_PTR arg); /* @internal */ -export function ClosureReason_clone_ptr(arg: number): number { +export function ClosureReason_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15677,7 +15684,7 @@ export function ClosureReason_clone_ptr(arg: number): number { } // struct LDKClosureReason ClosureReason_clone(const struct LDKClosureReason *NONNULL_PTR orig); /* @internal */ -export function ClosureReason_clone(orig: number): number { +export function ClosureReason_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15686,7 +15693,7 @@ export function ClosureReason_clone(orig: number): number { } // struct LDKClosureReason ClosureReason_counterparty_force_closed(struct LDKStr peer_msg); /* @internal */ -export function ClosureReason_counterparty_force_closed(peer_msg: number): number { +export function ClosureReason_counterparty_force_closed(peer_msg: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15695,7 +15702,7 @@ export function ClosureReason_counterparty_force_closed(peer_msg: number): numbe } // struct LDKClosureReason ClosureReason_holder_force_closed(void); /* @internal */ -export function ClosureReason_holder_force_closed(): number { +export function ClosureReason_holder_force_closed(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15704,7 +15711,7 @@ export function ClosureReason_holder_force_closed(): number { } // struct LDKClosureReason ClosureReason_cooperative_closure(void); /* @internal */ -export function ClosureReason_cooperative_closure(): number { +export function ClosureReason_cooperative_closure(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15713,7 +15720,7 @@ export function ClosureReason_cooperative_closure(): number { } // struct LDKClosureReason ClosureReason_commitment_tx_confirmed(void); /* @internal */ -export function ClosureReason_commitment_tx_confirmed(): number { +export function ClosureReason_commitment_tx_confirmed(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15722,7 +15729,7 @@ export function ClosureReason_commitment_tx_confirmed(): number { } // struct LDKClosureReason ClosureReason_funding_timed_out(void); /* @internal */ -export function ClosureReason_funding_timed_out(): number { +export function ClosureReason_funding_timed_out(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15731,7 +15738,7 @@ export function ClosureReason_funding_timed_out(): number { } // struct LDKClosureReason ClosureReason_processing_error(struct LDKStr err); /* @internal */ -export function ClosureReason_processing_error(err: number): number { +export function ClosureReason_processing_error(err: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15740,7 +15747,7 @@ export function ClosureReason_processing_error(err: number): number { } // struct LDKClosureReason ClosureReason_disconnected_peer(void); /* @internal */ -export function ClosureReason_disconnected_peer(): number { +export function ClosureReason_disconnected_peer(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15749,7 +15756,7 @@ export function ClosureReason_disconnected_peer(): number { } // struct LDKClosureReason ClosureReason_outdated_channel_manager(void); /* @internal */ -export function ClosureReason_outdated_channel_manager(): number { +export function ClosureReason_outdated_channel_manager(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15758,7 +15765,7 @@ export function ClosureReason_outdated_channel_manager(): number { } // struct LDKCVec_u8Z ClosureReason_write(const struct LDKClosureReason *NONNULL_PTR obj); /* @internal */ -export function ClosureReason_write(obj: number): number { +export function ClosureReason_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15767,7 +15774,7 @@ export function ClosureReason_write(obj: number): number { } // struct LDKCResult_COption_ClosureReasonZDecodeErrorZ ClosureReason_read(struct LDKu8slice ser); /* @internal */ -export function ClosureReason_read(ser: number): number { +export function ClosureReason_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15776,16 +15783,16 @@ export function ClosureReason_read(ser: number): number { } // void HTLCDestination_free(struct LDKHTLCDestination this_ptr); /* @internal */ -export function HTLCDestination_free(this_ptr: number): void { +export function HTLCDestination_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_HTLCDestination_free(this_ptr); // debug statements here } - // uintptr_t HTLCDestination_clone_ptr(LDKHTLCDestination *NONNULL_PTR arg); + // uint64_t HTLCDestination_clone_ptr(LDKHTLCDestination *NONNULL_PTR arg); /* @internal */ -export function HTLCDestination_clone_ptr(arg: number): number { +export function HTLCDestination_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15794,7 +15801,7 @@ export function HTLCDestination_clone_ptr(arg: number): number { } // struct LDKHTLCDestination HTLCDestination_clone(const struct LDKHTLCDestination *NONNULL_PTR orig); /* @internal */ -export function HTLCDestination_clone(orig: number): number { +export function HTLCDestination_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15803,7 +15810,7 @@ export function HTLCDestination_clone(orig: number): number { } // struct LDKHTLCDestination HTLCDestination_next_hop_channel(struct LDKPublicKey node_id, struct LDKThirtyTwoBytes channel_id); /* @internal */ -export function HTLCDestination_next_hop_channel(node_id: number, channel_id: number): number { +export function HTLCDestination_next_hop_channel(node_id: number, channel_id: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15812,7 +15819,7 @@ export function HTLCDestination_next_hop_channel(node_id: number, channel_id: nu } // struct LDKHTLCDestination HTLCDestination_unknown_next_hop(uint64_t requested_forward_scid); /* @internal */ -export function HTLCDestination_unknown_next_hop(requested_forward_scid: bigint): number { +export function HTLCDestination_unknown_next_hop(requested_forward_scid: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15821,7 +15828,7 @@ export function HTLCDestination_unknown_next_hop(requested_forward_scid: bigint) } // struct LDKHTLCDestination HTLCDestination_failed_payment(struct LDKThirtyTwoBytes payment_hash); /* @internal */ -export function HTLCDestination_failed_payment(payment_hash: number): number { +export function HTLCDestination_failed_payment(payment_hash: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15830,7 +15837,7 @@ export function HTLCDestination_failed_payment(payment_hash: number): number { } // struct LDKCVec_u8Z HTLCDestination_write(const struct LDKHTLCDestination *NONNULL_PTR obj); /* @internal */ -export function HTLCDestination_write(obj: number): number { +export function HTLCDestination_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15839,7 +15846,7 @@ export function HTLCDestination_write(obj: number): number { } // struct LDKCResult_COption_HTLCDestinationZDecodeErrorZ HTLCDestination_read(struct LDKu8slice ser); /* @internal */ -export function HTLCDestination_read(ser: number): number { +export function HTLCDestination_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15848,16 +15855,16 @@ export function HTLCDestination_read(ser: number): number { } // void Event_free(struct LDKEvent this_ptr); /* @internal */ -export function Event_free(this_ptr: number): void { +export function Event_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_Event_free(this_ptr); // debug statements here } - // uintptr_t Event_clone_ptr(LDKEvent *NONNULL_PTR arg); + // uint64_t Event_clone_ptr(LDKEvent *NONNULL_PTR arg); /* @internal */ -export function Event_clone_ptr(arg: number): number { +export function Event_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15866,7 +15873,7 @@ export function Event_clone_ptr(arg: number): number { } // struct LDKEvent Event_clone(const struct LDKEvent *NONNULL_PTR orig); /* @internal */ -export function Event_clone(orig: number): number { +export function Event_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15875,7 +15882,7 @@ export function Event_clone(orig: number): number { } // struct LDKEvent Event_funding_generation_ready(struct LDKThirtyTwoBytes temporary_channel_id, struct LDKPublicKey counterparty_node_id, uint64_t channel_value_satoshis, struct LDKCVec_u8Z output_script, uint64_t user_channel_id); /* @internal */ -export function Event_funding_generation_ready(temporary_channel_id: number, counterparty_node_id: number, channel_value_satoshis: bigint, output_script: number, user_channel_id: bigint): number { +export function Event_funding_generation_ready(temporary_channel_id: number, counterparty_node_id: number, channel_value_satoshis: bigint, output_script: number, user_channel_id: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15884,7 +15891,7 @@ export function Event_funding_generation_ready(temporary_channel_id: number, cou } // struct LDKEvent Event_payment_received(struct LDKThirtyTwoBytes payment_hash, uint64_t amount_msat, struct LDKPaymentPurpose purpose); /* @internal */ -export function Event_payment_received(payment_hash: number, amount_msat: bigint, purpose: number): number { +export function Event_payment_received(payment_hash: number, amount_msat: bigint, purpose: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15893,7 +15900,7 @@ export function Event_payment_received(payment_hash: number, amount_msat: bigint } // struct LDKEvent Event_payment_claimed(struct LDKThirtyTwoBytes payment_hash, uint64_t amount_msat, struct LDKPaymentPurpose purpose); /* @internal */ -export function Event_payment_claimed(payment_hash: number, amount_msat: bigint, purpose: number): number { +export function Event_payment_claimed(payment_hash: number, amount_msat: bigint, purpose: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15902,7 +15909,7 @@ export function Event_payment_claimed(payment_hash: number, amount_msat: bigint, } // struct LDKEvent Event_payment_sent(struct LDKThirtyTwoBytes payment_id, struct LDKThirtyTwoBytes payment_preimage, struct LDKThirtyTwoBytes payment_hash, struct LDKCOption_u64Z fee_paid_msat); /* @internal */ -export function Event_payment_sent(payment_id: number, payment_preimage: number, payment_hash: number, fee_paid_msat: number): number { +export function Event_payment_sent(payment_id: number, payment_preimage: number, payment_hash: number, fee_paid_msat: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15911,7 +15918,7 @@ export function Event_payment_sent(payment_id: number, payment_preimage: number, } // struct LDKEvent Event_payment_failed(struct LDKThirtyTwoBytes payment_id, struct LDKThirtyTwoBytes payment_hash); /* @internal */ -export function Event_payment_failed(payment_id: number, payment_hash: number): number { +export function Event_payment_failed(payment_id: number, payment_hash: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15920,7 +15927,7 @@ export function Event_payment_failed(payment_id: number, payment_hash: number): } // struct LDKEvent Event_payment_path_successful(struct LDKThirtyTwoBytes payment_id, struct LDKThirtyTwoBytes payment_hash, struct LDKCVec_RouteHopZ path); /* @internal */ -export function Event_payment_path_successful(payment_id: number, payment_hash: number, path: number): number { +export function Event_payment_path_successful(payment_id: number, payment_hash: number, path: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15929,7 +15936,7 @@ export function Event_payment_path_successful(payment_id: number, payment_hash: } // struct LDKEvent Event_payment_path_failed(struct LDKThirtyTwoBytes payment_id, struct LDKThirtyTwoBytes payment_hash, bool rejected_by_dest, struct LDKCOption_NetworkUpdateZ network_update, bool all_paths_failed, struct LDKCVec_RouteHopZ path, struct LDKCOption_u64Z short_channel_id, struct LDKRouteParameters retry); /* @internal */ -export function Event_payment_path_failed(payment_id: number, payment_hash: number, rejected_by_dest: boolean, network_update: number, all_paths_failed: boolean, path: number, short_channel_id: number, retry: number): number { +export function Event_payment_path_failed(payment_id: number, payment_hash: number, rejected_by_dest: boolean, network_update: bigint, all_paths_failed: boolean, path: number, short_channel_id: bigint, retry: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15938,7 +15945,7 @@ export function Event_payment_path_failed(payment_id: number, payment_hash: numb } // struct LDKEvent Event_probe_successful(struct LDKThirtyTwoBytes payment_id, struct LDKThirtyTwoBytes payment_hash, struct LDKCVec_RouteHopZ path); /* @internal */ -export function Event_probe_successful(payment_id: number, payment_hash: number, path: number): number { +export function Event_probe_successful(payment_id: number, payment_hash: number, path: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15947,7 +15954,7 @@ export function Event_probe_successful(payment_id: number, payment_hash: number, } // struct LDKEvent Event_probe_failed(struct LDKThirtyTwoBytes payment_id, struct LDKThirtyTwoBytes payment_hash, struct LDKCVec_RouteHopZ path, struct LDKCOption_u64Z short_channel_id); /* @internal */ -export function Event_probe_failed(payment_id: number, payment_hash: number, path: number, short_channel_id: number): number { +export function Event_probe_failed(payment_id: number, payment_hash: number, path: number, short_channel_id: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15956,7 +15963,7 @@ export function Event_probe_failed(payment_id: number, payment_hash: number, pat } // struct LDKEvent Event_pending_htlcs_forwardable(uint64_t time_forwardable); /* @internal */ -export function Event_pending_htlcs_forwardable(time_forwardable: bigint): number { +export function Event_pending_htlcs_forwardable(time_forwardable: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15965,7 +15972,7 @@ export function Event_pending_htlcs_forwardable(time_forwardable: bigint): numbe } // struct LDKEvent Event_spendable_outputs(struct LDKCVec_SpendableOutputDescriptorZ outputs); /* @internal */ -export function Event_spendable_outputs(outputs: number): number { +export function Event_spendable_outputs(outputs: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15974,7 +15981,7 @@ export function Event_spendable_outputs(outputs: number): number { } // struct LDKEvent Event_payment_forwarded(struct LDKThirtyTwoBytes prev_channel_id, struct LDKThirtyTwoBytes next_channel_id, struct LDKCOption_u64Z fee_earned_msat, bool claim_from_onchain_tx); /* @internal */ -export function Event_payment_forwarded(prev_channel_id: number, next_channel_id: number, fee_earned_msat: number, claim_from_onchain_tx: boolean): number { +export function Event_payment_forwarded(prev_channel_id: number, next_channel_id: number, fee_earned_msat: bigint, claim_from_onchain_tx: boolean): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15983,7 +15990,7 @@ export function Event_payment_forwarded(prev_channel_id: number, next_channel_id } // struct LDKEvent Event_channel_closed(struct LDKThirtyTwoBytes channel_id, uint64_t user_channel_id, struct LDKClosureReason reason); /* @internal */ -export function Event_channel_closed(channel_id: number, user_channel_id: bigint, reason: number): number { +export function Event_channel_closed(channel_id: number, user_channel_id: bigint, reason: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -15992,7 +15999,7 @@ export function Event_channel_closed(channel_id: number, user_channel_id: bigint } // struct LDKEvent Event_discard_funding(struct LDKThirtyTwoBytes channel_id, struct LDKTransaction transaction); /* @internal */ -export function Event_discard_funding(channel_id: number, transaction: number): number { +export function Event_discard_funding(channel_id: number, transaction: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16001,7 +16008,7 @@ export function Event_discard_funding(channel_id: number, transaction: number): } // struct LDKEvent Event_open_channel_request(struct LDKThirtyTwoBytes temporary_channel_id, struct LDKPublicKey counterparty_node_id, uint64_t funding_satoshis, uint64_t push_msat, struct LDKChannelTypeFeatures channel_type); /* @internal */ -export function Event_open_channel_request(temporary_channel_id: number, counterparty_node_id: number, funding_satoshis: bigint, push_msat: bigint, channel_type: number): number { +export function Event_open_channel_request(temporary_channel_id: number, counterparty_node_id: number, funding_satoshis: bigint, push_msat: bigint, channel_type: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16010,7 +16017,7 @@ export function Event_open_channel_request(temporary_channel_id: number, counter } // struct LDKEvent Event_htlchandling_failed(struct LDKThirtyTwoBytes prev_channel_id, struct LDKHTLCDestination failed_next_destination); /* @internal */ -export function Event_htlchandling_failed(prev_channel_id: number, failed_next_destination: number): number { +export function Event_htlchandling_failed(prev_channel_id: number, failed_next_destination: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16019,7 +16026,7 @@ export function Event_htlchandling_failed(prev_channel_id: number, failed_next_d } // struct LDKCVec_u8Z Event_write(const struct LDKEvent *NONNULL_PTR obj); /* @internal */ -export function Event_write(obj: number): number { +export function Event_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16028,7 +16035,7 @@ export function Event_write(obj: number): number { } // struct LDKCResult_COption_EventZDecodeErrorZ Event_read(struct LDKu8slice ser); /* @internal */ -export function Event_read(ser: number): number { +export function Event_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16037,16 +16044,16 @@ export function Event_read(ser: number): number { } // void MessageSendEvent_free(struct LDKMessageSendEvent this_ptr); /* @internal */ -export function MessageSendEvent_free(this_ptr: number): void { +export function MessageSendEvent_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_MessageSendEvent_free(this_ptr); // debug statements here } - // uintptr_t MessageSendEvent_clone_ptr(LDKMessageSendEvent *NONNULL_PTR arg); + // uint64_t MessageSendEvent_clone_ptr(LDKMessageSendEvent *NONNULL_PTR arg); /* @internal */ -export function MessageSendEvent_clone_ptr(arg: number): number { +export function MessageSendEvent_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16055,7 +16062,7 @@ export function MessageSendEvent_clone_ptr(arg: number): number { } // struct LDKMessageSendEvent MessageSendEvent_clone(const struct LDKMessageSendEvent *NONNULL_PTR orig); /* @internal */ -export function MessageSendEvent_clone(orig: number): number { +export function MessageSendEvent_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16064,7 +16071,7 @@ export function MessageSendEvent_clone(orig: number): number { } // struct LDKMessageSendEvent MessageSendEvent_send_accept_channel(struct LDKPublicKey node_id, struct LDKAcceptChannel msg); /* @internal */ -export function MessageSendEvent_send_accept_channel(node_id: number, msg: number): number { +export function MessageSendEvent_send_accept_channel(node_id: number, msg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16073,7 +16080,7 @@ export function MessageSendEvent_send_accept_channel(node_id: number, msg: numbe } // struct LDKMessageSendEvent MessageSendEvent_send_open_channel(struct LDKPublicKey node_id, struct LDKOpenChannel msg); /* @internal */ -export function MessageSendEvent_send_open_channel(node_id: number, msg: number): number { +export function MessageSendEvent_send_open_channel(node_id: number, msg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16082,7 +16089,7 @@ export function MessageSendEvent_send_open_channel(node_id: number, msg: number) } // struct LDKMessageSendEvent MessageSendEvent_send_funding_created(struct LDKPublicKey node_id, struct LDKFundingCreated msg); /* @internal */ -export function MessageSendEvent_send_funding_created(node_id: number, msg: number): number { +export function MessageSendEvent_send_funding_created(node_id: number, msg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16091,7 +16098,7 @@ export function MessageSendEvent_send_funding_created(node_id: number, msg: numb } // struct LDKMessageSendEvent MessageSendEvent_send_funding_signed(struct LDKPublicKey node_id, struct LDKFundingSigned msg); /* @internal */ -export function MessageSendEvent_send_funding_signed(node_id: number, msg: number): number { +export function MessageSendEvent_send_funding_signed(node_id: number, msg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16100,7 +16107,7 @@ export function MessageSendEvent_send_funding_signed(node_id: number, msg: numbe } // struct LDKMessageSendEvent MessageSendEvent_send_channel_ready(struct LDKPublicKey node_id, struct LDKChannelReady msg); /* @internal */ -export function MessageSendEvent_send_channel_ready(node_id: number, msg: number): number { +export function MessageSendEvent_send_channel_ready(node_id: number, msg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16109,7 +16116,7 @@ export function MessageSendEvent_send_channel_ready(node_id: number, msg: number } // struct LDKMessageSendEvent MessageSendEvent_send_announcement_signatures(struct LDKPublicKey node_id, struct LDKAnnouncementSignatures msg); /* @internal */ -export function MessageSendEvent_send_announcement_signatures(node_id: number, msg: number): number { +export function MessageSendEvent_send_announcement_signatures(node_id: number, msg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16118,7 +16125,7 @@ export function MessageSendEvent_send_announcement_signatures(node_id: number, m } // struct LDKMessageSendEvent MessageSendEvent_update_htlcs(struct LDKPublicKey node_id, struct LDKCommitmentUpdate updates); /* @internal */ -export function MessageSendEvent_update_htlcs(node_id: number, updates: number): number { +export function MessageSendEvent_update_htlcs(node_id: number, updates: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16127,7 +16134,7 @@ export function MessageSendEvent_update_htlcs(node_id: number, updates: number): } // struct LDKMessageSendEvent MessageSendEvent_send_revoke_and_ack(struct LDKPublicKey node_id, struct LDKRevokeAndACK msg); /* @internal */ -export function MessageSendEvent_send_revoke_and_ack(node_id: number, msg: number): number { +export function MessageSendEvent_send_revoke_and_ack(node_id: number, msg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16136,7 +16143,7 @@ export function MessageSendEvent_send_revoke_and_ack(node_id: number, msg: numbe } // struct LDKMessageSendEvent MessageSendEvent_send_closing_signed(struct LDKPublicKey node_id, struct LDKClosingSigned msg); /* @internal */ -export function MessageSendEvent_send_closing_signed(node_id: number, msg: number): number { +export function MessageSendEvent_send_closing_signed(node_id: number, msg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16145,7 +16152,7 @@ export function MessageSendEvent_send_closing_signed(node_id: number, msg: numbe } // struct LDKMessageSendEvent MessageSendEvent_send_shutdown(struct LDKPublicKey node_id, struct LDKShutdown msg); /* @internal */ -export function MessageSendEvent_send_shutdown(node_id: number, msg: number): number { +export function MessageSendEvent_send_shutdown(node_id: number, msg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16154,7 +16161,7 @@ export function MessageSendEvent_send_shutdown(node_id: number, msg: number): nu } // struct LDKMessageSendEvent MessageSendEvent_send_channel_reestablish(struct LDKPublicKey node_id, struct LDKChannelReestablish msg); /* @internal */ -export function MessageSendEvent_send_channel_reestablish(node_id: number, msg: number): number { +export function MessageSendEvent_send_channel_reestablish(node_id: number, msg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16163,7 +16170,7 @@ export function MessageSendEvent_send_channel_reestablish(node_id: number, msg: } // struct LDKMessageSendEvent MessageSendEvent_broadcast_channel_announcement(struct LDKChannelAnnouncement msg, struct LDKChannelUpdate update_msg); /* @internal */ -export function MessageSendEvent_broadcast_channel_announcement(msg: number, update_msg: number): number { +export function MessageSendEvent_broadcast_channel_announcement(msg: bigint, update_msg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16172,7 +16179,7 @@ export function MessageSendEvent_broadcast_channel_announcement(msg: number, upd } // struct LDKMessageSendEvent MessageSendEvent_broadcast_node_announcement(struct LDKNodeAnnouncement msg); /* @internal */ -export function MessageSendEvent_broadcast_node_announcement(msg: number): number { +export function MessageSendEvent_broadcast_node_announcement(msg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16181,7 +16188,7 @@ export function MessageSendEvent_broadcast_node_announcement(msg: number): numbe } // struct LDKMessageSendEvent MessageSendEvent_broadcast_channel_update(struct LDKChannelUpdate msg); /* @internal */ -export function MessageSendEvent_broadcast_channel_update(msg: number): number { +export function MessageSendEvent_broadcast_channel_update(msg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16190,7 +16197,7 @@ export function MessageSendEvent_broadcast_channel_update(msg: number): number { } // struct LDKMessageSendEvent MessageSendEvent_send_channel_update(struct LDKPublicKey node_id, struct LDKChannelUpdate msg); /* @internal */ -export function MessageSendEvent_send_channel_update(node_id: number, msg: number): number { +export function MessageSendEvent_send_channel_update(node_id: number, msg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16199,7 +16206,7 @@ export function MessageSendEvent_send_channel_update(node_id: number, msg: numbe } // struct LDKMessageSendEvent MessageSendEvent_handle_error(struct LDKPublicKey node_id, struct LDKErrorAction action); /* @internal */ -export function MessageSendEvent_handle_error(node_id: number, action: number): number { +export function MessageSendEvent_handle_error(node_id: number, action: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16208,7 +16215,7 @@ export function MessageSendEvent_handle_error(node_id: number, action: number): } // struct LDKMessageSendEvent MessageSendEvent_send_channel_range_query(struct LDKPublicKey node_id, struct LDKQueryChannelRange msg); /* @internal */ -export function MessageSendEvent_send_channel_range_query(node_id: number, msg: number): number { +export function MessageSendEvent_send_channel_range_query(node_id: number, msg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16217,7 +16224,7 @@ export function MessageSendEvent_send_channel_range_query(node_id: number, msg: } // struct LDKMessageSendEvent MessageSendEvent_send_short_ids_query(struct LDKPublicKey node_id, struct LDKQueryShortChannelIds msg); /* @internal */ -export function MessageSendEvent_send_short_ids_query(node_id: number, msg: number): number { +export function MessageSendEvent_send_short_ids_query(node_id: number, msg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16226,7 +16233,7 @@ export function MessageSendEvent_send_short_ids_query(node_id: number, msg: numb } // struct LDKMessageSendEvent MessageSendEvent_send_reply_channel_range(struct LDKPublicKey node_id, struct LDKReplyChannelRange msg); /* @internal */ -export function MessageSendEvent_send_reply_channel_range(node_id: number, msg: number): number { +export function MessageSendEvent_send_reply_channel_range(node_id: number, msg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16235,7 +16242,7 @@ export function MessageSendEvent_send_reply_channel_range(node_id: number, msg: } // struct LDKMessageSendEvent MessageSendEvent_send_gossip_timestamp_filter(struct LDKPublicKey node_id, struct LDKGossipTimestampFilter msg); /* @internal */ -export function MessageSendEvent_send_gossip_timestamp_filter(node_id: number, msg: number): number { +export function MessageSendEvent_send_gossip_timestamp_filter(node_id: number, msg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16244,7 +16251,7 @@ export function MessageSendEvent_send_gossip_timestamp_filter(node_id: number, m } // void MessageSendEventsProvider_free(struct LDKMessageSendEventsProvider this_ptr); /* @internal */ -export function MessageSendEventsProvider_free(this_ptr: number): void { +export function MessageSendEventsProvider_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16253,7 +16260,7 @@ export function MessageSendEventsProvider_free(this_ptr: number): void { } // void EventsProvider_free(struct LDKEventsProvider this_ptr); /* @internal */ -export function EventsProvider_free(this_ptr: number): void { +export function EventsProvider_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16262,7 +16269,7 @@ export function EventsProvider_free(this_ptr: number): void { } // void EventHandler_free(struct LDKEventHandler this_ptr); /* @internal */ -export function EventHandler_free(this_ptr: number): void { +export function EventHandler_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16271,16 +16278,16 @@ export function EventHandler_free(this_ptr: number): void { } // void APIError_free(struct LDKAPIError this_ptr); /* @internal */ -export function APIError_free(this_ptr: number): void { +export function APIError_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_APIError_free(this_ptr); // debug statements here } - // uintptr_t APIError_clone_ptr(LDKAPIError *NONNULL_PTR arg); + // uint64_t APIError_clone_ptr(LDKAPIError *NONNULL_PTR arg); /* @internal */ -export function APIError_clone_ptr(arg: number): number { +export function APIError_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16289,7 +16296,7 @@ export function APIError_clone_ptr(arg: number): number { } // struct LDKAPIError APIError_clone(const struct LDKAPIError *NONNULL_PTR orig); /* @internal */ -export function APIError_clone(orig: number): number { +export function APIError_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16298,7 +16305,7 @@ export function APIError_clone(orig: number): number { } // struct LDKAPIError APIError_apimisuse_error(struct LDKStr err); /* @internal */ -export function APIError_apimisuse_error(err: number): number { +export function APIError_apimisuse_error(err: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16307,7 +16314,7 @@ export function APIError_apimisuse_error(err: number): number { } // struct LDKAPIError APIError_fee_rate_too_high(struct LDKStr err, uint32_t feerate); /* @internal */ -export function APIError_fee_rate_too_high(err: number, feerate: number): number { +export function APIError_fee_rate_too_high(err: number, feerate: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16316,7 +16323,7 @@ export function APIError_fee_rate_too_high(err: number, feerate: number): number } // struct LDKAPIError APIError_route_error(struct LDKStr err); /* @internal */ -export function APIError_route_error(err: number): number { +export function APIError_route_error(err: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16325,7 +16332,7 @@ export function APIError_route_error(err: number): number { } // struct LDKAPIError APIError_channel_unavailable(struct LDKStr err); /* @internal */ -export function APIError_channel_unavailable(err: number): number { +export function APIError_channel_unavailable(err: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16334,7 +16341,7 @@ export function APIError_channel_unavailable(err: number): number { } // struct LDKAPIError APIError_monitor_update_failed(void); /* @internal */ -export function APIError_monitor_update_failed(): number { +export function APIError_monitor_update_failed(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16343,7 +16350,7 @@ export function APIError_monitor_update_failed(): number { } // struct LDKAPIError APIError_incompatible_shutdown_script(struct LDKShutdownScript script); /* @internal */ -export function APIError_incompatible_shutdown_script(script: number): number { +export function APIError_incompatible_shutdown_script(script: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16352,7 +16359,7 @@ export function APIError_incompatible_shutdown_script(script: number): number { } // void BigSize_free(struct LDKBigSize this_obj); /* @internal */ -export function BigSize_free(this_obj: number): void { +export function BigSize_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16361,7 +16368,7 @@ export function BigSize_free(this_obj: number): void { } // uint64_t BigSize_get_a(const struct LDKBigSize *NONNULL_PTR this_ptr); /* @internal */ -export function BigSize_get_a(this_ptr: number): bigint { +export function BigSize_get_a(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16370,7 +16377,7 @@ export function BigSize_get_a(this_ptr: number): bigint { } // void BigSize_set_a(struct LDKBigSize *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function BigSize_set_a(this_ptr: number, val: bigint): void { +export function BigSize_set_a(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16379,7 +16386,7 @@ export function BigSize_set_a(this_ptr: number, val: bigint): void { } // MUST_USE_RES struct LDKBigSize BigSize_new(uint64_t a_arg); /* @internal */ -export function BigSize_new(a_arg: bigint): number { +export function BigSize_new(a_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16388,16 +16395,16 @@ export function BigSize_new(a_arg: bigint): number { } // void Hostname_free(struct LDKHostname this_obj); /* @internal */ -export function Hostname_free(this_obj: number): void { +export function Hostname_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_Hostname_free(this_obj); // debug statements here } - // uintptr_t Hostname_clone_ptr(LDKHostname *NONNULL_PTR arg); + // uint64_t Hostname_clone_ptr(LDKHostname *NONNULL_PTR arg); /* @internal */ -export function Hostname_clone_ptr(arg: number): number { +export function Hostname_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16406,7 +16413,7 @@ export function Hostname_clone_ptr(arg: number): number { } // struct LDKHostname Hostname_clone(const struct LDKHostname *NONNULL_PTR orig); /* @internal */ -export function Hostname_clone(orig: number): number { +export function Hostname_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16415,7 +16422,7 @@ export function Hostname_clone(orig: number): number { } // MUST_USE_RES uint8_t Hostname_len(const struct LDKHostname *NONNULL_PTR this_arg); /* @internal */ -export function Hostname_len(this_arg: number): number { +export function Hostname_len(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16424,7 +16431,7 @@ export function Hostname_len(this_arg: number): number { } // struct LDKCResult_StringErrorZ sign(struct LDKu8slice msg, const uint8_t (*sk)[32]); /* @internal */ -export function sign(msg: number, sk: number): number { +export function sign(msg: number, sk: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16433,7 +16440,7 @@ export function sign(msg: number, sk: number): number { } // struct LDKCResult_PublicKeyErrorZ recover_pk(struct LDKu8slice msg, struct LDKStr sig); /* @internal */ -export function recover_pk(msg: number, sig: number): number { +export function recover_pk(msg: number, sig: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16460,7 +16467,7 @@ export function construct_invoice_preimage(hrp_bytes: number, data_without_signa } // void Persister_free(struct LDKPersister this_ptr); /* @internal */ -export function Persister_free(this_ptr: number): void { +export function Persister_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16469,7 +16476,7 @@ export function Persister_free(this_ptr: number): void { } // enum LDKLevel Level_clone(const enum LDKLevel *NONNULL_PTR orig); /* @internal */ -export function Level_clone(orig: number): Level { +export function Level_clone(orig: bigint): Level { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16532,7 +16539,7 @@ export function Level_error(): Level { } // bool Level_eq(const enum LDKLevel *NONNULL_PTR a, const enum LDKLevel *NONNULL_PTR b); /* @internal */ -export function Level_eq(a: number, b: number): boolean { +export function Level_eq(a: bigint, b: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16541,7 +16548,7 @@ export function Level_eq(a: number, b: number): boolean { } // uint64_t Level_hash(const enum LDKLevel *NONNULL_PTR o); /* @internal */ -export function Level_hash(o: number): bigint { +export function Level_hash(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16559,7 +16566,7 @@ export function Level_max(): Level { } // void Record_free(struct LDKRecord this_obj); /* @internal */ -export function Record_free(this_obj: number): void { +export function Record_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16568,7 +16575,7 @@ export function Record_free(this_obj: number): void { } // enum LDKLevel Record_get_level(const struct LDKRecord *NONNULL_PTR this_ptr); /* @internal */ -export function Record_get_level(this_ptr: number): Level { +export function Record_get_level(this_ptr: bigint): Level { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16577,7 +16584,7 @@ export function Record_get_level(this_ptr: number): Level { } // void Record_set_level(struct LDKRecord *NONNULL_PTR this_ptr, enum LDKLevel val); /* @internal */ -export function Record_set_level(this_ptr: number, val: Level): void { +export function Record_set_level(this_ptr: bigint, val: Level): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16586,7 +16593,7 @@ export function Record_set_level(this_ptr: number, val: Level): void { } // struct LDKStr Record_get_args(const struct LDKRecord *NONNULL_PTR this_ptr); /* @internal */ -export function Record_get_args(this_ptr: number): number { +export function Record_get_args(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16595,7 +16602,7 @@ export function Record_get_args(this_ptr: number): number { } // void Record_set_args(struct LDKRecord *NONNULL_PTR this_ptr, struct LDKStr val); /* @internal */ -export function Record_set_args(this_ptr: number, val: number): void { +export function Record_set_args(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16604,7 +16611,7 @@ export function Record_set_args(this_ptr: number, val: number): void { } // struct LDKStr Record_get_module_path(const struct LDKRecord *NONNULL_PTR this_ptr); /* @internal */ -export function Record_get_module_path(this_ptr: number): number { +export function Record_get_module_path(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16613,7 +16620,7 @@ export function Record_get_module_path(this_ptr: number): number { } // void Record_set_module_path(struct LDKRecord *NONNULL_PTR this_ptr, struct LDKStr val); /* @internal */ -export function Record_set_module_path(this_ptr: number, val: number): void { +export function Record_set_module_path(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16622,7 +16629,7 @@ export function Record_set_module_path(this_ptr: number, val: number): void { } // struct LDKStr Record_get_file(const struct LDKRecord *NONNULL_PTR this_ptr); /* @internal */ -export function Record_get_file(this_ptr: number): number { +export function Record_get_file(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16631,7 +16638,7 @@ export function Record_get_file(this_ptr: number): number { } // void Record_set_file(struct LDKRecord *NONNULL_PTR this_ptr, struct LDKStr val); /* @internal */ -export function Record_set_file(this_ptr: number, val: number): void { +export function Record_set_file(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16640,7 +16647,7 @@ export function Record_set_file(this_ptr: number, val: number): void { } // uint32_t Record_get_line(const struct LDKRecord *NONNULL_PTR this_ptr); /* @internal */ -export function Record_get_line(this_ptr: number): number { +export function Record_get_line(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16649,16 +16656,16 @@ export function Record_get_line(this_ptr: number): number { } // void Record_set_line(struct LDKRecord *NONNULL_PTR this_ptr, uint32_t val); /* @internal */ -export function Record_set_line(this_ptr: number, val: number): void { +export function Record_set_line(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_Record_set_line(this_ptr, val); // debug statements here } - // uintptr_t Record_clone_ptr(LDKRecord *NONNULL_PTR arg); + // uint64_t Record_clone_ptr(LDKRecord *NONNULL_PTR arg); /* @internal */ -export function Record_clone_ptr(arg: number): number { +export function Record_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16667,7 +16674,7 @@ export function Record_clone_ptr(arg: number): number { } // struct LDKRecord Record_clone(const struct LDKRecord *NONNULL_PTR orig); /* @internal */ -export function Record_clone(orig: number): number { +export function Record_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16676,7 +16683,7 @@ export function Record_clone(orig: number): number { } // void Logger_free(struct LDKLogger this_ptr); /* @internal */ -export function Logger_free(this_ptr: number): void { +export function Logger_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16685,7 +16692,7 @@ export function Logger_free(this_ptr: number): void { } // void ChannelHandshakeConfig_free(struct LDKChannelHandshakeConfig this_obj); /* @internal */ -export function ChannelHandshakeConfig_free(this_obj: number): void { +export function ChannelHandshakeConfig_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16694,7 +16701,7 @@ export function ChannelHandshakeConfig_free(this_obj: number): void { } // uint32_t ChannelHandshakeConfig_get_minimum_depth(const struct LDKChannelHandshakeConfig *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelHandshakeConfig_get_minimum_depth(this_ptr: number): number { +export function ChannelHandshakeConfig_get_minimum_depth(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16703,7 +16710,7 @@ export function ChannelHandshakeConfig_get_minimum_depth(this_ptr: number): numb } // void ChannelHandshakeConfig_set_minimum_depth(struct LDKChannelHandshakeConfig *NONNULL_PTR this_ptr, uint32_t val); /* @internal */ -export function ChannelHandshakeConfig_set_minimum_depth(this_ptr: number, val: number): void { +export function ChannelHandshakeConfig_set_minimum_depth(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16712,7 +16719,7 @@ export function ChannelHandshakeConfig_set_minimum_depth(this_ptr: number, val: } // uint16_t ChannelHandshakeConfig_get_our_to_self_delay(const struct LDKChannelHandshakeConfig *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelHandshakeConfig_get_our_to_self_delay(this_ptr: number): number { +export function ChannelHandshakeConfig_get_our_to_self_delay(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16721,7 +16728,7 @@ export function ChannelHandshakeConfig_get_our_to_self_delay(this_ptr: number): } // void ChannelHandshakeConfig_set_our_to_self_delay(struct LDKChannelHandshakeConfig *NONNULL_PTR this_ptr, uint16_t val); /* @internal */ -export function ChannelHandshakeConfig_set_our_to_self_delay(this_ptr: number, val: number): void { +export function ChannelHandshakeConfig_set_our_to_self_delay(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16730,7 +16737,7 @@ export function ChannelHandshakeConfig_set_our_to_self_delay(this_ptr: number, v } // uint64_t ChannelHandshakeConfig_get_our_htlc_minimum_msat(const struct LDKChannelHandshakeConfig *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelHandshakeConfig_get_our_htlc_minimum_msat(this_ptr: number): bigint { +export function ChannelHandshakeConfig_get_our_htlc_minimum_msat(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16739,7 +16746,7 @@ export function ChannelHandshakeConfig_get_our_htlc_minimum_msat(this_ptr: numbe } // void ChannelHandshakeConfig_set_our_htlc_minimum_msat(struct LDKChannelHandshakeConfig *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function ChannelHandshakeConfig_set_our_htlc_minimum_msat(this_ptr: number, val: bigint): void { +export function ChannelHandshakeConfig_set_our_htlc_minimum_msat(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16748,7 +16755,7 @@ export function ChannelHandshakeConfig_set_our_htlc_minimum_msat(this_ptr: numbe } // uint8_t ChannelHandshakeConfig_get_max_inbound_htlc_value_in_flight_percent_of_channel(const struct LDKChannelHandshakeConfig *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelHandshakeConfig_get_max_inbound_htlc_value_in_flight_percent_of_channel(this_ptr: number): number { +export function ChannelHandshakeConfig_get_max_inbound_htlc_value_in_flight_percent_of_channel(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16757,7 +16764,7 @@ export function ChannelHandshakeConfig_get_max_inbound_htlc_value_in_flight_perc } // void ChannelHandshakeConfig_set_max_inbound_htlc_value_in_flight_percent_of_channel(struct LDKChannelHandshakeConfig *NONNULL_PTR this_ptr, uint8_t val); /* @internal */ -export function ChannelHandshakeConfig_set_max_inbound_htlc_value_in_flight_percent_of_channel(this_ptr: number, val: number): void { +export function ChannelHandshakeConfig_set_max_inbound_htlc_value_in_flight_percent_of_channel(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16766,7 +16773,7 @@ export function ChannelHandshakeConfig_set_max_inbound_htlc_value_in_flight_perc } // bool ChannelHandshakeConfig_get_negotiate_scid_privacy(const struct LDKChannelHandshakeConfig *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelHandshakeConfig_get_negotiate_scid_privacy(this_ptr: number): boolean { +export function ChannelHandshakeConfig_get_negotiate_scid_privacy(this_ptr: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16775,7 +16782,7 @@ export function ChannelHandshakeConfig_get_negotiate_scid_privacy(this_ptr: numb } // void ChannelHandshakeConfig_set_negotiate_scid_privacy(struct LDKChannelHandshakeConfig *NONNULL_PTR this_ptr, bool val); /* @internal */ -export function ChannelHandshakeConfig_set_negotiate_scid_privacy(this_ptr: number, val: boolean): void { +export function ChannelHandshakeConfig_set_negotiate_scid_privacy(this_ptr: bigint, val: boolean): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16784,7 +16791,7 @@ export function ChannelHandshakeConfig_set_negotiate_scid_privacy(this_ptr: numb } // bool ChannelHandshakeConfig_get_announced_channel(const struct LDKChannelHandshakeConfig *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelHandshakeConfig_get_announced_channel(this_ptr: number): boolean { +export function ChannelHandshakeConfig_get_announced_channel(this_ptr: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16793,7 +16800,7 @@ export function ChannelHandshakeConfig_get_announced_channel(this_ptr: number): } // void ChannelHandshakeConfig_set_announced_channel(struct LDKChannelHandshakeConfig *NONNULL_PTR this_ptr, bool val); /* @internal */ -export function ChannelHandshakeConfig_set_announced_channel(this_ptr: number, val: boolean): void { +export function ChannelHandshakeConfig_set_announced_channel(this_ptr: bigint, val: boolean): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16802,7 +16809,7 @@ export function ChannelHandshakeConfig_set_announced_channel(this_ptr: number, v } // bool ChannelHandshakeConfig_get_commit_upfront_shutdown_pubkey(const struct LDKChannelHandshakeConfig *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelHandshakeConfig_get_commit_upfront_shutdown_pubkey(this_ptr: number): boolean { +export function ChannelHandshakeConfig_get_commit_upfront_shutdown_pubkey(this_ptr: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16811,7 +16818,7 @@ export function ChannelHandshakeConfig_get_commit_upfront_shutdown_pubkey(this_p } // void ChannelHandshakeConfig_set_commit_upfront_shutdown_pubkey(struct LDKChannelHandshakeConfig *NONNULL_PTR this_ptr, bool val); /* @internal */ -export function ChannelHandshakeConfig_set_commit_upfront_shutdown_pubkey(this_ptr: number, val: boolean): void { +export function ChannelHandshakeConfig_set_commit_upfront_shutdown_pubkey(this_ptr: bigint, val: boolean): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16820,16 +16827,16 @@ export function ChannelHandshakeConfig_set_commit_upfront_shutdown_pubkey(this_p } // MUST_USE_RES struct LDKChannelHandshakeConfig ChannelHandshakeConfig_new(uint32_t minimum_depth_arg, uint16_t our_to_self_delay_arg, uint64_t our_htlc_minimum_msat_arg, uint8_t max_inbound_htlc_value_in_flight_percent_of_channel_arg, bool negotiate_scid_privacy_arg, bool announced_channel_arg, bool commit_upfront_shutdown_pubkey_arg); /* @internal */ -export function ChannelHandshakeConfig_new(minimum_depth_arg: number, our_to_self_delay_arg: number, our_htlc_minimum_msat_arg: bigint, max_inbound_htlc_value_in_flight_percent_of_channel_arg: number, negotiate_scid_privacy_arg: boolean, announced_channel_arg: boolean, commit_upfront_shutdown_pubkey_arg: boolean): number { +export function ChannelHandshakeConfig_new(minimum_depth_arg: number, our_to_self_delay_arg: number, our_htlc_minimum_msat_arg: bigint, max_inbound_htlc_value_in_flight_percent_of_channel_arg: number, negotiate_scid_privacy_arg: boolean, announced_channel_arg: boolean, commit_upfront_shutdown_pubkey_arg: boolean): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_ChannelHandshakeConfig_new(minimum_depth_arg, our_to_self_delay_arg, our_htlc_minimum_msat_arg, max_inbound_htlc_value_in_flight_percent_of_channel_arg, negotiate_scid_privacy_arg, announced_channel_arg, commit_upfront_shutdown_pubkey_arg); return nativeResponseValue; } - // uintptr_t ChannelHandshakeConfig_clone_ptr(LDKChannelHandshakeConfig *NONNULL_PTR arg); + // uint64_t ChannelHandshakeConfig_clone_ptr(LDKChannelHandshakeConfig *NONNULL_PTR arg); /* @internal */ -export function ChannelHandshakeConfig_clone_ptr(arg: number): number { +export function ChannelHandshakeConfig_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16838,7 +16845,7 @@ export function ChannelHandshakeConfig_clone_ptr(arg: number): number { } // struct LDKChannelHandshakeConfig ChannelHandshakeConfig_clone(const struct LDKChannelHandshakeConfig *NONNULL_PTR orig); /* @internal */ -export function ChannelHandshakeConfig_clone(orig: number): number { +export function ChannelHandshakeConfig_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16847,7 +16854,7 @@ export function ChannelHandshakeConfig_clone(orig: number): number { } // MUST_USE_RES struct LDKChannelHandshakeConfig ChannelHandshakeConfig_default(void); /* @internal */ -export function ChannelHandshakeConfig_default(): number { +export function ChannelHandshakeConfig_default(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16856,7 +16863,7 @@ export function ChannelHandshakeConfig_default(): number { } // void ChannelHandshakeLimits_free(struct LDKChannelHandshakeLimits this_obj); /* @internal */ -export function ChannelHandshakeLimits_free(this_obj: number): void { +export function ChannelHandshakeLimits_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16865,7 +16872,7 @@ export function ChannelHandshakeLimits_free(this_obj: number): void { } // uint64_t ChannelHandshakeLimits_get_min_funding_satoshis(const struct LDKChannelHandshakeLimits *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelHandshakeLimits_get_min_funding_satoshis(this_ptr: number): bigint { +export function ChannelHandshakeLimits_get_min_funding_satoshis(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16874,7 +16881,7 @@ export function ChannelHandshakeLimits_get_min_funding_satoshis(this_ptr: number } // void ChannelHandshakeLimits_set_min_funding_satoshis(struct LDKChannelHandshakeLimits *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function ChannelHandshakeLimits_set_min_funding_satoshis(this_ptr: number, val: bigint): void { +export function ChannelHandshakeLimits_set_min_funding_satoshis(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16883,7 +16890,7 @@ export function ChannelHandshakeLimits_set_min_funding_satoshis(this_ptr: number } // uint64_t ChannelHandshakeLimits_get_max_funding_satoshis(const struct LDKChannelHandshakeLimits *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelHandshakeLimits_get_max_funding_satoshis(this_ptr: number): bigint { +export function ChannelHandshakeLimits_get_max_funding_satoshis(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16892,7 +16899,7 @@ export function ChannelHandshakeLimits_get_max_funding_satoshis(this_ptr: number } // void ChannelHandshakeLimits_set_max_funding_satoshis(struct LDKChannelHandshakeLimits *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function ChannelHandshakeLimits_set_max_funding_satoshis(this_ptr: number, val: bigint): void { +export function ChannelHandshakeLimits_set_max_funding_satoshis(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16901,7 +16908,7 @@ export function ChannelHandshakeLimits_set_max_funding_satoshis(this_ptr: number } // uint64_t ChannelHandshakeLimits_get_max_htlc_minimum_msat(const struct LDKChannelHandshakeLimits *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelHandshakeLimits_get_max_htlc_minimum_msat(this_ptr: number): bigint { +export function ChannelHandshakeLimits_get_max_htlc_minimum_msat(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16910,7 +16917,7 @@ export function ChannelHandshakeLimits_get_max_htlc_minimum_msat(this_ptr: numbe } // void ChannelHandshakeLimits_set_max_htlc_minimum_msat(struct LDKChannelHandshakeLimits *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function ChannelHandshakeLimits_set_max_htlc_minimum_msat(this_ptr: number, val: bigint): void { +export function ChannelHandshakeLimits_set_max_htlc_minimum_msat(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16919,7 +16926,7 @@ export function ChannelHandshakeLimits_set_max_htlc_minimum_msat(this_ptr: numbe } // uint64_t ChannelHandshakeLimits_get_min_max_htlc_value_in_flight_msat(const struct LDKChannelHandshakeLimits *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelHandshakeLimits_get_min_max_htlc_value_in_flight_msat(this_ptr: number): bigint { +export function ChannelHandshakeLimits_get_min_max_htlc_value_in_flight_msat(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16928,7 +16935,7 @@ export function ChannelHandshakeLimits_get_min_max_htlc_value_in_flight_msat(thi } // void ChannelHandshakeLimits_set_min_max_htlc_value_in_flight_msat(struct LDKChannelHandshakeLimits *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function ChannelHandshakeLimits_set_min_max_htlc_value_in_flight_msat(this_ptr: number, val: bigint): void { +export function ChannelHandshakeLimits_set_min_max_htlc_value_in_flight_msat(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16937,7 +16944,7 @@ export function ChannelHandshakeLimits_set_min_max_htlc_value_in_flight_msat(thi } // uint64_t ChannelHandshakeLimits_get_max_channel_reserve_satoshis(const struct LDKChannelHandshakeLimits *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelHandshakeLimits_get_max_channel_reserve_satoshis(this_ptr: number): bigint { +export function ChannelHandshakeLimits_get_max_channel_reserve_satoshis(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16946,7 +16953,7 @@ export function ChannelHandshakeLimits_get_max_channel_reserve_satoshis(this_ptr } // void ChannelHandshakeLimits_set_max_channel_reserve_satoshis(struct LDKChannelHandshakeLimits *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function ChannelHandshakeLimits_set_max_channel_reserve_satoshis(this_ptr: number, val: bigint): void { +export function ChannelHandshakeLimits_set_max_channel_reserve_satoshis(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16955,7 +16962,7 @@ export function ChannelHandshakeLimits_set_max_channel_reserve_satoshis(this_ptr } // uint16_t ChannelHandshakeLimits_get_min_max_accepted_htlcs(const struct LDKChannelHandshakeLimits *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelHandshakeLimits_get_min_max_accepted_htlcs(this_ptr: number): number { +export function ChannelHandshakeLimits_get_min_max_accepted_htlcs(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16964,7 +16971,7 @@ export function ChannelHandshakeLimits_get_min_max_accepted_htlcs(this_ptr: numb } // void ChannelHandshakeLimits_set_min_max_accepted_htlcs(struct LDKChannelHandshakeLimits *NONNULL_PTR this_ptr, uint16_t val); /* @internal */ -export function ChannelHandshakeLimits_set_min_max_accepted_htlcs(this_ptr: number, val: number): void { +export function ChannelHandshakeLimits_set_min_max_accepted_htlcs(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16973,7 +16980,7 @@ export function ChannelHandshakeLimits_set_min_max_accepted_htlcs(this_ptr: numb } // uint32_t ChannelHandshakeLimits_get_max_minimum_depth(const struct LDKChannelHandshakeLimits *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelHandshakeLimits_get_max_minimum_depth(this_ptr: number): number { +export function ChannelHandshakeLimits_get_max_minimum_depth(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16982,7 +16989,7 @@ export function ChannelHandshakeLimits_get_max_minimum_depth(this_ptr: number): } // void ChannelHandshakeLimits_set_max_minimum_depth(struct LDKChannelHandshakeLimits *NONNULL_PTR this_ptr, uint32_t val); /* @internal */ -export function ChannelHandshakeLimits_set_max_minimum_depth(this_ptr: number, val: number): void { +export function ChannelHandshakeLimits_set_max_minimum_depth(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -16991,7 +16998,7 @@ export function ChannelHandshakeLimits_set_max_minimum_depth(this_ptr: number, v } // bool ChannelHandshakeLimits_get_trust_own_funding_0conf(const struct LDKChannelHandshakeLimits *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelHandshakeLimits_get_trust_own_funding_0conf(this_ptr: number): boolean { +export function ChannelHandshakeLimits_get_trust_own_funding_0conf(this_ptr: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17000,7 +17007,7 @@ export function ChannelHandshakeLimits_get_trust_own_funding_0conf(this_ptr: num } // void ChannelHandshakeLimits_set_trust_own_funding_0conf(struct LDKChannelHandshakeLimits *NONNULL_PTR this_ptr, bool val); /* @internal */ -export function ChannelHandshakeLimits_set_trust_own_funding_0conf(this_ptr: number, val: boolean): void { +export function ChannelHandshakeLimits_set_trust_own_funding_0conf(this_ptr: bigint, val: boolean): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17009,7 +17016,7 @@ export function ChannelHandshakeLimits_set_trust_own_funding_0conf(this_ptr: num } // bool ChannelHandshakeLimits_get_force_announced_channel_preference(const struct LDKChannelHandshakeLimits *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelHandshakeLimits_get_force_announced_channel_preference(this_ptr: number): boolean { +export function ChannelHandshakeLimits_get_force_announced_channel_preference(this_ptr: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17018,7 +17025,7 @@ export function ChannelHandshakeLimits_get_force_announced_channel_preference(th } // void ChannelHandshakeLimits_set_force_announced_channel_preference(struct LDKChannelHandshakeLimits *NONNULL_PTR this_ptr, bool val); /* @internal */ -export function ChannelHandshakeLimits_set_force_announced_channel_preference(this_ptr: number, val: boolean): void { +export function ChannelHandshakeLimits_set_force_announced_channel_preference(this_ptr: bigint, val: boolean): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17027,7 +17034,7 @@ export function ChannelHandshakeLimits_set_force_announced_channel_preference(th } // uint16_t ChannelHandshakeLimits_get_their_to_self_delay(const struct LDKChannelHandshakeLimits *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelHandshakeLimits_get_their_to_self_delay(this_ptr: number): number { +export function ChannelHandshakeLimits_get_their_to_self_delay(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17036,7 +17043,7 @@ export function ChannelHandshakeLimits_get_their_to_self_delay(this_ptr: number) } // void ChannelHandshakeLimits_set_their_to_self_delay(struct LDKChannelHandshakeLimits *NONNULL_PTR this_ptr, uint16_t val); /* @internal */ -export function ChannelHandshakeLimits_set_their_to_self_delay(this_ptr: number, val: number): void { +export function ChannelHandshakeLimits_set_their_to_self_delay(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17045,16 +17052,16 @@ export function ChannelHandshakeLimits_set_their_to_self_delay(this_ptr: number, } // MUST_USE_RES struct LDKChannelHandshakeLimits ChannelHandshakeLimits_new(uint64_t min_funding_satoshis_arg, uint64_t max_funding_satoshis_arg, uint64_t max_htlc_minimum_msat_arg, uint64_t min_max_htlc_value_in_flight_msat_arg, uint64_t max_channel_reserve_satoshis_arg, uint16_t min_max_accepted_htlcs_arg, uint32_t max_minimum_depth_arg, bool trust_own_funding_0conf_arg, bool force_announced_channel_preference_arg, uint16_t their_to_self_delay_arg); /* @internal */ -export function ChannelHandshakeLimits_new(min_funding_satoshis_arg: bigint, max_funding_satoshis_arg: bigint, max_htlc_minimum_msat_arg: bigint, min_max_htlc_value_in_flight_msat_arg: bigint, max_channel_reserve_satoshis_arg: bigint, min_max_accepted_htlcs_arg: number, max_minimum_depth_arg: number, trust_own_funding_0conf_arg: boolean, force_announced_channel_preference_arg: boolean, their_to_self_delay_arg: number): number { +export function ChannelHandshakeLimits_new(min_funding_satoshis_arg: bigint, max_funding_satoshis_arg: bigint, max_htlc_minimum_msat_arg: bigint, min_max_htlc_value_in_flight_msat_arg: bigint, max_channel_reserve_satoshis_arg: bigint, min_max_accepted_htlcs_arg: number, max_minimum_depth_arg: number, trust_own_funding_0conf_arg: boolean, force_announced_channel_preference_arg: boolean, their_to_self_delay_arg: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_ChannelHandshakeLimits_new(min_funding_satoshis_arg, max_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, trust_own_funding_0conf_arg, force_announced_channel_preference_arg, their_to_self_delay_arg); return nativeResponseValue; } - // uintptr_t ChannelHandshakeLimits_clone_ptr(LDKChannelHandshakeLimits *NONNULL_PTR arg); + // uint64_t ChannelHandshakeLimits_clone_ptr(LDKChannelHandshakeLimits *NONNULL_PTR arg); /* @internal */ -export function ChannelHandshakeLimits_clone_ptr(arg: number): number { +export function ChannelHandshakeLimits_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17063,7 +17070,7 @@ export function ChannelHandshakeLimits_clone_ptr(arg: number): number { } // struct LDKChannelHandshakeLimits ChannelHandshakeLimits_clone(const struct LDKChannelHandshakeLimits *NONNULL_PTR orig); /* @internal */ -export function ChannelHandshakeLimits_clone(orig: number): number { +export function ChannelHandshakeLimits_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17072,7 +17079,7 @@ export function ChannelHandshakeLimits_clone(orig: number): number { } // MUST_USE_RES struct LDKChannelHandshakeLimits ChannelHandshakeLimits_default(void); /* @internal */ -export function ChannelHandshakeLimits_default(): number { +export function ChannelHandshakeLimits_default(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17081,7 +17088,7 @@ export function ChannelHandshakeLimits_default(): number { } // void ChannelConfig_free(struct LDKChannelConfig this_obj); /* @internal */ -export function ChannelConfig_free(this_obj: number): void { +export function ChannelConfig_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17090,7 +17097,7 @@ export function ChannelConfig_free(this_obj: number): void { } // uint32_t ChannelConfig_get_forwarding_fee_proportional_millionths(const struct LDKChannelConfig *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelConfig_get_forwarding_fee_proportional_millionths(this_ptr: number): number { +export function ChannelConfig_get_forwarding_fee_proportional_millionths(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17099,7 +17106,7 @@ export function ChannelConfig_get_forwarding_fee_proportional_millionths(this_pt } // void ChannelConfig_set_forwarding_fee_proportional_millionths(struct LDKChannelConfig *NONNULL_PTR this_ptr, uint32_t val); /* @internal */ -export function ChannelConfig_set_forwarding_fee_proportional_millionths(this_ptr: number, val: number): void { +export function ChannelConfig_set_forwarding_fee_proportional_millionths(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17108,7 +17115,7 @@ export function ChannelConfig_set_forwarding_fee_proportional_millionths(this_pt } // uint32_t ChannelConfig_get_forwarding_fee_base_msat(const struct LDKChannelConfig *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelConfig_get_forwarding_fee_base_msat(this_ptr: number): number { +export function ChannelConfig_get_forwarding_fee_base_msat(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17117,7 +17124,7 @@ export function ChannelConfig_get_forwarding_fee_base_msat(this_ptr: number): nu } // void ChannelConfig_set_forwarding_fee_base_msat(struct LDKChannelConfig *NONNULL_PTR this_ptr, uint32_t val); /* @internal */ -export function ChannelConfig_set_forwarding_fee_base_msat(this_ptr: number, val: number): void { +export function ChannelConfig_set_forwarding_fee_base_msat(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17126,7 +17133,7 @@ export function ChannelConfig_set_forwarding_fee_base_msat(this_ptr: number, val } // uint16_t ChannelConfig_get_cltv_expiry_delta(const struct LDKChannelConfig *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelConfig_get_cltv_expiry_delta(this_ptr: number): number { +export function ChannelConfig_get_cltv_expiry_delta(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17135,7 +17142,7 @@ export function ChannelConfig_get_cltv_expiry_delta(this_ptr: number): number { } // void ChannelConfig_set_cltv_expiry_delta(struct LDKChannelConfig *NONNULL_PTR this_ptr, uint16_t val); /* @internal */ -export function ChannelConfig_set_cltv_expiry_delta(this_ptr: number, val: number): void { +export function ChannelConfig_set_cltv_expiry_delta(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17144,7 +17151,7 @@ export function ChannelConfig_set_cltv_expiry_delta(this_ptr: number, val: numbe } // uint64_t ChannelConfig_get_max_dust_htlc_exposure_msat(const struct LDKChannelConfig *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelConfig_get_max_dust_htlc_exposure_msat(this_ptr: number): bigint { +export function ChannelConfig_get_max_dust_htlc_exposure_msat(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17153,7 +17160,7 @@ export function ChannelConfig_get_max_dust_htlc_exposure_msat(this_ptr: number): } // void ChannelConfig_set_max_dust_htlc_exposure_msat(struct LDKChannelConfig *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function ChannelConfig_set_max_dust_htlc_exposure_msat(this_ptr: number, val: bigint): void { +export function ChannelConfig_set_max_dust_htlc_exposure_msat(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17162,7 +17169,7 @@ export function ChannelConfig_set_max_dust_htlc_exposure_msat(this_ptr: number, } // uint64_t ChannelConfig_get_force_close_avoidance_max_fee_satoshis(const struct LDKChannelConfig *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelConfig_get_force_close_avoidance_max_fee_satoshis(this_ptr: number): bigint { +export function ChannelConfig_get_force_close_avoidance_max_fee_satoshis(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17171,7 +17178,7 @@ export function ChannelConfig_get_force_close_avoidance_max_fee_satoshis(this_pt } // void ChannelConfig_set_force_close_avoidance_max_fee_satoshis(struct LDKChannelConfig *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function ChannelConfig_set_force_close_avoidance_max_fee_satoshis(this_ptr: number, val: bigint): void { +export function ChannelConfig_set_force_close_avoidance_max_fee_satoshis(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17180,16 +17187,16 @@ export function ChannelConfig_set_force_close_avoidance_max_fee_satoshis(this_pt } // MUST_USE_RES struct LDKChannelConfig ChannelConfig_new(uint32_t forwarding_fee_proportional_millionths_arg, uint32_t forwarding_fee_base_msat_arg, uint16_t cltv_expiry_delta_arg, uint64_t max_dust_htlc_exposure_msat_arg, uint64_t force_close_avoidance_max_fee_satoshis_arg); /* @internal */ -export function ChannelConfig_new(forwarding_fee_proportional_millionths_arg: number, forwarding_fee_base_msat_arg: number, cltv_expiry_delta_arg: number, max_dust_htlc_exposure_msat_arg: bigint, force_close_avoidance_max_fee_satoshis_arg: bigint): number { +export function ChannelConfig_new(forwarding_fee_proportional_millionths_arg: number, forwarding_fee_base_msat_arg: number, cltv_expiry_delta_arg: number, max_dust_htlc_exposure_msat_arg: bigint, force_close_avoidance_max_fee_satoshis_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_ChannelConfig_new(forwarding_fee_proportional_millionths_arg, forwarding_fee_base_msat_arg, cltv_expiry_delta_arg, max_dust_htlc_exposure_msat_arg, force_close_avoidance_max_fee_satoshis_arg); return nativeResponseValue; } - // uintptr_t ChannelConfig_clone_ptr(LDKChannelConfig *NONNULL_PTR arg); + // uint64_t ChannelConfig_clone_ptr(LDKChannelConfig *NONNULL_PTR arg); /* @internal */ -export function ChannelConfig_clone_ptr(arg: number): number { +export function ChannelConfig_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17198,7 +17205,7 @@ export function ChannelConfig_clone_ptr(arg: number): number { } // struct LDKChannelConfig ChannelConfig_clone(const struct LDKChannelConfig *NONNULL_PTR orig); /* @internal */ -export function ChannelConfig_clone(orig: number): number { +export function ChannelConfig_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17207,7 +17214,7 @@ export function ChannelConfig_clone(orig: number): number { } // MUST_USE_RES struct LDKChannelConfig ChannelConfig_default(void); /* @internal */ -export function ChannelConfig_default(): number { +export function ChannelConfig_default(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17216,7 +17223,7 @@ export function ChannelConfig_default(): number { } // struct LDKCVec_u8Z ChannelConfig_write(const struct LDKChannelConfig *NONNULL_PTR obj); /* @internal */ -export function ChannelConfig_write(obj: number): number { +export function ChannelConfig_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17225,7 +17232,7 @@ export function ChannelConfig_write(obj: number): number { } // struct LDKCResult_ChannelConfigDecodeErrorZ ChannelConfig_read(struct LDKu8slice ser); /* @internal */ -export function ChannelConfig_read(ser: number): number { +export function ChannelConfig_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17234,7 +17241,7 @@ export function ChannelConfig_read(ser: number): number { } // void UserConfig_free(struct LDKUserConfig this_obj); /* @internal */ -export function UserConfig_free(this_obj: number): void { +export function UserConfig_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17243,7 +17250,7 @@ export function UserConfig_free(this_obj: number): void { } // struct LDKChannelHandshakeConfig UserConfig_get_channel_handshake_config(const struct LDKUserConfig *NONNULL_PTR this_ptr); /* @internal */ -export function UserConfig_get_channel_handshake_config(this_ptr: number): number { +export function UserConfig_get_channel_handshake_config(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17252,7 +17259,7 @@ export function UserConfig_get_channel_handshake_config(this_ptr: number): numbe } // void UserConfig_set_channel_handshake_config(struct LDKUserConfig *NONNULL_PTR this_ptr, struct LDKChannelHandshakeConfig val); /* @internal */ -export function UserConfig_set_channel_handshake_config(this_ptr: number, val: number): void { +export function UserConfig_set_channel_handshake_config(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17261,7 +17268,7 @@ export function UserConfig_set_channel_handshake_config(this_ptr: number, val: n } // struct LDKChannelHandshakeLimits UserConfig_get_channel_handshake_limits(const struct LDKUserConfig *NONNULL_PTR this_ptr); /* @internal */ -export function UserConfig_get_channel_handshake_limits(this_ptr: number): number { +export function UserConfig_get_channel_handshake_limits(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17270,7 +17277,7 @@ export function UserConfig_get_channel_handshake_limits(this_ptr: number): numbe } // void UserConfig_set_channel_handshake_limits(struct LDKUserConfig *NONNULL_PTR this_ptr, struct LDKChannelHandshakeLimits val); /* @internal */ -export function UserConfig_set_channel_handshake_limits(this_ptr: number, val: number): void { +export function UserConfig_set_channel_handshake_limits(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17279,7 +17286,7 @@ export function UserConfig_set_channel_handshake_limits(this_ptr: number, val: n } // struct LDKChannelConfig UserConfig_get_channel_config(const struct LDKUserConfig *NONNULL_PTR this_ptr); /* @internal */ -export function UserConfig_get_channel_config(this_ptr: number): number { +export function UserConfig_get_channel_config(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17288,7 +17295,7 @@ export function UserConfig_get_channel_config(this_ptr: number): number { } // void UserConfig_set_channel_config(struct LDKUserConfig *NONNULL_PTR this_ptr, struct LDKChannelConfig val); /* @internal */ -export function UserConfig_set_channel_config(this_ptr: number, val: number): void { +export function UserConfig_set_channel_config(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17297,7 +17304,7 @@ export function UserConfig_set_channel_config(this_ptr: number, val: number): vo } // bool UserConfig_get_accept_forwards_to_priv_channels(const struct LDKUserConfig *NONNULL_PTR this_ptr); /* @internal */ -export function UserConfig_get_accept_forwards_to_priv_channels(this_ptr: number): boolean { +export function UserConfig_get_accept_forwards_to_priv_channels(this_ptr: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17306,7 +17313,7 @@ export function UserConfig_get_accept_forwards_to_priv_channels(this_ptr: number } // void UserConfig_set_accept_forwards_to_priv_channels(struct LDKUserConfig *NONNULL_PTR this_ptr, bool val); /* @internal */ -export function UserConfig_set_accept_forwards_to_priv_channels(this_ptr: number, val: boolean): void { +export function UserConfig_set_accept_forwards_to_priv_channels(this_ptr: bigint, val: boolean): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17315,7 +17322,7 @@ export function UserConfig_set_accept_forwards_to_priv_channels(this_ptr: number } // bool UserConfig_get_accept_inbound_channels(const struct LDKUserConfig *NONNULL_PTR this_ptr); /* @internal */ -export function UserConfig_get_accept_inbound_channels(this_ptr: number): boolean { +export function UserConfig_get_accept_inbound_channels(this_ptr: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17324,7 +17331,7 @@ export function UserConfig_get_accept_inbound_channels(this_ptr: number): boolea } // void UserConfig_set_accept_inbound_channels(struct LDKUserConfig *NONNULL_PTR this_ptr, bool val); /* @internal */ -export function UserConfig_set_accept_inbound_channels(this_ptr: number, val: boolean): void { +export function UserConfig_set_accept_inbound_channels(this_ptr: bigint, val: boolean): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17333,7 +17340,7 @@ export function UserConfig_set_accept_inbound_channels(this_ptr: number, val: bo } // bool UserConfig_get_manually_accept_inbound_channels(const struct LDKUserConfig *NONNULL_PTR this_ptr); /* @internal */ -export function UserConfig_get_manually_accept_inbound_channels(this_ptr: number): boolean { +export function UserConfig_get_manually_accept_inbound_channels(this_ptr: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17342,7 +17349,7 @@ export function UserConfig_get_manually_accept_inbound_channels(this_ptr: number } // void UserConfig_set_manually_accept_inbound_channels(struct LDKUserConfig *NONNULL_PTR this_ptr, bool val); /* @internal */ -export function UserConfig_set_manually_accept_inbound_channels(this_ptr: number, val: boolean): void { +export function UserConfig_set_manually_accept_inbound_channels(this_ptr: bigint, val: boolean): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17351,16 +17358,16 @@ export function UserConfig_set_manually_accept_inbound_channels(this_ptr: number } // MUST_USE_RES struct LDKUserConfig UserConfig_new(struct LDKChannelHandshakeConfig channel_handshake_config_arg, struct LDKChannelHandshakeLimits channel_handshake_limits_arg, struct LDKChannelConfig channel_config_arg, bool accept_forwards_to_priv_channels_arg, bool accept_inbound_channels_arg, bool manually_accept_inbound_channels_arg); /* @internal */ -export function UserConfig_new(channel_handshake_config_arg: number, channel_handshake_limits_arg: number, channel_config_arg: number, accept_forwards_to_priv_channels_arg: boolean, accept_inbound_channels_arg: boolean, manually_accept_inbound_channels_arg: boolean): number { +export function UserConfig_new(channel_handshake_config_arg: bigint, channel_handshake_limits_arg: bigint, channel_config_arg: bigint, accept_forwards_to_priv_channels_arg: boolean, accept_inbound_channels_arg: boolean, manually_accept_inbound_channels_arg: boolean): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_UserConfig_new(channel_handshake_config_arg, channel_handshake_limits_arg, channel_config_arg, accept_forwards_to_priv_channels_arg, accept_inbound_channels_arg, manually_accept_inbound_channels_arg); return nativeResponseValue; } - // uintptr_t UserConfig_clone_ptr(LDKUserConfig *NONNULL_PTR arg); + // uint64_t UserConfig_clone_ptr(LDKUserConfig *NONNULL_PTR arg); /* @internal */ -export function UserConfig_clone_ptr(arg: number): number { +export function UserConfig_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17369,7 +17376,7 @@ export function UserConfig_clone_ptr(arg: number): number { } // struct LDKUserConfig UserConfig_clone(const struct LDKUserConfig *NONNULL_PTR orig); /* @internal */ -export function UserConfig_clone(orig: number): number { +export function UserConfig_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17378,7 +17385,7 @@ export function UserConfig_clone(orig: number): number { } // MUST_USE_RES struct LDKUserConfig UserConfig_default(void); /* @internal */ -export function UserConfig_default(): number { +export function UserConfig_default(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17387,16 +17394,16 @@ export function UserConfig_default(): number { } // void BestBlock_free(struct LDKBestBlock this_obj); /* @internal */ -export function BestBlock_free(this_obj: number): void { +export function BestBlock_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_BestBlock_free(this_obj); // debug statements here } - // uintptr_t BestBlock_clone_ptr(LDKBestBlock *NONNULL_PTR arg); + // uint64_t BestBlock_clone_ptr(LDKBestBlock *NONNULL_PTR arg); /* @internal */ -export function BestBlock_clone_ptr(arg: number): number { +export function BestBlock_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17405,7 +17412,7 @@ export function BestBlock_clone_ptr(arg: number): number { } // struct LDKBestBlock BestBlock_clone(const struct LDKBestBlock *NONNULL_PTR orig); /* @internal */ -export function BestBlock_clone(orig: number): number { +export function BestBlock_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17414,7 +17421,7 @@ export function BestBlock_clone(orig: number): number { } // MUST_USE_RES struct LDKBestBlock BestBlock_from_genesis(enum LDKNetwork network); /* @internal */ -export function BestBlock_from_genesis(network: Network): number { +export function BestBlock_from_genesis(network: Network): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17423,7 +17430,7 @@ export function BestBlock_from_genesis(network: Network): number { } // MUST_USE_RES struct LDKBestBlock BestBlock_new(struct LDKThirtyTwoBytes block_hash, uint32_t height); /* @internal */ -export function BestBlock_new(block_hash: number, height: number): number { +export function BestBlock_new(block_hash: number, height: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17432,7 +17439,7 @@ export function BestBlock_new(block_hash: number, height: number): number { } // MUST_USE_RES struct LDKThirtyTwoBytes BestBlock_block_hash(const struct LDKBestBlock *NONNULL_PTR this_arg); /* @internal */ -export function BestBlock_block_hash(this_arg: number): number { +export function BestBlock_block_hash(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17441,7 +17448,7 @@ export function BestBlock_block_hash(this_arg: number): number { } // MUST_USE_RES uint32_t BestBlock_height(const struct LDKBestBlock *NONNULL_PTR this_arg); /* @internal */ -export function BestBlock_height(this_arg: number): number { +export function BestBlock_height(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17450,7 +17457,7 @@ export function BestBlock_height(this_arg: number): number { } // enum LDKAccessError AccessError_clone(const enum LDKAccessError *NONNULL_PTR orig); /* @internal */ -export function AccessError_clone(orig: number): AccessError { +export function AccessError_clone(orig: bigint): AccessError { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17477,7 +17484,7 @@ export function AccessError_unknown_tx(): AccessError { } // void Access_free(struct LDKAccess this_ptr); /* @internal */ -export function Access_free(this_ptr: number): void { +export function Access_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17486,7 +17493,7 @@ export function Access_free(this_ptr: number): void { } // void Listen_free(struct LDKListen this_ptr); /* @internal */ -export function Listen_free(this_ptr: number): void { +export function Listen_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17495,7 +17502,7 @@ export function Listen_free(this_ptr: number): void { } // void Confirm_free(struct LDKConfirm this_ptr); /* @internal */ -export function Confirm_free(this_ptr: number): void { +export function Confirm_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17504,7 +17511,7 @@ export function Confirm_free(this_ptr: number): void { } // enum LDKChannelMonitorUpdateErr ChannelMonitorUpdateErr_clone(const enum LDKChannelMonitorUpdateErr *NONNULL_PTR orig); /* @internal */ -export function ChannelMonitorUpdateErr_clone(orig: number): ChannelMonitorUpdateErr { +export function ChannelMonitorUpdateErr_clone(orig: bigint): ChannelMonitorUpdateErr { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17531,7 +17538,7 @@ export function ChannelMonitorUpdateErr_permanent_failure(): ChannelMonitorUpdat } // void Watch_free(struct LDKWatch this_ptr); /* @internal */ -export function Watch_free(this_ptr: number): void { +export function Watch_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17540,7 +17547,7 @@ export function Watch_free(this_ptr: number): void { } // void Filter_free(struct LDKFilter this_ptr); /* @internal */ -export function Filter_free(this_ptr: number): void { +export function Filter_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17549,7 +17556,7 @@ export function Filter_free(this_ptr: number): void { } // void WatchedOutput_free(struct LDKWatchedOutput this_obj); /* @internal */ -export function WatchedOutput_free(this_obj: number): void { +export function WatchedOutput_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17558,7 +17565,7 @@ export function WatchedOutput_free(this_obj: number): void { } // struct LDKThirtyTwoBytes WatchedOutput_get_block_hash(const struct LDKWatchedOutput *NONNULL_PTR this_ptr); /* @internal */ -export function WatchedOutput_get_block_hash(this_ptr: number): number { +export function WatchedOutput_get_block_hash(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17567,7 +17574,7 @@ export function WatchedOutput_get_block_hash(this_ptr: number): number { } // void WatchedOutput_set_block_hash(struct LDKWatchedOutput *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function WatchedOutput_set_block_hash(this_ptr: number, val: number): void { +export function WatchedOutput_set_block_hash(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17576,7 +17583,7 @@ export function WatchedOutput_set_block_hash(this_ptr: number, val: number): voi } // struct LDKOutPoint WatchedOutput_get_outpoint(const struct LDKWatchedOutput *NONNULL_PTR this_ptr); /* @internal */ -export function WatchedOutput_get_outpoint(this_ptr: number): number { +export function WatchedOutput_get_outpoint(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17585,7 +17592,7 @@ export function WatchedOutput_get_outpoint(this_ptr: number): number { } // void WatchedOutput_set_outpoint(struct LDKWatchedOutput *NONNULL_PTR this_ptr, struct LDKOutPoint val); /* @internal */ -export function WatchedOutput_set_outpoint(this_ptr: number, val: number): void { +export function WatchedOutput_set_outpoint(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17594,7 +17601,7 @@ export function WatchedOutput_set_outpoint(this_ptr: number, val: number): void } // struct LDKu8slice WatchedOutput_get_script_pubkey(const struct LDKWatchedOutput *NONNULL_PTR this_ptr); /* @internal */ -export function WatchedOutput_get_script_pubkey(this_ptr: number): number { +export function WatchedOutput_get_script_pubkey(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17603,7 +17610,7 @@ export function WatchedOutput_get_script_pubkey(this_ptr: number): number { } // void WatchedOutput_set_script_pubkey(struct LDKWatchedOutput *NONNULL_PTR this_ptr, struct LDKCVec_u8Z val); /* @internal */ -export function WatchedOutput_set_script_pubkey(this_ptr: number, val: number): void { +export function WatchedOutput_set_script_pubkey(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17612,16 +17619,16 @@ export function WatchedOutput_set_script_pubkey(this_ptr: number, val: number): } // MUST_USE_RES struct LDKWatchedOutput WatchedOutput_new(struct LDKThirtyTwoBytes block_hash_arg, struct LDKOutPoint outpoint_arg, struct LDKCVec_u8Z script_pubkey_arg); /* @internal */ -export function WatchedOutput_new(block_hash_arg: number, outpoint_arg: number, script_pubkey_arg: number): number { +export function WatchedOutput_new(block_hash_arg: number, outpoint_arg: bigint, script_pubkey_arg: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_WatchedOutput_new(block_hash_arg, outpoint_arg, script_pubkey_arg); return nativeResponseValue; } - // uintptr_t WatchedOutput_clone_ptr(LDKWatchedOutput *NONNULL_PTR arg); + // uint64_t WatchedOutput_clone_ptr(LDKWatchedOutput *NONNULL_PTR arg); /* @internal */ -export function WatchedOutput_clone_ptr(arg: number): number { +export function WatchedOutput_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17630,7 +17637,7 @@ export function WatchedOutput_clone_ptr(arg: number): number { } // struct LDKWatchedOutput WatchedOutput_clone(const struct LDKWatchedOutput *NONNULL_PTR orig); /* @internal */ -export function WatchedOutput_clone(orig: number): number { +export function WatchedOutput_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17639,7 +17646,7 @@ export function WatchedOutput_clone(orig: number): number { } // uint64_t WatchedOutput_hash(const struct LDKWatchedOutput *NONNULL_PTR o); /* @internal */ -export function WatchedOutput_hash(o: number): bigint { +export function WatchedOutput_hash(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17648,7 +17655,7 @@ export function WatchedOutput_hash(o: number): bigint { } // void BroadcasterInterface_free(struct LDKBroadcasterInterface this_ptr); /* @internal */ -export function BroadcasterInterface_free(this_ptr: number): void { +export function BroadcasterInterface_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17657,7 +17664,7 @@ export function BroadcasterInterface_free(this_ptr: number): void { } // enum LDKConfirmationTarget ConfirmationTarget_clone(const enum LDKConfirmationTarget *NONNULL_PTR orig); /* @internal */ -export function ConfirmationTarget_clone(orig: number): ConfirmationTarget { +export function ConfirmationTarget_clone(orig: bigint): ConfirmationTarget { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17693,7 +17700,7 @@ export function ConfirmationTarget_high_priority(): ConfirmationTarget { } // bool ConfirmationTarget_eq(const enum LDKConfirmationTarget *NONNULL_PTR a, const enum LDKConfirmationTarget *NONNULL_PTR b); /* @internal */ -export function ConfirmationTarget_eq(a: number, b: number): boolean { +export function ConfirmationTarget_eq(a: bigint, b: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17702,7 +17709,7 @@ export function ConfirmationTarget_eq(a: number, b: number): boolean { } // void FeeEstimator_free(struct LDKFeeEstimator this_ptr); /* @internal */ -export function FeeEstimator_free(this_ptr: number): void { +export function FeeEstimator_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17711,16 +17718,16 @@ export function FeeEstimator_free(this_ptr: number): void { } // void MonitorUpdateId_free(struct LDKMonitorUpdateId this_obj); /* @internal */ -export function MonitorUpdateId_free(this_obj: number): void { +export function MonitorUpdateId_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_MonitorUpdateId_free(this_obj); // debug statements here } - // uintptr_t MonitorUpdateId_clone_ptr(LDKMonitorUpdateId *NONNULL_PTR arg); + // uint64_t MonitorUpdateId_clone_ptr(LDKMonitorUpdateId *NONNULL_PTR arg); /* @internal */ -export function MonitorUpdateId_clone_ptr(arg: number): number { +export function MonitorUpdateId_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17729,7 +17736,7 @@ export function MonitorUpdateId_clone_ptr(arg: number): number { } // struct LDKMonitorUpdateId MonitorUpdateId_clone(const struct LDKMonitorUpdateId *NONNULL_PTR orig); /* @internal */ -export function MonitorUpdateId_clone(orig: number): number { +export function MonitorUpdateId_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17738,7 +17745,7 @@ export function MonitorUpdateId_clone(orig: number): number { } // uint64_t MonitorUpdateId_hash(const struct LDKMonitorUpdateId *NONNULL_PTR o); /* @internal */ -export function MonitorUpdateId_hash(o: number): bigint { +export function MonitorUpdateId_hash(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17747,7 +17754,7 @@ export function MonitorUpdateId_hash(o: number): bigint { } // bool MonitorUpdateId_eq(const struct LDKMonitorUpdateId *NONNULL_PTR a, const struct LDKMonitorUpdateId *NONNULL_PTR b); /* @internal */ -export function MonitorUpdateId_eq(a: number, b: number): boolean { +export function MonitorUpdateId_eq(a: bigint, b: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17756,7 +17763,7 @@ export function MonitorUpdateId_eq(a: number, b: number): boolean { } // void Persist_free(struct LDKPersist this_ptr); /* @internal */ -export function Persist_free(this_ptr: number): void { +export function Persist_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17765,7 +17772,7 @@ export function Persist_free(this_ptr: number): void { } // void LockedChannelMonitor_free(struct LDKLockedChannelMonitor this_obj); /* @internal */ -export function LockedChannelMonitor_free(this_obj: number): void { +export function LockedChannelMonitor_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17774,7 +17781,7 @@ export function LockedChannelMonitor_free(this_obj: number): void { } // void ChainMonitor_free(struct LDKChainMonitor this_obj); /* @internal */ -export function ChainMonitor_free(this_obj: number): void { +export function ChainMonitor_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17783,7 +17790,7 @@ export function ChainMonitor_free(this_obj: number): void { } // MUST_USE_RES struct LDKChainMonitor ChainMonitor_new(struct LDKCOption_FilterZ chain_source, struct LDKBroadcasterInterface broadcaster, struct LDKLogger logger, struct LDKFeeEstimator feeest, struct LDKPersist persister); /* @internal */ -export function ChainMonitor_new(chain_source: number, broadcaster: number, logger: number, feeest: number, persister: number): number { +export function ChainMonitor_new(chain_source: bigint, broadcaster: bigint, logger: bigint, feeest: bigint, persister: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17792,7 +17799,7 @@ export function ChainMonitor_new(chain_source: number, broadcaster: number, logg } // MUST_USE_RES struct LDKCVec_BalanceZ ChainMonitor_get_claimable_balances(const struct LDKChainMonitor *NONNULL_PTR this_arg, struct LDKCVec_ChannelDetailsZ ignored_channels); /* @internal */ -export function ChainMonitor_get_claimable_balances(this_arg: number, ignored_channels: number): number { +export function ChainMonitor_get_claimable_balances(this_arg: bigint, ignored_channels: number): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17801,7 +17808,7 @@ export function ChainMonitor_get_claimable_balances(this_arg: number, ignored_ch } // MUST_USE_RES struct LDKCResult_LockedChannelMonitorNoneZ ChainMonitor_get_monitor(const struct LDKChainMonitor *NONNULL_PTR this_arg, struct LDKOutPoint funding_txo); /* @internal */ -export function ChainMonitor_get_monitor(this_arg: number, funding_txo: number): number { +export function ChainMonitor_get_monitor(this_arg: bigint, funding_txo: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17810,7 +17817,7 @@ export function ChainMonitor_get_monitor(this_arg: number, funding_txo: number): } // MUST_USE_RES struct LDKCVec_OutPointZ ChainMonitor_list_monitors(const struct LDKChainMonitor *NONNULL_PTR this_arg); /* @internal */ -export function ChainMonitor_list_monitors(this_arg: number): number { +export function ChainMonitor_list_monitors(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17819,7 +17826,7 @@ export function ChainMonitor_list_monitors(this_arg: number): number { } // MUST_USE_RES struct LDKCResult_NoneAPIErrorZ ChainMonitor_channel_monitor_updated(const struct LDKChainMonitor *NONNULL_PTR this_arg, struct LDKOutPoint funding_txo, struct LDKMonitorUpdateId completed_update_id); /* @internal */ -export function ChainMonitor_channel_monitor_updated(this_arg: number, funding_txo: number, completed_update_id: number): number { +export function ChainMonitor_channel_monitor_updated(this_arg: bigint, funding_txo: bigint, completed_update_id: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17828,7 +17835,7 @@ export function ChainMonitor_channel_monitor_updated(this_arg: number, funding_t } // struct LDKListen ChainMonitor_as_Listen(const struct LDKChainMonitor *NONNULL_PTR this_arg); /* @internal */ -export function ChainMonitor_as_Listen(this_arg: number): number { +export function ChainMonitor_as_Listen(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17837,7 +17844,7 @@ export function ChainMonitor_as_Listen(this_arg: number): number { } // struct LDKConfirm ChainMonitor_as_Confirm(const struct LDKChainMonitor *NONNULL_PTR this_arg); /* @internal */ -export function ChainMonitor_as_Confirm(this_arg: number): number { +export function ChainMonitor_as_Confirm(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17846,7 +17853,7 @@ export function ChainMonitor_as_Confirm(this_arg: number): number { } // struct LDKWatch ChainMonitor_as_Watch(const struct LDKChainMonitor *NONNULL_PTR this_arg); /* @internal */ -export function ChainMonitor_as_Watch(this_arg: number): number { +export function ChainMonitor_as_Watch(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17855,7 +17862,7 @@ export function ChainMonitor_as_Watch(this_arg: number): number { } // struct LDKEventsProvider ChainMonitor_as_EventsProvider(const struct LDKChainMonitor *NONNULL_PTR this_arg); /* @internal */ -export function ChainMonitor_as_EventsProvider(this_arg: number): number { +export function ChainMonitor_as_EventsProvider(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17864,7 +17871,7 @@ export function ChainMonitor_as_EventsProvider(this_arg: number): number { } // void ChannelMonitorUpdate_free(struct LDKChannelMonitorUpdate this_obj); /* @internal */ -export function ChannelMonitorUpdate_free(this_obj: number): void { +export function ChannelMonitorUpdate_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17873,7 +17880,7 @@ export function ChannelMonitorUpdate_free(this_obj: number): void { } // uint64_t ChannelMonitorUpdate_get_update_id(const struct LDKChannelMonitorUpdate *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelMonitorUpdate_get_update_id(this_ptr: number): bigint { +export function ChannelMonitorUpdate_get_update_id(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17882,16 +17889,16 @@ export function ChannelMonitorUpdate_get_update_id(this_ptr: number): bigint { } // void ChannelMonitorUpdate_set_update_id(struct LDKChannelMonitorUpdate *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function ChannelMonitorUpdate_set_update_id(this_ptr: number, val: bigint): void { +export function ChannelMonitorUpdate_set_update_id(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_ChannelMonitorUpdate_set_update_id(this_ptr, val); // debug statements here } - // uintptr_t ChannelMonitorUpdate_clone_ptr(LDKChannelMonitorUpdate *NONNULL_PTR arg); + // uint64_t ChannelMonitorUpdate_clone_ptr(LDKChannelMonitorUpdate *NONNULL_PTR arg); /* @internal */ -export function ChannelMonitorUpdate_clone_ptr(arg: number): number { +export function ChannelMonitorUpdate_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17900,7 +17907,7 @@ export function ChannelMonitorUpdate_clone_ptr(arg: number): number { } // struct LDKChannelMonitorUpdate ChannelMonitorUpdate_clone(const struct LDKChannelMonitorUpdate *NONNULL_PTR orig); /* @internal */ -export function ChannelMonitorUpdate_clone(orig: number): number { +export function ChannelMonitorUpdate_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17909,7 +17916,7 @@ export function ChannelMonitorUpdate_clone(orig: number): number { } // struct LDKCVec_u8Z ChannelMonitorUpdate_write(const struct LDKChannelMonitorUpdate *NONNULL_PTR obj); /* @internal */ -export function ChannelMonitorUpdate_write(obj: number): number { +export function ChannelMonitorUpdate_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17918,7 +17925,7 @@ export function ChannelMonitorUpdate_write(obj: number): number { } // struct LDKCResult_ChannelMonitorUpdateDecodeErrorZ ChannelMonitorUpdate_read(struct LDKu8slice ser); /* @internal */ -export function ChannelMonitorUpdate_read(ser: number): number { +export function ChannelMonitorUpdate_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17927,16 +17934,16 @@ export function ChannelMonitorUpdate_read(ser: number): number { } // void MonitorEvent_free(struct LDKMonitorEvent this_ptr); /* @internal */ -export function MonitorEvent_free(this_ptr: number): void { +export function MonitorEvent_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_MonitorEvent_free(this_ptr); // debug statements here } - // uintptr_t MonitorEvent_clone_ptr(LDKMonitorEvent *NONNULL_PTR arg); + // uint64_t MonitorEvent_clone_ptr(LDKMonitorEvent *NONNULL_PTR arg); /* @internal */ -export function MonitorEvent_clone_ptr(arg: number): number { +export function MonitorEvent_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17945,7 +17952,7 @@ export function MonitorEvent_clone_ptr(arg: number): number { } // struct LDKMonitorEvent MonitorEvent_clone(const struct LDKMonitorEvent *NONNULL_PTR orig); /* @internal */ -export function MonitorEvent_clone(orig: number): number { +export function MonitorEvent_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17954,7 +17961,7 @@ export function MonitorEvent_clone(orig: number): number { } // struct LDKMonitorEvent MonitorEvent_htlcevent(struct LDKHTLCUpdate a); /* @internal */ -export function MonitorEvent_htlcevent(a: number): number { +export function MonitorEvent_htlcevent(a: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17963,7 +17970,7 @@ export function MonitorEvent_htlcevent(a: number): number { } // struct LDKMonitorEvent MonitorEvent_commitment_tx_confirmed(struct LDKOutPoint a); /* @internal */ -export function MonitorEvent_commitment_tx_confirmed(a: number): number { +export function MonitorEvent_commitment_tx_confirmed(a: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17972,7 +17979,7 @@ export function MonitorEvent_commitment_tx_confirmed(a: number): number { } // struct LDKMonitorEvent MonitorEvent_update_completed(struct LDKOutPoint funding_txo, uint64_t monitor_update_id); /* @internal */ -export function MonitorEvent_update_completed(funding_txo: number, monitor_update_id: bigint): number { +export function MonitorEvent_update_completed(funding_txo: bigint, monitor_update_id: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17981,7 +17988,7 @@ export function MonitorEvent_update_completed(funding_txo: number, monitor_updat } // struct LDKMonitorEvent MonitorEvent_update_failed(struct LDKOutPoint a); /* @internal */ -export function MonitorEvent_update_failed(a: number): number { +export function MonitorEvent_update_failed(a: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17990,7 +17997,7 @@ export function MonitorEvent_update_failed(a: number): number { } // struct LDKCVec_u8Z MonitorEvent_write(const struct LDKMonitorEvent *NONNULL_PTR obj); /* @internal */ -export function MonitorEvent_write(obj: number): number { +export function MonitorEvent_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -17999,7 +18006,7 @@ export function MonitorEvent_write(obj: number): number { } // struct LDKCResult_COption_MonitorEventZDecodeErrorZ MonitorEvent_read(struct LDKu8slice ser); /* @internal */ -export function MonitorEvent_read(ser: number): number { +export function MonitorEvent_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18008,16 +18015,16 @@ export function MonitorEvent_read(ser: number): number { } // void HTLCUpdate_free(struct LDKHTLCUpdate this_obj); /* @internal */ -export function HTLCUpdate_free(this_obj: number): void { +export function HTLCUpdate_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_HTLCUpdate_free(this_obj); // debug statements here } - // uintptr_t HTLCUpdate_clone_ptr(LDKHTLCUpdate *NONNULL_PTR arg); + // uint64_t HTLCUpdate_clone_ptr(LDKHTLCUpdate *NONNULL_PTR arg); /* @internal */ -export function HTLCUpdate_clone_ptr(arg: number): number { +export function HTLCUpdate_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18026,7 +18033,7 @@ export function HTLCUpdate_clone_ptr(arg: number): number { } // struct LDKHTLCUpdate HTLCUpdate_clone(const struct LDKHTLCUpdate *NONNULL_PTR orig); /* @internal */ -export function HTLCUpdate_clone(orig: number): number { +export function HTLCUpdate_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18035,7 +18042,7 @@ export function HTLCUpdate_clone(orig: number): number { } // struct LDKCVec_u8Z HTLCUpdate_write(const struct LDKHTLCUpdate *NONNULL_PTR obj); /* @internal */ -export function HTLCUpdate_write(obj: number): number { +export function HTLCUpdate_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18044,7 +18051,7 @@ export function HTLCUpdate_write(obj: number): number { } // struct LDKCResult_HTLCUpdateDecodeErrorZ HTLCUpdate_read(struct LDKu8slice ser); /* @internal */ -export function HTLCUpdate_read(ser: number): number { +export function HTLCUpdate_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18053,16 +18060,16 @@ export function HTLCUpdate_read(ser: number): number { } // void Balance_free(struct LDKBalance this_ptr); /* @internal */ -export function Balance_free(this_ptr: number): void { +export function Balance_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_Balance_free(this_ptr); // debug statements here } - // uintptr_t Balance_clone_ptr(LDKBalance *NONNULL_PTR arg); + // uint64_t Balance_clone_ptr(LDKBalance *NONNULL_PTR arg); /* @internal */ -export function Balance_clone_ptr(arg: number): number { +export function Balance_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18071,7 +18078,7 @@ export function Balance_clone_ptr(arg: number): number { } // struct LDKBalance Balance_clone(const struct LDKBalance *NONNULL_PTR orig); /* @internal */ -export function Balance_clone(orig: number): number { +export function Balance_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18080,7 +18087,7 @@ export function Balance_clone(orig: number): number { } // struct LDKBalance Balance_claimable_on_channel_close(uint64_t claimable_amount_satoshis); /* @internal */ -export function Balance_claimable_on_channel_close(claimable_amount_satoshis: bigint): number { +export function Balance_claimable_on_channel_close(claimable_amount_satoshis: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18089,7 +18096,7 @@ export function Balance_claimable_on_channel_close(claimable_amount_satoshis: bi } // struct LDKBalance Balance_claimable_awaiting_confirmations(uint64_t claimable_amount_satoshis, uint32_t confirmation_height); /* @internal */ -export function Balance_claimable_awaiting_confirmations(claimable_amount_satoshis: bigint, confirmation_height: number): number { +export function Balance_claimable_awaiting_confirmations(claimable_amount_satoshis: bigint, confirmation_height: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18098,7 +18105,7 @@ export function Balance_claimable_awaiting_confirmations(claimable_amount_satosh } // struct LDKBalance Balance_contentious_claimable(uint64_t claimable_amount_satoshis, uint32_t timeout_height); /* @internal */ -export function Balance_contentious_claimable(claimable_amount_satoshis: bigint, timeout_height: number): number { +export function Balance_contentious_claimable(claimable_amount_satoshis: bigint, timeout_height: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18107,7 +18114,7 @@ export function Balance_contentious_claimable(claimable_amount_satoshis: bigint, } // struct LDKBalance Balance_maybe_claimable_htlcawaiting_timeout(uint64_t claimable_amount_satoshis, uint32_t claimable_height); /* @internal */ -export function Balance_maybe_claimable_htlcawaiting_timeout(claimable_amount_satoshis: bigint, claimable_height: number): number { +export function Balance_maybe_claimable_htlcawaiting_timeout(claimable_amount_satoshis: bigint, claimable_height: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18116,7 +18123,7 @@ export function Balance_maybe_claimable_htlcawaiting_timeout(claimable_amount_sa } // bool Balance_eq(const struct LDKBalance *NONNULL_PTR a, const struct LDKBalance *NONNULL_PTR b); /* @internal */ -export function Balance_eq(a: number, b: number): boolean { +export function Balance_eq(a: bigint, b: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18125,16 +18132,16 @@ export function Balance_eq(a: number, b: number): boolean { } // void ChannelMonitor_free(struct LDKChannelMonitor this_obj); /* @internal */ -export function ChannelMonitor_free(this_obj: number): void { +export function ChannelMonitor_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_ChannelMonitor_free(this_obj); // debug statements here } - // uintptr_t ChannelMonitor_clone_ptr(LDKChannelMonitor *NONNULL_PTR arg); + // uint64_t ChannelMonitor_clone_ptr(LDKChannelMonitor *NONNULL_PTR arg); /* @internal */ -export function ChannelMonitor_clone_ptr(arg: number): number { +export function ChannelMonitor_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18143,7 +18150,7 @@ export function ChannelMonitor_clone_ptr(arg: number): number { } // struct LDKChannelMonitor ChannelMonitor_clone(const struct LDKChannelMonitor *NONNULL_PTR orig); /* @internal */ -export function ChannelMonitor_clone(orig: number): number { +export function ChannelMonitor_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18152,7 +18159,7 @@ export function ChannelMonitor_clone(orig: number): number { } // struct LDKCVec_u8Z ChannelMonitor_write(const struct LDKChannelMonitor *NONNULL_PTR obj); /* @internal */ -export function ChannelMonitor_write(obj: number): number { +export function ChannelMonitor_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18161,7 +18168,7 @@ export function ChannelMonitor_write(obj: number): number { } // MUST_USE_RES struct LDKCResult_NoneNoneZ ChannelMonitor_update_monitor(const struct LDKChannelMonitor *NONNULL_PTR this_arg, const struct LDKChannelMonitorUpdate *NONNULL_PTR updates, const struct LDKBroadcasterInterface *NONNULL_PTR broadcaster, struct LDKFeeEstimator fee_estimator, const struct LDKLogger *NONNULL_PTR logger); /* @internal */ -export function ChannelMonitor_update_monitor(this_arg: number, updates: number, broadcaster: number, fee_estimator: number, logger: number): number { +export function ChannelMonitor_update_monitor(this_arg: bigint, updates: bigint, broadcaster: bigint, fee_estimator: bigint, logger: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18170,7 +18177,7 @@ export function ChannelMonitor_update_monitor(this_arg: number, updates: number, } // MUST_USE_RES uint64_t ChannelMonitor_get_latest_update_id(const struct LDKChannelMonitor *NONNULL_PTR this_arg); /* @internal */ -export function ChannelMonitor_get_latest_update_id(this_arg: number): bigint { +export function ChannelMonitor_get_latest_update_id(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18179,7 +18186,7 @@ export function ChannelMonitor_get_latest_update_id(this_arg: number): bigint { } // MUST_USE_RES struct LDKC2Tuple_OutPointScriptZ ChannelMonitor_get_funding_txo(const struct LDKChannelMonitor *NONNULL_PTR this_arg); /* @internal */ -export function ChannelMonitor_get_funding_txo(this_arg: number): number { +export function ChannelMonitor_get_funding_txo(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18188,7 +18195,7 @@ export function ChannelMonitor_get_funding_txo(this_arg: number): number { } // MUST_USE_RES struct LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ ChannelMonitor_get_outputs_to_watch(const struct LDKChannelMonitor *NONNULL_PTR this_arg); /* @internal */ -export function ChannelMonitor_get_outputs_to_watch(this_arg: number): number { +export function ChannelMonitor_get_outputs_to_watch(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18197,7 +18204,7 @@ export function ChannelMonitor_get_outputs_to_watch(this_arg: number): number { } // void ChannelMonitor_load_outputs_to_watch(const struct LDKChannelMonitor *NONNULL_PTR this_arg, const struct LDKFilter *NONNULL_PTR filter); /* @internal */ -export function ChannelMonitor_load_outputs_to_watch(this_arg: number, filter: number): void { +export function ChannelMonitor_load_outputs_to_watch(this_arg: bigint, filter: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18206,7 +18213,7 @@ export function ChannelMonitor_load_outputs_to_watch(this_arg: number, filter: n } // MUST_USE_RES struct LDKCVec_MonitorEventZ ChannelMonitor_get_and_clear_pending_monitor_events(const struct LDKChannelMonitor *NONNULL_PTR this_arg); /* @internal */ -export function ChannelMonitor_get_and_clear_pending_monitor_events(this_arg: number): number { +export function ChannelMonitor_get_and_clear_pending_monitor_events(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18215,7 +18222,7 @@ export function ChannelMonitor_get_and_clear_pending_monitor_events(this_arg: nu } // MUST_USE_RES struct LDKCVec_EventZ ChannelMonitor_get_and_clear_pending_events(const struct LDKChannelMonitor *NONNULL_PTR this_arg); /* @internal */ -export function ChannelMonitor_get_and_clear_pending_events(this_arg: number): number { +export function ChannelMonitor_get_and_clear_pending_events(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18224,7 +18231,7 @@ export function ChannelMonitor_get_and_clear_pending_events(this_arg: number): n } // MUST_USE_RES struct LDKPublicKey ChannelMonitor_get_counterparty_node_id(const struct LDKChannelMonitor *NONNULL_PTR this_arg); /* @internal */ -export function ChannelMonitor_get_counterparty_node_id(this_arg: number): number { +export function ChannelMonitor_get_counterparty_node_id(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18233,7 +18240,7 @@ export function ChannelMonitor_get_counterparty_node_id(this_arg: number): numbe } // MUST_USE_RES struct LDKCVec_TransactionZ ChannelMonitor_get_latest_holder_commitment_txn(const struct LDKChannelMonitor *NONNULL_PTR this_arg, const struct LDKLogger *NONNULL_PTR logger); /* @internal */ -export function ChannelMonitor_get_latest_holder_commitment_txn(this_arg: number, logger: number): number { +export function ChannelMonitor_get_latest_holder_commitment_txn(this_arg: bigint, logger: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18242,7 +18249,7 @@ export function ChannelMonitor_get_latest_holder_commitment_txn(this_arg: number } // MUST_USE_RES struct LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ ChannelMonitor_block_connected(const struct LDKChannelMonitor *NONNULL_PTR this_arg, const uint8_t (*header)[80], struct LDKCVec_C2Tuple_usizeTransactionZZ txdata, uint32_t height, struct LDKBroadcasterInterface broadcaster, struct LDKFeeEstimator fee_estimator, struct LDKLogger logger); /* @internal */ -export function ChannelMonitor_block_connected(this_arg: number, header: number, txdata: number, height: number, broadcaster: number, fee_estimator: number, logger: number): number { +export function ChannelMonitor_block_connected(this_arg: bigint, header: number, txdata: number, height: number, broadcaster: bigint, fee_estimator: bigint, logger: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18251,7 +18258,7 @@ export function ChannelMonitor_block_connected(this_arg: number, header: number, } // void ChannelMonitor_block_disconnected(const struct LDKChannelMonitor *NONNULL_PTR this_arg, const uint8_t (*header)[80], uint32_t height, struct LDKBroadcasterInterface broadcaster, struct LDKFeeEstimator fee_estimator, struct LDKLogger logger); /* @internal */ -export function ChannelMonitor_block_disconnected(this_arg: number, header: number, height: number, broadcaster: number, fee_estimator: number, logger: number): void { +export function ChannelMonitor_block_disconnected(this_arg: bigint, header: number, height: number, broadcaster: bigint, fee_estimator: bigint, logger: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18260,7 +18267,7 @@ export function ChannelMonitor_block_disconnected(this_arg: number, header: numb } // MUST_USE_RES struct LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ ChannelMonitor_transactions_confirmed(const struct LDKChannelMonitor *NONNULL_PTR this_arg, const uint8_t (*header)[80], struct LDKCVec_C2Tuple_usizeTransactionZZ txdata, uint32_t height, struct LDKBroadcasterInterface broadcaster, struct LDKFeeEstimator fee_estimator, struct LDKLogger logger); /* @internal */ -export function ChannelMonitor_transactions_confirmed(this_arg: number, header: number, txdata: number, height: number, broadcaster: number, fee_estimator: number, logger: number): number { +export function ChannelMonitor_transactions_confirmed(this_arg: bigint, header: number, txdata: number, height: number, broadcaster: bigint, fee_estimator: bigint, logger: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18269,7 +18276,7 @@ export function ChannelMonitor_transactions_confirmed(this_arg: number, header: } // void ChannelMonitor_transaction_unconfirmed(const struct LDKChannelMonitor *NONNULL_PTR this_arg, const uint8_t (*txid)[32], struct LDKBroadcasterInterface broadcaster, struct LDKFeeEstimator fee_estimator, struct LDKLogger logger); /* @internal */ -export function ChannelMonitor_transaction_unconfirmed(this_arg: number, txid: number, broadcaster: number, fee_estimator: number, logger: number): void { +export function ChannelMonitor_transaction_unconfirmed(this_arg: bigint, txid: number, broadcaster: bigint, fee_estimator: bigint, logger: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18278,7 +18285,7 @@ export function ChannelMonitor_transaction_unconfirmed(this_arg: number, txid: n } // MUST_USE_RES struct LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ ChannelMonitor_best_block_updated(const struct LDKChannelMonitor *NONNULL_PTR this_arg, const uint8_t (*header)[80], uint32_t height, struct LDKBroadcasterInterface broadcaster, struct LDKFeeEstimator fee_estimator, struct LDKLogger logger); /* @internal */ -export function ChannelMonitor_best_block_updated(this_arg: number, header: number, height: number, broadcaster: number, fee_estimator: number, logger: number): number { +export function ChannelMonitor_best_block_updated(this_arg: bigint, header: number, height: number, broadcaster: bigint, fee_estimator: bigint, logger: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18287,7 +18294,7 @@ export function ChannelMonitor_best_block_updated(this_arg: number, header: numb } // MUST_USE_RES struct LDKCVec_TxidZ ChannelMonitor_get_relevant_txids(const struct LDKChannelMonitor *NONNULL_PTR this_arg); /* @internal */ -export function ChannelMonitor_get_relevant_txids(this_arg: number): number { +export function ChannelMonitor_get_relevant_txids(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18296,7 +18303,7 @@ export function ChannelMonitor_get_relevant_txids(this_arg: number): number { } // MUST_USE_RES struct LDKBestBlock ChannelMonitor_current_best_block(const struct LDKChannelMonitor *NONNULL_PTR this_arg); /* @internal */ -export function ChannelMonitor_current_best_block(this_arg: number): number { +export function ChannelMonitor_current_best_block(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18305,7 +18312,7 @@ export function ChannelMonitor_current_best_block(this_arg: number): number { } // MUST_USE_RES struct LDKCVec_BalanceZ ChannelMonitor_get_claimable_balances(const struct LDKChannelMonitor *NONNULL_PTR this_arg); /* @internal */ -export function ChannelMonitor_get_claimable_balances(this_arg: number): number { +export function ChannelMonitor_get_claimable_balances(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18314,7 +18321,7 @@ export function ChannelMonitor_get_claimable_balances(this_arg: number): number } // struct LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ C2Tuple_BlockHashChannelMonitorZ_read(struct LDKu8slice ser, const struct LDKKeysInterface *NONNULL_PTR arg); /* @internal */ -export function C2Tuple_BlockHashChannelMonitorZ_read(ser: number, arg: number): number { +export function C2Tuple_BlockHashChannelMonitorZ_read(ser: number, arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18323,7 +18330,7 @@ export function C2Tuple_BlockHashChannelMonitorZ_read(ser: number, arg: number): } // void OutPoint_free(struct LDKOutPoint this_obj); /* @internal */ -export function OutPoint_free(this_obj: number): void { +export function OutPoint_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18332,7 +18339,7 @@ export function OutPoint_free(this_obj: number): void { } // const uint8_t (*OutPoint_get_txid(const struct LDKOutPoint *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function OutPoint_get_txid(this_ptr: number): number { +export function OutPoint_get_txid(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18341,7 +18348,7 @@ export function OutPoint_get_txid(this_ptr: number): number { } // void OutPoint_set_txid(struct LDKOutPoint *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function OutPoint_set_txid(this_ptr: number, val: number): void { +export function OutPoint_set_txid(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18350,7 +18357,7 @@ export function OutPoint_set_txid(this_ptr: number, val: number): void { } // uint16_t OutPoint_get_index(const struct LDKOutPoint *NONNULL_PTR this_ptr); /* @internal */ -export function OutPoint_get_index(this_ptr: number): number { +export function OutPoint_get_index(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18359,7 +18366,7 @@ export function OutPoint_get_index(this_ptr: number): number { } // void OutPoint_set_index(struct LDKOutPoint *NONNULL_PTR this_ptr, uint16_t val); /* @internal */ -export function OutPoint_set_index(this_ptr: number, val: number): void { +export function OutPoint_set_index(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18368,16 +18375,16 @@ export function OutPoint_set_index(this_ptr: number, val: number): void { } // MUST_USE_RES struct LDKOutPoint OutPoint_new(struct LDKThirtyTwoBytes txid_arg, uint16_t index_arg); /* @internal */ -export function OutPoint_new(txid_arg: number, index_arg: number): number { +export function OutPoint_new(txid_arg: number, index_arg: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_OutPoint_new(txid_arg, index_arg); return nativeResponseValue; } - // uintptr_t OutPoint_clone_ptr(LDKOutPoint *NONNULL_PTR arg); + // uint64_t OutPoint_clone_ptr(LDKOutPoint *NONNULL_PTR arg); /* @internal */ -export function OutPoint_clone_ptr(arg: number): number { +export function OutPoint_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18386,7 +18393,7 @@ export function OutPoint_clone_ptr(arg: number): number { } // struct LDKOutPoint OutPoint_clone(const struct LDKOutPoint *NONNULL_PTR orig); /* @internal */ -export function OutPoint_clone(orig: number): number { +export function OutPoint_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18395,7 +18402,7 @@ export function OutPoint_clone(orig: number): number { } // bool OutPoint_eq(const struct LDKOutPoint *NONNULL_PTR a, const struct LDKOutPoint *NONNULL_PTR b); /* @internal */ -export function OutPoint_eq(a: number, b: number): boolean { +export function OutPoint_eq(a: bigint, b: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18404,7 +18411,7 @@ export function OutPoint_eq(a: number, b: number): boolean { } // uint64_t OutPoint_hash(const struct LDKOutPoint *NONNULL_PTR o); /* @internal */ -export function OutPoint_hash(o: number): bigint { +export function OutPoint_hash(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18413,7 +18420,7 @@ export function OutPoint_hash(o: number): bigint { } // MUST_USE_RES struct LDKThirtyTwoBytes OutPoint_to_channel_id(const struct LDKOutPoint *NONNULL_PTR this_arg); /* @internal */ -export function OutPoint_to_channel_id(this_arg: number): number { +export function OutPoint_to_channel_id(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18422,7 +18429,7 @@ export function OutPoint_to_channel_id(this_arg: number): number { } // struct LDKCVec_u8Z OutPoint_write(const struct LDKOutPoint *NONNULL_PTR obj); /* @internal */ -export function OutPoint_write(obj: number): number { +export function OutPoint_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18431,7 +18438,7 @@ export function OutPoint_write(obj: number): number { } // struct LDKCResult_OutPointDecodeErrorZ OutPoint_read(struct LDKu8slice ser); /* @internal */ -export function OutPoint_read(ser: number): number { +export function OutPoint_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18440,7 +18447,7 @@ export function OutPoint_read(ser: number): number { } // void DelayedPaymentOutputDescriptor_free(struct LDKDelayedPaymentOutputDescriptor this_obj); /* @internal */ -export function DelayedPaymentOutputDescriptor_free(this_obj: number): void { +export function DelayedPaymentOutputDescriptor_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18449,7 +18456,7 @@ export function DelayedPaymentOutputDescriptor_free(this_obj: number): void { } // struct LDKOutPoint DelayedPaymentOutputDescriptor_get_outpoint(const struct LDKDelayedPaymentOutputDescriptor *NONNULL_PTR this_ptr); /* @internal */ -export function DelayedPaymentOutputDescriptor_get_outpoint(this_ptr: number): number { +export function DelayedPaymentOutputDescriptor_get_outpoint(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18458,7 +18465,7 @@ export function DelayedPaymentOutputDescriptor_get_outpoint(this_ptr: number): n } // void DelayedPaymentOutputDescriptor_set_outpoint(struct LDKDelayedPaymentOutputDescriptor *NONNULL_PTR this_ptr, struct LDKOutPoint val); /* @internal */ -export function DelayedPaymentOutputDescriptor_set_outpoint(this_ptr: number, val: number): void { +export function DelayedPaymentOutputDescriptor_set_outpoint(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18467,7 +18474,7 @@ export function DelayedPaymentOutputDescriptor_set_outpoint(this_ptr: number, va } // struct LDKPublicKey DelayedPaymentOutputDescriptor_get_per_commitment_point(const struct LDKDelayedPaymentOutputDescriptor *NONNULL_PTR this_ptr); /* @internal */ -export function DelayedPaymentOutputDescriptor_get_per_commitment_point(this_ptr: number): number { +export function DelayedPaymentOutputDescriptor_get_per_commitment_point(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18476,7 +18483,7 @@ export function DelayedPaymentOutputDescriptor_get_per_commitment_point(this_ptr } // void DelayedPaymentOutputDescriptor_set_per_commitment_point(struct LDKDelayedPaymentOutputDescriptor *NONNULL_PTR this_ptr, struct LDKPublicKey val); /* @internal */ -export function DelayedPaymentOutputDescriptor_set_per_commitment_point(this_ptr: number, val: number): void { +export function DelayedPaymentOutputDescriptor_set_per_commitment_point(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18485,7 +18492,7 @@ export function DelayedPaymentOutputDescriptor_set_per_commitment_point(this_ptr } // uint16_t DelayedPaymentOutputDescriptor_get_to_self_delay(const struct LDKDelayedPaymentOutputDescriptor *NONNULL_PTR this_ptr); /* @internal */ -export function DelayedPaymentOutputDescriptor_get_to_self_delay(this_ptr: number): number { +export function DelayedPaymentOutputDescriptor_get_to_self_delay(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18494,7 +18501,7 @@ export function DelayedPaymentOutputDescriptor_get_to_self_delay(this_ptr: numbe } // void DelayedPaymentOutputDescriptor_set_to_self_delay(struct LDKDelayedPaymentOutputDescriptor *NONNULL_PTR this_ptr, uint16_t val); /* @internal */ -export function DelayedPaymentOutputDescriptor_set_to_self_delay(this_ptr: number, val: number): void { +export function DelayedPaymentOutputDescriptor_set_to_self_delay(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18503,7 +18510,7 @@ export function DelayedPaymentOutputDescriptor_set_to_self_delay(this_ptr: numbe } // struct LDKTxOut DelayedPaymentOutputDescriptor_get_output(const struct LDKDelayedPaymentOutputDescriptor *NONNULL_PTR this_ptr); /* @internal */ -export function DelayedPaymentOutputDescriptor_get_output(this_ptr: number): number { +export function DelayedPaymentOutputDescriptor_get_output(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18512,7 +18519,7 @@ export function DelayedPaymentOutputDescriptor_get_output(this_ptr: number): num } // void DelayedPaymentOutputDescriptor_set_output(struct LDKDelayedPaymentOutputDescriptor *NONNULL_PTR this_ptr, struct LDKTxOut val); /* @internal */ -export function DelayedPaymentOutputDescriptor_set_output(this_ptr: number, val: number): void { +export function DelayedPaymentOutputDescriptor_set_output(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18521,7 +18528,7 @@ export function DelayedPaymentOutputDescriptor_set_output(this_ptr: number, val: } // struct LDKPublicKey DelayedPaymentOutputDescriptor_get_revocation_pubkey(const struct LDKDelayedPaymentOutputDescriptor *NONNULL_PTR this_ptr); /* @internal */ -export function DelayedPaymentOutputDescriptor_get_revocation_pubkey(this_ptr: number): number { +export function DelayedPaymentOutputDescriptor_get_revocation_pubkey(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18530,7 +18537,7 @@ export function DelayedPaymentOutputDescriptor_get_revocation_pubkey(this_ptr: n } // void DelayedPaymentOutputDescriptor_set_revocation_pubkey(struct LDKDelayedPaymentOutputDescriptor *NONNULL_PTR this_ptr, struct LDKPublicKey val); /* @internal */ -export function DelayedPaymentOutputDescriptor_set_revocation_pubkey(this_ptr: number, val: number): void { +export function DelayedPaymentOutputDescriptor_set_revocation_pubkey(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18539,7 +18546,7 @@ export function DelayedPaymentOutputDescriptor_set_revocation_pubkey(this_ptr: n } // const uint8_t (*DelayedPaymentOutputDescriptor_get_channel_keys_id(const struct LDKDelayedPaymentOutputDescriptor *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function DelayedPaymentOutputDescriptor_get_channel_keys_id(this_ptr: number): number { +export function DelayedPaymentOutputDescriptor_get_channel_keys_id(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18548,7 +18555,7 @@ export function DelayedPaymentOutputDescriptor_get_channel_keys_id(this_ptr: num } // void DelayedPaymentOutputDescriptor_set_channel_keys_id(struct LDKDelayedPaymentOutputDescriptor *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function DelayedPaymentOutputDescriptor_set_channel_keys_id(this_ptr: number, val: number): void { +export function DelayedPaymentOutputDescriptor_set_channel_keys_id(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18557,7 +18564,7 @@ export function DelayedPaymentOutputDescriptor_set_channel_keys_id(this_ptr: num } // uint64_t DelayedPaymentOutputDescriptor_get_channel_value_satoshis(const struct LDKDelayedPaymentOutputDescriptor *NONNULL_PTR this_ptr); /* @internal */ -export function DelayedPaymentOutputDescriptor_get_channel_value_satoshis(this_ptr: number): bigint { +export function DelayedPaymentOutputDescriptor_get_channel_value_satoshis(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18566,7 +18573,7 @@ export function DelayedPaymentOutputDescriptor_get_channel_value_satoshis(this_p } // void DelayedPaymentOutputDescriptor_set_channel_value_satoshis(struct LDKDelayedPaymentOutputDescriptor *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function DelayedPaymentOutputDescriptor_set_channel_value_satoshis(this_ptr: number, val: bigint): void { +export function DelayedPaymentOutputDescriptor_set_channel_value_satoshis(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18575,16 +18582,16 @@ export function DelayedPaymentOutputDescriptor_set_channel_value_satoshis(this_p } // MUST_USE_RES struct LDKDelayedPaymentOutputDescriptor DelayedPaymentOutputDescriptor_new(struct LDKOutPoint outpoint_arg, struct LDKPublicKey per_commitment_point_arg, uint16_t to_self_delay_arg, struct LDKTxOut output_arg, struct LDKPublicKey revocation_pubkey_arg, struct LDKThirtyTwoBytes channel_keys_id_arg, uint64_t channel_value_satoshis_arg); /* @internal */ -export function DelayedPaymentOutputDescriptor_new(outpoint_arg: number, per_commitment_point_arg: number, to_self_delay_arg: number, output_arg: number, revocation_pubkey_arg: number, channel_keys_id_arg: number, channel_value_satoshis_arg: bigint): number { +export function DelayedPaymentOutputDescriptor_new(outpoint_arg: bigint, per_commitment_point_arg: number, to_self_delay_arg: number, output_arg: bigint, revocation_pubkey_arg: number, channel_keys_id_arg: number, channel_value_satoshis_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_DelayedPaymentOutputDescriptor_new(outpoint_arg, per_commitment_point_arg, to_self_delay_arg, output_arg, revocation_pubkey_arg, channel_keys_id_arg, channel_value_satoshis_arg); return nativeResponseValue; } - // uintptr_t DelayedPaymentOutputDescriptor_clone_ptr(LDKDelayedPaymentOutputDescriptor *NONNULL_PTR arg); + // uint64_t DelayedPaymentOutputDescriptor_clone_ptr(LDKDelayedPaymentOutputDescriptor *NONNULL_PTR arg); /* @internal */ -export function DelayedPaymentOutputDescriptor_clone_ptr(arg: number): number { +export function DelayedPaymentOutputDescriptor_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18593,7 +18600,7 @@ export function DelayedPaymentOutputDescriptor_clone_ptr(arg: number): number { } // struct LDKDelayedPaymentOutputDescriptor DelayedPaymentOutputDescriptor_clone(const struct LDKDelayedPaymentOutputDescriptor *NONNULL_PTR orig); /* @internal */ -export function DelayedPaymentOutputDescriptor_clone(orig: number): number { +export function DelayedPaymentOutputDescriptor_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18602,7 +18609,7 @@ export function DelayedPaymentOutputDescriptor_clone(orig: number): number { } // struct LDKCVec_u8Z DelayedPaymentOutputDescriptor_write(const struct LDKDelayedPaymentOutputDescriptor *NONNULL_PTR obj); /* @internal */ -export function DelayedPaymentOutputDescriptor_write(obj: number): number { +export function DelayedPaymentOutputDescriptor_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18611,7 +18618,7 @@ export function DelayedPaymentOutputDescriptor_write(obj: number): number { } // struct LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ DelayedPaymentOutputDescriptor_read(struct LDKu8slice ser); /* @internal */ -export function DelayedPaymentOutputDescriptor_read(ser: number): number { +export function DelayedPaymentOutputDescriptor_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18620,7 +18627,7 @@ export function DelayedPaymentOutputDescriptor_read(ser: number): number { } // void StaticPaymentOutputDescriptor_free(struct LDKStaticPaymentOutputDescriptor this_obj); /* @internal */ -export function StaticPaymentOutputDescriptor_free(this_obj: number): void { +export function StaticPaymentOutputDescriptor_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18629,7 +18636,7 @@ export function StaticPaymentOutputDescriptor_free(this_obj: number): void { } // struct LDKOutPoint StaticPaymentOutputDescriptor_get_outpoint(const struct LDKStaticPaymentOutputDescriptor *NONNULL_PTR this_ptr); /* @internal */ -export function StaticPaymentOutputDescriptor_get_outpoint(this_ptr: number): number { +export function StaticPaymentOutputDescriptor_get_outpoint(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18638,7 +18645,7 @@ export function StaticPaymentOutputDescriptor_get_outpoint(this_ptr: number): nu } // void StaticPaymentOutputDescriptor_set_outpoint(struct LDKStaticPaymentOutputDescriptor *NONNULL_PTR this_ptr, struct LDKOutPoint val); /* @internal */ -export function StaticPaymentOutputDescriptor_set_outpoint(this_ptr: number, val: number): void { +export function StaticPaymentOutputDescriptor_set_outpoint(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18647,7 +18654,7 @@ export function StaticPaymentOutputDescriptor_set_outpoint(this_ptr: number, val } // struct LDKTxOut StaticPaymentOutputDescriptor_get_output(const struct LDKStaticPaymentOutputDescriptor *NONNULL_PTR this_ptr); /* @internal */ -export function StaticPaymentOutputDescriptor_get_output(this_ptr: number): number { +export function StaticPaymentOutputDescriptor_get_output(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18656,7 +18663,7 @@ export function StaticPaymentOutputDescriptor_get_output(this_ptr: number): numb } // void StaticPaymentOutputDescriptor_set_output(struct LDKStaticPaymentOutputDescriptor *NONNULL_PTR this_ptr, struct LDKTxOut val); /* @internal */ -export function StaticPaymentOutputDescriptor_set_output(this_ptr: number, val: number): void { +export function StaticPaymentOutputDescriptor_set_output(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18665,7 +18672,7 @@ export function StaticPaymentOutputDescriptor_set_output(this_ptr: number, val: } // const uint8_t (*StaticPaymentOutputDescriptor_get_channel_keys_id(const struct LDKStaticPaymentOutputDescriptor *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function StaticPaymentOutputDescriptor_get_channel_keys_id(this_ptr: number): number { +export function StaticPaymentOutputDescriptor_get_channel_keys_id(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18674,7 +18681,7 @@ export function StaticPaymentOutputDescriptor_get_channel_keys_id(this_ptr: numb } // void StaticPaymentOutputDescriptor_set_channel_keys_id(struct LDKStaticPaymentOutputDescriptor *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function StaticPaymentOutputDescriptor_set_channel_keys_id(this_ptr: number, val: number): void { +export function StaticPaymentOutputDescriptor_set_channel_keys_id(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18683,7 +18690,7 @@ export function StaticPaymentOutputDescriptor_set_channel_keys_id(this_ptr: numb } // uint64_t StaticPaymentOutputDescriptor_get_channel_value_satoshis(const struct LDKStaticPaymentOutputDescriptor *NONNULL_PTR this_ptr); /* @internal */ -export function StaticPaymentOutputDescriptor_get_channel_value_satoshis(this_ptr: number): bigint { +export function StaticPaymentOutputDescriptor_get_channel_value_satoshis(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18692,7 +18699,7 @@ export function StaticPaymentOutputDescriptor_get_channel_value_satoshis(this_pt } // void StaticPaymentOutputDescriptor_set_channel_value_satoshis(struct LDKStaticPaymentOutputDescriptor *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function StaticPaymentOutputDescriptor_set_channel_value_satoshis(this_ptr: number, val: bigint): void { +export function StaticPaymentOutputDescriptor_set_channel_value_satoshis(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18701,16 +18708,16 @@ export function StaticPaymentOutputDescriptor_set_channel_value_satoshis(this_pt } // MUST_USE_RES struct LDKStaticPaymentOutputDescriptor StaticPaymentOutputDescriptor_new(struct LDKOutPoint outpoint_arg, struct LDKTxOut output_arg, struct LDKThirtyTwoBytes channel_keys_id_arg, uint64_t channel_value_satoshis_arg); /* @internal */ -export function StaticPaymentOutputDescriptor_new(outpoint_arg: number, output_arg: number, channel_keys_id_arg: number, channel_value_satoshis_arg: bigint): number { +export function StaticPaymentOutputDescriptor_new(outpoint_arg: bigint, output_arg: bigint, channel_keys_id_arg: number, channel_value_satoshis_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_StaticPaymentOutputDescriptor_new(outpoint_arg, output_arg, channel_keys_id_arg, channel_value_satoshis_arg); return nativeResponseValue; } - // uintptr_t StaticPaymentOutputDescriptor_clone_ptr(LDKStaticPaymentOutputDescriptor *NONNULL_PTR arg); + // uint64_t StaticPaymentOutputDescriptor_clone_ptr(LDKStaticPaymentOutputDescriptor *NONNULL_PTR arg); /* @internal */ -export function StaticPaymentOutputDescriptor_clone_ptr(arg: number): number { +export function StaticPaymentOutputDescriptor_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18719,7 +18726,7 @@ export function StaticPaymentOutputDescriptor_clone_ptr(arg: number): number { } // struct LDKStaticPaymentOutputDescriptor StaticPaymentOutputDescriptor_clone(const struct LDKStaticPaymentOutputDescriptor *NONNULL_PTR orig); /* @internal */ -export function StaticPaymentOutputDescriptor_clone(orig: number): number { +export function StaticPaymentOutputDescriptor_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18728,7 +18735,7 @@ export function StaticPaymentOutputDescriptor_clone(orig: number): number { } // struct LDKCVec_u8Z StaticPaymentOutputDescriptor_write(const struct LDKStaticPaymentOutputDescriptor *NONNULL_PTR obj); /* @internal */ -export function StaticPaymentOutputDescriptor_write(obj: number): number { +export function StaticPaymentOutputDescriptor_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18737,7 +18744,7 @@ export function StaticPaymentOutputDescriptor_write(obj: number): number { } // struct LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ StaticPaymentOutputDescriptor_read(struct LDKu8slice ser); /* @internal */ -export function StaticPaymentOutputDescriptor_read(ser: number): number { +export function StaticPaymentOutputDescriptor_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18746,16 +18753,16 @@ export function StaticPaymentOutputDescriptor_read(ser: number): number { } // void SpendableOutputDescriptor_free(struct LDKSpendableOutputDescriptor this_ptr); /* @internal */ -export function SpendableOutputDescriptor_free(this_ptr: number): void { +export function SpendableOutputDescriptor_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_SpendableOutputDescriptor_free(this_ptr); // debug statements here } - // uintptr_t SpendableOutputDescriptor_clone_ptr(LDKSpendableOutputDescriptor *NONNULL_PTR arg); + // uint64_t SpendableOutputDescriptor_clone_ptr(LDKSpendableOutputDescriptor *NONNULL_PTR arg); /* @internal */ -export function SpendableOutputDescriptor_clone_ptr(arg: number): number { +export function SpendableOutputDescriptor_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18764,7 +18771,7 @@ export function SpendableOutputDescriptor_clone_ptr(arg: number): number { } // struct LDKSpendableOutputDescriptor SpendableOutputDescriptor_clone(const struct LDKSpendableOutputDescriptor *NONNULL_PTR orig); /* @internal */ -export function SpendableOutputDescriptor_clone(orig: number): number { +export function SpendableOutputDescriptor_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18773,7 +18780,7 @@ export function SpendableOutputDescriptor_clone(orig: number): number { } // struct LDKSpendableOutputDescriptor SpendableOutputDescriptor_static_output(struct LDKOutPoint outpoint, struct LDKTxOut output); /* @internal */ -export function SpendableOutputDescriptor_static_output(outpoint: number, output: number): number { +export function SpendableOutputDescriptor_static_output(outpoint: bigint, output: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18782,7 +18789,7 @@ export function SpendableOutputDescriptor_static_output(outpoint: number, output } // struct LDKSpendableOutputDescriptor SpendableOutputDescriptor_delayed_payment_output(struct LDKDelayedPaymentOutputDescriptor a); /* @internal */ -export function SpendableOutputDescriptor_delayed_payment_output(a: number): number { +export function SpendableOutputDescriptor_delayed_payment_output(a: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18791,7 +18798,7 @@ export function SpendableOutputDescriptor_delayed_payment_output(a: number): num } // struct LDKSpendableOutputDescriptor SpendableOutputDescriptor_static_payment_output(struct LDKStaticPaymentOutputDescriptor a); /* @internal */ -export function SpendableOutputDescriptor_static_payment_output(a: number): number { +export function SpendableOutputDescriptor_static_payment_output(a: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18800,7 +18807,7 @@ export function SpendableOutputDescriptor_static_payment_output(a: number): numb } // struct LDKCVec_u8Z SpendableOutputDescriptor_write(const struct LDKSpendableOutputDescriptor *NONNULL_PTR obj); /* @internal */ -export function SpendableOutputDescriptor_write(obj: number): number { +export function SpendableOutputDescriptor_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18809,7 +18816,7 @@ export function SpendableOutputDescriptor_write(obj: number): number { } // struct LDKCResult_SpendableOutputDescriptorDecodeErrorZ SpendableOutputDescriptor_read(struct LDKu8slice ser); /* @internal */ -export function SpendableOutputDescriptor_read(ser: number): number { +export function SpendableOutputDescriptor_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18818,16 +18825,16 @@ export function SpendableOutputDescriptor_read(ser: number): number { } // void BaseSign_free(struct LDKBaseSign this_ptr); /* @internal */ -export function BaseSign_free(this_ptr: number): void { +export function BaseSign_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_BaseSign_free(this_ptr); // debug statements here } - // uintptr_t Sign_clone_ptr(LDKSign *NONNULL_PTR arg); + // uint64_t Sign_clone_ptr(LDKSign *NONNULL_PTR arg); /* @internal */ -export function Sign_clone_ptr(arg: number): number { +export function Sign_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18836,7 +18843,7 @@ export function Sign_clone_ptr(arg: number): number { } // struct LDKSign Sign_clone(const struct LDKSign *NONNULL_PTR orig); /* @internal */ -export function Sign_clone(orig: number): number { +export function Sign_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18845,7 +18852,7 @@ export function Sign_clone(orig: number): number { } // void Sign_free(struct LDKSign this_ptr); /* @internal */ -export function Sign_free(this_ptr: number): void { +export function Sign_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18854,7 +18861,7 @@ export function Sign_free(this_ptr: number): void { } // enum LDKRecipient Recipient_clone(const enum LDKRecipient *NONNULL_PTR orig); /* @internal */ -export function Recipient_clone(orig: number): Recipient { +export function Recipient_clone(orig: bigint): Recipient { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18881,7 +18888,7 @@ export function Recipient_phantom_node(): Recipient { } // void KeysInterface_free(struct LDKKeysInterface this_ptr); /* @internal */ -export function KeysInterface_free(this_ptr: number): void { +export function KeysInterface_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18890,7 +18897,7 @@ export function KeysInterface_free(this_ptr: number): void { } // void InMemorySigner_free(struct LDKInMemorySigner this_obj); /* @internal */ -export function InMemorySigner_free(this_obj: number): void { +export function InMemorySigner_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18899,7 +18906,7 @@ export function InMemorySigner_free(this_obj: number): void { } // const uint8_t (*InMemorySigner_get_funding_key(const struct LDKInMemorySigner *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function InMemorySigner_get_funding_key(this_ptr: number): number { +export function InMemorySigner_get_funding_key(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18908,7 +18915,7 @@ export function InMemorySigner_get_funding_key(this_ptr: number): number { } // void InMemorySigner_set_funding_key(struct LDKInMemorySigner *NONNULL_PTR this_ptr, struct LDKSecretKey val); /* @internal */ -export function InMemorySigner_set_funding_key(this_ptr: number, val: number): void { +export function InMemorySigner_set_funding_key(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18917,7 +18924,7 @@ export function InMemorySigner_set_funding_key(this_ptr: number, val: number): v } // const uint8_t (*InMemorySigner_get_revocation_base_key(const struct LDKInMemorySigner *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function InMemorySigner_get_revocation_base_key(this_ptr: number): number { +export function InMemorySigner_get_revocation_base_key(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18926,7 +18933,7 @@ export function InMemorySigner_get_revocation_base_key(this_ptr: number): number } // void InMemorySigner_set_revocation_base_key(struct LDKInMemorySigner *NONNULL_PTR this_ptr, struct LDKSecretKey val); /* @internal */ -export function InMemorySigner_set_revocation_base_key(this_ptr: number, val: number): void { +export function InMemorySigner_set_revocation_base_key(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18935,7 +18942,7 @@ export function InMemorySigner_set_revocation_base_key(this_ptr: number, val: nu } // const uint8_t (*InMemorySigner_get_payment_key(const struct LDKInMemorySigner *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function InMemorySigner_get_payment_key(this_ptr: number): number { +export function InMemorySigner_get_payment_key(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18944,7 +18951,7 @@ export function InMemorySigner_get_payment_key(this_ptr: number): number { } // void InMemorySigner_set_payment_key(struct LDKInMemorySigner *NONNULL_PTR this_ptr, struct LDKSecretKey val); /* @internal */ -export function InMemorySigner_set_payment_key(this_ptr: number, val: number): void { +export function InMemorySigner_set_payment_key(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18953,7 +18960,7 @@ export function InMemorySigner_set_payment_key(this_ptr: number, val: number): v } // const uint8_t (*InMemorySigner_get_delayed_payment_base_key(const struct LDKInMemorySigner *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function InMemorySigner_get_delayed_payment_base_key(this_ptr: number): number { +export function InMemorySigner_get_delayed_payment_base_key(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18962,7 +18969,7 @@ export function InMemorySigner_get_delayed_payment_base_key(this_ptr: number): n } // void InMemorySigner_set_delayed_payment_base_key(struct LDKInMemorySigner *NONNULL_PTR this_ptr, struct LDKSecretKey val); /* @internal */ -export function InMemorySigner_set_delayed_payment_base_key(this_ptr: number, val: number): void { +export function InMemorySigner_set_delayed_payment_base_key(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18971,7 +18978,7 @@ export function InMemorySigner_set_delayed_payment_base_key(this_ptr: number, va } // const uint8_t (*InMemorySigner_get_htlc_base_key(const struct LDKInMemorySigner *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function InMemorySigner_get_htlc_base_key(this_ptr: number): number { +export function InMemorySigner_get_htlc_base_key(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18980,7 +18987,7 @@ export function InMemorySigner_get_htlc_base_key(this_ptr: number): number { } // void InMemorySigner_set_htlc_base_key(struct LDKInMemorySigner *NONNULL_PTR this_ptr, struct LDKSecretKey val); /* @internal */ -export function InMemorySigner_set_htlc_base_key(this_ptr: number, val: number): void { +export function InMemorySigner_set_htlc_base_key(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18989,7 +18996,7 @@ export function InMemorySigner_set_htlc_base_key(this_ptr: number, val: number): } // const uint8_t (*InMemorySigner_get_commitment_seed(const struct LDKInMemorySigner *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function InMemorySigner_get_commitment_seed(this_ptr: number): number { +export function InMemorySigner_get_commitment_seed(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -18998,16 +19005,16 @@ export function InMemorySigner_get_commitment_seed(this_ptr: number): number { } // void InMemorySigner_set_commitment_seed(struct LDKInMemorySigner *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function InMemorySigner_set_commitment_seed(this_ptr: number, val: number): void { +export function InMemorySigner_set_commitment_seed(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_InMemorySigner_set_commitment_seed(this_ptr, val); // debug statements here } - // uintptr_t InMemorySigner_clone_ptr(LDKInMemorySigner *NONNULL_PTR arg); + // uint64_t InMemorySigner_clone_ptr(LDKInMemorySigner *NONNULL_PTR arg); /* @internal */ -export function InMemorySigner_clone_ptr(arg: number): number { +export function InMemorySigner_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19016,7 +19023,7 @@ export function InMemorySigner_clone_ptr(arg: number): number { } // struct LDKInMemorySigner InMemorySigner_clone(const struct LDKInMemorySigner *NONNULL_PTR orig); /* @internal */ -export function InMemorySigner_clone(orig: number): number { +export function InMemorySigner_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19025,7 +19032,7 @@ export function InMemorySigner_clone(orig: number): number { } // MUST_USE_RES struct LDKInMemorySigner InMemorySigner_new(struct LDKSecretKey node_secret, struct LDKSecretKey funding_key, struct LDKSecretKey revocation_base_key, struct LDKSecretKey payment_key, struct LDKSecretKey delayed_payment_base_key, struct LDKSecretKey htlc_base_key, struct LDKThirtyTwoBytes commitment_seed, uint64_t channel_value_satoshis, struct LDKThirtyTwoBytes channel_keys_id); /* @internal */ -export function InMemorySigner_new(node_secret: number, funding_key: number, revocation_base_key: number, payment_key: number, delayed_payment_base_key: number, htlc_base_key: number, commitment_seed: number, channel_value_satoshis: bigint, channel_keys_id: number): number { +export function InMemorySigner_new(node_secret: number, funding_key: number, revocation_base_key: number, payment_key: number, delayed_payment_base_key: number, htlc_base_key: number, commitment_seed: number, channel_value_satoshis: bigint, channel_keys_id: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19034,7 +19041,7 @@ export function InMemorySigner_new(node_secret: number, funding_key: number, rev } // MUST_USE_RES struct LDKChannelPublicKeys InMemorySigner_counterparty_pubkeys(const struct LDKInMemorySigner *NONNULL_PTR this_arg); /* @internal */ -export function InMemorySigner_counterparty_pubkeys(this_arg: number): number { +export function InMemorySigner_counterparty_pubkeys(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19043,7 +19050,7 @@ export function InMemorySigner_counterparty_pubkeys(this_arg: number): number { } // MUST_USE_RES uint16_t InMemorySigner_counterparty_selected_contest_delay(const struct LDKInMemorySigner *NONNULL_PTR this_arg); /* @internal */ -export function InMemorySigner_counterparty_selected_contest_delay(this_arg: number): number { +export function InMemorySigner_counterparty_selected_contest_delay(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19052,7 +19059,7 @@ export function InMemorySigner_counterparty_selected_contest_delay(this_arg: num } // MUST_USE_RES uint16_t InMemorySigner_holder_selected_contest_delay(const struct LDKInMemorySigner *NONNULL_PTR this_arg); /* @internal */ -export function InMemorySigner_holder_selected_contest_delay(this_arg: number): number { +export function InMemorySigner_holder_selected_contest_delay(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19061,7 +19068,7 @@ export function InMemorySigner_holder_selected_contest_delay(this_arg: number): } // MUST_USE_RES bool InMemorySigner_is_outbound(const struct LDKInMemorySigner *NONNULL_PTR this_arg); /* @internal */ -export function InMemorySigner_is_outbound(this_arg: number): boolean { +export function InMemorySigner_is_outbound(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19070,7 +19077,7 @@ export function InMemorySigner_is_outbound(this_arg: number): boolean { } // MUST_USE_RES struct LDKOutPoint InMemorySigner_funding_outpoint(const struct LDKInMemorySigner *NONNULL_PTR this_arg); /* @internal */ -export function InMemorySigner_funding_outpoint(this_arg: number): number { +export function InMemorySigner_funding_outpoint(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19079,7 +19086,7 @@ export function InMemorySigner_funding_outpoint(this_arg: number): number { } // MUST_USE_RES struct LDKChannelTransactionParameters InMemorySigner_get_channel_parameters(const struct LDKInMemorySigner *NONNULL_PTR this_arg); /* @internal */ -export function InMemorySigner_get_channel_parameters(this_arg: number): number { +export function InMemorySigner_get_channel_parameters(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19088,7 +19095,7 @@ export function InMemorySigner_get_channel_parameters(this_arg: number): number } // MUST_USE_RES bool InMemorySigner_opt_anchors(const struct LDKInMemorySigner *NONNULL_PTR this_arg); /* @internal */ -export function InMemorySigner_opt_anchors(this_arg: number): boolean { +export function InMemorySigner_opt_anchors(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19097,7 +19104,7 @@ export function InMemorySigner_opt_anchors(this_arg: number): boolean { } // MUST_USE_RES struct LDKCResult_CVec_CVec_u8ZZNoneZ InMemorySigner_sign_counterparty_payment_input(const struct LDKInMemorySigner *NONNULL_PTR this_arg, struct LDKTransaction spend_tx, uintptr_t input_idx, const struct LDKStaticPaymentOutputDescriptor *NONNULL_PTR descriptor); /* @internal */ -export function InMemorySigner_sign_counterparty_payment_input(this_arg: number, spend_tx: number, input_idx: number, descriptor: number): number { +export function InMemorySigner_sign_counterparty_payment_input(this_arg: bigint, spend_tx: number, input_idx: number, descriptor: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19106,7 +19113,7 @@ export function InMemorySigner_sign_counterparty_payment_input(this_arg: number, } // MUST_USE_RES struct LDKCResult_CVec_CVec_u8ZZNoneZ InMemorySigner_sign_dynamic_p2wsh_input(const struct LDKInMemorySigner *NONNULL_PTR this_arg, struct LDKTransaction spend_tx, uintptr_t input_idx, const struct LDKDelayedPaymentOutputDescriptor *NONNULL_PTR descriptor); /* @internal */ -export function InMemorySigner_sign_dynamic_p2wsh_input(this_arg: number, spend_tx: number, input_idx: number, descriptor: number): number { +export function InMemorySigner_sign_dynamic_p2wsh_input(this_arg: bigint, spend_tx: number, input_idx: number, descriptor: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19115,7 +19122,7 @@ export function InMemorySigner_sign_dynamic_p2wsh_input(this_arg: number, spend_ } // struct LDKBaseSign InMemorySigner_as_BaseSign(const struct LDKInMemorySigner *NONNULL_PTR this_arg); /* @internal */ -export function InMemorySigner_as_BaseSign(this_arg: number): number { +export function InMemorySigner_as_BaseSign(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19124,7 +19131,7 @@ export function InMemorySigner_as_BaseSign(this_arg: number): number { } // struct LDKSign InMemorySigner_as_Sign(const struct LDKInMemorySigner *NONNULL_PTR this_arg); /* @internal */ -export function InMemorySigner_as_Sign(this_arg: number): number { +export function InMemorySigner_as_Sign(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19133,7 +19140,7 @@ export function InMemorySigner_as_Sign(this_arg: number): number { } // struct LDKCVec_u8Z InMemorySigner_write(const struct LDKInMemorySigner *NONNULL_PTR obj); /* @internal */ -export function InMemorySigner_write(obj: number): number { +export function InMemorySigner_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19142,7 +19149,7 @@ export function InMemorySigner_write(obj: number): number { } // struct LDKCResult_InMemorySignerDecodeErrorZ InMemorySigner_read(struct LDKu8slice ser, struct LDKSecretKey arg); /* @internal */ -export function InMemorySigner_read(ser: number, arg: number): number { +export function InMemorySigner_read(ser: number, arg: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19151,7 +19158,7 @@ export function InMemorySigner_read(ser: number, arg: number): number { } // void KeysManager_free(struct LDKKeysManager this_obj); /* @internal */ -export function KeysManager_free(this_obj: number): void { +export function KeysManager_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19160,7 +19167,7 @@ export function KeysManager_free(this_obj: number): void { } // MUST_USE_RES struct LDKKeysManager KeysManager_new(const uint8_t (*seed)[32], uint64_t starting_time_secs, uint32_t starting_time_nanos); /* @internal */ -export function KeysManager_new(seed: number, starting_time_secs: bigint, starting_time_nanos: number): number { +export function KeysManager_new(seed: number, starting_time_secs: bigint, starting_time_nanos: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19169,7 +19176,7 @@ export function KeysManager_new(seed: number, starting_time_secs: bigint, starti } // MUST_USE_RES struct LDKInMemorySigner KeysManager_derive_channel_keys(const struct LDKKeysManager *NONNULL_PTR this_arg, uint64_t channel_value_satoshis, const uint8_t (*params)[32]); /* @internal */ -export function KeysManager_derive_channel_keys(this_arg: number, channel_value_satoshis: bigint, params: number): number { +export function KeysManager_derive_channel_keys(this_arg: bigint, channel_value_satoshis: bigint, params: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19178,7 +19185,7 @@ export function KeysManager_derive_channel_keys(this_arg: number, channel_value_ } // MUST_USE_RES struct LDKCResult_TransactionNoneZ KeysManager_spend_spendable_outputs(const struct LDKKeysManager *NONNULL_PTR this_arg, struct LDKCVec_SpendableOutputDescriptorZ descriptors, struct LDKCVec_TxOutZ outputs, struct LDKCVec_u8Z change_destination_script, uint32_t feerate_sat_per_1000_weight); /* @internal */ -export function KeysManager_spend_spendable_outputs(this_arg: number, descriptors: number, outputs: number, change_destination_script: number, feerate_sat_per_1000_weight: number): number { +export function KeysManager_spend_spendable_outputs(this_arg: bigint, descriptors: number, outputs: number, change_destination_script: number, feerate_sat_per_1000_weight: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19187,7 +19194,7 @@ export function KeysManager_spend_spendable_outputs(this_arg: number, descriptor } // struct LDKKeysInterface KeysManager_as_KeysInterface(const struct LDKKeysManager *NONNULL_PTR this_arg); /* @internal */ -export function KeysManager_as_KeysInterface(this_arg: number): number { +export function KeysManager_as_KeysInterface(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19196,7 +19203,7 @@ export function KeysManager_as_KeysInterface(this_arg: number): number { } // void PhantomKeysManager_free(struct LDKPhantomKeysManager this_obj); /* @internal */ -export function PhantomKeysManager_free(this_obj: number): void { +export function PhantomKeysManager_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19205,7 +19212,7 @@ export function PhantomKeysManager_free(this_obj: number): void { } // struct LDKKeysInterface PhantomKeysManager_as_KeysInterface(const struct LDKPhantomKeysManager *NONNULL_PTR this_arg); /* @internal */ -export function PhantomKeysManager_as_KeysInterface(this_arg: number): number { +export function PhantomKeysManager_as_KeysInterface(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19214,7 +19221,7 @@ export function PhantomKeysManager_as_KeysInterface(this_arg: number): number { } // MUST_USE_RES struct LDKPhantomKeysManager PhantomKeysManager_new(const uint8_t (*seed)[32], uint64_t starting_time_secs, uint32_t starting_time_nanos, const uint8_t (*cross_node_seed)[32]); /* @internal */ -export function PhantomKeysManager_new(seed: number, starting_time_secs: bigint, starting_time_nanos: number, cross_node_seed: number): number { +export function PhantomKeysManager_new(seed: number, starting_time_secs: bigint, starting_time_nanos: number, cross_node_seed: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19223,7 +19230,7 @@ export function PhantomKeysManager_new(seed: number, starting_time_secs: bigint, } // MUST_USE_RES struct LDKCResult_TransactionNoneZ PhantomKeysManager_spend_spendable_outputs(const struct LDKPhantomKeysManager *NONNULL_PTR this_arg, struct LDKCVec_SpendableOutputDescriptorZ descriptors, struct LDKCVec_TxOutZ outputs, struct LDKCVec_u8Z change_destination_script, uint32_t feerate_sat_per_1000_weight); /* @internal */ -export function PhantomKeysManager_spend_spendable_outputs(this_arg: number, descriptors: number, outputs: number, change_destination_script: number, feerate_sat_per_1000_weight: number): number { +export function PhantomKeysManager_spend_spendable_outputs(this_arg: bigint, descriptors: number, outputs: number, change_destination_script: number, feerate_sat_per_1000_weight: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19232,7 +19239,7 @@ export function PhantomKeysManager_spend_spendable_outputs(this_arg: number, des } // MUST_USE_RES struct LDKInMemorySigner PhantomKeysManager_derive_channel_keys(const struct LDKPhantomKeysManager *NONNULL_PTR this_arg, uint64_t channel_value_satoshis, const uint8_t (*params)[32]); /* @internal */ -export function PhantomKeysManager_derive_channel_keys(this_arg: number, channel_value_satoshis: bigint, params: number): number { +export function PhantomKeysManager_derive_channel_keys(this_arg: bigint, channel_value_satoshis: bigint, params: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19241,7 +19248,7 @@ export function PhantomKeysManager_derive_channel_keys(this_arg: number, channel } // void ChannelManager_free(struct LDKChannelManager this_obj); /* @internal */ -export function ChannelManager_free(this_obj: number): void { +export function ChannelManager_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19250,7 +19257,7 @@ export function ChannelManager_free(this_obj: number): void { } // void ChainParameters_free(struct LDKChainParameters this_obj); /* @internal */ -export function ChainParameters_free(this_obj: number): void { +export function ChainParameters_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19259,7 +19266,7 @@ export function ChainParameters_free(this_obj: number): void { } // enum LDKNetwork ChainParameters_get_network(const struct LDKChainParameters *NONNULL_PTR this_ptr); /* @internal */ -export function ChainParameters_get_network(this_ptr: number): Network { +export function ChainParameters_get_network(this_ptr: bigint): Network { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19268,7 +19275,7 @@ export function ChainParameters_get_network(this_ptr: number): Network { } // void ChainParameters_set_network(struct LDKChainParameters *NONNULL_PTR this_ptr, enum LDKNetwork val); /* @internal */ -export function ChainParameters_set_network(this_ptr: number, val: Network): void { +export function ChainParameters_set_network(this_ptr: bigint, val: Network): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19277,7 +19284,7 @@ export function ChainParameters_set_network(this_ptr: number, val: Network): voi } // struct LDKBestBlock ChainParameters_get_best_block(const struct LDKChainParameters *NONNULL_PTR this_ptr); /* @internal */ -export function ChainParameters_get_best_block(this_ptr: number): number { +export function ChainParameters_get_best_block(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19286,7 +19293,7 @@ export function ChainParameters_get_best_block(this_ptr: number): number { } // void ChainParameters_set_best_block(struct LDKChainParameters *NONNULL_PTR this_ptr, struct LDKBestBlock val); /* @internal */ -export function ChainParameters_set_best_block(this_ptr: number, val: number): void { +export function ChainParameters_set_best_block(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19295,16 +19302,16 @@ export function ChainParameters_set_best_block(this_ptr: number, val: number): v } // MUST_USE_RES struct LDKChainParameters ChainParameters_new(enum LDKNetwork network_arg, struct LDKBestBlock best_block_arg); /* @internal */ -export function ChainParameters_new(network_arg: Network, best_block_arg: number): number { +export function ChainParameters_new(network_arg: Network, best_block_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_ChainParameters_new(network_arg, best_block_arg); return nativeResponseValue; } - // uintptr_t ChainParameters_clone_ptr(LDKChainParameters *NONNULL_PTR arg); + // uint64_t ChainParameters_clone_ptr(LDKChainParameters *NONNULL_PTR arg); /* @internal */ -export function ChainParameters_clone_ptr(arg: number): number { +export function ChainParameters_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19313,7 +19320,7 @@ export function ChainParameters_clone_ptr(arg: number): number { } // struct LDKChainParameters ChainParameters_clone(const struct LDKChainParameters *NONNULL_PTR orig); /* @internal */ -export function ChainParameters_clone(orig: number): number { +export function ChainParameters_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19322,7 +19329,7 @@ export function ChainParameters_clone(orig: number): number { } // void CounterpartyForwardingInfo_free(struct LDKCounterpartyForwardingInfo this_obj); /* @internal */ -export function CounterpartyForwardingInfo_free(this_obj: number): void { +export function CounterpartyForwardingInfo_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19331,7 +19338,7 @@ export function CounterpartyForwardingInfo_free(this_obj: number): void { } // uint32_t CounterpartyForwardingInfo_get_fee_base_msat(const struct LDKCounterpartyForwardingInfo *NONNULL_PTR this_ptr); /* @internal */ -export function CounterpartyForwardingInfo_get_fee_base_msat(this_ptr: number): number { +export function CounterpartyForwardingInfo_get_fee_base_msat(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19340,7 +19347,7 @@ export function CounterpartyForwardingInfo_get_fee_base_msat(this_ptr: number): } // void CounterpartyForwardingInfo_set_fee_base_msat(struct LDKCounterpartyForwardingInfo *NONNULL_PTR this_ptr, uint32_t val); /* @internal */ -export function CounterpartyForwardingInfo_set_fee_base_msat(this_ptr: number, val: number): void { +export function CounterpartyForwardingInfo_set_fee_base_msat(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19349,7 +19356,7 @@ export function CounterpartyForwardingInfo_set_fee_base_msat(this_ptr: number, v } // uint32_t CounterpartyForwardingInfo_get_fee_proportional_millionths(const struct LDKCounterpartyForwardingInfo *NONNULL_PTR this_ptr); /* @internal */ -export function CounterpartyForwardingInfo_get_fee_proportional_millionths(this_ptr: number): number { +export function CounterpartyForwardingInfo_get_fee_proportional_millionths(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19358,7 +19365,7 @@ export function CounterpartyForwardingInfo_get_fee_proportional_millionths(this_ } // void CounterpartyForwardingInfo_set_fee_proportional_millionths(struct LDKCounterpartyForwardingInfo *NONNULL_PTR this_ptr, uint32_t val); /* @internal */ -export function CounterpartyForwardingInfo_set_fee_proportional_millionths(this_ptr: number, val: number): void { +export function CounterpartyForwardingInfo_set_fee_proportional_millionths(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19367,7 +19374,7 @@ export function CounterpartyForwardingInfo_set_fee_proportional_millionths(this_ } // uint16_t CounterpartyForwardingInfo_get_cltv_expiry_delta(const struct LDKCounterpartyForwardingInfo *NONNULL_PTR this_ptr); /* @internal */ -export function CounterpartyForwardingInfo_get_cltv_expiry_delta(this_ptr: number): number { +export function CounterpartyForwardingInfo_get_cltv_expiry_delta(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19376,7 +19383,7 @@ export function CounterpartyForwardingInfo_get_cltv_expiry_delta(this_ptr: numbe } // void CounterpartyForwardingInfo_set_cltv_expiry_delta(struct LDKCounterpartyForwardingInfo *NONNULL_PTR this_ptr, uint16_t val); /* @internal */ -export function CounterpartyForwardingInfo_set_cltv_expiry_delta(this_ptr: number, val: number): void { +export function CounterpartyForwardingInfo_set_cltv_expiry_delta(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19385,16 +19392,16 @@ export function CounterpartyForwardingInfo_set_cltv_expiry_delta(this_ptr: numbe } // MUST_USE_RES struct LDKCounterpartyForwardingInfo CounterpartyForwardingInfo_new(uint32_t fee_base_msat_arg, uint32_t fee_proportional_millionths_arg, uint16_t cltv_expiry_delta_arg); /* @internal */ -export function CounterpartyForwardingInfo_new(fee_base_msat_arg: number, fee_proportional_millionths_arg: number, cltv_expiry_delta_arg: number): number { +export function CounterpartyForwardingInfo_new(fee_base_msat_arg: number, fee_proportional_millionths_arg: number, cltv_expiry_delta_arg: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CounterpartyForwardingInfo_new(fee_base_msat_arg, fee_proportional_millionths_arg, cltv_expiry_delta_arg); return nativeResponseValue; } - // uintptr_t CounterpartyForwardingInfo_clone_ptr(LDKCounterpartyForwardingInfo *NONNULL_PTR arg); + // uint64_t CounterpartyForwardingInfo_clone_ptr(LDKCounterpartyForwardingInfo *NONNULL_PTR arg); /* @internal */ -export function CounterpartyForwardingInfo_clone_ptr(arg: number): number { +export function CounterpartyForwardingInfo_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19403,7 +19410,7 @@ export function CounterpartyForwardingInfo_clone_ptr(arg: number): number { } // struct LDKCounterpartyForwardingInfo CounterpartyForwardingInfo_clone(const struct LDKCounterpartyForwardingInfo *NONNULL_PTR orig); /* @internal */ -export function CounterpartyForwardingInfo_clone(orig: number): number { +export function CounterpartyForwardingInfo_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19412,7 +19419,7 @@ export function CounterpartyForwardingInfo_clone(orig: number): number { } // void ChannelCounterparty_free(struct LDKChannelCounterparty this_obj); /* @internal */ -export function ChannelCounterparty_free(this_obj: number): void { +export function ChannelCounterparty_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19421,7 +19428,7 @@ export function ChannelCounterparty_free(this_obj: number): void { } // struct LDKPublicKey ChannelCounterparty_get_node_id(const struct LDKChannelCounterparty *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelCounterparty_get_node_id(this_ptr: number): number { +export function ChannelCounterparty_get_node_id(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19430,7 +19437,7 @@ export function ChannelCounterparty_get_node_id(this_ptr: number): number { } // void ChannelCounterparty_set_node_id(struct LDKChannelCounterparty *NONNULL_PTR this_ptr, struct LDKPublicKey val); /* @internal */ -export function ChannelCounterparty_set_node_id(this_ptr: number, val: number): void { +export function ChannelCounterparty_set_node_id(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19439,7 +19446,7 @@ export function ChannelCounterparty_set_node_id(this_ptr: number, val: number): } // struct LDKInitFeatures ChannelCounterparty_get_features(const struct LDKChannelCounterparty *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelCounterparty_get_features(this_ptr: number): number { +export function ChannelCounterparty_get_features(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19448,7 +19455,7 @@ export function ChannelCounterparty_get_features(this_ptr: number): number { } // void ChannelCounterparty_set_features(struct LDKChannelCounterparty *NONNULL_PTR this_ptr, struct LDKInitFeatures val); /* @internal */ -export function ChannelCounterparty_set_features(this_ptr: number, val: number): void { +export function ChannelCounterparty_set_features(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19457,7 +19464,7 @@ export function ChannelCounterparty_set_features(this_ptr: number, val: number): } // uint64_t ChannelCounterparty_get_unspendable_punishment_reserve(const struct LDKChannelCounterparty *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelCounterparty_get_unspendable_punishment_reserve(this_ptr: number): bigint { +export function ChannelCounterparty_get_unspendable_punishment_reserve(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19466,7 +19473,7 @@ export function ChannelCounterparty_get_unspendable_punishment_reserve(this_ptr: } // void ChannelCounterparty_set_unspendable_punishment_reserve(struct LDKChannelCounterparty *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function ChannelCounterparty_set_unspendable_punishment_reserve(this_ptr: number, val: bigint): void { +export function ChannelCounterparty_set_unspendable_punishment_reserve(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19475,7 +19482,7 @@ export function ChannelCounterparty_set_unspendable_punishment_reserve(this_ptr: } // struct LDKCounterpartyForwardingInfo ChannelCounterparty_get_forwarding_info(const struct LDKChannelCounterparty *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelCounterparty_get_forwarding_info(this_ptr: number): number { +export function ChannelCounterparty_get_forwarding_info(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19484,7 +19491,7 @@ export function ChannelCounterparty_get_forwarding_info(this_ptr: number): numbe } // void ChannelCounterparty_set_forwarding_info(struct LDKChannelCounterparty *NONNULL_PTR this_ptr, struct LDKCounterpartyForwardingInfo val); /* @internal */ -export function ChannelCounterparty_set_forwarding_info(this_ptr: number, val: number): void { +export function ChannelCounterparty_set_forwarding_info(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19493,7 +19500,7 @@ export function ChannelCounterparty_set_forwarding_info(this_ptr: number, val: n } // struct LDKCOption_u64Z ChannelCounterparty_get_outbound_htlc_minimum_msat(const struct LDKChannelCounterparty *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelCounterparty_get_outbound_htlc_minimum_msat(this_ptr: number): number { +export function ChannelCounterparty_get_outbound_htlc_minimum_msat(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19502,7 +19509,7 @@ export function ChannelCounterparty_get_outbound_htlc_minimum_msat(this_ptr: num } // void ChannelCounterparty_set_outbound_htlc_minimum_msat(struct LDKChannelCounterparty *NONNULL_PTR this_ptr, struct LDKCOption_u64Z val); /* @internal */ -export function ChannelCounterparty_set_outbound_htlc_minimum_msat(this_ptr: number, val: number): void { +export function ChannelCounterparty_set_outbound_htlc_minimum_msat(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19511,7 +19518,7 @@ export function ChannelCounterparty_set_outbound_htlc_minimum_msat(this_ptr: num } // struct LDKCOption_u64Z ChannelCounterparty_get_outbound_htlc_maximum_msat(const struct LDKChannelCounterparty *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelCounterparty_get_outbound_htlc_maximum_msat(this_ptr: number): number { +export function ChannelCounterparty_get_outbound_htlc_maximum_msat(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19520,7 +19527,7 @@ export function ChannelCounterparty_get_outbound_htlc_maximum_msat(this_ptr: num } // void ChannelCounterparty_set_outbound_htlc_maximum_msat(struct LDKChannelCounterparty *NONNULL_PTR this_ptr, struct LDKCOption_u64Z val); /* @internal */ -export function ChannelCounterparty_set_outbound_htlc_maximum_msat(this_ptr: number, val: number): void { +export function ChannelCounterparty_set_outbound_htlc_maximum_msat(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19529,16 +19536,16 @@ export function ChannelCounterparty_set_outbound_htlc_maximum_msat(this_ptr: num } // MUST_USE_RES struct LDKChannelCounterparty ChannelCounterparty_new(struct LDKPublicKey node_id_arg, struct LDKInitFeatures features_arg, uint64_t unspendable_punishment_reserve_arg, struct LDKCounterpartyForwardingInfo forwarding_info_arg, struct LDKCOption_u64Z outbound_htlc_minimum_msat_arg, struct LDKCOption_u64Z outbound_htlc_maximum_msat_arg); /* @internal */ -export function ChannelCounterparty_new(node_id_arg: number, features_arg: number, unspendable_punishment_reserve_arg: bigint, forwarding_info_arg: number, outbound_htlc_minimum_msat_arg: number, outbound_htlc_maximum_msat_arg: number): number { +export function ChannelCounterparty_new(node_id_arg: number, features_arg: bigint, unspendable_punishment_reserve_arg: bigint, forwarding_info_arg: bigint, outbound_htlc_minimum_msat_arg: bigint, outbound_htlc_maximum_msat_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_ChannelCounterparty_new(node_id_arg, features_arg, unspendable_punishment_reserve_arg, forwarding_info_arg, outbound_htlc_minimum_msat_arg, outbound_htlc_maximum_msat_arg); return nativeResponseValue; } - // uintptr_t ChannelCounterparty_clone_ptr(LDKChannelCounterparty *NONNULL_PTR arg); + // uint64_t ChannelCounterparty_clone_ptr(LDKChannelCounterparty *NONNULL_PTR arg); /* @internal */ -export function ChannelCounterparty_clone_ptr(arg: number): number { +export function ChannelCounterparty_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19547,7 +19554,7 @@ export function ChannelCounterparty_clone_ptr(arg: number): number { } // struct LDKChannelCounterparty ChannelCounterparty_clone(const struct LDKChannelCounterparty *NONNULL_PTR orig); /* @internal */ -export function ChannelCounterparty_clone(orig: number): number { +export function ChannelCounterparty_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19556,7 +19563,7 @@ export function ChannelCounterparty_clone(orig: number): number { } // void ChannelDetails_free(struct LDKChannelDetails this_obj); /* @internal */ -export function ChannelDetails_free(this_obj: number): void { +export function ChannelDetails_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19565,7 +19572,7 @@ export function ChannelDetails_free(this_obj: number): void { } // const uint8_t (*ChannelDetails_get_channel_id(const struct LDKChannelDetails *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function ChannelDetails_get_channel_id(this_ptr: number): number { +export function ChannelDetails_get_channel_id(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19574,7 +19581,7 @@ export function ChannelDetails_get_channel_id(this_ptr: number): number { } // void ChannelDetails_set_channel_id(struct LDKChannelDetails *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function ChannelDetails_set_channel_id(this_ptr: number, val: number): void { +export function ChannelDetails_set_channel_id(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19583,7 +19590,7 @@ export function ChannelDetails_set_channel_id(this_ptr: number, val: number): vo } // struct LDKChannelCounterparty ChannelDetails_get_counterparty(const struct LDKChannelDetails *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelDetails_get_counterparty(this_ptr: number): number { +export function ChannelDetails_get_counterparty(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19592,7 +19599,7 @@ export function ChannelDetails_get_counterparty(this_ptr: number): number { } // void ChannelDetails_set_counterparty(struct LDKChannelDetails *NONNULL_PTR this_ptr, struct LDKChannelCounterparty val); /* @internal */ -export function ChannelDetails_set_counterparty(this_ptr: number, val: number): void { +export function ChannelDetails_set_counterparty(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19601,7 +19608,7 @@ export function ChannelDetails_set_counterparty(this_ptr: number, val: number): } // struct LDKOutPoint ChannelDetails_get_funding_txo(const struct LDKChannelDetails *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelDetails_get_funding_txo(this_ptr: number): number { +export function ChannelDetails_get_funding_txo(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19610,7 +19617,7 @@ export function ChannelDetails_get_funding_txo(this_ptr: number): number { } // void ChannelDetails_set_funding_txo(struct LDKChannelDetails *NONNULL_PTR this_ptr, struct LDKOutPoint val); /* @internal */ -export function ChannelDetails_set_funding_txo(this_ptr: number, val: number): void { +export function ChannelDetails_set_funding_txo(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19619,7 +19626,7 @@ export function ChannelDetails_set_funding_txo(this_ptr: number, val: number): v } // struct LDKChannelTypeFeatures ChannelDetails_get_channel_type(const struct LDKChannelDetails *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelDetails_get_channel_type(this_ptr: number): number { +export function ChannelDetails_get_channel_type(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19628,7 +19635,7 @@ export function ChannelDetails_get_channel_type(this_ptr: number): number { } // void ChannelDetails_set_channel_type(struct LDKChannelDetails *NONNULL_PTR this_ptr, struct LDKChannelTypeFeatures val); /* @internal */ -export function ChannelDetails_set_channel_type(this_ptr: number, val: number): void { +export function ChannelDetails_set_channel_type(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19637,7 +19644,7 @@ export function ChannelDetails_set_channel_type(this_ptr: number, val: number): } // struct LDKCOption_u64Z ChannelDetails_get_short_channel_id(const struct LDKChannelDetails *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelDetails_get_short_channel_id(this_ptr: number): number { +export function ChannelDetails_get_short_channel_id(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19646,7 +19653,7 @@ export function ChannelDetails_get_short_channel_id(this_ptr: number): number { } // void ChannelDetails_set_short_channel_id(struct LDKChannelDetails *NONNULL_PTR this_ptr, struct LDKCOption_u64Z val); /* @internal */ -export function ChannelDetails_set_short_channel_id(this_ptr: number, val: number): void { +export function ChannelDetails_set_short_channel_id(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19655,7 +19662,7 @@ export function ChannelDetails_set_short_channel_id(this_ptr: number, val: numbe } // struct LDKCOption_u64Z ChannelDetails_get_outbound_scid_alias(const struct LDKChannelDetails *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelDetails_get_outbound_scid_alias(this_ptr: number): number { +export function ChannelDetails_get_outbound_scid_alias(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19664,7 +19671,7 @@ export function ChannelDetails_get_outbound_scid_alias(this_ptr: number): number } // void ChannelDetails_set_outbound_scid_alias(struct LDKChannelDetails *NONNULL_PTR this_ptr, struct LDKCOption_u64Z val); /* @internal */ -export function ChannelDetails_set_outbound_scid_alias(this_ptr: number, val: number): void { +export function ChannelDetails_set_outbound_scid_alias(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19673,7 +19680,7 @@ export function ChannelDetails_set_outbound_scid_alias(this_ptr: number, val: nu } // struct LDKCOption_u64Z ChannelDetails_get_inbound_scid_alias(const struct LDKChannelDetails *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelDetails_get_inbound_scid_alias(this_ptr: number): number { +export function ChannelDetails_get_inbound_scid_alias(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19682,7 +19689,7 @@ export function ChannelDetails_get_inbound_scid_alias(this_ptr: number): number } // void ChannelDetails_set_inbound_scid_alias(struct LDKChannelDetails *NONNULL_PTR this_ptr, struct LDKCOption_u64Z val); /* @internal */ -export function ChannelDetails_set_inbound_scid_alias(this_ptr: number, val: number): void { +export function ChannelDetails_set_inbound_scid_alias(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19691,7 +19698,7 @@ export function ChannelDetails_set_inbound_scid_alias(this_ptr: number, val: num } // uint64_t ChannelDetails_get_channel_value_satoshis(const struct LDKChannelDetails *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelDetails_get_channel_value_satoshis(this_ptr: number): bigint { +export function ChannelDetails_get_channel_value_satoshis(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19700,7 +19707,7 @@ export function ChannelDetails_get_channel_value_satoshis(this_ptr: number): big } // void ChannelDetails_set_channel_value_satoshis(struct LDKChannelDetails *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function ChannelDetails_set_channel_value_satoshis(this_ptr: number, val: bigint): void { +export function ChannelDetails_set_channel_value_satoshis(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19709,7 +19716,7 @@ export function ChannelDetails_set_channel_value_satoshis(this_ptr: number, val: } // struct LDKCOption_u64Z ChannelDetails_get_unspendable_punishment_reserve(const struct LDKChannelDetails *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelDetails_get_unspendable_punishment_reserve(this_ptr: number): number { +export function ChannelDetails_get_unspendable_punishment_reserve(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19718,7 +19725,7 @@ export function ChannelDetails_get_unspendable_punishment_reserve(this_ptr: numb } // void ChannelDetails_set_unspendable_punishment_reserve(struct LDKChannelDetails *NONNULL_PTR this_ptr, struct LDKCOption_u64Z val); /* @internal */ -export function ChannelDetails_set_unspendable_punishment_reserve(this_ptr: number, val: number): void { +export function ChannelDetails_set_unspendable_punishment_reserve(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19727,7 +19734,7 @@ export function ChannelDetails_set_unspendable_punishment_reserve(this_ptr: numb } // uint64_t ChannelDetails_get_user_channel_id(const struct LDKChannelDetails *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelDetails_get_user_channel_id(this_ptr: number): bigint { +export function ChannelDetails_get_user_channel_id(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19736,7 +19743,7 @@ export function ChannelDetails_get_user_channel_id(this_ptr: number): bigint { } // void ChannelDetails_set_user_channel_id(struct LDKChannelDetails *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function ChannelDetails_set_user_channel_id(this_ptr: number, val: bigint): void { +export function ChannelDetails_set_user_channel_id(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19745,7 +19752,7 @@ export function ChannelDetails_set_user_channel_id(this_ptr: number, val: bigint } // uint64_t ChannelDetails_get_balance_msat(const struct LDKChannelDetails *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelDetails_get_balance_msat(this_ptr: number): bigint { +export function ChannelDetails_get_balance_msat(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19754,7 +19761,7 @@ export function ChannelDetails_get_balance_msat(this_ptr: number): bigint { } // void ChannelDetails_set_balance_msat(struct LDKChannelDetails *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function ChannelDetails_set_balance_msat(this_ptr: number, val: bigint): void { +export function ChannelDetails_set_balance_msat(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19763,7 +19770,7 @@ export function ChannelDetails_set_balance_msat(this_ptr: number, val: bigint): } // uint64_t ChannelDetails_get_outbound_capacity_msat(const struct LDKChannelDetails *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelDetails_get_outbound_capacity_msat(this_ptr: number): bigint { +export function ChannelDetails_get_outbound_capacity_msat(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19772,7 +19779,7 @@ export function ChannelDetails_get_outbound_capacity_msat(this_ptr: number): big } // void ChannelDetails_set_outbound_capacity_msat(struct LDKChannelDetails *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function ChannelDetails_set_outbound_capacity_msat(this_ptr: number, val: bigint): void { +export function ChannelDetails_set_outbound_capacity_msat(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19781,7 +19788,7 @@ export function ChannelDetails_set_outbound_capacity_msat(this_ptr: number, val: } // uint64_t ChannelDetails_get_next_outbound_htlc_limit_msat(const struct LDKChannelDetails *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelDetails_get_next_outbound_htlc_limit_msat(this_ptr: number): bigint { +export function ChannelDetails_get_next_outbound_htlc_limit_msat(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19790,7 +19797,7 @@ export function ChannelDetails_get_next_outbound_htlc_limit_msat(this_ptr: numbe } // void ChannelDetails_set_next_outbound_htlc_limit_msat(struct LDKChannelDetails *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function ChannelDetails_set_next_outbound_htlc_limit_msat(this_ptr: number, val: bigint): void { +export function ChannelDetails_set_next_outbound_htlc_limit_msat(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19799,7 +19806,7 @@ export function ChannelDetails_set_next_outbound_htlc_limit_msat(this_ptr: numbe } // uint64_t ChannelDetails_get_inbound_capacity_msat(const struct LDKChannelDetails *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelDetails_get_inbound_capacity_msat(this_ptr: number): bigint { +export function ChannelDetails_get_inbound_capacity_msat(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19808,7 +19815,7 @@ export function ChannelDetails_get_inbound_capacity_msat(this_ptr: number): bigi } // void ChannelDetails_set_inbound_capacity_msat(struct LDKChannelDetails *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function ChannelDetails_set_inbound_capacity_msat(this_ptr: number, val: bigint): void { +export function ChannelDetails_set_inbound_capacity_msat(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19817,7 +19824,7 @@ export function ChannelDetails_set_inbound_capacity_msat(this_ptr: number, val: } // struct LDKCOption_u32Z ChannelDetails_get_confirmations_required(const struct LDKChannelDetails *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelDetails_get_confirmations_required(this_ptr: number): number { +export function ChannelDetails_get_confirmations_required(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19826,7 +19833,7 @@ export function ChannelDetails_get_confirmations_required(this_ptr: number): num } // void ChannelDetails_set_confirmations_required(struct LDKChannelDetails *NONNULL_PTR this_ptr, struct LDKCOption_u32Z val); /* @internal */ -export function ChannelDetails_set_confirmations_required(this_ptr: number, val: number): void { +export function ChannelDetails_set_confirmations_required(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19835,7 +19842,7 @@ export function ChannelDetails_set_confirmations_required(this_ptr: number, val: } // struct LDKCOption_u16Z ChannelDetails_get_force_close_spend_delay(const struct LDKChannelDetails *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelDetails_get_force_close_spend_delay(this_ptr: number): number { +export function ChannelDetails_get_force_close_spend_delay(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19844,7 +19851,7 @@ export function ChannelDetails_get_force_close_spend_delay(this_ptr: number): nu } // void ChannelDetails_set_force_close_spend_delay(struct LDKChannelDetails *NONNULL_PTR this_ptr, struct LDKCOption_u16Z val); /* @internal */ -export function ChannelDetails_set_force_close_spend_delay(this_ptr: number, val: number): void { +export function ChannelDetails_set_force_close_spend_delay(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19853,7 +19860,7 @@ export function ChannelDetails_set_force_close_spend_delay(this_ptr: number, val } // bool ChannelDetails_get_is_outbound(const struct LDKChannelDetails *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelDetails_get_is_outbound(this_ptr: number): boolean { +export function ChannelDetails_get_is_outbound(this_ptr: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19862,7 +19869,7 @@ export function ChannelDetails_get_is_outbound(this_ptr: number): boolean { } // void ChannelDetails_set_is_outbound(struct LDKChannelDetails *NONNULL_PTR this_ptr, bool val); /* @internal */ -export function ChannelDetails_set_is_outbound(this_ptr: number, val: boolean): void { +export function ChannelDetails_set_is_outbound(this_ptr: bigint, val: boolean): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19871,7 +19878,7 @@ export function ChannelDetails_set_is_outbound(this_ptr: number, val: boolean): } // bool ChannelDetails_get_is_channel_ready(const struct LDKChannelDetails *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelDetails_get_is_channel_ready(this_ptr: number): boolean { +export function ChannelDetails_get_is_channel_ready(this_ptr: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19880,7 +19887,7 @@ export function ChannelDetails_get_is_channel_ready(this_ptr: number): boolean { } // void ChannelDetails_set_is_channel_ready(struct LDKChannelDetails *NONNULL_PTR this_ptr, bool val); /* @internal */ -export function ChannelDetails_set_is_channel_ready(this_ptr: number, val: boolean): void { +export function ChannelDetails_set_is_channel_ready(this_ptr: bigint, val: boolean): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19889,7 +19896,7 @@ export function ChannelDetails_set_is_channel_ready(this_ptr: number, val: boole } // bool ChannelDetails_get_is_usable(const struct LDKChannelDetails *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelDetails_get_is_usable(this_ptr: number): boolean { +export function ChannelDetails_get_is_usable(this_ptr: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19898,7 +19905,7 @@ export function ChannelDetails_get_is_usable(this_ptr: number): boolean { } // void ChannelDetails_set_is_usable(struct LDKChannelDetails *NONNULL_PTR this_ptr, bool val); /* @internal */ -export function ChannelDetails_set_is_usable(this_ptr: number, val: boolean): void { +export function ChannelDetails_set_is_usable(this_ptr: bigint, val: boolean): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19907,7 +19914,7 @@ export function ChannelDetails_set_is_usable(this_ptr: number, val: boolean): vo } // bool ChannelDetails_get_is_public(const struct LDKChannelDetails *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelDetails_get_is_public(this_ptr: number): boolean { +export function ChannelDetails_get_is_public(this_ptr: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19916,7 +19923,7 @@ export function ChannelDetails_get_is_public(this_ptr: number): boolean { } // void ChannelDetails_set_is_public(struct LDKChannelDetails *NONNULL_PTR this_ptr, bool val); /* @internal */ -export function ChannelDetails_set_is_public(this_ptr: number, val: boolean): void { +export function ChannelDetails_set_is_public(this_ptr: bigint, val: boolean): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19925,7 +19932,7 @@ export function ChannelDetails_set_is_public(this_ptr: number, val: boolean): vo } // struct LDKCOption_u64Z ChannelDetails_get_inbound_htlc_minimum_msat(const struct LDKChannelDetails *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelDetails_get_inbound_htlc_minimum_msat(this_ptr: number): number { +export function ChannelDetails_get_inbound_htlc_minimum_msat(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19934,7 +19941,7 @@ export function ChannelDetails_get_inbound_htlc_minimum_msat(this_ptr: number): } // void ChannelDetails_set_inbound_htlc_minimum_msat(struct LDKChannelDetails *NONNULL_PTR this_ptr, struct LDKCOption_u64Z val); /* @internal */ -export function ChannelDetails_set_inbound_htlc_minimum_msat(this_ptr: number, val: number): void { +export function ChannelDetails_set_inbound_htlc_minimum_msat(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19943,7 +19950,7 @@ export function ChannelDetails_set_inbound_htlc_minimum_msat(this_ptr: number, v } // struct LDKCOption_u64Z ChannelDetails_get_inbound_htlc_maximum_msat(const struct LDKChannelDetails *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelDetails_get_inbound_htlc_maximum_msat(this_ptr: number): number { +export function ChannelDetails_get_inbound_htlc_maximum_msat(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19952,7 +19959,7 @@ export function ChannelDetails_get_inbound_htlc_maximum_msat(this_ptr: number): } // void ChannelDetails_set_inbound_htlc_maximum_msat(struct LDKChannelDetails *NONNULL_PTR this_ptr, struct LDKCOption_u64Z val); /* @internal */ -export function ChannelDetails_set_inbound_htlc_maximum_msat(this_ptr: number, val: number): void { +export function ChannelDetails_set_inbound_htlc_maximum_msat(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19961,7 +19968,7 @@ export function ChannelDetails_set_inbound_htlc_maximum_msat(this_ptr: number, v } // struct LDKChannelConfig ChannelDetails_get_config(const struct LDKChannelDetails *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelDetails_get_config(this_ptr: number): number { +export function ChannelDetails_get_config(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19970,7 +19977,7 @@ export function ChannelDetails_get_config(this_ptr: number): number { } // void ChannelDetails_set_config(struct LDKChannelDetails *NONNULL_PTR this_ptr, struct LDKChannelConfig val); /* @internal */ -export function ChannelDetails_set_config(this_ptr: number, val: number): void { +export function ChannelDetails_set_config(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19979,16 +19986,16 @@ export function ChannelDetails_set_config(this_ptr: number, val: number): void { } // MUST_USE_RES struct LDKChannelDetails ChannelDetails_new(struct LDKThirtyTwoBytes channel_id_arg, struct LDKChannelCounterparty counterparty_arg, struct LDKOutPoint funding_txo_arg, struct LDKChannelTypeFeatures channel_type_arg, struct LDKCOption_u64Z short_channel_id_arg, struct LDKCOption_u64Z outbound_scid_alias_arg, struct LDKCOption_u64Z inbound_scid_alias_arg, uint64_t channel_value_satoshis_arg, struct LDKCOption_u64Z unspendable_punishment_reserve_arg, uint64_t user_channel_id_arg, uint64_t balance_msat_arg, uint64_t outbound_capacity_msat_arg, uint64_t next_outbound_htlc_limit_msat_arg, uint64_t inbound_capacity_msat_arg, struct LDKCOption_u32Z confirmations_required_arg, struct LDKCOption_u16Z force_close_spend_delay_arg, bool is_outbound_arg, bool is_channel_ready_arg, bool is_usable_arg, bool is_public_arg, struct LDKCOption_u64Z inbound_htlc_minimum_msat_arg, struct LDKCOption_u64Z inbound_htlc_maximum_msat_arg, struct LDKChannelConfig config_arg); /* @internal */ -export function ChannelDetails_new(channel_id_arg: number, counterparty_arg: number, funding_txo_arg: number, channel_type_arg: number, short_channel_id_arg: number, outbound_scid_alias_arg: number, inbound_scid_alias_arg: number, channel_value_satoshis_arg: bigint, unspendable_punishment_reserve_arg: number, user_channel_id_arg: bigint, balance_msat_arg: bigint, outbound_capacity_msat_arg: bigint, next_outbound_htlc_limit_msat_arg: bigint, inbound_capacity_msat_arg: bigint, confirmations_required_arg: number, force_close_spend_delay_arg: number, is_outbound_arg: boolean, is_channel_ready_arg: boolean, is_usable_arg: boolean, is_public_arg: boolean, inbound_htlc_minimum_msat_arg: number, inbound_htlc_maximum_msat_arg: number, config_arg: number): number { +export function ChannelDetails_new(channel_id_arg: number, counterparty_arg: bigint, funding_txo_arg: bigint, channel_type_arg: bigint, short_channel_id_arg: bigint, outbound_scid_alias_arg: bigint, inbound_scid_alias_arg: bigint, channel_value_satoshis_arg: bigint, unspendable_punishment_reserve_arg: bigint, user_channel_id_arg: bigint, balance_msat_arg: bigint, outbound_capacity_msat_arg: bigint, next_outbound_htlc_limit_msat_arg: bigint, inbound_capacity_msat_arg: bigint, confirmations_required_arg: bigint, force_close_spend_delay_arg: bigint, is_outbound_arg: boolean, is_channel_ready_arg: boolean, is_usable_arg: boolean, is_public_arg: boolean, inbound_htlc_minimum_msat_arg: bigint, inbound_htlc_maximum_msat_arg: bigint, config_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_ChannelDetails_new(channel_id_arg, counterparty_arg, funding_txo_arg, channel_type_arg, short_channel_id_arg, outbound_scid_alias_arg, inbound_scid_alias_arg, channel_value_satoshis_arg, unspendable_punishment_reserve_arg, user_channel_id_arg, balance_msat_arg, outbound_capacity_msat_arg, next_outbound_htlc_limit_msat_arg, inbound_capacity_msat_arg, confirmations_required_arg, force_close_spend_delay_arg, is_outbound_arg, is_channel_ready_arg, is_usable_arg, is_public_arg, inbound_htlc_minimum_msat_arg, inbound_htlc_maximum_msat_arg, config_arg); return nativeResponseValue; } - // uintptr_t ChannelDetails_clone_ptr(LDKChannelDetails *NONNULL_PTR arg); + // uint64_t ChannelDetails_clone_ptr(LDKChannelDetails *NONNULL_PTR arg); /* @internal */ -export function ChannelDetails_clone_ptr(arg: number): number { +export function ChannelDetails_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -19997,7 +20004,7 @@ export function ChannelDetails_clone_ptr(arg: number): number { } // struct LDKChannelDetails ChannelDetails_clone(const struct LDKChannelDetails *NONNULL_PTR orig); /* @internal */ -export function ChannelDetails_clone(orig: number): number { +export function ChannelDetails_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20006,7 +20013,7 @@ export function ChannelDetails_clone(orig: number): number { } // MUST_USE_RES struct LDKCOption_u64Z ChannelDetails_get_inbound_payment_scid(const struct LDKChannelDetails *NONNULL_PTR this_arg); /* @internal */ -export function ChannelDetails_get_inbound_payment_scid(this_arg: number): number { +export function ChannelDetails_get_inbound_payment_scid(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20015,7 +20022,7 @@ export function ChannelDetails_get_inbound_payment_scid(this_arg: number): numbe } // MUST_USE_RES struct LDKCOption_u64Z ChannelDetails_get_outbound_payment_scid(const struct LDKChannelDetails *NONNULL_PTR this_arg); /* @internal */ -export function ChannelDetails_get_outbound_payment_scid(this_arg: number): number { +export function ChannelDetails_get_outbound_payment_scid(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20024,16 +20031,16 @@ export function ChannelDetails_get_outbound_payment_scid(this_arg: number): numb } // void PaymentSendFailure_free(struct LDKPaymentSendFailure this_ptr); /* @internal */ -export function PaymentSendFailure_free(this_ptr: number): void { +export function PaymentSendFailure_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_PaymentSendFailure_free(this_ptr); // debug statements here } - // uintptr_t PaymentSendFailure_clone_ptr(LDKPaymentSendFailure *NONNULL_PTR arg); + // uint64_t PaymentSendFailure_clone_ptr(LDKPaymentSendFailure *NONNULL_PTR arg); /* @internal */ -export function PaymentSendFailure_clone_ptr(arg: number): number { +export function PaymentSendFailure_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20042,7 +20049,7 @@ export function PaymentSendFailure_clone_ptr(arg: number): number { } // struct LDKPaymentSendFailure PaymentSendFailure_clone(const struct LDKPaymentSendFailure *NONNULL_PTR orig); /* @internal */ -export function PaymentSendFailure_clone(orig: number): number { +export function PaymentSendFailure_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20051,7 +20058,7 @@ export function PaymentSendFailure_clone(orig: number): number { } // struct LDKPaymentSendFailure PaymentSendFailure_parameter_error(struct LDKAPIError a); /* @internal */ -export function PaymentSendFailure_parameter_error(a: number): number { +export function PaymentSendFailure_parameter_error(a: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20060,7 +20067,7 @@ export function PaymentSendFailure_parameter_error(a: number): number { } // struct LDKPaymentSendFailure PaymentSendFailure_path_parameter_error(struct LDKCVec_CResult_NoneAPIErrorZZ a); /* @internal */ -export function PaymentSendFailure_path_parameter_error(a: number): number { +export function PaymentSendFailure_path_parameter_error(a: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20069,7 +20076,7 @@ export function PaymentSendFailure_path_parameter_error(a: number): number { } // struct LDKPaymentSendFailure PaymentSendFailure_all_failed_retry_safe(struct LDKCVec_APIErrorZ a); /* @internal */ -export function PaymentSendFailure_all_failed_retry_safe(a: number): number { +export function PaymentSendFailure_all_failed_retry_safe(a: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20078,7 +20085,7 @@ export function PaymentSendFailure_all_failed_retry_safe(a: number): number { } // struct LDKPaymentSendFailure PaymentSendFailure_partial_failure(struct LDKCVec_CResult_NoneAPIErrorZZ results, struct LDKRouteParameters failed_paths_retry, struct LDKThirtyTwoBytes payment_id); /* @internal */ -export function PaymentSendFailure_partial_failure(results: number, failed_paths_retry: number, payment_id: number): number { +export function PaymentSendFailure_partial_failure(results: number, failed_paths_retry: bigint, payment_id: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20087,7 +20094,7 @@ export function PaymentSendFailure_partial_failure(results: number, failed_paths } // void PhantomRouteHints_free(struct LDKPhantomRouteHints this_obj); /* @internal */ -export function PhantomRouteHints_free(this_obj: number): void { +export function PhantomRouteHints_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20096,7 +20103,7 @@ export function PhantomRouteHints_free(this_obj: number): void { } // struct LDKCVec_ChannelDetailsZ PhantomRouteHints_get_channels(const struct LDKPhantomRouteHints *NONNULL_PTR this_ptr); /* @internal */ -export function PhantomRouteHints_get_channels(this_ptr: number): number { +export function PhantomRouteHints_get_channels(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20105,7 +20112,7 @@ export function PhantomRouteHints_get_channels(this_ptr: number): number { } // void PhantomRouteHints_set_channels(struct LDKPhantomRouteHints *NONNULL_PTR this_ptr, struct LDKCVec_ChannelDetailsZ val); /* @internal */ -export function PhantomRouteHints_set_channels(this_ptr: number, val: number): void { +export function PhantomRouteHints_set_channels(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20114,7 +20121,7 @@ export function PhantomRouteHints_set_channels(this_ptr: number, val: number): v } // uint64_t PhantomRouteHints_get_phantom_scid(const struct LDKPhantomRouteHints *NONNULL_PTR this_ptr); /* @internal */ -export function PhantomRouteHints_get_phantom_scid(this_ptr: number): bigint { +export function PhantomRouteHints_get_phantom_scid(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20123,7 +20130,7 @@ export function PhantomRouteHints_get_phantom_scid(this_ptr: number): bigint { } // void PhantomRouteHints_set_phantom_scid(struct LDKPhantomRouteHints *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function PhantomRouteHints_set_phantom_scid(this_ptr: number, val: bigint): void { +export function PhantomRouteHints_set_phantom_scid(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20132,7 +20139,7 @@ export function PhantomRouteHints_set_phantom_scid(this_ptr: number, val: bigint } // struct LDKPublicKey PhantomRouteHints_get_real_node_pubkey(const struct LDKPhantomRouteHints *NONNULL_PTR this_ptr); /* @internal */ -export function PhantomRouteHints_get_real_node_pubkey(this_ptr: number): number { +export function PhantomRouteHints_get_real_node_pubkey(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20141,7 +20148,7 @@ export function PhantomRouteHints_get_real_node_pubkey(this_ptr: number): number } // void PhantomRouteHints_set_real_node_pubkey(struct LDKPhantomRouteHints *NONNULL_PTR this_ptr, struct LDKPublicKey val); /* @internal */ -export function PhantomRouteHints_set_real_node_pubkey(this_ptr: number, val: number): void { +export function PhantomRouteHints_set_real_node_pubkey(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20150,16 +20157,16 @@ export function PhantomRouteHints_set_real_node_pubkey(this_ptr: number, val: nu } // MUST_USE_RES struct LDKPhantomRouteHints PhantomRouteHints_new(struct LDKCVec_ChannelDetailsZ channels_arg, uint64_t phantom_scid_arg, struct LDKPublicKey real_node_pubkey_arg); /* @internal */ -export function PhantomRouteHints_new(channels_arg: number, phantom_scid_arg: bigint, real_node_pubkey_arg: number): number { +export function PhantomRouteHints_new(channels_arg: number, phantom_scid_arg: bigint, real_node_pubkey_arg: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_PhantomRouteHints_new(channels_arg, phantom_scid_arg, real_node_pubkey_arg); return nativeResponseValue; } - // uintptr_t PhantomRouteHints_clone_ptr(LDKPhantomRouteHints *NONNULL_PTR arg); + // uint64_t PhantomRouteHints_clone_ptr(LDKPhantomRouteHints *NONNULL_PTR arg); /* @internal */ -export function PhantomRouteHints_clone_ptr(arg: number): number { +export function PhantomRouteHints_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20168,7 +20175,7 @@ export function PhantomRouteHints_clone_ptr(arg: number): number { } // struct LDKPhantomRouteHints PhantomRouteHints_clone(const struct LDKPhantomRouteHints *NONNULL_PTR orig); /* @internal */ -export function PhantomRouteHints_clone(orig: number): number { +export function PhantomRouteHints_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20177,7 +20184,7 @@ export function PhantomRouteHints_clone(orig: number): number { } // MUST_USE_RES struct LDKChannelManager ChannelManager_new(struct LDKFeeEstimator fee_est, struct LDKWatch chain_monitor, struct LDKBroadcasterInterface tx_broadcaster, struct LDKLogger logger, struct LDKKeysInterface keys_manager, struct LDKUserConfig config, struct LDKChainParameters params); /* @internal */ -export function ChannelManager_new(fee_est: number, chain_monitor: number, tx_broadcaster: number, logger: number, keys_manager: number, config: number, params: number): number { +export function ChannelManager_new(fee_est: bigint, chain_monitor: bigint, tx_broadcaster: bigint, logger: bigint, keys_manager: bigint, config: bigint, params: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20186,7 +20193,7 @@ export function ChannelManager_new(fee_est: number, chain_monitor: number, tx_br } // MUST_USE_RES struct LDKUserConfig ChannelManager_get_current_default_configuration(const struct LDKChannelManager *NONNULL_PTR this_arg); /* @internal */ -export function ChannelManager_get_current_default_configuration(this_arg: number): number { +export function ChannelManager_get_current_default_configuration(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20195,7 +20202,7 @@ export function ChannelManager_get_current_default_configuration(this_arg: numbe } // MUST_USE_RES struct LDKCResult__u832APIErrorZ ChannelManager_create_channel(const struct LDKChannelManager *NONNULL_PTR this_arg, struct LDKPublicKey their_network_key, uint64_t channel_value_satoshis, uint64_t push_msat, uint64_t user_channel_id, struct LDKUserConfig override_config); /* @internal */ -export function ChannelManager_create_channel(this_arg: number, their_network_key: number, channel_value_satoshis: bigint, push_msat: bigint, user_channel_id: bigint, override_config: number): number { +export function ChannelManager_create_channel(this_arg: bigint, their_network_key: number, channel_value_satoshis: bigint, push_msat: bigint, user_channel_id: bigint, override_config: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20204,7 +20211,7 @@ export function ChannelManager_create_channel(this_arg: number, their_network_ke } // MUST_USE_RES struct LDKCVec_ChannelDetailsZ ChannelManager_list_channels(const struct LDKChannelManager *NONNULL_PTR this_arg); /* @internal */ -export function ChannelManager_list_channels(this_arg: number): number { +export function ChannelManager_list_channels(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20213,7 +20220,7 @@ export function ChannelManager_list_channels(this_arg: number): number { } // MUST_USE_RES struct LDKCVec_ChannelDetailsZ ChannelManager_list_usable_channels(const struct LDKChannelManager *NONNULL_PTR this_arg); /* @internal */ -export function ChannelManager_list_usable_channels(this_arg: number): number { +export function ChannelManager_list_usable_channels(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20222,7 +20229,7 @@ export function ChannelManager_list_usable_channels(this_arg: number): number { } // MUST_USE_RES struct LDKCResult_NoneAPIErrorZ ChannelManager_close_channel(const struct LDKChannelManager *NONNULL_PTR this_arg, const uint8_t (*channel_id)[32], struct LDKPublicKey counterparty_node_id); /* @internal */ -export function ChannelManager_close_channel(this_arg: number, channel_id: number, counterparty_node_id: number): number { +export function ChannelManager_close_channel(this_arg: bigint, channel_id: number, counterparty_node_id: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20231,7 +20238,7 @@ export function ChannelManager_close_channel(this_arg: number, channel_id: numbe } // MUST_USE_RES struct LDKCResult_NoneAPIErrorZ ChannelManager_close_channel_with_target_feerate(const struct LDKChannelManager *NONNULL_PTR this_arg, const uint8_t (*channel_id)[32], struct LDKPublicKey counterparty_node_id, uint32_t target_feerate_sats_per_1000_weight); /* @internal */ -export function ChannelManager_close_channel_with_target_feerate(this_arg: number, channel_id: number, counterparty_node_id: number, target_feerate_sats_per_1000_weight: number): number { +export function ChannelManager_close_channel_with_target_feerate(this_arg: bigint, channel_id: number, counterparty_node_id: number, target_feerate_sats_per_1000_weight: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20240,7 +20247,7 @@ export function ChannelManager_close_channel_with_target_feerate(this_arg: numbe } // MUST_USE_RES struct LDKCResult_NoneAPIErrorZ ChannelManager_force_close_broadcasting_latest_txn(const struct LDKChannelManager *NONNULL_PTR this_arg, const uint8_t (*channel_id)[32], struct LDKPublicKey counterparty_node_id); /* @internal */ -export function ChannelManager_force_close_broadcasting_latest_txn(this_arg: number, channel_id: number, counterparty_node_id: number): number { +export function ChannelManager_force_close_broadcasting_latest_txn(this_arg: bigint, channel_id: number, counterparty_node_id: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20249,7 +20256,7 @@ export function ChannelManager_force_close_broadcasting_latest_txn(this_arg: num } // MUST_USE_RES struct LDKCResult_NoneAPIErrorZ ChannelManager_force_close_without_broadcasting_txn(const struct LDKChannelManager *NONNULL_PTR this_arg, const uint8_t (*channel_id)[32], struct LDKPublicKey counterparty_node_id); /* @internal */ -export function ChannelManager_force_close_without_broadcasting_txn(this_arg: number, channel_id: number, counterparty_node_id: number): number { +export function ChannelManager_force_close_without_broadcasting_txn(this_arg: bigint, channel_id: number, counterparty_node_id: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20258,7 +20265,7 @@ export function ChannelManager_force_close_without_broadcasting_txn(this_arg: nu } // void ChannelManager_force_close_all_channels_broadcasting_latest_txn(const struct LDKChannelManager *NONNULL_PTR this_arg); /* @internal */ -export function ChannelManager_force_close_all_channels_broadcasting_latest_txn(this_arg: number): void { +export function ChannelManager_force_close_all_channels_broadcasting_latest_txn(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20267,7 +20274,7 @@ export function ChannelManager_force_close_all_channels_broadcasting_latest_txn( } // void ChannelManager_force_close_all_channels_without_broadcasting_txn(const struct LDKChannelManager *NONNULL_PTR this_arg); /* @internal */ -export function ChannelManager_force_close_all_channels_without_broadcasting_txn(this_arg: number): void { +export function ChannelManager_force_close_all_channels_without_broadcasting_txn(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20276,7 +20283,7 @@ export function ChannelManager_force_close_all_channels_without_broadcasting_txn } // MUST_USE_RES struct LDKCResult_PaymentIdPaymentSendFailureZ ChannelManager_send_payment(const struct LDKChannelManager *NONNULL_PTR this_arg, const struct LDKRoute *NONNULL_PTR route, struct LDKThirtyTwoBytes payment_hash, struct LDKThirtyTwoBytes payment_secret); /* @internal */ -export function ChannelManager_send_payment(this_arg: number, route: number, payment_hash: number, payment_secret: number): number { +export function ChannelManager_send_payment(this_arg: bigint, route: bigint, payment_hash: number, payment_secret: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20285,7 +20292,7 @@ export function ChannelManager_send_payment(this_arg: number, route: number, pay } // MUST_USE_RES struct LDKCResult_NonePaymentSendFailureZ ChannelManager_retry_payment(const struct LDKChannelManager *NONNULL_PTR this_arg, const struct LDKRoute *NONNULL_PTR route, struct LDKThirtyTwoBytes payment_id); /* @internal */ -export function ChannelManager_retry_payment(this_arg: number, route: number, payment_id: number): number { +export function ChannelManager_retry_payment(this_arg: bigint, route: bigint, payment_id: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20294,7 +20301,7 @@ export function ChannelManager_retry_payment(this_arg: number, route: number, pa } // void ChannelManager_abandon_payment(const struct LDKChannelManager *NONNULL_PTR this_arg, struct LDKThirtyTwoBytes payment_id); /* @internal */ -export function ChannelManager_abandon_payment(this_arg: number, payment_id: number): void { +export function ChannelManager_abandon_payment(this_arg: bigint, payment_id: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20303,7 +20310,7 @@ export function ChannelManager_abandon_payment(this_arg: number, payment_id: num } // MUST_USE_RES struct LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ ChannelManager_send_spontaneous_payment(const struct LDKChannelManager *NONNULL_PTR this_arg, const struct LDKRoute *NONNULL_PTR route, struct LDKThirtyTwoBytes payment_preimage); /* @internal */ -export function ChannelManager_send_spontaneous_payment(this_arg: number, route: number, payment_preimage: number): number { +export function ChannelManager_send_spontaneous_payment(this_arg: bigint, route: bigint, payment_preimage: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20312,7 +20319,7 @@ export function ChannelManager_send_spontaneous_payment(this_arg: number, route: } // MUST_USE_RES struct LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ ChannelManager_send_probe(const struct LDKChannelManager *NONNULL_PTR this_arg, struct LDKCVec_RouteHopZ hops); /* @internal */ -export function ChannelManager_send_probe(this_arg: number, hops: number): number { +export function ChannelManager_send_probe(this_arg: bigint, hops: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20321,7 +20328,7 @@ export function ChannelManager_send_probe(this_arg: number, hops: number): numbe } // MUST_USE_RES struct LDKCResult_NoneAPIErrorZ ChannelManager_funding_transaction_generated(const struct LDKChannelManager *NONNULL_PTR this_arg, const uint8_t (*temporary_channel_id)[32], struct LDKPublicKey counterparty_node_id, struct LDKTransaction funding_transaction); /* @internal */ -export function ChannelManager_funding_transaction_generated(this_arg: number, temporary_channel_id: number, counterparty_node_id: number, funding_transaction: number): number { +export function ChannelManager_funding_transaction_generated(this_arg: bigint, temporary_channel_id: number, counterparty_node_id: number, funding_transaction: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20330,7 +20337,7 @@ export function ChannelManager_funding_transaction_generated(this_arg: number, t } // void ChannelManager_broadcast_node_announcement(const struct LDKChannelManager *NONNULL_PTR this_arg, struct LDKThreeBytes rgb, struct LDKThirtyTwoBytes alias, struct LDKCVec_NetAddressZ addresses); /* @internal */ -export function ChannelManager_broadcast_node_announcement(this_arg: number, rgb: number, alias: number, addresses: number): void { +export function ChannelManager_broadcast_node_announcement(this_arg: bigint, rgb: number, alias: number, addresses: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20339,7 +20346,7 @@ export function ChannelManager_broadcast_node_announcement(this_arg: number, rgb } // MUST_USE_RES struct LDKCResult_NoneAPIErrorZ ChannelManager_update_channel_config(const struct LDKChannelManager *NONNULL_PTR this_arg, struct LDKPublicKey counterparty_node_id, struct LDKCVec_ThirtyTwoBytesZ channel_ids, const struct LDKChannelConfig *NONNULL_PTR config); /* @internal */ -export function ChannelManager_update_channel_config(this_arg: number, counterparty_node_id: number, channel_ids: number, config: number): number { +export function ChannelManager_update_channel_config(this_arg: bigint, counterparty_node_id: number, channel_ids: number, config: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20348,7 +20355,7 @@ export function ChannelManager_update_channel_config(this_arg: number, counterpa } // void ChannelManager_process_pending_htlc_forwards(const struct LDKChannelManager *NONNULL_PTR this_arg); /* @internal */ -export function ChannelManager_process_pending_htlc_forwards(this_arg: number): void { +export function ChannelManager_process_pending_htlc_forwards(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20357,7 +20364,7 @@ export function ChannelManager_process_pending_htlc_forwards(this_arg: number): } // void ChannelManager_timer_tick_occurred(const struct LDKChannelManager *NONNULL_PTR this_arg); /* @internal */ -export function ChannelManager_timer_tick_occurred(this_arg: number): void { +export function ChannelManager_timer_tick_occurred(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20366,7 +20373,7 @@ export function ChannelManager_timer_tick_occurred(this_arg: number): void { } // void ChannelManager_fail_htlc_backwards(const struct LDKChannelManager *NONNULL_PTR this_arg, const uint8_t (*payment_hash)[32]); /* @internal */ -export function ChannelManager_fail_htlc_backwards(this_arg: number, payment_hash: number): void { +export function ChannelManager_fail_htlc_backwards(this_arg: bigint, payment_hash: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20375,7 +20382,7 @@ export function ChannelManager_fail_htlc_backwards(this_arg: number, payment_has } // void ChannelManager_claim_funds(const struct LDKChannelManager *NONNULL_PTR this_arg, struct LDKThirtyTwoBytes payment_preimage); /* @internal */ -export function ChannelManager_claim_funds(this_arg: number, payment_preimage: number): void { +export function ChannelManager_claim_funds(this_arg: bigint, payment_preimage: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20384,7 +20391,7 @@ export function ChannelManager_claim_funds(this_arg: number, payment_preimage: n } // MUST_USE_RES struct LDKPublicKey ChannelManager_get_our_node_id(const struct LDKChannelManager *NONNULL_PTR this_arg); /* @internal */ -export function ChannelManager_get_our_node_id(this_arg: number): number { +export function ChannelManager_get_our_node_id(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20393,7 +20400,7 @@ export function ChannelManager_get_our_node_id(this_arg: number): number { } // MUST_USE_RES struct LDKCResult_NoneAPIErrorZ ChannelManager_accept_inbound_channel(const struct LDKChannelManager *NONNULL_PTR this_arg, const uint8_t (*temporary_channel_id)[32], struct LDKPublicKey counterparty_node_id, uint64_t user_channel_id); /* @internal */ -export function ChannelManager_accept_inbound_channel(this_arg: number, temporary_channel_id: number, counterparty_node_id: number, user_channel_id: bigint): number { +export function ChannelManager_accept_inbound_channel(this_arg: bigint, temporary_channel_id: number, counterparty_node_id: number, user_channel_id: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20402,7 +20409,7 @@ export function ChannelManager_accept_inbound_channel(this_arg: number, temporar } // MUST_USE_RES struct LDKCResult_NoneAPIErrorZ ChannelManager_accept_inbound_channel_from_trusted_peer_0conf(const struct LDKChannelManager *NONNULL_PTR this_arg, const uint8_t (*temporary_channel_id)[32], struct LDKPublicKey counterparty_node_id, uint64_t user_channel_id); /* @internal */ -export function ChannelManager_accept_inbound_channel_from_trusted_peer_0conf(this_arg: number, temporary_channel_id: number, counterparty_node_id: number, user_channel_id: bigint): number { +export function ChannelManager_accept_inbound_channel_from_trusted_peer_0conf(this_arg: bigint, temporary_channel_id: number, counterparty_node_id: number, user_channel_id: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20411,7 +20418,7 @@ export function ChannelManager_accept_inbound_channel_from_trusted_peer_0conf(th } // MUST_USE_RES struct LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ ChannelManager_create_inbound_payment(const struct LDKChannelManager *NONNULL_PTR this_arg, struct LDKCOption_u64Z min_value_msat, uint32_t invoice_expiry_delta_secs); /* @internal */ -export function ChannelManager_create_inbound_payment(this_arg: number, min_value_msat: number, invoice_expiry_delta_secs: number): number { +export function ChannelManager_create_inbound_payment(this_arg: bigint, min_value_msat: bigint, invoice_expiry_delta_secs: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20420,7 +20427,7 @@ export function ChannelManager_create_inbound_payment(this_arg: number, min_valu } // MUST_USE_RES struct LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ ChannelManager_create_inbound_payment_legacy(const struct LDKChannelManager *NONNULL_PTR this_arg, struct LDKCOption_u64Z min_value_msat, uint32_t invoice_expiry_delta_secs); /* @internal */ -export function ChannelManager_create_inbound_payment_legacy(this_arg: number, min_value_msat: number, invoice_expiry_delta_secs: number): number { +export function ChannelManager_create_inbound_payment_legacy(this_arg: bigint, min_value_msat: bigint, invoice_expiry_delta_secs: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20429,7 +20436,7 @@ export function ChannelManager_create_inbound_payment_legacy(this_arg: number, m } // MUST_USE_RES struct LDKCResult_PaymentSecretNoneZ ChannelManager_create_inbound_payment_for_hash(const struct LDKChannelManager *NONNULL_PTR this_arg, struct LDKThirtyTwoBytes payment_hash, struct LDKCOption_u64Z min_value_msat, uint32_t invoice_expiry_delta_secs); /* @internal */ -export function ChannelManager_create_inbound_payment_for_hash(this_arg: number, payment_hash: number, min_value_msat: number, invoice_expiry_delta_secs: number): number { +export function ChannelManager_create_inbound_payment_for_hash(this_arg: bigint, payment_hash: number, min_value_msat: bigint, invoice_expiry_delta_secs: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20438,7 +20445,7 @@ export function ChannelManager_create_inbound_payment_for_hash(this_arg: number, } // MUST_USE_RES struct LDKCResult_PaymentSecretAPIErrorZ ChannelManager_create_inbound_payment_for_hash_legacy(const struct LDKChannelManager *NONNULL_PTR this_arg, struct LDKThirtyTwoBytes payment_hash, struct LDKCOption_u64Z min_value_msat, uint32_t invoice_expiry_delta_secs); /* @internal */ -export function ChannelManager_create_inbound_payment_for_hash_legacy(this_arg: number, payment_hash: number, min_value_msat: number, invoice_expiry_delta_secs: number): number { +export function ChannelManager_create_inbound_payment_for_hash_legacy(this_arg: bigint, payment_hash: number, min_value_msat: bigint, invoice_expiry_delta_secs: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20447,7 +20454,7 @@ export function ChannelManager_create_inbound_payment_for_hash_legacy(this_arg: } // MUST_USE_RES struct LDKCResult_PaymentPreimageAPIErrorZ ChannelManager_get_payment_preimage(const struct LDKChannelManager *NONNULL_PTR this_arg, struct LDKThirtyTwoBytes payment_hash, struct LDKThirtyTwoBytes payment_secret); /* @internal */ -export function ChannelManager_get_payment_preimage(this_arg: number, payment_hash: number, payment_secret: number): number { +export function ChannelManager_get_payment_preimage(this_arg: bigint, payment_hash: number, payment_secret: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20456,7 +20463,7 @@ export function ChannelManager_get_payment_preimage(this_arg: number, payment_ha } // MUST_USE_RES uint64_t ChannelManager_get_phantom_scid(const struct LDKChannelManager *NONNULL_PTR this_arg); /* @internal */ -export function ChannelManager_get_phantom_scid(this_arg: number): bigint { +export function ChannelManager_get_phantom_scid(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20465,7 +20472,7 @@ export function ChannelManager_get_phantom_scid(this_arg: number): bigint { } // MUST_USE_RES struct LDKPhantomRouteHints ChannelManager_get_phantom_route_hints(const struct LDKChannelManager *NONNULL_PTR this_arg); /* @internal */ -export function ChannelManager_get_phantom_route_hints(this_arg: number): number { +export function ChannelManager_get_phantom_route_hints(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20474,7 +20481,7 @@ export function ChannelManager_get_phantom_route_hints(this_arg: number): number } // struct LDKMessageSendEventsProvider ChannelManager_as_MessageSendEventsProvider(const struct LDKChannelManager *NONNULL_PTR this_arg); /* @internal */ -export function ChannelManager_as_MessageSendEventsProvider(this_arg: number): number { +export function ChannelManager_as_MessageSendEventsProvider(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20483,7 +20490,7 @@ export function ChannelManager_as_MessageSendEventsProvider(this_arg: number): n } // struct LDKEventsProvider ChannelManager_as_EventsProvider(const struct LDKChannelManager *NONNULL_PTR this_arg); /* @internal */ -export function ChannelManager_as_EventsProvider(this_arg: number): number { +export function ChannelManager_as_EventsProvider(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20492,7 +20499,7 @@ export function ChannelManager_as_EventsProvider(this_arg: number): number { } // struct LDKListen ChannelManager_as_Listen(const struct LDKChannelManager *NONNULL_PTR this_arg); /* @internal */ -export function ChannelManager_as_Listen(this_arg: number): number { +export function ChannelManager_as_Listen(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20501,7 +20508,7 @@ export function ChannelManager_as_Listen(this_arg: number): number { } // struct LDKConfirm ChannelManager_as_Confirm(const struct LDKChannelManager *NONNULL_PTR this_arg); /* @internal */ -export function ChannelManager_as_Confirm(this_arg: number): number { +export function ChannelManager_as_Confirm(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20510,7 +20517,7 @@ export function ChannelManager_as_Confirm(this_arg: number): number { } // void ChannelManager_await_persistable_update(const struct LDKChannelManager *NONNULL_PTR this_arg); /* @internal */ -export function ChannelManager_await_persistable_update(this_arg: number): void { +export function ChannelManager_await_persistable_update(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20519,7 +20526,7 @@ export function ChannelManager_await_persistable_update(this_arg: number): void } // MUST_USE_RES struct LDKBestBlock ChannelManager_current_best_block(const struct LDKChannelManager *NONNULL_PTR this_arg); /* @internal */ -export function ChannelManager_current_best_block(this_arg: number): number { +export function ChannelManager_current_best_block(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20528,7 +20535,7 @@ export function ChannelManager_current_best_block(this_arg: number): number { } // struct LDKChannelMessageHandler ChannelManager_as_ChannelMessageHandler(const struct LDKChannelManager *NONNULL_PTR this_arg); /* @internal */ -export function ChannelManager_as_ChannelMessageHandler(this_arg: number): number { +export function ChannelManager_as_ChannelMessageHandler(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20537,7 +20544,7 @@ export function ChannelManager_as_ChannelMessageHandler(this_arg: number): numbe } // struct LDKCVec_u8Z CounterpartyForwardingInfo_write(const struct LDKCounterpartyForwardingInfo *NONNULL_PTR obj); /* @internal */ -export function CounterpartyForwardingInfo_write(obj: number): number { +export function CounterpartyForwardingInfo_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20546,7 +20553,7 @@ export function CounterpartyForwardingInfo_write(obj: number): number { } // struct LDKCResult_CounterpartyForwardingInfoDecodeErrorZ CounterpartyForwardingInfo_read(struct LDKu8slice ser); /* @internal */ -export function CounterpartyForwardingInfo_read(ser: number): number { +export function CounterpartyForwardingInfo_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20555,7 +20562,7 @@ export function CounterpartyForwardingInfo_read(ser: number): number { } // struct LDKCVec_u8Z ChannelCounterparty_write(const struct LDKChannelCounterparty *NONNULL_PTR obj); /* @internal */ -export function ChannelCounterparty_write(obj: number): number { +export function ChannelCounterparty_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20564,7 +20571,7 @@ export function ChannelCounterparty_write(obj: number): number { } // struct LDKCResult_ChannelCounterpartyDecodeErrorZ ChannelCounterparty_read(struct LDKu8slice ser); /* @internal */ -export function ChannelCounterparty_read(ser: number): number { +export function ChannelCounterparty_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20573,7 +20580,7 @@ export function ChannelCounterparty_read(ser: number): number { } // struct LDKCVec_u8Z ChannelDetails_write(const struct LDKChannelDetails *NONNULL_PTR obj); /* @internal */ -export function ChannelDetails_write(obj: number): number { +export function ChannelDetails_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20582,7 +20589,7 @@ export function ChannelDetails_write(obj: number): number { } // struct LDKCResult_ChannelDetailsDecodeErrorZ ChannelDetails_read(struct LDKu8slice ser); /* @internal */ -export function ChannelDetails_read(ser: number): number { +export function ChannelDetails_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20591,7 +20598,7 @@ export function ChannelDetails_read(ser: number): number { } // struct LDKCVec_u8Z PhantomRouteHints_write(const struct LDKPhantomRouteHints *NONNULL_PTR obj); /* @internal */ -export function PhantomRouteHints_write(obj: number): number { +export function PhantomRouteHints_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20600,7 +20607,7 @@ export function PhantomRouteHints_write(obj: number): number { } // struct LDKCResult_PhantomRouteHintsDecodeErrorZ PhantomRouteHints_read(struct LDKu8slice ser); /* @internal */ -export function PhantomRouteHints_read(ser: number): number { +export function PhantomRouteHints_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20609,7 +20616,7 @@ export function PhantomRouteHints_read(ser: number): number { } // struct LDKCVec_u8Z ChannelManager_write(const struct LDKChannelManager *NONNULL_PTR obj); /* @internal */ -export function ChannelManager_write(obj: number): number { +export function ChannelManager_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20618,7 +20625,7 @@ export function ChannelManager_write(obj: number): number { } // void ChannelManagerReadArgs_free(struct LDKChannelManagerReadArgs this_obj); /* @internal */ -export function ChannelManagerReadArgs_free(this_obj: number): void { +export function ChannelManagerReadArgs_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20627,7 +20634,7 @@ export function ChannelManagerReadArgs_free(this_obj: number): void { } // const struct LDKKeysInterface *ChannelManagerReadArgs_get_keys_manager(const struct LDKChannelManagerReadArgs *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelManagerReadArgs_get_keys_manager(this_ptr: number): number { +export function ChannelManagerReadArgs_get_keys_manager(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20636,7 +20643,7 @@ export function ChannelManagerReadArgs_get_keys_manager(this_ptr: number): numbe } // void ChannelManagerReadArgs_set_keys_manager(struct LDKChannelManagerReadArgs *NONNULL_PTR this_ptr, struct LDKKeysInterface val); /* @internal */ -export function ChannelManagerReadArgs_set_keys_manager(this_ptr: number, val: number): void { +export function ChannelManagerReadArgs_set_keys_manager(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20645,7 +20652,7 @@ export function ChannelManagerReadArgs_set_keys_manager(this_ptr: number, val: n } // const struct LDKFeeEstimator *ChannelManagerReadArgs_get_fee_estimator(const struct LDKChannelManagerReadArgs *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelManagerReadArgs_get_fee_estimator(this_ptr: number): number { +export function ChannelManagerReadArgs_get_fee_estimator(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20654,7 +20661,7 @@ export function ChannelManagerReadArgs_get_fee_estimator(this_ptr: number): numb } // void ChannelManagerReadArgs_set_fee_estimator(struct LDKChannelManagerReadArgs *NONNULL_PTR this_ptr, struct LDKFeeEstimator val); /* @internal */ -export function ChannelManagerReadArgs_set_fee_estimator(this_ptr: number, val: number): void { +export function ChannelManagerReadArgs_set_fee_estimator(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20663,7 +20670,7 @@ export function ChannelManagerReadArgs_set_fee_estimator(this_ptr: number, val: } // const struct LDKWatch *ChannelManagerReadArgs_get_chain_monitor(const struct LDKChannelManagerReadArgs *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelManagerReadArgs_get_chain_monitor(this_ptr: number): number { +export function ChannelManagerReadArgs_get_chain_monitor(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20672,7 +20679,7 @@ export function ChannelManagerReadArgs_get_chain_monitor(this_ptr: number): numb } // void ChannelManagerReadArgs_set_chain_monitor(struct LDKChannelManagerReadArgs *NONNULL_PTR this_ptr, struct LDKWatch val); /* @internal */ -export function ChannelManagerReadArgs_set_chain_monitor(this_ptr: number, val: number): void { +export function ChannelManagerReadArgs_set_chain_monitor(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20681,7 +20688,7 @@ export function ChannelManagerReadArgs_set_chain_monitor(this_ptr: number, val: } // const struct LDKBroadcasterInterface *ChannelManagerReadArgs_get_tx_broadcaster(const struct LDKChannelManagerReadArgs *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelManagerReadArgs_get_tx_broadcaster(this_ptr: number): number { +export function ChannelManagerReadArgs_get_tx_broadcaster(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20690,7 +20697,7 @@ export function ChannelManagerReadArgs_get_tx_broadcaster(this_ptr: number): num } // void ChannelManagerReadArgs_set_tx_broadcaster(struct LDKChannelManagerReadArgs *NONNULL_PTR this_ptr, struct LDKBroadcasterInterface val); /* @internal */ -export function ChannelManagerReadArgs_set_tx_broadcaster(this_ptr: number, val: number): void { +export function ChannelManagerReadArgs_set_tx_broadcaster(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20699,7 +20706,7 @@ export function ChannelManagerReadArgs_set_tx_broadcaster(this_ptr: number, val: } // const struct LDKLogger *ChannelManagerReadArgs_get_logger(const struct LDKChannelManagerReadArgs *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelManagerReadArgs_get_logger(this_ptr: number): number { +export function ChannelManagerReadArgs_get_logger(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20708,7 +20715,7 @@ export function ChannelManagerReadArgs_get_logger(this_ptr: number): number { } // void ChannelManagerReadArgs_set_logger(struct LDKChannelManagerReadArgs *NONNULL_PTR this_ptr, struct LDKLogger val); /* @internal */ -export function ChannelManagerReadArgs_set_logger(this_ptr: number, val: number): void { +export function ChannelManagerReadArgs_set_logger(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20717,7 +20724,7 @@ export function ChannelManagerReadArgs_set_logger(this_ptr: number, val: number) } // struct LDKUserConfig ChannelManagerReadArgs_get_default_config(const struct LDKChannelManagerReadArgs *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelManagerReadArgs_get_default_config(this_ptr: number): number { +export function ChannelManagerReadArgs_get_default_config(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20726,7 +20733,7 @@ export function ChannelManagerReadArgs_get_default_config(this_ptr: number): num } // void ChannelManagerReadArgs_set_default_config(struct LDKChannelManagerReadArgs *NONNULL_PTR this_ptr, struct LDKUserConfig val); /* @internal */ -export function ChannelManagerReadArgs_set_default_config(this_ptr: number, val: number): void { +export function ChannelManagerReadArgs_set_default_config(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20735,7 +20742,7 @@ export function ChannelManagerReadArgs_set_default_config(this_ptr: number, val: } // MUST_USE_RES struct LDKChannelManagerReadArgs ChannelManagerReadArgs_new(struct LDKKeysInterface keys_manager, struct LDKFeeEstimator fee_estimator, struct LDKWatch chain_monitor, struct LDKBroadcasterInterface tx_broadcaster, struct LDKLogger logger, struct LDKUserConfig default_config, struct LDKCVec_ChannelMonitorZ channel_monitors); /* @internal */ -export function ChannelManagerReadArgs_new(keys_manager: number, fee_estimator: number, chain_monitor: number, tx_broadcaster: number, logger: number, default_config: number, channel_monitors: number): number { +export function ChannelManagerReadArgs_new(keys_manager: bigint, fee_estimator: bigint, chain_monitor: bigint, tx_broadcaster: bigint, logger: bigint, default_config: bigint, channel_monitors: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20744,7 +20751,7 @@ export function ChannelManagerReadArgs_new(keys_manager: number, fee_estimator: } // struct LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ C2Tuple_BlockHashChannelManagerZ_read(struct LDKu8slice ser, struct LDKChannelManagerReadArgs arg); /* @internal */ -export function C2Tuple_BlockHashChannelManagerZ_read(ser: number, arg: number): number { +export function C2Tuple_BlockHashChannelManagerZ_read(ser: number, arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20753,7 +20760,7 @@ export function C2Tuple_BlockHashChannelManagerZ_read(ser: number, arg: number): } // void ExpandedKey_free(struct LDKExpandedKey this_obj); /* @internal */ -export function ExpandedKey_free(this_obj: number): void { +export function ExpandedKey_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20762,7 +20769,7 @@ export function ExpandedKey_free(this_obj: number): void { } // MUST_USE_RES struct LDKExpandedKey ExpandedKey_new(const uint8_t (*key_material)[32]); /* @internal */ -export function ExpandedKey_new(key_material: number): number { +export function ExpandedKey_new(key_material: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20771,7 +20778,7 @@ export function ExpandedKey_new(key_material: number): number { } // struct LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ create(const struct LDKExpandedKey *NONNULL_PTR keys, struct LDKCOption_u64Z min_value_msat, uint32_t invoice_expiry_delta_secs, const struct LDKKeysInterface *NONNULL_PTR keys_manager, uint64_t current_time); /* @internal */ -export function create(keys: number, min_value_msat: number, invoice_expiry_delta_secs: number, keys_manager: number, current_time: bigint): number { +export function create(keys: bigint, min_value_msat: bigint, invoice_expiry_delta_secs: number, keys_manager: bigint, current_time: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20780,7 +20787,7 @@ export function create(keys: number, min_value_msat: number, invoice_expiry_delt } // struct LDKCResult_PaymentSecretNoneZ create_from_hash(const struct LDKExpandedKey *NONNULL_PTR keys, struct LDKCOption_u64Z min_value_msat, struct LDKThirtyTwoBytes payment_hash, uint32_t invoice_expiry_delta_secs, uint64_t current_time); /* @internal */ -export function create_from_hash(keys: number, min_value_msat: number, payment_hash: number, invoice_expiry_delta_secs: number, current_time: bigint): number { +export function create_from_hash(keys: bigint, min_value_msat: bigint, payment_hash: number, invoice_expiry_delta_secs: number, current_time: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20789,16 +20796,16 @@ export function create_from_hash(keys: number, min_value_msat: number, payment_h } // void DecodeError_free(struct LDKDecodeError this_obj); /* @internal */ -export function DecodeError_free(this_obj: number): void { +export function DecodeError_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_DecodeError_free(this_obj); // debug statements here } - // uintptr_t DecodeError_clone_ptr(LDKDecodeError *NONNULL_PTR arg); + // uint64_t DecodeError_clone_ptr(LDKDecodeError *NONNULL_PTR arg); /* @internal */ -export function DecodeError_clone_ptr(arg: number): number { +export function DecodeError_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20807,7 +20814,7 @@ export function DecodeError_clone_ptr(arg: number): number { } // struct LDKDecodeError DecodeError_clone(const struct LDKDecodeError *NONNULL_PTR orig); /* @internal */ -export function DecodeError_clone(orig: number): number { +export function DecodeError_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20816,7 +20823,7 @@ export function DecodeError_clone(orig: number): number { } // void Init_free(struct LDKInit this_obj); /* @internal */ -export function Init_free(this_obj: number): void { +export function Init_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20825,7 +20832,7 @@ export function Init_free(this_obj: number): void { } // struct LDKInitFeatures Init_get_features(const struct LDKInit *NONNULL_PTR this_ptr); /* @internal */ -export function Init_get_features(this_ptr: number): number { +export function Init_get_features(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20834,7 +20841,7 @@ export function Init_get_features(this_ptr: number): number { } // void Init_set_features(struct LDKInit *NONNULL_PTR this_ptr, struct LDKInitFeatures val); /* @internal */ -export function Init_set_features(this_ptr: number, val: number): void { +export function Init_set_features(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20843,7 +20850,7 @@ export function Init_set_features(this_ptr: number, val: number): void { } // struct LDKCOption_NetAddressZ Init_get_remote_network_address(const struct LDKInit *NONNULL_PTR this_ptr); /* @internal */ -export function Init_get_remote_network_address(this_ptr: number): number { +export function Init_get_remote_network_address(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20852,7 +20859,7 @@ export function Init_get_remote_network_address(this_ptr: number): number { } // void Init_set_remote_network_address(struct LDKInit *NONNULL_PTR this_ptr, struct LDKCOption_NetAddressZ val); /* @internal */ -export function Init_set_remote_network_address(this_ptr: number, val: number): void { +export function Init_set_remote_network_address(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20861,16 +20868,16 @@ export function Init_set_remote_network_address(this_ptr: number, val: number): } // MUST_USE_RES struct LDKInit Init_new(struct LDKInitFeatures features_arg, struct LDKCOption_NetAddressZ remote_network_address_arg); /* @internal */ -export function Init_new(features_arg: number, remote_network_address_arg: number): number { +export function Init_new(features_arg: bigint, remote_network_address_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_Init_new(features_arg, remote_network_address_arg); return nativeResponseValue; } - // uintptr_t Init_clone_ptr(LDKInit *NONNULL_PTR arg); + // uint64_t Init_clone_ptr(LDKInit *NONNULL_PTR arg); /* @internal */ -export function Init_clone_ptr(arg: number): number { +export function Init_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20879,7 +20886,7 @@ export function Init_clone_ptr(arg: number): number { } // struct LDKInit Init_clone(const struct LDKInit *NONNULL_PTR orig); /* @internal */ -export function Init_clone(orig: number): number { +export function Init_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20888,7 +20895,7 @@ export function Init_clone(orig: number): number { } // void ErrorMessage_free(struct LDKErrorMessage this_obj); /* @internal */ -export function ErrorMessage_free(this_obj: number): void { +export function ErrorMessage_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20897,7 +20904,7 @@ export function ErrorMessage_free(this_obj: number): void { } // const uint8_t (*ErrorMessage_get_channel_id(const struct LDKErrorMessage *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function ErrorMessage_get_channel_id(this_ptr: number): number { +export function ErrorMessage_get_channel_id(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20906,7 +20913,7 @@ export function ErrorMessage_get_channel_id(this_ptr: number): number { } // void ErrorMessage_set_channel_id(struct LDKErrorMessage *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function ErrorMessage_set_channel_id(this_ptr: number, val: number): void { +export function ErrorMessage_set_channel_id(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20915,7 +20922,7 @@ export function ErrorMessage_set_channel_id(this_ptr: number, val: number): void } // struct LDKStr ErrorMessage_get_data(const struct LDKErrorMessage *NONNULL_PTR this_ptr); /* @internal */ -export function ErrorMessage_get_data(this_ptr: number): number { +export function ErrorMessage_get_data(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20924,7 +20931,7 @@ export function ErrorMessage_get_data(this_ptr: number): number { } // void ErrorMessage_set_data(struct LDKErrorMessage *NONNULL_PTR this_ptr, struct LDKStr val); /* @internal */ -export function ErrorMessage_set_data(this_ptr: number, val: number): void { +export function ErrorMessage_set_data(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20933,16 +20940,16 @@ export function ErrorMessage_set_data(this_ptr: number, val: number): void { } // MUST_USE_RES struct LDKErrorMessage ErrorMessage_new(struct LDKThirtyTwoBytes channel_id_arg, struct LDKStr data_arg); /* @internal */ -export function ErrorMessage_new(channel_id_arg: number, data_arg: number): number { +export function ErrorMessage_new(channel_id_arg: number, data_arg: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_ErrorMessage_new(channel_id_arg, data_arg); return nativeResponseValue; } - // uintptr_t ErrorMessage_clone_ptr(LDKErrorMessage *NONNULL_PTR arg); + // uint64_t ErrorMessage_clone_ptr(LDKErrorMessage *NONNULL_PTR arg); /* @internal */ -export function ErrorMessage_clone_ptr(arg: number): number { +export function ErrorMessage_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20951,7 +20958,7 @@ export function ErrorMessage_clone_ptr(arg: number): number { } // struct LDKErrorMessage ErrorMessage_clone(const struct LDKErrorMessage *NONNULL_PTR orig); /* @internal */ -export function ErrorMessage_clone(orig: number): number { +export function ErrorMessage_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20960,7 +20967,7 @@ export function ErrorMessage_clone(orig: number): number { } // void WarningMessage_free(struct LDKWarningMessage this_obj); /* @internal */ -export function WarningMessage_free(this_obj: number): void { +export function WarningMessage_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20969,7 +20976,7 @@ export function WarningMessage_free(this_obj: number): void { } // const uint8_t (*WarningMessage_get_channel_id(const struct LDKWarningMessage *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function WarningMessage_get_channel_id(this_ptr: number): number { +export function WarningMessage_get_channel_id(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20978,7 +20985,7 @@ export function WarningMessage_get_channel_id(this_ptr: number): number { } // void WarningMessage_set_channel_id(struct LDKWarningMessage *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function WarningMessage_set_channel_id(this_ptr: number, val: number): void { +export function WarningMessage_set_channel_id(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20987,7 +20994,7 @@ export function WarningMessage_set_channel_id(this_ptr: number, val: number): vo } // struct LDKStr WarningMessage_get_data(const struct LDKWarningMessage *NONNULL_PTR this_ptr); /* @internal */ -export function WarningMessage_get_data(this_ptr: number): number { +export function WarningMessage_get_data(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -20996,7 +21003,7 @@ export function WarningMessage_get_data(this_ptr: number): number { } // void WarningMessage_set_data(struct LDKWarningMessage *NONNULL_PTR this_ptr, struct LDKStr val); /* @internal */ -export function WarningMessage_set_data(this_ptr: number, val: number): void { +export function WarningMessage_set_data(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21005,16 +21012,16 @@ export function WarningMessage_set_data(this_ptr: number, val: number): void { } // MUST_USE_RES struct LDKWarningMessage WarningMessage_new(struct LDKThirtyTwoBytes channel_id_arg, struct LDKStr data_arg); /* @internal */ -export function WarningMessage_new(channel_id_arg: number, data_arg: number): number { +export function WarningMessage_new(channel_id_arg: number, data_arg: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_WarningMessage_new(channel_id_arg, data_arg); return nativeResponseValue; } - // uintptr_t WarningMessage_clone_ptr(LDKWarningMessage *NONNULL_PTR arg); + // uint64_t WarningMessage_clone_ptr(LDKWarningMessage *NONNULL_PTR arg); /* @internal */ -export function WarningMessage_clone_ptr(arg: number): number { +export function WarningMessage_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21023,7 +21030,7 @@ export function WarningMessage_clone_ptr(arg: number): number { } // struct LDKWarningMessage WarningMessage_clone(const struct LDKWarningMessage *NONNULL_PTR orig); /* @internal */ -export function WarningMessage_clone(orig: number): number { +export function WarningMessage_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21032,7 +21039,7 @@ export function WarningMessage_clone(orig: number): number { } // void Ping_free(struct LDKPing this_obj); /* @internal */ -export function Ping_free(this_obj: number): void { +export function Ping_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21041,7 +21048,7 @@ export function Ping_free(this_obj: number): void { } // uint16_t Ping_get_ponglen(const struct LDKPing *NONNULL_PTR this_ptr); /* @internal */ -export function Ping_get_ponglen(this_ptr: number): number { +export function Ping_get_ponglen(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21050,7 +21057,7 @@ export function Ping_get_ponglen(this_ptr: number): number { } // void Ping_set_ponglen(struct LDKPing *NONNULL_PTR this_ptr, uint16_t val); /* @internal */ -export function Ping_set_ponglen(this_ptr: number, val: number): void { +export function Ping_set_ponglen(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21059,7 +21066,7 @@ export function Ping_set_ponglen(this_ptr: number, val: number): void { } // uint16_t Ping_get_byteslen(const struct LDKPing *NONNULL_PTR this_ptr); /* @internal */ -export function Ping_get_byteslen(this_ptr: number): number { +export function Ping_get_byteslen(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21068,7 +21075,7 @@ export function Ping_get_byteslen(this_ptr: number): number { } // void Ping_set_byteslen(struct LDKPing *NONNULL_PTR this_ptr, uint16_t val); /* @internal */ -export function Ping_set_byteslen(this_ptr: number, val: number): void { +export function Ping_set_byteslen(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21077,16 +21084,16 @@ export function Ping_set_byteslen(this_ptr: number, val: number): void { } // MUST_USE_RES struct LDKPing Ping_new(uint16_t ponglen_arg, uint16_t byteslen_arg); /* @internal */ -export function Ping_new(ponglen_arg: number, byteslen_arg: number): number { +export function Ping_new(ponglen_arg: number, byteslen_arg: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_Ping_new(ponglen_arg, byteslen_arg); return nativeResponseValue; } - // uintptr_t Ping_clone_ptr(LDKPing *NONNULL_PTR arg); + // uint64_t Ping_clone_ptr(LDKPing *NONNULL_PTR arg); /* @internal */ -export function Ping_clone_ptr(arg: number): number { +export function Ping_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21095,7 +21102,7 @@ export function Ping_clone_ptr(arg: number): number { } // struct LDKPing Ping_clone(const struct LDKPing *NONNULL_PTR orig); /* @internal */ -export function Ping_clone(orig: number): number { +export function Ping_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21104,7 +21111,7 @@ export function Ping_clone(orig: number): number { } // void Pong_free(struct LDKPong this_obj); /* @internal */ -export function Pong_free(this_obj: number): void { +export function Pong_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21113,7 +21120,7 @@ export function Pong_free(this_obj: number): void { } // uint16_t Pong_get_byteslen(const struct LDKPong *NONNULL_PTR this_ptr); /* @internal */ -export function Pong_get_byteslen(this_ptr: number): number { +export function Pong_get_byteslen(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21122,7 +21129,7 @@ export function Pong_get_byteslen(this_ptr: number): number { } // void Pong_set_byteslen(struct LDKPong *NONNULL_PTR this_ptr, uint16_t val); /* @internal */ -export function Pong_set_byteslen(this_ptr: number, val: number): void { +export function Pong_set_byteslen(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21131,16 +21138,16 @@ export function Pong_set_byteslen(this_ptr: number, val: number): void { } // MUST_USE_RES struct LDKPong Pong_new(uint16_t byteslen_arg); /* @internal */ -export function Pong_new(byteslen_arg: number): number { +export function Pong_new(byteslen_arg: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_Pong_new(byteslen_arg); return nativeResponseValue; } - // uintptr_t Pong_clone_ptr(LDKPong *NONNULL_PTR arg); + // uint64_t Pong_clone_ptr(LDKPong *NONNULL_PTR arg); /* @internal */ -export function Pong_clone_ptr(arg: number): number { +export function Pong_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21149,7 +21156,7 @@ export function Pong_clone_ptr(arg: number): number { } // struct LDKPong Pong_clone(const struct LDKPong *NONNULL_PTR orig); /* @internal */ -export function Pong_clone(orig: number): number { +export function Pong_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21158,7 +21165,7 @@ export function Pong_clone(orig: number): number { } // void OpenChannel_free(struct LDKOpenChannel this_obj); /* @internal */ -export function OpenChannel_free(this_obj: number): void { +export function OpenChannel_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21167,7 +21174,7 @@ export function OpenChannel_free(this_obj: number): void { } // const uint8_t (*OpenChannel_get_chain_hash(const struct LDKOpenChannel *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function OpenChannel_get_chain_hash(this_ptr: number): number { +export function OpenChannel_get_chain_hash(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21176,7 +21183,7 @@ export function OpenChannel_get_chain_hash(this_ptr: number): number { } // void OpenChannel_set_chain_hash(struct LDKOpenChannel *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function OpenChannel_set_chain_hash(this_ptr: number, val: number): void { +export function OpenChannel_set_chain_hash(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21185,7 +21192,7 @@ export function OpenChannel_set_chain_hash(this_ptr: number, val: number): void } // const uint8_t (*OpenChannel_get_temporary_channel_id(const struct LDKOpenChannel *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function OpenChannel_get_temporary_channel_id(this_ptr: number): number { +export function OpenChannel_get_temporary_channel_id(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21194,7 +21201,7 @@ export function OpenChannel_get_temporary_channel_id(this_ptr: number): number { } // void OpenChannel_set_temporary_channel_id(struct LDKOpenChannel *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function OpenChannel_set_temporary_channel_id(this_ptr: number, val: number): void { +export function OpenChannel_set_temporary_channel_id(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21203,7 +21210,7 @@ export function OpenChannel_set_temporary_channel_id(this_ptr: number, val: numb } // uint64_t OpenChannel_get_funding_satoshis(const struct LDKOpenChannel *NONNULL_PTR this_ptr); /* @internal */ -export function OpenChannel_get_funding_satoshis(this_ptr: number): bigint { +export function OpenChannel_get_funding_satoshis(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21212,7 +21219,7 @@ export function OpenChannel_get_funding_satoshis(this_ptr: number): bigint { } // void OpenChannel_set_funding_satoshis(struct LDKOpenChannel *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function OpenChannel_set_funding_satoshis(this_ptr: number, val: bigint): void { +export function OpenChannel_set_funding_satoshis(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21221,7 +21228,7 @@ export function OpenChannel_set_funding_satoshis(this_ptr: number, val: bigint): } // uint64_t OpenChannel_get_push_msat(const struct LDKOpenChannel *NONNULL_PTR this_ptr); /* @internal */ -export function OpenChannel_get_push_msat(this_ptr: number): bigint { +export function OpenChannel_get_push_msat(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21230,7 +21237,7 @@ export function OpenChannel_get_push_msat(this_ptr: number): bigint { } // void OpenChannel_set_push_msat(struct LDKOpenChannel *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function OpenChannel_set_push_msat(this_ptr: number, val: bigint): void { +export function OpenChannel_set_push_msat(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21239,7 +21246,7 @@ export function OpenChannel_set_push_msat(this_ptr: number, val: bigint): void { } // uint64_t OpenChannel_get_dust_limit_satoshis(const struct LDKOpenChannel *NONNULL_PTR this_ptr); /* @internal */ -export function OpenChannel_get_dust_limit_satoshis(this_ptr: number): bigint { +export function OpenChannel_get_dust_limit_satoshis(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21248,7 +21255,7 @@ export function OpenChannel_get_dust_limit_satoshis(this_ptr: number): bigint { } // void OpenChannel_set_dust_limit_satoshis(struct LDKOpenChannel *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function OpenChannel_set_dust_limit_satoshis(this_ptr: number, val: bigint): void { +export function OpenChannel_set_dust_limit_satoshis(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21257,7 +21264,7 @@ export function OpenChannel_set_dust_limit_satoshis(this_ptr: number, val: bigin } // uint64_t OpenChannel_get_max_htlc_value_in_flight_msat(const struct LDKOpenChannel *NONNULL_PTR this_ptr); /* @internal */ -export function OpenChannel_get_max_htlc_value_in_flight_msat(this_ptr: number): bigint { +export function OpenChannel_get_max_htlc_value_in_flight_msat(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21266,7 +21273,7 @@ export function OpenChannel_get_max_htlc_value_in_flight_msat(this_ptr: number): } // void OpenChannel_set_max_htlc_value_in_flight_msat(struct LDKOpenChannel *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function OpenChannel_set_max_htlc_value_in_flight_msat(this_ptr: number, val: bigint): void { +export function OpenChannel_set_max_htlc_value_in_flight_msat(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21275,7 +21282,7 @@ export function OpenChannel_set_max_htlc_value_in_flight_msat(this_ptr: number, } // uint64_t OpenChannel_get_channel_reserve_satoshis(const struct LDKOpenChannel *NONNULL_PTR this_ptr); /* @internal */ -export function OpenChannel_get_channel_reserve_satoshis(this_ptr: number): bigint { +export function OpenChannel_get_channel_reserve_satoshis(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21284,7 +21291,7 @@ export function OpenChannel_get_channel_reserve_satoshis(this_ptr: number): bigi } // void OpenChannel_set_channel_reserve_satoshis(struct LDKOpenChannel *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function OpenChannel_set_channel_reserve_satoshis(this_ptr: number, val: bigint): void { +export function OpenChannel_set_channel_reserve_satoshis(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21293,7 +21300,7 @@ export function OpenChannel_set_channel_reserve_satoshis(this_ptr: number, val: } // uint64_t OpenChannel_get_htlc_minimum_msat(const struct LDKOpenChannel *NONNULL_PTR this_ptr); /* @internal */ -export function OpenChannel_get_htlc_minimum_msat(this_ptr: number): bigint { +export function OpenChannel_get_htlc_minimum_msat(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21302,7 +21309,7 @@ export function OpenChannel_get_htlc_minimum_msat(this_ptr: number): bigint { } // void OpenChannel_set_htlc_minimum_msat(struct LDKOpenChannel *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function OpenChannel_set_htlc_minimum_msat(this_ptr: number, val: bigint): void { +export function OpenChannel_set_htlc_minimum_msat(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21311,7 +21318,7 @@ export function OpenChannel_set_htlc_minimum_msat(this_ptr: number, val: bigint) } // uint32_t OpenChannel_get_feerate_per_kw(const struct LDKOpenChannel *NONNULL_PTR this_ptr); /* @internal */ -export function OpenChannel_get_feerate_per_kw(this_ptr: number): number { +export function OpenChannel_get_feerate_per_kw(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21320,7 +21327,7 @@ export function OpenChannel_get_feerate_per_kw(this_ptr: number): number { } // void OpenChannel_set_feerate_per_kw(struct LDKOpenChannel *NONNULL_PTR this_ptr, uint32_t val); /* @internal */ -export function OpenChannel_set_feerate_per_kw(this_ptr: number, val: number): void { +export function OpenChannel_set_feerate_per_kw(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21329,7 +21336,7 @@ export function OpenChannel_set_feerate_per_kw(this_ptr: number, val: number): v } // uint16_t OpenChannel_get_to_self_delay(const struct LDKOpenChannel *NONNULL_PTR this_ptr); /* @internal */ -export function OpenChannel_get_to_self_delay(this_ptr: number): number { +export function OpenChannel_get_to_self_delay(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21338,7 +21345,7 @@ export function OpenChannel_get_to_self_delay(this_ptr: number): number { } // void OpenChannel_set_to_self_delay(struct LDKOpenChannel *NONNULL_PTR this_ptr, uint16_t val); /* @internal */ -export function OpenChannel_set_to_self_delay(this_ptr: number, val: number): void { +export function OpenChannel_set_to_self_delay(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21347,7 +21354,7 @@ export function OpenChannel_set_to_self_delay(this_ptr: number, val: number): vo } // uint16_t OpenChannel_get_max_accepted_htlcs(const struct LDKOpenChannel *NONNULL_PTR this_ptr); /* @internal */ -export function OpenChannel_get_max_accepted_htlcs(this_ptr: number): number { +export function OpenChannel_get_max_accepted_htlcs(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21356,7 +21363,7 @@ export function OpenChannel_get_max_accepted_htlcs(this_ptr: number): number { } // void OpenChannel_set_max_accepted_htlcs(struct LDKOpenChannel *NONNULL_PTR this_ptr, uint16_t val); /* @internal */ -export function OpenChannel_set_max_accepted_htlcs(this_ptr: number, val: number): void { +export function OpenChannel_set_max_accepted_htlcs(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21365,7 +21372,7 @@ export function OpenChannel_set_max_accepted_htlcs(this_ptr: number, val: number } // struct LDKPublicKey OpenChannel_get_funding_pubkey(const struct LDKOpenChannel *NONNULL_PTR this_ptr); /* @internal */ -export function OpenChannel_get_funding_pubkey(this_ptr: number): number { +export function OpenChannel_get_funding_pubkey(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21374,7 +21381,7 @@ export function OpenChannel_get_funding_pubkey(this_ptr: number): number { } // void OpenChannel_set_funding_pubkey(struct LDKOpenChannel *NONNULL_PTR this_ptr, struct LDKPublicKey val); /* @internal */ -export function OpenChannel_set_funding_pubkey(this_ptr: number, val: number): void { +export function OpenChannel_set_funding_pubkey(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21383,7 +21390,7 @@ export function OpenChannel_set_funding_pubkey(this_ptr: number, val: number): v } // struct LDKPublicKey OpenChannel_get_revocation_basepoint(const struct LDKOpenChannel *NONNULL_PTR this_ptr); /* @internal */ -export function OpenChannel_get_revocation_basepoint(this_ptr: number): number { +export function OpenChannel_get_revocation_basepoint(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21392,7 +21399,7 @@ export function OpenChannel_get_revocation_basepoint(this_ptr: number): number { } // void OpenChannel_set_revocation_basepoint(struct LDKOpenChannel *NONNULL_PTR this_ptr, struct LDKPublicKey val); /* @internal */ -export function OpenChannel_set_revocation_basepoint(this_ptr: number, val: number): void { +export function OpenChannel_set_revocation_basepoint(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21401,7 +21408,7 @@ export function OpenChannel_set_revocation_basepoint(this_ptr: number, val: numb } // struct LDKPublicKey OpenChannel_get_payment_point(const struct LDKOpenChannel *NONNULL_PTR this_ptr); /* @internal */ -export function OpenChannel_get_payment_point(this_ptr: number): number { +export function OpenChannel_get_payment_point(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21410,7 +21417,7 @@ export function OpenChannel_get_payment_point(this_ptr: number): number { } // void OpenChannel_set_payment_point(struct LDKOpenChannel *NONNULL_PTR this_ptr, struct LDKPublicKey val); /* @internal */ -export function OpenChannel_set_payment_point(this_ptr: number, val: number): void { +export function OpenChannel_set_payment_point(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21419,7 +21426,7 @@ export function OpenChannel_set_payment_point(this_ptr: number, val: number): vo } // struct LDKPublicKey OpenChannel_get_delayed_payment_basepoint(const struct LDKOpenChannel *NONNULL_PTR this_ptr); /* @internal */ -export function OpenChannel_get_delayed_payment_basepoint(this_ptr: number): number { +export function OpenChannel_get_delayed_payment_basepoint(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21428,7 +21435,7 @@ export function OpenChannel_get_delayed_payment_basepoint(this_ptr: number): num } // void OpenChannel_set_delayed_payment_basepoint(struct LDKOpenChannel *NONNULL_PTR this_ptr, struct LDKPublicKey val); /* @internal */ -export function OpenChannel_set_delayed_payment_basepoint(this_ptr: number, val: number): void { +export function OpenChannel_set_delayed_payment_basepoint(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21437,7 +21444,7 @@ export function OpenChannel_set_delayed_payment_basepoint(this_ptr: number, val: } // struct LDKPublicKey OpenChannel_get_htlc_basepoint(const struct LDKOpenChannel *NONNULL_PTR this_ptr); /* @internal */ -export function OpenChannel_get_htlc_basepoint(this_ptr: number): number { +export function OpenChannel_get_htlc_basepoint(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21446,7 +21453,7 @@ export function OpenChannel_get_htlc_basepoint(this_ptr: number): number { } // void OpenChannel_set_htlc_basepoint(struct LDKOpenChannel *NONNULL_PTR this_ptr, struct LDKPublicKey val); /* @internal */ -export function OpenChannel_set_htlc_basepoint(this_ptr: number, val: number): void { +export function OpenChannel_set_htlc_basepoint(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21455,7 +21462,7 @@ export function OpenChannel_set_htlc_basepoint(this_ptr: number, val: number): v } // struct LDKPublicKey OpenChannel_get_first_per_commitment_point(const struct LDKOpenChannel *NONNULL_PTR this_ptr); /* @internal */ -export function OpenChannel_get_first_per_commitment_point(this_ptr: number): number { +export function OpenChannel_get_first_per_commitment_point(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21464,7 +21471,7 @@ export function OpenChannel_get_first_per_commitment_point(this_ptr: number): nu } // void OpenChannel_set_first_per_commitment_point(struct LDKOpenChannel *NONNULL_PTR this_ptr, struct LDKPublicKey val); /* @internal */ -export function OpenChannel_set_first_per_commitment_point(this_ptr: number, val: number): void { +export function OpenChannel_set_first_per_commitment_point(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21473,7 +21480,7 @@ export function OpenChannel_set_first_per_commitment_point(this_ptr: number, val } // uint8_t OpenChannel_get_channel_flags(const struct LDKOpenChannel *NONNULL_PTR this_ptr); /* @internal */ -export function OpenChannel_get_channel_flags(this_ptr: number): number { +export function OpenChannel_get_channel_flags(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21482,7 +21489,7 @@ export function OpenChannel_get_channel_flags(this_ptr: number): number { } // void OpenChannel_set_channel_flags(struct LDKOpenChannel *NONNULL_PTR this_ptr, uint8_t val); /* @internal */ -export function OpenChannel_set_channel_flags(this_ptr: number, val: number): void { +export function OpenChannel_set_channel_flags(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21491,7 +21498,7 @@ export function OpenChannel_set_channel_flags(this_ptr: number, val: number): vo } // struct LDKChannelTypeFeatures OpenChannel_get_channel_type(const struct LDKOpenChannel *NONNULL_PTR this_ptr); /* @internal */ -export function OpenChannel_get_channel_type(this_ptr: number): number { +export function OpenChannel_get_channel_type(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21500,16 +21507,16 @@ export function OpenChannel_get_channel_type(this_ptr: number): number { } // void OpenChannel_set_channel_type(struct LDKOpenChannel *NONNULL_PTR this_ptr, struct LDKChannelTypeFeatures val); /* @internal */ -export function OpenChannel_set_channel_type(this_ptr: number, val: number): void { +export function OpenChannel_set_channel_type(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_OpenChannel_set_channel_type(this_ptr, val); // debug statements here } - // uintptr_t OpenChannel_clone_ptr(LDKOpenChannel *NONNULL_PTR arg); + // uint64_t OpenChannel_clone_ptr(LDKOpenChannel *NONNULL_PTR arg); /* @internal */ -export function OpenChannel_clone_ptr(arg: number): number { +export function OpenChannel_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21518,7 +21525,7 @@ export function OpenChannel_clone_ptr(arg: number): number { } // struct LDKOpenChannel OpenChannel_clone(const struct LDKOpenChannel *NONNULL_PTR orig); /* @internal */ -export function OpenChannel_clone(orig: number): number { +export function OpenChannel_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21527,7 +21534,7 @@ export function OpenChannel_clone(orig: number): number { } // void AcceptChannel_free(struct LDKAcceptChannel this_obj); /* @internal */ -export function AcceptChannel_free(this_obj: number): void { +export function AcceptChannel_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21536,7 +21543,7 @@ export function AcceptChannel_free(this_obj: number): void { } // const uint8_t (*AcceptChannel_get_temporary_channel_id(const struct LDKAcceptChannel *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function AcceptChannel_get_temporary_channel_id(this_ptr: number): number { +export function AcceptChannel_get_temporary_channel_id(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21545,7 +21552,7 @@ export function AcceptChannel_get_temporary_channel_id(this_ptr: number): number } // void AcceptChannel_set_temporary_channel_id(struct LDKAcceptChannel *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function AcceptChannel_set_temporary_channel_id(this_ptr: number, val: number): void { +export function AcceptChannel_set_temporary_channel_id(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21554,7 +21561,7 @@ export function AcceptChannel_set_temporary_channel_id(this_ptr: number, val: nu } // uint64_t AcceptChannel_get_dust_limit_satoshis(const struct LDKAcceptChannel *NONNULL_PTR this_ptr); /* @internal */ -export function AcceptChannel_get_dust_limit_satoshis(this_ptr: number): bigint { +export function AcceptChannel_get_dust_limit_satoshis(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21563,7 +21570,7 @@ export function AcceptChannel_get_dust_limit_satoshis(this_ptr: number): bigint } // void AcceptChannel_set_dust_limit_satoshis(struct LDKAcceptChannel *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function AcceptChannel_set_dust_limit_satoshis(this_ptr: number, val: bigint): void { +export function AcceptChannel_set_dust_limit_satoshis(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21572,7 +21579,7 @@ export function AcceptChannel_set_dust_limit_satoshis(this_ptr: number, val: big } // uint64_t AcceptChannel_get_max_htlc_value_in_flight_msat(const struct LDKAcceptChannel *NONNULL_PTR this_ptr); /* @internal */ -export function AcceptChannel_get_max_htlc_value_in_flight_msat(this_ptr: number): bigint { +export function AcceptChannel_get_max_htlc_value_in_flight_msat(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21581,7 +21588,7 @@ export function AcceptChannel_get_max_htlc_value_in_flight_msat(this_ptr: number } // void AcceptChannel_set_max_htlc_value_in_flight_msat(struct LDKAcceptChannel *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function AcceptChannel_set_max_htlc_value_in_flight_msat(this_ptr: number, val: bigint): void { +export function AcceptChannel_set_max_htlc_value_in_flight_msat(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21590,7 +21597,7 @@ export function AcceptChannel_set_max_htlc_value_in_flight_msat(this_ptr: number } // uint64_t AcceptChannel_get_channel_reserve_satoshis(const struct LDKAcceptChannel *NONNULL_PTR this_ptr); /* @internal */ -export function AcceptChannel_get_channel_reserve_satoshis(this_ptr: number): bigint { +export function AcceptChannel_get_channel_reserve_satoshis(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21599,7 +21606,7 @@ export function AcceptChannel_get_channel_reserve_satoshis(this_ptr: number): bi } // void AcceptChannel_set_channel_reserve_satoshis(struct LDKAcceptChannel *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function AcceptChannel_set_channel_reserve_satoshis(this_ptr: number, val: bigint): void { +export function AcceptChannel_set_channel_reserve_satoshis(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21608,7 +21615,7 @@ export function AcceptChannel_set_channel_reserve_satoshis(this_ptr: number, val } // uint64_t AcceptChannel_get_htlc_minimum_msat(const struct LDKAcceptChannel *NONNULL_PTR this_ptr); /* @internal */ -export function AcceptChannel_get_htlc_minimum_msat(this_ptr: number): bigint { +export function AcceptChannel_get_htlc_minimum_msat(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21617,7 +21624,7 @@ export function AcceptChannel_get_htlc_minimum_msat(this_ptr: number): bigint { } // void AcceptChannel_set_htlc_minimum_msat(struct LDKAcceptChannel *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function AcceptChannel_set_htlc_minimum_msat(this_ptr: number, val: bigint): void { +export function AcceptChannel_set_htlc_minimum_msat(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21626,7 +21633,7 @@ export function AcceptChannel_set_htlc_minimum_msat(this_ptr: number, val: bigin } // uint32_t AcceptChannel_get_minimum_depth(const struct LDKAcceptChannel *NONNULL_PTR this_ptr); /* @internal */ -export function AcceptChannel_get_minimum_depth(this_ptr: number): number { +export function AcceptChannel_get_minimum_depth(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21635,7 +21642,7 @@ export function AcceptChannel_get_minimum_depth(this_ptr: number): number { } // void AcceptChannel_set_minimum_depth(struct LDKAcceptChannel *NONNULL_PTR this_ptr, uint32_t val); /* @internal */ -export function AcceptChannel_set_minimum_depth(this_ptr: number, val: number): void { +export function AcceptChannel_set_minimum_depth(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21644,7 +21651,7 @@ export function AcceptChannel_set_minimum_depth(this_ptr: number, val: number): } // uint16_t AcceptChannel_get_to_self_delay(const struct LDKAcceptChannel *NONNULL_PTR this_ptr); /* @internal */ -export function AcceptChannel_get_to_self_delay(this_ptr: number): number { +export function AcceptChannel_get_to_self_delay(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21653,7 +21660,7 @@ export function AcceptChannel_get_to_self_delay(this_ptr: number): number { } // void AcceptChannel_set_to_self_delay(struct LDKAcceptChannel *NONNULL_PTR this_ptr, uint16_t val); /* @internal */ -export function AcceptChannel_set_to_self_delay(this_ptr: number, val: number): void { +export function AcceptChannel_set_to_self_delay(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21662,7 +21669,7 @@ export function AcceptChannel_set_to_self_delay(this_ptr: number, val: number): } // uint16_t AcceptChannel_get_max_accepted_htlcs(const struct LDKAcceptChannel *NONNULL_PTR this_ptr); /* @internal */ -export function AcceptChannel_get_max_accepted_htlcs(this_ptr: number): number { +export function AcceptChannel_get_max_accepted_htlcs(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21671,7 +21678,7 @@ export function AcceptChannel_get_max_accepted_htlcs(this_ptr: number): number { } // void AcceptChannel_set_max_accepted_htlcs(struct LDKAcceptChannel *NONNULL_PTR this_ptr, uint16_t val); /* @internal */ -export function AcceptChannel_set_max_accepted_htlcs(this_ptr: number, val: number): void { +export function AcceptChannel_set_max_accepted_htlcs(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21680,7 +21687,7 @@ export function AcceptChannel_set_max_accepted_htlcs(this_ptr: number, val: numb } // struct LDKPublicKey AcceptChannel_get_funding_pubkey(const struct LDKAcceptChannel *NONNULL_PTR this_ptr); /* @internal */ -export function AcceptChannel_get_funding_pubkey(this_ptr: number): number { +export function AcceptChannel_get_funding_pubkey(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21689,7 +21696,7 @@ export function AcceptChannel_get_funding_pubkey(this_ptr: number): number { } // void AcceptChannel_set_funding_pubkey(struct LDKAcceptChannel *NONNULL_PTR this_ptr, struct LDKPublicKey val); /* @internal */ -export function AcceptChannel_set_funding_pubkey(this_ptr: number, val: number): void { +export function AcceptChannel_set_funding_pubkey(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21698,7 +21705,7 @@ export function AcceptChannel_set_funding_pubkey(this_ptr: number, val: number): } // struct LDKPublicKey AcceptChannel_get_revocation_basepoint(const struct LDKAcceptChannel *NONNULL_PTR this_ptr); /* @internal */ -export function AcceptChannel_get_revocation_basepoint(this_ptr: number): number { +export function AcceptChannel_get_revocation_basepoint(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21707,7 +21714,7 @@ export function AcceptChannel_get_revocation_basepoint(this_ptr: number): number } // void AcceptChannel_set_revocation_basepoint(struct LDKAcceptChannel *NONNULL_PTR this_ptr, struct LDKPublicKey val); /* @internal */ -export function AcceptChannel_set_revocation_basepoint(this_ptr: number, val: number): void { +export function AcceptChannel_set_revocation_basepoint(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21716,7 +21723,7 @@ export function AcceptChannel_set_revocation_basepoint(this_ptr: number, val: nu } // struct LDKPublicKey AcceptChannel_get_payment_point(const struct LDKAcceptChannel *NONNULL_PTR this_ptr); /* @internal */ -export function AcceptChannel_get_payment_point(this_ptr: number): number { +export function AcceptChannel_get_payment_point(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21725,7 +21732,7 @@ export function AcceptChannel_get_payment_point(this_ptr: number): number { } // void AcceptChannel_set_payment_point(struct LDKAcceptChannel *NONNULL_PTR this_ptr, struct LDKPublicKey val); /* @internal */ -export function AcceptChannel_set_payment_point(this_ptr: number, val: number): void { +export function AcceptChannel_set_payment_point(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21734,7 +21741,7 @@ export function AcceptChannel_set_payment_point(this_ptr: number, val: number): } // struct LDKPublicKey AcceptChannel_get_delayed_payment_basepoint(const struct LDKAcceptChannel *NONNULL_PTR this_ptr); /* @internal */ -export function AcceptChannel_get_delayed_payment_basepoint(this_ptr: number): number { +export function AcceptChannel_get_delayed_payment_basepoint(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21743,7 +21750,7 @@ export function AcceptChannel_get_delayed_payment_basepoint(this_ptr: number): n } // void AcceptChannel_set_delayed_payment_basepoint(struct LDKAcceptChannel *NONNULL_PTR this_ptr, struct LDKPublicKey val); /* @internal */ -export function AcceptChannel_set_delayed_payment_basepoint(this_ptr: number, val: number): void { +export function AcceptChannel_set_delayed_payment_basepoint(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21752,7 +21759,7 @@ export function AcceptChannel_set_delayed_payment_basepoint(this_ptr: number, va } // struct LDKPublicKey AcceptChannel_get_htlc_basepoint(const struct LDKAcceptChannel *NONNULL_PTR this_ptr); /* @internal */ -export function AcceptChannel_get_htlc_basepoint(this_ptr: number): number { +export function AcceptChannel_get_htlc_basepoint(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21761,7 +21768,7 @@ export function AcceptChannel_get_htlc_basepoint(this_ptr: number): number { } // void AcceptChannel_set_htlc_basepoint(struct LDKAcceptChannel *NONNULL_PTR this_ptr, struct LDKPublicKey val); /* @internal */ -export function AcceptChannel_set_htlc_basepoint(this_ptr: number, val: number): void { +export function AcceptChannel_set_htlc_basepoint(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21770,7 +21777,7 @@ export function AcceptChannel_set_htlc_basepoint(this_ptr: number, val: number): } // struct LDKPublicKey AcceptChannel_get_first_per_commitment_point(const struct LDKAcceptChannel *NONNULL_PTR this_ptr); /* @internal */ -export function AcceptChannel_get_first_per_commitment_point(this_ptr: number): number { +export function AcceptChannel_get_first_per_commitment_point(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21779,7 +21786,7 @@ export function AcceptChannel_get_first_per_commitment_point(this_ptr: number): } // void AcceptChannel_set_first_per_commitment_point(struct LDKAcceptChannel *NONNULL_PTR this_ptr, struct LDKPublicKey val); /* @internal */ -export function AcceptChannel_set_first_per_commitment_point(this_ptr: number, val: number): void { +export function AcceptChannel_set_first_per_commitment_point(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21788,7 +21795,7 @@ export function AcceptChannel_set_first_per_commitment_point(this_ptr: number, v } // struct LDKChannelTypeFeatures AcceptChannel_get_channel_type(const struct LDKAcceptChannel *NONNULL_PTR this_ptr); /* @internal */ -export function AcceptChannel_get_channel_type(this_ptr: number): number { +export function AcceptChannel_get_channel_type(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21797,16 +21804,16 @@ export function AcceptChannel_get_channel_type(this_ptr: number): number { } // void AcceptChannel_set_channel_type(struct LDKAcceptChannel *NONNULL_PTR this_ptr, struct LDKChannelTypeFeatures val); /* @internal */ -export function AcceptChannel_set_channel_type(this_ptr: number, val: number): void { +export function AcceptChannel_set_channel_type(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_AcceptChannel_set_channel_type(this_ptr, val); // debug statements here } - // uintptr_t AcceptChannel_clone_ptr(LDKAcceptChannel *NONNULL_PTR arg); + // uint64_t AcceptChannel_clone_ptr(LDKAcceptChannel *NONNULL_PTR arg); /* @internal */ -export function AcceptChannel_clone_ptr(arg: number): number { +export function AcceptChannel_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21815,7 +21822,7 @@ export function AcceptChannel_clone_ptr(arg: number): number { } // struct LDKAcceptChannel AcceptChannel_clone(const struct LDKAcceptChannel *NONNULL_PTR orig); /* @internal */ -export function AcceptChannel_clone(orig: number): number { +export function AcceptChannel_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21824,7 +21831,7 @@ export function AcceptChannel_clone(orig: number): number { } // void FundingCreated_free(struct LDKFundingCreated this_obj); /* @internal */ -export function FundingCreated_free(this_obj: number): void { +export function FundingCreated_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21833,7 +21840,7 @@ export function FundingCreated_free(this_obj: number): void { } // const uint8_t (*FundingCreated_get_temporary_channel_id(const struct LDKFundingCreated *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function FundingCreated_get_temporary_channel_id(this_ptr: number): number { +export function FundingCreated_get_temporary_channel_id(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21842,7 +21849,7 @@ export function FundingCreated_get_temporary_channel_id(this_ptr: number): numbe } // void FundingCreated_set_temporary_channel_id(struct LDKFundingCreated *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function FundingCreated_set_temporary_channel_id(this_ptr: number, val: number): void { +export function FundingCreated_set_temporary_channel_id(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21851,7 +21858,7 @@ export function FundingCreated_set_temporary_channel_id(this_ptr: number, val: n } // const uint8_t (*FundingCreated_get_funding_txid(const struct LDKFundingCreated *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function FundingCreated_get_funding_txid(this_ptr: number): number { +export function FundingCreated_get_funding_txid(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21860,7 +21867,7 @@ export function FundingCreated_get_funding_txid(this_ptr: number): number { } // void FundingCreated_set_funding_txid(struct LDKFundingCreated *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function FundingCreated_set_funding_txid(this_ptr: number, val: number): void { +export function FundingCreated_set_funding_txid(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21869,7 +21876,7 @@ export function FundingCreated_set_funding_txid(this_ptr: number, val: number): } // uint16_t FundingCreated_get_funding_output_index(const struct LDKFundingCreated *NONNULL_PTR this_ptr); /* @internal */ -export function FundingCreated_get_funding_output_index(this_ptr: number): number { +export function FundingCreated_get_funding_output_index(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21878,7 +21885,7 @@ export function FundingCreated_get_funding_output_index(this_ptr: number): numbe } // void FundingCreated_set_funding_output_index(struct LDKFundingCreated *NONNULL_PTR this_ptr, uint16_t val); /* @internal */ -export function FundingCreated_set_funding_output_index(this_ptr: number, val: number): void { +export function FundingCreated_set_funding_output_index(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21887,7 +21894,7 @@ export function FundingCreated_set_funding_output_index(this_ptr: number, val: n } // struct LDKSignature FundingCreated_get_signature(const struct LDKFundingCreated *NONNULL_PTR this_ptr); /* @internal */ -export function FundingCreated_get_signature(this_ptr: number): number { +export function FundingCreated_get_signature(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21896,7 +21903,7 @@ export function FundingCreated_get_signature(this_ptr: number): number { } // void FundingCreated_set_signature(struct LDKFundingCreated *NONNULL_PTR this_ptr, struct LDKSignature val); /* @internal */ -export function FundingCreated_set_signature(this_ptr: number, val: number): void { +export function FundingCreated_set_signature(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21905,16 +21912,16 @@ export function FundingCreated_set_signature(this_ptr: number, val: number): voi } // MUST_USE_RES struct LDKFundingCreated FundingCreated_new(struct LDKThirtyTwoBytes temporary_channel_id_arg, struct LDKThirtyTwoBytes funding_txid_arg, uint16_t funding_output_index_arg, struct LDKSignature signature_arg); /* @internal */ -export function FundingCreated_new(temporary_channel_id_arg: number, funding_txid_arg: number, funding_output_index_arg: number, signature_arg: number): number { +export function FundingCreated_new(temporary_channel_id_arg: number, funding_txid_arg: number, funding_output_index_arg: number, signature_arg: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_FundingCreated_new(temporary_channel_id_arg, funding_txid_arg, funding_output_index_arg, signature_arg); return nativeResponseValue; } - // uintptr_t FundingCreated_clone_ptr(LDKFundingCreated *NONNULL_PTR arg); + // uint64_t FundingCreated_clone_ptr(LDKFundingCreated *NONNULL_PTR arg); /* @internal */ -export function FundingCreated_clone_ptr(arg: number): number { +export function FundingCreated_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21923,7 +21930,7 @@ export function FundingCreated_clone_ptr(arg: number): number { } // struct LDKFundingCreated FundingCreated_clone(const struct LDKFundingCreated *NONNULL_PTR orig); /* @internal */ -export function FundingCreated_clone(orig: number): number { +export function FundingCreated_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21932,7 +21939,7 @@ export function FundingCreated_clone(orig: number): number { } // void FundingSigned_free(struct LDKFundingSigned this_obj); /* @internal */ -export function FundingSigned_free(this_obj: number): void { +export function FundingSigned_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21941,7 +21948,7 @@ export function FundingSigned_free(this_obj: number): void { } // const uint8_t (*FundingSigned_get_channel_id(const struct LDKFundingSigned *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function FundingSigned_get_channel_id(this_ptr: number): number { +export function FundingSigned_get_channel_id(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21950,7 +21957,7 @@ export function FundingSigned_get_channel_id(this_ptr: number): number { } // void FundingSigned_set_channel_id(struct LDKFundingSigned *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function FundingSigned_set_channel_id(this_ptr: number, val: number): void { +export function FundingSigned_set_channel_id(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21959,7 +21966,7 @@ export function FundingSigned_set_channel_id(this_ptr: number, val: number): voi } // struct LDKSignature FundingSigned_get_signature(const struct LDKFundingSigned *NONNULL_PTR this_ptr); /* @internal */ -export function FundingSigned_get_signature(this_ptr: number): number { +export function FundingSigned_get_signature(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21968,7 +21975,7 @@ export function FundingSigned_get_signature(this_ptr: number): number { } // void FundingSigned_set_signature(struct LDKFundingSigned *NONNULL_PTR this_ptr, struct LDKSignature val); /* @internal */ -export function FundingSigned_set_signature(this_ptr: number, val: number): void { +export function FundingSigned_set_signature(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21977,16 +21984,16 @@ export function FundingSigned_set_signature(this_ptr: number, val: number): void } // MUST_USE_RES struct LDKFundingSigned FundingSigned_new(struct LDKThirtyTwoBytes channel_id_arg, struct LDKSignature signature_arg); /* @internal */ -export function FundingSigned_new(channel_id_arg: number, signature_arg: number): number { +export function FundingSigned_new(channel_id_arg: number, signature_arg: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_FundingSigned_new(channel_id_arg, signature_arg); return nativeResponseValue; } - // uintptr_t FundingSigned_clone_ptr(LDKFundingSigned *NONNULL_PTR arg); + // uint64_t FundingSigned_clone_ptr(LDKFundingSigned *NONNULL_PTR arg); /* @internal */ -export function FundingSigned_clone_ptr(arg: number): number { +export function FundingSigned_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -21995,7 +22002,7 @@ export function FundingSigned_clone_ptr(arg: number): number { } // struct LDKFundingSigned FundingSigned_clone(const struct LDKFundingSigned *NONNULL_PTR orig); /* @internal */ -export function FundingSigned_clone(orig: number): number { +export function FundingSigned_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22004,7 +22011,7 @@ export function FundingSigned_clone(orig: number): number { } // void ChannelReady_free(struct LDKChannelReady this_obj); /* @internal */ -export function ChannelReady_free(this_obj: number): void { +export function ChannelReady_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22013,7 +22020,7 @@ export function ChannelReady_free(this_obj: number): void { } // const uint8_t (*ChannelReady_get_channel_id(const struct LDKChannelReady *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function ChannelReady_get_channel_id(this_ptr: number): number { +export function ChannelReady_get_channel_id(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22022,7 +22029,7 @@ export function ChannelReady_get_channel_id(this_ptr: number): number { } // void ChannelReady_set_channel_id(struct LDKChannelReady *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function ChannelReady_set_channel_id(this_ptr: number, val: number): void { +export function ChannelReady_set_channel_id(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22031,7 +22038,7 @@ export function ChannelReady_set_channel_id(this_ptr: number, val: number): void } // struct LDKPublicKey ChannelReady_get_next_per_commitment_point(const struct LDKChannelReady *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelReady_get_next_per_commitment_point(this_ptr: number): number { +export function ChannelReady_get_next_per_commitment_point(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22040,7 +22047,7 @@ export function ChannelReady_get_next_per_commitment_point(this_ptr: number): nu } // void ChannelReady_set_next_per_commitment_point(struct LDKChannelReady *NONNULL_PTR this_ptr, struct LDKPublicKey val); /* @internal */ -export function ChannelReady_set_next_per_commitment_point(this_ptr: number, val: number): void { +export function ChannelReady_set_next_per_commitment_point(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22049,7 +22056,7 @@ export function ChannelReady_set_next_per_commitment_point(this_ptr: number, val } // struct LDKCOption_u64Z ChannelReady_get_short_channel_id_alias(const struct LDKChannelReady *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelReady_get_short_channel_id_alias(this_ptr: number): number { +export function ChannelReady_get_short_channel_id_alias(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22058,7 +22065,7 @@ export function ChannelReady_get_short_channel_id_alias(this_ptr: number): numbe } // void ChannelReady_set_short_channel_id_alias(struct LDKChannelReady *NONNULL_PTR this_ptr, struct LDKCOption_u64Z val); /* @internal */ -export function ChannelReady_set_short_channel_id_alias(this_ptr: number, val: number): void { +export function ChannelReady_set_short_channel_id_alias(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22067,16 +22074,16 @@ export function ChannelReady_set_short_channel_id_alias(this_ptr: number, val: n } // MUST_USE_RES struct LDKChannelReady ChannelReady_new(struct LDKThirtyTwoBytes channel_id_arg, struct LDKPublicKey next_per_commitment_point_arg, struct LDKCOption_u64Z short_channel_id_alias_arg); /* @internal */ -export function ChannelReady_new(channel_id_arg: number, next_per_commitment_point_arg: number, short_channel_id_alias_arg: number): number { +export function ChannelReady_new(channel_id_arg: number, next_per_commitment_point_arg: number, short_channel_id_alias_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_ChannelReady_new(channel_id_arg, next_per_commitment_point_arg, short_channel_id_alias_arg); return nativeResponseValue; } - // uintptr_t ChannelReady_clone_ptr(LDKChannelReady *NONNULL_PTR arg); + // uint64_t ChannelReady_clone_ptr(LDKChannelReady *NONNULL_PTR arg); /* @internal */ -export function ChannelReady_clone_ptr(arg: number): number { +export function ChannelReady_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22085,7 +22092,7 @@ export function ChannelReady_clone_ptr(arg: number): number { } // struct LDKChannelReady ChannelReady_clone(const struct LDKChannelReady *NONNULL_PTR orig); /* @internal */ -export function ChannelReady_clone(orig: number): number { +export function ChannelReady_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22094,7 +22101,7 @@ export function ChannelReady_clone(orig: number): number { } // void Shutdown_free(struct LDKShutdown this_obj); /* @internal */ -export function Shutdown_free(this_obj: number): void { +export function Shutdown_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22103,7 +22110,7 @@ export function Shutdown_free(this_obj: number): void { } // const uint8_t (*Shutdown_get_channel_id(const struct LDKShutdown *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function Shutdown_get_channel_id(this_ptr: number): number { +export function Shutdown_get_channel_id(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22112,7 +22119,7 @@ export function Shutdown_get_channel_id(this_ptr: number): number { } // void Shutdown_set_channel_id(struct LDKShutdown *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function Shutdown_set_channel_id(this_ptr: number, val: number): void { +export function Shutdown_set_channel_id(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22121,7 +22128,7 @@ export function Shutdown_set_channel_id(this_ptr: number, val: number): void { } // struct LDKu8slice Shutdown_get_scriptpubkey(const struct LDKShutdown *NONNULL_PTR this_ptr); /* @internal */ -export function Shutdown_get_scriptpubkey(this_ptr: number): number { +export function Shutdown_get_scriptpubkey(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22130,7 +22137,7 @@ export function Shutdown_get_scriptpubkey(this_ptr: number): number { } // void Shutdown_set_scriptpubkey(struct LDKShutdown *NONNULL_PTR this_ptr, struct LDKCVec_u8Z val); /* @internal */ -export function Shutdown_set_scriptpubkey(this_ptr: number, val: number): void { +export function Shutdown_set_scriptpubkey(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22139,16 +22146,16 @@ export function Shutdown_set_scriptpubkey(this_ptr: number, val: number): void { } // MUST_USE_RES struct LDKShutdown Shutdown_new(struct LDKThirtyTwoBytes channel_id_arg, struct LDKCVec_u8Z scriptpubkey_arg); /* @internal */ -export function Shutdown_new(channel_id_arg: number, scriptpubkey_arg: number): number { +export function Shutdown_new(channel_id_arg: number, scriptpubkey_arg: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_Shutdown_new(channel_id_arg, scriptpubkey_arg); return nativeResponseValue; } - // uintptr_t Shutdown_clone_ptr(LDKShutdown *NONNULL_PTR arg); + // uint64_t Shutdown_clone_ptr(LDKShutdown *NONNULL_PTR arg); /* @internal */ -export function Shutdown_clone_ptr(arg: number): number { +export function Shutdown_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22157,7 +22164,7 @@ export function Shutdown_clone_ptr(arg: number): number { } // struct LDKShutdown Shutdown_clone(const struct LDKShutdown *NONNULL_PTR orig); /* @internal */ -export function Shutdown_clone(orig: number): number { +export function Shutdown_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22166,7 +22173,7 @@ export function Shutdown_clone(orig: number): number { } // void ClosingSignedFeeRange_free(struct LDKClosingSignedFeeRange this_obj); /* @internal */ -export function ClosingSignedFeeRange_free(this_obj: number): void { +export function ClosingSignedFeeRange_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22175,7 +22182,7 @@ export function ClosingSignedFeeRange_free(this_obj: number): void { } // uint64_t ClosingSignedFeeRange_get_min_fee_satoshis(const struct LDKClosingSignedFeeRange *NONNULL_PTR this_ptr); /* @internal */ -export function ClosingSignedFeeRange_get_min_fee_satoshis(this_ptr: number): bigint { +export function ClosingSignedFeeRange_get_min_fee_satoshis(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22184,7 +22191,7 @@ export function ClosingSignedFeeRange_get_min_fee_satoshis(this_ptr: number): bi } // void ClosingSignedFeeRange_set_min_fee_satoshis(struct LDKClosingSignedFeeRange *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function ClosingSignedFeeRange_set_min_fee_satoshis(this_ptr: number, val: bigint): void { +export function ClosingSignedFeeRange_set_min_fee_satoshis(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22193,7 +22200,7 @@ export function ClosingSignedFeeRange_set_min_fee_satoshis(this_ptr: number, val } // uint64_t ClosingSignedFeeRange_get_max_fee_satoshis(const struct LDKClosingSignedFeeRange *NONNULL_PTR this_ptr); /* @internal */ -export function ClosingSignedFeeRange_get_max_fee_satoshis(this_ptr: number): bigint { +export function ClosingSignedFeeRange_get_max_fee_satoshis(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22202,7 +22209,7 @@ export function ClosingSignedFeeRange_get_max_fee_satoshis(this_ptr: number): bi } // void ClosingSignedFeeRange_set_max_fee_satoshis(struct LDKClosingSignedFeeRange *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function ClosingSignedFeeRange_set_max_fee_satoshis(this_ptr: number, val: bigint): void { +export function ClosingSignedFeeRange_set_max_fee_satoshis(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22211,16 +22218,16 @@ export function ClosingSignedFeeRange_set_max_fee_satoshis(this_ptr: number, val } // MUST_USE_RES struct LDKClosingSignedFeeRange ClosingSignedFeeRange_new(uint64_t min_fee_satoshis_arg, uint64_t max_fee_satoshis_arg); /* @internal */ -export function ClosingSignedFeeRange_new(min_fee_satoshis_arg: bigint, max_fee_satoshis_arg: bigint): number { +export function ClosingSignedFeeRange_new(min_fee_satoshis_arg: bigint, max_fee_satoshis_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_ClosingSignedFeeRange_new(min_fee_satoshis_arg, max_fee_satoshis_arg); return nativeResponseValue; } - // uintptr_t ClosingSignedFeeRange_clone_ptr(LDKClosingSignedFeeRange *NONNULL_PTR arg); + // uint64_t ClosingSignedFeeRange_clone_ptr(LDKClosingSignedFeeRange *NONNULL_PTR arg); /* @internal */ -export function ClosingSignedFeeRange_clone_ptr(arg: number): number { +export function ClosingSignedFeeRange_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22229,7 +22236,7 @@ export function ClosingSignedFeeRange_clone_ptr(arg: number): number { } // struct LDKClosingSignedFeeRange ClosingSignedFeeRange_clone(const struct LDKClosingSignedFeeRange *NONNULL_PTR orig); /* @internal */ -export function ClosingSignedFeeRange_clone(orig: number): number { +export function ClosingSignedFeeRange_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22238,7 +22245,7 @@ export function ClosingSignedFeeRange_clone(orig: number): number { } // void ClosingSigned_free(struct LDKClosingSigned this_obj); /* @internal */ -export function ClosingSigned_free(this_obj: number): void { +export function ClosingSigned_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22247,7 +22254,7 @@ export function ClosingSigned_free(this_obj: number): void { } // const uint8_t (*ClosingSigned_get_channel_id(const struct LDKClosingSigned *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function ClosingSigned_get_channel_id(this_ptr: number): number { +export function ClosingSigned_get_channel_id(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22256,7 +22263,7 @@ export function ClosingSigned_get_channel_id(this_ptr: number): number { } // void ClosingSigned_set_channel_id(struct LDKClosingSigned *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function ClosingSigned_set_channel_id(this_ptr: number, val: number): void { +export function ClosingSigned_set_channel_id(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22265,7 +22272,7 @@ export function ClosingSigned_set_channel_id(this_ptr: number, val: number): voi } // uint64_t ClosingSigned_get_fee_satoshis(const struct LDKClosingSigned *NONNULL_PTR this_ptr); /* @internal */ -export function ClosingSigned_get_fee_satoshis(this_ptr: number): bigint { +export function ClosingSigned_get_fee_satoshis(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22274,7 +22281,7 @@ export function ClosingSigned_get_fee_satoshis(this_ptr: number): bigint { } // void ClosingSigned_set_fee_satoshis(struct LDKClosingSigned *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function ClosingSigned_set_fee_satoshis(this_ptr: number, val: bigint): void { +export function ClosingSigned_set_fee_satoshis(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22283,7 +22290,7 @@ export function ClosingSigned_set_fee_satoshis(this_ptr: number, val: bigint): v } // struct LDKSignature ClosingSigned_get_signature(const struct LDKClosingSigned *NONNULL_PTR this_ptr); /* @internal */ -export function ClosingSigned_get_signature(this_ptr: number): number { +export function ClosingSigned_get_signature(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22292,7 +22299,7 @@ export function ClosingSigned_get_signature(this_ptr: number): number { } // void ClosingSigned_set_signature(struct LDKClosingSigned *NONNULL_PTR this_ptr, struct LDKSignature val); /* @internal */ -export function ClosingSigned_set_signature(this_ptr: number, val: number): void { +export function ClosingSigned_set_signature(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22301,7 +22308,7 @@ export function ClosingSigned_set_signature(this_ptr: number, val: number): void } // struct LDKClosingSignedFeeRange ClosingSigned_get_fee_range(const struct LDKClosingSigned *NONNULL_PTR this_ptr); /* @internal */ -export function ClosingSigned_get_fee_range(this_ptr: number): number { +export function ClosingSigned_get_fee_range(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22310,7 +22317,7 @@ export function ClosingSigned_get_fee_range(this_ptr: number): number { } // void ClosingSigned_set_fee_range(struct LDKClosingSigned *NONNULL_PTR this_ptr, struct LDKClosingSignedFeeRange val); /* @internal */ -export function ClosingSigned_set_fee_range(this_ptr: number, val: number): void { +export function ClosingSigned_set_fee_range(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22319,16 +22326,16 @@ export function ClosingSigned_set_fee_range(this_ptr: number, val: number): void } // MUST_USE_RES struct LDKClosingSigned ClosingSigned_new(struct LDKThirtyTwoBytes channel_id_arg, uint64_t fee_satoshis_arg, struct LDKSignature signature_arg, struct LDKClosingSignedFeeRange fee_range_arg); /* @internal */ -export function ClosingSigned_new(channel_id_arg: number, fee_satoshis_arg: bigint, signature_arg: number, fee_range_arg: number): number { +export function ClosingSigned_new(channel_id_arg: number, fee_satoshis_arg: bigint, signature_arg: number, fee_range_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_ClosingSigned_new(channel_id_arg, fee_satoshis_arg, signature_arg, fee_range_arg); return nativeResponseValue; } - // uintptr_t ClosingSigned_clone_ptr(LDKClosingSigned *NONNULL_PTR arg); + // uint64_t ClosingSigned_clone_ptr(LDKClosingSigned *NONNULL_PTR arg); /* @internal */ -export function ClosingSigned_clone_ptr(arg: number): number { +export function ClosingSigned_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22337,7 +22344,7 @@ export function ClosingSigned_clone_ptr(arg: number): number { } // struct LDKClosingSigned ClosingSigned_clone(const struct LDKClosingSigned *NONNULL_PTR orig); /* @internal */ -export function ClosingSigned_clone(orig: number): number { +export function ClosingSigned_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22346,7 +22353,7 @@ export function ClosingSigned_clone(orig: number): number { } // void UpdateAddHTLC_free(struct LDKUpdateAddHTLC this_obj); /* @internal */ -export function UpdateAddHTLC_free(this_obj: number): void { +export function UpdateAddHTLC_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22355,7 +22362,7 @@ export function UpdateAddHTLC_free(this_obj: number): void { } // const uint8_t (*UpdateAddHTLC_get_channel_id(const struct LDKUpdateAddHTLC *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function UpdateAddHTLC_get_channel_id(this_ptr: number): number { +export function UpdateAddHTLC_get_channel_id(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22364,7 +22371,7 @@ export function UpdateAddHTLC_get_channel_id(this_ptr: number): number { } // void UpdateAddHTLC_set_channel_id(struct LDKUpdateAddHTLC *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function UpdateAddHTLC_set_channel_id(this_ptr: number, val: number): void { +export function UpdateAddHTLC_set_channel_id(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22373,7 +22380,7 @@ export function UpdateAddHTLC_set_channel_id(this_ptr: number, val: number): voi } // uint64_t UpdateAddHTLC_get_htlc_id(const struct LDKUpdateAddHTLC *NONNULL_PTR this_ptr); /* @internal */ -export function UpdateAddHTLC_get_htlc_id(this_ptr: number): bigint { +export function UpdateAddHTLC_get_htlc_id(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22382,7 +22389,7 @@ export function UpdateAddHTLC_get_htlc_id(this_ptr: number): bigint { } // void UpdateAddHTLC_set_htlc_id(struct LDKUpdateAddHTLC *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function UpdateAddHTLC_set_htlc_id(this_ptr: number, val: bigint): void { +export function UpdateAddHTLC_set_htlc_id(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22391,7 +22398,7 @@ export function UpdateAddHTLC_set_htlc_id(this_ptr: number, val: bigint): void { } // uint64_t UpdateAddHTLC_get_amount_msat(const struct LDKUpdateAddHTLC *NONNULL_PTR this_ptr); /* @internal */ -export function UpdateAddHTLC_get_amount_msat(this_ptr: number): bigint { +export function UpdateAddHTLC_get_amount_msat(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22400,7 +22407,7 @@ export function UpdateAddHTLC_get_amount_msat(this_ptr: number): bigint { } // void UpdateAddHTLC_set_amount_msat(struct LDKUpdateAddHTLC *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function UpdateAddHTLC_set_amount_msat(this_ptr: number, val: bigint): void { +export function UpdateAddHTLC_set_amount_msat(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22409,7 +22416,7 @@ export function UpdateAddHTLC_set_amount_msat(this_ptr: number, val: bigint): vo } // const uint8_t (*UpdateAddHTLC_get_payment_hash(const struct LDKUpdateAddHTLC *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function UpdateAddHTLC_get_payment_hash(this_ptr: number): number { +export function UpdateAddHTLC_get_payment_hash(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22418,7 +22425,7 @@ export function UpdateAddHTLC_get_payment_hash(this_ptr: number): number { } // void UpdateAddHTLC_set_payment_hash(struct LDKUpdateAddHTLC *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function UpdateAddHTLC_set_payment_hash(this_ptr: number, val: number): void { +export function UpdateAddHTLC_set_payment_hash(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22427,7 +22434,7 @@ export function UpdateAddHTLC_set_payment_hash(this_ptr: number, val: number): v } // uint32_t UpdateAddHTLC_get_cltv_expiry(const struct LDKUpdateAddHTLC *NONNULL_PTR this_ptr); /* @internal */ -export function UpdateAddHTLC_get_cltv_expiry(this_ptr: number): number { +export function UpdateAddHTLC_get_cltv_expiry(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22436,16 +22443,16 @@ export function UpdateAddHTLC_get_cltv_expiry(this_ptr: number): number { } // void UpdateAddHTLC_set_cltv_expiry(struct LDKUpdateAddHTLC *NONNULL_PTR this_ptr, uint32_t val); /* @internal */ -export function UpdateAddHTLC_set_cltv_expiry(this_ptr: number, val: number): void { +export function UpdateAddHTLC_set_cltv_expiry(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_UpdateAddHTLC_set_cltv_expiry(this_ptr, val); // debug statements here } - // uintptr_t UpdateAddHTLC_clone_ptr(LDKUpdateAddHTLC *NONNULL_PTR arg); + // uint64_t UpdateAddHTLC_clone_ptr(LDKUpdateAddHTLC *NONNULL_PTR arg); /* @internal */ -export function UpdateAddHTLC_clone_ptr(arg: number): number { +export function UpdateAddHTLC_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22454,7 +22461,7 @@ export function UpdateAddHTLC_clone_ptr(arg: number): number { } // struct LDKUpdateAddHTLC UpdateAddHTLC_clone(const struct LDKUpdateAddHTLC *NONNULL_PTR orig); /* @internal */ -export function UpdateAddHTLC_clone(orig: number): number { +export function UpdateAddHTLC_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22463,7 +22470,7 @@ export function UpdateAddHTLC_clone(orig: number): number { } // void UpdateFulfillHTLC_free(struct LDKUpdateFulfillHTLC this_obj); /* @internal */ -export function UpdateFulfillHTLC_free(this_obj: number): void { +export function UpdateFulfillHTLC_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22472,7 +22479,7 @@ export function UpdateFulfillHTLC_free(this_obj: number): void { } // const uint8_t (*UpdateFulfillHTLC_get_channel_id(const struct LDKUpdateFulfillHTLC *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function UpdateFulfillHTLC_get_channel_id(this_ptr: number): number { +export function UpdateFulfillHTLC_get_channel_id(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22481,7 +22488,7 @@ export function UpdateFulfillHTLC_get_channel_id(this_ptr: number): number { } // void UpdateFulfillHTLC_set_channel_id(struct LDKUpdateFulfillHTLC *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function UpdateFulfillHTLC_set_channel_id(this_ptr: number, val: number): void { +export function UpdateFulfillHTLC_set_channel_id(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22490,7 +22497,7 @@ export function UpdateFulfillHTLC_set_channel_id(this_ptr: number, val: number): } // uint64_t UpdateFulfillHTLC_get_htlc_id(const struct LDKUpdateFulfillHTLC *NONNULL_PTR this_ptr); /* @internal */ -export function UpdateFulfillHTLC_get_htlc_id(this_ptr: number): bigint { +export function UpdateFulfillHTLC_get_htlc_id(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22499,7 +22506,7 @@ export function UpdateFulfillHTLC_get_htlc_id(this_ptr: number): bigint { } // void UpdateFulfillHTLC_set_htlc_id(struct LDKUpdateFulfillHTLC *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function UpdateFulfillHTLC_set_htlc_id(this_ptr: number, val: bigint): void { +export function UpdateFulfillHTLC_set_htlc_id(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22508,7 +22515,7 @@ export function UpdateFulfillHTLC_set_htlc_id(this_ptr: number, val: bigint): vo } // const uint8_t (*UpdateFulfillHTLC_get_payment_preimage(const struct LDKUpdateFulfillHTLC *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function UpdateFulfillHTLC_get_payment_preimage(this_ptr: number): number { +export function UpdateFulfillHTLC_get_payment_preimage(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22517,7 +22524,7 @@ export function UpdateFulfillHTLC_get_payment_preimage(this_ptr: number): number } // void UpdateFulfillHTLC_set_payment_preimage(struct LDKUpdateFulfillHTLC *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function UpdateFulfillHTLC_set_payment_preimage(this_ptr: number, val: number): void { +export function UpdateFulfillHTLC_set_payment_preimage(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22526,16 +22533,16 @@ export function UpdateFulfillHTLC_set_payment_preimage(this_ptr: number, val: nu } // MUST_USE_RES struct LDKUpdateFulfillHTLC UpdateFulfillHTLC_new(struct LDKThirtyTwoBytes channel_id_arg, uint64_t htlc_id_arg, struct LDKThirtyTwoBytes payment_preimage_arg); /* @internal */ -export function UpdateFulfillHTLC_new(channel_id_arg: number, htlc_id_arg: bigint, payment_preimage_arg: number): number { +export function UpdateFulfillHTLC_new(channel_id_arg: number, htlc_id_arg: bigint, payment_preimage_arg: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_UpdateFulfillHTLC_new(channel_id_arg, htlc_id_arg, payment_preimage_arg); return nativeResponseValue; } - // uintptr_t UpdateFulfillHTLC_clone_ptr(LDKUpdateFulfillHTLC *NONNULL_PTR arg); + // uint64_t UpdateFulfillHTLC_clone_ptr(LDKUpdateFulfillHTLC *NONNULL_PTR arg); /* @internal */ -export function UpdateFulfillHTLC_clone_ptr(arg: number): number { +export function UpdateFulfillHTLC_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22544,7 +22551,7 @@ export function UpdateFulfillHTLC_clone_ptr(arg: number): number { } // struct LDKUpdateFulfillHTLC UpdateFulfillHTLC_clone(const struct LDKUpdateFulfillHTLC *NONNULL_PTR orig); /* @internal */ -export function UpdateFulfillHTLC_clone(orig: number): number { +export function UpdateFulfillHTLC_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22553,7 +22560,7 @@ export function UpdateFulfillHTLC_clone(orig: number): number { } // void UpdateFailHTLC_free(struct LDKUpdateFailHTLC this_obj); /* @internal */ -export function UpdateFailHTLC_free(this_obj: number): void { +export function UpdateFailHTLC_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22562,7 +22569,7 @@ export function UpdateFailHTLC_free(this_obj: number): void { } // const uint8_t (*UpdateFailHTLC_get_channel_id(const struct LDKUpdateFailHTLC *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function UpdateFailHTLC_get_channel_id(this_ptr: number): number { +export function UpdateFailHTLC_get_channel_id(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22571,7 +22578,7 @@ export function UpdateFailHTLC_get_channel_id(this_ptr: number): number { } // void UpdateFailHTLC_set_channel_id(struct LDKUpdateFailHTLC *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function UpdateFailHTLC_set_channel_id(this_ptr: number, val: number): void { +export function UpdateFailHTLC_set_channel_id(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22580,7 +22587,7 @@ export function UpdateFailHTLC_set_channel_id(this_ptr: number, val: number): vo } // uint64_t UpdateFailHTLC_get_htlc_id(const struct LDKUpdateFailHTLC *NONNULL_PTR this_ptr); /* @internal */ -export function UpdateFailHTLC_get_htlc_id(this_ptr: number): bigint { +export function UpdateFailHTLC_get_htlc_id(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22589,16 +22596,16 @@ export function UpdateFailHTLC_get_htlc_id(this_ptr: number): bigint { } // void UpdateFailHTLC_set_htlc_id(struct LDKUpdateFailHTLC *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function UpdateFailHTLC_set_htlc_id(this_ptr: number, val: bigint): void { +export function UpdateFailHTLC_set_htlc_id(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_UpdateFailHTLC_set_htlc_id(this_ptr, val); // debug statements here } - // uintptr_t UpdateFailHTLC_clone_ptr(LDKUpdateFailHTLC *NONNULL_PTR arg); + // uint64_t UpdateFailHTLC_clone_ptr(LDKUpdateFailHTLC *NONNULL_PTR arg); /* @internal */ -export function UpdateFailHTLC_clone_ptr(arg: number): number { +export function UpdateFailHTLC_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22607,7 +22614,7 @@ export function UpdateFailHTLC_clone_ptr(arg: number): number { } // struct LDKUpdateFailHTLC UpdateFailHTLC_clone(const struct LDKUpdateFailHTLC *NONNULL_PTR orig); /* @internal */ -export function UpdateFailHTLC_clone(orig: number): number { +export function UpdateFailHTLC_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22616,7 +22623,7 @@ export function UpdateFailHTLC_clone(orig: number): number { } // void UpdateFailMalformedHTLC_free(struct LDKUpdateFailMalformedHTLC this_obj); /* @internal */ -export function UpdateFailMalformedHTLC_free(this_obj: number): void { +export function UpdateFailMalformedHTLC_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22625,7 +22632,7 @@ export function UpdateFailMalformedHTLC_free(this_obj: number): void { } // const uint8_t (*UpdateFailMalformedHTLC_get_channel_id(const struct LDKUpdateFailMalformedHTLC *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function UpdateFailMalformedHTLC_get_channel_id(this_ptr: number): number { +export function UpdateFailMalformedHTLC_get_channel_id(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22634,7 +22641,7 @@ export function UpdateFailMalformedHTLC_get_channel_id(this_ptr: number): number } // void UpdateFailMalformedHTLC_set_channel_id(struct LDKUpdateFailMalformedHTLC *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function UpdateFailMalformedHTLC_set_channel_id(this_ptr: number, val: number): void { +export function UpdateFailMalformedHTLC_set_channel_id(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22643,7 +22650,7 @@ export function UpdateFailMalformedHTLC_set_channel_id(this_ptr: number, val: nu } // uint64_t UpdateFailMalformedHTLC_get_htlc_id(const struct LDKUpdateFailMalformedHTLC *NONNULL_PTR this_ptr); /* @internal */ -export function UpdateFailMalformedHTLC_get_htlc_id(this_ptr: number): bigint { +export function UpdateFailMalformedHTLC_get_htlc_id(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22652,7 +22659,7 @@ export function UpdateFailMalformedHTLC_get_htlc_id(this_ptr: number): bigint { } // void UpdateFailMalformedHTLC_set_htlc_id(struct LDKUpdateFailMalformedHTLC *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function UpdateFailMalformedHTLC_set_htlc_id(this_ptr: number, val: bigint): void { +export function UpdateFailMalformedHTLC_set_htlc_id(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22661,7 +22668,7 @@ export function UpdateFailMalformedHTLC_set_htlc_id(this_ptr: number, val: bigin } // uint16_t UpdateFailMalformedHTLC_get_failure_code(const struct LDKUpdateFailMalformedHTLC *NONNULL_PTR this_ptr); /* @internal */ -export function UpdateFailMalformedHTLC_get_failure_code(this_ptr: number): number { +export function UpdateFailMalformedHTLC_get_failure_code(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22670,16 +22677,16 @@ export function UpdateFailMalformedHTLC_get_failure_code(this_ptr: number): numb } // void UpdateFailMalformedHTLC_set_failure_code(struct LDKUpdateFailMalformedHTLC *NONNULL_PTR this_ptr, uint16_t val); /* @internal */ -export function UpdateFailMalformedHTLC_set_failure_code(this_ptr: number, val: number): void { +export function UpdateFailMalformedHTLC_set_failure_code(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_UpdateFailMalformedHTLC_set_failure_code(this_ptr, val); // debug statements here } - // uintptr_t UpdateFailMalformedHTLC_clone_ptr(LDKUpdateFailMalformedHTLC *NONNULL_PTR arg); + // uint64_t UpdateFailMalformedHTLC_clone_ptr(LDKUpdateFailMalformedHTLC *NONNULL_PTR arg); /* @internal */ -export function UpdateFailMalformedHTLC_clone_ptr(arg: number): number { +export function UpdateFailMalformedHTLC_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22688,7 +22695,7 @@ export function UpdateFailMalformedHTLC_clone_ptr(arg: number): number { } // struct LDKUpdateFailMalformedHTLC UpdateFailMalformedHTLC_clone(const struct LDKUpdateFailMalformedHTLC *NONNULL_PTR orig); /* @internal */ -export function UpdateFailMalformedHTLC_clone(orig: number): number { +export function UpdateFailMalformedHTLC_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22697,7 +22704,7 @@ export function UpdateFailMalformedHTLC_clone(orig: number): number { } // void CommitmentSigned_free(struct LDKCommitmentSigned this_obj); /* @internal */ -export function CommitmentSigned_free(this_obj: number): void { +export function CommitmentSigned_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22706,7 +22713,7 @@ export function CommitmentSigned_free(this_obj: number): void { } // const uint8_t (*CommitmentSigned_get_channel_id(const struct LDKCommitmentSigned *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function CommitmentSigned_get_channel_id(this_ptr: number): number { +export function CommitmentSigned_get_channel_id(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22715,7 +22722,7 @@ export function CommitmentSigned_get_channel_id(this_ptr: number): number { } // void CommitmentSigned_set_channel_id(struct LDKCommitmentSigned *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function CommitmentSigned_set_channel_id(this_ptr: number, val: number): void { +export function CommitmentSigned_set_channel_id(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22724,7 +22731,7 @@ export function CommitmentSigned_set_channel_id(this_ptr: number, val: number): } // struct LDKSignature CommitmentSigned_get_signature(const struct LDKCommitmentSigned *NONNULL_PTR this_ptr); /* @internal */ -export function CommitmentSigned_get_signature(this_ptr: number): number { +export function CommitmentSigned_get_signature(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22733,7 +22740,7 @@ export function CommitmentSigned_get_signature(this_ptr: number): number { } // void CommitmentSigned_set_signature(struct LDKCommitmentSigned *NONNULL_PTR this_ptr, struct LDKSignature val); /* @internal */ -export function CommitmentSigned_set_signature(this_ptr: number, val: number): void { +export function CommitmentSigned_set_signature(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22742,7 +22749,7 @@ export function CommitmentSigned_set_signature(this_ptr: number, val: number): v } // struct LDKCVec_SignatureZ CommitmentSigned_get_htlc_signatures(const struct LDKCommitmentSigned *NONNULL_PTR this_ptr); /* @internal */ -export function CommitmentSigned_get_htlc_signatures(this_ptr: number): number { +export function CommitmentSigned_get_htlc_signatures(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22751,7 +22758,7 @@ export function CommitmentSigned_get_htlc_signatures(this_ptr: number): number { } // void CommitmentSigned_set_htlc_signatures(struct LDKCommitmentSigned *NONNULL_PTR this_ptr, struct LDKCVec_SignatureZ val); /* @internal */ -export function CommitmentSigned_set_htlc_signatures(this_ptr: number, val: number): void { +export function CommitmentSigned_set_htlc_signatures(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22760,16 +22767,16 @@ export function CommitmentSigned_set_htlc_signatures(this_ptr: number, val: numb } // MUST_USE_RES struct LDKCommitmentSigned CommitmentSigned_new(struct LDKThirtyTwoBytes channel_id_arg, struct LDKSignature signature_arg, struct LDKCVec_SignatureZ htlc_signatures_arg); /* @internal */ -export function CommitmentSigned_new(channel_id_arg: number, signature_arg: number, htlc_signatures_arg: number): number { +export function CommitmentSigned_new(channel_id_arg: number, signature_arg: number, htlc_signatures_arg: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CommitmentSigned_new(channel_id_arg, signature_arg, htlc_signatures_arg); return nativeResponseValue; } - // uintptr_t CommitmentSigned_clone_ptr(LDKCommitmentSigned *NONNULL_PTR arg); + // uint64_t CommitmentSigned_clone_ptr(LDKCommitmentSigned *NONNULL_PTR arg); /* @internal */ -export function CommitmentSigned_clone_ptr(arg: number): number { +export function CommitmentSigned_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22778,7 +22785,7 @@ export function CommitmentSigned_clone_ptr(arg: number): number { } // struct LDKCommitmentSigned CommitmentSigned_clone(const struct LDKCommitmentSigned *NONNULL_PTR orig); /* @internal */ -export function CommitmentSigned_clone(orig: number): number { +export function CommitmentSigned_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22787,7 +22794,7 @@ export function CommitmentSigned_clone(orig: number): number { } // void RevokeAndACK_free(struct LDKRevokeAndACK this_obj); /* @internal */ -export function RevokeAndACK_free(this_obj: number): void { +export function RevokeAndACK_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22796,7 +22803,7 @@ export function RevokeAndACK_free(this_obj: number): void { } // const uint8_t (*RevokeAndACK_get_channel_id(const struct LDKRevokeAndACK *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function RevokeAndACK_get_channel_id(this_ptr: number): number { +export function RevokeAndACK_get_channel_id(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22805,7 +22812,7 @@ export function RevokeAndACK_get_channel_id(this_ptr: number): number { } // void RevokeAndACK_set_channel_id(struct LDKRevokeAndACK *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function RevokeAndACK_set_channel_id(this_ptr: number, val: number): void { +export function RevokeAndACK_set_channel_id(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22814,7 +22821,7 @@ export function RevokeAndACK_set_channel_id(this_ptr: number, val: number): void } // const uint8_t (*RevokeAndACK_get_per_commitment_secret(const struct LDKRevokeAndACK *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function RevokeAndACK_get_per_commitment_secret(this_ptr: number): number { +export function RevokeAndACK_get_per_commitment_secret(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22823,7 +22830,7 @@ export function RevokeAndACK_get_per_commitment_secret(this_ptr: number): number } // void RevokeAndACK_set_per_commitment_secret(struct LDKRevokeAndACK *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function RevokeAndACK_set_per_commitment_secret(this_ptr: number, val: number): void { +export function RevokeAndACK_set_per_commitment_secret(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22832,7 +22839,7 @@ export function RevokeAndACK_set_per_commitment_secret(this_ptr: number, val: nu } // struct LDKPublicKey RevokeAndACK_get_next_per_commitment_point(const struct LDKRevokeAndACK *NONNULL_PTR this_ptr); /* @internal */ -export function RevokeAndACK_get_next_per_commitment_point(this_ptr: number): number { +export function RevokeAndACK_get_next_per_commitment_point(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22841,7 +22848,7 @@ export function RevokeAndACK_get_next_per_commitment_point(this_ptr: number): nu } // void RevokeAndACK_set_next_per_commitment_point(struct LDKRevokeAndACK *NONNULL_PTR this_ptr, struct LDKPublicKey val); /* @internal */ -export function RevokeAndACK_set_next_per_commitment_point(this_ptr: number, val: number): void { +export function RevokeAndACK_set_next_per_commitment_point(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22850,16 +22857,16 @@ export function RevokeAndACK_set_next_per_commitment_point(this_ptr: number, val } // MUST_USE_RES struct LDKRevokeAndACK RevokeAndACK_new(struct LDKThirtyTwoBytes channel_id_arg, struct LDKThirtyTwoBytes per_commitment_secret_arg, struct LDKPublicKey next_per_commitment_point_arg); /* @internal */ -export function RevokeAndACK_new(channel_id_arg: number, per_commitment_secret_arg: number, next_per_commitment_point_arg: number): number { +export function RevokeAndACK_new(channel_id_arg: number, per_commitment_secret_arg: number, next_per_commitment_point_arg: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_RevokeAndACK_new(channel_id_arg, per_commitment_secret_arg, next_per_commitment_point_arg); return nativeResponseValue; } - // uintptr_t RevokeAndACK_clone_ptr(LDKRevokeAndACK *NONNULL_PTR arg); + // uint64_t RevokeAndACK_clone_ptr(LDKRevokeAndACK *NONNULL_PTR arg); /* @internal */ -export function RevokeAndACK_clone_ptr(arg: number): number { +export function RevokeAndACK_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22868,7 +22875,7 @@ export function RevokeAndACK_clone_ptr(arg: number): number { } // struct LDKRevokeAndACK RevokeAndACK_clone(const struct LDKRevokeAndACK *NONNULL_PTR orig); /* @internal */ -export function RevokeAndACK_clone(orig: number): number { +export function RevokeAndACK_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22877,7 +22884,7 @@ export function RevokeAndACK_clone(orig: number): number { } // void UpdateFee_free(struct LDKUpdateFee this_obj); /* @internal */ -export function UpdateFee_free(this_obj: number): void { +export function UpdateFee_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22886,7 +22893,7 @@ export function UpdateFee_free(this_obj: number): void { } // const uint8_t (*UpdateFee_get_channel_id(const struct LDKUpdateFee *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function UpdateFee_get_channel_id(this_ptr: number): number { +export function UpdateFee_get_channel_id(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22895,7 +22902,7 @@ export function UpdateFee_get_channel_id(this_ptr: number): number { } // void UpdateFee_set_channel_id(struct LDKUpdateFee *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function UpdateFee_set_channel_id(this_ptr: number, val: number): void { +export function UpdateFee_set_channel_id(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22904,7 +22911,7 @@ export function UpdateFee_set_channel_id(this_ptr: number, val: number): void { } // uint32_t UpdateFee_get_feerate_per_kw(const struct LDKUpdateFee *NONNULL_PTR this_ptr); /* @internal */ -export function UpdateFee_get_feerate_per_kw(this_ptr: number): number { +export function UpdateFee_get_feerate_per_kw(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22913,7 +22920,7 @@ export function UpdateFee_get_feerate_per_kw(this_ptr: number): number { } // void UpdateFee_set_feerate_per_kw(struct LDKUpdateFee *NONNULL_PTR this_ptr, uint32_t val); /* @internal */ -export function UpdateFee_set_feerate_per_kw(this_ptr: number, val: number): void { +export function UpdateFee_set_feerate_per_kw(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22922,16 +22929,16 @@ export function UpdateFee_set_feerate_per_kw(this_ptr: number, val: number): voi } // MUST_USE_RES struct LDKUpdateFee UpdateFee_new(struct LDKThirtyTwoBytes channel_id_arg, uint32_t feerate_per_kw_arg); /* @internal */ -export function UpdateFee_new(channel_id_arg: number, feerate_per_kw_arg: number): number { +export function UpdateFee_new(channel_id_arg: number, feerate_per_kw_arg: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_UpdateFee_new(channel_id_arg, feerate_per_kw_arg); return nativeResponseValue; } - // uintptr_t UpdateFee_clone_ptr(LDKUpdateFee *NONNULL_PTR arg); + // uint64_t UpdateFee_clone_ptr(LDKUpdateFee *NONNULL_PTR arg); /* @internal */ -export function UpdateFee_clone_ptr(arg: number): number { +export function UpdateFee_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22940,7 +22947,7 @@ export function UpdateFee_clone_ptr(arg: number): number { } // struct LDKUpdateFee UpdateFee_clone(const struct LDKUpdateFee *NONNULL_PTR orig); /* @internal */ -export function UpdateFee_clone(orig: number): number { +export function UpdateFee_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22949,7 +22956,7 @@ export function UpdateFee_clone(orig: number): number { } // void DataLossProtect_free(struct LDKDataLossProtect this_obj); /* @internal */ -export function DataLossProtect_free(this_obj: number): void { +export function DataLossProtect_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22958,7 +22965,7 @@ export function DataLossProtect_free(this_obj: number): void { } // const uint8_t (*DataLossProtect_get_your_last_per_commitment_secret(const struct LDKDataLossProtect *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function DataLossProtect_get_your_last_per_commitment_secret(this_ptr: number): number { +export function DataLossProtect_get_your_last_per_commitment_secret(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22967,7 +22974,7 @@ export function DataLossProtect_get_your_last_per_commitment_secret(this_ptr: nu } // void DataLossProtect_set_your_last_per_commitment_secret(struct LDKDataLossProtect *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function DataLossProtect_set_your_last_per_commitment_secret(this_ptr: number, val: number): void { +export function DataLossProtect_set_your_last_per_commitment_secret(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22976,7 +22983,7 @@ export function DataLossProtect_set_your_last_per_commitment_secret(this_ptr: nu } // struct LDKPublicKey DataLossProtect_get_my_current_per_commitment_point(const struct LDKDataLossProtect *NONNULL_PTR this_ptr); /* @internal */ -export function DataLossProtect_get_my_current_per_commitment_point(this_ptr: number): number { +export function DataLossProtect_get_my_current_per_commitment_point(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22985,7 +22992,7 @@ export function DataLossProtect_get_my_current_per_commitment_point(this_ptr: nu } // void DataLossProtect_set_my_current_per_commitment_point(struct LDKDataLossProtect *NONNULL_PTR this_ptr, struct LDKPublicKey val); /* @internal */ -export function DataLossProtect_set_my_current_per_commitment_point(this_ptr: number, val: number): void { +export function DataLossProtect_set_my_current_per_commitment_point(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -22994,16 +23001,16 @@ export function DataLossProtect_set_my_current_per_commitment_point(this_ptr: nu } // MUST_USE_RES struct LDKDataLossProtect DataLossProtect_new(struct LDKThirtyTwoBytes your_last_per_commitment_secret_arg, struct LDKPublicKey my_current_per_commitment_point_arg); /* @internal */ -export function DataLossProtect_new(your_last_per_commitment_secret_arg: number, my_current_per_commitment_point_arg: number): number { +export function DataLossProtect_new(your_last_per_commitment_secret_arg: number, my_current_per_commitment_point_arg: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_DataLossProtect_new(your_last_per_commitment_secret_arg, my_current_per_commitment_point_arg); return nativeResponseValue; } - // uintptr_t DataLossProtect_clone_ptr(LDKDataLossProtect *NONNULL_PTR arg); + // uint64_t DataLossProtect_clone_ptr(LDKDataLossProtect *NONNULL_PTR arg); /* @internal */ -export function DataLossProtect_clone_ptr(arg: number): number { +export function DataLossProtect_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23012,7 +23019,7 @@ export function DataLossProtect_clone_ptr(arg: number): number { } // struct LDKDataLossProtect DataLossProtect_clone(const struct LDKDataLossProtect *NONNULL_PTR orig); /* @internal */ -export function DataLossProtect_clone(orig: number): number { +export function DataLossProtect_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23021,7 +23028,7 @@ export function DataLossProtect_clone(orig: number): number { } // void ChannelReestablish_free(struct LDKChannelReestablish this_obj); /* @internal */ -export function ChannelReestablish_free(this_obj: number): void { +export function ChannelReestablish_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23030,7 +23037,7 @@ export function ChannelReestablish_free(this_obj: number): void { } // const uint8_t (*ChannelReestablish_get_channel_id(const struct LDKChannelReestablish *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function ChannelReestablish_get_channel_id(this_ptr: number): number { +export function ChannelReestablish_get_channel_id(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23039,7 +23046,7 @@ export function ChannelReestablish_get_channel_id(this_ptr: number): number { } // void ChannelReestablish_set_channel_id(struct LDKChannelReestablish *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function ChannelReestablish_set_channel_id(this_ptr: number, val: number): void { +export function ChannelReestablish_set_channel_id(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23048,7 +23055,7 @@ export function ChannelReestablish_set_channel_id(this_ptr: number, val: number) } // uint64_t ChannelReestablish_get_next_local_commitment_number(const struct LDKChannelReestablish *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelReestablish_get_next_local_commitment_number(this_ptr: number): bigint { +export function ChannelReestablish_get_next_local_commitment_number(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23057,7 +23064,7 @@ export function ChannelReestablish_get_next_local_commitment_number(this_ptr: nu } // void ChannelReestablish_set_next_local_commitment_number(struct LDKChannelReestablish *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function ChannelReestablish_set_next_local_commitment_number(this_ptr: number, val: bigint): void { +export function ChannelReestablish_set_next_local_commitment_number(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23066,7 +23073,7 @@ export function ChannelReestablish_set_next_local_commitment_number(this_ptr: nu } // uint64_t ChannelReestablish_get_next_remote_commitment_number(const struct LDKChannelReestablish *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelReestablish_get_next_remote_commitment_number(this_ptr: number): bigint { +export function ChannelReestablish_get_next_remote_commitment_number(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23075,16 +23082,16 @@ export function ChannelReestablish_get_next_remote_commitment_number(this_ptr: n } // void ChannelReestablish_set_next_remote_commitment_number(struct LDKChannelReestablish *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function ChannelReestablish_set_next_remote_commitment_number(this_ptr: number, val: bigint): void { +export function ChannelReestablish_set_next_remote_commitment_number(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_ChannelReestablish_set_next_remote_commitment_number(this_ptr, val); // debug statements here } - // uintptr_t ChannelReestablish_clone_ptr(LDKChannelReestablish *NONNULL_PTR arg); + // uint64_t ChannelReestablish_clone_ptr(LDKChannelReestablish *NONNULL_PTR arg); /* @internal */ -export function ChannelReestablish_clone_ptr(arg: number): number { +export function ChannelReestablish_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23093,7 +23100,7 @@ export function ChannelReestablish_clone_ptr(arg: number): number { } // struct LDKChannelReestablish ChannelReestablish_clone(const struct LDKChannelReestablish *NONNULL_PTR orig); /* @internal */ -export function ChannelReestablish_clone(orig: number): number { +export function ChannelReestablish_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23102,7 +23109,7 @@ export function ChannelReestablish_clone(orig: number): number { } // void AnnouncementSignatures_free(struct LDKAnnouncementSignatures this_obj); /* @internal */ -export function AnnouncementSignatures_free(this_obj: number): void { +export function AnnouncementSignatures_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23111,7 +23118,7 @@ export function AnnouncementSignatures_free(this_obj: number): void { } // const uint8_t (*AnnouncementSignatures_get_channel_id(const struct LDKAnnouncementSignatures *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function AnnouncementSignatures_get_channel_id(this_ptr: number): number { +export function AnnouncementSignatures_get_channel_id(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23120,7 +23127,7 @@ export function AnnouncementSignatures_get_channel_id(this_ptr: number): number } // void AnnouncementSignatures_set_channel_id(struct LDKAnnouncementSignatures *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function AnnouncementSignatures_set_channel_id(this_ptr: number, val: number): void { +export function AnnouncementSignatures_set_channel_id(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23129,7 +23136,7 @@ export function AnnouncementSignatures_set_channel_id(this_ptr: number, val: num } // uint64_t AnnouncementSignatures_get_short_channel_id(const struct LDKAnnouncementSignatures *NONNULL_PTR this_ptr); /* @internal */ -export function AnnouncementSignatures_get_short_channel_id(this_ptr: number): bigint { +export function AnnouncementSignatures_get_short_channel_id(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23138,7 +23145,7 @@ export function AnnouncementSignatures_get_short_channel_id(this_ptr: number): b } // void AnnouncementSignatures_set_short_channel_id(struct LDKAnnouncementSignatures *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function AnnouncementSignatures_set_short_channel_id(this_ptr: number, val: bigint): void { +export function AnnouncementSignatures_set_short_channel_id(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23147,7 +23154,7 @@ export function AnnouncementSignatures_set_short_channel_id(this_ptr: number, va } // struct LDKSignature AnnouncementSignatures_get_node_signature(const struct LDKAnnouncementSignatures *NONNULL_PTR this_ptr); /* @internal */ -export function AnnouncementSignatures_get_node_signature(this_ptr: number): number { +export function AnnouncementSignatures_get_node_signature(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23156,7 +23163,7 @@ export function AnnouncementSignatures_get_node_signature(this_ptr: number): num } // void AnnouncementSignatures_set_node_signature(struct LDKAnnouncementSignatures *NONNULL_PTR this_ptr, struct LDKSignature val); /* @internal */ -export function AnnouncementSignatures_set_node_signature(this_ptr: number, val: number): void { +export function AnnouncementSignatures_set_node_signature(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23165,7 +23172,7 @@ export function AnnouncementSignatures_set_node_signature(this_ptr: number, val: } // struct LDKSignature AnnouncementSignatures_get_bitcoin_signature(const struct LDKAnnouncementSignatures *NONNULL_PTR this_ptr); /* @internal */ -export function AnnouncementSignatures_get_bitcoin_signature(this_ptr: number): number { +export function AnnouncementSignatures_get_bitcoin_signature(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23174,7 +23181,7 @@ export function AnnouncementSignatures_get_bitcoin_signature(this_ptr: number): } // void AnnouncementSignatures_set_bitcoin_signature(struct LDKAnnouncementSignatures *NONNULL_PTR this_ptr, struct LDKSignature val); /* @internal */ -export function AnnouncementSignatures_set_bitcoin_signature(this_ptr: number, val: number): void { +export function AnnouncementSignatures_set_bitcoin_signature(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23183,16 +23190,16 @@ export function AnnouncementSignatures_set_bitcoin_signature(this_ptr: number, v } // MUST_USE_RES struct LDKAnnouncementSignatures AnnouncementSignatures_new(struct LDKThirtyTwoBytes channel_id_arg, uint64_t short_channel_id_arg, struct LDKSignature node_signature_arg, struct LDKSignature bitcoin_signature_arg); /* @internal */ -export function AnnouncementSignatures_new(channel_id_arg: number, short_channel_id_arg: bigint, node_signature_arg: number, bitcoin_signature_arg: number): number { +export function AnnouncementSignatures_new(channel_id_arg: number, short_channel_id_arg: bigint, node_signature_arg: number, bitcoin_signature_arg: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_AnnouncementSignatures_new(channel_id_arg, short_channel_id_arg, node_signature_arg, bitcoin_signature_arg); return nativeResponseValue; } - // uintptr_t AnnouncementSignatures_clone_ptr(LDKAnnouncementSignatures *NONNULL_PTR arg); + // uint64_t AnnouncementSignatures_clone_ptr(LDKAnnouncementSignatures *NONNULL_PTR arg); /* @internal */ -export function AnnouncementSignatures_clone_ptr(arg: number): number { +export function AnnouncementSignatures_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23201,7 +23208,7 @@ export function AnnouncementSignatures_clone_ptr(arg: number): number { } // struct LDKAnnouncementSignatures AnnouncementSignatures_clone(const struct LDKAnnouncementSignatures *NONNULL_PTR orig); /* @internal */ -export function AnnouncementSignatures_clone(orig: number): number { +export function AnnouncementSignatures_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23210,16 +23217,16 @@ export function AnnouncementSignatures_clone(orig: number): number { } // void NetAddress_free(struct LDKNetAddress this_ptr); /* @internal */ -export function NetAddress_free(this_ptr: number): void { +export function NetAddress_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_NetAddress_free(this_ptr); // debug statements here } - // uintptr_t NetAddress_clone_ptr(LDKNetAddress *NONNULL_PTR arg); + // uint64_t NetAddress_clone_ptr(LDKNetAddress *NONNULL_PTR arg); /* @internal */ -export function NetAddress_clone_ptr(arg: number): number { +export function NetAddress_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23228,7 +23235,7 @@ export function NetAddress_clone_ptr(arg: number): number { } // struct LDKNetAddress NetAddress_clone(const struct LDKNetAddress *NONNULL_PTR orig); /* @internal */ -export function NetAddress_clone(orig: number): number { +export function NetAddress_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23237,7 +23244,7 @@ export function NetAddress_clone(orig: number): number { } // struct LDKNetAddress NetAddress_ipv4(struct LDKFourBytes addr, uint16_t port); /* @internal */ -export function NetAddress_ipv4(addr: number, port: number): number { +export function NetAddress_ipv4(addr: number, port: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23246,7 +23253,7 @@ export function NetAddress_ipv4(addr: number, port: number): number { } // struct LDKNetAddress NetAddress_ipv6(struct LDKSixteenBytes addr, uint16_t port); /* @internal */ -export function NetAddress_ipv6(addr: number, port: number): number { +export function NetAddress_ipv6(addr: number, port: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23255,7 +23262,7 @@ export function NetAddress_ipv6(addr: number, port: number): number { } // struct LDKNetAddress NetAddress_onion_v2(struct LDKTwelveBytes a); /* @internal */ -export function NetAddress_onion_v2(a: number): number { +export function NetAddress_onion_v2(a: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23264,7 +23271,7 @@ export function NetAddress_onion_v2(a: number): number { } // struct LDKNetAddress NetAddress_onion_v3(struct LDKThirtyTwoBytes ed25519_pubkey, uint16_t checksum, uint8_t version, uint16_t port); /* @internal */ -export function NetAddress_onion_v3(ed25519_pubkey: number, checksum: number, version: number, port: number): number { +export function NetAddress_onion_v3(ed25519_pubkey: number, checksum: number, version: number, port: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23273,7 +23280,7 @@ export function NetAddress_onion_v3(ed25519_pubkey: number, checksum: number, ve } // struct LDKNetAddress NetAddress_hostname(struct LDKHostname hostname, uint16_t port); /* @internal */ -export function NetAddress_hostname(hostname: number, port: number): number { +export function NetAddress_hostname(hostname: bigint, port: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23282,7 +23289,7 @@ export function NetAddress_hostname(hostname: number, port: number): number { } // struct LDKCVec_u8Z NetAddress_write(const struct LDKNetAddress *NONNULL_PTR obj); /* @internal */ -export function NetAddress_write(obj: number): number { +export function NetAddress_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23291,7 +23298,7 @@ export function NetAddress_write(obj: number): number { } // struct LDKCResult_NetAddressDecodeErrorZ NetAddress_read(struct LDKu8slice ser); /* @internal */ -export function NetAddress_read(ser: number): number { +export function NetAddress_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23300,7 +23307,7 @@ export function NetAddress_read(ser: number): number { } // void UnsignedNodeAnnouncement_free(struct LDKUnsignedNodeAnnouncement this_obj); /* @internal */ -export function UnsignedNodeAnnouncement_free(this_obj: number): void { +export function UnsignedNodeAnnouncement_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23309,7 +23316,7 @@ export function UnsignedNodeAnnouncement_free(this_obj: number): void { } // struct LDKNodeFeatures UnsignedNodeAnnouncement_get_features(const struct LDKUnsignedNodeAnnouncement *NONNULL_PTR this_ptr); /* @internal */ -export function UnsignedNodeAnnouncement_get_features(this_ptr: number): number { +export function UnsignedNodeAnnouncement_get_features(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23318,7 +23325,7 @@ export function UnsignedNodeAnnouncement_get_features(this_ptr: number): number } // void UnsignedNodeAnnouncement_set_features(struct LDKUnsignedNodeAnnouncement *NONNULL_PTR this_ptr, struct LDKNodeFeatures val); /* @internal */ -export function UnsignedNodeAnnouncement_set_features(this_ptr: number, val: number): void { +export function UnsignedNodeAnnouncement_set_features(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23327,7 +23334,7 @@ export function UnsignedNodeAnnouncement_set_features(this_ptr: number, val: num } // uint32_t UnsignedNodeAnnouncement_get_timestamp(const struct LDKUnsignedNodeAnnouncement *NONNULL_PTR this_ptr); /* @internal */ -export function UnsignedNodeAnnouncement_get_timestamp(this_ptr: number): number { +export function UnsignedNodeAnnouncement_get_timestamp(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23336,7 +23343,7 @@ export function UnsignedNodeAnnouncement_get_timestamp(this_ptr: number): number } // void UnsignedNodeAnnouncement_set_timestamp(struct LDKUnsignedNodeAnnouncement *NONNULL_PTR this_ptr, uint32_t val); /* @internal */ -export function UnsignedNodeAnnouncement_set_timestamp(this_ptr: number, val: number): void { +export function UnsignedNodeAnnouncement_set_timestamp(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23345,7 +23352,7 @@ export function UnsignedNodeAnnouncement_set_timestamp(this_ptr: number, val: nu } // struct LDKPublicKey UnsignedNodeAnnouncement_get_node_id(const struct LDKUnsignedNodeAnnouncement *NONNULL_PTR this_ptr); /* @internal */ -export function UnsignedNodeAnnouncement_get_node_id(this_ptr: number): number { +export function UnsignedNodeAnnouncement_get_node_id(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23354,7 +23361,7 @@ export function UnsignedNodeAnnouncement_get_node_id(this_ptr: number): number { } // void UnsignedNodeAnnouncement_set_node_id(struct LDKUnsignedNodeAnnouncement *NONNULL_PTR this_ptr, struct LDKPublicKey val); /* @internal */ -export function UnsignedNodeAnnouncement_set_node_id(this_ptr: number, val: number): void { +export function UnsignedNodeAnnouncement_set_node_id(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23363,7 +23370,7 @@ export function UnsignedNodeAnnouncement_set_node_id(this_ptr: number, val: numb } // const uint8_t (*UnsignedNodeAnnouncement_get_rgb(const struct LDKUnsignedNodeAnnouncement *NONNULL_PTR this_ptr))[3]; /* @internal */ -export function UnsignedNodeAnnouncement_get_rgb(this_ptr: number): number { +export function UnsignedNodeAnnouncement_get_rgb(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23372,7 +23379,7 @@ export function UnsignedNodeAnnouncement_get_rgb(this_ptr: number): number { } // void UnsignedNodeAnnouncement_set_rgb(struct LDKUnsignedNodeAnnouncement *NONNULL_PTR this_ptr, struct LDKThreeBytes val); /* @internal */ -export function UnsignedNodeAnnouncement_set_rgb(this_ptr: number, val: number): void { +export function UnsignedNodeAnnouncement_set_rgb(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23381,7 +23388,7 @@ export function UnsignedNodeAnnouncement_set_rgb(this_ptr: number, val: number): } // const uint8_t (*UnsignedNodeAnnouncement_get_alias(const struct LDKUnsignedNodeAnnouncement *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function UnsignedNodeAnnouncement_get_alias(this_ptr: number): number { +export function UnsignedNodeAnnouncement_get_alias(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23390,7 +23397,7 @@ export function UnsignedNodeAnnouncement_get_alias(this_ptr: number): number { } // void UnsignedNodeAnnouncement_set_alias(struct LDKUnsignedNodeAnnouncement *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function UnsignedNodeAnnouncement_set_alias(this_ptr: number, val: number): void { +export function UnsignedNodeAnnouncement_set_alias(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23399,7 +23406,7 @@ export function UnsignedNodeAnnouncement_set_alias(this_ptr: number, val: number } // struct LDKCVec_NetAddressZ UnsignedNodeAnnouncement_get_addresses(const struct LDKUnsignedNodeAnnouncement *NONNULL_PTR this_ptr); /* @internal */ -export function UnsignedNodeAnnouncement_get_addresses(this_ptr: number): number { +export function UnsignedNodeAnnouncement_get_addresses(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23408,16 +23415,16 @@ export function UnsignedNodeAnnouncement_get_addresses(this_ptr: number): number } // void UnsignedNodeAnnouncement_set_addresses(struct LDKUnsignedNodeAnnouncement *NONNULL_PTR this_ptr, struct LDKCVec_NetAddressZ val); /* @internal */ -export function UnsignedNodeAnnouncement_set_addresses(this_ptr: number, val: number): void { +export function UnsignedNodeAnnouncement_set_addresses(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_UnsignedNodeAnnouncement_set_addresses(this_ptr, val); // debug statements here } - // uintptr_t UnsignedNodeAnnouncement_clone_ptr(LDKUnsignedNodeAnnouncement *NONNULL_PTR arg); + // uint64_t UnsignedNodeAnnouncement_clone_ptr(LDKUnsignedNodeAnnouncement *NONNULL_PTR arg); /* @internal */ -export function UnsignedNodeAnnouncement_clone_ptr(arg: number): number { +export function UnsignedNodeAnnouncement_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23426,7 +23433,7 @@ export function UnsignedNodeAnnouncement_clone_ptr(arg: number): number { } // struct LDKUnsignedNodeAnnouncement UnsignedNodeAnnouncement_clone(const struct LDKUnsignedNodeAnnouncement *NONNULL_PTR orig); /* @internal */ -export function UnsignedNodeAnnouncement_clone(orig: number): number { +export function UnsignedNodeAnnouncement_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23435,7 +23442,7 @@ export function UnsignedNodeAnnouncement_clone(orig: number): number { } // void NodeAnnouncement_free(struct LDKNodeAnnouncement this_obj); /* @internal */ -export function NodeAnnouncement_free(this_obj: number): void { +export function NodeAnnouncement_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23444,7 +23451,7 @@ export function NodeAnnouncement_free(this_obj: number): void { } // struct LDKSignature NodeAnnouncement_get_signature(const struct LDKNodeAnnouncement *NONNULL_PTR this_ptr); /* @internal */ -export function NodeAnnouncement_get_signature(this_ptr: number): number { +export function NodeAnnouncement_get_signature(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23453,7 +23460,7 @@ export function NodeAnnouncement_get_signature(this_ptr: number): number { } // void NodeAnnouncement_set_signature(struct LDKNodeAnnouncement *NONNULL_PTR this_ptr, struct LDKSignature val); /* @internal */ -export function NodeAnnouncement_set_signature(this_ptr: number, val: number): void { +export function NodeAnnouncement_set_signature(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23462,7 +23469,7 @@ export function NodeAnnouncement_set_signature(this_ptr: number, val: number): v } // struct LDKUnsignedNodeAnnouncement NodeAnnouncement_get_contents(const struct LDKNodeAnnouncement *NONNULL_PTR this_ptr); /* @internal */ -export function NodeAnnouncement_get_contents(this_ptr: number): number { +export function NodeAnnouncement_get_contents(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23471,7 +23478,7 @@ export function NodeAnnouncement_get_contents(this_ptr: number): number { } // void NodeAnnouncement_set_contents(struct LDKNodeAnnouncement *NONNULL_PTR this_ptr, struct LDKUnsignedNodeAnnouncement val); /* @internal */ -export function NodeAnnouncement_set_contents(this_ptr: number, val: number): void { +export function NodeAnnouncement_set_contents(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23480,16 +23487,16 @@ export function NodeAnnouncement_set_contents(this_ptr: number, val: number): vo } // MUST_USE_RES struct LDKNodeAnnouncement NodeAnnouncement_new(struct LDKSignature signature_arg, struct LDKUnsignedNodeAnnouncement contents_arg); /* @internal */ -export function NodeAnnouncement_new(signature_arg: number, contents_arg: number): number { +export function NodeAnnouncement_new(signature_arg: number, contents_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_NodeAnnouncement_new(signature_arg, contents_arg); return nativeResponseValue; } - // uintptr_t NodeAnnouncement_clone_ptr(LDKNodeAnnouncement *NONNULL_PTR arg); + // uint64_t NodeAnnouncement_clone_ptr(LDKNodeAnnouncement *NONNULL_PTR arg); /* @internal */ -export function NodeAnnouncement_clone_ptr(arg: number): number { +export function NodeAnnouncement_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23498,7 +23505,7 @@ export function NodeAnnouncement_clone_ptr(arg: number): number { } // struct LDKNodeAnnouncement NodeAnnouncement_clone(const struct LDKNodeAnnouncement *NONNULL_PTR orig); /* @internal */ -export function NodeAnnouncement_clone(orig: number): number { +export function NodeAnnouncement_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23507,7 +23514,7 @@ export function NodeAnnouncement_clone(orig: number): number { } // void UnsignedChannelAnnouncement_free(struct LDKUnsignedChannelAnnouncement this_obj); /* @internal */ -export function UnsignedChannelAnnouncement_free(this_obj: number): void { +export function UnsignedChannelAnnouncement_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23516,7 +23523,7 @@ export function UnsignedChannelAnnouncement_free(this_obj: number): void { } // struct LDKChannelFeatures UnsignedChannelAnnouncement_get_features(const struct LDKUnsignedChannelAnnouncement *NONNULL_PTR this_ptr); /* @internal */ -export function UnsignedChannelAnnouncement_get_features(this_ptr: number): number { +export function UnsignedChannelAnnouncement_get_features(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23525,7 +23532,7 @@ export function UnsignedChannelAnnouncement_get_features(this_ptr: number): numb } // void UnsignedChannelAnnouncement_set_features(struct LDKUnsignedChannelAnnouncement *NONNULL_PTR this_ptr, struct LDKChannelFeatures val); /* @internal */ -export function UnsignedChannelAnnouncement_set_features(this_ptr: number, val: number): void { +export function UnsignedChannelAnnouncement_set_features(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23534,7 +23541,7 @@ export function UnsignedChannelAnnouncement_set_features(this_ptr: number, val: } // const uint8_t (*UnsignedChannelAnnouncement_get_chain_hash(const struct LDKUnsignedChannelAnnouncement *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function UnsignedChannelAnnouncement_get_chain_hash(this_ptr: number): number { +export function UnsignedChannelAnnouncement_get_chain_hash(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23543,7 +23550,7 @@ export function UnsignedChannelAnnouncement_get_chain_hash(this_ptr: number): nu } // void UnsignedChannelAnnouncement_set_chain_hash(struct LDKUnsignedChannelAnnouncement *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function UnsignedChannelAnnouncement_set_chain_hash(this_ptr: number, val: number): void { +export function UnsignedChannelAnnouncement_set_chain_hash(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23552,7 +23559,7 @@ export function UnsignedChannelAnnouncement_set_chain_hash(this_ptr: number, val } // uint64_t UnsignedChannelAnnouncement_get_short_channel_id(const struct LDKUnsignedChannelAnnouncement *NONNULL_PTR this_ptr); /* @internal */ -export function UnsignedChannelAnnouncement_get_short_channel_id(this_ptr: number): bigint { +export function UnsignedChannelAnnouncement_get_short_channel_id(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23561,7 +23568,7 @@ export function UnsignedChannelAnnouncement_get_short_channel_id(this_ptr: numbe } // void UnsignedChannelAnnouncement_set_short_channel_id(struct LDKUnsignedChannelAnnouncement *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function UnsignedChannelAnnouncement_set_short_channel_id(this_ptr: number, val: bigint): void { +export function UnsignedChannelAnnouncement_set_short_channel_id(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23570,7 +23577,7 @@ export function UnsignedChannelAnnouncement_set_short_channel_id(this_ptr: numbe } // struct LDKPublicKey UnsignedChannelAnnouncement_get_node_id_1(const struct LDKUnsignedChannelAnnouncement *NONNULL_PTR this_ptr); /* @internal */ -export function UnsignedChannelAnnouncement_get_node_id_1(this_ptr: number): number { +export function UnsignedChannelAnnouncement_get_node_id_1(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23579,7 +23586,7 @@ export function UnsignedChannelAnnouncement_get_node_id_1(this_ptr: number): num } // void UnsignedChannelAnnouncement_set_node_id_1(struct LDKUnsignedChannelAnnouncement *NONNULL_PTR this_ptr, struct LDKPublicKey val); /* @internal */ -export function UnsignedChannelAnnouncement_set_node_id_1(this_ptr: number, val: number): void { +export function UnsignedChannelAnnouncement_set_node_id_1(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23588,7 +23595,7 @@ export function UnsignedChannelAnnouncement_set_node_id_1(this_ptr: number, val: } // struct LDKPublicKey UnsignedChannelAnnouncement_get_node_id_2(const struct LDKUnsignedChannelAnnouncement *NONNULL_PTR this_ptr); /* @internal */ -export function UnsignedChannelAnnouncement_get_node_id_2(this_ptr: number): number { +export function UnsignedChannelAnnouncement_get_node_id_2(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23597,7 +23604,7 @@ export function UnsignedChannelAnnouncement_get_node_id_2(this_ptr: number): num } // void UnsignedChannelAnnouncement_set_node_id_2(struct LDKUnsignedChannelAnnouncement *NONNULL_PTR this_ptr, struct LDKPublicKey val); /* @internal */ -export function UnsignedChannelAnnouncement_set_node_id_2(this_ptr: number, val: number): void { +export function UnsignedChannelAnnouncement_set_node_id_2(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23606,7 +23613,7 @@ export function UnsignedChannelAnnouncement_set_node_id_2(this_ptr: number, val: } // struct LDKPublicKey UnsignedChannelAnnouncement_get_bitcoin_key_1(const struct LDKUnsignedChannelAnnouncement *NONNULL_PTR this_ptr); /* @internal */ -export function UnsignedChannelAnnouncement_get_bitcoin_key_1(this_ptr: number): number { +export function UnsignedChannelAnnouncement_get_bitcoin_key_1(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23615,7 +23622,7 @@ export function UnsignedChannelAnnouncement_get_bitcoin_key_1(this_ptr: number): } // void UnsignedChannelAnnouncement_set_bitcoin_key_1(struct LDKUnsignedChannelAnnouncement *NONNULL_PTR this_ptr, struct LDKPublicKey val); /* @internal */ -export function UnsignedChannelAnnouncement_set_bitcoin_key_1(this_ptr: number, val: number): void { +export function UnsignedChannelAnnouncement_set_bitcoin_key_1(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23624,7 +23631,7 @@ export function UnsignedChannelAnnouncement_set_bitcoin_key_1(this_ptr: number, } // struct LDKPublicKey UnsignedChannelAnnouncement_get_bitcoin_key_2(const struct LDKUnsignedChannelAnnouncement *NONNULL_PTR this_ptr); /* @internal */ -export function UnsignedChannelAnnouncement_get_bitcoin_key_2(this_ptr: number): number { +export function UnsignedChannelAnnouncement_get_bitcoin_key_2(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23633,16 +23640,16 @@ export function UnsignedChannelAnnouncement_get_bitcoin_key_2(this_ptr: number): } // void UnsignedChannelAnnouncement_set_bitcoin_key_2(struct LDKUnsignedChannelAnnouncement *NONNULL_PTR this_ptr, struct LDKPublicKey val); /* @internal */ -export function UnsignedChannelAnnouncement_set_bitcoin_key_2(this_ptr: number, val: number): void { +export function UnsignedChannelAnnouncement_set_bitcoin_key_2(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_UnsignedChannelAnnouncement_set_bitcoin_key_2(this_ptr, val); // debug statements here } - // uintptr_t UnsignedChannelAnnouncement_clone_ptr(LDKUnsignedChannelAnnouncement *NONNULL_PTR arg); + // uint64_t UnsignedChannelAnnouncement_clone_ptr(LDKUnsignedChannelAnnouncement *NONNULL_PTR arg); /* @internal */ -export function UnsignedChannelAnnouncement_clone_ptr(arg: number): number { +export function UnsignedChannelAnnouncement_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23651,7 +23658,7 @@ export function UnsignedChannelAnnouncement_clone_ptr(arg: number): number { } // struct LDKUnsignedChannelAnnouncement UnsignedChannelAnnouncement_clone(const struct LDKUnsignedChannelAnnouncement *NONNULL_PTR orig); /* @internal */ -export function UnsignedChannelAnnouncement_clone(orig: number): number { +export function UnsignedChannelAnnouncement_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23660,7 +23667,7 @@ export function UnsignedChannelAnnouncement_clone(orig: number): number { } // void ChannelAnnouncement_free(struct LDKChannelAnnouncement this_obj); /* @internal */ -export function ChannelAnnouncement_free(this_obj: number): void { +export function ChannelAnnouncement_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23669,7 +23676,7 @@ export function ChannelAnnouncement_free(this_obj: number): void { } // struct LDKSignature ChannelAnnouncement_get_node_signature_1(const struct LDKChannelAnnouncement *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelAnnouncement_get_node_signature_1(this_ptr: number): number { +export function ChannelAnnouncement_get_node_signature_1(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23678,7 +23685,7 @@ export function ChannelAnnouncement_get_node_signature_1(this_ptr: number): numb } // void ChannelAnnouncement_set_node_signature_1(struct LDKChannelAnnouncement *NONNULL_PTR this_ptr, struct LDKSignature val); /* @internal */ -export function ChannelAnnouncement_set_node_signature_1(this_ptr: number, val: number): void { +export function ChannelAnnouncement_set_node_signature_1(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23687,7 +23694,7 @@ export function ChannelAnnouncement_set_node_signature_1(this_ptr: number, val: } // struct LDKSignature ChannelAnnouncement_get_node_signature_2(const struct LDKChannelAnnouncement *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelAnnouncement_get_node_signature_2(this_ptr: number): number { +export function ChannelAnnouncement_get_node_signature_2(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23696,7 +23703,7 @@ export function ChannelAnnouncement_get_node_signature_2(this_ptr: number): numb } // void ChannelAnnouncement_set_node_signature_2(struct LDKChannelAnnouncement *NONNULL_PTR this_ptr, struct LDKSignature val); /* @internal */ -export function ChannelAnnouncement_set_node_signature_2(this_ptr: number, val: number): void { +export function ChannelAnnouncement_set_node_signature_2(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23705,7 +23712,7 @@ export function ChannelAnnouncement_set_node_signature_2(this_ptr: number, val: } // struct LDKSignature ChannelAnnouncement_get_bitcoin_signature_1(const struct LDKChannelAnnouncement *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelAnnouncement_get_bitcoin_signature_1(this_ptr: number): number { +export function ChannelAnnouncement_get_bitcoin_signature_1(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23714,7 +23721,7 @@ export function ChannelAnnouncement_get_bitcoin_signature_1(this_ptr: number): n } // void ChannelAnnouncement_set_bitcoin_signature_1(struct LDKChannelAnnouncement *NONNULL_PTR this_ptr, struct LDKSignature val); /* @internal */ -export function ChannelAnnouncement_set_bitcoin_signature_1(this_ptr: number, val: number): void { +export function ChannelAnnouncement_set_bitcoin_signature_1(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23723,7 +23730,7 @@ export function ChannelAnnouncement_set_bitcoin_signature_1(this_ptr: number, va } // struct LDKSignature ChannelAnnouncement_get_bitcoin_signature_2(const struct LDKChannelAnnouncement *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelAnnouncement_get_bitcoin_signature_2(this_ptr: number): number { +export function ChannelAnnouncement_get_bitcoin_signature_2(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23732,7 +23739,7 @@ export function ChannelAnnouncement_get_bitcoin_signature_2(this_ptr: number): n } // void ChannelAnnouncement_set_bitcoin_signature_2(struct LDKChannelAnnouncement *NONNULL_PTR this_ptr, struct LDKSignature val); /* @internal */ -export function ChannelAnnouncement_set_bitcoin_signature_2(this_ptr: number, val: number): void { +export function ChannelAnnouncement_set_bitcoin_signature_2(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23741,7 +23748,7 @@ export function ChannelAnnouncement_set_bitcoin_signature_2(this_ptr: number, va } // struct LDKUnsignedChannelAnnouncement ChannelAnnouncement_get_contents(const struct LDKChannelAnnouncement *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelAnnouncement_get_contents(this_ptr: number): number { +export function ChannelAnnouncement_get_contents(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23750,7 +23757,7 @@ export function ChannelAnnouncement_get_contents(this_ptr: number): number { } // void ChannelAnnouncement_set_contents(struct LDKChannelAnnouncement *NONNULL_PTR this_ptr, struct LDKUnsignedChannelAnnouncement val); /* @internal */ -export function ChannelAnnouncement_set_contents(this_ptr: number, val: number): void { +export function ChannelAnnouncement_set_contents(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23759,16 +23766,16 @@ export function ChannelAnnouncement_set_contents(this_ptr: number, val: number): } // MUST_USE_RES struct LDKChannelAnnouncement ChannelAnnouncement_new(struct LDKSignature node_signature_1_arg, struct LDKSignature node_signature_2_arg, struct LDKSignature bitcoin_signature_1_arg, struct LDKSignature bitcoin_signature_2_arg, struct LDKUnsignedChannelAnnouncement contents_arg); /* @internal */ -export function ChannelAnnouncement_new(node_signature_1_arg: number, node_signature_2_arg: number, bitcoin_signature_1_arg: number, bitcoin_signature_2_arg: number, contents_arg: number): number { +export function ChannelAnnouncement_new(node_signature_1_arg: number, node_signature_2_arg: number, bitcoin_signature_1_arg: number, bitcoin_signature_2_arg: number, contents_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_ChannelAnnouncement_new(node_signature_1_arg, node_signature_2_arg, bitcoin_signature_1_arg, bitcoin_signature_2_arg, contents_arg); return nativeResponseValue; } - // uintptr_t ChannelAnnouncement_clone_ptr(LDKChannelAnnouncement *NONNULL_PTR arg); + // uint64_t ChannelAnnouncement_clone_ptr(LDKChannelAnnouncement *NONNULL_PTR arg); /* @internal */ -export function ChannelAnnouncement_clone_ptr(arg: number): number { +export function ChannelAnnouncement_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23777,7 +23784,7 @@ export function ChannelAnnouncement_clone_ptr(arg: number): number { } // struct LDKChannelAnnouncement ChannelAnnouncement_clone(const struct LDKChannelAnnouncement *NONNULL_PTR orig); /* @internal */ -export function ChannelAnnouncement_clone(orig: number): number { +export function ChannelAnnouncement_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23786,7 +23793,7 @@ export function ChannelAnnouncement_clone(orig: number): number { } // void UnsignedChannelUpdate_free(struct LDKUnsignedChannelUpdate this_obj); /* @internal */ -export function UnsignedChannelUpdate_free(this_obj: number): void { +export function UnsignedChannelUpdate_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23795,7 +23802,7 @@ export function UnsignedChannelUpdate_free(this_obj: number): void { } // const uint8_t (*UnsignedChannelUpdate_get_chain_hash(const struct LDKUnsignedChannelUpdate *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function UnsignedChannelUpdate_get_chain_hash(this_ptr: number): number { +export function UnsignedChannelUpdate_get_chain_hash(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23804,7 +23811,7 @@ export function UnsignedChannelUpdate_get_chain_hash(this_ptr: number): number { } // void UnsignedChannelUpdate_set_chain_hash(struct LDKUnsignedChannelUpdate *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function UnsignedChannelUpdate_set_chain_hash(this_ptr: number, val: number): void { +export function UnsignedChannelUpdate_set_chain_hash(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23813,7 +23820,7 @@ export function UnsignedChannelUpdate_set_chain_hash(this_ptr: number, val: numb } // uint64_t UnsignedChannelUpdate_get_short_channel_id(const struct LDKUnsignedChannelUpdate *NONNULL_PTR this_ptr); /* @internal */ -export function UnsignedChannelUpdate_get_short_channel_id(this_ptr: number): bigint { +export function UnsignedChannelUpdate_get_short_channel_id(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23822,7 +23829,7 @@ export function UnsignedChannelUpdate_get_short_channel_id(this_ptr: number): bi } // void UnsignedChannelUpdate_set_short_channel_id(struct LDKUnsignedChannelUpdate *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function UnsignedChannelUpdate_set_short_channel_id(this_ptr: number, val: bigint): void { +export function UnsignedChannelUpdate_set_short_channel_id(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23831,7 +23838,7 @@ export function UnsignedChannelUpdate_set_short_channel_id(this_ptr: number, val } // uint32_t UnsignedChannelUpdate_get_timestamp(const struct LDKUnsignedChannelUpdate *NONNULL_PTR this_ptr); /* @internal */ -export function UnsignedChannelUpdate_get_timestamp(this_ptr: number): number { +export function UnsignedChannelUpdate_get_timestamp(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23840,7 +23847,7 @@ export function UnsignedChannelUpdate_get_timestamp(this_ptr: number): number { } // void UnsignedChannelUpdate_set_timestamp(struct LDKUnsignedChannelUpdate *NONNULL_PTR this_ptr, uint32_t val); /* @internal */ -export function UnsignedChannelUpdate_set_timestamp(this_ptr: number, val: number): void { +export function UnsignedChannelUpdate_set_timestamp(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23849,7 +23856,7 @@ export function UnsignedChannelUpdate_set_timestamp(this_ptr: number, val: numbe } // uint8_t UnsignedChannelUpdate_get_flags(const struct LDKUnsignedChannelUpdate *NONNULL_PTR this_ptr); /* @internal */ -export function UnsignedChannelUpdate_get_flags(this_ptr: number): number { +export function UnsignedChannelUpdate_get_flags(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23858,7 +23865,7 @@ export function UnsignedChannelUpdate_get_flags(this_ptr: number): number { } // void UnsignedChannelUpdate_set_flags(struct LDKUnsignedChannelUpdate *NONNULL_PTR this_ptr, uint8_t val); /* @internal */ -export function UnsignedChannelUpdate_set_flags(this_ptr: number, val: number): void { +export function UnsignedChannelUpdate_set_flags(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23867,7 +23874,7 @@ export function UnsignedChannelUpdate_set_flags(this_ptr: number, val: number): } // uint16_t UnsignedChannelUpdate_get_cltv_expiry_delta(const struct LDKUnsignedChannelUpdate *NONNULL_PTR this_ptr); /* @internal */ -export function UnsignedChannelUpdate_get_cltv_expiry_delta(this_ptr: number): number { +export function UnsignedChannelUpdate_get_cltv_expiry_delta(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23876,7 +23883,7 @@ export function UnsignedChannelUpdate_get_cltv_expiry_delta(this_ptr: number): n } // void UnsignedChannelUpdate_set_cltv_expiry_delta(struct LDKUnsignedChannelUpdate *NONNULL_PTR this_ptr, uint16_t val); /* @internal */ -export function UnsignedChannelUpdate_set_cltv_expiry_delta(this_ptr: number, val: number): void { +export function UnsignedChannelUpdate_set_cltv_expiry_delta(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23885,7 +23892,7 @@ export function UnsignedChannelUpdate_set_cltv_expiry_delta(this_ptr: number, va } // uint64_t UnsignedChannelUpdate_get_htlc_minimum_msat(const struct LDKUnsignedChannelUpdate *NONNULL_PTR this_ptr); /* @internal */ -export function UnsignedChannelUpdate_get_htlc_minimum_msat(this_ptr: number): bigint { +export function UnsignedChannelUpdate_get_htlc_minimum_msat(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23894,7 +23901,7 @@ export function UnsignedChannelUpdate_get_htlc_minimum_msat(this_ptr: number): b } // void UnsignedChannelUpdate_set_htlc_minimum_msat(struct LDKUnsignedChannelUpdate *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function UnsignedChannelUpdate_set_htlc_minimum_msat(this_ptr: number, val: bigint): void { +export function UnsignedChannelUpdate_set_htlc_minimum_msat(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23903,7 +23910,7 @@ export function UnsignedChannelUpdate_set_htlc_minimum_msat(this_ptr: number, va } // uint64_t UnsignedChannelUpdate_get_htlc_maximum_msat(const struct LDKUnsignedChannelUpdate *NONNULL_PTR this_ptr); /* @internal */ -export function UnsignedChannelUpdate_get_htlc_maximum_msat(this_ptr: number): bigint { +export function UnsignedChannelUpdate_get_htlc_maximum_msat(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23912,7 +23919,7 @@ export function UnsignedChannelUpdate_get_htlc_maximum_msat(this_ptr: number): b } // void UnsignedChannelUpdate_set_htlc_maximum_msat(struct LDKUnsignedChannelUpdate *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function UnsignedChannelUpdate_set_htlc_maximum_msat(this_ptr: number, val: bigint): void { +export function UnsignedChannelUpdate_set_htlc_maximum_msat(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23921,7 +23928,7 @@ export function UnsignedChannelUpdate_set_htlc_maximum_msat(this_ptr: number, va } // uint32_t UnsignedChannelUpdate_get_fee_base_msat(const struct LDKUnsignedChannelUpdate *NONNULL_PTR this_ptr); /* @internal */ -export function UnsignedChannelUpdate_get_fee_base_msat(this_ptr: number): number { +export function UnsignedChannelUpdate_get_fee_base_msat(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23930,7 +23937,7 @@ export function UnsignedChannelUpdate_get_fee_base_msat(this_ptr: number): numbe } // void UnsignedChannelUpdate_set_fee_base_msat(struct LDKUnsignedChannelUpdate *NONNULL_PTR this_ptr, uint32_t val); /* @internal */ -export function UnsignedChannelUpdate_set_fee_base_msat(this_ptr: number, val: number): void { +export function UnsignedChannelUpdate_set_fee_base_msat(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23939,7 +23946,7 @@ export function UnsignedChannelUpdate_set_fee_base_msat(this_ptr: number, val: n } // uint32_t UnsignedChannelUpdate_get_fee_proportional_millionths(const struct LDKUnsignedChannelUpdate *NONNULL_PTR this_ptr); /* @internal */ -export function UnsignedChannelUpdate_get_fee_proportional_millionths(this_ptr: number): number { +export function UnsignedChannelUpdate_get_fee_proportional_millionths(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23948,7 +23955,7 @@ export function UnsignedChannelUpdate_get_fee_proportional_millionths(this_ptr: } // void UnsignedChannelUpdate_set_fee_proportional_millionths(struct LDKUnsignedChannelUpdate *NONNULL_PTR this_ptr, uint32_t val); /* @internal */ -export function UnsignedChannelUpdate_set_fee_proportional_millionths(this_ptr: number, val: number): void { +export function UnsignedChannelUpdate_set_fee_proportional_millionths(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23957,7 +23964,7 @@ export function UnsignedChannelUpdate_set_fee_proportional_millionths(this_ptr: } // struct LDKCVec_u8Z UnsignedChannelUpdate_get_excess_data(const struct LDKUnsignedChannelUpdate *NONNULL_PTR this_ptr); /* @internal */ -export function UnsignedChannelUpdate_get_excess_data(this_ptr: number): number { +export function UnsignedChannelUpdate_get_excess_data(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23966,7 +23973,7 @@ export function UnsignedChannelUpdate_get_excess_data(this_ptr: number): number } // void UnsignedChannelUpdate_set_excess_data(struct LDKUnsignedChannelUpdate *NONNULL_PTR this_ptr, struct LDKCVec_u8Z val); /* @internal */ -export function UnsignedChannelUpdate_set_excess_data(this_ptr: number, val: number): void { +export function UnsignedChannelUpdate_set_excess_data(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23975,16 +23982,16 @@ export function UnsignedChannelUpdate_set_excess_data(this_ptr: number, val: num } // MUST_USE_RES struct LDKUnsignedChannelUpdate UnsignedChannelUpdate_new(struct LDKThirtyTwoBytes chain_hash_arg, uint64_t short_channel_id_arg, uint32_t timestamp_arg, uint8_t flags_arg, uint16_t cltv_expiry_delta_arg, uint64_t htlc_minimum_msat_arg, uint64_t htlc_maximum_msat_arg, uint32_t fee_base_msat_arg, uint32_t fee_proportional_millionths_arg, struct LDKCVec_u8Z excess_data_arg); /* @internal */ -export function UnsignedChannelUpdate_new(chain_hash_arg: number, short_channel_id_arg: bigint, timestamp_arg: number, flags_arg: number, cltv_expiry_delta_arg: number, htlc_minimum_msat_arg: bigint, htlc_maximum_msat_arg: bigint, fee_base_msat_arg: number, fee_proportional_millionths_arg: number, excess_data_arg: number): number { +export function UnsignedChannelUpdate_new(chain_hash_arg: number, short_channel_id_arg: bigint, timestamp_arg: number, flags_arg: number, cltv_expiry_delta_arg: number, htlc_minimum_msat_arg: bigint, htlc_maximum_msat_arg: bigint, fee_base_msat_arg: number, fee_proportional_millionths_arg: number, excess_data_arg: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_UnsignedChannelUpdate_new(chain_hash_arg, short_channel_id_arg, timestamp_arg, flags_arg, cltv_expiry_delta_arg, htlc_minimum_msat_arg, htlc_maximum_msat_arg, fee_base_msat_arg, fee_proportional_millionths_arg, excess_data_arg); return nativeResponseValue; } - // uintptr_t UnsignedChannelUpdate_clone_ptr(LDKUnsignedChannelUpdate *NONNULL_PTR arg); + // uint64_t UnsignedChannelUpdate_clone_ptr(LDKUnsignedChannelUpdate *NONNULL_PTR arg); /* @internal */ -export function UnsignedChannelUpdate_clone_ptr(arg: number): number { +export function UnsignedChannelUpdate_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -23993,7 +24000,7 @@ export function UnsignedChannelUpdate_clone_ptr(arg: number): number { } // struct LDKUnsignedChannelUpdate UnsignedChannelUpdate_clone(const struct LDKUnsignedChannelUpdate *NONNULL_PTR orig); /* @internal */ -export function UnsignedChannelUpdate_clone(orig: number): number { +export function UnsignedChannelUpdate_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24002,7 +24009,7 @@ export function UnsignedChannelUpdate_clone(orig: number): number { } // void ChannelUpdate_free(struct LDKChannelUpdate this_obj); /* @internal */ -export function ChannelUpdate_free(this_obj: number): void { +export function ChannelUpdate_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24011,7 +24018,7 @@ export function ChannelUpdate_free(this_obj: number): void { } // struct LDKSignature ChannelUpdate_get_signature(const struct LDKChannelUpdate *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelUpdate_get_signature(this_ptr: number): number { +export function ChannelUpdate_get_signature(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24020,7 +24027,7 @@ export function ChannelUpdate_get_signature(this_ptr: number): number { } // void ChannelUpdate_set_signature(struct LDKChannelUpdate *NONNULL_PTR this_ptr, struct LDKSignature val); /* @internal */ -export function ChannelUpdate_set_signature(this_ptr: number, val: number): void { +export function ChannelUpdate_set_signature(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24029,7 +24036,7 @@ export function ChannelUpdate_set_signature(this_ptr: number, val: number): void } // struct LDKUnsignedChannelUpdate ChannelUpdate_get_contents(const struct LDKChannelUpdate *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelUpdate_get_contents(this_ptr: number): number { +export function ChannelUpdate_get_contents(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24038,7 +24045,7 @@ export function ChannelUpdate_get_contents(this_ptr: number): number { } // void ChannelUpdate_set_contents(struct LDKChannelUpdate *NONNULL_PTR this_ptr, struct LDKUnsignedChannelUpdate val); /* @internal */ -export function ChannelUpdate_set_contents(this_ptr: number, val: number): void { +export function ChannelUpdate_set_contents(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24047,16 +24054,16 @@ export function ChannelUpdate_set_contents(this_ptr: number, val: number): void } // MUST_USE_RES struct LDKChannelUpdate ChannelUpdate_new(struct LDKSignature signature_arg, struct LDKUnsignedChannelUpdate contents_arg); /* @internal */ -export function ChannelUpdate_new(signature_arg: number, contents_arg: number): number { +export function ChannelUpdate_new(signature_arg: number, contents_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_ChannelUpdate_new(signature_arg, contents_arg); return nativeResponseValue; } - // uintptr_t ChannelUpdate_clone_ptr(LDKChannelUpdate *NONNULL_PTR arg); + // uint64_t ChannelUpdate_clone_ptr(LDKChannelUpdate *NONNULL_PTR arg); /* @internal */ -export function ChannelUpdate_clone_ptr(arg: number): number { +export function ChannelUpdate_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24065,7 +24072,7 @@ export function ChannelUpdate_clone_ptr(arg: number): number { } // struct LDKChannelUpdate ChannelUpdate_clone(const struct LDKChannelUpdate *NONNULL_PTR orig); /* @internal */ -export function ChannelUpdate_clone(orig: number): number { +export function ChannelUpdate_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24074,7 +24081,7 @@ export function ChannelUpdate_clone(orig: number): number { } // void QueryChannelRange_free(struct LDKQueryChannelRange this_obj); /* @internal */ -export function QueryChannelRange_free(this_obj: number): void { +export function QueryChannelRange_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24083,7 +24090,7 @@ export function QueryChannelRange_free(this_obj: number): void { } // const uint8_t (*QueryChannelRange_get_chain_hash(const struct LDKQueryChannelRange *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function QueryChannelRange_get_chain_hash(this_ptr: number): number { +export function QueryChannelRange_get_chain_hash(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24092,7 +24099,7 @@ export function QueryChannelRange_get_chain_hash(this_ptr: number): number { } // void QueryChannelRange_set_chain_hash(struct LDKQueryChannelRange *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function QueryChannelRange_set_chain_hash(this_ptr: number, val: number): void { +export function QueryChannelRange_set_chain_hash(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24101,7 +24108,7 @@ export function QueryChannelRange_set_chain_hash(this_ptr: number, val: number): } // uint32_t QueryChannelRange_get_first_blocknum(const struct LDKQueryChannelRange *NONNULL_PTR this_ptr); /* @internal */ -export function QueryChannelRange_get_first_blocknum(this_ptr: number): number { +export function QueryChannelRange_get_first_blocknum(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24110,7 +24117,7 @@ export function QueryChannelRange_get_first_blocknum(this_ptr: number): number { } // void QueryChannelRange_set_first_blocknum(struct LDKQueryChannelRange *NONNULL_PTR this_ptr, uint32_t val); /* @internal */ -export function QueryChannelRange_set_first_blocknum(this_ptr: number, val: number): void { +export function QueryChannelRange_set_first_blocknum(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24119,7 +24126,7 @@ export function QueryChannelRange_set_first_blocknum(this_ptr: number, val: numb } // uint32_t QueryChannelRange_get_number_of_blocks(const struct LDKQueryChannelRange *NONNULL_PTR this_ptr); /* @internal */ -export function QueryChannelRange_get_number_of_blocks(this_ptr: number): number { +export function QueryChannelRange_get_number_of_blocks(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24128,7 +24135,7 @@ export function QueryChannelRange_get_number_of_blocks(this_ptr: number): number } // void QueryChannelRange_set_number_of_blocks(struct LDKQueryChannelRange *NONNULL_PTR this_ptr, uint32_t val); /* @internal */ -export function QueryChannelRange_set_number_of_blocks(this_ptr: number, val: number): void { +export function QueryChannelRange_set_number_of_blocks(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24137,16 +24144,16 @@ export function QueryChannelRange_set_number_of_blocks(this_ptr: number, val: nu } // MUST_USE_RES struct LDKQueryChannelRange QueryChannelRange_new(struct LDKThirtyTwoBytes chain_hash_arg, uint32_t first_blocknum_arg, uint32_t number_of_blocks_arg); /* @internal */ -export function QueryChannelRange_new(chain_hash_arg: number, first_blocknum_arg: number, number_of_blocks_arg: number): number { +export function QueryChannelRange_new(chain_hash_arg: number, first_blocknum_arg: number, number_of_blocks_arg: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_QueryChannelRange_new(chain_hash_arg, first_blocknum_arg, number_of_blocks_arg); return nativeResponseValue; } - // uintptr_t QueryChannelRange_clone_ptr(LDKQueryChannelRange *NONNULL_PTR arg); + // uint64_t QueryChannelRange_clone_ptr(LDKQueryChannelRange *NONNULL_PTR arg); /* @internal */ -export function QueryChannelRange_clone_ptr(arg: number): number { +export function QueryChannelRange_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24155,7 +24162,7 @@ export function QueryChannelRange_clone_ptr(arg: number): number { } // struct LDKQueryChannelRange QueryChannelRange_clone(const struct LDKQueryChannelRange *NONNULL_PTR orig); /* @internal */ -export function QueryChannelRange_clone(orig: number): number { +export function QueryChannelRange_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24164,7 +24171,7 @@ export function QueryChannelRange_clone(orig: number): number { } // void ReplyChannelRange_free(struct LDKReplyChannelRange this_obj); /* @internal */ -export function ReplyChannelRange_free(this_obj: number): void { +export function ReplyChannelRange_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24173,7 +24180,7 @@ export function ReplyChannelRange_free(this_obj: number): void { } // const uint8_t (*ReplyChannelRange_get_chain_hash(const struct LDKReplyChannelRange *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function ReplyChannelRange_get_chain_hash(this_ptr: number): number { +export function ReplyChannelRange_get_chain_hash(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24182,7 +24189,7 @@ export function ReplyChannelRange_get_chain_hash(this_ptr: number): number { } // void ReplyChannelRange_set_chain_hash(struct LDKReplyChannelRange *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function ReplyChannelRange_set_chain_hash(this_ptr: number, val: number): void { +export function ReplyChannelRange_set_chain_hash(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24191,7 +24198,7 @@ export function ReplyChannelRange_set_chain_hash(this_ptr: number, val: number): } // uint32_t ReplyChannelRange_get_first_blocknum(const struct LDKReplyChannelRange *NONNULL_PTR this_ptr); /* @internal */ -export function ReplyChannelRange_get_first_blocknum(this_ptr: number): number { +export function ReplyChannelRange_get_first_blocknum(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24200,7 +24207,7 @@ export function ReplyChannelRange_get_first_blocknum(this_ptr: number): number { } // void ReplyChannelRange_set_first_blocknum(struct LDKReplyChannelRange *NONNULL_PTR this_ptr, uint32_t val); /* @internal */ -export function ReplyChannelRange_set_first_blocknum(this_ptr: number, val: number): void { +export function ReplyChannelRange_set_first_blocknum(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24209,7 +24216,7 @@ export function ReplyChannelRange_set_first_blocknum(this_ptr: number, val: numb } // uint32_t ReplyChannelRange_get_number_of_blocks(const struct LDKReplyChannelRange *NONNULL_PTR this_ptr); /* @internal */ -export function ReplyChannelRange_get_number_of_blocks(this_ptr: number): number { +export function ReplyChannelRange_get_number_of_blocks(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24218,7 +24225,7 @@ export function ReplyChannelRange_get_number_of_blocks(this_ptr: number): number } // void ReplyChannelRange_set_number_of_blocks(struct LDKReplyChannelRange *NONNULL_PTR this_ptr, uint32_t val); /* @internal */ -export function ReplyChannelRange_set_number_of_blocks(this_ptr: number, val: number): void { +export function ReplyChannelRange_set_number_of_blocks(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24227,7 +24234,7 @@ export function ReplyChannelRange_set_number_of_blocks(this_ptr: number, val: nu } // bool ReplyChannelRange_get_sync_complete(const struct LDKReplyChannelRange *NONNULL_PTR this_ptr); /* @internal */ -export function ReplyChannelRange_get_sync_complete(this_ptr: number): boolean { +export function ReplyChannelRange_get_sync_complete(this_ptr: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24236,7 +24243,7 @@ export function ReplyChannelRange_get_sync_complete(this_ptr: number): boolean { } // void ReplyChannelRange_set_sync_complete(struct LDKReplyChannelRange *NONNULL_PTR this_ptr, bool val); /* @internal */ -export function ReplyChannelRange_set_sync_complete(this_ptr: number, val: boolean): void { +export function ReplyChannelRange_set_sync_complete(this_ptr: bigint, val: boolean): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24245,7 +24252,7 @@ export function ReplyChannelRange_set_sync_complete(this_ptr: number, val: boole } // struct LDKCVec_u64Z ReplyChannelRange_get_short_channel_ids(const struct LDKReplyChannelRange *NONNULL_PTR this_ptr); /* @internal */ -export function ReplyChannelRange_get_short_channel_ids(this_ptr: number): number { +export function ReplyChannelRange_get_short_channel_ids(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24254,7 +24261,7 @@ export function ReplyChannelRange_get_short_channel_ids(this_ptr: number): numbe } // void ReplyChannelRange_set_short_channel_ids(struct LDKReplyChannelRange *NONNULL_PTR this_ptr, struct LDKCVec_u64Z val); /* @internal */ -export function ReplyChannelRange_set_short_channel_ids(this_ptr: number, val: number): void { +export function ReplyChannelRange_set_short_channel_ids(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24263,16 +24270,16 @@ export function ReplyChannelRange_set_short_channel_ids(this_ptr: number, val: n } // MUST_USE_RES struct LDKReplyChannelRange ReplyChannelRange_new(struct LDKThirtyTwoBytes chain_hash_arg, uint32_t first_blocknum_arg, uint32_t number_of_blocks_arg, bool sync_complete_arg, struct LDKCVec_u64Z short_channel_ids_arg); /* @internal */ -export function ReplyChannelRange_new(chain_hash_arg: number, first_blocknum_arg: number, number_of_blocks_arg: number, sync_complete_arg: boolean, short_channel_ids_arg: number): number { +export function ReplyChannelRange_new(chain_hash_arg: number, first_blocknum_arg: number, number_of_blocks_arg: number, sync_complete_arg: boolean, short_channel_ids_arg: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_ReplyChannelRange_new(chain_hash_arg, first_blocknum_arg, number_of_blocks_arg, sync_complete_arg, short_channel_ids_arg); return nativeResponseValue; } - // uintptr_t ReplyChannelRange_clone_ptr(LDKReplyChannelRange *NONNULL_PTR arg); + // uint64_t ReplyChannelRange_clone_ptr(LDKReplyChannelRange *NONNULL_PTR arg); /* @internal */ -export function ReplyChannelRange_clone_ptr(arg: number): number { +export function ReplyChannelRange_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24281,7 +24288,7 @@ export function ReplyChannelRange_clone_ptr(arg: number): number { } // struct LDKReplyChannelRange ReplyChannelRange_clone(const struct LDKReplyChannelRange *NONNULL_PTR orig); /* @internal */ -export function ReplyChannelRange_clone(orig: number): number { +export function ReplyChannelRange_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24290,7 +24297,7 @@ export function ReplyChannelRange_clone(orig: number): number { } // void QueryShortChannelIds_free(struct LDKQueryShortChannelIds this_obj); /* @internal */ -export function QueryShortChannelIds_free(this_obj: number): void { +export function QueryShortChannelIds_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24299,7 +24306,7 @@ export function QueryShortChannelIds_free(this_obj: number): void { } // const uint8_t (*QueryShortChannelIds_get_chain_hash(const struct LDKQueryShortChannelIds *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function QueryShortChannelIds_get_chain_hash(this_ptr: number): number { +export function QueryShortChannelIds_get_chain_hash(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24308,7 +24315,7 @@ export function QueryShortChannelIds_get_chain_hash(this_ptr: number): number { } // void QueryShortChannelIds_set_chain_hash(struct LDKQueryShortChannelIds *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function QueryShortChannelIds_set_chain_hash(this_ptr: number, val: number): void { +export function QueryShortChannelIds_set_chain_hash(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24317,7 +24324,7 @@ export function QueryShortChannelIds_set_chain_hash(this_ptr: number, val: numbe } // struct LDKCVec_u64Z QueryShortChannelIds_get_short_channel_ids(const struct LDKQueryShortChannelIds *NONNULL_PTR this_ptr); /* @internal */ -export function QueryShortChannelIds_get_short_channel_ids(this_ptr: number): number { +export function QueryShortChannelIds_get_short_channel_ids(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24326,7 +24333,7 @@ export function QueryShortChannelIds_get_short_channel_ids(this_ptr: number): nu } // void QueryShortChannelIds_set_short_channel_ids(struct LDKQueryShortChannelIds *NONNULL_PTR this_ptr, struct LDKCVec_u64Z val); /* @internal */ -export function QueryShortChannelIds_set_short_channel_ids(this_ptr: number, val: number): void { +export function QueryShortChannelIds_set_short_channel_ids(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24335,16 +24342,16 @@ export function QueryShortChannelIds_set_short_channel_ids(this_ptr: number, val } // MUST_USE_RES struct LDKQueryShortChannelIds QueryShortChannelIds_new(struct LDKThirtyTwoBytes chain_hash_arg, struct LDKCVec_u64Z short_channel_ids_arg); /* @internal */ -export function QueryShortChannelIds_new(chain_hash_arg: number, short_channel_ids_arg: number): number { +export function QueryShortChannelIds_new(chain_hash_arg: number, short_channel_ids_arg: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_QueryShortChannelIds_new(chain_hash_arg, short_channel_ids_arg); return nativeResponseValue; } - // uintptr_t QueryShortChannelIds_clone_ptr(LDKQueryShortChannelIds *NONNULL_PTR arg); + // uint64_t QueryShortChannelIds_clone_ptr(LDKQueryShortChannelIds *NONNULL_PTR arg); /* @internal */ -export function QueryShortChannelIds_clone_ptr(arg: number): number { +export function QueryShortChannelIds_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24353,7 +24360,7 @@ export function QueryShortChannelIds_clone_ptr(arg: number): number { } // struct LDKQueryShortChannelIds QueryShortChannelIds_clone(const struct LDKQueryShortChannelIds *NONNULL_PTR orig); /* @internal */ -export function QueryShortChannelIds_clone(orig: number): number { +export function QueryShortChannelIds_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24362,7 +24369,7 @@ export function QueryShortChannelIds_clone(orig: number): number { } // void ReplyShortChannelIdsEnd_free(struct LDKReplyShortChannelIdsEnd this_obj); /* @internal */ -export function ReplyShortChannelIdsEnd_free(this_obj: number): void { +export function ReplyShortChannelIdsEnd_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24371,7 +24378,7 @@ export function ReplyShortChannelIdsEnd_free(this_obj: number): void { } // const uint8_t (*ReplyShortChannelIdsEnd_get_chain_hash(const struct LDKReplyShortChannelIdsEnd *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function ReplyShortChannelIdsEnd_get_chain_hash(this_ptr: number): number { +export function ReplyShortChannelIdsEnd_get_chain_hash(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24380,7 +24387,7 @@ export function ReplyShortChannelIdsEnd_get_chain_hash(this_ptr: number): number } // void ReplyShortChannelIdsEnd_set_chain_hash(struct LDKReplyShortChannelIdsEnd *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function ReplyShortChannelIdsEnd_set_chain_hash(this_ptr: number, val: number): void { +export function ReplyShortChannelIdsEnd_set_chain_hash(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24389,7 +24396,7 @@ export function ReplyShortChannelIdsEnd_set_chain_hash(this_ptr: number, val: nu } // bool ReplyShortChannelIdsEnd_get_full_information(const struct LDKReplyShortChannelIdsEnd *NONNULL_PTR this_ptr); /* @internal */ -export function ReplyShortChannelIdsEnd_get_full_information(this_ptr: number): boolean { +export function ReplyShortChannelIdsEnd_get_full_information(this_ptr: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24398,7 +24405,7 @@ export function ReplyShortChannelIdsEnd_get_full_information(this_ptr: number): } // void ReplyShortChannelIdsEnd_set_full_information(struct LDKReplyShortChannelIdsEnd *NONNULL_PTR this_ptr, bool val); /* @internal */ -export function ReplyShortChannelIdsEnd_set_full_information(this_ptr: number, val: boolean): void { +export function ReplyShortChannelIdsEnd_set_full_information(this_ptr: bigint, val: boolean): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24407,16 +24414,16 @@ export function ReplyShortChannelIdsEnd_set_full_information(this_ptr: number, v } // MUST_USE_RES struct LDKReplyShortChannelIdsEnd ReplyShortChannelIdsEnd_new(struct LDKThirtyTwoBytes chain_hash_arg, bool full_information_arg); /* @internal */ -export function ReplyShortChannelIdsEnd_new(chain_hash_arg: number, full_information_arg: boolean): number { +export function ReplyShortChannelIdsEnd_new(chain_hash_arg: number, full_information_arg: boolean): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_ReplyShortChannelIdsEnd_new(chain_hash_arg, full_information_arg); return nativeResponseValue; } - // uintptr_t ReplyShortChannelIdsEnd_clone_ptr(LDKReplyShortChannelIdsEnd *NONNULL_PTR arg); + // uint64_t ReplyShortChannelIdsEnd_clone_ptr(LDKReplyShortChannelIdsEnd *NONNULL_PTR arg); /* @internal */ -export function ReplyShortChannelIdsEnd_clone_ptr(arg: number): number { +export function ReplyShortChannelIdsEnd_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24425,7 +24432,7 @@ export function ReplyShortChannelIdsEnd_clone_ptr(arg: number): number { } // struct LDKReplyShortChannelIdsEnd ReplyShortChannelIdsEnd_clone(const struct LDKReplyShortChannelIdsEnd *NONNULL_PTR orig); /* @internal */ -export function ReplyShortChannelIdsEnd_clone(orig: number): number { +export function ReplyShortChannelIdsEnd_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24434,7 +24441,7 @@ export function ReplyShortChannelIdsEnd_clone(orig: number): number { } // void GossipTimestampFilter_free(struct LDKGossipTimestampFilter this_obj); /* @internal */ -export function GossipTimestampFilter_free(this_obj: number): void { +export function GossipTimestampFilter_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24443,7 +24450,7 @@ export function GossipTimestampFilter_free(this_obj: number): void { } // const uint8_t (*GossipTimestampFilter_get_chain_hash(const struct LDKGossipTimestampFilter *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function GossipTimestampFilter_get_chain_hash(this_ptr: number): number { +export function GossipTimestampFilter_get_chain_hash(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24452,7 +24459,7 @@ export function GossipTimestampFilter_get_chain_hash(this_ptr: number): number { } // void GossipTimestampFilter_set_chain_hash(struct LDKGossipTimestampFilter *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function GossipTimestampFilter_set_chain_hash(this_ptr: number, val: number): void { +export function GossipTimestampFilter_set_chain_hash(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24461,7 +24468,7 @@ export function GossipTimestampFilter_set_chain_hash(this_ptr: number, val: numb } // uint32_t GossipTimestampFilter_get_first_timestamp(const struct LDKGossipTimestampFilter *NONNULL_PTR this_ptr); /* @internal */ -export function GossipTimestampFilter_get_first_timestamp(this_ptr: number): number { +export function GossipTimestampFilter_get_first_timestamp(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24470,7 +24477,7 @@ export function GossipTimestampFilter_get_first_timestamp(this_ptr: number): num } // void GossipTimestampFilter_set_first_timestamp(struct LDKGossipTimestampFilter *NONNULL_PTR this_ptr, uint32_t val); /* @internal */ -export function GossipTimestampFilter_set_first_timestamp(this_ptr: number, val: number): void { +export function GossipTimestampFilter_set_first_timestamp(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24479,7 +24486,7 @@ export function GossipTimestampFilter_set_first_timestamp(this_ptr: number, val: } // uint32_t GossipTimestampFilter_get_timestamp_range(const struct LDKGossipTimestampFilter *NONNULL_PTR this_ptr); /* @internal */ -export function GossipTimestampFilter_get_timestamp_range(this_ptr: number): number { +export function GossipTimestampFilter_get_timestamp_range(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24488,7 +24495,7 @@ export function GossipTimestampFilter_get_timestamp_range(this_ptr: number): num } // void GossipTimestampFilter_set_timestamp_range(struct LDKGossipTimestampFilter *NONNULL_PTR this_ptr, uint32_t val); /* @internal */ -export function GossipTimestampFilter_set_timestamp_range(this_ptr: number, val: number): void { +export function GossipTimestampFilter_set_timestamp_range(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24497,16 +24504,16 @@ export function GossipTimestampFilter_set_timestamp_range(this_ptr: number, val: } // MUST_USE_RES struct LDKGossipTimestampFilter GossipTimestampFilter_new(struct LDKThirtyTwoBytes chain_hash_arg, uint32_t first_timestamp_arg, uint32_t timestamp_range_arg); /* @internal */ -export function GossipTimestampFilter_new(chain_hash_arg: number, first_timestamp_arg: number, timestamp_range_arg: number): number { +export function GossipTimestampFilter_new(chain_hash_arg: number, first_timestamp_arg: number, timestamp_range_arg: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_GossipTimestampFilter_new(chain_hash_arg, first_timestamp_arg, timestamp_range_arg); return nativeResponseValue; } - // uintptr_t GossipTimestampFilter_clone_ptr(LDKGossipTimestampFilter *NONNULL_PTR arg); + // uint64_t GossipTimestampFilter_clone_ptr(LDKGossipTimestampFilter *NONNULL_PTR arg); /* @internal */ -export function GossipTimestampFilter_clone_ptr(arg: number): number { +export function GossipTimestampFilter_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24515,7 +24522,7 @@ export function GossipTimestampFilter_clone_ptr(arg: number): number { } // struct LDKGossipTimestampFilter GossipTimestampFilter_clone(const struct LDKGossipTimestampFilter *NONNULL_PTR orig); /* @internal */ -export function GossipTimestampFilter_clone(orig: number): number { +export function GossipTimestampFilter_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24524,16 +24531,16 @@ export function GossipTimestampFilter_clone(orig: number): number { } // void ErrorAction_free(struct LDKErrorAction this_ptr); /* @internal */ -export function ErrorAction_free(this_ptr: number): void { +export function ErrorAction_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_ErrorAction_free(this_ptr); // debug statements here } - // uintptr_t ErrorAction_clone_ptr(LDKErrorAction *NONNULL_PTR arg); + // uint64_t ErrorAction_clone_ptr(LDKErrorAction *NONNULL_PTR arg); /* @internal */ -export function ErrorAction_clone_ptr(arg: number): number { +export function ErrorAction_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24542,7 +24549,7 @@ export function ErrorAction_clone_ptr(arg: number): number { } // struct LDKErrorAction ErrorAction_clone(const struct LDKErrorAction *NONNULL_PTR orig); /* @internal */ -export function ErrorAction_clone(orig: number): number { +export function ErrorAction_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24551,7 +24558,7 @@ export function ErrorAction_clone(orig: number): number { } // struct LDKErrorAction ErrorAction_disconnect_peer(struct LDKErrorMessage msg); /* @internal */ -export function ErrorAction_disconnect_peer(msg: number): number { +export function ErrorAction_disconnect_peer(msg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24560,7 +24567,7 @@ export function ErrorAction_disconnect_peer(msg: number): number { } // struct LDKErrorAction ErrorAction_ignore_error(void); /* @internal */ -export function ErrorAction_ignore_error(): number { +export function ErrorAction_ignore_error(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24569,7 +24576,7 @@ export function ErrorAction_ignore_error(): number { } // struct LDKErrorAction ErrorAction_ignore_and_log(enum LDKLevel a); /* @internal */ -export function ErrorAction_ignore_and_log(a: Level): number { +export function ErrorAction_ignore_and_log(a: Level): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24578,7 +24585,7 @@ export function ErrorAction_ignore_and_log(a: Level): number { } // struct LDKErrorAction ErrorAction_ignore_duplicate_gossip(void); /* @internal */ -export function ErrorAction_ignore_duplicate_gossip(): number { +export function ErrorAction_ignore_duplicate_gossip(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24587,7 +24594,7 @@ export function ErrorAction_ignore_duplicate_gossip(): number { } // struct LDKErrorAction ErrorAction_send_error_message(struct LDKErrorMessage msg); /* @internal */ -export function ErrorAction_send_error_message(msg: number): number { +export function ErrorAction_send_error_message(msg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24596,7 +24603,7 @@ export function ErrorAction_send_error_message(msg: number): number { } // struct LDKErrorAction ErrorAction_send_warning_message(struct LDKWarningMessage msg, enum LDKLevel log_level); /* @internal */ -export function ErrorAction_send_warning_message(msg: number, log_level: Level): number { +export function ErrorAction_send_warning_message(msg: bigint, log_level: Level): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24605,7 +24612,7 @@ export function ErrorAction_send_warning_message(msg: number, log_level: Level): } // void LightningError_free(struct LDKLightningError this_obj); /* @internal */ -export function LightningError_free(this_obj: number): void { +export function LightningError_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24614,7 +24621,7 @@ export function LightningError_free(this_obj: number): void { } // struct LDKStr LightningError_get_err(const struct LDKLightningError *NONNULL_PTR this_ptr); /* @internal */ -export function LightningError_get_err(this_ptr: number): number { +export function LightningError_get_err(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24623,7 +24630,7 @@ export function LightningError_get_err(this_ptr: number): number { } // void LightningError_set_err(struct LDKLightningError *NONNULL_PTR this_ptr, struct LDKStr val); /* @internal */ -export function LightningError_set_err(this_ptr: number, val: number): void { +export function LightningError_set_err(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24632,7 +24639,7 @@ export function LightningError_set_err(this_ptr: number, val: number): void { } // struct LDKErrorAction LightningError_get_action(const struct LDKLightningError *NONNULL_PTR this_ptr); /* @internal */ -export function LightningError_get_action(this_ptr: number): number { +export function LightningError_get_action(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24641,7 +24648,7 @@ export function LightningError_get_action(this_ptr: number): number { } // void LightningError_set_action(struct LDKLightningError *NONNULL_PTR this_ptr, struct LDKErrorAction val); /* @internal */ -export function LightningError_set_action(this_ptr: number, val: number): void { +export function LightningError_set_action(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24650,16 +24657,16 @@ export function LightningError_set_action(this_ptr: number, val: number): void { } // MUST_USE_RES struct LDKLightningError LightningError_new(struct LDKStr err_arg, struct LDKErrorAction action_arg); /* @internal */ -export function LightningError_new(err_arg: number, action_arg: number): number { +export function LightningError_new(err_arg: number, action_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_LightningError_new(err_arg, action_arg); return nativeResponseValue; } - // uintptr_t LightningError_clone_ptr(LDKLightningError *NONNULL_PTR arg); + // uint64_t LightningError_clone_ptr(LDKLightningError *NONNULL_PTR arg); /* @internal */ -export function LightningError_clone_ptr(arg: number): number { +export function LightningError_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24668,7 +24675,7 @@ export function LightningError_clone_ptr(arg: number): number { } // struct LDKLightningError LightningError_clone(const struct LDKLightningError *NONNULL_PTR orig); /* @internal */ -export function LightningError_clone(orig: number): number { +export function LightningError_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24677,7 +24684,7 @@ export function LightningError_clone(orig: number): number { } // void CommitmentUpdate_free(struct LDKCommitmentUpdate this_obj); /* @internal */ -export function CommitmentUpdate_free(this_obj: number): void { +export function CommitmentUpdate_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24686,7 +24693,7 @@ export function CommitmentUpdate_free(this_obj: number): void { } // struct LDKCVec_UpdateAddHTLCZ CommitmentUpdate_get_update_add_htlcs(const struct LDKCommitmentUpdate *NONNULL_PTR this_ptr); /* @internal */ -export function CommitmentUpdate_get_update_add_htlcs(this_ptr: number): number { +export function CommitmentUpdate_get_update_add_htlcs(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24695,7 +24702,7 @@ export function CommitmentUpdate_get_update_add_htlcs(this_ptr: number): number } // void CommitmentUpdate_set_update_add_htlcs(struct LDKCommitmentUpdate *NONNULL_PTR this_ptr, struct LDKCVec_UpdateAddHTLCZ val); /* @internal */ -export function CommitmentUpdate_set_update_add_htlcs(this_ptr: number, val: number): void { +export function CommitmentUpdate_set_update_add_htlcs(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24704,7 +24711,7 @@ export function CommitmentUpdate_set_update_add_htlcs(this_ptr: number, val: num } // struct LDKCVec_UpdateFulfillHTLCZ CommitmentUpdate_get_update_fulfill_htlcs(const struct LDKCommitmentUpdate *NONNULL_PTR this_ptr); /* @internal */ -export function CommitmentUpdate_get_update_fulfill_htlcs(this_ptr: number): number { +export function CommitmentUpdate_get_update_fulfill_htlcs(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24713,7 +24720,7 @@ export function CommitmentUpdate_get_update_fulfill_htlcs(this_ptr: number): num } // void CommitmentUpdate_set_update_fulfill_htlcs(struct LDKCommitmentUpdate *NONNULL_PTR this_ptr, struct LDKCVec_UpdateFulfillHTLCZ val); /* @internal */ -export function CommitmentUpdate_set_update_fulfill_htlcs(this_ptr: number, val: number): void { +export function CommitmentUpdate_set_update_fulfill_htlcs(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24722,7 +24729,7 @@ export function CommitmentUpdate_set_update_fulfill_htlcs(this_ptr: number, val: } // struct LDKCVec_UpdateFailHTLCZ CommitmentUpdate_get_update_fail_htlcs(const struct LDKCommitmentUpdate *NONNULL_PTR this_ptr); /* @internal */ -export function CommitmentUpdate_get_update_fail_htlcs(this_ptr: number): number { +export function CommitmentUpdate_get_update_fail_htlcs(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24731,7 +24738,7 @@ export function CommitmentUpdate_get_update_fail_htlcs(this_ptr: number): number } // void CommitmentUpdate_set_update_fail_htlcs(struct LDKCommitmentUpdate *NONNULL_PTR this_ptr, struct LDKCVec_UpdateFailHTLCZ val); /* @internal */ -export function CommitmentUpdate_set_update_fail_htlcs(this_ptr: number, val: number): void { +export function CommitmentUpdate_set_update_fail_htlcs(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24740,7 +24747,7 @@ export function CommitmentUpdate_set_update_fail_htlcs(this_ptr: number, val: nu } // struct LDKCVec_UpdateFailMalformedHTLCZ CommitmentUpdate_get_update_fail_malformed_htlcs(const struct LDKCommitmentUpdate *NONNULL_PTR this_ptr); /* @internal */ -export function CommitmentUpdate_get_update_fail_malformed_htlcs(this_ptr: number): number { +export function CommitmentUpdate_get_update_fail_malformed_htlcs(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24749,7 +24756,7 @@ export function CommitmentUpdate_get_update_fail_malformed_htlcs(this_ptr: numbe } // void CommitmentUpdate_set_update_fail_malformed_htlcs(struct LDKCommitmentUpdate *NONNULL_PTR this_ptr, struct LDKCVec_UpdateFailMalformedHTLCZ val); /* @internal */ -export function CommitmentUpdate_set_update_fail_malformed_htlcs(this_ptr: number, val: number): void { +export function CommitmentUpdate_set_update_fail_malformed_htlcs(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24758,7 +24765,7 @@ export function CommitmentUpdate_set_update_fail_malformed_htlcs(this_ptr: numbe } // struct LDKUpdateFee CommitmentUpdate_get_update_fee(const struct LDKCommitmentUpdate *NONNULL_PTR this_ptr); /* @internal */ -export function CommitmentUpdate_get_update_fee(this_ptr: number): number { +export function CommitmentUpdate_get_update_fee(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24767,7 +24774,7 @@ export function CommitmentUpdate_get_update_fee(this_ptr: number): number { } // void CommitmentUpdate_set_update_fee(struct LDKCommitmentUpdate *NONNULL_PTR this_ptr, struct LDKUpdateFee val); /* @internal */ -export function CommitmentUpdate_set_update_fee(this_ptr: number, val: number): void { +export function CommitmentUpdate_set_update_fee(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24776,7 +24783,7 @@ export function CommitmentUpdate_set_update_fee(this_ptr: number, val: number): } // struct LDKCommitmentSigned CommitmentUpdate_get_commitment_signed(const struct LDKCommitmentUpdate *NONNULL_PTR this_ptr); /* @internal */ -export function CommitmentUpdate_get_commitment_signed(this_ptr: number): number { +export function CommitmentUpdate_get_commitment_signed(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24785,7 +24792,7 @@ export function CommitmentUpdate_get_commitment_signed(this_ptr: number): number } // void CommitmentUpdate_set_commitment_signed(struct LDKCommitmentUpdate *NONNULL_PTR this_ptr, struct LDKCommitmentSigned val); /* @internal */ -export function CommitmentUpdate_set_commitment_signed(this_ptr: number, val: number): void { +export function CommitmentUpdate_set_commitment_signed(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24794,16 +24801,16 @@ export function CommitmentUpdate_set_commitment_signed(this_ptr: number, val: nu } // MUST_USE_RES struct LDKCommitmentUpdate CommitmentUpdate_new(struct LDKCVec_UpdateAddHTLCZ update_add_htlcs_arg, struct LDKCVec_UpdateFulfillHTLCZ update_fulfill_htlcs_arg, struct LDKCVec_UpdateFailHTLCZ update_fail_htlcs_arg, struct LDKCVec_UpdateFailMalformedHTLCZ update_fail_malformed_htlcs_arg, struct LDKUpdateFee update_fee_arg, struct LDKCommitmentSigned commitment_signed_arg); /* @internal */ -export function CommitmentUpdate_new(update_add_htlcs_arg: number, update_fulfill_htlcs_arg: number, update_fail_htlcs_arg: number, update_fail_malformed_htlcs_arg: number, update_fee_arg: number, commitment_signed_arg: number): number { +export function CommitmentUpdate_new(update_add_htlcs_arg: number, update_fulfill_htlcs_arg: number, update_fail_htlcs_arg: number, update_fail_malformed_htlcs_arg: number, update_fee_arg: bigint, commitment_signed_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CommitmentUpdate_new(update_add_htlcs_arg, update_fulfill_htlcs_arg, update_fail_htlcs_arg, update_fail_malformed_htlcs_arg, update_fee_arg, commitment_signed_arg); return nativeResponseValue; } - // uintptr_t CommitmentUpdate_clone_ptr(LDKCommitmentUpdate *NONNULL_PTR arg); + // uint64_t CommitmentUpdate_clone_ptr(LDKCommitmentUpdate *NONNULL_PTR arg); /* @internal */ -export function CommitmentUpdate_clone_ptr(arg: number): number { +export function CommitmentUpdate_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24812,7 +24819,7 @@ export function CommitmentUpdate_clone_ptr(arg: number): number { } // struct LDKCommitmentUpdate CommitmentUpdate_clone(const struct LDKCommitmentUpdate *NONNULL_PTR orig); /* @internal */ -export function CommitmentUpdate_clone(orig: number): number { +export function CommitmentUpdate_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24821,7 +24828,7 @@ export function CommitmentUpdate_clone(orig: number): number { } // void ChannelMessageHandler_free(struct LDKChannelMessageHandler this_ptr); /* @internal */ -export function ChannelMessageHandler_free(this_ptr: number): void { +export function ChannelMessageHandler_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24830,7 +24837,7 @@ export function ChannelMessageHandler_free(this_ptr: number): void { } // void RoutingMessageHandler_free(struct LDKRoutingMessageHandler this_ptr); /* @internal */ -export function RoutingMessageHandler_free(this_ptr: number): void { +export function RoutingMessageHandler_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24839,7 +24846,7 @@ export function RoutingMessageHandler_free(this_ptr: number): void { } // struct LDKCVec_u8Z AcceptChannel_write(const struct LDKAcceptChannel *NONNULL_PTR obj); /* @internal */ -export function AcceptChannel_write(obj: number): number { +export function AcceptChannel_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24848,7 +24855,7 @@ export function AcceptChannel_write(obj: number): number { } // struct LDKCResult_AcceptChannelDecodeErrorZ AcceptChannel_read(struct LDKu8slice ser); /* @internal */ -export function AcceptChannel_read(ser: number): number { +export function AcceptChannel_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24857,7 +24864,7 @@ export function AcceptChannel_read(ser: number): number { } // struct LDKCVec_u8Z AnnouncementSignatures_write(const struct LDKAnnouncementSignatures *NONNULL_PTR obj); /* @internal */ -export function AnnouncementSignatures_write(obj: number): number { +export function AnnouncementSignatures_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24866,7 +24873,7 @@ export function AnnouncementSignatures_write(obj: number): number { } // struct LDKCResult_AnnouncementSignaturesDecodeErrorZ AnnouncementSignatures_read(struct LDKu8slice ser); /* @internal */ -export function AnnouncementSignatures_read(ser: number): number { +export function AnnouncementSignatures_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24875,7 +24882,7 @@ export function AnnouncementSignatures_read(ser: number): number { } // struct LDKCVec_u8Z ChannelReestablish_write(const struct LDKChannelReestablish *NONNULL_PTR obj); /* @internal */ -export function ChannelReestablish_write(obj: number): number { +export function ChannelReestablish_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24884,7 +24891,7 @@ export function ChannelReestablish_write(obj: number): number { } // struct LDKCResult_ChannelReestablishDecodeErrorZ ChannelReestablish_read(struct LDKu8slice ser); /* @internal */ -export function ChannelReestablish_read(ser: number): number { +export function ChannelReestablish_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24893,7 +24900,7 @@ export function ChannelReestablish_read(ser: number): number { } // struct LDKCVec_u8Z ClosingSigned_write(const struct LDKClosingSigned *NONNULL_PTR obj); /* @internal */ -export function ClosingSigned_write(obj: number): number { +export function ClosingSigned_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24902,7 +24909,7 @@ export function ClosingSigned_write(obj: number): number { } // struct LDKCResult_ClosingSignedDecodeErrorZ ClosingSigned_read(struct LDKu8slice ser); /* @internal */ -export function ClosingSigned_read(ser: number): number { +export function ClosingSigned_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24911,7 +24918,7 @@ export function ClosingSigned_read(ser: number): number { } // struct LDKCVec_u8Z ClosingSignedFeeRange_write(const struct LDKClosingSignedFeeRange *NONNULL_PTR obj); /* @internal */ -export function ClosingSignedFeeRange_write(obj: number): number { +export function ClosingSignedFeeRange_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24920,7 +24927,7 @@ export function ClosingSignedFeeRange_write(obj: number): number { } // struct LDKCResult_ClosingSignedFeeRangeDecodeErrorZ ClosingSignedFeeRange_read(struct LDKu8slice ser); /* @internal */ -export function ClosingSignedFeeRange_read(ser: number): number { +export function ClosingSignedFeeRange_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24929,7 +24936,7 @@ export function ClosingSignedFeeRange_read(ser: number): number { } // struct LDKCVec_u8Z CommitmentSigned_write(const struct LDKCommitmentSigned *NONNULL_PTR obj); /* @internal */ -export function CommitmentSigned_write(obj: number): number { +export function CommitmentSigned_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24938,7 +24945,7 @@ export function CommitmentSigned_write(obj: number): number { } // struct LDKCResult_CommitmentSignedDecodeErrorZ CommitmentSigned_read(struct LDKu8slice ser); /* @internal */ -export function CommitmentSigned_read(ser: number): number { +export function CommitmentSigned_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24947,7 +24954,7 @@ export function CommitmentSigned_read(ser: number): number { } // struct LDKCVec_u8Z FundingCreated_write(const struct LDKFundingCreated *NONNULL_PTR obj); /* @internal */ -export function FundingCreated_write(obj: number): number { +export function FundingCreated_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24956,7 +24963,7 @@ export function FundingCreated_write(obj: number): number { } // struct LDKCResult_FundingCreatedDecodeErrorZ FundingCreated_read(struct LDKu8slice ser); /* @internal */ -export function FundingCreated_read(ser: number): number { +export function FundingCreated_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24965,7 +24972,7 @@ export function FundingCreated_read(ser: number): number { } // struct LDKCVec_u8Z FundingSigned_write(const struct LDKFundingSigned *NONNULL_PTR obj); /* @internal */ -export function FundingSigned_write(obj: number): number { +export function FundingSigned_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24974,7 +24981,7 @@ export function FundingSigned_write(obj: number): number { } // struct LDKCResult_FundingSignedDecodeErrorZ FundingSigned_read(struct LDKu8slice ser); /* @internal */ -export function FundingSigned_read(ser: number): number { +export function FundingSigned_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24983,7 +24990,7 @@ export function FundingSigned_read(ser: number): number { } // struct LDKCVec_u8Z ChannelReady_write(const struct LDKChannelReady *NONNULL_PTR obj); /* @internal */ -export function ChannelReady_write(obj: number): number { +export function ChannelReady_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -24992,7 +24999,7 @@ export function ChannelReady_write(obj: number): number { } // struct LDKCResult_ChannelReadyDecodeErrorZ ChannelReady_read(struct LDKu8slice ser); /* @internal */ -export function ChannelReady_read(ser: number): number { +export function ChannelReady_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25001,7 +25008,7 @@ export function ChannelReady_read(ser: number): number { } // struct LDKCVec_u8Z Init_write(const struct LDKInit *NONNULL_PTR obj); /* @internal */ -export function Init_write(obj: number): number { +export function Init_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25010,7 +25017,7 @@ export function Init_write(obj: number): number { } // struct LDKCResult_InitDecodeErrorZ Init_read(struct LDKu8slice ser); /* @internal */ -export function Init_read(ser: number): number { +export function Init_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25019,7 +25026,7 @@ export function Init_read(ser: number): number { } // struct LDKCVec_u8Z OpenChannel_write(const struct LDKOpenChannel *NONNULL_PTR obj); /* @internal */ -export function OpenChannel_write(obj: number): number { +export function OpenChannel_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25028,7 +25035,7 @@ export function OpenChannel_write(obj: number): number { } // struct LDKCResult_OpenChannelDecodeErrorZ OpenChannel_read(struct LDKu8slice ser); /* @internal */ -export function OpenChannel_read(ser: number): number { +export function OpenChannel_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25037,7 +25044,7 @@ export function OpenChannel_read(ser: number): number { } // struct LDKCVec_u8Z RevokeAndACK_write(const struct LDKRevokeAndACK *NONNULL_PTR obj); /* @internal */ -export function RevokeAndACK_write(obj: number): number { +export function RevokeAndACK_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25046,7 +25053,7 @@ export function RevokeAndACK_write(obj: number): number { } // struct LDKCResult_RevokeAndACKDecodeErrorZ RevokeAndACK_read(struct LDKu8slice ser); /* @internal */ -export function RevokeAndACK_read(ser: number): number { +export function RevokeAndACK_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25055,7 +25062,7 @@ export function RevokeAndACK_read(ser: number): number { } // struct LDKCVec_u8Z Shutdown_write(const struct LDKShutdown *NONNULL_PTR obj); /* @internal */ -export function Shutdown_write(obj: number): number { +export function Shutdown_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25064,7 +25071,7 @@ export function Shutdown_write(obj: number): number { } // struct LDKCResult_ShutdownDecodeErrorZ Shutdown_read(struct LDKu8slice ser); /* @internal */ -export function Shutdown_read(ser: number): number { +export function Shutdown_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25073,7 +25080,7 @@ export function Shutdown_read(ser: number): number { } // struct LDKCVec_u8Z UpdateFailHTLC_write(const struct LDKUpdateFailHTLC *NONNULL_PTR obj); /* @internal */ -export function UpdateFailHTLC_write(obj: number): number { +export function UpdateFailHTLC_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25082,7 +25089,7 @@ export function UpdateFailHTLC_write(obj: number): number { } // struct LDKCResult_UpdateFailHTLCDecodeErrorZ UpdateFailHTLC_read(struct LDKu8slice ser); /* @internal */ -export function UpdateFailHTLC_read(ser: number): number { +export function UpdateFailHTLC_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25091,7 +25098,7 @@ export function UpdateFailHTLC_read(ser: number): number { } // struct LDKCVec_u8Z UpdateFailMalformedHTLC_write(const struct LDKUpdateFailMalformedHTLC *NONNULL_PTR obj); /* @internal */ -export function UpdateFailMalformedHTLC_write(obj: number): number { +export function UpdateFailMalformedHTLC_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25100,7 +25107,7 @@ export function UpdateFailMalformedHTLC_write(obj: number): number { } // struct LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ UpdateFailMalformedHTLC_read(struct LDKu8slice ser); /* @internal */ -export function UpdateFailMalformedHTLC_read(ser: number): number { +export function UpdateFailMalformedHTLC_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25109,7 +25116,7 @@ export function UpdateFailMalformedHTLC_read(ser: number): number { } // struct LDKCVec_u8Z UpdateFee_write(const struct LDKUpdateFee *NONNULL_PTR obj); /* @internal */ -export function UpdateFee_write(obj: number): number { +export function UpdateFee_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25118,7 +25125,7 @@ export function UpdateFee_write(obj: number): number { } // struct LDKCResult_UpdateFeeDecodeErrorZ UpdateFee_read(struct LDKu8slice ser); /* @internal */ -export function UpdateFee_read(ser: number): number { +export function UpdateFee_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25127,7 +25134,7 @@ export function UpdateFee_read(ser: number): number { } // struct LDKCVec_u8Z UpdateFulfillHTLC_write(const struct LDKUpdateFulfillHTLC *NONNULL_PTR obj); /* @internal */ -export function UpdateFulfillHTLC_write(obj: number): number { +export function UpdateFulfillHTLC_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25136,7 +25143,7 @@ export function UpdateFulfillHTLC_write(obj: number): number { } // struct LDKCResult_UpdateFulfillHTLCDecodeErrorZ UpdateFulfillHTLC_read(struct LDKu8slice ser); /* @internal */ -export function UpdateFulfillHTLC_read(ser: number): number { +export function UpdateFulfillHTLC_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25145,7 +25152,7 @@ export function UpdateFulfillHTLC_read(ser: number): number { } // struct LDKCVec_u8Z UpdateAddHTLC_write(const struct LDKUpdateAddHTLC *NONNULL_PTR obj); /* @internal */ -export function UpdateAddHTLC_write(obj: number): number { +export function UpdateAddHTLC_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25154,7 +25161,7 @@ export function UpdateAddHTLC_write(obj: number): number { } // struct LDKCResult_UpdateAddHTLCDecodeErrorZ UpdateAddHTLC_read(struct LDKu8slice ser); /* @internal */ -export function UpdateAddHTLC_read(ser: number): number { +export function UpdateAddHTLC_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25163,7 +25170,7 @@ export function UpdateAddHTLC_read(ser: number): number { } // struct LDKCVec_u8Z Ping_write(const struct LDKPing *NONNULL_PTR obj); /* @internal */ -export function Ping_write(obj: number): number { +export function Ping_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25172,7 +25179,7 @@ export function Ping_write(obj: number): number { } // struct LDKCResult_PingDecodeErrorZ Ping_read(struct LDKu8slice ser); /* @internal */ -export function Ping_read(ser: number): number { +export function Ping_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25181,7 +25188,7 @@ export function Ping_read(ser: number): number { } // struct LDKCVec_u8Z Pong_write(const struct LDKPong *NONNULL_PTR obj); /* @internal */ -export function Pong_write(obj: number): number { +export function Pong_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25190,7 +25197,7 @@ export function Pong_write(obj: number): number { } // struct LDKCResult_PongDecodeErrorZ Pong_read(struct LDKu8slice ser); /* @internal */ -export function Pong_read(ser: number): number { +export function Pong_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25199,7 +25206,7 @@ export function Pong_read(ser: number): number { } // struct LDKCVec_u8Z UnsignedChannelAnnouncement_write(const struct LDKUnsignedChannelAnnouncement *NONNULL_PTR obj); /* @internal */ -export function UnsignedChannelAnnouncement_write(obj: number): number { +export function UnsignedChannelAnnouncement_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25208,7 +25215,7 @@ export function UnsignedChannelAnnouncement_write(obj: number): number { } // struct LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ UnsignedChannelAnnouncement_read(struct LDKu8slice ser); /* @internal */ -export function UnsignedChannelAnnouncement_read(ser: number): number { +export function UnsignedChannelAnnouncement_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25217,7 +25224,7 @@ export function UnsignedChannelAnnouncement_read(ser: number): number { } // struct LDKCVec_u8Z ChannelAnnouncement_write(const struct LDKChannelAnnouncement *NONNULL_PTR obj); /* @internal */ -export function ChannelAnnouncement_write(obj: number): number { +export function ChannelAnnouncement_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25226,7 +25233,7 @@ export function ChannelAnnouncement_write(obj: number): number { } // struct LDKCResult_ChannelAnnouncementDecodeErrorZ ChannelAnnouncement_read(struct LDKu8slice ser); /* @internal */ -export function ChannelAnnouncement_read(ser: number): number { +export function ChannelAnnouncement_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25235,7 +25242,7 @@ export function ChannelAnnouncement_read(ser: number): number { } // struct LDKCVec_u8Z UnsignedChannelUpdate_write(const struct LDKUnsignedChannelUpdate *NONNULL_PTR obj); /* @internal */ -export function UnsignedChannelUpdate_write(obj: number): number { +export function UnsignedChannelUpdate_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25244,7 +25251,7 @@ export function UnsignedChannelUpdate_write(obj: number): number { } // struct LDKCResult_UnsignedChannelUpdateDecodeErrorZ UnsignedChannelUpdate_read(struct LDKu8slice ser); /* @internal */ -export function UnsignedChannelUpdate_read(ser: number): number { +export function UnsignedChannelUpdate_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25253,7 +25260,7 @@ export function UnsignedChannelUpdate_read(ser: number): number { } // struct LDKCVec_u8Z ChannelUpdate_write(const struct LDKChannelUpdate *NONNULL_PTR obj); /* @internal */ -export function ChannelUpdate_write(obj: number): number { +export function ChannelUpdate_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25262,7 +25269,7 @@ export function ChannelUpdate_write(obj: number): number { } // struct LDKCResult_ChannelUpdateDecodeErrorZ ChannelUpdate_read(struct LDKu8slice ser); /* @internal */ -export function ChannelUpdate_read(ser: number): number { +export function ChannelUpdate_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25271,7 +25278,7 @@ export function ChannelUpdate_read(ser: number): number { } // struct LDKCVec_u8Z ErrorMessage_write(const struct LDKErrorMessage *NONNULL_PTR obj); /* @internal */ -export function ErrorMessage_write(obj: number): number { +export function ErrorMessage_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25280,7 +25287,7 @@ export function ErrorMessage_write(obj: number): number { } // struct LDKCResult_ErrorMessageDecodeErrorZ ErrorMessage_read(struct LDKu8slice ser); /* @internal */ -export function ErrorMessage_read(ser: number): number { +export function ErrorMessage_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25289,7 +25296,7 @@ export function ErrorMessage_read(ser: number): number { } // struct LDKCVec_u8Z WarningMessage_write(const struct LDKWarningMessage *NONNULL_PTR obj); /* @internal */ -export function WarningMessage_write(obj: number): number { +export function WarningMessage_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25298,7 +25305,7 @@ export function WarningMessage_write(obj: number): number { } // struct LDKCResult_WarningMessageDecodeErrorZ WarningMessage_read(struct LDKu8slice ser); /* @internal */ -export function WarningMessage_read(ser: number): number { +export function WarningMessage_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25307,7 +25314,7 @@ export function WarningMessage_read(ser: number): number { } // struct LDKCVec_u8Z UnsignedNodeAnnouncement_write(const struct LDKUnsignedNodeAnnouncement *NONNULL_PTR obj); /* @internal */ -export function UnsignedNodeAnnouncement_write(obj: number): number { +export function UnsignedNodeAnnouncement_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25316,7 +25323,7 @@ export function UnsignedNodeAnnouncement_write(obj: number): number { } // struct LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ UnsignedNodeAnnouncement_read(struct LDKu8slice ser); /* @internal */ -export function UnsignedNodeAnnouncement_read(ser: number): number { +export function UnsignedNodeAnnouncement_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25325,7 +25332,7 @@ export function UnsignedNodeAnnouncement_read(ser: number): number { } // struct LDKCVec_u8Z NodeAnnouncement_write(const struct LDKNodeAnnouncement *NONNULL_PTR obj); /* @internal */ -export function NodeAnnouncement_write(obj: number): number { +export function NodeAnnouncement_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25334,7 +25341,7 @@ export function NodeAnnouncement_write(obj: number): number { } // struct LDKCResult_NodeAnnouncementDecodeErrorZ NodeAnnouncement_read(struct LDKu8slice ser); /* @internal */ -export function NodeAnnouncement_read(ser: number): number { +export function NodeAnnouncement_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25343,7 +25350,7 @@ export function NodeAnnouncement_read(ser: number): number { } // struct LDKCResult_QueryShortChannelIdsDecodeErrorZ QueryShortChannelIds_read(struct LDKu8slice ser); /* @internal */ -export function QueryShortChannelIds_read(ser: number): number { +export function QueryShortChannelIds_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25352,7 +25359,7 @@ export function QueryShortChannelIds_read(ser: number): number { } // struct LDKCVec_u8Z QueryShortChannelIds_write(const struct LDKQueryShortChannelIds *NONNULL_PTR obj); /* @internal */ -export function QueryShortChannelIds_write(obj: number): number { +export function QueryShortChannelIds_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25361,7 +25368,7 @@ export function QueryShortChannelIds_write(obj: number): number { } // struct LDKCVec_u8Z ReplyShortChannelIdsEnd_write(const struct LDKReplyShortChannelIdsEnd *NONNULL_PTR obj); /* @internal */ -export function ReplyShortChannelIdsEnd_write(obj: number): number { +export function ReplyShortChannelIdsEnd_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25370,7 +25377,7 @@ export function ReplyShortChannelIdsEnd_write(obj: number): number { } // struct LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ ReplyShortChannelIdsEnd_read(struct LDKu8slice ser); /* @internal */ -export function ReplyShortChannelIdsEnd_read(ser: number): number { +export function ReplyShortChannelIdsEnd_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25379,7 +25386,7 @@ export function ReplyShortChannelIdsEnd_read(ser: number): number { } // MUST_USE_RES uint32_t QueryChannelRange_end_blocknum(const struct LDKQueryChannelRange *NONNULL_PTR this_arg); /* @internal */ -export function QueryChannelRange_end_blocknum(this_arg: number): number { +export function QueryChannelRange_end_blocknum(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25388,7 +25395,7 @@ export function QueryChannelRange_end_blocknum(this_arg: number): number { } // struct LDKCVec_u8Z QueryChannelRange_write(const struct LDKQueryChannelRange *NONNULL_PTR obj); /* @internal */ -export function QueryChannelRange_write(obj: number): number { +export function QueryChannelRange_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25397,7 +25404,7 @@ export function QueryChannelRange_write(obj: number): number { } // struct LDKCResult_QueryChannelRangeDecodeErrorZ QueryChannelRange_read(struct LDKu8slice ser); /* @internal */ -export function QueryChannelRange_read(ser: number): number { +export function QueryChannelRange_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25406,7 +25413,7 @@ export function QueryChannelRange_read(ser: number): number { } // struct LDKCResult_ReplyChannelRangeDecodeErrorZ ReplyChannelRange_read(struct LDKu8slice ser); /* @internal */ -export function ReplyChannelRange_read(ser: number): number { +export function ReplyChannelRange_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25415,7 +25422,7 @@ export function ReplyChannelRange_read(ser: number): number { } // struct LDKCVec_u8Z ReplyChannelRange_write(const struct LDKReplyChannelRange *NONNULL_PTR obj); /* @internal */ -export function ReplyChannelRange_write(obj: number): number { +export function ReplyChannelRange_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25424,7 +25431,7 @@ export function ReplyChannelRange_write(obj: number): number { } // struct LDKCVec_u8Z GossipTimestampFilter_write(const struct LDKGossipTimestampFilter *NONNULL_PTR obj); /* @internal */ -export function GossipTimestampFilter_write(obj: number): number { +export function GossipTimestampFilter_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25433,7 +25440,7 @@ export function GossipTimestampFilter_write(obj: number): number { } // struct LDKCResult_GossipTimestampFilterDecodeErrorZ GossipTimestampFilter_read(struct LDKu8slice ser); /* @internal */ -export function GossipTimestampFilter_read(ser: number): number { +export function GossipTimestampFilter_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25442,7 +25449,7 @@ export function GossipTimestampFilter_read(ser: number): number { } // void CustomMessageHandler_free(struct LDKCustomMessageHandler this_ptr); /* @internal */ -export function CustomMessageHandler_free(this_ptr: number): void { +export function CustomMessageHandler_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25451,7 +25458,7 @@ export function CustomMessageHandler_free(this_ptr: number): void { } // void IgnoringMessageHandler_free(struct LDKIgnoringMessageHandler this_obj); /* @internal */ -export function IgnoringMessageHandler_free(this_obj: number): void { +export function IgnoringMessageHandler_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25460,7 +25467,7 @@ export function IgnoringMessageHandler_free(this_obj: number): void { } // MUST_USE_RES struct LDKIgnoringMessageHandler IgnoringMessageHandler_new(void); /* @internal */ -export function IgnoringMessageHandler_new(): number { +export function IgnoringMessageHandler_new(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25469,7 +25476,7 @@ export function IgnoringMessageHandler_new(): number { } // struct LDKMessageSendEventsProvider IgnoringMessageHandler_as_MessageSendEventsProvider(const struct LDKIgnoringMessageHandler *NONNULL_PTR this_arg); /* @internal */ -export function IgnoringMessageHandler_as_MessageSendEventsProvider(this_arg: number): number { +export function IgnoringMessageHandler_as_MessageSendEventsProvider(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25478,7 +25485,7 @@ export function IgnoringMessageHandler_as_MessageSendEventsProvider(this_arg: nu } // struct LDKRoutingMessageHandler IgnoringMessageHandler_as_RoutingMessageHandler(const struct LDKIgnoringMessageHandler *NONNULL_PTR this_arg); /* @internal */ -export function IgnoringMessageHandler_as_RoutingMessageHandler(this_arg: number): number { +export function IgnoringMessageHandler_as_RoutingMessageHandler(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25487,7 +25494,7 @@ export function IgnoringMessageHandler_as_RoutingMessageHandler(this_arg: number } // struct LDKCustomMessageReader IgnoringMessageHandler_as_CustomMessageReader(const struct LDKIgnoringMessageHandler *NONNULL_PTR this_arg); /* @internal */ -export function IgnoringMessageHandler_as_CustomMessageReader(this_arg: number): number { +export function IgnoringMessageHandler_as_CustomMessageReader(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25496,7 +25503,7 @@ export function IgnoringMessageHandler_as_CustomMessageReader(this_arg: number): } // struct LDKCustomMessageHandler IgnoringMessageHandler_as_CustomMessageHandler(const struct LDKIgnoringMessageHandler *NONNULL_PTR this_arg); /* @internal */ -export function IgnoringMessageHandler_as_CustomMessageHandler(this_arg: number): number { +export function IgnoringMessageHandler_as_CustomMessageHandler(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25505,7 +25512,7 @@ export function IgnoringMessageHandler_as_CustomMessageHandler(this_arg: number) } // void ErroringMessageHandler_free(struct LDKErroringMessageHandler this_obj); /* @internal */ -export function ErroringMessageHandler_free(this_obj: number): void { +export function ErroringMessageHandler_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25514,7 +25521,7 @@ export function ErroringMessageHandler_free(this_obj: number): void { } // MUST_USE_RES struct LDKErroringMessageHandler ErroringMessageHandler_new(void); /* @internal */ -export function ErroringMessageHandler_new(): number { +export function ErroringMessageHandler_new(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25523,7 +25530,7 @@ export function ErroringMessageHandler_new(): number { } // struct LDKMessageSendEventsProvider ErroringMessageHandler_as_MessageSendEventsProvider(const struct LDKErroringMessageHandler *NONNULL_PTR this_arg); /* @internal */ -export function ErroringMessageHandler_as_MessageSendEventsProvider(this_arg: number): number { +export function ErroringMessageHandler_as_MessageSendEventsProvider(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25532,7 +25539,7 @@ export function ErroringMessageHandler_as_MessageSendEventsProvider(this_arg: nu } // struct LDKChannelMessageHandler ErroringMessageHandler_as_ChannelMessageHandler(const struct LDKErroringMessageHandler *NONNULL_PTR this_arg); /* @internal */ -export function ErroringMessageHandler_as_ChannelMessageHandler(this_arg: number): number { +export function ErroringMessageHandler_as_ChannelMessageHandler(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25541,7 +25548,7 @@ export function ErroringMessageHandler_as_ChannelMessageHandler(this_arg: number } // void MessageHandler_free(struct LDKMessageHandler this_obj); /* @internal */ -export function MessageHandler_free(this_obj: number): void { +export function MessageHandler_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25550,7 +25557,7 @@ export function MessageHandler_free(this_obj: number): void { } // const struct LDKChannelMessageHandler *MessageHandler_get_chan_handler(const struct LDKMessageHandler *NONNULL_PTR this_ptr); /* @internal */ -export function MessageHandler_get_chan_handler(this_ptr: number): number { +export function MessageHandler_get_chan_handler(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25559,7 +25566,7 @@ export function MessageHandler_get_chan_handler(this_ptr: number): number { } // void MessageHandler_set_chan_handler(struct LDKMessageHandler *NONNULL_PTR this_ptr, struct LDKChannelMessageHandler val); /* @internal */ -export function MessageHandler_set_chan_handler(this_ptr: number, val: number): void { +export function MessageHandler_set_chan_handler(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25568,7 +25575,7 @@ export function MessageHandler_set_chan_handler(this_ptr: number, val: number): } // const struct LDKRoutingMessageHandler *MessageHandler_get_route_handler(const struct LDKMessageHandler *NONNULL_PTR this_ptr); /* @internal */ -export function MessageHandler_get_route_handler(this_ptr: number): number { +export function MessageHandler_get_route_handler(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25577,7 +25584,7 @@ export function MessageHandler_get_route_handler(this_ptr: number): number { } // void MessageHandler_set_route_handler(struct LDKMessageHandler *NONNULL_PTR this_ptr, struct LDKRoutingMessageHandler val); /* @internal */ -export function MessageHandler_set_route_handler(this_ptr: number, val: number): void { +export function MessageHandler_set_route_handler(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25586,16 +25593,16 @@ export function MessageHandler_set_route_handler(this_ptr: number, val: number): } // MUST_USE_RES struct LDKMessageHandler MessageHandler_new(struct LDKChannelMessageHandler chan_handler_arg, struct LDKRoutingMessageHandler route_handler_arg); /* @internal */ -export function MessageHandler_new(chan_handler_arg: number, route_handler_arg: number): number { +export function MessageHandler_new(chan_handler_arg: bigint, route_handler_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_MessageHandler_new(chan_handler_arg, route_handler_arg); return nativeResponseValue; } - // uintptr_t SocketDescriptor_clone_ptr(LDKSocketDescriptor *NONNULL_PTR arg); + // uint64_t SocketDescriptor_clone_ptr(LDKSocketDescriptor *NONNULL_PTR arg); /* @internal */ -export function SocketDescriptor_clone_ptr(arg: number): number { +export function SocketDescriptor_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25604,7 +25611,7 @@ export function SocketDescriptor_clone_ptr(arg: number): number { } // struct LDKSocketDescriptor SocketDescriptor_clone(const struct LDKSocketDescriptor *NONNULL_PTR orig); /* @internal */ -export function SocketDescriptor_clone(orig: number): number { +export function SocketDescriptor_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25613,7 +25620,7 @@ export function SocketDescriptor_clone(orig: number): number { } // void SocketDescriptor_free(struct LDKSocketDescriptor this_ptr); /* @internal */ -export function SocketDescriptor_free(this_ptr: number): void { +export function SocketDescriptor_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25622,7 +25629,7 @@ export function SocketDescriptor_free(this_ptr: number): void { } // void PeerHandleError_free(struct LDKPeerHandleError this_obj); /* @internal */ -export function PeerHandleError_free(this_obj: number): void { +export function PeerHandleError_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25631,7 +25638,7 @@ export function PeerHandleError_free(this_obj: number): void { } // bool PeerHandleError_get_no_connection_possible(const struct LDKPeerHandleError *NONNULL_PTR this_ptr); /* @internal */ -export function PeerHandleError_get_no_connection_possible(this_ptr: number): boolean { +export function PeerHandleError_get_no_connection_possible(this_ptr: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25640,7 +25647,7 @@ export function PeerHandleError_get_no_connection_possible(this_ptr: number): bo } // void PeerHandleError_set_no_connection_possible(struct LDKPeerHandleError *NONNULL_PTR this_ptr, bool val); /* @internal */ -export function PeerHandleError_set_no_connection_possible(this_ptr: number, val: boolean): void { +export function PeerHandleError_set_no_connection_possible(this_ptr: bigint, val: boolean): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25649,16 +25656,16 @@ export function PeerHandleError_set_no_connection_possible(this_ptr: number, val } // MUST_USE_RES struct LDKPeerHandleError PeerHandleError_new(bool no_connection_possible_arg); /* @internal */ -export function PeerHandleError_new(no_connection_possible_arg: boolean): number { +export function PeerHandleError_new(no_connection_possible_arg: boolean): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_PeerHandleError_new(no_connection_possible_arg); return nativeResponseValue; } - // uintptr_t PeerHandleError_clone_ptr(LDKPeerHandleError *NONNULL_PTR arg); + // uint64_t PeerHandleError_clone_ptr(LDKPeerHandleError *NONNULL_PTR arg); /* @internal */ -export function PeerHandleError_clone_ptr(arg: number): number { +export function PeerHandleError_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25667,7 +25674,7 @@ export function PeerHandleError_clone_ptr(arg: number): number { } // struct LDKPeerHandleError PeerHandleError_clone(const struct LDKPeerHandleError *NONNULL_PTR orig); /* @internal */ -export function PeerHandleError_clone(orig: number): number { +export function PeerHandleError_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25676,7 +25683,7 @@ export function PeerHandleError_clone(orig: number): number { } // void PeerManager_free(struct LDKPeerManager this_obj); /* @internal */ -export function PeerManager_free(this_obj: number): void { +export function PeerManager_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25685,7 +25692,7 @@ export function PeerManager_free(this_obj: number): void { } // MUST_USE_RES struct LDKPeerManager PeerManager_new(struct LDKMessageHandler message_handler, struct LDKSecretKey our_node_secret, const uint8_t (*ephemeral_random_data)[32], struct LDKLogger logger, struct LDKCustomMessageHandler custom_message_handler); /* @internal */ -export function PeerManager_new(message_handler: number, our_node_secret: number, ephemeral_random_data: number, logger: number, custom_message_handler: number): number { +export function PeerManager_new(message_handler: bigint, our_node_secret: number, ephemeral_random_data: number, logger: bigint, custom_message_handler: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25694,7 +25701,7 @@ export function PeerManager_new(message_handler: number, our_node_secret: number } // MUST_USE_RES struct LDKCVec_PublicKeyZ PeerManager_get_peer_node_ids(const struct LDKPeerManager *NONNULL_PTR this_arg); /* @internal */ -export function PeerManager_get_peer_node_ids(this_arg: number): number { +export function PeerManager_get_peer_node_ids(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25703,7 +25710,7 @@ export function PeerManager_get_peer_node_ids(this_arg: number): number { } // MUST_USE_RES struct LDKCResult_CVec_u8ZPeerHandleErrorZ PeerManager_new_outbound_connection(const struct LDKPeerManager *NONNULL_PTR this_arg, struct LDKPublicKey their_node_id, struct LDKSocketDescriptor descriptor, struct LDKCOption_NetAddressZ remote_network_address); /* @internal */ -export function PeerManager_new_outbound_connection(this_arg: number, their_node_id: number, descriptor: number, remote_network_address: number): number { +export function PeerManager_new_outbound_connection(this_arg: bigint, their_node_id: number, descriptor: bigint, remote_network_address: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25712,7 +25719,7 @@ export function PeerManager_new_outbound_connection(this_arg: number, their_node } // MUST_USE_RES struct LDKCResult_NonePeerHandleErrorZ PeerManager_new_inbound_connection(const struct LDKPeerManager *NONNULL_PTR this_arg, struct LDKSocketDescriptor descriptor, struct LDKCOption_NetAddressZ remote_network_address); /* @internal */ -export function PeerManager_new_inbound_connection(this_arg: number, descriptor: number, remote_network_address: number): number { +export function PeerManager_new_inbound_connection(this_arg: bigint, descriptor: bigint, remote_network_address: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25721,7 +25728,7 @@ export function PeerManager_new_inbound_connection(this_arg: number, descriptor: } // MUST_USE_RES struct LDKCResult_NonePeerHandleErrorZ PeerManager_write_buffer_space_avail(const struct LDKPeerManager *NONNULL_PTR this_arg, struct LDKSocketDescriptor *NONNULL_PTR descriptor); /* @internal */ -export function PeerManager_write_buffer_space_avail(this_arg: number, descriptor: number): number { +export function PeerManager_write_buffer_space_avail(this_arg: bigint, descriptor: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25730,7 +25737,7 @@ export function PeerManager_write_buffer_space_avail(this_arg: number, descripto } // MUST_USE_RES struct LDKCResult_boolPeerHandleErrorZ PeerManager_read_event(const struct LDKPeerManager *NONNULL_PTR this_arg, struct LDKSocketDescriptor *NONNULL_PTR peer_descriptor, struct LDKu8slice data); /* @internal */ -export function PeerManager_read_event(this_arg: number, peer_descriptor: number, data: number): number { +export function PeerManager_read_event(this_arg: bigint, peer_descriptor: bigint, data: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25739,7 +25746,7 @@ export function PeerManager_read_event(this_arg: number, peer_descriptor: number } // void PeerManager_process_events(const struct LDKPeerManager *NONNULL_PTR this_arg); /* @internal */ -export function PeerManager_process_events(this_arg: number): void { +export function PeerManager_process_events(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25748,7 +25755,7 @@ export function PeerManager_process_events(this_arg: number): void { } // void PeerManager_socket_disconnected(const struct LDKPeerManager *NONNULL_PTR this_arg, const struct LDKSocketDescriptor *NONNULL_PTR descriptor); /* @internal */ -export function PeerManager_socket_disconnected(this_arg: number, descriptor: number): void { +export function PeerManager_socket_disconnected(this_arg: bigint, descriptor: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25757,7 +25764,7 @@ export function PeerManager_socket_disconnected(this_arg: number, descriptor: nu } // void PeerManager_disconnect_by_node_id(const struct LDKPeerManager *NONNULL_PTR this_arg, struct LDKPublicKey node_id, bool no_connection_possible); /* @internal */ -export function PeerManager_disconnect_by_node_id(this_arg: number, node_id: number, no_connection_possible: boolean): void { +export function PeerManager_disconnect_by_node_id(this_arg: bigint, node_id: number, no_connection_possible: boolean): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25766,7 +25773,7 @@ export function PeerManager_disconnect_by_node_id(this_arg: number, node_id: num } // void PeerManager_disconnect_all_peers(const struct LDKPeerManager *NONNULL_PTR this_arg); /* @internal */ -export function PeerManager_disconnect_all_peers(this_arg: number): void { +export function PeerManager_disconnect_all_peers(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25775,7 +25782,7 @@ export function PeerManager_disconnect_all_peers(this_arg: number): void { } // void PeerManager_timer_tick_occurred(const struct LDKPeerManager *NONNULL_PTR this_arg); /* @internal */ -export function PeerManager_timer_tick_occurred(this_arg: number): void { +export function PeerManager_timer_tick_occurred(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25811,7 +25818,7 @@ export function build_commitment_secret(commitment_seed: number, idx: bigint): n } // struct LDKTransaction build_closing_transaction(uint64_t to_holder_value_sat, uint64_t to_counterparty_value_sat, struct LDKCVec_u8Z to_holder_script, struct LDKCVec_u8Z to_counterparty_script, struct LDKOutPoint funding_outpoint); /* @internal */ -export function build_closing_transaction(to_holder_value_sat: bigint, to_counterparty_value_sat: bigint, to_holder_script: number, to_counterparty_script: number, funding_outpoint: number): number { +export function build_closing_transaction(to_holder_value_sat: bigint, to_counterparty_value_sat: bigint, to_holder_script: number, to_counterparty_script: number, funding_outpoint: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25820,16 +25827,16 @@ export function build_closing_transaction(to_holder_value_sat: bigint, to_counte } // void CounterpartyCommitmentSecrets_free(struct LDKCounterpartyCommitmentSecrets this_obj); /* @internal */ -export function CounterpartyCommitmentSecrets_free(this_obj: number): void { +export function CounterpartyCommitmentSecrets_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CounterpartyCommitmentSecrets_free(this_obj); // debug statements here } - // uintptr_t CounterpartyCommitmentSecrets_clone_ptr(LDKCounterpartyCommitmentSecrets *NONNULL_PTR arg); + // uint64_t CounterpartyCommitmentSecrets_clone_ptr(LDKCounterpartyCommitmentSecrets *NONNULL_PTR arg); /* @internal */ -export function CounterpartyCommitmentSecrets_clone_ptr(arg: number): number { +export function CounterpartyCommitmentSecrets_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25838,7 +25845,7 @@ export function CounterpartyCommitmentSecrets_clone_ptr(arg: number): number { } // struct LDKCounterpartyCommitmentSecrets CounterpartyCommitmentSecrets_clone(const struct LDKCounterpartyCommitmentSecrets *NONNULL_PTR orig); /* @internal */ -export function CounterpartyCommitmentSecrets_clone(orig: number): number { +export function CounterpartyCommitmentSecrets_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25847,7 +25854,7 @@ export function CounterpartyCommitmentSecrets_clone(orig: number): number { } // MUST_USE_RES struct LDKCounterpartyCommitmentSecrets CounterpartyCommitmentSecrets_new(void); /* @internal */ -export function CounterpartyCommitmentSecrets_new(): number { +export function CounterpartyCommitmentSecrets_new(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25856,7 +25863,7 @@ export function CounterpartyCommitmentSecrets_new(): number { } // MUST_USE_RES uint64_t CounterpartyCommitmentSecrets_get_min_seen_secret(const struct LDKCounterpartyCommitmentSecrets *NONNULL_PTR this_arg); /* @internal */ -export function CounterpartyCommitmentSecrets_get_min_seen_secret(this_arg: number): bigint { +export function CounterpartyCommitmentSecrets_get_min_seen_secret(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25865,7 +25872,7 @@ export function CounterpartyCommitmentSecrets_get_min_seen_secret(this_arg: numb } // MUST_USE_RES struct LDKCResult_NoneNoneZ CounterpartyCommitmentSecrets_provide_secret(struct LDKCounterpartyCommitmentSecrets *NONNULL_PTR this_arg, uint64_t idx, struct LDKThirtyTwoBytes secret); /* @internal */ -export function CounterpartyCommitmentSecrets_provide_secret(this_arg: number, idx: bigint, secret: number): number { +export function CounterpartyCommitmentSecrets_provide_secret(this_arg: bigint, idx: bigint, secret: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25874,7 +25881,7 @@ export function CounterpartyCommitmentSecrets_provide_secret(this_arg: number, i } // MUST_USE_RES struct LDKThirtyTwoBytes CounterpartyCommitmentSecrets_get_secret(const struct LDKCounterpartyCommitmentSecrets *NONNULL_PTR this_arg, uint64_t idx); /* @internal */ -export function CounterpartyCommitmentSecrets_get_secret(this_arg: number, idx: bigint): number { +export function CounterpartyCommitmentSecrets_get_secret(this_arg: bigint, idx: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25883,7 +25890,7 @@ export function CounterpartyCommitmentSecrets_get_secret(this_arg: number, idx: } // struct LDKCVec_u8Z CounterpartyCommitmentSecrets_write(const struct LDKCounterpartyCommitmentSecrets *NONNULL_PTR obj); /* @internal */ -export function CounterpartyCommitmentSecrets_write(obj: number): number { +export function CounterpartyCommitmentSecrets_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25892,7 +25899,7 @@ export function CounterpartyCommitmentSecrets_write(obj: number): number { } // struct LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ CounterpartyCommitmentSecrets_read(struct LDKu8slice ser); /* @internal */ -export function CounterpartyCommitmentSecrets_read(ser: number): number { +export function CounterpartyCommitmentSecrets_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25901,7 +25908,7 @@ export function CounterpartyCommitmentSecrets_read(ser: number): number { } // struct LDKCResult_SecretKeyErrorZ derive_private_key(struct LDKPublicKey per_commitment_point, const uint8_t (*base_secret)[32]); /* @internal */ -export function derive_private_key(per_commitment_point: number, base_secret: number): number { +export function derive_private_key(per_commitment_point: number, base_secret: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25910,7 +25917,7 @@ export function derive_private_key(per_commitment_point: number, base_secret: nu } // struct LDKCResult_PublicKeyErrorZ derive_public_key(struct LDKPublicKey per_commitment_point, struct LDKPublicKey base_point); /* @internal */ -export function derive_public_key(per_commitment_point: number, base_point: number): number { +export function derive_public_key(per_commitment_point: number, base_point: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25919,7 +25926,7 @@ export function derive_public_key(per_commitment_point: number, base_point: numb } // struct LDKCResult_SecretKeyErrorZ derive_private_revocation_key(const uint8_t (*per_commitment_secret)[32], const uint8_t (*countersignatory_revocation_base_secret)[32]); /* @internal */ -export function derive_private_revocation_key(per_commitment_secret: number, countersignatory_revocation_base_secret: number): number { +export function derive_private_revocation_key(per_commitment_secret: number, countersignatory_revocation_base_secret: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25928,7 +25935,7 @@ export function derive_private_revocation_key(per_commitment_secret: number, cou } // struct LDKCResult_PublicKeyErrorZ derive_public_revocation_key(struct LDKPublicKey per_commitment_point, struct LDKPublicKey countersignatory_revocation_base_point); /* @internal */ -export function derive_public_revocation_key(per_commitment_point: number, countersignatory_revocation_base_point: number): number { +export function derive_public_revocation_key(per_commitment_point: number, countersignatory_revocation_base_point: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25937,7 +25944,7 @@ export function derive_public_revocation_key(per_commitment_point: number, count } // void TxCreationKeys_free(struct LDKTxCreationKeys this_obj); /* @internal */ -export function TxCreationKeys_free(this_obj: number): void { +export function TxCreationKeys_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25946,7 +25953,7 @@ export function TxCreationKeys_free(this_obj: number): void { } // struct LDKPublicKey TxCreationKeys_get_per_commitment_point(const struct LDKTxCreationKeys *NONNULL_PTR this_ptr); /* @internal */ -export function TxCreationKeys_get_per_commitment_point(this_ptr: number): number { +export function TxCreationKeys_get_per_commitment_point(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25955,7 +25962,7 @@ export function TxCreationKeys_get_per_commitment_point(this_ptr: number): numbe } // void TxCreationKeys_set_per_commitment_point(struct LDKTxCreationKeys *NONNULL_PTR this_ptr, struct LDKPublicKey val); /* @internal */ -export function TxCreationKeys_set_per_commitment_point(this_ptr: number, val: number): void { +export function TxCreationKeys_set_per_commitment_point(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25964,7 +25971,7 @@ export function TxCreationKeys_set_per_commitment_point(this_ptr: number, val: n } // struct LDKPublicKey TxCreationKeys_get_revocation_key(const struct LDKTxCreationKeys *NONNULL_PTR this_ptr); /* @internal */ -export function TxCreationKeys_get_revocation_key(this_ptr: number): number { +export function TxCreationKeys_get_revocation_key(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25973,7 +25980,7 @@ export function TxCreationKeys_get_revocation_key(this_ptr: number): number { } // void TxCreationKeys_set_revocation_key(struct LDKTxCreationKeys *NONNULL_PTR this_ptr, struct LDKPublicKey val); /* @internal */ -export function TxCreationKeys_set_revocation_key(this_ptr: number, val: number): void { +export function TxCreationKeys_set_revocation_key(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25982,7 +25989,7 @@ export function TxCreationKeys_set_revocation_key(this_ptr: number, val: number) } // struct LDKPublicKey TxCreationKeys_get_broadcaster_htlc_key(const struct LDKTxCreationKeys *NONNULL_PTR this_ptr); /* @internal */ -export function TxCreationKeys_get_broadcaster_htlc_key(this_ptr: number): number { +export function TxCreationKeys_get_broadcaster_htlc_key(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -25991,7 +25998,7 @@ export function TxCreationKeys_get_broadcaster_htlc_key(this_ptr: number): numbe } // void TxCreationKeys_set_broadcaster_htlc_key(struct LDKTxCreationKeys *NONNULL_PTR this_ptr, struct LDKPublicKey val); /* @internal */ -export function TxCreationKeys_set_broadcaster_htlc_key(this_ptr: number, val: number): void { +export function TxCreationKeys_set_broadcaster_htlc_key(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26000,7 +26007,7 @@ export function TxCreationKeys_set_broadcaster_htlc_key(this_ptr: number, val: n } // struct LDKPublicKey TxCreationKeys_get_countersignatory_htlc_key(const struct LDKTxCreationKeys *NONNULL_PTR this_ptr); /* @internal */ -export function TxCreationKeys_get_countersignatory_htlc_key(this_ptr: number): number { +export function TxCreationKeys_get_countersignatory_htlc_key(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26009,7 +26016,7 @@ export function TxCreationKeys_get_countersignatory_htlc_key(this_ptr: number): } // void TxCreationKeys_set_countersignatory_htlc_key(struct LDKTxCreationKeys *NONNULL_PTR this_ptr, struct LDKPublicKey val); /* @internal */ -export function TxCreationKeys_set_countersignatory_htlc_key(this_ptr: number, val: number): void { +export function TxCreationKeys_set_countersignatory_htlc_key(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26018,7 +26025,7 @@ export function TxCreationKeys_set_countersignatory_htlc_key(this_ptr: number, v } // struct LDKPublicKey TxCreationKeys_get_broadcaster_delayed_payment_key(const struct LDKTxCreationKeys *NONNULL_PTR this_ptr); /* @internal */ -export function TxCreationKeys_get_broadcaster_delayed_payment_key(this_ptr: number): number { +export function TxCreationKeys_get_broadcaster_delayed_payment_key(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26027,7 +26034,7 @@ export function TxCreationKeys_get_broadcaster_delayed_payment_key(this_ptr: num } // void TxCreationKeys_set_broadcaster_delayed_payment_key(struct LDKTxCreationKeys *NONNULL_PTR this_ptr, struct LDKPublicKey val); /* @internal */ -export function TxCreationKeys_set_broadcaster_delayed_payment_key(this_ptr: number, val: number): void { +export function TxCreationKeys_set_broadcaster_delayed_payment_key(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26036,16 +26043,16 @@ export function TxCreationKeys_set_broadcaster_delayed_payment_key(this_ptr: num } // MUST_USE_RES struct LDKTxCreationKeys TxCreationKeys_new(struct LDKPublicKey per_commitment_point_arg, struct LDKPublicKey revocation_key_arg, struct LDKPublicKey broadcaster_htlc_key_arg, struct LDKPublicKey countersignatory_htlc_key_arg, struct LDKPublicKey broadcaster_delayed_payment_key_arg); /* @internal */ -export function TxCreationKeys_new(per_commitment_point_arg: number, revocation_key_arg: number, broadcaster_htlc_key_arg: number, countersignatory_htlc_key_arg: number, broadcaster_delayed_payment_key_arg: number): number { +export function TxCreationKeys_new(per_commitment_point_arg: number, revocation_key_arg: number, broadcaster_htlc_key_arg: number, countersignatory_htlc_key_arg: number, broadcaster_delayed_payment_key_arg: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_TxCreationKeys_new(per_commitment_point_arg, revocation_key_arg, broadcaster_htlc_key_arg, countersignatory_htlc_key_arg, broadcaster_delayed_payment_key_arg); return nativeResponseValue; } - // uintptr_t TxCreationKeys_clone_ptr(LDKTxCreationKeys *NONNULL_PTR arg); + // uint64_t TxCreationKeys_clone_ptr(LDKTxCreationKeys *NONNULL_PTR arg); /* @internal */ -export function TxCreationKeys_clone_ptr(arg: number): number { +export function TxCreationKeys_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26054,7 +26061,7 @@ export function TxCreationKeys_clone_ptr(arg: number): number { } // struct LDKTxCreationKeys TxCreationKeys_clone(const struct LDKTxCreationKeys *NONNULL_PTR orig); /* @internal */ -export function TxCreationKeys_clone(orig: number): number { +export function TxCreationKeys_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26063,7 +26070,7 @@ export function TxCreationKeys_clone(orig: number): number { } // struct LDKCVec_u8Z TxCreationKeys_write(const struct LDKTxCreationKeys *NONNULL_PTR obj); /* @internal */ -export function TxCreationKeys_write(obj: number): number { +export function TxCreationKeys_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26072,7 +26079,7 @@ export function TxCreationKeys_write(obj: number): number { } // struct LDKCResult_TxCreationKeysDecodeErrorZ TxCreationKeys_read(struct LDKu8slice ser); /* @internal */ -export function TxCreationKeys_read(ser: number): number { +export function TxCreationKeys_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26081,7 +26088,7 @@ export function TxCreationKeys_read(ser: number): number { } // void ChannelPublicKeys_free(struct LDKChannelPublicKeys this_obj); /* @internal */ -export function ChannelPublicKeys_free(this_obj: number): void { +export function ChannelPublicKeys_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26090,7 +26097,7 @@ export function ChannelPublicKeys_free(this_obj: number): void { } // struct LDKPublicKey ChannelPublicKeys_get_funding_pubkey(const struct LDKChannelPublicKeys *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelPublicKeys_get_funding_pubkey(this_ptr: number): number { +export function ChannelPublicKeys_get_funding_pubkey(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26099,7 +26106,7 @@ export function ChannelPublicKeys_get_funding_pubkey(this_ptr: number): number { } // void ChannelPublicKeys_set_funding_pubkey(struct LDKChannelPublicKeys *NONNULL_PTR this_ptr, struct LDKPublicKey val); /* @internal */ -export function ChannelPublicKeys_set_funding_pubkey(this_ptr: number, val: number): void { +export function ChannelPublicKeys_set_funding_pubkey(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26108,7 +26115,7 @@ export function ChannelPublicKeys_set_funding_pubkey(this_ptr: number, val: numb } // struct LDKPublicKey ChannelPublicKeys_get_revocation_basepoint(const struct LDKChannelPublicKeys *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelPublicKeys_get_revocation_basepoint(this_ptr: number): number { +export function ChannelPublicKeys_get_revocation_basepoint(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26117,7 +26124,7 @@ export function ChannelPublicKeys_get_revocation_basepoint(this_ptr: number): nu } // void ChannelPublicKeys_set_revocation_basepoint(struct LDKChannelPublicKeys *NONNULL_PTR this_ptr, struct LDKPublicKey val); /* @internal */ -export function ChannelPublicKeys_set_revocation_basepoint(this_ptr: number, val: number): void { +export function ChannelPublicKeys_set_revocation_basepoint(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26126,7 +26133,7 @@ export function ChannelPublicKeys_set_revocation_basepoint(this_ptr: number, val } // struct LDKPublicKey ChannelPublicKeys_get_payment_point(const struct LDKChannelPublicKeys *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelPublicKeys_get_payment_point(this_ptr: number): number { +export function ChannelPublicKeys_get_payment_point(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26135,7 +26142,7 @@ export function ChannelPublicKeys_get_payment_point(this_ptr: number): number { } // void ChannelPublicKeys_set_payment_point(struct LDKChannelPublicKeys *NONNULL_PTR this_ptr, struct LDKPublicKey val); /* @internal */ -export function ChannelPublicKeys_set_payment_point(this_ptr: number, val: number): void { +export function ChannelPublicKeys_set_payment_point(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26144,7 +26151,7 @@ export function ChannelPublicKeys_set_payment_point(this_ptr: number, val: numbe } // struct LDKPublicKey ChannelPublicKeys_get_delayed_payment_basepoint(const struct LDKChannelPublicKeys *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelPublicKeys_get_delayed_payment_basepoint(this_ptr: number): number { +export function ChannelPublicKeys_get_delayed_payment_basepoint(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26153,7 +26160,7 @@ export function ChannelPublicKeys_get_delayed_payment_basepoint(this_ptr: number } // void ChannelPublicKeys_set_delayed_payment_basepoint(struct LDKChannelPublicKeys *NONNULL_PTR this_ptr, struct LDKPublicKey val); /* @internal */ -export function ChannelPublicKeys_set_delayed_payment_basepoint(this_ptr: number, val: number): void { +export function ChannelPublicKeys_set_delayed_payment_basepoint(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26162,7 +26169,7 @@ export function ChannelPublicKeys_set_delayed_payment_basepoint(this_ptr: number } // struct LDKPublicKey ChannelPublicKeys_get_htlc_basepoint(const struct LDKChannelPublicKeys *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelPublicKeys_get_htlc_basepoint(this_ptr: number): number { +export function ChannelPublicKeys_get_htlc_basepoint(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26171,7 +26178,7 @@ export function ChannelPublicKeys_get_htlc_basepoint(this_ptr: number): number { } // void ChannelPublicKeys_set_htlc_basepoint(struct LDKChannelPublicKeys *NONNULL_PTR this_ptr, struct LDKPublicKey val); /* @internal */ -export function ChannelPublicKeys_set_htlc_basepoint(this_ptr: number, val: number): void { +export function ChannelPublicKeys_set_htlc_basepoint(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26180,16 +26187,16 @@ export function ChannelPublicKeys_set_htlc_basepoint(this_ptr: number, val: numb } // MUST_USE_RES struct LDKChannelPublicKeys ChannelPublicKeys_new(struct LDKPublicKey funding_pubkey_arg, struct LDKPublicKey revocation_basepoint_arg, struct LDKPublicKey payment_point_arg, struct LDKPublicKey delayed_payment_basepoint_arg, struct LDKPublicKey htlc_basepoint_arg); /* @internal */ -export function ChannelPublicKeys_new(funding_pubkey_arg: number, revocation_basepoint_arg: number, payment_point_arg: number, delayed_payment_basepoint_arg: number, htlc_basepoint_arg: number): number { +export function ChannelPublicKeys_new(funding_pubkey_arg: number, revocation_basepoint_arg: number, payment_point_arg: number, delayed_payment_basepoint_arg: number, htlc_basepoint_arg: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_ChannelPublicKeys_new(funding_pubkey_arg, revocation_basepoint_arg, payment_point_arg, delayed_payment_basepoint_arg, htlc_basepoint_arg); return nativeResponseValue; } - // uintptr_t ChannelPublicKeys_clone_ptr(LDKChannelPublicKeys *NONNULL_PTR arg); + // uint64_t ChannelPublicKeys_clone_ptr(LDKChannelPublicKeys *NONNULL_PTR arg); /* @internal */ -export function ChannelPublicKeys_clone_ptr(arg: number): number { +export function ChannelPublicKeys_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26198,7 +26205,7 @@ export function ChannelPublicKeys_clone_ptr(arg: number): number { } // struct LDKChannelPublicKeys ChannelPublicKeys_clone(const struct LDKChannelPublicKeys *NONNULL_PTR orig); /* @internal */ -export function ChannelPublicKeys_clone(orig: number): number { +export function ChannelPublicKeys_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26207,7 +26214,7 @@ export function ChannelPublicKeys_clone(orig: number): number { } // struct LDKCVec_u8Z ChannelPublicKeys_write(const struct LDKChannelPublicKeys *NONNULL_PTR obj); /* @internal */ -export function ChannelPublicKeys_write(obj: number): number { +export function ChannelPublicKeys_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26216,7 +26223,7 @@ export function ChannelPublicKeys_write(obj: number): number { } // struct LDKCResult_ChannelPublicKeysDecodeErrorZ ChannelPublicKeys_read(struct LDKu8slice ser); /* @internal */ -export function ChannelPublicKeys_read(ser: number): number { +export function ChannelPublicKeys_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26225,7 +26232,7 @@ export function ChannelPublicKeys_read(ser: number): number { } // MUST_USE_RES struct LDKCResult_TxCreationKeysErrorZ TxCreationKeys_derive_new(struct LDKPublicKey per_commitment_point, struct LDKPublicKey broadcaster_delayed_payment_base, struct LDKPublicKey broadcaster_htlc_base, struct LDKPublicKey countersignatory_revocation_base, struct LDKPublicKey countersignatory_htlc_base); /* @internal */ -export function TxCreationKeys_derive_new(per_commitment_point: number, broadcaster_delayed_payment_base: number, broadcaster_htlc_base: number, countersignatory_revocation_base: number, countersignatory_htlc_base: number): number { +export function TxCreationKeys_derive_new(per_commitment_point: number, broadcaster_delayed_payment_base: number, broadcaster_htlc_base: number, countersignatory_revocation_base: number, countersignatory_htlc_base: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26234,7 +26241,7 @@ export function TxCreationKeys_derive_new(per_commitment_point: number, broadcas } // MUST_USE_RES struct LDKCResult_TxCreationKeysErrorZ TxCreationKeys_from_channel_static_keys(struct LDKPublicKey per_commitment_point, const struct LDKChannelPublicKeys *NONNULL_PTR broadcaster_keys, const struct LDKChannelPublicKeys *NONNULL_PTR countersignatory_keys); /* @internal */ -export function TxCreationKeys_from_channel_static_keys(per_commitment_point: number, broadcaster_keys: number, countersignatory_keys: number): number { +export function TxCreationKeys_from_channel_static_keys(per_commitment_point: number, broadcaster_keys: bigint, countersignatory_keys: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26252,7 +26259,7 @@ export function get_revokeable_redeemscript(revocation_key: number, contest_dela } // void HTLCOutputInCommitment_free(struct LDKHTLCOutputInCommitment this_obj); /* @internal */ -export function HTLCOutputInCommitment_free(this_obj: number): void { +export function HTLCOutputInCommitment_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26261,7 +26268,7 @@ export function HTLCOutputInCommitment_free(this_obj: number): void { } // bool HTLCOutputInCommitment_get_offered(const struct LDKHTLCOutputInCommitment *NONNULL_PTR this_ptr); /* @internal */ -export function HTLCOutputInCommitment_get_offered(this_ptr: number): boolean { +export function HTLCOutputInCommitment_get_offered(this_ptr: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26270,7 +26277,7 @@ export function HTLCOutputInCommitment_get_offered(this_ptr: number): boolean { } // void HTLCOutputInCommitment_set_offered(struct LDKHTLCOutputInCommitment *NONNULL_PTR this_ptr, bool val); /* @internal */ -export function HTLCOutputInCommitment_set_offered(this_ptr: number, val: boolean): void { +export function HTLCOutputInCommitment_set_offered(this_ptr: bigint, val: boolean): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26279,7 +26286,7 @@ export function HTLCOutputInCommitment_set_offered(this_ptr: number, val: boolea } // uint64_t HTLCOutputInCommitment_get_amount_msat(const struct LDKHTLCOutputInCommitment *NONNULL_PTR this_ptr); /* @internal */ -export function HTLCOutputInCommitment_get_amount_msat(this_ptr: number): bigint { +export function HTLCOutputInCommitment_get_amount_msat(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26288,7 +26295,7 @@ export function HTLCOutputInCommitment_get_amount_msat(this_ptr: number): bigint } // void HTLCOutputInCommitment_set_amount_msat(struct LDKHTLCOutputInCommitment *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function HTLCOutputInCommitment_set_amount_msat(this_ptr: number, val: bigint): void { +export function HTLCOutputInCommitment_set_amount_msat(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26297,7 +26304,7 @@ export function HTLCOutputInCommitment_set_amount_msat(this_ptr: number, val: bi } // uint32_t HTLCOutputInCommitment_get_cltv_expiry(const struct LDKHTLCOutputInCommitment *NONNULL_PTR this_ptr); /* @internal */ -export function HTLCOutputInCommitment_get_cltv_expiry(this_ptr: number): number { +export function HTLCOutputInCommitment_get_cltv_expiry(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26306,7 +26313,7 @@ export function HTLCOutputInCommitment_get_cltv_expiry(this_ptr: number): number } // void HTLCOutputInCommitment_set_cltv_expiry(struct LDKHTLCOutputInCommitment *NONNULL_PTR this_ptr, uint32_t val); /* @internal */ -export function HTLCOutputInCommitment_set_cltv_expiry(this_ptr: number, val: number): void { +export function HTLCOutputInCommitment_set_cltv_expiry(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26315,7 +26322,7 @@ export function HTLCOutputInCommitment_set_cltv_expiry(this_ptr: number, val: nu } // const uint8_t (*HTLCOutputInCommitment_get_payment_hash(const struct LDKHTLCOutputInCommitment *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function HTLCOutputInCommitment_get_payment_hash(this_ptr: number): number { +export function HTLCOutputInCommitment_get_payment_hash(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26324,7 +26331,7 @@ export function HTLCOutputInCommitment_get_payment_hash(this_ptr: number): numbe } // void HTLCOutputInCommitment_set_payment_hash(struct LDKHTLCOutputInCommitment *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function HTLCOutputInCommitment_set_payment_hash(this_ptr: number, val: number): void { +export function HTLCOutputInCommitment_set_payment_hash(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26333,7 +26340,7 @@ export function HTLCOutputInCommitment_set_payment_hash(this_ptr: number, val: n } // struct LDKCOption_u32Z HTLCOutputInCommitment_get_transaction_output_index(const struct LDKHTLCOutputInCommitment *NONNULL_PTR this_ptr); /* @internal */ -export function HTLCOutputInCommitment_get_transaction_output_index(this_ptr: number): number { +export function HTLCOutputInCommitment_get_transaction_output_index(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26342,7 +26349,7 @@ export function HTLCOutputInCommitment_get_transaction_output_index(this_ptr: nu } // void HTLCOutputInCommitment_set_transaction_output_index(struct LDKHTLCOutputInCommitment *NONNULL_PTR this_ptr, struct LDKCOption_u32Z val); /* @internal */ -export function HTLCOutputInCommitment_set_transaction_output_index(this_ptr: number, val: number): void { +export function HTLCOutputInCommitment_set_transaction_output_index(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26351,16 +26358,16 @@ export function HTLCOutputInCommitment_set_transaction_output_index(this_ptr: nu } // MUST_USE_RES struct LDKHTLCOutputInCommitment HTLCOutputInCommitment_new(bool offered_arg, uint64_t amount_msat_arg, uint32_t cltv_expiry_arg, struct LDKThirtyTwoBytes payment_hash_arg, struct LDKCOption_u32Z transaction_output_index_arg); /* @internal */ -export function HTLCOutputInCommitment_new(offered_arg: boolean, amount_msat_arg: bigint, cltv_expiry_arg: number, payment_hash_arg: number, transaction_output_index_arg: number): number { +export function HTLCOutputInCommitment_new(offered_arg: boolean, amount_msat_arg: bigint, cltv_expiry_arg: number, payment_hash_arg: number, transaction_output_index_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_HTLCOutputInCommitment_new(offered_arg, amount_msat_arg, cltv_expiry_arg, payment_hash_arg, transaction_output_index_arg); return nativeResponseValue; } - // uintptr_t HTLCOutputInCommitment_clone_ptr(LDKHTLCOutputInCommitment *NONNULL_PTR arg); + // uint64_t HTLCOutputInCommitment_clone_ptr(LDKHTLCOutputInCommitment *NONNULL_PTR arg); /* @internal */ -export function HTLCOutputInCommitment_clone_ptr(arg: number): number { +export function HTLCOutputInCommitment_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26369,7 +26376,7 @@ export function HTLCOutputInCommitment_clone_ptr(arg: number): number { } // struct LDKHTLCOutputInCommitment HTLCOutputInCommitment_clone(const struct LDKHTLCOutputInCommitment *NONNULL_PTR orig); /* @internal */ -export function HTLCOutputInCommitment_clone(orig: number): number { +export function HTLCOutputInCommitment_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26378,7 +26385,7 @@ export function HTLCOutputInCommitment_clone(orig: number): number { } // struct LDKCVec_u8Z HTLCOutputInCommitment_write(const struct LDKHTLCOutputInCommitment *NONNULL_PTR obj); /* @internal */ -export function HTLCOutputInCommitment_write(obj: number): number { +export function HTLCOutputInCommitment_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26387,7 +26394,7 @@ export function HTLCOutputInCommitment_write(obj: number): number { } // struct LDKCResult_HTLCOutputInCommitmentDecodeErrorZ HTLCOutputInCommitment_read(struct LDKu8slice ser); /* @internal */ -export function HTLCOutputInCommitment_read(ser: number): number { +export function HTLCOutputInCommitment_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26396,7 +26403,7 @@ export function HTLCOutputInCommitment_read(ser: number): number { } // struct LDKCVec_u8Z get_htlc_redeemscript(const struct LDKHTLCOutputInCommitment *NONNULL_PTR htlc, bool opt_anchors, const struct LDKTxCreationKeys *NONNULL_PTR keys); /* @internal */ -export function get_htlc_redeemscript(htlc: number, opt_anchors: boolean, keys: number): number { +export function get_htlc_redeemscript(htlc: bigint, opt_anchors: boolean, keys: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26414,7 +26421,7 @@ export function make_funding_redeemscript(broadcaster: number, countersignatory: } // struct LDKTransaction build_htlc_transaction(const uint8_t (*commitment_txid)[32], uint32_t feerate_per_kw, uint16_t contest_delay, const struct LDKHTLCOutputInCommitment *NONNULL_PTR htlc, bool opt_anchors, struct LDKPublicKey broadcaster_delayed_payment_key, struct LDKPublicKey revocation_key); /* @internal */ -export function build_htlc_transaction(commitment_txid: number, feerate_per_kw: number, contest_delay: number, htlc: number, opt_anchors: boolean, broadcaster_delayed_payment_key: number, revocation_key: number): number { +export function build_htlc_transaction(commitment_txid: number, feerate_per_kw: number, contest_delay: number, htlc: bigint, opt_anchors: boolean, broadcaster_delayed_payment_key: number, revocation_key: number): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26432,7 +26439,7 @@ export function get_anchor_redeemscript(funding_pubkey: number): number { } // void ChannelTransactionParameters_free(struct LDKChannelTransactionParameters this_obj); /* @internal */ -export function ChannelTransactionParameters_free(this_obj: number): void { +export function ChannelTransactionParameters_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26441,7 +26448,7 @@ export function ChannelTransactionParameters_free(this_obj: number): void { } // struct LDKChannelPublicKeys ChannelTransactionParameters_get_holder_pubkeys(const struct LDKChannelTransactionParameters *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelTransactionParameters_get_holder_pubkeys(this_ptr: number): number { +export function ChannelTransactionParameters_get_holder_pubkeys(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26450,7 +26457,7 @@ export function ChannelTransactionParameters_get_holder_pubkeys(this_ptr: number } // void ChannelTransactionParameters_set_holder_pubkeys(struct LDKChannelTransactionParameters *NONNULL_PTR this_ptr, struct LDKChannelPublicKeys val); /* @internal */ -export function ChannelTransactionParameters_set_holder_pubkeys(this_ptr: number, val: number): void { +export function ChannelTransactionParameters_set_holder_pubkeys(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26459,7 +26466,7 @@ export function ChannelTransactionParameters_set_holder_pubkeys(this_ptr: number } // uint16_t ChannelTransactionParameters_get_holder_selected_contest_delay(const struct LDKChannelTransactionParameters *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelTransactionParameters_get_holder_selected_contest_delay(this_ptr: number): number { +export function ChannelTransactionParameters_get_holder_selected_contest_delay(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26468,7 +26475,7 @@ export function ChannelTransactionParameters_get_holder_selected_contest_delay(t } // void ChannelTransactionParameters_set_holder_selected_contest_delay(struct LDKChannelTransactionParameters *NONNULL_PTR this_ptr, uint16_t val); /* @internal */ -export function ChannelTransactionParameters_set_holder_selected_contest_delay(this_ptr: number, val: number): void { +export function ChannelTransactionParameters_set_holder_selected_contest_delay(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26477,7 +26484,7 @@ export function ChannelTransactionParameters_set_holder_selected_contest_delay(t } // bool ChannelTransactionParameters_get_is_outbound_from_holder(const struct LDKChannelTransactionParameters *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelTransactionParameters_get_is_outbound_from_holder(this_ptr: number): boolean { +export function ChannelTransactionParameters_get_is_outbound_from_holder(this_ptr: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26486,7 +26493,7 @@ export function ChannelTransactionParameters_get_is_outbound_from_holder(this_pt } // void ChannelTransactionParameters_set_is_outbound_from_holder(struct LDKChannelTransactionParameters *NONNULL_PTR this_ptr, bool val); /* @internal */ -export function ChannelTransactionParameters_set_is_outbound_from_holder(this_ptr: number, val: boolean): void { +export function ChannelTransactionParameters_set_is_outbound_from_holder(this_ptr: bigint, val: boolean): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26495,7 +26502,7 @@ export function ChannelTransactionParameters_set_is_outbound_from_holder(this_pt } // struct LDKCounterpartyChannelTransactionParameters ChannelTransactionParameters_get_counterparty_parameters(const struct LDKChannelTransactionParameters *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelTransactionParameters_get_counterparty_parameters(this_ptr: number): number { +export function ChannelTransactionParameters_get_counterparty_parameters(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26504,7 +26511,7 @@ export function ChannelTransactionParameters_get_counterparty_parameters(this_pt } // void ChannelTransactionParameters_set_counterparty_parameters(struct LDKChannelTransactionParameters *NONNULL_PTR this_ptr, struct LDKCounterpartyChannelTransactionParameters val); /* @internal */ -export function ChannelTransactionParameters_set_counterparty_parameters(this_ptr: number, val: number): void { +export function ChannelTransactionParameters_set_counterparty_parameters(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26513,7 +26520,7 @@ export function ChannelTransactionParameters_set_counterparty_parameters(this_pt } // struct LDKOutPoint ChannelTransactionParameters_get_funding_outpoint(const struct LDKChannelTransactionParameters *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelTransactionParameters_get_funding_outpoint(this_ptr: number): number { +export function ChannelTransactionParameters_get_funding_outpoint(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26522,7 +26529,7 @@ export function ChannelTransactionParameters_get_funding_outpoint(this_ptr: numb } // void ChannelTransactionParameters_set_funding_outpoint(struct LDKChannelTransactionParameters *NONNULL_PTR this_ptr, struct LDKOutPoint val); /* @internal */ -export function ChannelTransactionParameters_set_funding_outpoint(this_ptr: number, val: number): void { +export function ChannelTransactionParameters_set_funding_outpoint(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26531,7 +26538,7 @@ export function ChannelTransactionParameters_set_funding_outpoint(this_ptr: numb } // enum LDKCOption_NoneZ ChannelTransactionParameters_get_opt_anchors(const struct LDKChannelTransactionParameters *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelTransactionParameters_get_opt_anchors(this_ptr: number): COption_NoneZ { +export function ChannelTransactionParameters_get_opt_anchors(this_ptr: bigint): COption_NoneZ { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26540,7 +26547,7 @@ export function ChannelTransactionParameters_get_opt_anchors(this_ptr: number): } // void ChannelTransactionParameters_set_opt_anchors(struct LDKChannelTransactionParameters *NONNULL_PTR this_ptr, enum LDKCOption_NoneZ val); /* @internal */ -export function ChannelTransactionParameters_set_opt_anchors(this_ptr: number, val: COption_NoneZ): void { +export function ChannelTransactionParameters_set_opt_anchors(this_ptr: bigint, val: COption_NoneZ): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26549,16 +26556,16 @@ export function ChannelTransactionParameters_set_opt_anchors(this_ptr: number, v } // MUST_USE_RES struct LDKChannelTransactionParameters ChannelTransactionParameters_new(struct LDKChannelPublicKeys holder_pubkeys_arg, uint16_t holder_selected_contest_delay_arg, bool is_outbound_from_holder_arg, struct LDKCounterpartyChannelTransactionParameters counterparty_parameters_arg, struct LDKOutPoint funding_outpoint_arg, enum LDKCOption_NoneZ opt_anchors_arg); /* @internal */ -export function ChannelTransactionParameters_new(holder_pubkeys_arg: number, holder_selected_contest_delay_arg: number, is_outbound_from_holder_arg: boolean, counterparty_parameters_arg: number, funding_outpoint_arg: number, opt_anchors_arg: COption_NoneZ): number { +export function ChannelTransactionParameters_new(holder_pubkeys_arg: bigint, holder_selected_contest_delay_arg: number, is_outbound_from_holder_arg: boolean, counterparty_parameters_arg: bigint, funding_outpoint_arg: bigint, opt_anchors_arg: COption_NoneZ): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_ChannelTransactionParameters_new(holder_pubkeys_arg, holder_selected_contest_delay_arg, is_outbound_from_holder_arg, counterparty_parameters_arg, funding_outpoint_arg, opt_anchors_arg); return nativeResponseValue; } - // uintptr_t ChannelTransactionParameters_clone_ptr(LDKChannelTransactionParameters *NONNULL_PTR arg); + // uint64_t ChannelTransactionParameters_clone_ptr(LDKChannelTransactionParameters *NONNULL_PTR arg); /* @internal */ -export function ChannelTransactionParameters_clone_ptr(arg: number): number { +export function ChannelTransactionParameters_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26567,7 +26574,7 @@ export function ChannelTransactionParameters_clone_ptr(arg: number): number { } // struct LDKChannelTransactionParameters ChannelTransactionParameters_clone(const struct LDKChannelTransactionParameters *NONNULL_PTR orig); /* @internal */ -export function ChannelTransactionParameters_clone(orig: number): number { +export function ChannelTransactionParameters_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26576,7 +26583,7 @@ export function ChannelTransactionParameters_clone(orig: number): number { } // void CounterpartyChannelTransactionParameters_free(struct LDKCounterpartyChannelTransactionParameters this_obj); /* @internal */ -export function CounterpartyChannelTransactionParameters_free(this_obj: number): void { +export function CounterpartyChannelTransactionParameters_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26585,7 +26592,7 @@ export function CounterpartyChannelTransactionParameters_free(this_obj: number): } // struct LDKChannelPublicKeys CounterpartyChannelTransactionParameters_get_pubkeys(const struct LDKCounterpartyChannelTransactionParameters *NONNULL_PTR this_ptr); /* @internal */ -export function CounterpartyChannelTransactionParameters_get_pubkeys(this_ptr: number): number { +export function CounterpartyChannelTransactionParameters_get_pubkeys(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26594,7 +26601,7 @@ export function CounterpartyChannelTransactionParameters_get_pubkeys(this_ptr: n } // void CounterpartyChannelTransactionParameters_set_pubkeys(struct LDKCounterpartyChannelTransactionParameters *NONNULL_PTR this_ptr, struct LDKChannelPublicKeys val); /* @internal */ -export function CounterpartyChannelTransactionParameters_set_pubkeys(this_ptr: number, val: number): void { +export function CounterpartyChannelTransactionParameters_set_pubkeys(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26603,7 +26610,7 @@ export function CounterpartyChannelTransactionParameters_set_pubkeys(this_ptr: n } // uint16_t CounterpartyChannelTransactionParameters_get_selected_contest_delay(const struct LDKCounterpartyChannelTransactionParameters *NONNULL_PTR this_ptr); /* @internal */ -export function CounterpartyChannelTransactionParameters_get_selected_contest_delay(this_ptr: number): number { +export function CounterpartyChannelTransactionParameters_get_selected_contest_delay(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26612,7 +26619,7 @@ export function CounterpartyChannelTransactionParameters_get_selected_contest_de } // void CounterpartyChannelTransactionParameters_set_selected_contest_delay(struct LDKCounterpartyChannelTransactionParameters *NONNULL_PTR this_ptr, uint16_t val); /* @internal */ -export function CounterpartyChannelTransactionParameters_set_selected_contest_delay(this_ptr: number, val: number): void { +export function CounterpartyChannelTransactionParameters_set_selected_contest_delay(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26621,16 +26628,16 @@ export function CounterpartyChannelTransactionParameters_set_selected_contest_de } // MUST_USE_RES struct LDKCounterpartyChannelTransactionParameters CounterpartyChannelTransactionParameters_new(struct LDKChannelPublicKeys pubkeys_arg, uint16_t selected_contest_delay_arg); /* @internal */ -export function CounterpartyChannelTransactionParameters_new(pubkeys_arg: number, selected_contest_delay_arg: number): number { +export function CounterpartyChannelTransactionParameters_new(pubkeys_arg: bigint, selected_contest_delay_arg: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CounterpartyChannelTransactionParameters_new(pubkeys_arg, selected_contest_delay_arg); return nativeResponseValue; } - // uintptr_t CounterpartyChannelTransactionParameters_clone_ptr(LDKCounterpartyChannelTransactionParameters *NONNULL_PTR arg); + // uint64_t CounterpartyChannelTransactionParameters_clone_ptr(LDKCounterpartyChannelTransactionParameters *NONNULL_PTR arg); /* @internal */ -export function CounterpartyChannelTransactionParameters_clone_ptr(arg: number): number { +export function CounterpartyChannelTransactionParameters_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26639,7 +26646,7 @@ export function CounterpartyChannelTransactionParameters_clone_ptr(arg: number): } // struct LDKCounterpartyChannelTransactionParameters CounterpartyChannelTransactionParameters_clone(const struct LDKCounterpartyChannelTransactionParameters *NONNULL_PTR orig); /* @internal */ -export function CounterpartyChannelTransactionParameters_clone(orig: number): number { +export function CounterpartyChannelTransactionParameters_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26648,7 +26655,7 @@ export function CounterpartyChannelTransactionParameters_clone(orig: number): nu } // MUST_USE_RES bool ChannelTransactionParameters_is_populated(const struct LDKChannelTransactionParameters *NONNULL_PTR this_arg); /* @internal */ -export function ChannelTransactionParameters_is_populated(this_arg: number): boolean { +export function ChannelTransactionParameters_is_populated(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26657,7 +26664,7 @@ export function ChannelTransactionParameters_is_populated(this_arg: number): boo } // MUST_USE_RES struct LDKDirectedChannelTransactionParameters ChannelTransactionParameters_as_holder_broadcastable(const struct LDKChannelTransactionParameters *NONNULL_PTR this_arg); /* @internal */ -export function ChannelTransactionParameters_as_holder_broadcastable(this_arg: number): number { +export function ChannelTransactionParameters_as_holder_broadcastable(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26666,7 +26673,7 @@ export function ChannelTransactionParameters_as_holder_broadcastable(this_arg: n } // MUST_USE_RES struct LDKDirectedChannelTransactionParameters ChannelTransactionParameters_as_counterparty_broadcastable(const struct LDKChannelTransactionParameters *NONNULL_PTR this_arg); /* @internal */ -export function ChannelTransactionParameters_as_counterparty_broadcastable(this_arg: number): number { +export function ChannelTransactionParameters_as_counterparty_broadcastable(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26675,7 +26682,7 @@ export function ChannelTransactionParameters_as_counterparty_broadcastable(this_ } // struct LDKCVec_u8Z CounterpartyChannelTransactionParameters_write(const struct LDKCounterpartyChannelTransactionParameters *NONNULL_PTR obj); /* @internal */ -export function CounterpartyChannelTransactionParameters_write(obj: number): number { +export function CounterpartyChannelTransactionParameters_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26684,7 +26691,7 @@ export function CounterpartyChannelTransactionParameters_write(obj: number): num } // struct LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ CounterpartyChannelTransactionParameters_read(struct LDKu8slice ser); /* @internal */ -export function CounterpartyChannelTransactionParameters_read(ser: number): number { +export function CounterpartyChannelTransactionParameters_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26693,7 +26700,7 @@ export function CounterpartyChannelTransactionParameters_read(ser: number): numb } // struct LDKCVec_u8Z ChannelTransactionParameters_write(const struct LDKChannelTransactionParameters *NONNULL_PTR obj); /* @internal */ -export function ChannelTransactionParameters_write(obj: number): number { +export function ChannelTransactionParameters_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26702,7 +26709,7 @@ export function ChannelTransactionParameters_write(obj: number): number { } // struct LDKCResult_ChannelTransactionParametersDecodeErrorZ ChannelTransactionParameters_read(struct LDKu8slice ser); /* @internal */ -export function ChannelTransactionParameters_read(ser: number): number { +export function ChannelTransactionParameters_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26711,7 +26718,7 @@ export function ChannelTransactionParameters_read(ser: number): number { } // void DirectedChannelTransactionParameters_free(struct LDKDirectedChannelTransactionParameters this_obj); /* @internal */ -export function DirectedChannelTransactionParameters_free(this_obj: number): void { +export function DirectedChannelTransactionParameters_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26720,7 +26727,7 @@ export function DirectedChannelTransactionParameters_free(this_obj: number): voi } // MUST_USE_RES struct LDKChannelPublicKeys DirectedChannelTransactionParameters_broadcaster_pubkeys(const struct LDKDirectedChannelTransactionParameters *NONNULL_PTR this_arg); /* @internal */ -export function DirectedChannelTransactionParameters_broadcaster_pubkeys(this_arg: number): number { +export function DirectedChannelTransactionParameters_broadcaster_pubkeys(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26729,7 +26736,7 @@ export function DirectedChannelTransactionParameters_broadcaster_pubkeys(this_ar } // MUST_USE_RES struct LDKChannelPublicKeys DirectedChannelTransactionParameters_countersignatory_pubkeys(const struct LDKDirectedChannelTransactionParameters *NONNULL_PTR this_arg); /* @internal */ -export function DirectedChannelTransactionParameters_countersignatory_pubkeys(this_arg: number): number { +export function DirectedChannelTransactionParameters_countersignatory_pubkeys(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26738,7 +26745,7 @@ export function DirectedChannelTransactionParameters_countersignatory_pubkeys(th } // MUST_USE_RES uint16_t DirectedChannelTransactionParameters_contest_delay(const struct LDKDirectedChannelTransactionParameters *NONNULL_PTR this_arg); /* @internal */ -export function DirectedChannelTransactionParameters_contest_delay(this_arg: number): number { +export function DirectedChannelTransactionParameters_contest_delay(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26747,7 +26754,7 @@ export function DirectedChannelTransactionParameters_contest_delay(this_arg: num } // MUST_USE_RES bool DirectedChannelTransactionParameters_is_outbound(const struct LDKDirectedChannelTransactionParameters *NONNULL_PTR this_arg); /* @internal */ -export function DirectedChannelTransactionParameters_is_outbound(this_arg: number): boolean { +export function DirectedChannelTransactionParameters_is_outbound(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26756,7 +26763,7 @@ export function DirectedChannelTransactionParameters_is_outbound(this_arg: numbe } // MUST_USE_RES struct LDKOutPoint DirectedChannelTransactionParameters_funding_outpoint(const struct LDKDirectedChannelTransactionParameters *NONNULL_PTR this_arg); /* @internal */ -export function DirectedChannelTransactionParameters_funding_outpoint(this_arg: number): number { +export function DirectedChannelTransactionParameters_funding_outpoint(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26765,7 +26772,7 @@ export function DirectedChannelTransactionParameters_funding_outpoint(this_arg: } // MUST_USE_RES bool DirectedChannelTransactionParameters_opt_anchors(const struct LDKDirectedChannelTransactionParameters *NONNULL_PTR this_arg); /* @internal */ -export function DirectedChannelTransactionParameters_opt_anchors(this_arg: number): boolean { +export function DirectedChannelTransactionParameters_opt_anchors(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26774,7 +26781,7 @@ export function DirectedChannelTransactionParameters_opt_anchors(this_arg: numbe } // void HolderCommitmentTransaction_free(struct LDKHolderCommitmentTransaction this_obj); /* @internal */ -export function HolderCommitmentTransaction_free(this_obj: number): void { +export function HolderCommitmentTransaction_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26783,7 +26790,7 @@ export function HolderCommitmentTransaction_free(this_obj: number): void { } // struct LDKSignature HolderCommitmentTransaction_get_counterparty_sig(const struct LDKHolderCommitmentTransaction *NONNULL_PTR this_ptr); /* @internal */ -export function HolderCommitmentTransaction_get_counterparty_sig(this_ptr: number): number { +export function HolderCommitmentTransaction_get_counterparty_sig(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26792,7 +26799,7 @@ export function HolderCommitmentTransaction_get_counterparty_sig(this_ptr: numbe } // void HolderCommitmentTransaction_set_counterparty_sig(struct LDKHolderCommitmentTransaction *NONNULL_PTR this_ptr, struct LDKSignature val); /* @internal */ -export function HolderCommitmentTransaction_set_counterparty_sig(this_ptr: number, val: number): void { +export function HolderCommitmentTransaction_set_counterparty_sig(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26801,7 +26808,7 @@ export function HolderCommitmentTransaction_set_counterparty_sig(this_ptr: numbe } // struct LDKCVec_SignatureZ HolderCommitmentTransaction_get_counterparty_htlc_sigs(const struct LDKHolderCommitmentTransaction *NONNULL_PTR this_ptr); /* @internal */ -export function HolderCommitmentTransaction_get_counterparty_htlc_sigs(this_ptr: number): number { +export function HolderCommitmentTransaction_get_counterparty_htlc_sigs(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26810,16 +26817,16 @@ export function HolderCommitmentTransaction_get_counterparty_htlc_sigs(this_ptr: } // void HolderCommitmentTransaction_set_counterparty_htlc_sigs(struct LDKHolderCommitmentTransaction *NONNULL_PTR this_ptr, struct LDKCVec_SignatureZ val); /* @internal */ -export function HolderCommitmentTransaction_set_counterparty_htlc_sigs(this_ptr: number, val: number): void { +export function HolderCommitmentTransaction_set_counterparty_htlc_sigs(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_HolderCommitmentTransaction_set_counterparty_htlc_sigs(this_ptr, val); // debug statements here } - // uintptr_t HolderCommitmentTransaction_clone_ptr(LDKHolderCommitmentTransaction *NONNULL_PTR arg); + // uint64_t HolderCommitmentTransaction_clone_ptr(LDKHolderCommitmentTransaction *NONNULL_PTR arg); /* @internal */ -export function HolderCommitmentTransaction_clone_ptr(arg: number): number { +export function HolderCommitmentTransaction_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26828,7 +26835,7 @@ export function HolderCommitmentTransaction_clone_ptr(arg: number): number { } // struct LDKHolderCommitmentTransaction HolderCommitmentTransaction_clone(const struct LDKHolderCommitmentTransaction *NONNULL_PTR orig); /* @internal */ -export function HolderCommitmentTransaction_clone(orig: number): number { +export function HolderCommitmentTransaction_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26837,7 +26844,7 @@ export function HolderCommitmentTransaction_clone(orig: number): number { } // struct LDKCVec_u8Z HolderCommitmentTransaction_write(const struct LDKHolderCommitmentTransaction *NONNULL_PTR obj); /* @internal */ -export function HolderCommitmentTransaction_write(obj: number): number { +export function HolderCommitmentTransaction_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26846,7 +26853,7 @@ export function HolderCommitmentTransaction_write(obj: number): number { } // struct LDKCResult_HolderCommitmentTransactionDecodeErrorZ HolderCommitmentTransaction_read(struct LDKu8slice ser); /* @internal */ -export function HolderCommitmentTransaction_read(ser: number): number { +export function HolderCommitmentTransaction_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26855,7 +26862,7 @@ export function HolderCommitmentTransaction_read(ser: number): number { } // MUST_USE_RES struct LDKHolderCommitmentTransaction HolderCommitmentTransaction_new(struct LDKCommitmentTransaction commitment_tx, struct LDKSignature counterparty_sig, struct LDKCVec_SignatureZ counterparty_htlc_sigs, struct LDKPublicKey holder_funding_key, struct LDKPublicKey counterparty_funding_key); /* @internal */ -export function HolderCommitmentTransaction_new(commitment_tx: number, counterparty_sig: number, counterparty_htlc_sigs: number, holder_funding_key: number, counterparty_funding_key: number): number { +export function HolderCommitmentTransaction_new(commitment_tx: bigint, counterparty_sig: number, counterparty_htlc_sigs: number, holder_funding_key: number, counterparty_funding_key: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26864,7 +26871,7 @@ export function HolderCommitmentTransaction_new(commitment_tx: number, counterpa } // void BuiltCommitmentTransaction_free(struct LDKBuiltCommitmentTransaction this_obj); /* @internal */ -export function BuiltCommitmentTransaction_free(this_obj: number): void { +export function BuiltCommitmentTransaction_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26873,7 +26880,7 @@ export function BuiltCommitmentTransaction_free(this_obj: number): void { } // struct LDKTransaction BuiltCommitmentTransaction_get_transaction(const struct LDKBuiltCommitmentTransaction *NONNULL_PTR this_ptr); /* @internal */ -export function BuiltCommitmentTransaction_get_transaction(this_ptr: number): number { +export function BuiltCommitmentTransaction_get_transaction(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26882,7 +26889,7 @@ export function BuiltCommitmentTransaction_get_transaction(this_ptr: number): nu } // void BuiltCommitmentTransaction_set_transaction(struct LDKBuiltCommitmentTransaction *NONNULL_PTR this_ptr, struct LDKTransaction val); /* @internal */ -export function BuiltCommitmentTransaction_set_transaction(this_ptr: number, val: number): void { +export function BuiltCommitmentTransaction_set_transaction(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26891,7 +26898,7 @@ export function BuiltCommitmentTransaction_set_transaction(this_ptr: number, val } // const uint8_t (*BuiltCommitmentTransaction_get_txid(const struct LDKBuiltCommitmentTransaction *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function BuiltCommitmentTransaction_get_txid(this_ptr: number): number { +export function BuiltCommitmentTransaction_get_txid(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26900,7 +26907,7 @@ export function BuiltCommitmentTransaction_get_txid(this_ptr: number): number { } // void BuiltCommitmentTransaction_set_txid(struct LDKBuiltCommitmentTransaction *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function BuiltCommitmentTransaction_set_txid(this_ptr: number, val: number): void { +export function BuiltCommitmentTransaction_set_txid(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26909,16 +26916,16 @@ export function BuiltCommitmentTransaction_set_txid(this_ptr: number, val: numbe } // MUST_USE_RES struct LDKBuiltCommitmentTransaction BuiltCommitmentTransaction_new(struct LDKTransaction transaction_arg, struct LDKThirtyTwoBytes txid_arg); /* @internal */ -export function BuiltCommitmentTransaction_new(transaction_arg: number, txid_arg: number): number { +export function BuiltCommitmentTransaction_new(transaction_arg: number, txid_arg: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_BuiltCommitmentTransaction_new(transaction_arg, txid_arg); return nativeResponseValue; } - // uintptr_t BuiltCommitmentTransaction_clone_ptr(LDKBuiltCommitmentTransaction *NONNULL_PTR arg); + // uint64_t BuiltCommitmentTransaction_clone_ptr(LDKBuiltCommitmentTransaction *NONNULL_PTR arg); /* @internal */ -export function BuiltCommitmentTransaction_clone_ptr(arg: number): number { +export function BuiltCommitmentTransaction_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26927,7 +26934,7 @@ export function BuiltCommitmentTransaction_clone_ptr(arg: number): number { } // struct LDKBuiltCommitmentTransaction BuiltCommitmentTransaction_clone(const struct LDKBuiltCommitmentTransaction *NONNULL_PTR orig); /* @internal */ -export function BuiltCommitmentTransaction_clone(orig: number): number { +export function BuiltCommitmentTransaction_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26936,7 +26943,7 @@ export function BuiltCommitmentTransaction_clone(orig: number): number { } // struct LDKCVec_u8Z BuiltCommitmentTransaction_write(const struct LDKBuiltCommitmentTransaction *NONNULL_PTR obj); /* @internal */ -export function BuiltCommitmentTransaction_write(obj: number): number { +export function BuiltCommitmentTransaction_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26945,7 +26952,7 @@ export function BuiltCommitmentTransaction_write(obj: number): number { } // struct LDKCResult_BuiltCommitmentTransactionDecodeErrorZ BuiltCommitmentTransaction_read(struct LDKu8slice ser); /* @internal */ -export function BuiltCommitmentTransaction_read(ser: number): number { +export function BuiltCommitmentTransaction_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26954,7 +26961,7 @@ export function BuiltCommitmentTransaction_read(ser: number): number { } // MUST_USE_RES struct LDKThirtyTwoBytes BuiltCommitmentTransaction_get_sighash_all(const struct LDKBuiltCommitmentTransaction *NONNULL_PTR this_arg, struct LDKu8slice funding_redeemscript, uint64_t channel_value_satoshis); /* @internal */ -export function BuiltCommitmentTransaction_get_sighash_all(this_arg: number, funding_redeemscript: number, channel_value_satoshis: bigint): number { +export function BuiltCommitmentTransaction_get_sighash_all(this_arg: bigint, funding_redeemscript: number, channel_value_satoshis: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26963,7 +26970,7 @@ export function BuiltCommitmentTransaction_get_sighash_all(this_arg: number, fun } // MUST_USE_RES struct LDKSignature BuiltCommitmentTransaction_sign(const struct LDKBuiltCommitmentTransaction *NONNULL_PTR this_arg, const uint8_t (*funding_key)[32], struct LDKu8slice funding_redeemscript, uint64_t channel_value_satoshis); /* @internal */ -export function BuiltCommitmentTransaction_sign(this_arg: number, funding_key: number, funding_redeemscript: number, channel_value_satoshis: bigint): number { +export function BuiltCommitmentTransaction_sign(this_arg: bigint, funding_key: number, funding_redeemscript: number, channel_value_satoshis: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26972,16 +26979,16 @@ export function BuiltCommitmentTransaction_sign(this_arg: number, funding_key: n } // void ClosingTransaction_free(struct LDKClosingTransaction this_obj); /* @internal */ -export function ClosingTransaction_free(this_obj: number): void { +export function ClosingTransaction_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_ClosingTransaction_free(this_obj); // debug statements here } - // uintptr_t ClosingTransaction_clone_ptr(LDKClosingTransaction *NONNULL_PTR arg); + // uint64_t ClosingTransaction_clone_ptr(LDKClosingTransaction *NONNULL_PTR arg); /* @internal */ -export function ClosingTransaction_clone_ptr(arg: number): number { +export function ClosingTransaction_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26990,7 +26997,7 @@ export function ClosingTransaction_clone_ptr(arg: number): number { } // struct LDKClosingTransaction ClosingTransaction_clone(const struct LDKClosingTransaction *NONNULL_PTR orig); /* @internal */ -export function ClosingTransaction_clone(orig: number): number { +export function ClosingTransaction_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -26999,7 +27006,7 @@ export function ClosingTransaction_clone(orig: number): number { } // uint64_t ClosingTransaction_hash(const struct LDKClosingTransaction *NONNULL_PTR o); /* @internal */ -export function ClosingTransaction_hash(o: number): bigint { +export function ClosingTransaction_hash(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27008,7 +27015,7 @@ export function ClosingTransaction_hash(o: number): bigint { } // MUST_USE_RES struct LDKClosingTransaction ClosingTransaction_new(uint64_t to_holder_value_sat, uint64_t to_counterparty_value_sat, struct LDKCVec_u8Z to_holder_script, struct LDKCVec_u8Z to_counterparty_script, struct LDKOutPoint funding_outpoint); /* @internal */ -export function ClosingTransaction_new(to_holder_value_sat: bigint, to_counterparty_value_sat: bigint, to_holder_script: number, to_counterparty_script: number, funding_outpoint: number): number { +export function ClosingTransaction_new(to_holder_value_sat: bigint, to_counterparty_value_sat: bigint, to_holder_script: number, to_counterparty_script: number, funding_outpoint: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27017,7 +27024,7 @@ export function ClosingTransaction_new(to_holder_value_sat: bigint, to_counterpa } // MUST_USE_RES struct LDKTrustedClosingTransaction ClosingTransaction_trust(const struct LDKClosingTransaction *NONNULL_PTR this_arg); /* @internal */ -export function ClosingTransaction_trust(this_arg: number): number { +export function ClosingTransaction_trust(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27026,7 +27033,7 @@ export function ClosingTransaction_trust(this_arg: number): number { } // MUST_USE_RES struct LDKCResult_TrustedClosingTransactionNoneZ ClosingTransaction_verify(const struct LDKClosingTransaction *NONNULL_PTR this_arg, struct LDKOutPoint funding_outpoint); /* @internal */ -export function ClosingTransaction_verify(this_arg: number, funding_outpoint: number): number { +export function ClosingTransaction_verify(this_arg: bigint, funding_outpoint: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27035,7 +27042,7 @@ export function ClosingTransaction_verify(this_arg: number, funding_outpoint: nu } // MUST_USE_RES uint64_t ClosingTransaction_to_holder_value_sat(const struct LDKClosingTransaction *NONNULL_PTR this_arg); /* @internal */ -export function ClosingTransaction_to_holder_value_sat(this_arg: number): bigint { +export function ClosingTransaction_to_holder_value_sat(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27044,7 +27051,7 @@ export function ClosingTransaction_to_holder_value_sat(this_arg: number): bigint } // MUST_USE_RES uint64_t ClosingTransaction_to_counterparty_value_sat(const struct LDKClosingTransaction *NONNULL_PTR this_arg); /* @internal */ -export function ClosingTransaction_to_counterparty_value_sat(this_arg: number): bigint { +export function ClosingTransaction_to_counterparty_value_sat(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27053,7 +27060,7 @@ export function ClosingTransaction_to_counterparty_value_sat(this_arg: number): } // MUST_USE_RES struct LDKu8slice ClosingTransaction_to_holder_script(const struct LDKClosingTransaction *NONNULL_PTR this_arg); /* @internal */ -export function ClosingTransaction_to_holder_script(this_arg: number): number { +export function ClosingTransaction_to_holder_script(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27062,7 +27069,7 @@ export function ClosingTransaction_to_holder_script(this_arg: number): number { } // MUST_USE_RES struct LDKu8slice ClosingTransaction_to_counterparty_script(const struct LDKClosingTransaction *NONNULL_PTR this_arg); /* @internal */ -export function ClosingTransaction_to_counterparty_script(this_arg: number): number { +export function ClosingTransaction_to_counterparty_script(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27071,7 +27078,7 @@ export function ClosingTransaction_to_counterparty_script(this_arg: number): num } // void TrustedClosingTransaction_free(struct LDKTrustedClosingTransaction this_obj); /* @internal */ -export function TrustedClosingTransaction_free(this_obj: number): void { +export function TrustedClosingTransaction_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27080,7 +27087,7 @@ export function TrustedClosingTransaction_free(this_obj: number): void { } // MUST_USE_RES struct LDKTransaction TrustedClosingTransaction_built_transaction(const struct LDKTrustedClosingTransaction *NONNULL_PTR this_arg); /* @internal */ -export function TrustedClosingTransaction_built_transaction(this_arg: number): number { +export function TrustedClosingTransaction_built_transaction(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27089,7 +27096,7 @@ export function TrustedClosingTransaction_built_transaction(this_arg: number): n } // MUST_USE_RES struct LDKThirtyTwoBytes TrustedClosingTransaction_get_sighash_all(const struct LDKTrustedClosingTransaction *NONNULL_PTR this_arg, struct LDKu8slice funding_redeemscript, uint64_t channel_value_satoshis); /* @internal */ -export function TrustedClosingTransaction_get_sighash_all(this_arg: number, funding_redeemscript: number, channel_value_satoshis: bigint): number { +export function TrustedClosingTransaction_get_sighash_all(this_arg: bigint, funding_redeemscript: number, channel_value_satoshis: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27098,7 +27105,7 @@ export function TrustedClosingTransaction_get_sighash_all(this_arg: number, fund } // MUST_USE_RES struct LDKSignature TrustedClosingTransaction_sign(const struct LDKTrustedClosingTransaction *NONNULL_PTR this_arg, const uint8_t (*funding_key)[32], struct LDKu8slice funding_redeemscript, uint64_t channel_value_satoshis); /* @internal */ -export function TrustedClosingTransaction_sign(this_arg: number, funding_key: number, funding_redeemscript: number, channel_value_satoshis: bigint): number { +export function TrustedClosingTransaction_sign(this_arg: bigint, funding_key: number, funding_redeemscript: number, channel_value_satoshis: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27107,16 +27114,16 @@ export function TrustedClosingTransaction_sign(this_arg: number, funding_key: nu } // void CommitmentTransaction_free(struct LDKCommitmentTransaction this_obj); /* @internal */ -export function CommitmentTransaction_free(this_obj: number): void { +export function CommitmentTransaction_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CommitmentTransaction_free(this_obj); // debug statements here } - // uintptr_t CommitmentTransaction_clone_ptr(LDKCommitmentTransaction *NONNULL_PTR arg); + // uint64_t CommitmentTransaction_clone_ptr(LDKCommitmentTransaction *NONNULL_PTR arg); /* @internal */ -export function CommitmentTransaction_clone_ptr(arg: number): number { +export function CommitmentTransaction_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27125,7 +27132,7 @@ export function CommitmentTransaction_clone_ptr(arg: number): number { } // struct LDKCommitmentTransaction CommitmentTransaction_clone(const struct LDKCommitmentTransaction *NONNULL_PTR orig); /* @internal */ -export function CommitmentTransaction_clone(orig: number): number { +export function CommitmentTransaction_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27134,7 +27141,7 @@ export function CommitmentTransaction_clone(orig: number): number { } // struct LDKCVec_u8Z CommitmentTransaction_write(const struct LDKCommitmentTransaction *NONNULL_PTR obj); /* @internal */ -export function CommitmentTransaction_write(obj: number): number { +export function CommitmentTransaction_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27143,7 +27150,7 @@ export function CommitmentTransaction_write(obj: number): number { } // struct LDKCResult_CommitmentTransactionDecodeErrorZ CommitmentTransaction_read(struct LDKu8slice ser); /* @internal */ -export function CommitmentTransaction_read(ser: number): number { +export function CommitmentTransaction_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27152,7 +27159,7 @@ export function CommitmentTransaction_read(ser: number): number { } // MUST_USE_RES uint64_t CommitmentTransaction_commitment_number(const struct LDKCommitmentTransaction *NONNULL_PTR this_arg); /* @internal */ -export function CommitmentTransaction_commitment_number(this_arg: number): bigint { +export function CommitmentTransaction_commitment_number(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27161,7 +27168,7 @@ export function CommitmentTransaction_commitment_number(this_arg: number): bigin } // MUST_USE_RES uint64_t CommitmentTransaction_to_broadcaster_value_sat(const struct LDKCommitmentTransaction *NONNULL_PTR this_arg); /* @internal */ -export function CommitmentTransaction_to_broadcaster_value_sat(this_arg: number): bigint { +export function CommitmentTransaction_to_broadcaster_value_sat(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27170,7 +27177,7 @@ export function CommitmentTransaction_to_broadcaster_value_sat(this_arg: number) } // MUST_USE_RES uint64_t CommitmentTransaction_to_countersignatory_value_sat(const struct LDKCommitmentTransaction *NONNULL_PTR this_arg); /* @internal */ -export function CommitmentTransaction_to_countersignatory_value_sat(this_arg: number): bigint { +export function CommitmentTransaction_to_countersignatory_value_sat(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27179,7 +27186,7 @@ export function CommitmentTransaction_to_countersignatory_value_sat(this_arg: nu } // MUST_USE_RES uint32_t CommitmentTransaction_feerate_per_kw(const struct LDKCommitmentTransaction *NONNULL_PTR this_arg); /* @internal */ -export function CommitmentTransaction_feerate_per_kw(this_arg: number): number { +export function CommitmentTransaction_feerate_per_kw(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27188,7 +27195,7 @@ export function CommitmentTransaction_feerate_per_kw(this_arg: number): number { } // MUST_USE_RES struct LDKTrustedCommitmentTransaction CommitmentTransaction_trust(const struct LDKCommitmentTransaction *NONNULL_PTR this_arg); /* @internal */ -export function CommitmentTransaction_trust(this_arg: number): number { +export function CommitmentTransaction_trust(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27197,7 +27204,7 @@ export function CommitmentTransaction_trust(this_arg: number): number { } // MUST_USE_RES struct LDKCResult_TrustedCommitmentTransactionNoneZ CommitmentTransaction_verify(const struct LDKCommitmentTransaction *NONNULL_PTR this_arg, const struct LDKDirectedChannelTransactionParameters *NONNULL_PTR channel_parameters, const struct LDKChannelPublicKeys *NONNULL_PTR broadcaster_keys, const struct LDKChannelPublicKeys *NONNULL_PTR countersignatory_keys); /* @internal */ -export function CommitmentTransaction_verify(this_arg: number, channel_parameters: number, broadcaster_keys: number, countersignatory_keys: number): number { +export function CommitmentTransaction_verify(this_arg: bigint, channel_parameters: bigint, broadcaster_keys: bigint, countersignatory_keys: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27206,7 +27213,7 @@ export function CommitmentTransaction_verify(this_arg: number, channel_parameter } // void TrustedCommitmentTransaction_free(struct LDKTrustedCommitmentTransaction this_obj); /* @internal */ -export function TrustedCommitmentTransaction_free(this_obj: number): void { +export function TrustedCommitmentTransaction_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27215,7 +27222,7 @@ export function TrustedCommitmentTransaction_free(this_obj: number): void { } // MUST_USE_RES struct LDKThirtyTwoBytes TrustedCommitmentTransaction_txid(const struct LDKTrustedCommitmentTransaction *NONNULL_PTR this_arg); /* @internal */ -export function TrustedCommitmentTransaction_txid(this_arg: number): number { +export function TrustedCommitmentTransaction_txid(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27224,7 +27231,7 @@ export function TrustedCommitmentTransaction_txid(this_arg: number): number { } // MUST_USE_RES struct LDKBuiltCommitmentTransaction TrustedCommitmentTransaction_built_transaction(const struct LDKTrustedCommitmentTransaction *NONNULL_PTR this_arg); /* @internal */ -export function TrustedCommitmentTransaction_built_transaction(this_arg: number): number { +export function TrustedCommitmentTransaction_built_transaction(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27233,7 +27240,7 @@ export function TrustedCommitmentTransaction_built_transaction(this_arg: number) } // MUST_USE_RES struct LDKTxCreationKeys TrustedCommitmentTransaction_keys(const struct LDKTrustedCommitmentTransaction *NONNULL_PTR this_arg); /* @internal */ -export function TrustedCommitmentTransaction_keys(this_arg: number): number { +export function TrustedCommitmentTransaction_keys(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27242,7 +27249,7 @@ export function TrustedCommitmentTransaction_keys(this_arg: number): number { } // MUST_USE_RES bool TrustedCommitmentTransaction_opt_anchors(const struct LDKTrustedCommitmentTransaction *NONNULL_PTR this_arg); /* @internal */ -export function TrustedCommitmentTransaction_opt_anchors(this_arg: number): boolean { +export function TrustedCommitmentTransaction_opt_anchors(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27251,7 +27258,7 @@ export function TrustedCommitmentTransaction_opt_anchors(this_arg: number): bool } // MUST_USE_RES struct LDKCResult_CVec_SignatureZNoneZ TrustedCommitmentTransaction_get_htlc_sigs(const struct LDKTrustedCommitmentTransaction *NONNULL_PTR this_arg, const uint8_t (*htlc_base_key)[32], const struct LDKDirectedChannelTransactionParameters *NONNULL_PTR channel_parameters); /* @internal */ -export function TrustedCommitmentTransaction_get_htlc_sigs(this_arg: number, htlc_base_key: number, channel_parameters: number): number { +export function TrustedCommitmentTransaction_get_htlc_sigs(this_arg: bigint, htlc_base_key: number, channel_parameters: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27269,7 +27276,7 @@ export function get_commitment_transaction_number_obscure_factor(broadcaster_pay } // bool InitFeatures_eq(const struct LDKInitFeatures *NONNULL_PTR a, const struct LDKInitFeatures *NONNULL_PTR b); /* @internal */ -export function InitFeatures_eq(a: number, b: number): boolean { +export function InitFeatures_eq(a: bigint, b: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27278,7 +27285,7 @@ export function InitFeatures_eq(a: number, b: number): boolean { } // bool NodeFeatures_eq(const struct LDKNodeFeatures *NONNULL_PTR a, const struct LDKNodeFeatures *NONNULL_PTR b); /* @internal */ -export function NodeFeatures_eq(a: number, b: number): boolean { +export function NodeFeatures_eq(a: bigint, b: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27287,7 +27294,7 @@ export function NodeFeatures_eq(a: number, b: number): boolean { } // bool ChannelFeatures_eq(const struct LDKChannelFeatures *NONNULL_PTR a, const struct LDKChannelFeatures *NONNULL_PTR b); /* @internal */ -export function ChannelFeatures_eq(a: number, b: number): boolean { +export function ChannelFeatures_eq(a: bigint, b: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27296,7 +27303,7 @@ export function ChannelFeatures_eq(a: number, b: number): boolean { } // bool InvoiceFeatures_eq(const struct LDKInvoiceFeatures *NONNULL_PTR a, const struct LDKInvoiceFeatures *NONNULL_PTR b); /* @internal */ -export function InvoiceFeatures_eq(a: number, b: number): boolean { +export function InvoiceFeatures_eq(a: bigint, b: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27305,16 +27312,16 @@ export function InvoiceFeatures_eq(a: number, b: number): boolean { } // bool ChannelTypeFeatures_eq(const struct LDKChannelTypeFeatures *NONNULL_PTR a, const struct LDKChannelTypeFeatures *NONNULL_PTR b); /* @internal */ -export function ChannelTypeFeatures_eq(a: number, b: number): boolean { +export function ChannelTypeFeatures_eq(a: bigint, b: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_ChannelTypeFeatures_eq(a, b); return nativeResponseValue; } - // uintptr_t InitFeatures_clone_ptr(LDKInitFeatures *NONNULL_PTR arg); + // uint64_t InitFeatures_clone_ptr(LDKInitFeatures *NONNULL_PTR arg); /* @internal */ -export function InitFeatures_clone_ptr(arg: number): number { +export function InitFeatures_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27323,16 +27330,16 @@ export function InitFeatures_clone_ptr(arg: number): number { } // struct LDKInitFeatures InitFeatures_clone(const struct LDKInitFeatures *NONNULL_PTR orig); /* @internal */ -export function InitFeatures_clone(orig: number): number { +export function InitFeatures_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_InitFeatures_clone(orig); return nativeResponseValue; } - // uintptr_t NodeFeatures_clone_ptr(LDKNodeFeatures *NONNULL_PTR arg); + // uint64_t NodeFeatures_clone_ptr(LDKNodeFeatures *NONNULL_PTR arg); /* @internal */ -export function NodeFeatures_clone_ptr(arg: number): number { +export function NodeFeatures_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27341,16 +27348,16 @@ export function NodeFeatures_clone_ptr(arg: number): number { } // struct LDKNodeFeatures NodeFeatures_clone(const struct LDKNodeFeatures *NONNULL_PTR orig); /* @internal */ -export function NodeFeatures_clone(orig: number): number { +export function NodeFeatures_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_NodeFeatures_clone(orig); return nativeResponseValue; } - // uintptr_t ChannelFeatures_clone_ptr(LDKChannelFeatures *NONNULL_PTR arg); + // uint64_t ChannelFeatures_clone_ptr(LDKChannelFeatures *NONNULL_PTR arg); /* @internal */ -export function ChannelFeatures_clone_ptr(arg: number): number { +export function ChannelFeatures_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27359,16 +27366,16 @@ export function ChannelFeatures_clone_ptr(arg: number): number { } // struct LDKChannelFeatures ChannelFeatures_clone(const struct LDKChannelFeatures *NONNULL_PTR orig); /* @internal */ -export function ChannelFeatures_clone(orig: number): number { +export function ChannelFeatures_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_ChannelFeatures_clone(orig); return nativeResponseValue; } - // uintptr_t InvoiceFeatures_clone_ptr(LDKInvoiceFeatures *NONNULL_PTR arg); + // uint64_t InvoiceFeatures_clone_ptr(LDKInvoiceFeatures *NONNULL_PTR arg); /* @internal */ -export function InvoiceFeatures_clone_ptr(arg: number): number { +export function InvoiceFeatures_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27377,16 +27384,16 @@ export function InvoiceFeatures_clone_ptr(arg: number): number { } // struct LDKInvoiceFeatures InvoiceFeatures_clone(const struct LDKInvoiceFeatures *NONNULL_PTR orig); /* @internal */ -export function InvoiceFeatures_clone(orig: number): number { +export function InvoiceFeatures_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_InvoiceFeatures_clone(orig); return nativeResponseValue; } - // uintptr_t ChannelTypeFeatures_clone_ptr(LDKChannelTypeFeatures *NONNULL_PTR arg); + // uint64_t ChannelTypeFeatures_clone_ptr(LDKChannelTypeFeatures *NONNULL_PTR arg); /* @internal */ -export function ChannelTypeFeatures_clone_ptr(arg: number): number { +export function ChannelTypeFeatures_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27395,7 +27402,7 @@ export function ChannelTypeFeatures_clone_ptr(arg: number): number { } // struct LDKChannelTypeFeatures ChannelTypeFeatures_clone(const struct LDKChannelTypeFeatures *NONNULL_PTR orig); /* @internal */ -export function ChannelTypeFeatures_clone(orig: number): number { +export function ChannelTypeFeatures_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27404,7 +27411,7 @@ export function ChannelTypeFeatures_clone(orig: number): number { } // void InitFeatures_free(struct LDKInitFeatures this_obj); /* @internal */ -export function InitFeatures_free(this_obj: number): void { +export function InitFeatures_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27413,7 +27420,7 @@ export function InitFeatures_free(this_obj: number): void { } // void NodeFeatures_free(struct LDKNodeFeatures this_obj); /* @internal */ -export function NodeFeatures_free(this_obj: number): void { +export function NodeFeatures_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27422,7 +27429,7 @@ export function NodeFeatures_free(this_obj: number): void { } // void ChannelFeatures_free(struct LDKChannelFeatures this_obj); /* @internal */ -export function ChannelFeatures_free(this_obj: number): void { +export function ChannelFeatures_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27431,7 +27438,7 @@ export function ChannelFeatures_free(this_obj: number): void { } // void InvoiceFeatures_free(struct LDKInvoiceFeatures this_obj); /* @internal */ -export function InvoiceFeatures_free(this_obj: number): void { +export function InvoiceFeatures_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27440,7 +27447,7 @@ export function InvoiceFeatures_free(this_obj: number): void { } // void ChannelTypeFeatures_free(struct LDKChannelTypeFeatures this_obj); /* @internal */ -export function ChannelTypeFeatures_free(this_obj: number): void { +export function ChannelTypeFeatures_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27449,7 +27456,7 @@ export function ChannelTypeFeatures_free(this_obj: number): void { } // MUST_USE_RES struct LDKInitFeatures InitFeatures_empty(void); /* @internal */ -export function InitFeatures_empty(): number { +export function InitFeatures_empty(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27458,7 +27465,7 @@ export function InitFeatures_empty(): number { } // MUST_USE_RES struct LDKInitFeatures InitFeatures_known(void); /* @internal */ -export function InitFeatures_known(): number { +export function InitFeatures_known(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27467,7 +27474,7 @@ export function InitFeatures_known(): number { } // MUST_USE_RES bool InitFeatures_requires_unknown_bits(const struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_requires_unknown_bits(this_arg: number): boolean { +export function InitFeatures_requires_unknown_bits(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27476,7 +27483,7 @@ export function InitFeatures_requires_unknown_bits(this_arg: number): boolean { } // MUST_USE_RES struct LDKNodeFeatures NodeFeatures_empty(void); /* @internal */ -export function NodeFeatures_empty(): number { +export function NodeFeatures_empty(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27485,7 +27492,7 @@ export function NodeFeatures_empty(): number { } // MUST_USE_RES struct LDKNodeFeatures NodeFeatures_known(void); /* @internal */ -export function NodeFeatures_known(): number { +export function NodeFeatures_known(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27494,7 +27501,7 @@ export function NodeFeatures_known(): number { } // MUST_USE_RES bool NodeFeatures_requires_unknown_bits(const struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_requires_unknown_bits(this_arg: number): boolean { +export function NodeFeatures_requires_unknown_bits(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27503,7 +27510,7 @@ export function NodeFeatures_requires_unknown_bits(this_arg: number): boolean { } // MUST_USE_RES struct LDKChannelFeatures ChannelFeatures_empty(void); /* @internal */ -export function ChannelFeatures_empty(): number { +export function ChannelFeatures_empty(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27512,7 +27519,7 @@ export function ChannelFeatures_empty(): number { } // MUST_USE_RES struct LDKChannelFeatures ChannelFeatures_known(void); /* @internal */ -export function ChannelFeatures_known(): number { +export function ChannelFeatures_known(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27521,7 +27528,7 @@ export function ChannelFeatures_known(): number { } // MUST_USE_RES bool ChannelFeatures_requires_unknown_bits(const struct LDKChannelFeatures *NONNULL_PTR this_arg); /* @internal */ -export function ChannelFeatures_requires_unknown_bits(this_arg: number): boolean { +export function ChannelFeatures_requires_unknown_bits(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27530,7 +27537,7 @@ export function ChannelFeatures_requires_unknown_bits(this_arg: number): boolean } // MUST_USE_RES struct LDKInvoiceFeatures InvoiceFeatures_empty(void); /* @internal */ -export function InvoiceFeatures_empty(): number { +export function InvoiceFeatures_empty(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27539,7 +27546,7 @@ export function InvoiceFeatures_empty(): number { } // MUST_USE_RES struct LDKInvoiceFeatures InvoiceFeatures_known(void); /* @internal */ -export function InvoiceFeatures_known(): number { +export function InvoiceFeatures_known(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27548,7 +27555,7 @@ export function InvoiceFeatures_known(): number { } // MUST_USE_RES bool InvoiceFeatures_requires_unknown_bits(const struct LDKInvoiceFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InvoiceFeatures_requires_unknown_bits(this_arg: number): boolean { +export function InvoiceFeatures_requires_unknown_bits(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27557,7 +27564,7 @@ export function InvoiceFeatures_requires_unknown_bits(this_arg: number): boolean } // MUST_USE_RES struct LDKChannelTypeFeatures ChannelTypeFeatures_empty(void); /* @internal */ -export function ChannelTypeFeatures_empty(): number { +export function ChannelTypeFeatures_empty(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27566,7 +27573,7 @@ export function ChannelTypeFeatures_empty(): number { } // MUST_USE_RES struct LDKChannelTypeFeatures ChannelTypeFeatures_known(void); /* @internal */ -export function ChannelTypeFeatures_known(): number { +export function ChannelTypeFeatures_known(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27575,7 +27582,7 @@ export function ChannelTypeFeatures_known(): number { } // MUST_USE_RES bool ChannelTypeFeatures_requires_unknown_bits(const struct LDKChannelTypeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function ChannelTypeFeatures_requires_unknown_bits(this_arg: number): boolean { +export function ChannelTypeFeatures_requires_unknown_bits(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27584,7 +27591,7 @@ export function ChannelTypeFeatures_requires_unknown_bits(this_arg: number): boo } // struct LDKCVec_u8Z InitFeatures_write(const struct LDKInitFeatures *NONNULL_PTR obj); /* @internal */ -export function InitFeatures_write(obj: number): number { +export function InitFeatures_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27593,7 +27600,7 @@ export function InitFeatures_write(obj: number): number { } // struct LDKCResult_InitFeaturesDecodeErrorZ InitFeatures_read(struct LDKu8slice ser); /* @internal */ -export function InitFeatures_read(ser: number): number { +export function InitFeatures_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27602,7 +27609,7 @@ export function InitFeatures_read(ser: number): number { } // struct LDKCVec_u8Z ChannelFeatures_write(const struct LDKChannelFeatures *NONNULL_PTR obj); /* @internal */ -export function ChannelFeatures_write(obj: number): number { +export function ChannelFeatures_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27611,7 +27618,7 @@ export function ChannelFeatures_write(obj: number): number { } // struct LDKCResult_ChannelFeaturesDecodeErrorZ ChannelFeatures_read(struct LDKu8slice ser); /* @internal */ -export function ChannelFeatures_read(ser: number): number { +export function ChannelFeatures_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27620,7 +27627,7 @@ export function ChannelFeatures_read(ser: number): number { } // struct LDKCVec_u8Z NodeFeatures_write(const struct LDKNodeFeatures *NONNULL_PTR obj); /* @internal */ -export function NodeFeatures_write(obj: number): number { +export function NodeFeatures_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27629,7 +27636,7 @@ export function NodeFeatures_write(obj: number): number { } // struct LDKCResult_NodeFeaturesDecodeErrorZ NodeFeatures_read(struct LDKu8slice ser); /* @internal */ -export function NodeFeatures_read(ser: number): number { +export function NodeFeatures_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27638,7 +27645,7 @@ export function NodeFeatures_read(ser: number): number { } // struct LDKCVec_u8Z InvoiceFeatures_write(const struct LDKInvoiceFeatures *NONNULL_PTR obj); /* @internal */ -export function InvoiceFeatures_write(obj: number): number { +export function InvoiceFeatures_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27647,7 +27654,7 @@ export function InvoiceFeatures_write(obj: number): number { } // struct LDKCResult_InvoiceFeaturesDecodeErrorZ InvoiceFeatures_read(struct LDKu8slice ser); /* @internal */ -export function InvoiceFeatures_read(ser: number): number { +export function InvoiceFeatures_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27656,7 +27663,7 @@ export function InvoiceFeatures_read(ser: number): number { } // struct LDKCVec_u8Z ChannelTypeFeatures_write(const struct LDKChannelTypeFeatures *NONNULL_PTR obj); /* @internal */ -export function ChannelTypeFeatures_write(obj: number): number { +export function ChannelTypeFeatures_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27665,7 +27672,7 @@ export function ChannelTypeFeatures_write(obj: number): number { } // struct LDKCResult_ChannelTypeFeaturesDecodeErrorZ ChannelTypeFeatures_read(struct LDKu8slice ser); /* @internal */ -export function ChannelTypeFeatures_read(ser: number): number { +export function ChannelTypeFeatures_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27674,7 +27681,7 @@ export function ChannelTypeFeatures_read(ser: number): number { } // void InitFeatures_set_data_loss_protect_optional(struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_set_data_loss_protect_optional(this_arg: number): void { +export function InitFeatures_set_data_loss_protect_optional(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27683,7 +27690,7 @@ export function InitFeatures_set_data_loss_protect_optional(this_arg: number): v } // void InitFeatures_set_data_loss_protect_required(struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_set_data_loss_protect_required(this_arg: number): void { +export function InitFeatures_set_data_loss_protect_required(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27692,7 +27699,7 @@ export function InitFeatures_set_data_loss_protect_required(this_arg: number): v } // MUST_USE_RES bool InitFeatures_supports_data_loss_protect(const struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_supports_data_loss_protect(this_arg: number): boolean { +export function InitFeatures_supports_data_loss_protect(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27701,7 +27708,7 @@ export function InitFeatures_supports_data_loss_protect(this_arg: number): boole } // void NodeFeatures_set_data_loss_protect_optional(struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_set_data_loss_protect_optional(this_arg: number): void { +export function NodeFeatures_set_data_loss_protect_optional(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27710,7 +27717,7 @@ export function NodeFeatures_set_data_loss_protect_optional(this_arg: number): v } // void NodeFeatures_set_data_loss_protect_required(struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_set_data_loss_protect_required(this_arg: number): void { +export function NodeFeatures_set_data_loss_protect_required(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27719,7 +27726,7 @@ export function NodeFeatures_set_data_loss_protect_required(this_arg: number): v } // MUST_USE_RES bool NodeFeatures_supports_data_loss_protect(const struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_supports_data_loss_protect(this_arg: number): boolean { +export function NodeFeatures_supports_data_loss_protect(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27728,7 +27735,7 @@ export function NodeFeatures_supports_data_loss_protect(this_arg: number): boole } // MUST_USE_RES bool InitFeatures_requires_data_loss_protect(const struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_requires_data_loss_protect(this_arg: number): boolean { +export function InitFeatures_requires_data_loss_protect(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27737,7 +27744,7 @@ export function InitFeatures_requires_data_loss_protect(this_arg: number): boole } // MUST_USE_RES bool NodeFeatures_requires_data_loss_protect(const struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_requires_data_loss_protect(this_arg: number): boolean { +export function NodeFeatures_requires_data_loss_protect(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27746,7 +27753,7 @@ export function NodeFeatures_requires_data_loss_protect(this_arg: number): boole } // void InitFeatures_set_initial_routing_sync_optional(struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_set_initial_routing_sync_optional(this_arg: number): void { +export function InitFeatures_set_initial_routing_sync_optional(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27755,7 +27762,7 @@ export function InitFeatures_set_initial_routing_sync_optional(this_arg: number) } // void InitFeatures_set_initial_routing_sync_required(struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_set_initial_routing_sync_required(this_arg: number): void { +export function InitFeatures_set_initial_routing_sync_required(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27764,7 +27771,7 @@ export function InitFeatures_set_initial_routing_sync_required(this_arg: number) } // MUST_USE_RES bool InitFeatures_initial_routing_sync(const struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_initial_routing_sync(this_arg: number): boolean { +export function InitFeatures_initial_routing_sync(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27773,7 +27780,7 @@ export function InitFeatures_initial_routing_sync(this_arg: number): boolean { } // void InitFeatures_set_upfront_shutdown_script_optional(struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_set_upfront_shutdown_script_optional(this_arg: number): void { +export function InitFeatures_set_upfront_shutdown_script_optional(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27782,7 +27789,7 @@ export function InitFeatures_set_upfront_shutdown_script_optional(this_arg: numb } // void InitFeatures_set_upfront_shutdown_script_required(struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_set_upfront_shutdown_script_required(this_arg: number): void { +export function InitFeatures_set_upfront_shutdown_script_required(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27791,7 +27798,7 @@ export function InitFeatures_set_upfront_shutdown_script_required(this_arg: numb } // MUST_USE_RES bool InitFeatures_supports_upfront_shutdown_script(const struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_supports_upfront_shutdown_script(this_arg: number): boolean { +export function InitFeatures_supports_upfront_shutdown_script(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27800,7 +27807,7 @@ export function InitFeatures_supports_upfront_shutdown_script(this_arg: number): } // void NodeFeatures_set_upfront_shutdown_script_optional(struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_set_upfront_shutdown_script_optional(this_arg: number): void { +export function NodeFeatures_set_upfront_shutdown_script_optional(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27809,7 +27816,7 @@ export function NodeFeatures_set_upfront_shutdown_script_optional(this_arg: numb } // void NodeFeatures_set_upfront_shutdown_script_required(struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_set_upfront_shutdown_script_required(this_arg: number): void { +export function NodeFeatures_set_upfront_shutdown_script_required(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27818,7 +27825,7 @@ export function NodeFeatures_set_upfront_shutdown_script_required(this_arg: numb } // MUST_USE_RES bool NodeFeatures_supports_upfront_shutdown_script(const struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_supports_upfront_shutdown_script(this_arg: number): boolean { +export function NodeFeatures_supports_upfront_shutdown_script(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27827,7 +27834,7 @@ export function NodeFeatures_supports_upfront_shutdown_script(this_arg: number): } // MUST_USE_RES bool InitFeatures_requires_upfront_shutdown_script(const struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_requires_upfront_shutdown_script(this_arg: number): boolean { +export function InitFeatures_requires_upfront_shutdown_script(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27836,7 +27843,7 @@ export function InitFeatures_requires_upfront_shutdown_script(this_arg: number): } // MUST_USE_RES bool NodeFeatures_requires_upfront_shutdown_script(const struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_requires_upfront_shutdown_script(this_arg: number): boolean { +export function NodeFeatures_requires_upfront_shutdown_script(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27845,7 +27852,7 @@ export function NodeFeatures_requires_upfront_shutdown_script(this_arg: number): } // void InitFeatures_set_gossip_queries_optional(struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_set_gossip_queries_optional(this_arg: number): void { +export function InitFeatures_set_gossip_queries_optional(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27854,7 +27861,7 @@ export function InitFeatures_set_gossip_queries_optional(this_arg: number): void } // void InitFeatures_set_gossip_queries_required(struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_set_gossip_queries_required(this_arg: number): void { +export function InitFeatures_set_gossip_queries_required(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27863,7 +27870,7 @@ export function InitFeatures_set_gossip_queries_required(this_arg: number): void } // MUST_USE_RES bool InitFeatures_supports_gossip_queries(const struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_supports_gossip_queries(this_arg: number): boolean { +export function InitFeatures_supports_gossip_queries(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27872,7 +27879,7 @@ export function InitFeatures_supports_gossip_queries(this_arg: number): boolean } // void NodeFeatures_set_gossip_queries_optional(struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_set_gossip_queries_optional(this_arg: number): void { +export function NodeFeatures_set_gossip_queries_optional(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27881,7 +27888,7 @@ export function NodeFeatures_set_gossip_queries_optional(this_arg: number): void } // void NodeFeatures_set_gossip_queries_required(struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_set_gossip_queries_required(this_arg: number): void { +export function NodeFeatures_set_gossip_queries_required(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27890,7 +27897,7 @@ export function NodeFeatures_set_gossip_queries_required(this_arg: number): void } // MUST_USE_RES bool NodeFeatures_supports_gossip_queries(const struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_supports_gossip_queries(this_arg: number): boolean { +export function NodeFeatures_supports_gossip_queries(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27899,7 +27906,7 @@ export function NodeFeatures_supports_gossip_queries(this_arg: number): boolean } // MUST_USE_RES bool InitFeatures_requires_gossip_queries(const struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_requires_gossip_queries(this_arg: number): boolean { +export function InitFeatures_requires_gossip_queries(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27908,7 +27915,7 @@ export function InitFeatures_requires_gossip_queries(this_arg: number): boolean } // MUST_USE_RES bool NodeFeatures_requires_gossip_queries(const struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_requires_gossip_queries(this_arg: number): boolean { +export function NodeFeatures_requires_gossip_queries(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27917,7 +27924,7 @@ export function NodeFeatures_requires_gossip_queries(this_arg: number): boolean } // void InitFeatures_set_variable_length_onion_optional(struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_set_variable_length_onion_optional(this_arg: number): void { +export function InitFeatures_set_variable_length_onion_optional(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27926,7 +27933,7 @@ export function InitFeatures_set_variable_length_onion_optional(this_arg: number } // void InitFeatures_set_variable_length_onion_required(struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_set_variable_length_onion_required(this_arg: number): void { +export function InitFeatures_set_variable_length_onion_required(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27935,7 +27942,7 @@ export function InitFeatures_set_variable_length_onion_required(this_arg: number } // MUST_USE_RES bool InitFeatures_supports_variable_length_onion(const struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_supports_variable_length_onion(this_arg: number): boolean { +export function InitFeatures_supports_variable_length_onion(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27944,7 +27951,7 @@ export function InitFeatures_supports_variable_length_onion(this_arg: number): b } // void NodeFeatures_set_variable_length_onion_optional(struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_set_variable_length_onion_optional(this_arg: number): void { +export function NodeFeatures_set_variable_length_onion_optional(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27953,7 +27960,7 @@ export function NodeFeatures_set_variable_length_onion_optional(this_arg: number } // void NodeFeatures_set_variable_length_onion_required(struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_set_variable_length_onion_required(this_arg: number): void { +export function NodeFeatures_set_variable_length_onion_required(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27962,7 +27969,7 @@ export function NodeFeatures_set_variable_length_onion_required(this_arg: number } // MUST_USE_RES bool NodeFeatures_supports_variable_length_onion(const struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_supports_variable_length_onion(this_arg: number): boolean { +export function NodeFeatures_supports_variable_length_onion(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27971,7 +27978,7 @@ export function NodeFeatures_supports_variable_length_onion(this_arg: number): b } // void InvoiceFeatures_set_variable_length_onion_optional(struct LDKInvoiceFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InvoiceFeatures_set_variable_length_onion_optional(this_arg: number): void { +export function InvoiceFeatures_set_variable_length_onion_optional(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27980,7 +27987,7 @@ export function InvoiceFeatures_set_variable_length_onion_optional(this_arg: num } // void InvoiceFeatures_set_variable_length_onion_required(struct LDKInvoiceFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InvoiceFeatures_set_variable_length_onion_required(this_arg: number): void { +export function InvoiceFeatures_set_variable_length_onion_required(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27989,7 +27996,7 @@ export function InvoiceFeatures_set_variable_length_onion_required(this_arg: num } // MUST_USE_RES bool InvoiceFeatures_supports_variable_length_onion(const struct LDKInvoiceFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InvoiceFeatures_supports_variable_length_onion(this_arg: number): boolean { +export function InvoiceFeatures_supports_variable_length_onion(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -27998,7 +28005,7 @@ export function InvoiceFeatures_supports_variable_length_onion(this_arg: number) } // MUST_USE_RES bool InitFeatures_requires_variable_length_onion(const struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_requires_variable_length_onion(this_arg: number): boolean { +export function InitFeatures_requires_variable_length_onion(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28007,7 +28014,7 @@ export function InitFeatures_requires_variable_length_onion(this_arg: number): b } // MUST_USE_RES bool NodeFeatures_requires_variable_length_onion(const struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_requires_variable_length_onion(this_arg: number): boolean { +export function NodeFeatures_requires_variable_length_onion(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28016,7 +28023,7 @@ export function NodeFeatures_requires_variable_length_onion(this_arg: number): b } // MUST_USE_RES bool InvoiceFeatures_requires_variable_length_onion(const struct LDKInvoiceFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InvoiceFeatures_requires_variable_length_onion(this_arg: number): boolean { +export function InvoiceFeatures_requires_variable_length_onion(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28025,7 +28032,7 @@ export function InvoiceFeatures_requires_variable_length_onion(this_arg: number) } // void InitFeatures_set_static_remote_key_optional(struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_set_static_remote_key_optional(this_arg: number): void { +export function InitFeatures_set_static_remote_key_optional(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28034,7 +28041,7 @@ export function InitFeatures_set_static_remote_key_optional(this_arg: number): v } // void InitFeatures_set_static_remote_key_required(struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_set_static_remote_key_required(this_arg: number): void { +export function InitFeatures_set_static_remote_key_required(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28043,7 +28050,7 @@ export function InitFeatures_set_static_remote_key_required(this_arg: number): v } // MUST_USE_RES bool InitFeatures_supports_static_remote_key(const struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_supports_static_remote_key(this_arg: number): boolean { +export function InitFeatures_supports_static_remote_key(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28052,7 +28059,7 @@ export function InitFeatures_supports_static_remote_key(this_arg: number): boole } // void NodeFeatures_set_static_remote_key_optional(struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_set_static_remote_key_optional(this_arg: number): void { +export function NodeFeatures_set_static_remote_key_optional(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28061,7 +28068,7 @@ export function NodeFeatures_set_static_remote_key_optional(this_arg: number): v } // void NodeFeatures_set_static_remote_key_required(struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_set_static_remote_key_required(this_arg: number): void { +export function NodeFeatures_set_static_remote_key_required(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28070,7 +28077,7 @@ export function NodeFeatures_set_static_remote_key_required(this_arg: number): v } // MUST_USE_RES bool NodeFeatures_supports_static_remote_key(const struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_supports_static_remote_key(this_arg: number): boolean { +export function NodeFeatures_supports_static_remote_key(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28079,7 +28086,7 @@ export function NodeFeatures_supports_static_remote_key(this_arg: number): boole } // void ChannelTypeFeatures_set_static_remote_key_optional(struct LDKChannelTypeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function ChannelTypeFeatures_set_static_remote_key_optional(this_arg: number): void { +export function ChannelTypeFeatures_set_static_remote_key_optional(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28088,7 +28095,7 @@ export function ChannelTypeFeatures_set_static_remote_key_optional(this_arg: num } // void ChannelTypeFeatures_set_static_remote_key_required(struct LDKChannelTypeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function ChannelTypeFeatures_set_static_remote_key_required(this_arg: number): void { +export function ChannelTypeFeatures_set_static_remote_key_required(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28097,7 +28104,7 @@ export function ChannelTypeFeatures_set_static_remote_key_required(this_arg: num } // MUST_USE_RES bool ChannelTypeFeatures_supports_static_remote_key(const struct LDKChannelTypeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function ChannelTypeFeatures_supports_static_remote_key(this_arg: number): boolean { +export function ChannelTypeFeatures_supports_static_remote_key(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28106,7 +28113,7 @@ export function ChannelTypeFeatures_supports_static_remote_key(this_arg: number) } // MUST_USE_RES bool InitFeatures_requires_static_remote_key(const struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_requires_static_remote_key(this_arg: number): boolean { +export function InitFeatures_requires_static_remote_key(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28115,7 +28122,7 @@ export function InitFeatures_requires_static_remote_key(this_arg: number): boole } // MUST_USE_RES bool NodeFeatures_requires_static_remote_key(const struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_requires_static_remote_key(this_arg: number): boolean { +export function NodeFeatures_requires_static_remote_key(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28124,7 +28131,7 @@ export function NodeFeatures_requires_static_remote_key(this_arg: number): boole } // MUST_USE_RES bool ChannelTypeFeatures_requires_static_remote_key(const struct LDKChannelTypeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function ChannelTypeFeatures_requires_static_remote_key(this_arg: number): boolean { +export function ChannelTypeFeatures_requires_static_remote_key(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28133,7 +28140,7 @@ export function ChannelTypeFeatures_requires_static_remote_key(this_arg: number) } // void InitFeatures_set_payment_secret_optional(struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_set_payment_secret_optional(this_arg: number): void { +export function InitFeatures_set_payment_secret_optional(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28142,7 +28149,7 @@ export function InitFeatures_set_payment_secret_optional(this_arg: number): void } // void InitFeatures_set_payment_secret_required(struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_set_payment_secret_required(this_arg: number): void { +export function InitFeatures_set_payment_secret_required(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28151,7 +28158,7 @@ export function InitFeatures_set_payment_secret_required(this_arg: number): void } // MUST_USE_RES bool InitFeatures_supports_payment_secret(const struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_supports_payment_secret(this_arg: number): boolean { +export function InitFeatures_supports_payment_secret(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28160,7 +28167,7 @@ export function InitFeatures_supports_payment_secret(this_arg: number): boolean } // void NodeFeatures_set_payment_secret_optional(struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_set_payment_secret_optional(this_arg: number): void { +export function NodeFeatures_set_payment_secret_optional(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28169,7 +28176,7 @@ export function NodeFeatures_set_payment_secret_optional(this_arg: number): void } // void NodeFeatures_set_payment_secret_required(struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_set_payment_secret_required(this_arg: number): void { +export function NodeFeatures_set_payment_secret_required(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28178,7 +28185,7 @@ export function NodeFeatures_set_payment_secret_required(this_arg: number): void } // MUST_USE_RES bool NodeFeatures_supports_payment_secret(const struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_supports_payment_secret(this_arg: number): boolean { +export function NodeFeatures_supports_payment_secret(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28187,7 +28194,7 @@ export function NodeFeatures_supports_payment_secret(this_arg: number): boolean } // void InvoiceFeatures_set_payment_secret_optional(struct LDKInvoiceFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InvoiceFeatures_set_payment_secret_optional(this_arg: number): void { +export function InvoiceFeatures_set_payment_secret_optional(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28196,7 +28203,7 @@ export function InvoiceFeatures_set_payment_secret_optional(this_arg: number): v } // void InvoiceFeatures_set_payment_secret_required(struct LDKInvoiceFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InvoiceFeatures_set_payment_secret_required(this_arg: number): void { +export function InvoiceFeatures_set_payment_secret_required(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28205,7 +28212,7 @@ export function InvoiceFeatures_set_payment_secret_required(this_arg: number): v } // MUST_USE_RES bool InvoiceFeatures_supports_payment_secret(const struct LDKInvoiceFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InvoiceFeatures_supports_payment_secret(this_arg: number): boolean { +export function InvoiceFeatures_supports_payment_secret(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28214,7 +28221,7 @@ export function InvoiceFeatures_supports_payment_secret(this_arg: number): boole } // MUST_USE_RES bool InitFeatures_requires_payment_secret(const struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_requires_payment_secret(this_arg: number): boolean { +export function InitFeatures_requires_payment_secret(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28223,7 +28230,7 @@ export function InitFeatures_requires_payment_secret(this_arg: number): boolean } // MUST_USE_RES bool NodeFeatures_requires_payment_secret(const struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_requires_payment_secret(this_arg: number): boolean { +export function NodeFeatures_requires_payment_secret(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28232,7 +28239,7 @@ export function NodeFeatures_requires_payment_secret(this_arg: number): boolean } // MUST_USE_RES bool InvoiceFeatures_requires_payment_secret(const struct LDKInvoiceFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InvoiceFeatures_requires_payment_secret(this_arg: number): boolean { +export function InvoiceFeatures_requires_payment_secret(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28241,7 +28248,7 @@ export function InvoiceFeatures_requires_payment_secret(this_arg: number): boole } // void InitFeatures_set_basic_mpp_optional(struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_set_basic_mpp_optional(this_arg: number): void { +export function InitFeatures_set_basic_mpp_optional(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28250,7 +28257,7 @@ export function InitFeatures_set_basic_mpp_optional(this_arg: number): void { } // void InitFeatures_set_basic_mpp_required(struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_set_basic_mpp_required(this_arg: number): void { +export function InitFeatures_set_basic_mpp_required(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28259,7 +28266,7 @@ export function InitFeatures_set_basic_mpp_required(this_arg: number): void { } // MUST_USE_RES bool InitFeatures_supports_basic_mpp(const struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_supports_basic_mpp(this_arg: number): boolean { +export function InitFeatures_supports_basic_mpp(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28268,7 +28275,7 @@ export function InitFeatures_supports_basic_mpp(this_arg: number): boolean { } // void NodeFeatures_set_basic_mpp_optional(struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_set_basic_mpp_optional(this_arg: number): void { +export function NodeFeatures_set_basic_mpp_optional(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28277,7 +28284,7 @@ export function NodeFeatures_set_basic_mpp_optional(this_arg: number): void { } // void NodeFeatures_set_basic_mpp_required(struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_set_basic_mpp_required(this_arg: number): void { +export function NodeFeatures_set_basic_mpp_required(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28286,7 +28293,7 @@ export function NodeFeatures_set_basic_mpp_required(this_arg: number): void { } // MUST_USE_RES bool NodeFeatures_supports_basic_mpp(const struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_supports_basic_mpp(this_arg: number): boolean { +export function NodeFeatures_supports_basic_mpp(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28295,7 +28302,7 @@ export function NodeFeatures_supports_basic_mpp(this_arg: number): boolean { } // void InvoiceFeatures_set_basic_mpp_optional(struct LDKInvoiceFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InvoiceFeatures_set_basic_mpp_optional(this_arg: number): void { +export function InvoiceFeatures_set_basic_mpp_optional(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28304,7 +28311,7 @@ export function InvoiceFeatures_set_basic_mpp_optional(this_arg: number): void { } // void InvoiceFeatures_set_basic_mpp_required(struct LDKInvoiceFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InvoiceFeatures_set_basic_mpp_required(this_arg: number): void { +export function InvoiceFeatures_set_basic_mpp_required(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28313,7 +28320,7 @@ export function InvoiceFeatures_set_basic_mpp_required(this_arg: number): void { } // MUST_USE_RES bool InvoiceFeatures_supports_basic_mpp(const struct LDKInvoiceFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InvoiceFeatures_supports_basic_mpp(this_arg: number): boolean { +export function InvoiceFeatures_supports_basic_mpp(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28322,7 +28329,7 @@ export function InvoiceFeatures_supports_basic_mpp(this_arg: number): boolean { } // MUST_USE_RES bool InitFeatures_requires_basic_mpp(const struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_requires_basic_mpp(this_arg: number): boolean { +export function InitFeatures_requires_basic_mpp(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28331,7 +28338,7 @@ export function InitFeatures_requires_basic_mpp(this_arg: number): boolean { } // MUST_USE_RES bool NodeFeatures_requires_basic_mpp(const struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_requires_basic_mpp(this_arg: number): boolean { +export function NodeFeatures_requires_basic_mpp(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28340,7 +28347,7 @@ export function NodeFeatures_requires_basic_mpp(this_arg: number): boolean { } // MUST_USE_RES bool InvoiceFeatures_requires_basic_mpp(const struct LDKInvoiceFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InvoiceFeatures_requires_basic_mpp(this_arg: number): boolean { +export function InvoiceFeatures_requires_basic_mpp(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28349,7 +28356,7 @@ export function InvoiceFeatures_requires_basic_mpp(this_arg: number): boolean { } // void InitFeatures_set_wumbo_optional(struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_set_wumbo_optional(this_arg: number): void { +export function InitFeatures_set_wumbo_optional(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28358,7 +28365,7 @@ export function InitFeatures_set_wumbo_optional(this_arg: number): void { } // void InitFeatures_set_wumbo_required(struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_set_wumbo_required(this_arg: number): void { +export function InitFeatures_set_wumbo_required(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28367,7 +28374,7 @@ export function InitFeatures_set_wumbo_required(this_arg: number): void { } // MUST_USE_RES bool InitFeatures_supports_wumbo(const struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_supports_wumbo(this_arg: number): boolean { +export function InitFeatures_supports_wumbo(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28376,7 +28383,7 @@ export function InitFeatures_supports_wumbo(this_arg: number): boolean { } // void NodeFeatures_set_wumbo_optional(struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_set_wumbo_optional(this_arg: number): void { +export function NodeFeatures_set_wumbo_optional(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28385,7 +28392,7 @@ export function NodeFeatures_set_wumbo_optional(this_arg: number): void { } // void NodeFeatures_set_wumbo_required(struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_set_wumbo_required(this_arg: number): void { +export function NodeFeatures_set_wumbo_required(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28394,7 +28401,7 @@ export function NodeFeatures_set_wumbo_required(this_arg: number): void { } // MUST_USE_RES bool NodeFeatures_supports_wumbo(const struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_supports_wumbo(this_arg: number): boolean { +export function NodeFeatures_supports_wumbo(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28403,7 +28410,7 @@ export function NodeFeatures_supports_wumbo(this_arg: number): boolean { } // MUST_USE_RES bool InitFeatures_requires_wumbo(const struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_requires_wumbo(this_arg: number): boolean { +export function InitFeatures_requires_wumbo(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28412,7 +28419,7 @@ export function InitFeatures_requires_wumbo(this_arg: number): boolean { } // MUST_USE_RES bool NodeFeatures_requires_wumbo(const struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_requires_wumbo(this_arg: number): boolean { +export function NodeFeatures_requires_wumbo(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28421,7 +28428,7 @@ export function NodeFeatures_requires_wumbo(this_arg: number): boolean { } // void InitFeatures_set_shutdown_any_segwit_optional(struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_set_shutdown_any_segwit_optional(this_arg: number): void { +export function InitFeatures_set_shutdown_any_segwit_optional(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28430,7 +28437,7 @@ export function InitFeatures_set_shutdown_any_segwit_optional(this_arg: number): } // void InitFeatures_set_shutdown_any_segwit_required(struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_set_shutdown_any_segwit_required(this_arg: number): void { +export function InitFeatures_set_shutdown_any_segwit_required(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28439,7 +28446,7 @@ export function InitFeatures_set_shutdown_any_segwit_required(this_arg: number): } // MUST_USE_RES bool InitFeatures_supports_shutdown_anysegwit(const struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_supports_shutdown_anysegwit(this_arg: number): boolean { +export function InitFeatures_supports_shutdown_anysegwit(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28448,7 +28455,7 @@ export function InitFeatures_supports_shutdown_anysegwit(this_arg: number): bool } // void NodeFeatures_set_shutdown_any_segwit_optional(struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_set_shutdown_any_segwit_optional(this_arg: number): void { +export function NodeFeatures_set_shutdown_any_segwit_optional(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28457,7 +28464,7 @@ export function NodeFeatures_set_shutdown_any_segwit_optional(this_arg: number): } // void NodeFeatures_set_shutdown_any_segwit_required(struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_set_shutdown_any_segwit_required(this_arg: number): void { +export function NodeFeatures_set_shutdown_any_segwit_required(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28466,7 +28473,7 @@ export function NodeFeatures_set_shutdown_any_segwit_required(this_arg: number): } // MUST_USE_RES bool NodeFeatures_supports_shutdown_anysegwit(const struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_supports_shutdown_anysegwit(this_arg: number): boolean { +export function NodeFeatures_supports_shutdown_anysegwit(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28475,7 +28482,7 @@ export function NodeFeatures_supports_shutdown_anysegwit(this_arg: number): bool } // MUST_USE_RES bool InitFeatures_requires_shutdown_anysegwit(const struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_requires_shutdown_anysegwit(this_arg: number): boolean { +export function InitFeatures_requires_shutdown_anysegwit(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28484,7 +28491,7 @@ export function InitFeatures_requires_shutdown_anysegwit(this_arg: number): bool } // MUST_USE_RES bool NodeFeatures_requires_shutdown_anysegwit(const struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_requires_shutdown_anysegwit(this_arg: number): boolean { +export function NodeFeatures_requires_shutdown_anysegwit(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28493,7 +28500,7 @@ export function NodeFeatures_requires_shutdown_anysegwit(this_arg: number): bool } // void InitFeatures_set_channel_type_optional(struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_set_channel_type_optional(this_arg: number): void { +export function InitFeatures_set_channel_type_optional(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28502,7 +28509,7 @@ export function InitFeatures_set_channel_type_optional(this_arg: number): void { } // void InitFeatures_set_channel_type_required(struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_set_channel_type_required(this_arg: number): void { +export function InitFeatures_set_channel_type_required(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28511,7 +28518,7 @@ export function InitFeatures_set_channel_type_required(this_arg: number): void { } // MUST_USE_RES bool InitFeatures_supports_channel_type(const struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_supports_channel_type(this_arg: number): boolean { +export function InitFeatures_supports_channel_type(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28520,7 +28527,7 @@ export function InitFeatures_supports_channel_type(this_arg: number): boolean { } // void NodeFeatures_set_channel_type_optional(struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_set_channel_type_optional(this_arg: number): void { +export function NodeFeatures_set_channel_type_optional(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28529,7 +28536,7 @@ export function NodeFeatures_set_channel_type_optional(this_arg: number): void { } // void NodeFeatures_set_channel_type_required(struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_set_channel_type_required(this_arg: number): void { +export function NodeFeatures_set_channel_type_required(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28538,7 +28545,7 @@ export function NodeFeatures_set_channel_type_required(this_arg: number): void { } // MUST_USE_RES bool NodeFeatures_supports_channel_type(const struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_supports_channel_type(this_arg: number): boolean { +export function NodeFeatures_supports_channel_type(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28547,7 +28554,7 @@ export function NodeFeatures_supports_channel_type(this_arg: number): boolean { } // MUST_USE_RES bool InitFeatures_requires_channel_type(const struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_requires_channel_type(this_arg: number): boolean { +export function InitFeatures_requires_channel_type(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28556,7 +28563,7 @@ export function InitFeatures_requires_channel_type(this_arg: number): boolean { } // MUST_USE_RES bool NodeFeatures_requires_channel_type(const struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_requires_channel_type(this_arg: number): boolean { +export function NodeFeatures_requires_channel_type(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28565,7 +28572,7 @@ export function NodeFeatures_requires_channel_type(this_arg: number): boolean { } // void InitFeatures_set_scid_privacy_optional(struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_set_scid_privacy_optional(this_arg: number): void { +export function InitFeatures_set_scid_privacy_optional(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28574,7 +28581,7 @@ export function InitFeatures_set_scid_privacy_optional(this_arg: number): void { } // void InitFeatures_set_scid_privacy_required(struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_set_scid_privacy_required(this_arg: number): void { +export function InitFeatures_set_scid_privacy_required(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28583,7 +28590,7 @@ export function InitFeatures_set_scid_privacy_required(this_arg: number): void { } // MUST_USE_RES bool InitFeatures_supports_scid_privacy(const struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_supports_scid_privacy(this_arg: number): boolean { +export function InitFeatures_supports_scid_privacy(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28592,7 +28599,7 @@ export function InitFeatures_supports_scid_privacy(this_arg: number): boolean { } // void NodeFeatures_set_scid_privacy_optional(struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_set_scid_privacy_optional(this_arg: number): void { +export function NodeFeatures_set_scid_privacy_optional(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28601,7 +28608,7 @@ export function NodeFeatures_set_scid_privacy_optional(this_arg: number): void { } // void NodeFeatures_set_scid_privacy_required(struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_set_scid_privacy_required(this_arg: number): void { +export function NodeFeatures_set_scid_privacy_required(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28610,7 +28617,7 @@ export function NodeFeatures_set_scid_privacy_required(this_arg: number): void { } // MUST_USE_RES bool NodeFeatures_supports_scid_privacy(const struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_supports_scid_privacy(this_arg: number): boolean { +export function NodeFeatures_supports_scid_privacy(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28619,7 +28626,7 @@ export function NodeFeatures_supports_scid_privacy(this_arg: number): boolean { } // void ChannelTypeFeatures_set_scid_privacy_optional(struct LDKChannelTypeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function ChannelTypeFeatures_set_scid_privacy_optional(this_arg: number): void { +export function ChannelTypeFeatures_set_scid_privacy_optional(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28628,7 +28635,7 @@ export function ChannelTypeFeatures_set_scid_privacy_optional(this_arg: number): } // void ChannelTypeFeatures_set_scid_privacy_required(struct LDKChannelTypeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function ChannelTypeFeatures_set_scid_privacy_required(this_arg: number): void { +export function ChannelTypeFeatures_set_scid_privacy_required(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28637,7 +28644,7 @@ export function ChannelTypeFeatures_set_scid_privacy_required(this_arg: number): } // MUST_USE_RES bool ChannelTypeFeatures_supports_scid_privacy(const struct LDKChannelTypeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function ChannelTypeFeatures_supports_scid_privacy(this_arg: number): boolean { +export function ChannelTypeFeatures_supports_scid_privacy(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28646,7 +28653,7 @@ export function ChannelTypeFeatures_supports_scid_privacy(this_arg: number): boo } // MUST_USE_RES bool InitFeatures_requires_scid_privacy(const struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_requires_scid_privacy(this_arg: number): boolean { +export function InitFeatures_requires_scid_privacy(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28655,7 +28662,7 @@ export function InitFeatures_requires_scid_privacy(this_arg: number): boolean { } // MUST_USE_RES bool NodeFeatures_requires_scid_privacy(const struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_requires_scid_privacy(this_arg: number): boolean { +export function NodeFeatures_requires_scid_privacy(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28664,7 +28671,7 @@ export function NodeFeatures_requires_scid_privacy(this_arg: number): boolean { } // MUST_USE_RES bool ChannelTypeFeatures_requires_scid_privacy(const struct LDKChannelTypeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function ChannelTypeFeatures_requires_scid_privacy(this_arg: number): boolean { +export function ChannelTypeFeatures_requires_scid_privacy(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28673,7 +28680,7 @@ export function ChannelTypeFeatures_requires_scid_privacy(this_arg: number): boo } // void InitFeatures_set_zero_conf_optional(struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_set_zero_conf_optional(this_arg: number): void { +export function InitFeatures_set_zero_conf_optional(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28682,7 +28689,7 @@ export function InitFeatures_set_zero_conf_optional(this_arg: number): void { } // void InitFeatures_set_zero_conf_required(struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_set_zero_conf_required(this_arg: number): void { +export function InitFeatures_set_zero_conf_required(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28691,7 +28698,7 @@ export function InitFeatures_set_zero_conf_required(this_arg: number): void { } // MUST_USE_RES bool InitFeatures_supports_zero_conf(const struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_supports_zero_conf(this_arg: number): boolean { +export function InitFeatures_supports_zero_conf(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28700,7 +28707,7 @@ export function InitFeatures_supports_zero_conf(this_arg: number): boolean { } // void NodeFeatures_set_zero_conf_optional(struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_set_zero_conf_optional(this_arg: number): void { +export function NodeFeatures_set_zero_conf_optional(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28709,7 +28716,7 @@ export function NodeFeatures_set_zero_conf_optional(this_arg: number): void { } // void NodeFeatures_set_zero_conf_required(struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_set_zero_conf_required(this_arg: number): void { +export function NodeFeatures_set_zero_conf_required(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28718,7 +28725,7 @@ export function NodeFeatures_set_zero_conf_required(this_arg: number): void { } // MUST_USE_RES bool NodeFeatures_supports_zero_conf(const struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_supports_zero_conf(this_arg: number): boolean { +export function NodeFeatures_supports_zero_conf(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28727,7 +28734,7 @@ export function NodeFeatures_supports_zero_conf(this_arg: number): boolean { } // void ChannelTypeFeatures_set_zero_conf_optional(struct LDKChannelTypeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function ChannelTypeFeatures_set_zero_conf_optional(this_arg: number): void { +export function ChannelTypeFeatures_set_zero_conf_optional(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28736,7 +28743,7 @@ export function ChannelTypeFeatures_set_zero_conf_optional(this_arg: number): vo } // void ChannelTypeFeatures_set_zero_conf_required(struct LDKChannelTypeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function ChannelTypeFeatures_set_zero_conf_required(this_arg: number): void { +export function ChannelTypeFeatures_set_zero_conf_required(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28745,7 +28752,7 @@ export function ChannelTypeFeatures_set_zero_conf_required(this_arg: number): vo } // MUST_USE_RES bool ChannelTypeFeatures_supports_zero_conf(const struct LDKChannelTypeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function ChannelTypeFeatures_supports_zero_conf(this_arg: number): boolean { +export function ChannelTypeFeatures_supports_zero_conf(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28754,7 +28761,7 @@ export function ChannelTypeFeatures_supports_zero_conf(this_arg: number): boolea } // MUST_USE_RES bool InitFeatures_requires_zero_conf(const struct LDKInitFeatures *NONNULL_PTR this_arg); /* @internal */ -export function InitFeatures_requires_zero_conf(this_arg: number): boolean { +export function InitFeatures_requires_zero_conf(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28763,7 +28770,7 @@ export function InitFeatures_requires_zero_conf(this_arg: number): boolean { } // MUST_USE_RES bool NodeFeatures_requires_zero_conf(const struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_requires_zero_conf(this_arg: number): boolean { +export function NodeFeatures_requires_zero_conf(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28772,7 +28779,7 @@ export function NodeFeatures_requires_zero_conf(this_arg: number): boolean { } // MUST_USE_RES bool ChannelTypeFeatures_requires_zero_conf(const struct LDKChannelTypeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function ChannelTypeFeatures_requires_zero_conf(this_arg: number): boolean { +export function ChannelTypeFeatures_requires_zero_conf(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28781,7 +28788,7 @@ export function ChannelTypeFeatures_requires_zero_conf(this_arg: number): boolea } // void NodeFeatures_set_keysend_optional(struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_set_keysend_optional(this_arg: number): void { +export function NodeFeatures_set_keysend_optional(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28790,7 +28797,7 @@ export function NodeFeatures_set_keysend_optional(this_arg: number): void { } // void NodeFeatures_set_keysend_required(struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_set_keysend_required(this_arg: number): void { +export function NodeFeatures_set_keysend_required(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28799,7 +28806,7 @@ export function NodeFeatures_set_keysend_required(this_arg: number): void { } // MUST_USE_RES bool NodeFeatures_supports_keysend(const struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_supports_keysend(this_arg: number): boolean { +export function NodeFeatures_supports_keysend(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28808,7 +28815,7 @@ export function NodeFeatures_supports_keysend(this_arg: number): boolean { } // MUST_USE_RES bool NodeFeatures_requires_keysend(const struct LDKNodeFeatures *NONNULL_PTR this_arg); /* @internal */ -export function NodeFeatures_requires_keysend(this_arg: number): boolean { +export function NodeFeatures_requires_keysend(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28817,16 +28824,16 @@ export function NodeFeatures_requires_keysend(this_arg: number): boolean { } // void ShutdownScript_free(struct LDKShutdownScript this_obj); /* @internal */ -export function ShutdownScript_free(this_obj: number): void { +export function ShutdownScript_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_ShutdownScript_free(this_obj); // debug statements here } - // uintptr_t ShutdownScript_clone_ptr(LDKShutdownScript *NONNULL_PTR arg); + // uint64_t ShutdownScript_clone_ptr(LDKShutdownScript *NONNULL_PTR arg); /* @internal */ -export function ShutdownScript_clone_ptr(arg: number): number { +export function ShutdownScript_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28835,7 +28842,7 @@ export function ShutdownScript_clone_ptr(arg: number): number { } // struct LDKShutdownScript ShutdownScript_clone(const struct LDKShutdownScript *NONNULL_PTR orig); /* @internal */ -export function ShutdownScript_clone(orig: number): number { +export function ShutdownScript_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28844,7 +28851,7 @@ export function ShutdownScript_clone(orig: number): number { } // void InvalidShutdownScript_free(struct LDKInvalidShutdownScript this_obj); /* @internal */ -export function InvalidShutdownScript_free(this_obj: number): void { +export function InvalidShutdownScript_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28853,7 +28860,7 @@ export function InvalidShutdownScript_free(this_obj: number): void { } // struct LDKu8slice InvalidShutdownScript_get_script(const struct LDKInvalidShutdownScript *NONNULL_PTR this_ptr); /* @internal */ -export function InvalidShutdownScript_get_script(this_ptr: number): number { +export function InvalidShutdownScript_get_script(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28862,7 +28869,7 @@ export function InvalidShutdownScript_get_script(this_ptr: number): number { } // void InvalidShutdownScript_set_script(struct LDKInvalidShutdownScript *NONNULL_PTR this_ptr, struct LDKCVec_u8Z val); /* @internal */ -export function InvalidShutdownScript_set_script(this_ptr: number, val: number): void { +export function InvalidShutdownScript_set_script(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28871,16 +28878,16 @@ export function InvalidShutdownScript_set_script(this_ptr: number, val: number): } // MUST_USE_RES struct LDKInvalidShutdownScript InvalidShutdownScript_new(struct LDKCVec_u8Z script_arg); /* @internal */ -export function InvalidShutdownScript_new(script_arg: number): number { +export function InvalidShutdownScript_new(script_arg: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_InvalidShutdownScript_new(script_arg); return nativeResponseValue; } - // uintptr_t InvalidShutdownScript_clone_ptr(LDKInvalidShutdownScript *NONNULL_PTR arg); + // uint64_t InvalidShutdownScript_clone_ptr(LDKInvalidShutdownScript *NONNULL_PTR arg); /* @internal */ -export function InvalidShutdownScript_clone_ptr(arg: number): number { +export function InvalidShutdownScript_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28889,7 +28896,7 @@ export function InvalidShutdownScript_clone_ptr(arg: number): number { } // struct LDKInvalidShutdownScript InvalidShutdownScript_clone(const struct LDKInvalidShutdownScript *NONNULL_PTR orig); /* @internal */ -export function InvalidShutdownScript_clone(orig: number): number { +export function InvalidShutdownScript_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28898,7 +28905,7 @@ export function InvalidShutdownScript_clone(orig: number): number { } // struct LDKCVec_u8Z ShutdownScript_write(const struct LDKShutdownScript *NONNULL_PTR obj); /* @internal */ -export function ShutdownScript_write(obj: number): number { +export function ShutdownScript_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28907,7 +28914,7 @@ export function ShutdownScript_write(obj: number): number { } // struct LDKCResult_ShutdownScriptDecodeErrorZ ShutdownScript_read(struct LDKu8slice ser); /* @internal */ -export function ShutdownScript_read(ser: number): number { +export function ShutdownScript_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28916,7 +28923,7 @@ export function ShutdownScript_read(ser: number): number { } // MUST_USE_RES struct LDKShutdownScript ShutdownScript_new_p2wpkh(const uint8_t (*pubkey_hash)[20]); /* @internal */ -export function ShutdownScript_new_p2wpkh(pubkey_hash: number): number { +export function ShutdownScript_new_p2wpkh(pubkey_hash: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28925,7 +28932,7 @@ export function ShutdownScript_new_p2wpkh(pubkey_hash: number): number { } // MUST_USE_RES struct LDKShutdownScript ShutdownScript_new_p2wsh(const uint8_t (*script_hash)[32]); /* @internal */ -export function ShutdownScript_new_p2wsh(script_hash: number): number { +export function ShutdownScript_new_p2wsh(script_hash: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28934,7 +28941,7 @@ export function ShutdownScript_new_p2wsh(script_hash: number): number { } // MUST_USE_RES struct LDKCResult_ShutdownScriptInvalidShutdownScriptZ ShutdownScript_new_witness_program(struct LDKWitnessVersion version, struct LDKu8slice program); /* @internal */ -export function ShutdownScript_new_witness_program(version: number, program: number): number { +export function ShutdownScript_new_witness_program(version: number, program: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28943,7 +28950,7 @@ export function ShutdownScript_new_witness_program(version: number, program: num } // MUST_USE_RES struct LDKCVec_u8Z ShutdownScript_into_inner(struct LDKShutdownScript this_arg); /* @internal */ -export function ShutdownScript_into_inner(this_arg: number): number { +export function ShutdownScript_into_inner(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28952,7 +28959,7 @@ export function ShutdownScript_into_inner(this_arg: number): number { } // MUST_USE_RES struct LDKPublicKey ShutdownScript_as_legacy_pubkey(const struct LDKShutdownScript *NONNULL_PTR this_arg); /* @internal */ -export function ShutdownScript_as_legacy_pubkey(this_arg: number): number { +export function ShutdownScript_as_legacy_pubkey(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28961,7 +28968,7 @@ export function ShutdownScript_as_legacy_pubkey(this_arg: number): number { } // MUST_USE_RES bool ShutdownScript_is_compatible(const struct LDKShutdownScript *NONNULL_PTR this_arg, const struct LDKInitFeatures *NONNULL_PTR features); /* @internal */ -export function ShutdownScript_is_compatible(this_arg: number, features: number): boolean { +export function ShutdownScript_is_compatible(this_arg: bigint, features: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28970,16 +28977,16 @@ export function ShutdownScript_is_compatible(this_arg: number, features: number) } // void CustomMessageReader_free(struct LDKCustomMessageReader this_ptr); /* @internal */ -export function CustomMessageReader_free(this_ptr: number): void { +export function CustomMessageReader_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_CustomMessageReader_free(this_ptr); // debug statements here } - // uintptr_t Type_clone_ptr(LDKType *NONNULL_PTR arg); + // uint64_t Type_clone_ptr(LDKType *NONNULL_PTR arg); /* @internal */ -export function Type_clone_ptr(arg: number): number { +export function Type_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28988,7 +28995,7 @@ export function Type_clone_ptr(arg: number): number { } // struct LDKType Type_clone(const struct LDKType *NONNULL_PTR orig); /* @internal */ -export function Type_clone(orig: number): number { +export function Type_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -28997,7 +29004,7 @@ export function Type_clone(orig: number): number { } // void Type_free(struct LDKType this_ptr); /* @internal */ -export function Type_free(this_ptr: number): void { +export function Type_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29006,16 +29013,16 @@ export function Type_free(this_ptr: number): void { } // void NodeId_free(struct LDKNodeId this_obj); /* @internal */ -export function NodeId_free(this_obj: number): void { +export function NodeId_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_NodeId_free(this_obj); // debug statements here } - // uintptr_t NodeId_clone_ptr(LDKNodeId *NONNULL_PTR arg); + // uint64_t NodeId_clone_ptr(LDKNodeId *NONNULL_PTR arg); /* @internal */ -export function NodeId_clone_ptr(arg: number): number { +export function NodeId_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29024,7 +29031,7 @@ export function NodeId_clone_ptr(arg: number): number { } // struct LDKNodeId NodeId_clone(const struct LDKNodeId *NONNULL_PTR orig); /* @internal */ -export function NodeId_clone(orig: number): number { +export function NodeId_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29033,7 +29040,7 @@ export function NodeId_clone(orig: number): number { } // MUST_USE_RES struct LDKNodeId NodeId_from_pubkey(struct LDKPublicKey pubkey); /* @internal */ -export function NodeId_from_pubkey(pubkey: number): number { +export function NodeId_from_pubkey(pubkey: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29042,7 +29049,7 @@ export function NodeId_from_pubkey(pubkey: number): number { } // MUST_USE_RES struct LDKu8slice NodeId_as_slice(const struct LDKNodeId *NONNULL_PTR this_arg); /* @internal */ -export function NodeId_as_slice(this_arg: number): number { +export function NodeId_as_slice(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29051,7 +29058,7 @@ export function NodeId_as_slice(this_arg: number): number { } // uint64_t NodeId_hash(const struct LDKNodeId *NONNULL_PTR o); /* @internal */ -export function NodeId_hash(o: number): bigint { +export function NodeId_hash(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29060,7 +29067,7 @@ export function NodeId_hash(o: number): bigint { } // struct LDKCVec_u8Z NodeId_write(const struct LDKNodeId *NONNULL_PTR obj); /* @internal */ -export function NodeId_write(obj: number): number { +export function NodeId_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29069,7 +29076,7 @@ export function NodeId_write(obj: number): number { } // struct LDKCResult_NodeIdDecodeErrorZ NodeId_read(struct LDKu8slice ser); /* @internal */ -export function NodeId_read(ser: number): number { +export function NodeId_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29078,7 +29085,7 @@ export function NodeId_read(ser: number): number { } // void NetworkGraph_free(struct LDKNetworkGraph this_obj); /* @internal */ -export function NetworkGraph_free(this_obj: number): void { +export function NetworkGraph_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29087,7 +29094,7 @@ export function NetworkGraph_free(this_obj: number): void { } // void ReadOnlyNetworkGraph_free(struct LDKReadOnlyNetworkGraph this_obj); /* @internal */ -export function ReadOnlyNetworkGraph_free(this_obj: number): void { +export function ReadOnlyNetworkGraph_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29096,16 +29103,16 @@ export function ReadOnlyNetworkGraph_free(this_obj: number): void { } // void NetworkUpdate_free(struct LDKNetworkUpdate this_ptr); /* @internal */ -export function NetworkUpdate_free(this_ptr: number): void { +export function NetworkUpdate_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_NetworkUpdate_free(this_ptr); // debug statements here } - // uintptr_t NetworkUpdate_clone_ptr(LDKNetworkUpdate *NONNULL_PTR arg); + // uint64_t NetworkUpdate_clone_ptr(LDKNetworkUpdate *NONNULL_PTR arg); /* @internal */ -export function NetworkUpdate_clone_ptr(arg: number): number { +export function NetworkUpdate_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29114,7 +29121,7 @@ export function NetworkUpdate_clone_ptr(arg: number): number { } // struct LDKNetworkUpdate NetworkUpdate_clone(const struct LDKNetworkUpdate *NONNULL_PTR orig); /* @internal */ -export function NetworkUpdate_clone(orig: number): number { +export function NetworkUpdate_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29123,7 +29130,7 @@ export function NetworkUpdate_clone(orig: number): number { } // struct LDKNetworkUpdate NetworkUpdate_channel_update_message(struct LDKChannelUpdate msg); /* @internal */ -export function NetworkUpdate_channel_update_message(msg: number): number { +export function NetworkUpdate_channel_update_message(msg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29132,7 +29139,7 @@ export function NetworkUpdate_channel_update_message(msg: number): number { } // struct LDKNetworkUpdate NetworkUpdate_channel_failure(uint64_t short_channel_id, bool is_permanent); /* @internal */ -export function NetworkUpdate_channel_failure(short_channel_id: bigint, is_permanent: boolean): number { +export function NetworkUpdate_channel_failure(short_channel_id: bigint, is_permanent: boolean): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29141,7 +29148,7 @@ export function NetworkUpdate_channel_failure(short_channel_id: bigint, is_perma } // struct LDKNetworkUpdate NetworkUpdate_node_failure(struct LDKPublicKey node_id, bool is_permanent); /* @internal */ -export function NetworkUpdate_node_failure(node_id: number, is_permanent: boolean): number { +export function NetworkUpdate_node_failure(node_id: number, is_permanent: boolean): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29150,7 +29157,7 @@ export function NetworkUpdate_node_failure(node_id: number, is_permanent: boolea } // struct LDKCVec_u8Z NetworkUpdate_write(const struct LDKNetworkUpdate *NONNULL_PTR obj); /* @internal */ -export function NetworkUpdate_write(obj: number): number { +export function NetworkUpdate_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29159,7 +29166,7 @@ export function NetworkUpdate_write(obj: number): number { } // struct LDKCResult_COption_NetworkUpdateZDecodeErrorZ NetworkUpdate_read(struct LDKu8slice ser); /* @internal */ -export function NetworkUpdate_read(ser: number): number { +export function NetworkUpdate_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29168,7 +29175,7 @@ export function NetworkUpdate_read(ser: number): number { } // void P2PGossipSync_free(struct LDKP2PGossipSync this_obj); /* @internal */ -export function P2PGossipSync_free(this_obj: number): void { +export function P2PGossipSync_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29177,7 +29184,7 @@ export function P2PGossipSync_free(this_obj: number): void { } // MUST_USE_RES struct LDKP2PGossipSync P2PGossipSync_new(const struct LDKNetworkGraph *NONNULL_PTR network_graph, struct LDKCOption_AccessZ chain_access, struct LDKLogger logger); /* @internal */ -export function P2PGossipSync_new(network_graph: number, chain_access: number, logger: number): number { +export function P2PGossipSync_new(network_graph: bigint, chain_access: bigint, logger: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29186,7 +29193,7 @@ export function P2PGossipSync_new(network_graph: number, chain_access: number, l } // void P2PGossipSync_add_chain_access(struct LDKP2PGossipSync *NONNULL_PTR this_arg, struct LDKCOption_AccessZ chain_access); /* @internal */ -export function P2PGossipSync_add_chain_access(this_arg: number, chain_access: number): void { +export function P2PGossipSync_add_chain_access(this_arg: bigint, chain_access: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29195,7 +29202,7 @@ export function P2PGossipSync_add_chain_access(this_arg: number, chain_access: n } // struct LDKEventHandler NetworkGraph_as_EventHandler(const struct LDKNetworkGraph *NONNULL_PTR this_arg); /* @internal */ -export function NetworkGraph_as_EventHandler(this_arg: number): number { +export function NetworkGraph_as_EventHandler(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29204,7 +29211,7 @@ export function NetworkGraph_as_EventHandler(this_arg: number): number { } // struct LDKRoutingMessageHandler P2PGossipSync_as_RoutingMessageHandler(const struct LDKP2PGossipSync *NONNULL_PTR this_arg); /* @internal */ -export function P2PGossipSync_as_RoutingMessageHandler(this_arg: number): number { +export function P2PGossipSync_as_RoutingMessageHandler(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29213,7 +29220,7 @@ export function P2PGossipSync_as_RoutingMessageHandler(this_arg: number): number } // struct LDKMessageSendEventsProvider P2PGossipSync_as_MessageSendEventsProvider(const struct LDKP2PGossipSync *NONNULL_PTR this_arg); /* @internal */ -export function P2PGossipSync_as_MessageSendEventsProvider(this_arg: number): number { +export function P2PGossipSync_as_MessageSendEventsProvider(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29222,7 +29229,7 @@ export function P2PGossipSync_as_MessageSendEventsProvider(this_arg: number): nu } // void ChannelUpdateInfo_free(struct LDKChannelUpdateInfo this_obj); /* @internal */ -export function ChannelUpdateInfo_free(this_obj: number): void { +export function ChannelUpdateInfo_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29231,7 +29238,7 @@ export function ChannelUpdateInfo_free(this_obj: number): void { } // uint32_t ChannelUpdateInfo_get_last_update(const struct LDKChannelUpdateInfo *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelUpdateInfo_get_last_update(this_ptr: number): number { +export function ChannelUpdateInfo_get_last_update(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29240,7 +29247,7 @@ export function ChannelUpdateInfo_get_last_update(this_ptr: number): number { } // void ChannelUpdateInfo_set_last_update(struct LDKChannelUpdateInfo *NONNULL_PTR this_ptr, uint32_t val); /* @internal */ -export function ChannelUpdateInfo_set_last_update(this_ptr: number, val: number): void { +export function ChannelUpdateInfo_set_last_update(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29249,7 +29256,7 @@ export function ChannelUpdateInfo_set_last_update(this_ptr: number, val: number) } // bool ChannelUpdateInfo_get_enabled(const struct LDKChannelUpdateInfo *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelUpdateInfo_get_enabled(this_ptr: number): boolean { +export function ChannelUpdateInfo_get_enabled(this_ptr: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29258,7 +29265,7 @@ export function ChannelUpdateInfo_get_enabled(this_ptr: number): boolean { } // void ChannelUpdateInfo_set_enabled(struct LDKChannelUpdateInfo *NONNULL_PTR this_ptr, bool val); /* @internal */ -export function ChannelUpdateInfo_set_enabled(this_ptr: number, val: boolean): void { +export function ChannelUpdateInfo_set_enabled(this_ptr: bigint, val: boolean): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29267,7 +29274,7 @@ export function ChannelUpdateInfo_set_enabled(this_ptr: number, val: boolean): v } // uint16_t ChannelUpdateInfo_get_cltv_expiry_delta(const struct LDKChannelUpdateInfo *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelUpdateInfo_get_cltv_expiry_delta(this_ptr: number): number { +export function ChannelUpdateInfo_get_cltv_expiry_delta(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29276,7 +29283,7 @@ export function ChannelUpdateInfo_get_cltv_expiry_delta(this_ptr: number): numbe } // void ChannelUpdateInfo_set_cltv_expiry_delta(struct LDKChannelUpdateInfo *NONNULL_PTR this_ptr, uint16_t val); /* @internal */ -export function ChannelUpdateInfo_set_cltv_expiry_delta(this_ptr: number, val: number): void { +export function ChannelUpdateInfo_set_cltv_expiry_delta(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29285,7 +29292,7 @@ export function ChannelUpdateInfo_set_cltv_expiry_delta(this_ptr: number, val: n } // uint64_t ChannelUpdateInfo_get_htlc_minimum_msat(const struct LDKChannelUpdateInfo *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelUpdateInfo_get_htlc_minimum_msat(this_ptr: number): bigint { +export function ChannelUpdateInfo_get_htlc_minimum_msat(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29294,7 +29301,7 @@ export function ChannelUpdateInfo_get_htlc_minimum_msat(this_ptr: number): bigin } // void ChannelUpdateInfo_set_htlc_minimum_msat(struct LDKChannelUpdateInfo *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function ChannelUpdateInfo_set_htlc_minimum_msat(this_ptr: number, val: bigint): void { +export function ChannelUpdateInfo_set_htlc_minimum_msat(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29303,7 +29310,7 @@ export function ChannelUpdateInfo_set_htlc_minimum_msat(this_ptr: number, val: b } // uint64_t ChannelUpdateInfo_get_htlc_maximum_msat(const struct LDKChannelUpdateInfo *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelUpdateInfo_get_htlc_maximum_msat(this_ptr: number): bigint { +export function ChannelUpdateInfo_get_htlc_maximum_msat(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29312,7 +29319,7 @@ export function ChannelUpdateInfo_get_htlc_maximum_msat(this_ptr: number): bigin } // void ChannelUpdateInfo_set_htlc_maximum_msat(struct LDKChannelUpdateInfo *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function ChannelUpdateInfo_set_htlc_maximum_msat(this_ptr: number, val: bigint): void { +export function ChannelUpdateInfo_set_htlc_maximum_msat(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29321,7 +29328,7 @@ export function ChannelUpdateInfo_set_htlc_maximum_msat(this_ptr: number, val: b } // struct LDKRoutingFees ChannelUpdateInfo_get_fees(const struct LDKChannelUpdateInfo *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelUpdateInfo_get_fees(this_ptr: number): number { +export function ChannelUpdateInfo_get_fees(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29330,7 +29337,7 @@ export function ChannelUpdateInfo_get_fees(this_ptr: number): number { } // void ChannelUpdateInfo_set_fees(struct LDKChannelUpdateInfo *NONNULL_PTR this_ptr, struct LDKRoutingFees val); /* @internal */ -export function ChannelUpdateInfo_set_fees(this_ptr: number, val: number): void { +export function ChannelUpdateInfo_set_fees(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29339,7 +29346,7 @@ export function ChannelUpdateInfo_set_fees(this_ptr: number, val: number): void } // struct LDKChannelUpdate ChannelUpdateInfo_get_last_update_message(const struct LDKChannelUpdateInfo *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelUpdateInfo_get_last_update_message(this_ptr: number): number { +export function ChannelUpdateInfo_get_last_update_message(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29348,7 +29355,7 @@ export function ChannelUpdateInfo_get_last_update_message(this_ptr: number): num } // void ChannelUpdateInfo_set_last_update_message(struct LDKChannelUpdateInfo *NONNULL_PTR this_ptr, struct LDKChannelUpdate val); /* @internal */ -export function ChannelUpdateInfo_set_last_update_message(this_ptr: number, val: number): void { +export function ChannelUpdateInfo_set_last_update_message(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29357,16 +29364,16 @@ export function ChannelUpdateInfo_set_last_update_message(this_ptr: number, val: } // MUST_USE_RES struct LDKChannelUpdateInfo ChannelUpdateInfo_new(uint32_t last_update_arg, bool enabled_arg, uint16_t cltv_expiry_delta_arg, uint64_t htlc_minimum_msat_arg, uint64_t htlc_maximum_msat_arg, struct LDKRoutingFees fees_arg, struct LDKChannelUpdate last_update_message_arg); /* @internal */ -export function ChannelUpdateInfo_new(last_update_arg: number, enabled_arg: boolean, cltv_expiry_delta_arg: number, htlc_minimum_msat_arg: bigint, htlc_maximum_msat_arg: bigint, fees_arg: number, last_update_message_arg: number): number { +export function ChannelUpdateInfo_new(last_update_arg: number, enabled_arg: boolean, cltv_expiry_delta_arg: number, htlc_minimum_msat_arg: bigint, htlc_maximum_msat_arg: bigint, fees_arg: bigint, last_update_message_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_ChannelUpdateInfo_new(last_update_arg, enabled_arg, cltv_expiry_delta_arg, htlc_minimum_msat_arg, htlc_maximum_msat_arg, fees_arg, last_update_message_arg); return nativeResponseValue; } - // uintptr_t ChannelUpdateInfo_clone_ptr(LDKChannelUpdateInfo *NONNULL_PTR arg); + // uint64_t ChannelUpdateInfo_clone_ptr(LDKChannelUpdateInfo *NONNULL_PTR arg); /* @internal */ -export function ChannelUpdateInfo_clone_ptr(arg: number): number { +export function ChannelUpdateInfo_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29375,7 +29382,7 @@ export function ChannelUpdateInfo_clone_ptr(arg: number): number { } // struct LDKChannelUpdateInfo ChannelUpdateInfo_clone(const struct LDKChannelUpdateInfo *NONNULL_PTR orig); /* @internal */ -export function ChannelUpdateInfo_clone(orig: number): number { +export function ChannelUpdateInfo_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29384,7 +29391,7 @@ export function ChannelUpdateInfo_clone(orig: number): number { } // struct LDKCVec_u8Z ChannelUpdateInfo_write(const struct LDKChannelUpdateInfo *NONNULL_PTR obj); /* @internal */ -export function ChannelUpdateInfo_write(obj: number): number { +export function ChannelUpdateInfo_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29393,7 +29400,7 @@ export function ChannelUpdateInfo_write(obj: number): number { } // struct LDKCResult_ChannelUpdateInfoDecodeErrorZ ChannelUpdateInfo_read(struct LDKu8slice ser); /* @internal */ -export function ChannelUpdateInfo_read(ser: number): number { +export function ChannelUpdateInfo_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29402,7 +29409,7 @@ export function ChannelUpdateInfo_read(ser: number): number { } // void ChannelInfo_free(struct LDKChannelInfo this_obj); /* @internal */ -export function ChannelInfo_free(this_obj: number): void { +export function ChannelInfo_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29411,7 +29418,7 @@ export function ChannelInfo_free(this_obj: number): void { } // struct LDKChannelFeatures ChannelInfo_get_features(const struct LDKChannelInfo *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelInfo_get_features(this_ptr: number): number { +export function ChannelInfo_get_features(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29420,7 +29427,7 @@ export function ChannelInfo_get_features(this_ptr: number): number { } // void ChannelInfo_set_features(struct LDKChannelInfo *NONNULL_PTR this_ptr, struct LDKChannelFeatures val); /* @internal */ -export function ChannelInfo_set_features(this_ptr: number, val: number): void { +export function ChannelInfo_set_features(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29429,7 +29436,7 @@ export function ChannelInfo_set_features(this_ptr: number, val: number): void { } // struct LDKNodeId ChannelInfo_get_node_one(const struct LDKChannelInfo *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelInfo_get_node_one(this_ptr: number): number { +export function ChannelInfo_get_node_one(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29438,7 +29445,7 @@ export function ChannelInfo_get_node_one(this_ptr: number): number { } // void ChannelInfo_set_node_one(struct LDKChannelInfo *NONNULL_PTR this_ptr, struct LDKNodeId val); /* @internal */ -export function ChannelInfo_set_node_one(this_ptr: number, val: number): void { +export function ChannelInfo_set_node_one(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29447,7 +29454,7 @@ export function ChannelInfo_set_node_one(this_ptr: number, val: number): void { } // struct LDKChannelUpdateInfo ChannelInfo_get_one_to_two(const struct LDKChannelInfo *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelInfo_get_one_to_two(this_ptr: number): number { +export function ChannelInfo_get_one_to_two(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29456,7 +29463,7 @@ export function ChannelInfo_get_one_to_two(this_ptr: number): number { } // void ChannelInfo_set_one_to_two(struct LDKChannelInfo *NONNULL_PTR this_ptr, struct LDKChannelUpdateInfo val); /* @internal */ -export function ChannelInfo_set_one_to_two(this_ptr: number, val: number): void { +export function ChannelInfo_set_one_to_two(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29465,7 +29472,7 @@ export function ChannelInfo_set_one_to_two(this_ptr: number, val: number): void } // struct LDKNodeId ChannelInfo_get_node_two(const struct LDKChannelInfo *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelInfo_get_node_two(this_ptr: number): number { +export function ChannelInfo_get_node_two(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29474,7 +29481,7 @@ export function ChannelInfo_get_node_two(this_ptr: number): number { } // void ChannelInfo_set_node_two(struct LDKChannelInfo *NONNULL_PTR this_ptr, struct LDKNodeId val); /* @internal */ -export function ChannelInfo_set_node_two(this_ptr: number, val: number): void { +export function ChannelInfo_set_node_two(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29483,7 +29490,7 @@ export function ChannelInfo_set_node_two(this_ptr: number, val: number): void { } // struct LDKChannelUpdateInfo ChannelInfo_get_two_to_one(const struct LDKChannelInfo *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelInfo_get_two_to_one(this_ptr: number): number { +export function ChannelInfo_get_two_to_one(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29492,7 +29499,7 @@ export function ChannelInfo_get_two_to_one(this_ptr: number): number { } // void ChannelInfo_set_two_to_one(struct LDKChannelInfo *NONNULL_PTR this_ptr, struct LDKChannelUpdateInfo val); /* @internal */ -export function ChannelInfo_set_two_to_one(this_ptr: number, val: number): void { +export function ChannelInfo_set_two_to_one(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29501,7 +29508,7 @@ export function ChannelInfo_set_two_to_one(this_ptr: number, val: number): void } // struct LDKCOption_u64Z ChannelInfo_get_capacity_sats(const struct LDKChannelInfo *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelInfo_get_capacity_sats(this_ptr: number): number { +export function ChannelInfo_get_capacity_sats(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29510,7 +29517,7 @@ export function ChannelInfo_get_capacity_sats(this_ptr: number): number { } // void ChannelInfo_set_capacity_sats(struct LDKChannelInfo *NONNULL_PTR this_ptr, struct LDKCOption_u64Z val); /* @internal */ -export function ChannelInfo_set_capacity_sats(this_ptr: number, val: number): void { +export function ChannelInfo_set_capacity_sats(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29519,7 +29526,7 @@ export function ChannelInfo_set_capacity_sats(this_ptr: number, val: number): vo } // struct LDKChannelAnnouncement ChannelInfo_get_announcement_message(const struct LDKChannelInfo *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelInfo_get_announcement_message(this_ptr: number): number { +export function ChannelInfo_get_announcement_message(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29528,16 +29535,16 @@ export function ChannelInfo_get_announcement_message(this_ptr: number): number { } // void ChannelInfo_set_announcement_message(struct LDKChannelInfo *NONNULL_PTR this_ptr, struct LDKChannelAnnouncement val); /* @internal */ -export function ChannelInfo_set_announcement_message(this_ptr: number, val: number): void { +export function ChannelInfo_set_announcement_message(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_ChannelInfo_set_announcement_message(this_ptr, val); // debug statements here } - // uintptr_t ChannelInfo_clone_ptr(LDKChannelInfo *NONNULL_PTR arg); + // uint64_t ChannelInfo_clone_ptr(LDKChannelInfo *NONNULL_PTR arg); /* @internal */ -export function ChannelInfo_clone_ptr(arg: number): number { +export function ChannelInfo_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29546,7 +29553,7 @@ export function ChannelInfo_clone_ptr(arg: number): number { } // struct LDKChannelInfo ChannelInfo_clone(const struct LDKChannelInfo *NONNULL_PTR orig); /* @internal */ -export function ChannelInfo_clone(orig: number): number { +export function ChannelInfo_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29555,7 +29562,7 @@ export function ChannelInfo_clone(orig: number): number { } // MUST_USE_RES struct LDKChannelUpdateInfo ChannelInfo_get_directional_info(const struct LDKChannelInfo *NONNULL_PTR this_arg, uint8_t channel_flags); /* @internal */ -export function ChannelInfo_get_directional_info(this_arg: number, channel_flags: number): number { +export function ChannelInfo_get_directional_info(this_arg: bigint, channel_flags: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29564,7 +29571,7 @@ export function ChannelInfo_get_directional_info(this_arg: number, channel_flags } // struct LDKCVec_u8Z ChannelInfo_write(const struct LDKChannelInfo *NONNULL_PTR obj); /* @internal */ -export function ChannelInfo_write(obj: number): number { +export function ChannelInfo_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29573,7 +29580,7 @@ export function ChannelInfo_write(obj: number): number { } // struct LDKCResult_ChannelInfoDecodeErrorZ ChannelInfo_read(struct LDKu8slice ser); /* @internal */ -export function ChannelInfo_read(ser: number): number { +export function ChannelInfo_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29582,16 +29589,16 @@ export function ChannelInfo_read(ser: number): number { } // void DirectedChannelInfo_free(struct LDKDirectedChannelInfo this_obj); /* @internal */ -export function DirectedChannelInfo_free(this_obj: number): void { +export function DirectedChannelInfo_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_DirectedChannelInfo_free(this_obj); // debug statements here } - // uintptr_t DirectedChannelInfo_clone_ptr(LDKDirectedChannelInfo *NONNULL_PTR arg); + // uint64_t DirectedChannelInfo_clone_ptr(LDKDirectedChannelInfo *NONNULL_PTR arg); /* @internal */ -export function DirectedChannelInfo_clone_ptr(arg: number): number { +export function DirectedChannelInfo_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29600,7 +29607,7 @@ export function DirectedChannelInfo_clone_ptr(arg: number): number { } // struct LDKDirectedChannelInfo DirectedChannelInfo_clone(const struct LDKDirectedChannelInfo *NONNULL_PTR orig); /* @internal */ -export function DirectedChannelInfo_clone(orig: number): number { +export function DirectedChannelInfo_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29609,7 +29616,7 @@ export function DirectedChannelInfo_clone(orig: number): number { } // MUST_USE_RES struct LDKChannelInfo DirectedChannelInfo_channel(const struct LDKDirectedChannelInfo *NONNULL_PTR this_arg); /* @internal */ -export function DirectedChannelInfo_channel(this_arg: number): number { +export function DirectedChannelInfo_channel(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29618,7 +29625,7 @@ export function DirectedChannelInfo_channel(this_arg: number): number { } // MUST_USE_RES struct LDKChannelUpdateInfo DirectedChannelInfo_direction(const struct LDKDirectedChannelInfo *NONNULL_PTR this_arg); /* @internal */ -export function DirectedChannelInfo_direction(this_arg: number): number { +export function DirectedChannelInfo_direction(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29627,7 +29634,7 @@ export function DirectedChannelInfo_direction(this_arg: number): number { } // MUST_USE_RES uint64_t DirectedChannelInfo_htlc_maximum_msat(const struct LDKDirectedChannelInfo *NONNULL_PTR this_arg); /* @internal */ -export function DirectedChannelInfo_htlc_maximum_msat(this_arg: number): bigint { +export function DirectedChannelInfo_htlc_maximum_msat(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29636,7 +29643,7 @@ export function DirectedChannelInfo_htlc_maximum_msat(this_arg: number): bigint } // MUST_USE_RES struct LDKEffectiveCapacity DirectedChannelInfo_effective_capacity(const struct LDKDirectedChannelInfo *NONNULL_PTR this_arg); /* @internal */ -export function DirectedChannelInfo_effective_capacity(this_arg: number): number { +export function DirectedChannelInfo_effective_capacity(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29645,16 +29652,16 @@ export function DirectedChannelInfo_effective_capacity(this_arg: number): number } // void EffectiveCapacity_free(struct LDKEffectiveCapacity this_ptr); /* @internal */ -export function EffectiveCapacity_free(this_ptr: number): void { +export function EffectiveCapacity_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_EffectiveCapacity_free(this_ptr); // debug statements here } - // uintptr_t EffectiveCapacity_clone_ptr(LDKEffectiveCapacity *NONNULL_PTR arg); + // uint64_t EffectiveCapacity_clone_ptr(LDKEffectiveCapacity *NONNULL_PTR arg); /* @internal */ -export function EffectiveCapacity_clone_ptr(arg: number): number { +export function EffectiveCapacity_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29663,7 +29670,7 @@ export function EffectiveCapacity_clone_ptr(arg: number): number { } // struct LDKEffectiveCapacity EffectiveCapacity_clone(const struct LDKEffectiveCapacity *NONNULL_PTR orig); /* @internal */ -export function EffectiveCapacity_clone(orig: number): number { +export function EffectiveCapacity_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29672,7 +29679,7 @@ export function EffectiveCapacity_clone(orig: number): number { } // struct LDKEffectiveCapacity EffectiveCapacity_exact_liquidity(uint64_t liquidity_msat); /* @internal */ -export function EffectiveCapacity_exact_liquidity(liquidity_msat: bigint): number { +export function EffectiveCapacity_exact_liquidity(liquidity_msat: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29681,7 +29688,7 @@ export function EffectiveCapacity_exact_liquidity(liquidity_msat: bigint): numbe } // struct LDKEffectiveCapacity EffectiveCapacity_maximum_htlc(uint64_t amount_msat); /* @internal */ -export function EffectiveCapacity_maximum_htlc(amount_msat: bigint): number { +export function EffectiveCapacity_maximum_htlc(amount_msat: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29690,7 +29697,7 @@ export function EffectiveCapacity_maximum_htlc(amount_msat: bigint): number { } // struct LDKEffectiveCapacity EffectiveCapacity_total(uint64_t capacity_msat, struct LDKCOption_u64Z htlc_maximum_msat); /* @internal */ -export function EffectiveCapacity_total(capacity_msat: bigint, htlc_maximum_msat: number): number { +export function EffectiveCapacity_total(capacity_msat: bigint, htlc_maximum_msat: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29699,7 +29706,7 @@ export function EffectiveCapacity_total(capacity_msat: bigint, htlc_maximum_msat } // struct LDKEffectiveCapacity EffectiveCapacity_infinite(void); /* @internal */ -export function EffectiveCapacity_infinite(): number { +export function EffectiveCapacity_infinite(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29708,7 +29715,7 @@ export function EffectiveCapacity_infinite(): number { } // struct LDKEffectiveCapacity EffectiveCapacity_unknown(void); /* @internal */ -export function EffectiveCapacity_unknown(): number { +export function EffectiveCapacity_unknown(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29717,7 +29724,7 @@ export function EffectiveCapacity_unknown(): number { } // MUST_USE_RES uint64_t EffectiveCapacity_as_msat(const struct LDKEffectiveCapacity *NONNULL_PTR this_arg); /* @internal */ -export function EffectiveCapacity_as_msat(this_arg: number): bigint { +export function EffectiveCapacity_as_msat(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29726,7 +29733,7 @@ export function EffectiveCapacity_as_msat(this_arg: number): bigint { } // void RoutingFees_free(struct LDKRoutingFees this_obj); /* @internal */ -export function RoutingFees_free(this_obj: number): void { +export function RoutingFees_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29735,7 +29742,7 @@ export function RoutingFees_free(this_obj: number): void { } // uint32_t RoutingFees_get_base_msat(const struct LDKRoutingFees *NONNULL_PTR this_ptr); /* @internal */ -export function RoutingFees_get_base_msat(this_ptr: number): number { +export function RoutingFees_get_base_msat(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29744,7 +29751,7 @@ export function RoutingFees_get_base_msat(this_ptr: number): number { } // void RoutingFees_set_base_msat(struct LDKRoutingFees *NONNULL_PTR this_ptr, uint32_t val); /* @internal */ -export function RoutingFees_set_base_msat(this_ptr: number, val: number): void { +export function RoutingFees_set_base_msat(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29753,7 +29760,7 @@ export function RoutingFees_set_base_msat(this_ptr: number, val: number): void { } // uint32_t RoutingFees_get_proportional_millionths(const struct LDKRoutingFees *NONNULL_PTR this_ptr); /* @internal */ -export function RoutingFees_get_proportional_millionths(this_ptr: number): number { +export function RoutingFees_get_proportional_millionths(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29762,7 +29769,7 @@ export function RoutingFees_get_proportional_millionths(this_ptr: number): numbe } // void RoutingFees_set_proportional_millionths(struct LDKRoutingFees *NONNULL_PTR this_ptr, uint32_t val); /* @internal */ -export function RoutingFees_set_proportional_millionths(this_ptr: number, val: number): void { +export function RoutingFees_set_proportional_millionths(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29771,7 +29778,7 @@ export function RoutingFees_set_proportional_millionths(this_ptr: number, val: n } // MUST_USE_RES struct LDKRoutingFees RoutingFees_new(uint32_t base_msat_arg, uint32_t proportional_millionths_arg); /* @internal */ -export function RoutingFees_new(base_msat_arg: number, proportional_millionths_arg: number): number { +export function RoutingFees_new(base_msat_arg: number, proportional_millionths_arg: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29780,16 +29787,16 @@ export function RoutingFees_new(base_msat_arg: number, proportional_millionths_a } // bool RoutingFees_eq(const struct LDKRoutingFees *NONNULL_PTR a, const struct LDKRoutingFees *NONNULL_PTR b); /* @internal */ -export function RoutingFees_eq(a: number, b: number): boolean { +export function RoutingFees_eq(a: bigint, b: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_RoutingFees_eq(a, b); return nativeResponseValue; } - // uintptr_t RoutingFees_clone_ptr(LDKRoutingFees *NONNULL_PTR arg); + // uint64_t RoutingFees_clone_ptr(LDKRoutingFees *NONNULL_PTR arg); /* @internal */ -export function RoutingFees_clone_ptr(arg: number): number { +export function RoutingFees_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29798,7 +29805,7 @@ export function RoutingFees_clone_ptr(arg: number): number { } // struct LDKRoutingFees RoutingFees_clone(const struct LDKRoutingFees *NONNULL_PTR orig); /* @internal */ -export function RoutingFees_clone(orig: number): number { +export function RoutingFees_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29807,7 +29814,7 @@ export function RoutingFees_clone(orig: number): number { } // uint64_t RoutingFees_hash(const struct LDKRoutingFees *NONNULL_PTR o); /* @internal */ -export function RoutingFees_hash(o: number): bigint { +export function RoutingFees_hash(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29816,7 +29823,7 @@ export function RoutingFees_hash(o: number): bigint { } // struct LDKCVec_u8Z RoutingFees_write(const struct LDKRoutingFees *NONNULL_PTR obj); /* @internal */ -export function RoutingFees_write(obj: number): number { +export function RoutingFees_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29825,7 +29832,7 @@ export function RoutingFees_write(obj: number): number { } // struct LDKCResult_RoutingFeesDecodeErrorZ RoutingFees_read(struct LDKu8slice ser); /* @internal */ -export function RoutingFees_read(ser: number): number { +export function RoutingFees_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29834,7 +29841,7 @@ export function RoutingFees_read(ser: number): number { } // void NodeAnnouncementInfo_free(struct LDKNodeAnnouncementInfo this_obj); /* @internal */ -export function NodeAnnouncementInfo_free(this_obj: number): void { +export function NodeAnnouncementInfo_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29843,7 +29850,7 @@ export function NodeAnnouncementInfo_free(this_obj: number): void { } // struct LDKNodeFeatures NodeAnnouncementInfo_get_features(const struct LDKNodeAnnouncementInfo *NONNULL_PTR this_ptr); /* @internal */ -export function NodeAnnouncementInfo_get_features(this_ptr: number): number { +export function NodeAnnouncementInfo_get_features(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29852,7 +29859,7 @@ export function NodeAnnouncementInfo_get_features(this_ptr: number): number { } // void NodeAnnouncementInfo_set_features(struct LDKNodeAnnouncementInfo *NONNULL_PTR this_ptr, struct LDKNodeFeatures val); /* @internal */ -export function NodeAnnouncementInfo_set_features(this_ptr: number, val: number): void { +export function NodeAnnouncementInfo_set_features(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29861,7 +29868,7 @@ export function NodeAnnouncementInfo_set_features(this_ptr: number, val: number) } // uint32_t NodeAnnouncementInfo_get_last_update(const struct LDKNodeAnnouncementInfo *NONNULL_PTR this_ptr); /* @internal */ -export function NodeAnnouncementInfo_get_last_update(this_ptr: number): number { +export function NodeAnnouncementInfo_get_last_update(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29870,7 +29877,7 @@ export function NodeAnnouncementInfo_get_last_update(this_ptr: number): number { } // void NodeAnnouncementInfo_set_last_update(struct LDKNodeAnnouncementInfo *NONNULL_PTR this_ptr, uint32_t val); /* @internal */ -export function NodeAnnouncementInfo_set_last_update(this_ptr: number, val: number): void { +export function NodeAnnouncementInfo_set_last_update(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29879,7 +29886,7 @@ export function NodeAnnouncementInfo_set_last_update(this_ptr: number, val: numb } // const uint8_t (*NodeAnnouncementInfo_get_rgb(const struct LDKNodeAnnouncementInfo *NONNULL_PTR this_ptr))[3]; /* @internal */ -export function NodeAnnouncementInfo_get_rgb(this_ptr: number): number { +export function NodeAnnouncementInfo_get_rgb(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29888,7 +29895,7 @@ export function NodeAnnouncementInfo_get_rgb(this_ptr: number): number { } // void NodeAnnouncementInfo_set_rgb(struct LDKNodeAnnouncementInfo *NONNULL_PTR this_ptr, struct LDKThreeBytes val); /* @internal */ -export function NodeAnnouncementInfo_set_rgb(this_ptr: number, val: number): void { +export function NodeAnnouncementInfo_set_rgb(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29897,7 +29904,7 @@ export function NodeAnnouncementInfo_set_rgb(this_ptr: number, val: number): voi } // struct LDKNodeAlias NodeAnnouncementInfo_get_alias(const struct LDKNodeAnnouncementInfo *NONNULL_PTR this_ptr); /* @internal */ -export function NodeAnnouncementInfo_get_alias(this_ptr: number): number { +export function NodeAnnouncementInfo_get_alias(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29906,7 +29913,7 @@ export function NodeAnnouncementInfo_get_alias(this_ptr: number): number { } // void NodeAnnouncementInfo_set_alias(struct LDKNodeAnnouncementInfo *NONNULL_PTR this_ptr, struct LDKNodeAlias val); /* @internal */ -export function NodeAnnouncementInfo_set_alias(this_ptr: number, val: number): void { +export function NodeAnnouncementInfo_set_alias(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29915,7 +29922,7 @@ export function NodeAnnouncementInfo_set_alias(this_ptr: number, val: number): v } // struct LDKCVec_NetAddressZ NodeAnnouncementInfo_get_addresses(const struct LDKNodeAnnouncementInfo *NONNULL_PTR this_ptr); /* @internal */ -export function NodeAnnouncementInfo_get_addresses(this_ptr: number): number { +export function NodeAnnouncementInfo_get_addresses(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29924,7 +29931,7 @@ export function NodeAnnouncementInfo_get_addresses(this_ptr: number): number { } // void NodeAnnouncementInfo_set_addresses(struct LDKNodeAnnouncementInfo *NONNULL_PTR this_ptr, struct LDKCVec_NetAddressZ val); /* @internal */ -export function NodeAnnouncementInfo_set_addresses(this_ptr: number, val: number): void { +export function NodeAnnouncementInfo_set_addresses(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29933,7 +29940,7 @@ export function NodeAnnouncementInfo_set_addresses(this_ptr: number, val: number } // struct LDKNodeAnnouncement NodeAnnouncementInfo_get_announcement_message(const struct LDKNodeAnnouncementInfo *NONNULL_PTR this_ptr); /* @internal */ -export function NodeAnnouncementInfo_get_announcement_message(this_ptr: number): number { +export function NodeAnnouncementInfo_get_announcement_message(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29942,7 +29949,7 @@ export function NodeAnnouncementInfo_get_announcement_message(this_ptr: number): } // void NodeAnnouncementInfo_set_announcement_message(struct LDKNodeAnnouncementInfo *NONNULL_PTR this_ptr, struct LDKNodeAnnouncement val); /* @internal */ -export function NodeAnnouncementInfo_set_announcement_message(this_ptr: number, val: number): void { +export function NodeAnnouncementInfo_set_announcement_message(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29951,16 +29958,16 @@ export function NodeAnnouncementInfo_set_announcement_message(this_ptr: number, } // MUST_USE_RES struct LDKNodeAnnouncementInfo NodeAnnouncementInfo_new(struct LDKNodeFeatures features_arg, uint32_t last_update_arg, struct LDKThreeBytes rgb_arg, struct LDKNodeAlias alias_arg, struct LDKCVec_NetAddressZ addresses_arg, struct LDKNodeAnnouncement announcement_message_arg); /* @internal */ -export function NodeAnnouncementInfo_new(features_arg: number, last_update_arg: number, rgb_arg: number, alias_arg: number, addresses_arg: number, announcement_message_arg: number): number { +export function NodeAnnouncementInfo_new(features_arg: bigint, last_update_arg: number, rgb_arg: number, alias_arg: bigint, addresses_arg: number, announcement_message_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_NodeAnnouncementInfo_new(features_arg, last_update_arg, rgb_arg, alias_arg, addresses_arg, announcement_message_arg); return nativeResponseValue; } - // uintptr_t NodeAnnouncementInfo_clone_ptr(LDKNodeAnnouncementInfo *NONNULL_PTR arg); + // uint64_t NodeAnnouncementInfo_clone_ptr(LDKNodeAnnouncementInfo *NONNULL_PTR arg); /* @internal */ -export function NodeAnnouncementInfo_clone_ptr(arg: number): number { +export function NodeAnnouncementInfo_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29969,7 +29976,7 @@ export function NodeAnnouncementInfo_clone_ptr(arg: number): number { } // struct LDKNodeAnnouncementInfo NodeAnnouncementInfo_clone(const struct LDKNodeAnnouncementInfo *NONNULL_PTR orig); /* @internal */ -export function NodeAnnouncementInfo_clone(orig: number): number { +export function NodeAnnouncementInfo_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29978,7 +29985,7 @@ export function NodeAnnouncementInfo_clone(orig: number): number { } // struct LDKCVec_u8Z NodeAnnouncementInfo_write(const struct LDKNodeAnnouncementInfo *NONNULL_PTR obj); /* @internal */ -export function NodeAnnouncementInfo_write(obj: number): number { +export function NodeAnnouncementInfo_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29987,7 +29994,7 @@ export function NodeAnnouncementInfo_write(obj: number): number { } // struct LDKCResult_NodeAnnouncementInfoDecodeErrorZ NodeAnnouncementInfo_read(struct LDKu8slice ser); /* @internal */ -export function NodeAnnouncementInfo_read(ser: number): number { +export function NodeAnnouncementInfo_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -29996,7 +30003,7 @@ export function NodeAnnouncementInfo_read(ser: number): number { } // void NodeAlias_free(struct LDKNodeAlias this_obj); /* @internal */ -export function NodeAlias_free(this_obj: number): void { +export function NodeAlias_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30005,7 +30012,7 @@ export function NodeAlias_free(this_obj: number): void { } // const uint8_t (*NodeAlias_get_a(const struct LDKNodeAlias *NONNULL_PTR this_ptr))[32]; /* @internal */ -export function NodeAlias_get_a(this_ptr: number): number { +export function NodeAlias_get_a(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30014,7 +30021,7 @@ export function NodeAlias_get_a(this_ptr: number): number { } // void NodeAlias_set_a(struct LDKNodeAlias *NONNULL_PTR this_ptr, struct LDKThirtyTwoBytes val); /* @internal */ -export function NodeAlias_set_a(this_ptr: number, val: number): void { +export function NodeAlias_set_a(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30023,16 +30030,16 @@ export function NodeAlias_set_a(this_ptr: number, val: number): void { } // MUST_USE_RES struct LDKNodeAlias NodeAlias_new(struct LDKThirtyTwoBytes a_arg); /* @internal */ -export function NodeAlias_new(a_arg: number): number { +export function NodeAlias_new(a_arg: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_NodeAlias_new(a_arg); return nativeResponseValue; } - // uintptr_t NodeAlias_clone_ptr(LDKNodeAlias *NONNULL_PTR arg); + // uint64_t NodeAlias_clone_ptr(LDKNodeAlias *NONNULL_PTR arg); /* @internal */ -export function NodeAlias_clone_ptr(arg: number): number { +export function NodeAlias_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30041,7 +30048,7 @@ export function NodeAlias_clone_ptr(arg: number): number { } // struct LDKNodeAlias NodeAlias_clone(const struct LDKNodeAlias *NONNULL_PTR orig); /* @internal */ -export function NodeAlias_clone(orig: number): number { +export function NodeAlias_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30050,7 +30057,7 @@ export function NodeAlias_clone(orig: number): number { } // struct LDKCVec_u8Z NodeAlias_write(const struct LDKNodeAlias *NONNULL_PTR obj); /* @internal */ -export function NodeAlias_write(obj: number): number { +export function NodeAlias_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30059,7 +30066,7 @@ export function NodeAlias_write(obj: number): number { } // struct LDKCResult_NodeAliasDecodeErrorZ NodeAlias_read(struct LDKu8slice ser); /* @internal */ -export function NodeAlias_read(ser: number): number { +export function NodeAlias_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30068,7 +30075,7 @@ export function NodeAlias_read(ser: number): number { } // void NodeInfo_free(struct LDKNodeInfo this_obj); /* @internal */ -export function NodeInfo_free(this_obj: number): void { +export function NodeInfo_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30077,7 +30084,7 @@ export function NodeInfo_free(this_obj: number): void { } // struct LDKCVec_u64Z NodeInfo_get_channels(const struct LDKNodeInfo *NONNULL_PTR this_ptr); /* @internal */ -export function NodeInfo_get_channels(this_ptr: number): number { +export function NodeInfo_get_channels(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30086,7 +30093,7 @@ export function NodeInfo_get_channels(this_ptr: number): number { } // void NodeInfo_set_channels(struct LDKNodeInfo *NONNULL_PTR this_ptr, struct LDKCVec_u64Z val); /* @internal */ -export function NodeInfo_set_channels(this_ptr: number, val: number): void { +export function NodeInfo_set_channels(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30095,7 +30102,7 @@ export function NodeInfo_set_channels(this_ptr: number, val: number): void { } // struct LDKRoutingFees NodeInfo_get_lowest_inbound_channel_fees(const struct LDKNodeInfo *NONNULL_PTR this_ptr); /* @internal */ -export function NodeInfo_get_lowest_inbound_channel_fees(this_ptr: number): number { +export function NodeInfo_get_lowest_inbound_channel_fees(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30104,7 +30111,7 @@ export function NodeInfo_get_lowest_inbound_channel_fees(this_ptr: number): numb } // void NodeInfo_set_lowest_inbound_channel_fees(struct LDKNodeInfo *NONNULL_PTR this_ptr, struct LDKRoutingFees val); /* @internal */ -export function NodeInfo_set_lowest_inbound_channel_fees(this_ptr: number, val: number): void { +export function NodeInfo_set_lowest_inbound_channel_fees(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30113,7 +30120,7 @@ export function NodeInfo_set_lowest_inbound_channel_fees(this_ptr: number, val: } // struct LDKNodeAnnouncementInfo NodeInfo_get_announcement_info(const struct LDKNodeInfo *NONNULL_PTR this_ptr); /* @internal */ -export function NodeInfo_get_announcement_info(this_ptr: number): number { +export function NodeInfo_get_announcement_info(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30122,7 +30129,7 @@ export function NodeInfo_get_announcement_info(this_ptr: number): number { } // void NodeInfo_set_announcement_info(struct LDKNodeInfo *NONNULL_PTR this_ptr, struct LDKNodeAnnouncementInfo val); /* @internal */ -export function NodeInfo_set_announcement_info(this_ptr: number, val: number): void { +export function NodeInfo_set_announcement_info(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30131,16 +30138,16 @@ export function NodeInfo_set_announcement_info(this_ptr: number, val: number): v } // MUST_USE_RES struct LDKNodeInfo NodeInfo_new(struct LDKCVec_u64Z channels_arg, struct LDKRoutingFees lowest_inbound_channel_fees_arg, struct LDKNodeAnnouncementInfo announcement_info_arg); /* @internal */ -export function NodeInfo_new(channels_arg: number, lowest_inbound_channel_fees_arg: number, announcement_info_arg: number): number { +export function NodeInfo_new(channels_arg: number, lowest_inbound_channel_fees_arg: bigint, announcement_info_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_NodeInfo_new(channels_arg, lowest_inbound_channel_fees_arg, announcement_info_arg); return nativeResponseValue; } - // uintptr_t NodeInfo_clone_ptr(LDKNodeInfo *NONNULL_PTR arg); + // uint64_t NodeInfo_clone_ptr(LDKNodeInfo *NONNULL_PTR arg); /* @internal */ -export function NodeInfo_clone_ptr(arg: number): number { +export function NodeInfo_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30149,7 +30156,7 @@ export function NodeInfo_clone_ptr(arg: number): number { } // struct LDKNodeInfo NodeInfo_clone(const struct LDKNodeInfo *NONNULL_PTR orig); /* @internal */ -export function NodeInfo_clone(orig: number): number { +export function NodeInfo_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30158,7 +30165,7 @@ export function NodeInfo_clone(orig: number): number { } // struct LDKCVec_u8Z NodeInfo_write(const struct LDKNodeInfo *NONNULL_PTR obj); /* @internal */ -export function NodeInfo_write(obj: number): number { +export function NodeInfo_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30167,7 +30174,7 @@ export function NodeInfo_write(obj: number): number { } // struct LDKCResult_NodeInfoDecodeErrorZ NodeInfo_read(struct LDKu8slice ser); /* @internal */ -export function NodeInfo_read(ser: number): number { +export function NodeInfo_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30176,7 +30183,7 @@ export function NodeInfo_read(ser: number): number { } // struct LDKCVec_u8Z NetworkGraph_write(const struct LDKNetworkGraph *NONNULL_PTR obj); /* @internal */ -export function NetworkGraph_write(obj: number): number { +export function NetworkGraph_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30185,7 +30192,7 @@ export function NetworkGraph_write(obj: number): number { } // struct LDKCResult_NetworkGraphDecodeErrorZ NetworkGraph_read(struct LDKu8slice ser, struct LDKLogger arg); /* @internal */ -export function NetworkGraph_read(ser: number, arg: number): number { +export function NetworkGraph_read(ser: number, arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30194,7 +30201,7 @@ export function NetworkGraph_read(ser: number, arg: number): number { } // MUST_USE_RES struct LDKNetworkGraph NetworkGraph_new(struct LDKThirtyTwoBytes genesis_hash, struct LDKLogger logger); /* @internal */ -export function NetworkGraph_new(genesis_hash: number, logger: number): number { +export function NetworkGraph_new(genesis_hash: number, logger: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30203,7 +30210,7 @@ export function NetworkGraph_new(genesis_hash: number, logger: number): number { } // MUST_USE_RES struct LDKReadOnlyNetworkGraph NetworkGraph_read_only(const struct LDKNetworkGraph *NONNULL_PTR this_arg); /* @internal */ -export function NetworkGraph_read_only(this_arg: number): number { +export function NetworkGraph_read_only(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30212,7 +30219,7 @@ export function NetworkGraph_read_only(this_arg: number): number { } // MUST_USE_RES struct LDKCOption_u32Z NetworkGraph_get_last_rapid_gossip_sync_timestamp(const struct LDKNetworkGraph *NONNULL_PTR this_arg); /* @internal */ -export function NetworkGraph_get_last_rapid_gossip_sync_timestamp(this_arg: number): number { +export function NetworkGraph_get_last_rapid_gossip_sync_timestamp(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30221,7 +30228,7 @@ export function NetworkGraph_get_last_rapid_gossip_sync_timestamp(this_arg: numb } // void NetworkGraph_set_last_rapid_gossip_sync_timestamp(const struct LDKNetworkGraph *NONNULL_PTR this_arg, uint32_t last_rapid_gossip_sync_timestamp); /* @internal */ -export function NetworkGraph_set_last_rapid_gossip_sync_timestamp(this_arg: number, last_rapid_gossip_sync_timestamp: number): void { +export function NetworkGraph_set_last_rapid_gossip_sync_timestamp(this_arg: bigint, last_rapid_gossip_sync_timestamp: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30230,7 +30237,7 @@ export function NetworkGraph_set_last_rapid_gossip_sync_timestamp(this_arg: numb } // MUST_USE_RES struct LDKCResult_NoneLightningErrorZ NetworkGraph_update_node_from_announcement(const struct LDKNetworkGraph *NONNULL_PTR this_arg, const struct LDKNodeAnnouncement *NONNULL_PTR msg); /* @internal */ -export function NetworkGraph_update_node_from_announcement(this_arg: number, msg: number): number { +export function NetworkGraph_update_node_from_announcement(this_arg: bigint, msg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30239,7 +30246,7 @@ export function NetworkGraph_update_node_from_announcement(this_arg: number, msg } // MUST_USE_RES struct LDKCResult_NoneLightningErrorZ NetworkGraph_update_node_from_unsigned_announcement(const struct LDKNetworkGraph *NONNULL_PTR this_arg, const struct LDKUnsignedNodeAnnouncement *NONNULL_PTR msg); /* @internal */ -export function NetworkGraph_update_node_from_unsigned_announcement(this_arg: number, msg: number): number { +export function NetworkGraph_update_node_from_unsigned_announcement(this_arg: bigint, msg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30248,7 +30255,7 @@ export function NetworkGraph_update_node_from_unsigned_announcement(this_arg: nu } // MUST_USE_RES struct LDKCResult_NoneLightningErrorZ NetworkGraph_update_channel_from_announcement(const struct LDKNetworkGraph *NONNULL_PTR this_arg, const struct LDKChannelAnnouncement *NONNULL_PTR msg, struct LDKCOption_AccessZ chain_access); /* @internal */ -export function NetworkGraph_update_channel_from_announcement(this_arg: number, msg: number, chain_access: number): number { +export function NetworkGraph_update_channel_from_announcement(this_arg: bigint, msg: bigint, chain_access: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30257,7 +30264,7 @@ export function NetworkGraph_update_channel_from_announcement(this_arg: number, } // MUST_USE_RES struct LDKCResult_NoneLightningErrorZ NetworkGraph_update_channel_from_unsigned_announcement(const struct LDKNetworkGraph *NONNULL_PTR this_arg, const struct LDKUnsignedChannelAnnouncement *NONNULL_PTR msg, struct LDKCOption_AccessZ chain_access); /* @internal */ -export function NetworkGraph_update_channel_from_unsigned_announcement(this_arg: number, msg: number, chain_access: number): number { +export function NetworkGraph_update_channel_from_unsigned_announcement(this_arg: bigint, msg: bigint, chain_access: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30266,7 +30273,7 @@ export function NetworkGraph_update_channel_from_unsigned_announcement(this_arg: } // MUST_USE_RES struct LDKCResult_NoneLightningErrorZ NetworkGraph_add_channel_from_partial_announcement(const struct LDKNetworkGraph *NONNULL_PTR this_arg, uint64_t short_channel_id, uint64_t timestamp, struct LDKChannelFeatures features, struct LDKPublicKey node_id_1, struct LDKPublicKey node_id_2); /* @internal */ -export function NetworkGraph_add_channel_from_partial_announcement(this_arg: number, short_channel_id: bigint, timestamp: bigint, features: number, node_id_1: number, node_id_2: number): number { +export function NetworkGraph_add_channel_from_partial_announcement(this_arg: bigint, short_channel_id: bigint, timestamp: bigint, features: bigint, node_id_1: number, node_id_2: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30275,7 +30282,7 @@ export function NetworkGraph_add_channel_from_partial_announcement(this_arg: num } // void NetworkGraph_channel_failed(const struct LDKNetworkGraph *NONNULL_PTR this_arg, uint64_t short_channel_id, bool is_permanent); /* @internal */ -export function NetworkGraph_channel_failed(this_arg: number, short_channel_id: bigint, is_permanent: boolean): void { +export function NetworkGraph_channel_failed(this_arg: bigint, short_channel_id: bigint, is_permanent: boolean): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30284,7 +30291,7 @@ export function NetworkGraph_channel_failed(this_arg: number, short_channel_id: } // void NetworkGraph_node_failed(const struct LDKNetworkGraph *NONNULL_PTR this_arg, struct LDKPublicKey _node_id, bool is_permanent); /* @internal */ -export function NetworkGraph_node_failed(this_arg: number, _node_id: number, is_permanent: boolean): void { +export function NetworkGraph_node_failed(this_arg: bigint, _node_id: number, is_permanent: boolean): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30293,7 +30300,7 @@ export function NetworkGraph_node_failed(this_arg: number, _node_id: number, is_ } // void NetworkGraph_remove_stale_channels_with_time(const struct LDKNetworkGraph *NONNULL_PTR this_arg, uint64_t current_time_unix); /* @internal */ -export function NetworkGraph_remove_stale_channels_with_time(this_arg: number, current_time_unix: bigint): void { +export function NetworkGraph_remove_stale_channels_with_time(this_arg: bigint, current_time_unix: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30302,7 +30309,7 @@ export function NetworkGraph_remove_stale_channels_with_time(this_arg: number, c } // MUST_USE_RES struct LDKCResult_NoneLightningErrorZ NetworkGraph_update_channel(const struct LDKNetworkGraph *NONNULL_PTR this_arg, const struct LDKChannelUpdate *NONNULL_PTR msg); /* @internal */ -export function NetworkGraph_update_channel(this_arg: number, msg: number): number { +export function NetworkGraph_update_channel(this_arg: bigint, msg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30311,7 +30318,7 @@ export function NetworkGraph_update_channel(this_arg: number, msg: number): numb } // MUST_USE_RES struct LDKCResult_NoneLightningErrorZ NetworkGraph_update_channel_unsigned(const struct LDKNetworkGraph *NONNULL_PTR this_arg, const struct LDKUnsignedChannelUpdate *NONNULL_PTR msg); /* @internal */ -export function NetworkGraph_update_channel_unsigned(this_arg: number, msg: number): number { +export function NetworkGraph_update_channel_unsigned(this_arg: bigint, msg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30320,7 +30327,7 @@ export function NetworkGraph_update_channel_unsigned(this_arg: number, msg: numb } // MUST_USE_RES struct LDKChannelInfo ReadOnlyNetworkGraph_channel(const struct LDKReadOnlyNetworkGraph *NONNULL_PTR this_arg, uint64_t short_channel_id); /* @internal */ -export function ReadOnlyNetworkGraph_channel(this_arg: number, short_channel_id: bigint): number { +export function ReadOnlyNetworkGraph_channel(this_arg: bigint, short_channel_id: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30329,7 +30336,7 @@ export function ReadOnlyNetworkGraph_channel(this_arg: number, short_channel_id: } // MUST_USE_RES struct LDKCVec_u64Z ReadOnlyNetworkGraph_list_channels(const struct LDKReadOnlyNetworkGraph *NONNULL_PTR this_arg); /* @internal */ -export function ReadOnlyNetworkGraph_list_channels(this_arg: number): number { +export function ReadOnlyNetworkGraph_list_channels(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30338,7 +30345,7 @@ export function ReadOnlyNetworkGraph_list_channels(this_arg: number): number { } // MUST_USE_RES struct LDKNodeInfo ReadOnlyNetworkGraph_node(const struct LDKReadOnlyNetworkGraph *NONNULL_PTR this_arg, const struct LDKNodeId *NONNULL_PTR node_id); /* @internal */ -export function ReadOnlyNetworkGraph_node(this_arg: number, node_id: number): number { +export function ReadOnlyNetworkGraph_node(this_arg: bigint, node_id: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30347,7 +30354,7 @@ export function ReadOnlyNetworkGraph_node(this_arg: number, node_id: number): nu } // MUST_USE_RES struct LDKCVec_NodeIdZ ReadOnlyNetworkGraph_list_nodes(const struct LDKReadOnlyNetworkGraph *NONNULL_PTR this_arg); /* @internal */ -export function ReadOnlyNetworkGraph_list_nodes(this_arg: number): number { +export function ReadOnlyNetworkGraph_list_nodes(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30356,7 +30363,7 @@ export function ReadOnlyNetworkGraph_list_nodes(this_arg: number): number { } // MUST_USE_RES struct LDKCOption_CVec_NetAddressZZ ReadOnlyNetworkGraph_get_addresses(const struct LDKReadOnlyNetworkGraph *NONNULL_PTR this_arg, struct LDKPublicKey pubkey); /* @internal */ -export function ReadOnlyNetworkGraph_get_addresses(this_arg: number, pubkey: number): number { +export function ReadOnlyNetworkGraph_get_addresses(this_arg: bigint, pubkey: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30365,7 +30372,7 @@ export function ReadOnlyNetworkGraph_get_addresses(this_arg: number, pubkey: num } // void RouteHop_free(struct LDKRouteHop this_obj); /* @internal */ -export function RouteHop_free(this_obj: number): void { +export function RouteHop_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30374,7 +30381,7 @@ export function RouteHop_free(this_obj: number): void { } // struct LDKPublicKey RouteHop_get_pubkey(const struct LDKRouteHop *NONNULL_PTR this_ptr); /* @internal */ -export function RouteHop_get_pubkey(this_ptr: number): number { +export function RouteHop_get_pubkey(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30383,7 +30390,7 @@ export function RouteHop_get_pubkey(this_ptr: number): number { } // void RouteHop_set_pubkey(struct LDKRouteHop *NONNULL_PTR this_ptr, struct LDKPublicKey val); /* @internal */ -export function RouteHop_set_pubkey(this_ptr: number, val: number): void { +export function RouteHop_set_pubkey(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30392,7 +30399,7 @@ export function RouteHop_set_pubkey(this_ptr: number, val: number): void { } // struct LDKNodeFeatures RouteHop_get_node_features(const struct LDKRouteHop *NONNULL_PTR this_ptr); /* @internal */ -export function RouteHop_get_node_features(this_ptr: number): number { +export function RouteHop_get_node_features(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30401,7 +30408,7 @@ export function RouteHop_get_node_features(this_ptr: number): number { } // void RouteHop_set_node_features(struct LDKRouteHop *NONNULL_PTR this_ptr, struct LDKNodeFeatures val); /* @internal */ -export function RouteHop_set_node_features(this_ptr: number, val: number): void { +export function RouteHop_set_node_features(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30410,7 +30417,7 @@ export function RouteHop_set_node_features(this_ptr: number, val: number): void } // uint64_t RouteHop_get_short_channel_id(const struct LDKRouteHop *NONNULL_PTR this_ptr); /* @internal */ -export function RouteHop_get_short_channel_id(this_ptr: number): bigint { +export function RouteHop_get_short_channel_id(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30419,7 +30426,7 @@ export function RouteHop_get_short_channel_id(this_ptr: number): bigint { } // void RouteHop_set_short_channel_id(struct LDKRouteHop *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function RouteHop_set_short_channel_id(this_ptr: number, val: bigint): void { +export function RouteHop_set_short_channel_id(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30428,7 +30435,7 @@ export function RouteHop_set_short_channel_id(this_ptr: number, val: bigint): vo } // struct LDKChannelFeatures RouteHop_get_channel_features(const struct LDKRouteHop *NONNULL_PTR this_ptr); /* @internal */ -export function RouteHop_get_channel_features(this_ptr: number): number { +export function RouteHop_get_channel_features(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30437,7 +30444,7 @@ export function RouteHop_get_channel_features(this_ptr: number): number { } // void RouteHop_set_channel_features(struct LDKRouteHop *NONNULL_PTR this_ptr, struct LDKChannelFeatures val); /* @internal */ -export function RouteHop_set_channel_features(this_ptr: number, val: number): void { +export function RouteHop_set_channel_features(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30446,7 +30453,7 @@ export function RouteHop_set_channel_features(this_ptr: number, val: number): vo } // uint64_t RouteHop_get_fee_msat(const struct LDKRouteHop *NONNULL_PTR this_ptr); /* @internal */ -export function RouteHop_get_fee_msat(this_ptr: number): bigint { +export function RouteHop_get_fee_msat(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30455,7 +30462,7 @@ export function RouteHop_get_fee_msat(this_ptr: number): bigint { } // void RouteHop_set_fee_msat(struct LDKRouteHop *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function RouteHop_set_fee_msat(this_ptr: number, val: bigint): void { +export function RouteHop_set_fee_msat(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30464,7 +30471,7 @@ export function RouteHop_set_fee_msat(this_ptr: number, val: bigint): void { } // uint32_t RouteHop_get_cltv_expiry_delta(const struct LDKRouteHop *NONNULL_PTR this_ptr); /* @internal */ -export function RouteHop_get_cltv_expiry_delta(this_ptr: number): number { +export function RouteHop_get_cltv_expiry_delta(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30473,7 +30480,7 @@ export function RouteHop_get_cltv_expiry_delta(this_ptr: number): number { } // void RouteHop_set_cltv_expiry_delta(struct LDKRouteHop *NONNULL_PTR this_ptr, uint32_t val); /* @internal */ -export function RouteHop_set_cltv_expiry_delta(this_ptr: number, val: number): void { +export function RouteHop_set_cltv_expiry_delta(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30482,16 +30489,16 @@ export function RouteHop_set_cltv_expiry_delta(this_ptr: number, val: number): v } // MUST_USE_RES struct LDKRouteHop RouteHop_new(struct LDKPublicKey pubkey_arg, struct LDKNodeFeatures node_features_arg, uint64_t short_channel_id_arg, struct LDKChannelFeatures channel_features_arg, uint64_t fee_msat_arg, uint32_t cltv_expiry_delta_arg); /* @internal */ -export function RouteHop_new(pubkey_arg: number, node_features_arg: number, short_channel_id_arg: bigint, channel_features_arg: number, fee_msat_arg: bigint, cltv_expiry_delta_arg: number): number { +export function RouteHop_new(pubkey_arg: number, node_features_arg: bigint, short_channel_id_arg: bigint, channel_features_arg: bigint, fee_msat_arg: bigint, cltv_expiry_delta_arg: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_RouteHop_new(pubkey_arg, node_features_arg, short_channel_id_arg, channel_features_arg, fee_msat_arg, cltv_expiry_delta_arg); return nativeResponseValue; } - // uintptr_t RouteHop_clone_ptr(LDKRouteHop *NONNULL_PTR arg); + // uint64_t RouteHop_clone_ptr(LDKRouteHop *NONNULL_PTR arg); /* @internal */ -export function RouteHop_clone_ptr(arg: number): number { +export function RouteHop_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30500,7 +30507,7 @@ export function RouteHop_clone_ptr(arg: number): number { } // struct LDKRouteHop RouteHop_clone(const struct LDKRouteHop *NONNULL_PTR orig); /* @internal */ -export function RouteHop_clone(orig: number): number { +export function RouteHop_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30509,7 +30516,7 @@ export function RouteHop_clone(orig: number): number { } // uint64_t RouteHop_hash(const struct LDKRouteHop *NONNULL_PTR o); /* @internal */ -export function RouteHop_hash(o: number): bigint { +export function RouteHop_hash(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30518,7 +30525,7 @@ export function RouteHop_hash(o: number): bigint { } // bool RouteHop_eq(const struct LDKRouteHop *NONNULL_PTR a, const struct LDKRouteHop *NONNULL_PTR b); /* @internal */ -export function RouteHop_eq(a: number, b: number): boolean { +export function RouteHop_eq(a: bigint, b: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30527,7 +30534,7 @@ export function RouteHop_eq(a: number, b: number): boolean { } // struct LDKCVec_u8Z RouteHop_write(const struct LDKRouteHop *NONNULL_PTR obj); /* @internal */ -export function RouteHop_write(obj: number): number { +export function RouteHop_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30536,7 +30543,7 @@ export function RouteHop_write(obj: number): number { } // struct LDKCResult_RouteHopDecodeErrorZ RouteHop_read(struct LDKu8slice ser); /* @internal */ -export function RouteHop_read(ser: number): number { +export function RouteHop_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30545,7 +30552,7 @@ export function RouteHop_read(ser: number): number { } // void Route_free(struct LDKRoute this_obj); /* @internal */ -export function Route_free(this_obj: number): void { +export function Route_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30554,7 +30561,7 @@ export function Route_free(this_obj: number): void { } // struct LDKCVec_CVec_RouteHopZZ Route_get_paths(const struct LDKRoute *NONNULL_PTR this_ptr); /* @internal */ -export function Route_get_paths(this_ptr: number): number { +export function Route_get_paths(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30563,7 +30570,7 @@ export function Route_get_paths(this_ptr: number): number { } // void Route_set_paths(struct LDKRoute *NONNULL_PTR this_ptr, struct LDKCVec_CVec_RouteHopZZ val); /* @internal */ -export function Route_set_paths(this_ptr: number, val: number): void { +export function Route_set_paths(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30572,7 +30579,7 @@ export function Route_set_paths(this_ptr: number, val: number): void { } // struct LDKPaymentParameters Route_get_payment_params(const struct LDKRoute *NONNULL_PTR this_ptr); /* @internal */ -export function Route_get_payment_params(this_ptr: number): number { +export function Route_get_payment_params(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30581,7 +30588,7 @@ export function Route_get_payment_params(this_ptr: number): number { } // void Route_set_payment_params(struct LDKRoute *NONNULL_PTR this_ptr, struct LDKPaymentParameters val); /* @internal */ -export function Route_set_payment_params(this_ptr: number, val: number): void { +export function Route_set_payment_params(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30590,16 +30597,16 @@ export function Route_set_payment_params(this_ptr: number, val: number): void { } // MUST_USE_RES struct LDKRoute Route_new(struct LDKCVec_CVec_RouteHopZZ paths_arg, struct LDKPaymentParameters payment_params_arg); /* @internal */ -export function Route_new(paths_arg: number, payment_params_arg: number): number { +export function Route_new(paths_arg: number, payment_params_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_Route_new(paths_arg, payment_params_arg); return nativeResponseValue; } - // uintptr_t Route_clone_ptr(LDKRoute *NONNULL_PTR arg); + // uint64_t Route_clone_ptr(LDKRoute *NONNULL_PTR arg); /* @internal */ -export function Route_clone_ptr(arg: number): number { +export function Route_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30608,7 +30615,7 @@ export function Route_clone_ptr(arg: number): number { } // struct LDKRoute Route_clone(const struct LDKRoute *NONNULL_PTR orig); /* @internal */ -export function Route_clone(orig: number): number { +export function Route_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30617,7 +30624,7 @@ export function Route_clone(orig: number): number { } // uint64_t Route_hash(const struct LDKRoute *NONNULL_PTR o); /* @internal */ -export function Route_hash(o: number): bigint { +export function Route_hash(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30626,7 +30633,7 @@ export function Route_hash(o: number): bigint { } // bool Route_eq(const struct LDKRoute *NONNULL_PTR a, const struct LDKRoute *NONNULL_PTR b); /* @internal */ -export function Route_eq(a: number, b: number): boolean { +export function Route_eq(a: bigint, b: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30635,7 +30642,7 @@ export function Route_eq(a: number, b: number): boolean { } // MUST_USE_RES uint64_t Route_get_total_fees(const struct LDKRoute *NONNULL_PTR this_arg); /* @internal */ -export function Route_get_total_fees(this_arg: number): bigint { +export function Route_get_total_fees(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30644,7 +30651,7 @@ export function Route_get_total_fees(this_arg: number): bigint { } // MUST_USE_RES uint64_t Route_get_total_amount(const struct LDKRoute *NONNULL_PTR this_arg); /* @internal */ -export function Route_get_total_amount(this_arg: number): bigint { +export function Route_get_total_amount(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30653,7 +30660,7 @@ export function Route_get_total_amount(this_arg: number): bigint { } // struct LDKCVec_u8Z Route_write(const struct LDKRoute *NONNULL_PTR obj); /* @internal */ -export function Route_write(obj: number): number { +export function Route_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30662,7 +30669,7 @@ export function Route_write(obj: number): number { } // struct LDKCResult_RouteDecodeErrorZ Route_read(struct LDKu8slice ser); /* @internal */ -export function Route_read(ser: number): number { +export function Route_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30671,7 +30678,7 @@ export function Route_read(ser: number): number { } // void RouteParameters_free(struct LDKRouteParameters this_obj); /* @internal */ -export function RouteParameters_free(this_obj: number): void { +export function RouteParameters_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30680,7 +30687,7 @@ export function RouteParameters_free(this_obj: number): void { } // struct LDKPaymentParameters RouteParameters_get_payment_params(const struct LDKRouteParameters *NONNULL_PTR this_ptr); /* @internal */ -export function RouteParameters_get_payment_params(this_ptr: number): number { +export function RouteParameters_get_payment_params(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30689,7 +30696,7 @@ export function RouteParameters_get_payment_params(this_ptr: number): number { } // void RouteParameters_set_payment_params(struct LDKRouteParameters *NONNULL_PTR this_ptr, struct LDKPaymentParameters val); /* @internal */ -export function RouteParameters_set_payment_params(this_ptr: number, val: number): void { +export function RouteParameters_set_payment_params(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30698,7 +30705,7 @@ export function RouteParameters_set_payment_params(this_ptr: number, val: number } // uint64_t RouteParameters_get_final_value_msat(const struct LDKRouteParameters *NONNULL_PTR this_ptr); /* @internal */ -export function RouteParameters_get_final_value_msat(this_ptr: number): bigint { +export function RouteParameters_get_final_value_msat(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30707,7 +30714,7 @@ export function RouteParameters_get_final_value_msat(this_ptr: number): bigint { } // void RouteParameters_set_final_value_msat(struct LDKRouteParameters *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function RouteParameters_set_final_value_msat(this_ptr: number, val: bigint): void { +export function RouteParameters_set_final_value_msat(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30716,7 +30723,7 @@ export function RouteParameters_set_final_value_msat(this_ptr: number, val: bigi } // uint32_t RouteParameters_get_final_cltv_expiry_delta(const struct LDKRouteParameters *NONNULL_PTR this_ptr); /* @internal */ -export function RouteParameters_get_final_cltv_expiry_delta(this_ptr: number): number { +export function RouteParameters_get_final_cltv_expiry_delta(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30725,7 +30732,7 @@ export function RouteParameters_get_final_cltv_expiry_delta(this_ptr: number): n } // void RouteParameters_set_final_cltv_expiry_delta(struct LDKRouteParameters *NONNULL_PTR this_ptr, uint32_t val); /* @internal */ -export function RouteParameters_set_final_cltv_expiry_delta(this_ptr: number, val: number): void { +export function RouteParameters_set_final_cltv_expiry_delta(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30734,16 +30741,16 @@ export function RouteParameters_set_final_cltv_expiry_delta(this_ptr: number, va } // MUST_USE_RES struct LDKRouteParameters RouteParameters_new(struct LDKPaymentParameters payment_params_arg, uint64_t final_value_msat_arg, uint32_t final_cltv_expiry_delta_arg); /* @internal */ -export function RouteParameters_new(payment_params_arg: number, final_value_msat_arg: bigint, final_cltv_expiry_delta_arg: number): number { +export function RouteParameters_new(payment_params_arg: bigint, final_value_msat_arg: bigint, final_cltv_expiry_delta_arg: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_RouteParameters_new(payment_params_arg, final_value_msat_arg, final_cltv_expiry_delta_arg); return nativeResponseValue; } - // uintptr_t RouteParameters_clone_ptr(LDKRouteParameters *NONNULL_PTR arg); + // uint64_t RouteParameters_clone_ptr(LDKRouteParameters *NONNULL_PTR arg); /* @internal */ -export function RouteParameters_clone_ptr(arg: number): number { +export function RouteParameters_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30752,7 +30759,7 @@ export function RouteParameters_clone_ptr(arg: number): number { } // struct LDKRouteParameters RouteParameters_clone(const struct LDKRouteParameters *NONNULL_PTR orig); /* @internal */ -export function RouteParameters_clone(orig: number): number { +export function RouteParameters_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30761,7 +30768,7 @@ export function RouteParameters_clone(orig: number): number { } // struct LDKCVec_u8Z RouteParameters_write(const struct LDKRouteParameters *NONNULL_PTR obj); /* @internal */ -export function RouteParameters_write(obj: number): number { +export function RouteParameters_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30770,7 +30777,7 @@ export function RouteParameters_write(obj: number): number { } // struct LDKCResult_RouteParametersDecodeErrorZ RouteParameters_read(struct LDKu8slice ser); /* @internal */ -export function RouteParameters_read(ser: number): number { +export function RouteParameters_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30779,7 +30786,7 @@ export function RouteParameters_read(ser: number): number { } // void PaymentParameters_free(struct LDKPaymentParameters this_obj); /* @internal */ -export function PaymentParameters_free(this_obj: number): void { +export function PaymentParameters_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30788,7 +30795,7 @@ export function PaymentParameters_free(this_obj: number): void { } // struct LDKPublicKey PaymentParameters_get_payee_pubkey(const struct LDKPaymentParameters *NONNULL_PTR this_ptr); /* @internal */ -export function PaymentParameters_get_payee_pubkey(this_ptr: number): number { +export function PaymentParameters_get_payee_pubkey(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30797,7 +30804,7 @@ export function PaymentParameters_get_payee_pubkey(this_ptr: number): number { } // void PaymentParameters_set_payee_pubkey(struct LDKPaymentParameters *NONNULL_PTR this_ptr, struct LDKPublicKey val); /* @internal */ -export function PaymentParameters_set_payee_pubkey(this_ptr: number, val: number): void { +export function PaymentParameters_set_payee_pubkey(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30806,7 +30813,7 @@ export function PaymentParameters_set_payee_pubkey(this_ptr: number, val: number } // struct LDKInvoiceFeatures PaymentParameters_get_features(const struct LDKPaymentParameters *NONNULL_PTR this_ptr); /* @internal */ -export function PaymentParameters_get_features(this_ptr: number): number { +export function PaymentParameters_get_features(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30815,7 +30822,7 @@ export function PaymentParameters_get_features(this_ptr: number): number { } // void PaymentParameters_set_features(struct LDKPaymentParameters *NONNULL_PTR this_ptr, struct LDKInvoiceFeatures val); /* @internal */ -export function PaymentParameters_set_features(this_ptr: number, val: number): void { +export function PaymentParameters_set_features(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30824,7 +30831,7 @@ export function PaymentParameters_set_features(this_ptr: number, val: number): v } // struct LDKCVec_RouteHintZ PaymentParameters_get_route_hints(const struct LDKPaymentParameters *NONNULL_PTR this_ptr); /* @internal */ -export function PaymentParameters_get_route_hints(this_ptr: number): number { +export function PaymentParameters_get_route_hints(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30833,7 +30840,7 @@ export function PaymentParameters_get_route_hints(this_ptr: number): number { } // void PaymentParameters_set_route_hints(struct LDKPaymentParameters *NONNULL_PTR this_ptr, struct LDKCVec_RouteHintZ val); /* @internal */ -export function PaymentParameters_set_route_hints(this_ptr: number, val: number): void { +export function PaymentParameters_set_route_hints(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30842,7 +30849,7 @@ export function PaymentParameters_set_route_hints(this_ptr: number, val: number) } // struct LDKCOption_u64Z PaymentParameters_get_expiry_time(const struct LDKPaymentParameters *NONNULL_PTR this_ptr); /* @internal */ -export function PaymentParameters_get_expiry_time(this_ptr: number): number { +export function PaymentParameters_get_expiry_time(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30851,7 +30858,7 @@ export function PaymentParameters_get_expiry_time(this_ptr: number): number { } // void PaymentParameters_set_expiry_time(struct LDKPaymentParameters *NONNULL_PTR this_ptr, struct LDKCOption_u64Z val); /* @internal */ -export function PaymentParameters_set_expiry_time(this_ptr: number, val: number): void { +export function PaymentParameters_set_expiry_time(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30860,7 +30867,7 @@ export function PaymentParameters_set_expiry_time(this_ptr: number, val: number) } // uint32_t PaymentParameters_get_max_total_cltv_expiry_delta(const struct LDKPaymentParameters *NONNULL_PTR this_ptr); /* @internal */ -export function PaymentParameters_get_max_total_cltv_expiry_delta(this_ptr: number): number { +export function PaymentParameters_get_max_total_cltv_expiry_delta(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30869,7 +30876,7 @@ export function PaymentParameters_get_max_total_cltv_expiry_delta(this_ptr: numb } // void PaymentParameters_set_max_total_cltv_expiry_delta(struct LDKPaymentParameters *NONNULL_PTR this_ptr, uint32_t val); /* @internal */ -export function PaymentParameters_set_max_total_cltv_expiry_delta(this_ptr: number, val: number): void { +export function PaymentParameters_set_max_total_cltv_expiry_delta(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30878,7 +30885,7 @@ export function PaymentParameters_set_max_total_cltv_expiry_delta(this_ptr: numb } // uint8_t PaymentParameters_get_max_path_count(const struct LDKPaymentParameters *NONNULL_PTR this_ptr); /* @internal */ -export function PaymentParameters_get_max_path_count(this_ptr: number): number { +export function PaymentParameters_get_max_path_count(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30887,7 +30894,7 @@ export function PaymentParameters_get_max_path_count(this_ptr: number): number { } // void PaymentParameters_set_max_path_count(struct LDKPaymentParameters *NONNULL_PTR this_ptr, uint8_t val); /* @internal */ -export function PaymentParameters_set_max_path_count(this_ptr: number, val: number): void { +export function PaymentParameters_set_max_path_count(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30896,7 +30903,7 @@ export function PaymentParameters_set_max_path_count(this_ptr: number, val: numb } // uint8_t PaymentParameters_get_max_channel_saturation_power_of_half(const struct LDKPaymentParameters *NONNULL_PTR this_ptr); /* @internal */ -export function PaymentParameters_get_max_channel_saturation_power_of_half(this_ptr: number): number { +export function PaymentParameters_get_max_channel_saturation_power_of_half(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30905,7 +30912,7 @@ export function PaymentParameters_get_max_channel_saturation_power_of_half(this_ } // void PaymentParameters_set_max_channel_saturation_power_of_half(struct LDKPaymentParameters *NONNULL_PTR this_ptr, uint8_t val); /* @internal */ -export function PaymentParameters_set_max_channel_saturation_power_of_half(this_ptr: number, val: number): void { +export function PaymentParameters_set_max_channel_saturation_power_of_half(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30914,7 +30921,7 @@ export function PaymentParameters_set_max_channel_saturation_power_of_half(this_ } // struct LDKCVec_u64Z PaymentParameters_get_previously_failed_channels(const struct LDKPaymentParameters *NONNULL_PTR this_ptr); /* @internal */ -export function PaymentParameters_get_previously_failed_channels(this_ptr: number): number { +export function PaymentParameters_get_previously_failed_channels(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30923,7 +30930,7 @@ export function PaymentParameters_get_previously_failed_channels(this_ptr: numbe } // void PaymentParameters_set_previously_failed_channels(struct LDKPaymentParameters *NONNULL_PTR this_ptr, struct LDKCVec_u64Z val); /* @internal */ -export function PaymentParameters_set_previously_failed_channels(this_ptr: number, val: number): void { +export function PaymentParameters_set_previously_failed_channels(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30932,16 +30939,16 @@ export function PaymentParameters_set_previously_failed_channels(this_ptr: numbe } // MUST_USE_RES struct LDKPaymentParameters PaymentParameters_new(struct LDKPublicKey payee_pubkey_arg, struct LDKInvoiceFeatures features_arg, struct LDKCVec_RouteHintZ route_hints_arg, struct LDKCOption_u64Z expiry_time_arg, uint32_t max_total_cltv_expiry_delta_arg, uint8_t max_path_count_arg, uint8_t max_channel_saturation_power_of_half_arg, struct LDKCVec_u64Z previously_failed_channels_arg); /* @internal */ -export function PaymentParameters_new(payee_pubkey_arg: number, features_arg: number, route_hints_arg: number, expiry_time_arg: number, max_total_cltv_expiry_delta_arg: number, max_path_count_arg: number, max_channel_saturation_power_of_half_arg: number, previously_failed_channels_arg: number): number { +export function PaymentParameters_new(payee_pubkey_arg: number, features_arg: bigint, route_hints_arg: number, expiry_time_arg: bigint, max_total_cltv_expiry_delta_arg: number, max_path_count_arg: number, max_channel_saturation_power_of_half_arg: number, previously_failed_channels_arg: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_PaymentParameters_new(payee_pubkey_arg, features_arg, route_hints_arg, expiry_time_arg, max_total_cltv_expiry_delta_arg, max_path_count_arg, max_channel_saturation_power_of_half_arg, previously_failed_channels_arg); return nativeResponseValue; } - // uintptr_t PaymentParameters_clone_ptr(LDKPaymentParameters *NONNULL_PTR arg); + // uint64_t PaymentParameters_clone_ptr(LDKPaymentParameters *NONNULL_PTR arg); /* @internal */ -export function PaymentParameters_clone_ptr(arg: number): number { +export function PaymentParameters_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30950,7 +30957,7 @@ export function PaymentParameters_clone_ptr(arg: number): number { } // struct LDKPaymentParameters PaymentParameters_clone(const struct LDKPaymentParameters *NONNULL_PTR orig); /* @internal */ -export function PaymentParameters_clone(orig: number): number { +export function PaymentParameters_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30959,7 +30966,7 @@ export function PaymentParameters_clone(orig: number): number { } // uint64_t PaymentParameters_hash(const struct LDKPaymentParameters *NONNULL_PTR o); /* @internal */ -export function PaymentParameters_hash(o: number): bigint { +export function PaymentParameters_hash(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30968,7 +30975,7 @@ export function PaymentParameters_hash(o: number): bigint { } // bool PaymentParameters_eq(const struct LDKPaymentParameters *NONNULL_PTR a, const struct LDKPaymentParameters *NONNULL_PTR b); /* @internal */ -export function PaymentParameters_eq(a: number, b: number): boolean { +export function PaymentParameters_eq(a: bigint, b: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30977,7 +30984,7 @@ export function PaymentParameters_eq(a: number, b: number): boolean { } // struct LDKCVec_u8Z PaymentParameters_write(const struct LDKPaymentParameters *NONNULL_PTR obj); /* @internal */ -export function PaymentParameters_write(obj: number): number { +export function PaymentParameters_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30986,7 +30993,7 @@ export function PaymentParameters_write(obj: number): number { } // struct LDKCResult_PaymentParametersDecodeErrorZ PaymentParameters_read(struct LDKu8slice ser); /* @internal */ -export function PaymentParameters_read(ser: number): number { +export function PaymentParameters_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -30995,7 +31002,7 @@ export function PaymentParameters_read(ser: number): number { } // MUST_USE_RES struct LDKPaymentParameters PaymentParameters_from_node_id(struct LDKPublicKey payee_pubkey); /* @internal */ -export function PaymentParameters_from_node_id(payee_pubkey: number): number { +export function PaymentParameters_from_node_id(payee_pubkey: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31004,7 +31011,7 @@ export function PaymentParameters_from_node_id(payee_pubkey: number): number { } // MUST_USE_RES struct LDKPaymentParameters PaymentParameters_for_keysend(struct LDKPublicKey payee_pubkey); /* @internal */ -export function PaymentParameters_for_keysend(payee_pubkey: number): number { +export function PaymentParameters_for_keysend(payee_pubkey: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31013,7 +31020,7 @@ export function PaymentParameters_for_keysend(payee_pubkey: number): number { } // void RouteHint_free(struct LDKRouteHint this_obj); /* @internal */ -export function RouteHint_free(this_obj: number): void { +export function RouteHint_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31022,7 +31029,7 @@ export function RouteHint_free(this_obj: number): void { } // struct LDKCVec_RouteHintHopZ RouteHint_get_a(const struct LDKRouteHint *NONNULL_PTR this_ptr); /* @internal */ -export function RouteHint_get_a(this_ptr: number): number { +export function RouteHint_get_a(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31031,7 +31038,7 @@ export function RouteHint_get_a(this_ptr: number): number { } // void RouteHint_set_a(struct LDKRouteHint *NONNULL_PTR this_ptr, struct LDKCVec_RouteHintHopZ val); /* @internal */ -export function RouteHint_set_a(this_ptr: number, val: number): void { +export function RouteHint_set_a(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31040,16 +31047,16 @@ export function RouteHint_set_a(this_ptr: number, val: number): void { } // MUST_USE_RES struct LDKRouteHint RouteHint_new(struct LDKCVec_RouteHintHopZ a_arg); /* @internal */ -export function RouteHint_new(a_arg: number): number { +export function RouteHint_new(a_arg: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_RouteHint_new(a_arg); return nativeResponseValue; } - // uintptr_t RouteHint_clone_ptr(LDKRouteHint *NONNULL_PTR arg); + // uint64_t RouteHint_clone_ptr(LDKRouteHint *NONNULL_PTR arg); /* @internal */ -export function RouteHint_clone_ptr(arg: number): number { +export function RouteHint_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31058,7 +31065,7 @@ export function RouteHint_clone_ptr(arg: number): number { } // struct LDKRouteHint RouteHint_clone(const struct LDKRouteHint *NONNULL_PTR orig); /* @internal */ -export function RouteHint_clone(orig: number): number { +export function RouteHint_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31067,7 +31074,7 @@ export function RouteHint_clone(orig: number): number { } // uint64_t RouteHint_hash(const struct LDKRouteHint *NONNULL_PTR o); /* @internal */ -export function RouteHint_hash(o: number): bigint { +export function RouteHint_hash(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31076,7 +31083,7 @@ export function RouteHint_hash(o: number): bigint { } // bool RouteHint_eq(const struct LDKRouteHint *NONNULL_PTR a, const struct LDKRouteHint *NONNULL_PTR b); /* @internal */ -export function RouteHint_eq(a: number, b: number): boolean { +export function RouteHint_eq(a: bigint, b: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31085,7 +31092,7 @@ export function RouteHint_eq(a: number, b: number): boolean { } // struct LDKCVec_u8Z RouteHint_write(const struct LDKRouteHint *NONNULL_PTR obj); /* @internal */ -export function RouteHint_write(obj: number): number { +export function RouteHint_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31094,7 +31101,7 @@ export function RouteHint_write(obj: number): number { } // struct LDKCResult_RouteHintDecodeErrorZ RouteHint_read(struct LDKu8slice ser); /* @internal */ -export function RouteHint_read(ser: number): number { +export function RouteHint_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31103,7 +31110,7 @@ export function RouteHint_read(ser: number): number { } // void RouteHintHop_free(struct LDKRouteHintHop this_obj); /* @internal */ -export function RouteHintHop_free(this_obj: number): void { +export function RouteHintHop_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31112,7 +31119,7 @@ export function RouteHintHop_free(this_obj: number): void { } // struct LDKPublicKey RouteHintHop_get_src_node_id(const struct LDKRouteHintHop *NONNULL_PTR this_ptr); /* @internal */ -export function RouteHintHop_get_src_node_id(this_ptr: number): number { +export function RouteHintHop_get_src_node_id(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31121,7 +31128,7 @@ export function RouteHintHop_get_src_node_id(this_ptr: number): number { } // void RouteHintHop_set_src_node_id(struct LDKRouteHintHop *NONNULL_PTR this_ptr, struct LDKPublicKey val); /* @internal */ -export function RouteHintHop_set_src_node_id(this_ptr: number, val: number): void { +export function RouteHintHop_set_src_node_id(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31130,7 +31137,7 @@ export function RouteHintHop_set_src_node_id(this_ptr: number, val: number): voi } // uint64_t RouteHintHop_get_short_channel_id(const struct LDKRouteHintHop *NONNULL_PTR this_ptr); /* @internal */ -export function RouteHintHop_get_short_channel_id(this_ptr: number): bigint { +export function RouteHintHop_get_short_channel_id(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31139,7 +31146,7 @@ export function RouteHintHop_get_short_channel_id(this_ptr: number): bigint { } // void RouteHintHop_set_short_channel_id(struct LDKRouteHintHop *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function RouteHintHop_set_short_channel_id(this_ptr: number, val: bigint): void { +export function RouteHintHop_set_short_channel_id(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31148,7 +31155,7 @@ export function RouteHintHop_set_short_channel_id(this_ptr: number, val: bigint) } // struct LDKRoutingFees RouteHintHop_get_fees(const struct LDKRouteHintHop *NONNULL_PTR this_ptr); /* @internal */ -export function RouteHintHop_get_fees(this_ptr: number): number { +export function RouteHintHop_get_fees(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31157,7 +31164,7 @@ export function RouteHintHop_get_fees(this_ptr: number): number { } // void RouteHintHop_set_fees(struct LDKRouteHintHop *NONNULL_PTR this_ptr, struct LDKRoutingFees val); /* @internal */ -export function RouteHintHop_set_fees(this_ptr: number, val: number): void { +export function RouteHintHop_set_fees(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31166,7 +31173,7 @@ export function RouteHintHop_set_fees(this_ptr: number, val: number): void { } // uint16_t RouteHintHop_get_cltv_expiry_delta(const struct LDKRouteHintHop *NONNULL_PTR this_ptr); /* @internal */ -export function RouteHintHop_get_cltv_expiry_delta(this_ptr: number): number { +export function RouteHintHop_get_cltv_expiry_delta(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31175,7 +31182,7 @@ export function RouteHintHop_get_cltv_expiry_delta(this_ptr: number): number { } // void RouteHintHop_set_cltv_expiry_delta(struct LDKRouteHintHop *NONNULL_PTR this_ptr, uint16_t val); /* @internal */ -export function RouteHintHop_set_cltv_expiry_delta(this_ptr: number, val: number): void { +export function RouteHintHop_set_cltv_expiry_delta(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31184,7 +31191,7 @@ export function RouteHintHop_set_cltv_expiry_delta(this_ptr: number, val: number } // struct LDKCOption_u64Z RouteHintHop_get_htlc_minimum_msat(const struct LDKRouteHintHop *NONNULL_PTR this_ptr); /* @internal */ -export function RouteHintHop_get_htlc_minimum_msat(this_ptr: number): number { +export function RouteHintHop_get_htlc_minimum_msat(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31193,7 +31200,7 @@ export function RouteHintHop_get_htlc_minimum_msat(this_ptr: number): number { } // void RouteHintHop_set_htlc_minimum_msat(struct LDKRouteHintHop *NONNULL_PTR this_ptr, struct LDKCOption_u64Z val); /* @internal */ -export function RouteHintHop_set_htlc_minimum_msat(this_ptr: number, val: number): void { +export function RouteHintHop_set_htlc_minimum_msat(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31202,7 +31209,7 @@ export function RouteHintHop_set_htlc_minimum_msat(this_ptr: number, val: number } // struct LDKCOption_u64Z RouteHintHop_get_htlc_maximum_msat(const struct LDKRouteHintHop *NONNULL_PTR this_ptr); /* @internal */ -export function RouteHintHop_get_htlc_maximum_msat(this_ptr: number): number { +export function RouteHintHop_get_htlc_maximum_msat(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31211,7 +31218,7 @@ export function RouteHintHop_get_htlc_maximum_msat(this_ptr: number): number { } // void RouteHintHop_set_htlc_maximum_msat(struct LDKRouteHintHop *NONNULL_PTR this_ptr, struct LDKCOption_u64Z val); /* @internal */ -export function RouteHintHop_set_htlc_maximum_msat(this_ptr: number, val: number): void { +export function RouteHintHop_set_htlc_maximum_msat(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31220,16 +31227,16 @@ export function RouteHintHop_set_htlc_maximum_msat(this_ptr: number, val: number } // MUST_USE_RES struct LDKRouteHintHop RouteHintHop_new(struct LDKPublicKey src_node_id_arg, uint64_t short_channel_id_arg, struct LDKRoutingFees fees_arg, uint16_t cltv_expiry_delta_arg, struct LDKCOption_u64Z htlc_minimum_msat_arg, struct LDKCOption_u64Z htlc_maximum_msat_arg); /* @internal */ -export function RouteHintHop_new(src_node_id_arg: number, short_channel_id_arg: bigint, fees_arg: number, cltv_expiry_delta_arg: number, htlc_minimum_msat_arg: number, htlc_maximum_msat_arg: number): number { +export function RouteHintHop_new(src_node_id_arg: number, short_channel_id_arg: bigint, fees_arg: bigint, cltv_expiry_delta_arg: number, htlc_minimum_msat_arg: bigint, htlc_maximum_msat_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_RouteHintHop_new(src_node_id_arg, short_channel_id_arg, fees_arg, cltv_expiry_delta_arg, htlc_minimum_msat_arg, htlc_maximum_msat_arg); return nativeResponseValue; } - // uintptr_t RouteHintHop_clone_ptr(LDKRouteHintHop *NONNULL_PTR arg); + // uint64_t RouteHintHop_clone_ptr(LDKRouteHintHop *NONNULL_PTR arg); /* @internal */ -export function RouteHintHop_clone_ptr(arg: number): number { +export function RouteHintHop_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31238,7 +31245,7 @@ export function RouteHintHop_clone_ptr(arg: number): number { } // struct LDKRouteHintHop RouteHintHop_clone(const struct LDKRouteHintHop *NONNULL_PTR orig); /* @internal */ -export function RouteHintHop_clone(orig: number): number { +export function RouteHintHop_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31247,7 +31254,7 @@ export function RouteHintHop_clone(orig: number): number { } // uint64_t RouteHintHop_hash(const struct LDKRouteHintHop *NONNULL_PTR o); /* @internal */ -export function RouteHintHop_hash(o: number): bigint { +export function RouteHintHop_hash(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31256,7 +31263,7 @@ export function RouteHintHop_hash(o: number): bigint { } // bool RouteHintHop_eq(const struct LDKRouteHintHop *NONNULL_PTR a, const struct LDKRouteHintHop *NONNULL_PTR b); /* @internal */ -export function RouteHintHop_eq(a: number, b: number): boolean { +export function RouteHintHop_eq(a: bigint, b: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31265,7 +31272,7 @@ export function RouteHintHop_eq(a: number, b: number): boolean { } // struct LDKCVec_u8Z RouteHintHop_write(const struct LDKRouteHintHop *NONNULL_PTR obj); /* @internal */ -export function RouteHintHop_write(obj: number): number { +export function RouteHintHop_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31274,7 +31281,7 @@ export function RouteHintHop_write(obj: number): number { } // struct LDKCResult_RouteHintHopDecodeErrorZ RouteHintHop_read(struct LDKu8slice ser); /* @internal */ -export function RouteHintHop_read(ser: number): number { +export function RouteHintHop_read(ser: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31283,7 +31290,7 @@ export function RouteHintHop_read(ser: number): number { } // struct LDKCResult_RouteLightningErrorZ find_route(struct LDKPublicKey our_node_pubkey, const struct LDKRouteParameters *NONNULL_PTR route_params, const struct LDKNetworkGraph *NONNULL_PTR network_graph, struct LDKCVec_ChannelDetailsZ *first_hops, struct LDKLogger logger, const struct LDKScore *NONNULL_PTR scorer, const uint8_t (*random_seed_bytes)[32]); /* @internal */ -export function find_route(our_node_pubkey: number, route_params: number, network_graph: number, first_hops: number, logger: number, scorer: number, random_seed_bytes: number): number { +export function find_route(our_node_pubkey: number, route_params: bigint, network_graph: bigint, first_hops: number, logger: bigint, scorer: bigint, random_seed_bytes: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31292,7 +31299,7 @@ export function find_route(our_node_pubkey: number, route_params: number, networ } // struct LDKCResult_RouteLightningErrorZ build_route_from_hops(struct LDKPublicKey our_node_pubkey, struct LDKCVec_PublicKeyZ hops, const struct LDKRouteParameters *NONNULL_PTR route_params, const struct LDKNetworkGraph *NONNULL_PTR network_graph, struct LDKLogger logger, const uint8_t (*random_seed_bytes)[32]); /* @internal */ -export function build_route_from_hops(our_node_pubkey: number, hops: number, route_params: number, network_graph: number, logger: number, random_seed_bytes: number): number { +export function build_route_from_hops(our_node_pubkey: number, hops: number, route_params: bigint, network_graph: bigint, logger: bigint, random_seed_bytes: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31301,7 +31308,7 @@ export function build_route_from_hops(our_node_pubkey: number, hops: number, rou } // void Score_free(struct LDKScore this_ptr); /* @internal */ -export function Score_free(this_ptr: number): void { +export function Score_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31310,7 +31317,7 @@ export function Score_free(this_ptr: number): void { } // void LockableScore_free(struct LDKLockableScore this_ptr); /* @internal */ -export function LockableScore_free(this_ptr: number): void { +export function LockableScore_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31319,7 +31326,7 @@ export function LockableScore_free(this_ptr: number): void { } // void MultiThreadedLockableScore_free(struct LDKMultiThreadedLockableScore this_obj); /* @internal */ -export function MultiThreadedLockableScore_free(this_obj: number): void { +export function MultiThreadedLockableScore_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31328,7 +31335,7 @@ export function MultiThreadedLockableScore_free(this_obj: number): void { } // struct LDKCVec_u8Z MultiThreadedLockableScore_write(const struct LDKMultiThreadedLockableScore *NONNULL_PTR obj); /* @internal */ -export function MultiThreadedLockableScore_write(obj: number): number { +export function MultiThreadedLockableScore_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31337,7 +31344,7 @@ export function MultiThreadedLockableScore_write(obj: number): number { } // MUST_USE_RES struct LDKMultiThreadedLockableScore MultiThreadedLockableScore_new(struct LDKScore score); /* @internal */ -export function MultiThreadedLockableScore_new(score: number): number { +export function MultiThreadedLockableScore_new(score: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31346,7 +31353,7 @@ export function MultiThreadedLockableScore_new(score: number): number { } // void ChannelUsage_free(struct LDKChannelUsage this_obj); /* @internal */ -export function ChannelUsage_free(this_obj: number): void { +export function ChannelUsage_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31355,7 +31362,7 @@ export function ChannelUsage_free(this_obj: number): void { } // uint64_t ChannelUsage_get_amount_msat(const struct LDKChannelUsage *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelUsage_get_amount_msat(this_ptr: number): bigint { +export function ChannelUsage_get_amount_msat(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31364,7 +31371,7 @@ export function ChannelUsage_get_amount_msat(this_ptr: number): bigint { } // void ChannelUsage_set_amount_msat(struct LDKChannelUsage *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function ChannelUsage_set_amount_msat(this_ptr: number, val: bigint): void { +export function ChannelUsage_set_amount_msat(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31373,7 +31380,7 @@ export function ChannelUsage_set_amount_msat(this_ptr: number, val: bigint): voi } // uint64_t ChannelUsage_get_inflight_htlc_msat(const struct LDKChannelUsage *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelUsage_get_inflight_htlc_msat(this_ptr: number): bigint { +export function ChannelUsage_get_inflight_htlc_msat(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31382,7 +31389,7 @@ export function ChannelUsage_get_inflight_htlc_msat(this_ptr: number): bigint { } // void ChannelUsage_set_inflight_htlc_msat(struct LDKChannelUsage *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function ChannelUsage_set_inflight_htlc_msat(this_ptr: number, val: bigint): void { +export function ChannelUsage_set_inflight_htlc_msat(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31391,7 +31398,7 @@ export function ChannelUsage_set_inflight_htlc_msat(this_ptr: number, val: bigin } // struct LDKEffectiveCapacity ChannelUsage_get_effective_capacity(const struct LDKChannelUsage *NONNULL_PTR this_ptr); /* @internal */ -export function ChannelUsage_get_effective_capacity(this_ptr: number): number { +export function ChannelUsage_get_effective_capacity(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31400,7 +31407,7 @@ export function ChannelUsage_get_effective_capacity(this_ptr: number): number { } // void ChannelUsage_set_effective_capacity(struct LDKChannelUsage *NONNULL_PTR this_ptr, struct LDKEffectiveCapacity val); /* @internal */ -export function ChannelUsage_set_effective_capacity(this_ptr: number, val: number): void { +export function ChannelUsage_set_effective_capacity(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31409,16 +31416,16 @@ export function ChannelUsage_set_effective_capacity(this_ptr: number, val: numbe } // MUST_USE_RES struct LDKChannelUsage ChannelUsage_new(uint64_t amount_msat_arg, uint64_t inflight_htlc_msat_arg, struct LDKEffectiveCapacity effective_capacity_arg); /* @internal */ -export function ChannelUsage_new(amount_msat_arg: bigint, inflight_htlc_msat_arg: bigint, effective_capacity_arg: number): number { +export function ChannelUsage_new(amount_msat_arg: bigint, inflight_htlc_msat_arg: bigint, effective_capacity_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_ChannelUsage_new(amount_msat_arg, inflight_htlc_msat_arg, effective_capacity_arg); return nativeResponseValue; } - // uintptr_t ChannelUsage_clone_ptr(LDKChannelUsage *NONNULL_PTR arg); + // uint64_t ChannelUsage_clone_ptr(LDKChannelUsage *NONNULL_PTR arg); /* @internal */ -export function ChannelUsage_clone_ptr(arg: number): number { +export function ChannelUsage_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31427,7 +31434,7 @@ export function ChannelUsage_clone_ptr(arg: number): number { } // struct LDKChannelUsage ChannelUsage_clone(const struct LDKChannelUsage *NONNULL_PTR orig); /* @internal */ -export function ChannelUsage_clone(orig: number): number { +export function ChannelUsage_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31436,16 +31443,16 @@ export function ChannelUsage_clone(orig: number): number { } // void FixedPenaltyScorer_free(struct LDKFixedPenaltyScorer this_obj); /* @internal */ -export function FixedPenaltyScorer_free(this_obj: number): void { +export function FixedPenaltyScorer_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_FixedPenaltyScorer_free(this_obj); // debug statements here } - // uintptr_t FixedPenaltyScorer_clone_ptr(LDKFixedPenaltyScorer *NONNULL_PTR arg); + // uint64_t FixedPenaltyScorer_clone_ptr(LDKFixedPenaltyScorer *NONNULL_PTR arg); /* @internal */ -export function FixedPenaltyScorer_clone_ptr(arg: number): number { +export function FixedPenaltyScorer_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31454,7 +31461,7 @@ export function FixedPenaltyScorer_clone_ptr(arg: number): number { } // struct LDKFixedPenaltyScorer FixedPenaltyScorer_clone(const struct LDKFixedPenaltyScorer *NONNULL_PTR orig); /* @internal */ -export function FixedPenaltyScorer_clone(orig: number): number { +export function FixedPenaltyScorer_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31463,7 +31470,7 @@ export function FixedPenaltyScorer_clone(orig: number): number { } // MUST_USE_RES struct LDKFixedPenaltyScorer FixedPenaltyScorer_with_penalty(uint64_t penalty_msat); /* @internal */ -export function FixedPenaltyScorer_with_penalty(penalty_msat: bigint): number { +export function FixedPenaltyScorer_with_penalty(penalty_msat: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31472,7 +31479,7 @@ export function FixedPenaltyScorer_with_penalty(penalty_msat: bigint): number { } // struct LDKScore FixedPenaltyScorer_as_Score(const struct LDKFixedPenaltyScorer *NONNULL_PTR this_arg); /* @internal */ -export function FixedPenaltyScorer_as_Score(this_arg: number): number { +export function FixedPenaltyScorer_as_Score(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31481,7 +31488,7 @@ export function FixedPenaltyScorer_as_Score(this_arg: number): number { } // struct LDKCVec_u8Z FixedPenaltyScorer_write(const struct LDKFixedPenaltyScorer *NONNULL_PTR obj); /* @internal */ -export function FixedPenaltyScorer_write(obj: number): number { +export function FixedPenaltyScorer_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31490,7 +31497,7 @@ export function FixedPenaltyScorer_write(obj: number): number { } // struct LDKCResult_FixedPenaltyScorerDecodeErrorZ FixedPenaltyScorer_read(struct LDKu8slice ser, uint64_t arg); /* @internal */ -export function FixedPenaltyScorer_read(ser: number, arg: bigint): number { +export function FixedPenaltyScorer_read(ser: number, arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31499,7 +31506,7 @@ export function FixedPenaltyScorer_read(ser: number, arg: bigint): number { } // void ProbabilisticScorer_free(struct LDKProbabilisticScorer this_obj); /* @internal */ -export function ProbabilisticScorer_free(this_obj: number): void { +export function ProbabilisticScorer_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31508,7 +31515,7 @@ export function ProbabilisticScorer_free(this_obj: number): void { } // void ProbabilisticScoringParameters_free(struct LDKProbabilisticScoringParameters this_obj); /* @internal */ -export function ProbabilisticScoringParameters_free(this_obj: number): void { +export function ProbabilisticScoringParameters_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31517,7 +31524,7 @@ export function ProbabilisticScoringParameters_free(this_obj: number): void { } // uint64_t ProbabilisticScoringParameters_get_base_penalty_msat(const struct LDKProbabilisticScoringParameters *NONNULL_PTR this_ptr); /* @internal */ -export function ProbabilisticScoringParameters_get_base_penalty_msat(this_ptr: number): bigint { +export function ProbabilisticScoringParameters_get_base_penalty_msat(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31526,7 +31533,7 @@ export function ProbabilisticScoringParameters_get_base_penalty_msat(this_ptr: n } // void ProbabilisticScoringParameters_set_base_penalty_msat(struct LDKProbabilisticScoringParameters *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function ProbabilisticScoringParameters_set_base_penalty_msat(this_ptr: number, val: bigint): void { +export function ProbabilisticScoringParameters_set_base_penalty_msat(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31535,7 +31542,7 @@ export function ProbabilisticScoringParameters_set_base_penalty_msat(this_ptr: n } // uint64_t ProbabilisticScoringParameters_get_base_penalty_amount_multiplier_msat(const struct LDKProbabilisticScoringParameters *NONNULL_PTR this_ptr); /* @internal */ -export function ProbabilisticScoringParameters_get_base_penalty_amount_multiplier_msat(this_ptr: number): bigint { +export function ProbabilisticScoringParameters_get_base_penalty_amount_multiplier_msat(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31544,7 +31551,7 @@ export function ProbabilisticScoringParameters_get_base_penalty_amount_multiplie } // void ProbabilisticScoringParameters_set_base_penalty_amount_multiplier_msat(struct LDKProbabilisticScoringParameters *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function ProbabilisticScoringParameters_set_base_penalty_amount_multiplier_msat(this_ptr: number, val: bigint): void { +export function ProbabilisticScoringParameters_set_base_penalty_amount_multiplier_msat(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31553,7 +31560,7 @@ export function ProbabilisticScoringParameters_set_base_penalty_amount_multiplie } // uint64_t ProbabilisticScoringParameters_get_liquidity_penalty_multiplier_msat(const struct LDKProbabilisticScoringParameters *NONNULL_PTR this_ptr); /* @internal */ -export function ProbabilisticScoringParameters_get_liquidity_penalty_multiplier_msat(this_ptr: number): bigint { +export function ProbabilisticScoringParameters_get_liquidity_penalty_multiplier_msat(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31562,7 +31569,7 @@ export function ProbabilisticScoringParameters_get_liquidity_penalty_multiplier_ } // void ProbabilisticScoringParameters_set_liquidity_penalty_multiplier_msat(struct LDKProbabilisticScoringParameters *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function ProbabilisticScoringParameters_set_liquidity_penalty_multiplier_msat(this_ptr: number, val: bigint): void { +export function ProbabilisticScoringParameters_set_liquidity_penalty_multiplier_msat(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31571,7 +31578,7 @@ export function ProbabilisticScoringParameters_set_liquidity_penalty_multiplier_ } // uint64_t ProbabilisticScoringParameters_get_liquidity_offset_half_life(const struct LDKProbabilisticScoringParameters *NONNULL_PTR this_ptr); /* @internal */ -export function ProbabilisticScoringParameters_get_liquidity_offset_half_life(this_ptr: number): bigint { +export function ProbabilisticScoringParameters_get_liquidity_offset_half_life(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31580,7 +31587,7 @@ export function ProbabilisticScoringParameters_get_liquidity_offset_half_life(th } // void ProbabilisticScoringParameters_set_liquidity_offset_half_life(struct LDKProbabilisticScoringParameters *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function ProbabilisticScoringParameters_set_liquidity_offset_half_life(this_ptr: number, val: bigint): void { +export function ProbabilisticScoringParameters_set_liquidity_offset_half_life(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31589,7 +31596,7 @@ export function ProbabilisticScoringParameters_set_liquidity_offset_half_life(th } // uint64_t ProbabilisticScoringParameters_get_liquidity_penalty_amount_multiplier_msat(const struct LDKProbabilisticScoringParameters *NONNULL_PTR this_ptr); /* @internal */ -export function ProbabilisticScoringParameters_get_liquidity_penalty_amount_multiplier_msat(this_ptr: number): bigint { +export function ProbabilisticScoringParameters_get_liquidity_penalty_amount_multiplier_msat(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31598,7 +31605,7 @@ export function ProbabilisticScoringParameters_get_liquidity_penalty_amount_mult } // void ProbabilisticScoringParameters_set_liquidity_penalty_amount_multiplier_msat(struct LDKProbabilisticScoringParameters *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function ProbabilisticScoringParameters_set_liquidity_penalty_amount_multiplier_msat(this_ptr: number, val: bigint): void { +export function ProbabilisticScoringParameters_set_liquidity_penalty_amount_multiplier_msat(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31607,7 +31614,7 @@ export function ProbabilisticScoringParameters_set_liquidity_penalty_amount_mult } // uint64_t ProbabilisticScoringParameters_get_anti_probing_penalty_msat(const struct LDKProbabilisticScoringParameters *NONNULL_PTR this_ptr); /* @internal */ -export function ProbabilisticScoringParameters_get_anti_probing_penalty_msat(this_ptr: number): bigint { +export function ProbabilisticScoringParameters_get_anti_probing_penalty_msat(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31616,7 +31623,7 @@ export function ProbabilisticScoringParameters_get_anti_probing_penalty_msat(thi } // void ProbabilisticScoringParameters_set_anti_probing_penalty_msat(struct LDKProbabilisticScoringParameters *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function ProbabilisticScoringParameters_set_anti_probing_penalty_msat(this_ptr: number, val: bigint): void { +export function ProbabilisticScoringParameters_set_anti_probing_penalty_msat(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31625,7 +31632,7 @@ export function ProbabilisticScoringParameters_set_anti_probing_penalty_msat(thi } // uint64_t ProbabilisticScoringParameters_get_considered_impossible_penalty_msat(const struct LDKProbabilisticScoringParameters *NONNULL_PTR this_ptr); /* @internal */ -export function ProbabilisticScoringParameters_get_considered_impossible_penalty_msat(this_ptr: number): bigint { +export function ProbabilisticScoringParameters_get_considered_impossible_penalty_msat(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31634,16 +31641,16 @@ export function ProbabilisticScoringParameters_get_considered_impossible_penalty } // void ProbabilisticScoringParameters_set_considered_impossible_penalty_msat(struct LDKProbabilisticScoringParameters *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function ProbabilisticScoringParameters_set_considered_impossible_penalty_msat(this_ptr: number, val: bigint): void { +export function ProbabilisticScoringParameters_set_considered_impossible_penalty_msat(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_ProbabilisticScoringParameters_set_considered_impossible_penalty_msat(this_ptr, val); // debug statements here } - // uintptr_t ProbabilisticScoringParameters_clone_ptr(LDKProbabilisticScoringParameters *NONNULL_PTR arg); + // uint64_t ProbabilisticScoringParameters_clone_ptr(LDKProbabilisticScoringParameters *NONNULL_PTR arg); /* @internal */ -export function ProbabilisticScoringParameters_clone_ptr(arg: number): number { +export function ProbabilisticScoringParameters_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31652,7 +31659,7 @@ export function ProbabilisticScoringParameters_clone_ptr(arg: number): number { } // struct LDKProbabilisticScoringParameters ProbabilisticScoringParameters_clone(const struct LDKProbabilisticScoringParameters *NONNULL_PTR orig); /* @internal */ -export function ProbabilisticScoringParameters_clone(orig: number): number { +export function ProbabilisticScoringParameters_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31661,7 +31668,7 @@ export function ProbabilisticScoringParameters_clone(orig: number): number { } // MUST_USE_RES struct LDKProbabilisticScorer ProbabilisticScorer_new(struct LDKProbabilisticScoringParameters params, const struct LDKNetworkGraph *NONNULL_PTR network_graph, struct LDKLogger logger); /* @internal */ -export function ProbabilisticScorer_new(params: number, network_graph: number, logger: number): number { +export function ProbabilisticScorer_new(params: bigint, network_graph: bigint, logger: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31670,7 +31677,7 @@ export function ProbabilisticScorer_new(params: number, network_graph: number, l } // void ProbabilisticScorer_debug_log_liquidity_stats(const struct LDKProbabilisticScorer *NONNULL_PTR this_arg); /* @internal */ -export function ProbabilisticScorer_debug_log_liquidity_stats(this_arg: number): void { +export function ProbabilisticScorer_debug_log_liquidity_stats(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31679,7 +31686,7 @@ export function ProbabilisticScorer_debug_log_liquidity_stats(this_arg: number): } // MUST_USE_RES struct LDKCOption_C2Tuple_u64u64ZZ ProbabilisticScorer_estimated_channel_liquidity_range(const struct LDKProbabilisticScorer *NONNULL_PTR this_arg, uint64_t scid, const struct LDKNodeId *NONNULL_PTR target); /* @internal */ -export function ProbabilisticScorer_estimated_channel_liquidity_range(this_arg: number, scid: bigint, target: number): number { +export function ProbabilisticScorer_estimated_channel_liquidity_range(this_arg: bigint, scid: bigint, target: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31688,7 +31695,7 @@ export function ProbabilisticScorer_estimated_channel_liquidity_range(this_arg: } // void ProbabilisticScorer_add_banned(struct LDKProbabilisticScorer *NONNULL_PTR this_arg, const struct LDKNodeId *NONNULL_PTR node_id); /* @internal */ -export function ProbabilisticScorer_add_banned(this_arg: number, node_id: number): void { +export function ProbabilisticScorer_add_banned(this_arg: bigint, node_id: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31697,7 +31704,7 @@ export function ProbabilisticScorer_add_banned(this_arg: number, node_id: number } // void ProbabilisticScorer_remove_banned(struct LDKProbabilisticScorer *NONNULL_PTR this_arg, const struct LDKNodeId *NONNULL_PTR node_id); /* @internal */ -export function ProbabilisticScorer_remove_banned(this_arg: number, node_id: number): void { +export function ProbabilisticScorer_remove_banned(this_arg: bigint, node_id: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31706,7 +31713,7 @@ export function ProbabilisticScorer_remove_banned(this_arg: number, node_id: num } // void ProbabilisticScorer_set_manual_penalty(struct LDKProbabilisticScorer *NONNULL_PTR this_arg, const struct LDKNodeId *NONNULL_PTR node_id, uint64_t penalty); /* @internal */ -export function ProbabilisticScorer_set_manual_penalty(this_arg: number, node_id: number, penalty: bigint): void { +export function ProbabilisticScorer_set_manual_penalty(this_arg: bigint, node_id: bigint, penalty: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31715,7 +31722,7 @@ export function ProbabilisticScorer_set_manual_penalty(this_arg: number, node_id } // void ProbabilisticScorer_remove_manual_penalty(struct LDKProbabilisticScorer *NONNULL_PTR this_arg, const struct LDKNodeId *NONNULL_PTR node_id); /* @internal */ -export function ProbabilisticScorer_remove_manual_penalty(this_arg: number, node_id: number): void { +export function ProbabilisticScorer_remove_manual_penalty(this_arg: bigint, node_id: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31724,7 +31731,7 @@ export function ProbabilisticScorer_remove_manual_penalty(this_arg: number, node } // void ProbabilisticScorer_clear_manual_penalties(struct LDKProbabilisticScorer *NONNULL_PTR this_arg); /* @internal */ -export function ProbabilisticScorer_clear_manual_penalties(this_arg: number): void { +export function ProbabilisticScorer_clear_manual_penalties(this_arg: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31733,7 +31740,7 @@ export function ProbabilisticScorer_clear_manual_penalties(this_arg: number): vo } // void ProbabilisticScoringParameters_add_banned_from_list(struct LDKProbabilisticScoringParameters *NONNULL_PTR this_arg, struct LDKCVec_NodeIdZ node_ids); /* @internal */ -export function ProbabilisticScoringParameters_add_banned_from_list(this_arg: number, node_ids: number): void { +export function ProbabilisticScoringParameters_add_banned_from_list(this_arg: bigint, node_ids: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31742,7 +31749,7 @@ export function ProbabilisticScoringParameters_add_banned_from_list(this_arg: nu } // MUST_USE_RES struct LDKProbabilisticScoringParameters ProbabilisticScoringParameters_default(void); /* @internal */ -export function ProbabilisticScoringParameters_default(): number { +export function ProbabilisticScoringParameters_default(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31751,7 +31758,7 @@ export function ProbabilisticScoringParameters_default(): number { } // struct LDKScore ProbabilisticScorer_as_Score(const struct LDKProbabilisticScorer *NONNULL_PTR this_arg); /* @internal */ -export function ProbabilisticScorer_as_Score(this_arg: number): number { +export function ProbabilisticScorer_as_Score(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31760,7 +31767,7 @@ export function ProbabilisticScorer_as_Score(this_arg: number): number { } // struct LDKCVec_u8Z ProbabilisticScorer_write(const struct LDKProbabilisticScorer *NONNULL_PTR obj); /* @internal */ -export function ProbabilisticScorer_write(obj: number): number { +export function ProbabilisticScorer_write(obj: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31769,7 +31776,7 @@ export function ProbabilisticScorer_write(obj: number): number { } // struct LDKCResult_ProbabilisticScorerDecodeErrorZ ProbabilisticScorer_read(struct LDKu8slice ser, struct LDKProbabilisticScoringParameters arg_a, const struct LDKNetworkGraph *NONNULL_PTR arg_b, struct LDKLogger arg_c); /* @internal */ -export function ProbabilisticScorer_read(ser: number, arg_a: number, arg_b: number, arg_c: number): number { +export function ProbabilisticScorer_read(ser: number, arg_a: bigint, arg_b: bigint, arg_c: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31778,16 +31785,16 @@ export function ProbabilisticScorer_read(ser: number, arg_a: number, arg_b: numb } // void ParseError_free(struct LDKParseError this_ptr); /* @internal */ -export function ParseError_free(this_ptr: number): void { +export function ParseError_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_ParseError_free(this_ptr); // debug statements here } - // uintptr_t ParseError_clone_ptr(LDKParseError *NONNULL_PTR arg); + // uint64_t ParseError_clone_ptr(LDKParseError *NONNULL_PTR arg); /* @internal */ -export function ParseError_clone_ptr(arg: number): number { +export function ParseError_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31796,7 +31803,7 @@ export function ParseError_clone_ptr(arg: number): number { } // struct LDKParseError ParseError_clone(const struct LDKParseError *NONNULL_PTR orig); /* @internal */ -export function ParseError_clone(orig: number): number { +export function ParseError_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31805,7 +31812,7 @@ export function ParseError_clone(orig: number): number { } // struct LDKParseError ParseError_bech32_error(struct LDKBech32Error a); /* @internal */ -export function ParseError_bech32_error(a: number): number { +export function ParseError_bech32_error(a: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31814,7 +31821,7 @@ export function ParseError_bech32_error(a: number): number { } // struct LDKParseError ParseError_parse_amount_error(struct LDKError a); /* @internal */ -export function ParseError_parse_amount_error(a: number): number { +export function ParseError_parse_amount_error(a: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31823,7 +31830,7 @@ export function ParseError_parse_amount_error(a: number): number { } // struct LDKParseError ParseError_malformed_signature(enum LDKSecp256k1Error a); /* @internal */ -export function ParseError_malformed_signature(a: Secp256k1Error): number { +export function ParseError_malformed_signature(a: Secp256k1Error): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31832,7 +31839,7 @@ export function ParseError_malformed_signature(a: Secp256k1Error): number { } // struct LDKParseError ParseError_bad_prefix(void); /* @internal */ -export function ParseError_bad_prefix(): number { +export function ParseError_bad_prefix(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31841,7 +31848,7 @@ export function ParseError_bad_prefix(): number { } // struct LDKParseError ParseError_unknown_currency(void); /* @internal */ -export function ParseError_unknown_currency(): number { +export function ParseError_unknown_currency(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31850,7 +31857,7 @@ export function ParseError_unknown_currency(): number { } // struct LDKParseError ParseError_unknown_si_prefix(void); /* @internal */ -export function ParseError_unknown_si_prefix(): number { +export function ParseError_unknown_si_prefix(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31859,7 +31866,7 @@ export function ParseError_unknown_si_prefix(): number { } // struct LDKParseError ParseError_malformed_hrp(void); /* @internal */ -export function ParseError_malformed_hrp(): number { +export function ParseError_malformed_hrp(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31868,7 +31875,7 @@ export function ParseError_malformed_hrp(): number { } // struct LDKParseError ParseError_too_short_data_part(void); /* @internal */ -export function ParseError_too_short_data_part(): number { +export function ParseError_too_short_data_part(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31877,7 +31884,7 @@ export function ParseError_too_short_data_part(): number { } // struct LDKParseError ParseError_unexpected_end_of_tagged_fields(void); /* @internal */ -export function ParseError_unexpected_end_of_tagged_fields(): number { +export function ParseError_unexpected_end_of_tagged_fields(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31886,7 +31893,7 @@ export function ParseError_unexpected_end_of_tagged_fields(): number { } // struct LDKParseError ParseError_description_decode_error(struct LDKError a); /* @internal */ -export function ParseError_description_decode_error(a: number): number { +export function ParseError_description_decode_error(a: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31895,7 +31902,7 @@ export function ParseError_description_decode_error(a: number): number { } // struct LDKParseError ParseError_padding_error(void); /* @internal */ -export function ParseError_padding_error(): number { +export function ParseError_padding_error(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31904,7 +31911,7 @@ export function ParseError_padding_error(): number { } // struct LDKParseError ParseError_integer_overflow_error(void); /* @internal */ -export function ParseError_integer_overflow_error(): number { +export function ParseError_integer_overflow_error(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31913,7 +31920,7 @@ export function ParseError_integer_overflow_error(): number { } // struct LDKParseError ParseError_invalid_seg_wit_program_length(void); /* @internal */ -export function ParseError_invalid_seg_wit_program_length(): number { +export function ParseError_invalid_seg_wit_program_length(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31922,7 +31929,7 @@ export function ParseError_invalid_seg_wit_program_length(): number { } // struct LDKParseError ParseError_invalid_pub_key_hash_length(void); /* @internal */ -export function ParseError_invalid_pub_key_hash_length(): number { +export function ParseError_invalid_pub_key_hash_length(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31931,7 +31938,7 @@ export function ParseError_invalid_pub_key_hash_length(): number { } // struct LDKParseError ParseError_invalid_script_hash_length(void); /* @internal */ -export function ParseError_invalid_script_hash_length(): number { +export function ParseError_invalid_script_hash_length(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31940,7 +31947,7 @@ export function ParseError_invalid_script_hash_length(): number { } // struct LDKParseError ParseError_invalid_recovery_id(void); /* @internal */ -export function ParseError_invalid_recovery_id(): number { +export function ParseError_invalid_recovery_id(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31949,7 +31956,7 @@ export function ParseError_invalid_recovery_id(): number { } // struct LDKParseError ParseError_invalid_slice_length(struct LDKStr a); /* @internal */ -export function ParseError_invalid_slice_length(a: number): number { +export function ParseError_invalid_slice_length(a: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31958,7 +31965,7 @@ export function ParseError_invalid_slice_length(a: number): number { } // struct LDKParseError ParseError_skip(void); /* @internal */ -export function ParseError_skip(): number { +export function ParseError_skip(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31967,16 +31974,16 @@ export function ParseError_skip(): number { } // void ParseOrSemanticError_free(struct LDKParseOrSemanticError this_ptr); /* @internal */ -export function ParseOrSemanticError_free(this_ptr: number): void { +export function ParseOrSemanticError_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_ParseOrSemanticError_free(this_ptr); // debug statements here } - // uintptr_t ParseOrSemanticError_clone_ptr(LDKParseOrSemanticError *NONNULL_PTR arg); + // uint64_t ParseOrSemanticError_clone_ptr(LDKParseOrSemanticError *NONNULL_PTR arg); /* @internal */ -export function ParseOrSemanticError_clone_ptr(arg: number): number { +export function ParseOrSemanticError_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31985,7 +31992,7 @@ export function ParseOrSemanticError_clone_ptr(arg: number): number { } // struct LDKParseOrSemanticError ParseOrSemanticError_clone(const struct LDKParseOrSemanticError *NONNULL_PTR orig); /* @internal */ -export function ParseOrSemanticError_clone(orig: number): number { +export function ParseOrSemanticError_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -31994,7 +32001,7 @@ export function ParseOrSemanticError_clone(orig: number): number { } // struct LDKParseOrSemanticError ParseOrSemanticError_parse_error(struct LDKParseError a); /* @internal */ -export function ParseOrSemanticError_parse_error(a: number): number { +export function ParseOrSemanticError_parse_error(a: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32003,7 +32010,7 @@ export function ParseOrSemanticError_parse_error(a: number): number { } // struct LDKParseOrSemanticError ParseOrSemanticError_semantic_error(enum LDKSemanticError a); /* @internal */ -export function ParseOrSemanticError_semantic_error(a: SemanticError): number { +export function ParseOrSemanticError_semantic_error(a: SemanticError): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32012,7 +32019,7 @@ export function ParseOrSemanticError_semantic_error(a: SemanticError): number { } // void Invoice_free(struct LDKInvoice this_obj); /* @internal */ -export function Invoice_free(this_obj: number): void { +export function Invoice_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32021,16 +32028,16 @@ export function Invoice_free(this_obj: number): void { } // bool Invoice_eq(const struct LDKInvoice *NONNULL_PTR a, const struct LDKInvoice *NONNULL_PTR b); /* @internal */ -export function Invoice_eq(a: number, b: number): boolean { +export function Invoice_eq(a: bigint, b: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_Invoice_eq(a, b); return nativeResponseValue; } - // uintptr_t Invoice_clone_ptr(LDKInvoice *NONNULL_PTR arg); + // uint64_t Invoice_clone_ptr(LDKInvoice *NONNULL_PTR arg); /* @internal */ -export function Invoice_clone_ptr(arg: number): number { +export function Invoice_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32039,7 +32046,7 @@ export function Invoice_clone_ptr(arg: number): number { } // struct LDKInvoice Invoice_clone(const struct LDKInvoice *NONNULL_PTR orig); /* @internal */ -export function Invoice_clone(orig: number): number { +export function Invoice_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32048,7 +32055,7 @@ export function Invoice_clone(orig: number): number { } // void SignedRawInvoice_free(struct LDKSignedRawInvoice this_obj); /* @internal */ -export function SignedRawInvoice_free(this_obj: number): void { +export function SignedRawInvoice_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32057,16 +32064,16 @@ export function SignedRawInvoice_free(this_obj: number): void { } // bool SignedRawInvoice_eq(const struct LDKSignedRawInvoice *NONNULL_PTR a, const struct LDKSignedRawInvoice *NONNULL_PTR b); /* @internal */ -export function SignedRawInvoice_eq(a: number, b: number): boolean { +export function SignedRawInvoice_eq(a: bigint, b: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_SignedRawInvoice_eq(a, b); return nativeResponseValue; } - // uintptr_t SignedRawInvoice_clone_ptr(LDKSignedRawInvoice *NONNULL_PTR arg); + // uint64_t SignedRawInvoice_clone_ptr(LDKSignedRawInvoice *NONNULL_PTR arg); /* @internal */ -export function SignedRawInvoice_clone_ptr(arg: number): number { +export function SignedRawInvoice_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32075,7 +32082,7 @@ export function SignedRawInvoice_clone_ptr(arg: number): number { } // struct LDKSignedRawInvoice SignedRawInvoice_clone(const struct LDKSignedRawInvoice *NONNULL_PTR orig); /* @internal */ -export function SignedRawInvoice_clone(orig: number): number { +export function SignedRawInvoice_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32084,7 +32091,7 @@ export function SignedRawInvoice_clone(orig: number): number { } // void RawInvoice_free(struct LDKRawInvoice this_obj); /* @internal */ -export function RawInvoice_free(this_obj: number): void { +export function RawInvoice_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32093,7 +32100,7 @@ export function RawInvoice_free(this_obj: number): void { } // struct LDKRawDataPart RawInvoice_get_data(const struct LDKRawInvoice *NONNULL_PTR this_ptr); /* @internal */ -export function RawInvoice_get_data(this_ptr: number): number { +export function RawInvoice_get_data(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32102,7 +32109,7 @@ export function RawInvoice_get_data(this_ptr: number): number { } // void RawInvoice_set_data(struct LDKRawInvoice *NONNULL_PTR this_ptr, struct LDKRawDataPart val); /* @internal */ -export function RawInvoice_set_data(this_ptr: number, val: number): void { +export function RawInvoice_set_data(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32111,16 +32118,16 @@ export function RawInvoice_set_data(this_ptr: number, val: number): void { } // bool RawInvoice_eq(const struct LDKRawInvoice *NONNULL_PTR a, const struct LDKRawInvoice *NONNULL_PTR b); /* @internal */ -export function RawInvoice_eq(a: number, b: number): boolean { +export function RawInvoice_eq(a: bigint, b: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_RawInvoice_eq(a, b); return nativeResponseValue; } - // uintptr_t RawInvoice_clone_ptr(LDKRawInvoice *NONNULL_PTR arg); + // uint64_t RawInvoice_clone_ptr(LDKRawInvoice *NONNULL_PTR arg); /* @internal */ -export function RawInvoice_clone_ptr(arg: number): number { +export function RawInvoice_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32129,7 +32136,7 @@ export function RawInvoice_clone_ptr(arg: number): number { } // struct LDKRawInvoice RawInvoice_clone(const struct LDKRawInvoice *NONNULL_PTR orig); /* @internal */ -export function RawInvoice_clone(orig: number): number { +export function RawInvoice_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32138,7 +32145,7 @@ export function RawInvoice_clone(orig: number): number { } // void RawDataPart_free(struct LDKRawDataPart this_obj); /* @internal */ -export function RawDataPart_free(this_obj: number): void { +export function RawDataPart_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32147,7 +32154,7 @@ export function RawDataPart_free(this_obj: number): void { } // struct LDKPositiveTimestamp RawDataPart_get_timestamp(const struct LDKRawDataPart *NONNULL_PTR this_ptr); /* @internal */ -export function RawDataPart_get_timestamp(this_ptr: number): number { +export function RawDataPart_get_timestamp(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32156,7 +32163,7 @@ export function RawDataPart_get_timestamp(this_ptr: number): number { } // void RawDataPart_set_timestamp(struct LDKRawDataPart *NONNULL_PTR this_ptr, struct LDKPositiveTimestamp val); /* @internal */ -export function RawDataPart_set_timestamp(this_ptr: number, val: number): void { +export function RawDataPart_set_timestamp(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32165,16 +32172,16 @@ export function RawDataPart_set_timestamp(this_ptr: number, val: number): void { } // bool RawDataPart_eq(const struct LDKRawDataPart *NONNULL_PTR a, const struct LDKRawDataPart *NONNULL_PTR b); /* @internal */ -export function RawDataPart_eq(a: number, b: number): boolean { +export function RawDataPart_eq(a: bigint, b: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_RawDataPart_eq(a, b); return nativeResponseValue; } - // uintptr_t RawDataPart_clone_ptr(LDKRawDataPart *NONNULL_PTR arg); + // uint64_t RawDataPart_clone_ptr(LDKRawDataPart *NONNULL_PTR arg); /* @internal */ -export function RawDataPart_clone_ptr(arg: number): number { +export function RawDataPart_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32183,7 +32190,7 @@ export function RawDataPart_clone_ptr(arg: number): number { } // struct LDKRawDataPart RawDataPart_clone(const struct LDKRawDataPart *NONNULL_PTR orig); /* @internal */ -export function RawDataPart_clone(orig: number): number { +export function RawDataPart_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32192,7 +32199,7 @@ export function RawDataPart_clone(orig: number): number { } // void PositiveTimestamp_free(struct LDKPositiveTimestamp this_obj); /* @internal */ -export function PositiveTimestamp_free(this_obj: number): void { +export function PositiveTimestamp_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32201,16 +32208,16 @@ export function PositiveTimestamp_free(this_obj: number): void { } // bool PositiveTimestamp_eq(const struct LDKPositiveTimestamp *NONNULL_PTR a, const struct LDKPositiveTimestamp *NONNULL_PTR b); /* @internal */ -export function PositiveTimestamp_eq(a: number, b: number): boolean { +export function PositiveTimestamp_eq(a: bigint, b: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_PositiveTimestamp_eq(a, b); return nativeResponseValue; } - // uintptr_t PositiveTimestamp_clone_ptr(LDKPositiveTimestamp *NONNULL_PTR arg); + // uint64_t PositiveTimestamp_clone_ptr(LDKPositiveTimestamp *NONNULL_PTR arg); /* @internal */ -export function PositiveTimestamp_clone_ptr(arg: number): number { +export function PositiveTimestamp_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32219,7 +32226,7 @@ export function PositiveTimestamp_clone_ptr(arg: number): number { } // struct LDKPositiveTimestamp PositiveTimestamp_clone(const struct LDKPositiveTimestamp *NONNULL_PTR orig); /* @internal */ -export function PositiveTimestamp_clone(orig: number): number { +export function PositiveTimestamp_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32228,7 +32235,7 @@ export function PositiveTimestamp_clone(orig: number): number { } // enum LDKSiPrefix SiPrefix_clone(const enum LDKSiPrefix *NONNULL_PTR orig); /* @internal */ -export function SiPrefix_clone(orig: number): SiPrefix { +export function SiPrefix_clone(orig: bigint): SiPrefix { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32273,7 +32280,7 @@ export function SiPrefix_pico(): SiPrefix { } // bool SiPrefix_eq(const enum LDKSiPrefix *NONNULL_PTR a, const enum LDKSiPrefix *NONNULL_PTR b); /* @internal */ -export function SiPrefix_eq(a: number, b: number): boolean { +export function SiPrefix_eq(a: bigint, b: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32282,7 +32289,7 @@ export function SiPrefix_eq(a: number, b: number): boolean { } // MUST_USE_RES uint64_t SiPrefix_multiplier(const enum LDKSiPrefix *NONNULL_PTR this_arg); /* @internal */ -export function SiPrefix_multiplier(this_arg: number): bigint { +export function SiPrefix_multiplier(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32291,7 +32298,7 @@ export function SiPrefix_multiplier(this_arg: number): bigint { } // enum LDKCurrency Currency_clone(const enum LDKCurrency *NONNULL_PTR orig); /* @internal */ -export function Currency_clone(orig: number): Currency { +export function Currency_clone(orig: bigint): Currency { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32345,7 +32352,7 @@ export function Currency_signet(): Currency { } // uint64_t Currency_hash(const enum LDKCurrency *NONNULL_PTR o); /* @internal */ -export function Currency_hash(o: number): bigint { +export function Currency_hash(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32354,7 +32361,7 @@ export function Currency_hash(o: number): bigint { } // bool Currency_eq(const enum LDKCurrency *NONNULL_PTR a, const enum LDKCurrency *NONNULL_PTR b); /* @internal */ -export function Currency_eq(a: number, b: number): boolean { +export function Currency_eq(a: bigint, b: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32363,16 +32370,16 @@ export function Currency_eq(a: number, b: number): boolean { } // void Sha256_free(struct LDKSha256 this_obj); /* @internal */ -export function Sha256_free(this_obj: number): void { +export function Sha256_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_Sha256_free(this_obj); // debug statements here } - // uintptr_t Sha256_clone_ptr(LDKSha256 *NONNULL_PTR arg); + // uint64_t Sha256_clone_ptr(LDKSha256 *NONNULL_PTR arg); /* @internal */ -export function Sha256_clone_ptr(arg: number): number { +export function Sha256_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32381,7 +32388,7 @@ export function Sha256_clone_ptr(arg: number): number { } // struct LDKSha256 Sha256_clone(const struct LDKSha256 *NONNULL_PTR orig); /* @internal */ -export function Sha256_clone(orig: number): number { +export function Sha256_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32390,7 +32397,7 @@ export function Sha256_clone(orig: number): number { } // uint64_t Sha256_hash(const struct LDKSha256 *NONNULL_PTR o); /* @internal */ -export function Sha256_hash(o: number): bigint { +export function Sha256_hash(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32399,7 +32406,7 @@ export function Sha256_hash(o: number): bigint { } // bool Sha256_eq(const struct LDKSha256 *NONNULL_PTR a, const struct LDKSha256 *NONNULL_PTR b); /* @internal */ -export function Sha256_eq(a: number, b: number): boolean { +export function Sha256_eq(a: bigint, b: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32408,16 +32415,16 @@ export function Sha256_eq(a: number, b: number): boolean { } // void Description_free(struct LDKDescription this_obj); /* @internal */ -export function Description_free(this_obj: number): void { +export function Description_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_Description_free(this_obj); // debug statements here } - // uintptr_t Description_clone_ptr(LDKDescription *NONNULL_PTR arg); + // uint64_t Description_clone_ptr(LDKDescription *NONNULL_PTR arg); /* @internal */ -export function Description_clone_ptr(arg: number): number { +export function Description_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32426,7 +32433,7 @@ export function Description_clone_ptr(arg: number): number { } // struct LDKDescription Description_clone(const struct LDKDescription *NONNULL_PTR orig); /* @internal */ -export function Description_clone(orig: number): number { +export function Description_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32435,7 +32442,7 @@ export function Description_clone(orig: number): number { } // uint64_t Description_hash(const struct LDKDescription *NONNULL_PTR o); /* @internal */ -export function Description_hash(o: number): bigint { +export function Description_hash(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32444,7 +32451,7 @@ export function Description_hash(o: number): bigint { } // bool Description_eq(const struct LDKDescription *NONNULL_PTR a, const struct LDKDescription *NONNULL_PTR b); /* @internal */ -export function Description_eq(a: number, b: number): boolean { +export function Description_eq(a: bigint, b: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32453,7 +32460,7 @@ export function Description_eq(a: number, b: number): boolean { } // void PayeePubKey_free(struct LDKPayeePubKey this_obj); /* @internal */ -export function PayeePubKey_free(this_obj: number): void { +export function PayeePubKey_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32462,7 +32469,7 @@ export function PayeePubKey_free(this_obj: number): void { } // struct LDKPublicKey PayeePubKey_get_a(const struct LDKPayeePubKey *NONNULL_PTR this_ptr); /* @internal */ -export function PayeePubKey_get_a(this_ptr: number): number { +export function PayeePubKey_get_a(this_ptr: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32471,7 +32478,7 @@ export function PayeePubKey_get_a(this_ptr: number): number { } // void PayeePubKey_set_a(struct LDKPayeePubKey *NONNULL_PTR this_ptr, struct LDKPublicKey val); /* @internal */ -export function PayeePubKey_set_a(this_ptr: number, val: number): void { +export function PayeePubKey_set_a(this_ptr: bigint, val: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32480,16 +32487,16 @@ export function PayeePubKey_set_a(this_ptr: number, val: number): void { } // MUST_USE_RES struct LDKPayeePubKey PayeePubKey_new(struct LDKPublicKey a_arg); /* @internal */ -export function PayeePubKey_new(a_arg: number): number { +export function PayeePubKey_new(a_arg: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_PayeePubKey_new(a_arg); return nativeResponseValue; } - // uintptr_t PayeePubKey_clone_ptr(LDKPayeePubKey *NONNULL_PTR arg); + // uint64_t PayeePubKey_clone_ptr(LDKPayeePubKey *NONNULL_PTR arg); /* @internal */ -export function PayeePubKey_clone_ptr(arg: number): number { +export function PayeePubKey_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32498,7 +32505,7 @@ export function PayeePubKey_clone_ptr(arg: number): number { } // struct LDKPayeePubKey PayeePubKey_clone(const struct LDKPayeePubKey *NONNULL_PTR orig); /* @internal */ -export function PayeePubKey_clone(orig: number): number { +export function PayeePubKey_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32507,7 +32514,7 @@ export function PayeePubKey_clone(orig: number): number { } // uint64_t PayeePubKey_hash(const struct LDKPayeePubKey *NONNULL_PTR o); /* @internal */ -export function PayeePubKey_hash(o: number): bigint { +export function PayeePubKey_hash(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32516,7 +32523,7 @@ export function PayeePubKey_hash(o: number): bigint { } // bool PayeePubKey_eq(const struct LDKPayeePubKey *NONNULL_PTR a, const struct LDKPayeePubKey *NONNULL_PTR b); /* @internal */ -export function PayeePubKey_eq(a: number, b: number): boolean { +export function PayeePubKey_eq(a: bigint, b: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32525,16 +32532,16 @@ export function PayeePubKey_eq(a: number, b: number): boolean { } // void ExpiryTime_free(struct LDKExpiryTime this_obj); /* @internal */ -export function ExpiryTime_free(this_obj: number): void { +export function ExpiryTime_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_ExpiryTime_free(this_obj); // debug statements here } - // uintptr_t ExpiryTime_clone_ptr(LDKExpiryTime *NONNULL_PTR arg); + // uint64_t ExpiryTime_clone_ptr(LDKExpiryTime *NONNULL_PTR arg); /* @internal */ -export function ExpiryTime_clone_ptr(arg: number): number { +export function ExpiryTime_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32543,7 +32550,7 @@ export function ExpiryTime_clone_ptr(arg: number): number { } // struct LDKExpiryTime ExpiryTime_clone(const struct LDKExpiryTime *NONNULL_PTR orig); /* @internal */ -export function ExpiryTime_clone(orig: number): number { +export function ExpiryTime_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32552,7 +32559,7 @@ export function ExpiryTime_clone(orig: number): number { } // uint64_t ExpiryTime_hash(const struct LDKExpiryTime *NONNULL_PTR o); /* @internal */ -export function ExpiryTime_hash(o: number): bigint { +export function ExpiryTime_hash(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32561,7 +32568,7 @@ export function ExpiryTime_hash(o: number): bigint { } // bool ExpiryTime_eq(const struct LDKExpiryTime *NONNULL_PTR a, const struct LDKExpiryTime *NONNULL_PTR b); /* @internal */ -export function ExpiryTime_eq(a: number, b: number): boolean { +export function ExpiryTime_eq(a: bigint, b: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32570,7 +32577,7 @@ export function ExpiryTime_eq(a: number, b: number): boolean { } // void MinFinalCltvExpiry_free(struct LDKMinFinalCltvExpiry this_obj); /* @internal */ -export function MinFinalCltvExpiry_free(this_obj: number): void { +export function MinFinalCltvExpiry_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32579,7 +32586,7 @@ export function MinFinalCltvExpiry_free(this_obj: number): void { } // uint64_t MinFinalCltvExpiry_get_a(const struct LDKMinFinalCltvExpiry *NONNULL_PTR this_ptr); /* @internal */ -export function MinFinalCltvExpiry_get_a(this_ptr: number): bigint { +export function MinFinalCltvExpiry_get_a(this_ptr: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32588,7 +32595,7 @@ export function MinFinalCltvExpiry_get_a(this_ptr: number): bigint { } // void MinFinalCltvExpiry_set_a(struct LDKMinFinalCltvExpiry *NONNULL_PTR this_ptr, uint64_t val); /* @internal */ -export function MinFinalCltvExpiry_set_a(this_ptr: number, val: bigint): void { +export function MinFinalCltvExpiry_set_a(this_ptr: bigint, val: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32597,16 +32604,16 @@ export function MinFinalCltvExpiry_set_a(this_ptr: number, val: bigint): void { } // MUST_USE_RES struct LDKMinFinalCltvExpiry MinFinalCltvExpiry_new(uint64_t a_arg); /* @internal */ -export function MinFinalCltvExpiry_new(a_arg: bigint): number { +export function MinFinalCltvExpiry_new(a_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_MinFinalCltvExpiry_new(a_arg); return nativeResponseValue; } - // uintptr_t MinFinalCltvExpiry_clone_ptr(LDKMinFinalCltvExpiry *NONNULL_PTR arg); + // uint64_t MinFinalCltvExpiry_clone_ptr(LDKMinFinalCltvExpiry *NONNULL_PTR arg); /* @internal */ -export function MinFinalCltvExpiry_clone_ptr(arg: number): number { +export function MinFinalCltvExpiry_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32615,7 +32622,7 @@ export function MinFinalCltvExpiry_clone_ptr(arg: number): number { } // struct LDKMinFinalCltvExpiry MinFinalCltvExpiry_clone(const struct LDKMinFinalCltvExpiry *NONNULL_PTR orig); /* @internal */ -export function MinFinalCltvExpiry_clone(orig: number): number { +export function MinFinalCltvExpiry_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32624,7 +32631,7 @@ export function MinFinalCltvExpiry_clone(orig: number): number { } // uint64_t MinFinalCltvExpiry_hash(const struct LDKMinFinalCltvExpiry *NONNULL_PTR o); /* @internal */ -export function MinFinalCltvExpiry_hash(o: number): bigint { +export function MinFinalCltvExpiry_hash(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32633,7 +32640,7 @@ export function MinFinalCltvExpiry_hash(o: number): bigint { } // bool MinFinalCltvExpiry_eq(const struct LDKMinFinalCltvExpiry *NONNULL_PTR a, const struct LDKMinFinalCltvExpiry *NONNULL_PTR b); /* @internal */ -export function MinFinalCltvExpiry_eq(a: number, b: number): boolean { +export function MinFinalCltvExpiry_eq(a: bigint, b: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32642,16 +32649,16 @@ export function MinFinalCltvExpiry_eq(a: number, b: number): boolean { } // void Fallback_free(struct LDKFallback this_ptr); /* @internal */ -export function Fallback_free(this_ptr: number): void { +export function Fallback_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_Fallback_free(this_ptr); // debug statements here } - // uintptr_t Fallback_clone_ptr(LDKFallback *NONNULL_PTR arg); + // uint64_t Fallback_clone_ptr(LDKFallback *NONNULL_PTR arg); /* @internal */ -export function Fallback_clone_ptr(arg: number): number { +export function Fallback_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32660,7 +32667,7 @@ export function Fallback_clone_ptr(arg: number): number { } // struct LDKFallback Fallback_clone(const struct LDKFallback *NONNULL_PTR orig); /* @internal */ -export function Fallback_clone(orig: number): number { +export function Fallback_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32669,7 +32676,7 @@ export function Fallback_clone(orig: number): number { } // struct LDKFallback Fallback_seg_wit_program(struct LDKu5 version, struct LDKCVec_u8Z program); /* @internal */ -export function Fallback_seg_wit_program(version: number, program: number): number { +export function Fallback_seg_wit_program(version: number, program: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32678,7 +32685,7 @@ export function Fallback_seg_wit_program(version: number, program: number): numb } // struct LDKFallback Fallback_pub_key_hash(struct LDKTwentyBytes a); /* @internal */ -export function Fallback_pub_key_hash(a: number): number { +export function Fallback_pub_key_hash(a: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32687,7 +32694,7 @@ export function Fallback_pub_key_hash(a: number): number { } // struct LDKFallback Fallback_script_hash(struct LDKTwentyBytes a); /* @internal */ -export function Fallback_script_hash(a: number): number { +export function Fallback_script_hash(a: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32696,7 +32703,7 @@ export function Fallback_script_hash(a: number): number { } // uint64_t Fallback_hash(const struct LDKFallback *NONNULL_PTR o); /* @internal */ -export function Fallback_hash(o: number): bigint { +export function Fallback_hash(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32705,7 +32712,7 @@ export function Fallback_hash(o: number): bigint { } // bool Fallback_eq(const struct LDKFallback *NONNULL_PTR a, const struct LDKFallback *NONNULL_PTR b); /* @internal */ -export function Fallback_eq(a: number, b: number): boolean { +export function Fallback_eq(a: bigint, b: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32714,16 +32721,16 @@ export function Fallback_eq(a: number, b: number): boolean { } // void InvoiceSignature_free(struct LDKInvoiceSignature this_obj); /* @internal */ -export function InvoiceSignature_free(this_obj: number): void { +export function InvoiceSignature_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_InvoiceSignature_free(this_obj); // debug statements here } - // uintptr_t InvoiceSignature_clone_ptr(LDKInvoiceSignature *NONNULL_PTR arg); + // uint64_t InvoiceSignature_clone_ptr(LDKInvoiceSignature *NONNULL_PTR arg); /* @internal */ -export function InvoiceSignature_clone_ptr(arg: number): number { +export function InvoiceSignature_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32732,7 +32739,7 @@ export function InvoiceSignature_clone_ptr(arg: number): number { } // struct LDKInvoiceSignature InvoiceSignature_clone(const struct LDKInvoiceSignature *NONNULL_PTR orig); /* @internal */ -export function InvoiceSignature_clone(orig: number): number { +export function InvoiceSignature_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32741,7 +32748,7 @@ export function InvoiceSignature_clone(orig: number): number { } // bool InvoiceSignature_eq(const struct LDKInvoiceSignature *NONNULL_PTR a, const struct LDKInvoiceSignature *NONNULL_PTR b); /* @internal */ -export function InvoiceSignature_eq(a: number, b: number): boolean { +export function InvoiceSignature_eq(a: bigint, b: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32750,16 +32757,16 @@ export function InvoiceSignature_eq(a: number, b: number): boolean { } // void PrivateRoute_free(struct LDKPrivateRoute this_obj); /* @internal */ -export function PrivateRoute_free(this_obj: number): void { +export function PrivateRoute_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_PrivateRoute_free(this_obj); // debug statements here } - // uintptr_t PrivateRoute_clone_ptr(LDKPrivateRoute *NONNULL_PTR arg); + // uint64_t PrivateRoute_clone_ptr(LDKPrivateRoute *NONNULL_PTR arg); /* @internal */ -export function PrivateRoute_clone_ptr(arg: number): number { +export function PrivateRoute_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32768,7 +32775,7 @@ export function PrivateRoute_clone_ptr(arg: number): number { } // struct LDKPrivateRoute PrivateRoute_clone(const struct LDKPrivateRoute *NONNULL_PTR orig); /* @internal */ -export function PrivateRoute_clone(orig: number): number { +export function PrivateRoute_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32777,7 +32784,7 @@ export function PrivateRoute_clone(orig: number): number { } // uint64_t PrivateRoute_hash(const struct LDKPrivateRoute *NONNULL_PTR o); /* @internal */ -export function PrivateRoute_hash(o: number): bigint { +export function PrivateRoute_hash(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32786,7 +32793,7 @@ export function PrivateRoute_hash(o: number): bigint { } // bool PrivateRoute_eq(const struct LDKPrivateRoute *NONNULL_PTR a, const struct LDKPrivateRoute *NONNULL_PTR b); /* @internal */ -export function PrivateRoute_eq(a: number, b: number): boolean { +export function PrivateRoute_eq(a: bigint, b: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32795,7 +32802,7 @@ export function PrivateRoute_eq(a: number, b: number): boolean { } // MUST_USE_RES struct LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ SignedRawInvoice_into_parts(struct LDKSignedRawInvoice this_arg); /* @internal */ -export function SignedRawInvoice_into_parts(this_arg: number): number { +export function SignedRawInvoice_into_parts(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32804,7 +32811,7 @@ export function SignedRawInvoice_into_parts(this_arg: number): number { } // MUST_USE_RES struct LDKRawInvoice SignedRawInvoice_raw_invoice(const struct LDKSignedRawInvoice *NONNULL_PTR this_arg); /* @internal */ -export function SignedRawInvoice_raw_invoice(this_arg: number): number { +export function SignedRawInvoice_raw_invoice(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32813,7 +32820,7 @@ export function SignedRawInvoice_raw_invoice(this_arg: number): number { } // MUST_USE_RES const uint8_t (*SignedRawInvoice_hash(const struct LDKSignedRawInvoice *NONNULL_PTR this_arg))[32]; /* @internal */ -export function SignedRawInvoice_hash(this_arg: number): number { +export function SignedRawInvoice_hash(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32822,7 +32829,7 @@ export function SignedRawInvoice_hash(this_arg: number): number { } // MUST_USE_RES struct LDKInvoiceSignature SignedRawInvoice_signature(const struct LDKSignedRawInvoice *NONNULL_PTR this_arg); /* @internal */ -export function SignedRawInvoice_signature(this_arg: number): number { +export function SignedRawInvoice_signature(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32831,7 +32838,7 @@ export function SignedRawInvoice_signature(this_arg: number): number { } // MUST_USE_RES struct LDKCResult_PayeePubKeyErrorZ SignedRawInvoice_recover_payee_pub_key(const struct LDKSignedRawInvoice *NONNULL_PTR this_arg); /* @internal */ -export function SignedRawInvoice_recover_payee_pub_key(this_arg: number): number { +export function SignedRawInvoice_recover_payee_pub_key(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32840,7 +32847,7 @@ export function SignedRawInvoice_recover_payee_pub_key(this_arg: number): number } // MUST_USE_RES bool SignedRawInvoice_check_signature(const struct LDKSignedRawInvoice *NONNULL_PTR this_arg); /* @internal */ -export function SignedRawInvoice_check_signature(this_arg: number): boolean { +export function SignedRawInvoice_check_signature(this_arg: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32849,7 +32856,7 @@ export function SignedRawInvoice_check_signature(this_arg: number): boolean { } // MUST_USE_RES struct LDKThirtyTwoBytes RawInvoice_hash(const struct LDKRawInvoice *NONNULL_PTR this_arg); /* @internal */ -export function RawInvoice_hash(this_arg: number): number { +export function RawInvoice_hash(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32858,7 +32865,7 @@ export function RawInvoice_hash(this_arg: number): number { } // MUST_USE_RES struct LDKSha256 RawInvoice_payment_hash(const struct LDKRawInvoice *NONNULL_PTR this_arg); /* @internal */ -export function RawInvoice_payment_hash(this_arg: number): number { +export function RawInvoice_payment_hash(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32867,7 +32874,7 @@ export function RawInvoice_payment_hash(this_arg: number): number { } // MUST_USE_RES struct LDKDescription RawInvoice_description(const struct LDKRawInvoice *NONNULL_PTR this_arg); /* @internal */ -export function RawInvoice_description(this_arg: number): number { +export function RawInvoice_description(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32876,7 +32883,7 @@ export function RawInvoice_description(this_arg: number): number { } // MUST_USE_RES struct LDKPayeePubKey RawInvoice_payee_pub_key(const struct LDKRawInvoice *NONNULL_PTR this_arg); /* @internal */ -export function RawInvoice_payee_pub_key(this_arg: number): number { +export function RawInvoice_payee_pub_key(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32885,7 +32892,7 @@ export function RawInvoice_payee_pub_key(this_arg: number): number { } // MUST_USE_RES struct LDKSha256 RawInvoice_description_hash(const struct LDKRawInvoice *NONNULL_PTR this_arg); /* @internal */ -export function RawInvoice_description_hash(this_arg: number): number { +export function RawInvoice_description_hash(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32894,7 +32901,7 @@ export function RawInvoice_description_hash(this_arg: number): number { } // MUST_USE_RES struct LDKExpiryTime RawInvoice_expiry_time(const struct LDKRawInvoice *NONNULL_PTR this_arg); /* @internal */ -export function RawInvoice_expiry_time(this_arg: number): number { +export function RawInvoice_expiry_time(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32903,7 +32910,7 @@ export function RawInvoice_expiry_time(this_arg: number): number { } // MUST_USE_RES struct LDKMinFinalCltvExpiry RawInvoice_min_final_cltv_expiry(const struct LDKRawInvoice *NONNULL_PTR this_arg); /* @internal */ -export function RawInvoice_min_final_cltv_expiry(this_arg: number): number { +export function RawInvoice_min_final_cltv_expiry(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32912,7 +32919,7 @@ export function RawInvoice_min_final_cltv_expiry(this_arg: number): number { } // MUST_USE_RES struct LDKThirtyTwoBytes RawInvoice_payment_secret(const struct LDKRawInvoice *NONNULL_PTR this_arg); /* @internal */ -export function RawInvoice_payment_secret(this_arg: number): number { +export function RawInvoice_payment_secret(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32921,7 +32928,7 @@ export function RawInvoice_payment_secret(this_arg: number): number { } // MUST_USE_RES struct LDKInvoiceFeatures RawInvoice_features(const struct LDKRawInvoice *NONNULL_PTR this_arg); /* @internal */ -export function RawInvoice_features(this_arg: number): number { +export function RawInvoice_features(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32930,7 +32937,7 @@ export function RawInvoice_features(this_arg: number): number { } // MUST_USE_RES struct LDKCVec_PrivateRouteZ RawInvoice_private_routes(const struct LDKRawInvoice *NONNULL_PTR this_arg); /* @internal */ -export function RawInvoice_private_routes(this_arg: number): number { +export function RawInvoice_private_routes(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32939,7 +32946,7 @@ export function RawInvoice_private_routes(this_arg: number): number { } // MUST_USE_RES struct LDKCOption_u64Z RawInvoice_amount_pico_btc(const struct LDKRawInvoice *NONNULL_PTR this_arg); /* @internal */ -export function RawInvoice_amount_pico_btc(this_arg: number): number { +export function RawInvoice_amount_pico_btc(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32948,7 +32955,7 @@ export function RawInvoice_amount_pico_btc(this_arg: number): number { } // MUST_USE_RES enum LDKCurrency RawInvoice_currency(const struct LDKRawInvoice *NONNULL_PTR this_arg); /* @internal */ -export function RawInvoice_currency(this_arg: number): Currency { +export function RawInvoice_currency(this_arg: bigint): Currency { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32957,7 +32964,7 @@ export function RawInvoice_currency(this_arg: number): Currency { } // MUST_USE_RES struct LDKCResult_PositiveTimestampCreationErrorZ PositiveTimestamp_from_unix_timestamp(uint64_t unix_seconds); /* @internal */ -export function PositiveTimestamp_from_unix_timestamp(unix_seconds: bigint): number { +export function PositiveTimestamp_from_unix_timestamp(unix_seconds: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32966,7 +32973,7 @@ export function PositiveTimestamp_from_unix_timestamp(unix_seconds: bigint): num } // MUST_USE_RES struct LDKCResult_PositiveTimestampCreationErrorZ PositiveTimestamp_from_duration_since_epoch(uint64_t duration); /* @internal */ -export function PositiveTimestamp_from_duration_since_epoch(duration: bigint): number { +export function PositiveTimestamp_from_duration_since_epoch(duration: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32975,7 +32982,7 @@ export function PositiveTimestamp_from_duration_since_epoch(duration: bigint): n } // MUST_USE_RES uint64_t PositiveTimestamp_as_unix_timestamp(const struct LDKPositiveTimestamp *NONNULL_PTR this_arg); /* @internal */ -export function PositiveTimestamp_as_unix_timestamp(this_arg: number): bigint { +export function PositiveTimestamp_as_unix_timestamp(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32984,7 +32991,7 @@ export function PositiveTimestamp_as_unix_timestamp(this_arg: number): bigint { } // MUST_USE_RES uint64_t PositiveTimestamp_as_duration_since_epoch(const struct LDKPositiveTimestamp *NONNULL_PTR this_arg); /* @internal */ -export function PositiveTimestamp_as_duration_since_epoch(this_arg: number): bigint { +export function PositiveTimestamp_as_duration_since_epoch(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -32993,7 +33000,7 @@ export function PositiveTimestamp_as_duration_since_epoch(this_arg: number): big } // MUST_USE_RES struct LDKSignedRawInvoice Invoice_into_signed_raw(struct LDKInvoice this_arg); /* @internal */ -export function Invoice_into_signed_raw(this_arg: number): number { +export function Invoice_into_signed_raw(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33002,7 +33009,7 @@ export function Invoice_into_signed_raw(this_arg: number): number { } // MUST_USE_RES struct LDKCResult_NoneSemanticErrorZ Invoice_check_signature(const struct LDKInvoice *NONNULL_PTR this_arg); /* @internal */ -export function Invoice_check_signature(this_arg: number): number { +export function Invoice_check_signature(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33011,7 +33018,7 @@ export function Invoice_check_signature(this_arg: number): number { } // MUST_USE_RES struct LDKCResult_InvoiceSemanticErrorZ Invoice_from_signed(struct LDKSignedRawInvoice signed_invoice); /* @internal */ -export function Invoice_from_signed(signed_invoice: number): number { +export function Invoice_from_signed(signed_invoice: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33020,7 +33027,7 @@ export function Invoice_from_signed(signed_invoice: number): number { } // MUST_USE_RES uint64_t Invoice_duration_since_epoch(const struct LDKInvoice *NONNULL_PTR this_arg); /* @internal */ -export function Invoice_duration_since_epoch(this_arg: number): bigint { +export function Invoice_duration_since_epoch(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33029,7 +33036,7 @@ export function Invoice_duration_since_epoch(this_arg: number): bigint { } // MUST_USE_RES const uint8_t (*Invoice_payment_hash(const struct LDKInvoice *NONNULL_PTR this_arg))[32]; /* @internal */ -export function Invoice_payment_hash(this_arg: number): number { +export function Invoice_payment_hash(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33038,7 +33045,7 @@ export function Invoice_payment_hash(this_arg: number): number { } // MUST_USE_RES struct LDKPublicKey Invoice_payee_pub_key(const struct LDKInvoice *NONNULL_PTR this_arg); /* @internal */ -export function Invoice_payee_pub_key(this_arg: number): number { +export function Invoice_payee_pub_key(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33047,7 +33054,7 @@ export function Invoice_payee_pub_key(this_arg: number): number { } // MUST_USE_RES const uint8_t (*Invoice_payment_secret(const struct LDKInvoice *NONNULL_PTR this_arg))[32]; /* @internal */ -export function Invoice_payment_secret(this_arg: number): number { +export function Invoice_payment_secret(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33056,7 +33063,7 @@ export function Invoice_payment_secret(this_arg: number): number { } // MUST_USE_RES struct LDKInvoiceFeatures Invoice_features(const struct LDKInvoice *NONNULL_PTR this_arg); /* @internal */ -export function Invoice_features(this_arg: number): number { +export function Invoice_features(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33065,7 +33072,7 @@ export function Invoice_features(this_arg: number): number { } // MUST_USE_RES struct LDKPublicKey Invoice_recover_payee_pub_key(const struct LDKInvoice *NONNULL_PTR this_arg); /* @internal */ -export function Invoice_recover_payee_pub_key(this_arg: number): number { +export function Invoice_recover_payee_pub_key(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33074,7 +33081,7 @@ export function Invoice_recover_payee_pub_key(this_arg: number): number { } // MUST_USE_RES uint64_t Invoice_expiry_time(const struct LDKInvoice *NONNULL_PTR this_arg); /* @internal */ -export function Invoice_expiry_time(this_arg: number): bigint { +export function Invoice_expiry_time(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33083,7 +33090,7 @@ export function Invoice_expiry_time(this_arg: number): bigint { } // MUST_USE_RES bool Invoice_would_expire(const struct LDKInvoice *NONNULL_PTR this_arg, uint64_t at_time); /* @internal */ -export function Invoice_would_expire(this_arg: number, at_time: bigint): boolean { +export function Invoice_would_expire(this_arg: bigint, at_time: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33092,7 +33099,7 @@ export function Invoice_would_expire(this_arg: number, at_time: bigint): boolean } // MUST_USE_RES uint64_t Invoice_min_final_cltv_expiry(const struct LDKInvoice *NONNULL_PTR this_arg); /* @internal */ -export function Invoice_min_final_cltv_expiry(this_arg: number): bigint { +export function Invoice_min_final_cltv_expiry(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33101,7 +33108,7 @@ export function Invoice_min_final_cltv_expiry(this_arg: number): bigint { } // MUST_USE_RES struct LDKCVec_PrivateRouteZ Invoice_private_routes(const struct LDKInvoice *NONNULL_PTR this_arg); /* @internal */ -export function Invoice_private_routes(this_arg: number): number { +export function Invoice_private_routes(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33110,7 +33117,7 @@ export function Invoice_private_routes(this_arg: number): number { } // MUST_USE_RES struct LDKCVec_RouteHintZ Invoice_route_hints(const struct LDKInvoice *NONNULL_PTR this_arg); /* @internal */ -export function Invoice_route_hints(this_arg: number): number { +export function Invoice_route_hints(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33119,7 +33126,7 @@ export function Invoice_route_hints(this_arg: number): number { } // MUST_USE_RES enum LDKCurrency Invoice_currency(const struct LDKInvoice *NONNULL_PTR this_arg); /* @internal */ -export function Invoice_currency(this_arg: number): Currency { +export function Invoice_currency(this_arg: bigint): Currency { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33128,7 +33135,7 @@ export function Invoice_currency(this_arg: number): Currency { } // MUST_USE_RES struct LDKCOption_u64Z Invoice_amount_milli_satoshis(const struct LDKInvoice *NONNULL_PTR this_arg); /* @internal */ -export function Invoice_amount_milli_satoshis(this_arg: number): number { +export function Invoice_amount_milli_satoshis(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33137,7 +33144,7 @@ export function Invoice_amount_milli_satoshis(this_arg: number): number { } // MUST_USE_RES struct LDKCResult_DescriptionCreationErrorZ Description_new(struct LDKStr description); /* @internal */ -export function Description_new(description: number): number { +export function Description_new(description: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33146,7 +33153,7 @@ export function Description_new(description: number): number { } // MUST_USE_RES struct LDKStr Description_into_inner(struct LDKDescription this_arg); /* @internal */ -export function Description_into_inner(this_arg: number): number { +export function Description_into_inner(this_arg: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33155,7 +33162,7 @@ export function Description_into_inner(this_arg: number): number { } // MUST_USE_RES struct LDKExpiryTime ExpiryTime_from_seconds(uint64_t seconds); /* @internal */ -export function ExpiryTime_from_seconds(seconds: bigint): number { +export function ExpiryTime_from_seconds(seconds: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33164,7 +33171,7 @@ export function ExpiryTime_from_seconds(seconds: bigint): number { } // MUST_USE_RES struct LDKExpiryTime ExpiryTime_from_duration(uint64_t duration); /* @internal */ -export function ExpiryTime_from_duration(duration: bigint): number { +export function ExpiryTime_from_duration(duration: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33173,7 +33180,7 @@ export function ExpiryTime_from_duration(duration: bigint): number { } // MUST_USE_RES uint64_t ExpiryTime_as_seconds(const struct LDKExpiryTime *NONNULL_PTR this_arg); /* @internal */ -export function ExpiryTime_as_seconds(this_arg: number): bigint { +export function ExpiryTime_as_seconds(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33182,7 +33189,7 @@ export function ExpiryTime_as_seconds(this_arg: number): bigint { } // MUST_USE_RES uint64_t ExpiryTime_as_duration(const struct LDKExpiryTime *NONNULL_PTR this_arg); /* @internal */ -export function ExpiryTime_as_duration(this_arg: number): bigint { +export function ExpiryTime_as_duration(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33191,7 +33198,7 @@ export function ExpiryTime_as_duration(this_arg: number): bigint { } // MUST_USE_RES struct LDKCResult_PrivateRouteCreationErrorZ PrivateRoute_new(struct LDKRouteHint hops); /* @internal */ -export function PrivateRoute_new(hops: number): number { +export function PrivateRoute_new(hops: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33200,7 +33207,7 @@ export function PrivateRoute_new(hops: number): number { } // MUST_USE_RES struct LDKRouteHint PrivateRoute_into_inner(struct LDKPrivateRoute this_arg); /* @internal */ -export function PrivateRoute_into_inner(this_arg: number): number { +export function PrivateRoute_into_inner(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33209,7 +33216,7 @@ export function PrivateRoute_into_inner(this_arg: number): number { } // enum LDKCreationError CreationError_clone(const enum LDKCreationError *NONNULL_PTR orig); /* @internal */ -export function CreationError_clone(orig: number): CreationError { +export function CreationError_clone(orig: bigint): CreationError { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33263,7 +33270,7 @@ export function CreationError_missing_route_hints(): CreationError { } // bool CreationError_eq(const enum LDKCreationError *NONNULL_PTR a, const enum LDKCreationError *NONNULL_PTR b); /* @internal */ -export function CreationError_eq(a: number, b: number): boolean { +export function CreationError_eq(a: bigint, b: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33272,7 +33279,7 @@ export function CreationError_eq(a: number, b: number): boolean { } // struct LDKStr CreationError_to_str(const enum LDKCreationError *NONNULL_PTR o); /* @internal */ -export function CreationError_to_str(o: number): number { +export function CreationError_to_str(o: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33281,7 +33288,7 @@ export function CreationError_to_str(o: number): number { } // enum LDKSemanticError SemanticError_clone(const enum LDKSemanticError *NONNULL_PTR orig); /* @internal */ -export function SemanticError_clone(orig: number): SemanticError { +export function SemanticError_clone(orig: bigint): SemanticError { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33380,7 +33387,7 @@ export function SemanticError_imprecise_amount(): SemanticError { } // bool SemanticError_eq(const enum LDKSemanticError *NONNULL_PTR a, const enum LDKSemanticError *NONNULL_PTR b); /* @internal */ -export function SemanticError_eq(a: number, b: number): boolean { +export function SemanticError_eq(a: bigint, b: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33389,7 +33396,7 @@ export function SemanticError_eq(a: number, b: number): boolean { } // struct LDKStr SemanticError_to_str(const enum LDKSemanticError *NONNULL_PTR o); /* @internal */ -export function SemanticError_to_str(o: number): number { +export function SemanticError_to_str(o: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33398,16 +33405,16 @@ export function SemanticError_to_str(o: number): number { } // void SignOrCreationError_free(struct LDKSignOrCreationError this_ptr); /* @internal */ -export function SignOrCreationError_free(this_ptr: number): void { +export function SignOrCreationError_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_SignOrCreationError_free(this_ptr); // debug statements here } - // uintptr_t SignOrCreationError_clone_ptr(LDKSignOrCreationError *NONNULL_PTR arg); + // uint64_t SignOrCreationError_clone_ptr(LDKSignOrCreationError *NONNULL_PTR arg); /* @internal */ -export function SignOrCreationError_clone_ptr(arg: number): number { +export function SignOrCreationError_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33416,7 +33423,7 @@ export function SignOrCreationError_clone_ptr(arg: number): number { } // struct LDKSignOrCreationError SignOrCreationError_clone(const struct LDKSignOrCreationError *NONNULL_PTR orig); /* @internal */ -export function SignOrCreationError_clone(orig: number): number { +export function SignOrCreationError_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33425,7 +33432,7 @@ export function SignOrCreationError_clone(orig: number): number { } // struct LDKSignOrCreationError SignOrCreationError_sign_error(void); /* @internal */ -export function SignOrCreationError_sign_error(): number { +export function SignOrCreationError_sign_error(): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33434,7 +33441,7 @@ export function SignOrCreationError_sign_error(): number { } // struct LDKSignOrCreationError SignOrCreationError_creation_error(enum LDKCreationError a); /* @internal */ -export function SignOrCreationError_creation_error(a: CreationError): number { +export function SignOrCreationError_creation_error(a: CreationError): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33443,7 +33450,7 @@ export function SignOrCreationError_creation_error(a: CreationError): number { } // bool SignOrCreationError_eq(const struct LDKSignOrCreationError *NONNULL_PTR a, const struct LDKSignOrCreationError *NONNULL_PTR b); /* @internal */ -export function SignOrCreationError_eq(a: number, b: number): boolean { +export function SignOrCreationError_eq(a: bigint, b: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33452,7 +33459,7 @@ export function SignOrCreationError_eq(a: number, b: number): boolean { } // struct LDKStr SignOrCreationError_to_str(const struct LDKSignOrCreationError *NONNULL_PTR o); /* @internal */ -export function SignOrCreationError_to_str(o: number): number { +export function SignOrCreationError_to_str(o: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33461,7 +33468,7 @@ export function SignOrCreationError_to_str(o: number): number { } // void InvoicePayer_free(struct LDKInvoicePayer this_obj); /* @internal */ -export function InvoicePayer_free(this_obj: number): void { +export function InvoicePayer_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33470,7 +33477,7 @@ export function InvoicePayer_free(this_obj: number): void { } // void Payer_free(struct LDKPayer this_ptr); /* @internal */ -export function Payer_free(this_ptr: number): void { +export function Payer_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33479,7 +33486,7 @@ export function Payer_free(this_ptr: number): void { } // void Router_free(struct LDKRouter this_ptr); /* @internal */ -export function Router_free(this_ptr: number): void { +export function Router_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33488,16 +33495,16 @@ export function Router_free(this_ptr: number): void { } // void Retry_free(struct LDKRetry this_ptr); /* @internal */ -export function Retry_free(this_ptr: number): void { +export function Retry_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_Retry_free(this_ptr); // debug statements here } - // uintptr_t Retry_clone_ptr(LDKRetry *NONNULL_PTR arg); + // uint64_t Retry_clone_ptr(LDKRetry *NONNULL_PTR arg); /* @internal */ -export function Retry_clone_ptr(arg: number): number { +export function Retry_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33506,7 +33513,7 @@ export function Retry_clone_ptr(arg: number): number { } // struct LDKRetry Retry_clone(const struct LDKRetry *NONNULL_PTR orig); /* @internal */ -export function Retry_clone(orig: number): number { +export function Retry_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33515,7 +33522,7 @@ export function Retry_clone(orig: number): number { } // struct LDKRetry Retry_attempts(uintptr_t a); /* @internal */ -export function Retry_attempts(a: number): number { +export function Retry_attempts(a: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33524,7 +33531,7 @@ export function Retry_attempts(a: number): number { } // bool Retry_eq(const struct LDKRetry *NONNULL_PTR a, const struct LDKRetry *NONNULL_PTR b); /* @internal */ -export function Retry_eq(a: number, b: number): boolean { +export function Retry_eq(a: bigint, b: bigint): boolean { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33533,7 +33540,7 @@ export function Retry_eq(a: number, b: number): boolean { } // uint64_t Retry_hash(const struct LDKRetry *NONNULL_PTR o); /* @internal */ -export function Retry_hash(o: number): bigint { +export function Retry_hash(o: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33542,16 +33549,16 @@ export function Retry_hash(o: number): bigint { } // void PaymentError_free(struct LDKPaymentError this_ptr); /* @internal */ -export function PaymentError_free(this_ptr: number): void { +export function PaymentError_free(this_ptr: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } const nativeResponseValue = wasm.TS_PaymentError_free(this_ptr); // debug statements here } - // uintptr_t PaymentError_clone_ptr(LDKPaymentError *NONNULL_PTR arg); + // uint64_t PaymentError_clone_ptr(LDKPaymentError *NONNULL_PTR arg); /* @internal */ -export function PaymentError_clone_ptr(arg: number): number { +export function PaymentError_clone_ptr(arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33560,7 +33567,7 @@ export function PaymentError_clone_ptr(arg: number): number { } // struct LDKPaymentError PaymentError_clone(const struct LDKPaymentError *NONNULL_PTR orig); /* @internal */ -export function PaymentError_clone(orig: number): number { +export function PaymentError_clone(orig: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33569,7 +33576,7 @@ export function PaymentError_clone(orig: number): number { } // struct LDKPaymentError PaymentError_invoice(struct LDKStr a); /* @internal */ -export function PaymentError_invoice(a: number): number { +export function PaymentError_invoice(a: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33578,7 +33585,7 @@ export function PaymentError_invoice(a: number): number { } // struct LDKPaymentError PaymentError_routing(struct LDKLightningError a); /* @internal */ -export function PaymentError_routing(a: number): number { +export function PaymentError_routing(a: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33587,7 +33594,7 @@ export function PaymentError_routing(a: number): number { } // struct LDKPaymentError PaymentError_sending(struct LDKPaymentSendFailure a); /* @internal */ -export function PaymentError_sending(a: number): number { +export function PaymentError_sending(a: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33596,7 +33603,7 @@ export function PaymentError_sending(a: number): number { } // MUST_USE_RES struct LDKInvoicePayer InvoicePayer_new(struct LDKPayer payer, struct LDKRouter router, const struct LDKMultiThreadedLockableScore *NONNULL_PTR scorer, struct LDKLogger logger, struct LDKEventHandler event_handler, struct LDKRetry retry); /* @internal */ -export function InvoicePayer_new(payer: number, router: number, scorer: number, logger: number, event_handler: number, retry: number): number { +export function InvoicePayer_new(payer: bigint, router: bigint, scorer: bigint, logger: bigint, event_handler: bigint, retry: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33605,7 +33612,7 @@ export function InvoicePayer_new(payer: number, router: number, scorer: number, } // MUST_USE_RES struct LDKCResult_PaymentIdPaymentErrorZ InvoicePayer_pay_invoice(const struct LDKInvoicePayer *NONNULL_PTR this_arg, const struct LDKInvoice *NONNULL_PTR invoice); /* @internal */ -export function InvoicePayer_pay_invoice(this_arg: number, invoice: number): number { +export function InvoicePayer_pay_invoice(this_arg: bigint, invoice: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33614,7 +33621,7 @@ export function InvoicePayer_pay_invoice(this_arg: number, invoice: number): num } // MUST_USE_RES struct LDKCResult_PaymentIdPaymentErrorZ InvoicePayer_pay_zero_value_invoice(const struct LDKInvoicePayer *NONNULL_PTR this_arg, const struct LDKInvoice *NONNULL_PTR invoice, uint64_t amount_msats); /* @internal */ -export function InvoicePayer_pay_zero_value_invoice(this_arg: number, invoice: number, amount_msats: bigint): number { +export function InvoicePayer_pay_zero_value_invoice(this_arg: bigint, invoice: bigint, amount_msats: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33623,7 +33630,7 @@ export function InvoicePayer_pay_zero_value_invoice(this_arg: number, invoice: n } // MUST_USE_RES struct LDKCResult_PaymentIdPaymentErrorZ InvoicePayer_pay_pubkey(const struct LDKInvoicePayer *NONNULL_PTR this_arg, struct LDKPublicKey pubkey, struct LDKThirtyTwoBytes payment_preimage, uint64_t amount_msats, uint32_t final_cltv_expiry_delta); /* @internal */ -export function InvoicePayer_pay_pubkey(this_arg: number, pubkey: number, payment_preimage: number, amount_msats: bigint, final_cltv_expiry_delta: number): number { +export function InvoicePayer_pay_pubkey(this_arg: bigint, pubkey: number, payment_preimage: number, amount_msats: bigint, final_cltv_expiry_delta: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33632,7 +33639,7 @@ export function InvoicePayer_pay_pubkey(this_arg: number, pubkey: number, paymen } // void InvoicePayer_remove_cached_payment(const struct LDKInvoicePayer *NONNULL_PTR this_arg, const uint8_t (*payment_hash)[32]); /* @internal */ -export function InvoicePayer_remove_cached_payment(this_arg: number, payment_hash: number): void { +export function InvoicePayer_remove_cached_payment(this_arg: bigint, payment_hash: number): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33641,7 +33648,7 @@ export function InvoicePayer_remove_cached_payment(this_arg: number, payment_has } // struct LDKEventHandler InvoicePayer_as_EventHandler(const struct LDKInvoicePayer *NONNULL_PTR this_arg); /* @internal */ -export function InvoicePayer_as_EventHandler(this_arg: number): number { +export function InvoicePayer_as_EventHandler(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33650,7 +33657,7 @@ export function InvoicePayer_as_EventHandler(this_arg: number): number { } // struct LDKCResult_InvoiceSignOrCreationErrorZ create_invoice_from_channelmanager_with_description_hash_and_duration_since_epoch(const struct LDKChannelManager *NONNULL_PTR channelmanager, struct LDKKeysInterface keys_manager, enum LDKCurrency network, struct LDKCOption_u64Z amt_msat, struct LDKSha256 description_hash, uint64_t duration_since_epoch, uint32_t invoice_expiry_delta_secs); /* @internal */ -export function create_invoice_from_channelmanager_with_description_hash_and_duration_since_epoch(channelmanager: number, keys_manager: number, network: Currency, amt_msat: number, description_hash: number, duration_since_epoch: bigint, invoice_expiry_delta_secs: number): number { +export function create_invoice_from_channelmanager_with_description_hash_and_duration_since_epoch(channelmanager: bigint, keys_manager: bigint, network: Currency, amt_msat: bigint, description_hash: bigint, duration_since_epoch: bigint, invoice_expiry_delta_secs: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33659,7 +33666,7 @@ export function create_invoice_from_channelmanager_with_description_hash_and_dur } // struct LDKCResult_InvoiceSignOrCreationErrorZ create_invoice_from_channelmanager_and_duration_since_epoch(const struct LDKChannelManager *NONNULL_PTR channelmanager, struct LDKKeysInterface keys_manager, enum LDKCurrency network, struct LDKCOption_u64Z amt_msat, struct LDKStr description, uint64_t duration_since_epoch, uint32_t invoice_expiry_delta_secs); /* @internal */ -export function create_invoice_from_channelmanager_and_duration_since_epoch(channelmanager: number, keys_manager: number, network: Currency, amt_msat: number, description: number, duration_since_epoch: bigint, invoice_expiry_delta_secs: number): number { +export function create_invoice_from_channelmanager_and_duration_since_epoch(channelmanager: bigint, keys_manager: bigint, network: Currency, amt_msat: bigint, description: number, duration_since_epoch: bigint, invoice_expiry_delta_secs: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33668,7 +33675,7 @@ export function create_invoice_from_channelmanager_and_duration_since_epoch(chan } // void DefaultRouter_free(struct LDKDefaultRouter this_obj); /* @internal */ -export function DefaultRouter_free(this_obj: number): void { +export function DefaultRouter_free(this_obj: bigint): void { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33677,7 +33684,7 @@ export function DefaultRouter_free(this_obj: number): void { } // MUST_USE_RES struct LDKDefaultRouter DefaultRouter_new(const struct LDKNetworkGraph *NONNULL_PTR network_graph, struct LDKLogger logger, struct LDKThirtyTwoBytes random_seed_bytes); /* @internal */ -export function DefaultRouter_new(network_graph: number, logger: number, random_seed_bytes: number): number { +export function DefaultRouter_new(network_graph: bigint, logger: bigint, random_seed_bytes: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33686,7 +33693,7 @@ export function DefaultRouter_new(network_graph: number, logger: number, random_ } // struct LDKRouter DefaultRouter_as_Router(const struct LDKDefaultRouter *NONNULL_PTR this_arg); /* @internal */ -export function DefaultRouter_as_Router(this_arg: number): number { +export function DefaultRouter_as_Router(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33695,7 +33702,7 @@ export function DefaultRouter_as_Router(this_arg: number): number { } // struct LDKPayer ChannelManager_as_Payer(const struct LDKChannelManager *NONNULL_PTR this_arg); /* @internal */ -export function ChannelManager_as_Payer(this_arg: number): number { +export function ChannelManager_as_Payer(this_arg: bigint): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33704,7 +33711,7 @@ export function ChannelManager_as_Payer(this_arg: number): number { } // struct LDKCResult_SiPrefixParseErrorZ SiPrefix_from_str(struct LDKStr s); /* @internal */ -export function SiPrefix_from_str(s: number): number { +export function SiPrefix_from_str(s: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33713,7 +33720,7 @@ export function SiPrefix_from_str(s: number): number { } // struct LDKCResult_InvoiceParseOrSemanticErrorZ Invoice_from_str(struct LDKStr s); /* @internal */ -export function Invoice_from_str(s: number): number { +export function Invoice_from_str(s: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33722,7 +33729,7 @@ export function Invoice_from_str(s: number): number { } // struct LDKCResult_SignedRawInvoiceParseErrorZ SignedRawInvoice_from_str(struct LDKStr s); /* @internal */ -export function SignedRawInvoice_from_str(s: number): number { +export function SignedRawInvoice_from_str(s: number): bigint { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33731,7 +33738,7 @@ export function SignedRawInvoice_from_str(s: number): number { } // struct LDKStr ParseError_to_str(const struct LDKParseError *NONNULL_PTR o); /* @internal */ -export function ParseError_to_str(o: number): number { +export function ParseError_to_str(o: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33740,7 +33747,7 @@ export function ParseError_to_str(o: number): number { } // struct LDKStr ParseOrSemanticError_to_str(const struct LDKParseOrSemanticError *NONNULL_PTR o); /* @internal */ -export function ParseOrSemanticError_to_str(o: number): number { +export function ParseOrSemanticError_to_str(o: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33749,7 +33756,7 @@ export function ParseOrSemanticError_to_str(o: number): number { } // struct LDKStr Invoice_to_str(const struct LDKInvoice *NONNULL_PTR o); /* @internal */ -export function Invoice_to_str(o: number): number { +export function Invoice_to_str(o: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33758,7 +33765,7 @@ export function Invoice_to_str(o: number): number { } // struct LDKStr SignedRawInvoice_to_str(const struct LDKSignedRawInvoice *NONNULL_PTR o); /* @internal */ -export function SignedRawInvoice_to_str(o: number): number { +export function SignedRawInvoice_to_str(o: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33767,7 +33774,7 @@ export function SignedRawInvoice_to_str(o: number): number { } // struct LDKStr Currency_to_str(const enum LDKCurrency *NONNULL_PTR o); /* @internal */ -export function Currency_to_str(o: number): number { +export function Currency_to_str(o: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } @@ -33776,7 +33783,7 @@ export function Currency_to_str(o: number): number { } // struct LDKStr SiPrefix_to_str(const enum LDKSiPrefix *NONNULL_PTR o); /* @internal */ -export function SiPrefix_to_str(o: number): number { +export function SiPrefix_to_str(o: bigint): number { if(!isWasmInitialized) { throw new Error("initializeWasm() must be awaited first!"); } diff --git a/ts/structs/APIError.mts b/ts/structs/APIError.mts index aec7424a..2baeb358 100644 --- a/ts/structs/APIError.mts +++ b/ts/structs/APIError.mts @@ -360,9 +360,9 @@ import * as bindings from '../bindings.mjs' * too-high values) */ export class APIError extends CommonBase { - protected constructor(_dummy: object, ptr: number) { super(ptr, bindings.APIError_free); } + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.APIError_free); } /* @internal */ - public static constr_from_ptr(ptr: number): APIError { + public static constr_from_ptr(ptr: bigint): APIError { const raw_ty: number = bindings.LDKAPIError_ty_from_ptr(ptr); switch (raw_ty) { case 0: return new APIError_APIMisuseError(ptr); @@ -376,8 +376,8 @@ export class APIError extends CommonBase { } } - public clone_ptr(): number { - const ret: number = bindings.APIError_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.APIError_clone_ptr(this.ptr); return ret; } @@ -385,7 +385,7 @@ export class APIError extends CommonBase { * Creates a copy of the APIError */ public clone(): APIError { - const ret: number = bindings.APIError_clone(this.ptr); + const ret: bigint = bindings.APIError_clone(this.ptr); const ret_hu_conv: APIError = APIError.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -395,7 +395,7 @@ export class APIError extends CommonBase { * Utility method to constructs a new APIMisuseError-variant APIError */ public static constructor_apimisuse_error(err: string): APIError { - const ret: number = bindings.APIError_apimisuse_error(bindings.encodeString(err)); + const ret: bigint = bindings.APIError_apimisuse_error(bindings.encodeString(err)); const ret_hu_conv: APIError = APIError.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -405,7 +405,7 @@ export class APIError extends CommonBase { * Utility method to constructs a new FeeRateTooHigh-variant APIError */ public static constructor_fee_rate_too_high(err: string, feerate: number): APIError { - const ret: number = bindings.APIError_fee_rate_too_high(bindings.encodeString(err), feerate); + const ret: bigint = bindings.APIError_fee_rate_too_high(bindings.encodeString(err), feerate); const ret_hu_conv: APIError = APIError.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -415,7 +415,7 @@ export class APIError extends CommonBase { * Utility method to constructs a new RouteError-variant APIError */ public static constructor_route_error(err: string): APIError { - const ret: number = bindings.APIError_route_error(bindings.encodeString(err)); + const ret: bigint = bindings.APIError_route_error(bindings.encodeString(err)); const ret_hu_conv: APIError = APIError.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -425,7 +425,7 @@ export class APIError extends CommonBase { * Utility method to constructs a new ChannelUnavailable-variant APIError */ public static constructor_channel_unavailable(err: string): APIError { - const ret: number = bindings.APIError_channel_unavailable(bindings.encodeString(err)); + const ret: bigint = bindings.APIError_channel_unavailable(bindings.encodeString(err)); const ret_hu_conv: APIError = APIError.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -435,7 +435,7 @@ export class APIError extends CommonBase { * Utility method to constructs a new MonitorUpdateFailed-variant APIError */ public static constructor_monitor_update_failed(): APIError { - const ret: number = bindings.APIError_monitor_update_failed(); + const ret: bigint = bindings.APIError_monitor_update_failed(); const ret_hu_conv: APIError = APIError.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -445,9 +445,10 @@ export class APIError extends CommonBase { * Utility method to constructs a new IncompatibleShutdownScript-variant APIError */ public static constructor_incompatible_shutdown_script(script: ShutdownScript): APIError { - const ret: number = bindings.APIError_incompatible_shutdown_script(script == null ? 0 : CommonBase.get_ptr_of(script) & ~1); + const ret: bigint = bindings.APIError_incompatible_shutdown_script(script == null ? 0n : CommonBase.get_ptr_of(script)); const ret_hu_conv: APIError = APIError.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, script); return ret_hu_conv; } @@ -459,7 +460,7 @@ export class APIError_APIMisuseError extends APIError { */ public err: string; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const err: number = bindings.LDKAPIError_APIMisuseError_get_err(ptr); const err_conv: string = bindings.decodeString(err); @@ -477,7 +478,7 @@ export class APIError_FeeRateTooHigh extends APIError { */ public feerate: number; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const err: number = bindings.LDKAPIError_FeeRateTooHigh_get_err(ptr); const err_conv: string = bindings.decodeString(err); @@ -492,7 +493,7 @@ export class APIError_RouteError extends APIError { */ public err: string; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const err: number = bindings.LDKAPIError_RouteError_get_err(ptr); const err_conv: string = bindings.decodeString(err); @@ -506,7 +507,7 @@ export class APIError_ChannelUnavailable extends APIError { */ public err: string; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const err: number = bindings.LDKAPIError_ChannelUnavailable_get_err(ptr); const err_conv: string = bindings.decodeString(err); @@ -516,7 +517,7 @@ export class APIError_ChannelUnavailable extends APIError { /** A APIError of type MonitorUpdateFailed */ export class APIError_MonitorUpdateFailed extends APIError { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } @@ -527,9 +528,9 @@ export class APIError_IncompatibleShutdownScript extends APIError { */ public script: ShutdownScript; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); - const script: number = bindings.LDKAPIError_IncompatibleShutdownScript_get_script(ptr); + const script: bigint = bindings.LDKAPIError_IncompatibleShutdownScript_get_script(ptr); const script_hu_conv: ShutdownScript = new ShutdownScript(null, script); CommonBase.add_ref_from(script_hu_conv, this); this.script = script_hu_conv; diff --git a/ts/structs/AcceptChannel.mts b/ts/structs/AcceptChannel.mts index 22621127..456de3ec 100644 --- a/ts/structs/AcceptChannel.mts +++ b/ts/structs/AcceptChannel.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class AcceptChannel extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.AcceptChannel_free); } @@ -592,7 +592,7 @@ export class AcceptChannel extends CommonBase { * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None */ public get_channel_type(): ChannelTypeFeatures { - const ret: number = bindings.AcceptChannel_get_channel_type(this.ptr); + const ret: bigint = bindings.AcceptChannel_get_channel_type(this.ptr); const ret_hu_conv: ChannelTypeFeatures = new ChannelTypeFeatures(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -608,11 +608,12 @@ export class AcceptChannel extends CommonBase { * Note that val (or a relevant inner pointer) may be NULL or all-0s to represent None */ public set_channel_type(val: ChannelTypeFeatures): void { - bindings.AcceptChannel_set_channel_type(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.AcceptChannel_set_channel_type(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } - public clone_ptr(): number { - const ret: number = bindings.AcceptChannel_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.AcceptChannel_clone_ptr(this.ptr); return ret; } @@ -620,7 +621,7 @@ export class AcceptChannel extends CommonBase { * Creates a copy of the AcceptChannel */ public clone(): AcceptChannel { - const ret: number = bindings.AcceptChannel_clone(this.ptr); + const ret: bigint = bindings.AcceptChannel_clone(this.ptr); const ret_hu_conv: AcceptChannel = new AcceptChannel(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -639,7 +640,7 @@ export class AcceptChannel extends CommonBase { * Read a AcceptChannel from a byte array, created by AcceptChannel_write */ public static constructor_read(ser: Uint8Array): Result_AcceptChannelDecodeErrorZ { - const ret: number = bindings.AcceptChannel_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.AcceptChannel_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_AcceptChannelDecodeErrorZ = Result_AcceptChannelDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/Access.mts b/ts/structs/Access.mts index 9ea43cc9..60b22fd7 100644 --- a/ts/structs/Access.mts +++ b/ts/structs/Access.mts @@ -382,7 +382,7 @@ export class Access extends CommonBase { public bindings_instance?: bindings.LDKAccess; /* @internal */ - constructor(_dummy: object, ptr: number) { + constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.Access_free); this.bindings_instance = null; } @@ -391,14 +391,14 @@ export class Access extends CommonBase { public static new_impl(arg: AccessInterface): Access { const impl_holder: LDKAccessHolder = new LDKAccessHolder(); let structImplementation = { - get_utxo (genesis_hash: number, short_channel_id: bigint): number { + get_utxo (genesis_hash: number, short_channel_id: bigint): bigint { const genesis_hash_conv: Uint8Array = bindings.decodeUint8Array(genesis_hash); const ret: Result_TxOutAccessErrorZ = arg.get_utxo(genesis_hash_conv, short_channel_id); - const result: number = ret == null ? 0 : ret.clone_ptr(); + const result: bigint = ret == null ? 0n : ret.clone_ptr(); return result; }, } as bindings.LDKAccess; - const ptr: number = bindings.LDKAccess_new(structImplementation); + const ptr: bigint = bindings.LDKAccess_new(structImplementation); impl_holder.held = new Access(null, ptr); impl_holder.held.bindings_instance = structImplementation; @@ -413,7 +413,7 @@ export class Access extends CommonBase { * [`short_channel_id`]: https://github.com/lightning/bolts/blob/master/07-routing-gossip.md#definition-of-short_channel_id */ public get_utxo(genesis_hash: Uint8Array, short_channel_id: bigint): Result_TxOutAccessErrorZ { - const ret: number = bindings.Access_get_utxo(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(genesis_hash, 32)), short_channel_id); + const ret: bigint = bindings.Access_get_utxo(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(genesis_hash, 32)), short_channel_id); const ret_hu_conv: Result_TxOutAccessErrorZ = Result_TxOutAccessErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/AnnouncementSignatures.mts b/ts/structs/AnnouncementSignatures.mts index 65f322d2..45d8b53a 100644 --- a/ts/structs/AnnouncementSignatures.mts +++ b/ts/structs/AnnouncementSignatures.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class AnnouncementSignatures extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.AnnouncementSignatures_free); } @@ -432,14 +432,14 @@ export class AnnouncementSignatures extends CommonBase { * Constructs a new AnnouncementSignatures given each field */ public static constructor_new(channel_id_arg: Uint8Array, short_channel_id_arg: bigint, node_signature_arg: Uint8Array, bitcoin_signature_arg: Uint8Array): AnnouncementSignatures { - const ret: number = bindings.AnnouncementSignatures_new(bindings.encodeUint8Array(bindings.check_arr_len(channel_id_arg, 32)), short_channel_id_arg, bindings.encodeUint8Array(bindings.check_arr_len(node_signature_arg, 64)), bindings.encodeUint8Array(bindings.check_arr_len(bitcoin_signature_arg, 64))); + const ret: bigint = bindings.AnnouncementSignatures_new(bindings.encodeUint8Array(bindings.check_arr_len(channel_id_arg, 32)), short_channel_id_arg, bindings.encodeUint8Array(bindings.check_arr_len(node_signature_arg, 64)), bindings.encodeUint8Array(bindings.check_arr_len(bitcoin_signature_arg, 64))); const ret_hu_conv: AnnouncementSignatures = new AnnouncementSignatures(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.AnnouncementSignatures_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.AnnouncementSignatures_clone_ptr(this.ptr); return ret; } @@ -447,7 +447,7 @@ export class AnnouncementSignatures extends CommonBase { * Creates a copy of the AnnouncementSignatures */ public clone(): AnnouncementSignatures { - const ret: number = bindings.AnnouncementSignatures_clone(this.ptr); + const ret: bigint = bindings.AnnouncementSignatures_clone(this.ptr); const ret_hu_conv: AnnouncementSignatures = new AnnouncementSignatures(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -466,7 +466,7 @@ export class AnnouncementSignatures extends CommonBase { * Read a AnnouncementSignatures from a byte array, created by AnnouncementSignatures_write */ public static constructor_read(ser: Uint8Array): Result_AnnouncementSignaturesDecodeErrorZ { - const ret: number = bindings.AnnouncementSignatures_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.AnnouncementSignatures_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_AnnouncementSignaturesDecodeErrorZ = Result_AnnouncementSignaturesDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/Balance.mts b/ts/structs/Balance.mts index 6649e81a..63c9ea8c 100644 --- a/ts/structs/Balance.mts +++ b/ts/structs/Balance.mts @@ -362,9 +362,9 @@ import * as bindings from '../bindings.mjs' * be provided. */ export class Balance extends CommonBase { - protected constructor(_dummy: object, ptr: number) { super(ptr, bindings.Balance_free); } + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.Balance_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Balance { + public static constr_from_ptr(ptr: bigint): Balance { const raw_ty: number = bindings.LDKBalance_ty_from_ptr(ptr); switch (raw_ty) { case 0: return new Balance_ClaimableOnChannelClose(ptr); @@ -376,8 +376,8 @@ export class Balance extends CommonBase { } } - public clone_ptr(): number { - const ret: number = bindings.Balance_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.Balance_clone_ptr(this.ptr); return ret; } @@ -385,7 +385,7 @@ export class Balance extends CommonBase { * Creates a copy of the Balance */ public clone(): Balance { - const ret: number = bindings.Balance_clone(this.ptr); + const ret: bigint = bindings.Balance_clone(this.ptr); const ret_hu_conv: Balance = Balance.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -395,7 +395,7 @@ export class Balance extends CommonBase { * Utility method to constructs a new ClaimableOnChannelClose-variant Balance */ public static constructor_claimable_on_channel_close(claimable_amount_satoshis: bigint): Balance { - const ret: number = bindings.Balance_claimable_on_channel_close(claimable_amount_satoshis); + const ret: bigint = bindings.Balance_claimable_on_channel_close(claimable_amount_satoshis); const ret_hu_conv: Balance = Balance.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -405,7 +405,7 @@ export class Balance extends CommonBase { * Utility method to constructs a new ClaimableAwaitingConfirmations-variant Balance */ public static constructor_claimable_awaiting_confirmations(claimable_amount_satoshis: bigint, confirmation_height: number): Balance { - const ret: number = bindings.Balance_claimable_awaiting_confirmations(claimable_amount_satoshis, confirmation_height); + const ret: bigint = bindings.Balance_claimable_awaiting_confirmations(claimable_amount_satoshis, confirmation_height); const ret_hu_conv: Balance = Balance.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -415,7 +415,7 @@ export class Balance extends CommonBase { * Utility method to constructs a new ContentiousClaimable-variant Balance */ public static constructor_contentious_claimable(claimable_amount_satoshis: bigint, timeout_height: number): Balance { - const ret: number = bindings.Balance_contentious_claimable(claimable_amount_satoshis, timeout_height); + const ret: bigint = bindings.Balance_contentious_claimable(claimable_amount_satoshis, timeout_height); const ret_hu_conv: Balance = Balance.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -425,7 +425,7 @@ export class Balance extends CommonBase { * Utility method to constructs a new MaybeClaimableHTLCAwaitingTimeout-variant Balance */ public static constructor_maybe_claimable_htlcawaiting_timeout(claimable_amount_satoshis: bigint, claimable_height: number): Balance { - const ret: number = bindings.Balance_maybe_claimable_htlcawaiting_timeout(claimable_amount_satoshis, claimable_height); + const ret: bigint = bindings.Balance_maybe_claimable_htlcawaiting_timeout(claimable_amount_satoshis, claimable_height); const ret_hu_conv: Balance = Balance.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -436,7 +436,7 @@ export class Balance extends CommonBase { * This ignores pointers and is_owned flags and looks at the values in fields. */ public eq(b: Balance): boolean { - const ret: boolean = bindings.Balance_eq(this.ptr, b == null ? 0 : CommonBase.get_ptr_of(b) & ~1); + const ret: boolean = bindings.Balance_eq(this.ptr, b == null ? 0n : CommonBase.get_ptr_of(b)); return ret; } @@ -449,7 +449,7 @@ export class Balance_ClaimableOnChannelClose extends Balance { */ public claimable_amount_satoshis: bigint; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); this.claimable_amount_satoshis = bindings.LDKBalance_ClaimableOnChannelClose_get_claimable_amount_satoshis(ptr); } @@ -467,7 +467,7 @@ export class Balance_ClaimableAwaitingConfirmations extends Balance { */ public confirmation_height: number; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); this.claimable_amount_satoshis = bindings.LDKBalance_ClaimableAwaitingConfirmations_get_claimable_amount_satoshis(ptr); this.confirmation_height = bindings.LDKBalance_ClaimableAwaitingConfirmations_get_confirmation_height(ptr); @@ -486,7 +486,7 @@ export class Balance_ContentiousClaimable extends Balance { */ public timeout_height: number; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); this.claimable_amount_satoshis = bindings.LDKBalance_ContentiousClaimable_get_claimable_amount_satoshis(ptr); this.timeout_height = bindings.LDKBalance_ContentiousClaimable_get_timeout_height(ptr); @@ -505,7 +505,7 @@ export class Balance_MaybeClaimableHTLCAwaitingTimeout extends Balance { */ public claimable_height: number; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); this.claimable_amount_satoshis = bindings.LDKBalance_MaybeClaimableHTLCAwaitingTimeout_get_claimable_amount_satoshis(ptr); this.claimable_height = bindings.LDKBalance_MaybeClaimableHTLCAwaitingTimeout_get_claimable_height(ptr); diff --git a/ts/structs/BaseSign.mts b/ts/structs/BaseSign.mts index 7a8c63b2..fcfe34ed 100644 --- a/ts/structs/BaseSign.mts +++ b/ts/structs/BaseSign.mts @@ -542,7 +542,7 @@ export class BaseSign extends CommonBase { public bindings_instance?: bindings.LDKBaseSign; /* @internal */ - constructor(_dummy: object, ptr: number) { + constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.BaseSign_free); this.bindings_instance = null; } @@ -561,7 +561,7 @@ export class BaseSign extends CommonBase { const result: number = bindings.encodeUint8Array(bindings.check_arr_len(ret, 32)); return result; }, - validate_holder_commitment (holder_tx: number, preimages: number): number { + validate_holder_commitment (holder_tx: bigint, preimages: number): bigint { const holder_tx_hu_conv: HolderCommitmentTransaction = new HolderCommitmentTransaction(null, holder_tx); const preimages_conv_12_len: number = bindings.getArrayLength(preimages); const preimages_conv_12_arr: Uint8Array[] = new Array(preimages_conv_12_len).fill(null); @@ -572,7 +572,7 @@ export class BaseSign extends CommonBase { } bindings.freeWasmMemory(preimages) const ret: Result_NoneNoneZ = arg.validate_holder_commitment(holder_tx_hu_conv, preimages_conv_12_arr); - const result: number = ret == null ? 0 : ret.clone_ptr(); + const result: bigint = ret == null ? 0n : ret.clone_ptr(); return result; }, channel_keys_id (): number { @@ -580,7 +580,7 @@ export class BaseSign extends CommonBase { const result: number = bindings.encodeUint8Array(bindings.check_arr_len(ret, 32)); return result; }, - sign_counterparty_commitment (commitment_tx: number, preimages: number): number { + sign_counterparty_commitment (commitment_tx: bigint, preimages: number): bigint { const commitment_tx_hu_conv: CommitmentTransaction = new CommitmentTransaction(null, commitment_tx); const preimages_conv_12_len: number = bindings.getArrayLength(preimages); const preimages_conv_12_arr: Uint8Array[] = new Array(preimages_conv_12_len).fill(null); @@ -591,62 +591,62 @@ export class BaseSign extends CommonBase { } bindings.freeWasmMemory(preimages) const ret: Result_C2Tuple_SignatureCVec_SignatureZZNoneZ = arg.sign_counterparty_commitment(commitment_tx_hu_conv, preimages_conv_12_arr); - const result: number = ret == null ? 0 : ret.clone_ptr(); + const result: bigint = ret == null ? 0n : ret.clone_ptr(); return result; }, - validate_counterparty_revocation (idx: bigint, secret: number): number { + validate_counterparty_revocation (idx: bigint, secret: number): bigint { const secret_conv: Uint8Array = bindings.decodeUint8Array(secret); const ret: Result_NoneNoneZ = arg.validate_counterparty_revocation(idx, secret_conv); - const result: number = ret == null ? 0 : ret.clone_ptr(); + const result: bigint = ret == null ? 0n : ret.clone_ptr(); return result; }, - sign_holder_commitment_and_htlcs (commitment_tx: number): number { + sign_holder_commitment_and_htlcs (commitment_tx: bigint): bigint { const commitment_tx_hu_conv: HolderCommitmentTransaction = new HolderCommitmentTransaction(null, commitment_tx); const ret: Result_C2Tuple_SignatureCVec_SignatureZZNoneZ = arg.sign_holder_commitment_and_htlcs(commitment_tx_hu_conv); - const result: number = ret == null ? 0 : ret.clone_ptr(); + const result: bigint = ret == null ? 0n : ret.clone_ptr(); return result; }, - sign_justice_revoked_output (justice_tx: number, input: number, amount: bigint, per_commitment_key: number): number { + sign_justice_revoked_output (justice_tx: number, input: number, amount: bigint, per_commitment_key: number): bigint { const justice_tx_conv: Uint8Array = bindings.decodeUint8Array(justice_tx); const per_commitment_key_conv: Uint8Array = bindings.decodeUint8Array(per_commitment_key); const ret: Result_SignatureNoneZ = arg.sign_justice_revoked_output(justice_tx_conv, input, amount, per_commitment_key_conv); - const result: number = ret == null ? 0 : ret.clone_ptr(); + const result: bigint = ret == null ? 0n : ret.clone_ptr(); return result; }, - sign_justice_revoked_htlc (justice_tx: number, input: number, amount: bigint, per_commitment_key: number, htlc: number): number { + sign_justice_revoked_htlc (justice_tx: number, input: number, amount: bigint, per_commitment_key: number, htlc: bigint): bigint { const justice_tx_conv: Uint8Array = bindings.decodeUint8Array(justice_tx); const per_commitment_key_conv: Uint8Array = bindings.decodeUint8Array(per_commitment_key); const htlc_hu_conv: HTLCOutputInCommitment = new HTLCOutputInCommitment(null, htlc); const ret: Result_SignatureNoneZ = arg.sign_justice_revoked_htlc(justice_tx_conv, input, amount, per_commitment_key_conv, htlc_hu_conv); - const result: number = ret == null ? 0 : ret.clone_ptr(); + const result: bigint = ret == null ? 0n : ret.clone_ptr(); return result; }, - sign_counterparty_htlc_transaction (htlc_tx: number, input: number, amount: bigint, per_commitment_point: number, htlc: number): number { + sign_counterparty_htlc_transaction (htlc_tx: number, input: number, amount: bigint, per_commitment_point: number, htlc: bigint): bigint { const htlc_tx_conv: Uint8Array = bindings.decodeUint8Array(htlc_tx); const per_commitment_point_conv: Uint8Array = bindings.decodeUint8Array(per_commitment_point); const htlc_hu_conv: HTLCOutputInCommitment = new HTLCOutputInCommitment(null, htlc); const ret: Result_SignatureNoneZ = arg.sign_counterparty_htlc_transaction(htlc_tx_conv, input, amount, per_commitment_point_conv, htlc_hu_conv); - const result: number = ret == null ? 0 : ret.clone_ptr(); + const result: bigint = ret == null ? 0n : ret.clone_ptr(); return result; }, - sign_closing_transaction (closing_tx: number): number { + sign_closing_transaction (closing_tx: bigint): bigint { const closing_tx_hu_conv: ClosingTransaction = new ClosingTransaction(null, closing_tx); const ret: Result_SignatureNoneZ = arg.sign_closing_transaction(closing_tx_hu_conv); - const result: number = ret == null ? 0 : ret.clone_ptr(); + const result: bigint = ret == null ? 0n : ret.clone_ptr(); return result; }, - sign_channel_announcement (msg: number): number { + sign_channel_announcement (msg: bigint): bigint { const msg_hu_conv: UnsignedChannelAnnouncement = new UnsignedChannelAnnouncement(null, msg); const ret: Result_C2Tuple_SignatureSignatureZNoneZ = arg.sign_channel_announcement(msg_hu_conv); - const result: number = ret == null ? 0 : ret.clone_ptr(); + const result: bigint = ret == null ? 0n : ret.clone_ptr(); return result; }, - ready_channel (channel_parameters: number): void { + ready_channel (channel_parameters: bigint): void { const channel_parameters_hu_conv: ChannelTransactionParameters = new ChannelTransactionParameters(null, channel_parameters); arg.ready_channel(channel_parameters_hu_conv); }, } as bindings.LDKBaseSign; - const ptr: number = bindings.LDKBaseSign_new(structImplementation, pubkeys == null ? 0 : pubkeys.clone_ptr()); + const ptr: bigint = bindings.LDKBaseSign_new(structImplementation, pubkeys == null ? 0n : pubkeys.clone_ptr()); impl_holder.held = new BaseSign(null, ptr); impl_holder.held.bindings_instance = structImplementation; @@ -696,7 +696,7 @@ export class BaseSign extends CommonBase { * irrelevant or duplicate preimages. */ public validate_holder_commitment(holder_tx: HolderCommitmentTransaction, preimages: Uint8Array[]): Result_NoneNoneZ { - const ret: number = bindings.BaseSign_validate_holder_commitment(this.ptr, holder_tx == null ? 0 : CommonBase.get_ptr_of(holder_tx) & ~1, bindings.encodeUint32Array(preimages != null ? preimages.map(preimages_conv_12 => bindings.encodeUint8Array(bindings.check_arr_len(preimages_conv_12, 32))) : null)); + const ret: bigint = bindings.BaseSign_validate_holder_commitment(this.ptr, holder_tx == null ? 0n : CommonBase.get_ptr_of(holder_tx), bindings.encodeUint32Array(preimages != null ? preimages.map(preimages_conv_12 => bindings.encodeUint8Array(bindings.check_arr_len(preimages_conv_12, 32))) : null)); const ret_hu_conv: Result_NoneNoneZ = Result_NoneNoneZ.constr_from_ptr(ret); CommonBase.add_ref_from(this, holder_tx); return ret_hu_conv; @@ -729,7 +729,7 @@ export class BaseSign extends CommonBase { * irrelevant or duplicate preimages. */ public sign_counterparty_commitment(commitment_tx: CommitmentTransaction, preimages: Uint8Array[]): Result_C2Tuple_SignatureCVec_SignatureZZNoneZ { - const ret: number = bindings.BaseSign_sign_counterparty_commitment(this.ptr, commitment_tx == null ? 0 : CommonBase.get_ptr_of(commitment_tx) & ~1, bindings.encodeUint32Array(preimages != null ? preimages.map(preimages_conv_12 => bindings.encodeUint8Array(bindings.check_arr_len(preimages_conv_12, 32))) : null)); + const ret: bigint = bindings.BaseSign_sign_counterparty_commitment(this.ptr, commitment_tx == null ? 0n : CommonBase.get_ptr_of(commitment_tx), bindings.encodeUint32Array(preimages != null ? preimages.map(preimages_conv_12 => bindings.encodeUint8Array(bindings.check_arr_len(preimages_conv_12, 32))) : null)); const ret_hu_conv: Result_C2Tuple_SignatureCVec_SignatureZZNoneZ = Result_C2Tuple_SignatureCVec_SignatureZZNoneZ.constr_from_ptr(ret); CommonBase.add_ref_from(this, commitment_tx); return ret_hu_conv; @@ -742,7 +742,7 @@ export class BaseSign extends CommonBase { * forward and it is safe to sign the next counterparty commitment. */ public validate_counterparty_revocation(idx: bigint, secret: Uint8Array): Result_NoneNoneZ { - const ret: number = bindings.BaseSign_validate_counterparty_revocation(this.ptr, idx, bindings.encodeUint8Array(bindings.check_arr_len(secret, 32))); + const ret: bigint = bindings.BaseSign_validate_counterparty_revocation(this.ptr, idx, bindings.encodeUint8Array(bindings.check_arr_len(secret, 32))); const ret_hu_conv: Result_NoneNoneZ = Result_NoneNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -761,7 +761,7 @@ export class BaseSign extends CommonBase { * May return Err if key derivation fails. Callers, such as ChannelMonitor, will panic in such a case. */ public sign_holder_commitment_and_htlcs(commitment_tx: HolderCommitmentTransaction): Result_C2Tuple_SignatureCVec_SignatureZZNoneZ { - const ret: number = bindings.BaseSign_sign_holder_commitment_and_htlcs(this.ptr, commitment_tx == null ? 0 : CommonBase.get_ptr_of(commitment_tx) & ~1); + const ret: bigint = bindings.BaseSign_sign_holder_commitment_and_htlcs(this.ptr, commitment_tx == null ? 0n : CommonBase.get_ptr_of(commitment_tx)); const ret_hu_conv: Result_C2Tuple_SignatureCVec_SignatureZZNoneZ = Result_C2Tuple_SignatureCVec_SignatureZZNoneZ.constr_from_ptr(ret); CommonBase.add_ref_from(this, commitment_tx); return ret_hu_conv; @@ -784,7 +784,7 @@ export class BaseSign extends CommonBase { * so). */ public sign_justice_revoked_output(justice_tx: Uint8Array, input: number, amount: bigint, per_commitment_key: Uint8Array): Result_SignatureNoneZ { - const ret: number = bindings.BaseSign_sign_justice_revoked_output(this.ptr, bindings.encodeUint8Array(justice_tx), input, amount, bindings.encodeUint8Array(bindings.check_arr_len(per_commitment_key, 32))); + const ret: bigint = bindings.BaseSign_sign_justice_revoked_output(this.ptr, bindings.encodeUint8Array(justice_tx), input, amount, bindings.encodeUint8Array(bindings.check_arr_len(per_commitment_key, 32))); const ret_hu_conv: Result_SignatureNoneZ = Result_SignatureNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -809,7 +809,7 @@ export class BaseSign extends CommonBase { * (which is committed to in the BIP 143 signatures). */ public sign_justice_revoked_htlc(justice_tx: Uint8Array, input: number, amount: bigint, per_commitment_key: Uint8Array, htlc: HTLCOutputInCommitment): Result_SignatureNoneZ { - const ret: number = bindings.BaseSign_sign_justice_revoked_htlc(this.ptr, bindings.encodeUint8Array(justice_tx), input, amount, bindings.encodeUint8Array(bindings.check_arr_len(per_commitment_key, 32)), htlc == null ? 0 : CommonBase.get_ptr_of(htlc) & ~1); + const ret: bigint = bindings.BaseSign_sign_justice_revoked_htlc(this.ptr, bindings.encodeUint8Array(justice_tx), input, amount, bindings.encodeUint8Array(bindings.check_arr_len(per_commitment_key, 32)), htlc == null ? 0n : CommonBase.get_ptr_of(htlc)); const ret_hu_conv: Result_SignatureNoneZ = Result_SignatureNoneZ.constr_from_ptr(ret); CommonBase.add_ref_from(this, htlc); return ret_hu_conv; @@ -835,7 +835,7 @@ export class BaseSign extends CommonBase { * BIP 143 signature. */ public sign_counterparty_htlc_transaction(htlc_tx: Uint8Array, input: number, amount: bigint, per_commitment_point: Uint8Array, htlc: HTLCOutputInCommitment): Result_SignatureNoneZ { - const ret: number = bindings.BaseSign_sign_counterparty_htlc_transaction(this.ptr, bindings.encodeUint8Array(htlc_tx), input, amount, bindings.encodeUint8Array(bindings.check_arr_len(per_commitment_point, 33)), htlc == null ? 0 : CommonBase.get_ptr_of(htlc) & ~1); + const ret: bigint = bindings.BaseSign_sign_counterparty_htlc_transaction(this.ptr, bindings.encodeUint8Array(htlc_tx), input, amount, bindings.encodeUint8Array(bindings.check_arr_len(per_commitment_point, 33)), htlc == null ? 0n : CommonBase.get_ptr_of(htlc)); const ret_hu_conv: Result_SignatureNoneZ = Result_SignatureNoneZ.constr_from_ptr(ret); CommonBase.add_ref_from(this, htlc); return ret_hu_conv; @@ -848,7 +848,7 @@ export class BaseSign extends CommonBase { * chosen to forgo their output as dust. */ public sign_closing_transaction(closing_tx: ClosingTransaction): Result_SignatureNoneZ { - const ret: number = bindings.BaseSign_sign_closing_transaction(this.ptr, closing_tx == null ? 0 : CommonBase.get_ptr_of(closing_tx) & ~1); + const ret: bigint = bindings.BaseSign_sign_closing_transaction(this.ptr, closing_tx == null ? 0n : CommonBase.get_ptr_of(closing_tx)); const ret_hu_conv: Result_SignatureNoneZ = Result_SignatureNoneZ.constr_from_ptr(ret); CommonBase.add_ref_from(this, closing_tx); return ret_hu_conv; @@ -866,7 +866,7 @@ export class BaseSign extends CommonBase { * protocol. */ public sign_channel_announcement(msg: UnsignedChannelAnnouncement): Result_C2Tuple_SignatureSignatureZNoneZ { - const ret: number = bindings.BaseSign_sign_channel_announcement(this.ptr, msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + const ret: bigint = bindings.BaseSign_sign_channel_announcement(this.ptr, msg == null ? 0n : CommonBase.get_ptr_of(msg)); const ret_hu_conv: Result_C2Tuple_SignatureSignatureZNoneZ = Result_C2Tuple_SignatureSignatureZNoneZ.constr_from_ptr(ret); CommonBase.add_ref_from(this, msg); return ret_hu_conv; @@ -885,7 +885,7 @@ export class BaseSign extends CommonBase { * Will be called before any signatures are applied. */ public ready_channel(channel_parameters: ChannelTransactionParameters): void { - bindings.BaseSign_ready_channel(this.ptr, channel_parameters == null ? 0 : CommonBase.get_ptr_of(channel_parameters) & ~1); + bindings.BaseSign_ready_channel(this.ptr, channel_parameters == null ? 0n : CommonBase.get_ptr_of(channel_parameters)); CommonBase.add_ref_from(this, channel_parameters); } @@ -894,7 +894,7 @@ export class BaseSign extends CommonBase { * Does not need to free the outer struct containing function pointers and may be NULL is no resources need to be freed. */ public get_pubkeys(): ChannelPublicKeys { - const ret: number = bindings.BaseSign_get_pubkeys(this.ptr); + const ret: bigint = bindings.BaseSign_get_pubkeys(this.ptr); const ret_hu_conv: ChannelPublicKeys = new ChannelPublicKeys(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; diff --git a/ts/structs/Bech32Error.mts b/ts/structs/Bech32Error.mts index 8879ad0d..3c88dad6 100644 --- a/ts/structs/Bech32Error.mts +++ b/ts/structs/Bech32Error.mts @@ -359,9 +359,9 @@ import * as bindings from '../bindings.mjs' * Represents an error returned from the bech32 library during validation of some bech32 data */ export class Bech32Error extends CommonBase { - protected constructor(_dummy: object, ptr: number) { super(ptr, bindings.Bech32Error_free); } + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.Bech32Error_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Bech32Error { + public static constr_from_ptr(ptr: bigint): Bech32Error { const raw_ty: number = bindings.LDKBech32Error_ty_from_ptr(ptr); switch (raw_ty) { case 0: return new Bech32Error_MissingSeparator(ptr); @@ -376,8 +376,8 @@ export class Bech32Error extends CommonBase { } } - public clone_ptr(): number { - const ret: number = bindings.Bech32Error_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.Bech32Error_clone_ptr(this.ptr); return ret; } @@ -385,7 +385,7 @@ export class Bech32Error extends CommonBase { * Creates a new Bech32Error which has the same data as `orig` */ public clone(): Bech32Error { - const ret: number = bindings.Bech32Error_clone(this.ptr); + const ret: bigint = bindings.Bech32Error_clone(this.ptr); const ret_hu_conv: Bech32Error = Bech32Error.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -395,21 +395,21 @@ export class Bech32Error extends CommonBase { /** A Bech32Error of type MissingSeparator */ export class Bech32Error_MissingSeparator extends Bech32Error { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } /** A Bech32Error of type InvalidChecksum */ export class Bech32Error_InvalidChecksum extends Bech32Error { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } /** A Bech32Error of type InvalidLength */ export class Bech32Error_InvalidLength extends Bech32Error { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } @@ -417,7 +417,7 @@ export class Bech32Error_InvalidLength extends Bech32Error { export class Bech32Error_InvalidChar extends Bech32Error { public invalid_char: number; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); this.invalid_char = bindings.LDKBech32Error_InvalidChar_get_invalid_char(ptr); } @@ -426,7 +426,7 @@ export class Bech32Error_InvalidChar extends Bech32Error { export class Bech32Error_InvalidData extends Bech32Error { public invalid_data: number; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); this.invalid_data = bindings.LDKBech32Error_InvalidData_get_invalid_data(ptr); } @@ -434,14 +434,14 @@ export class Bech32Error_InvalidData extends Bech32Error { /** A Bech32Error of type InvalidPadding */ export class Bech32Error_InvalidPadding extends Bech32Error { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } /** A Bech32Error of type MixedCase */ export class Bech32Error_MixedCase extends Bech32Error { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } diff --git a/ts/structs/BestBlock.mts b/ts/structs/BestBlock.mts index 58c8c10d..494b38e2 100644 --- a/ts/structs/BestBlock.mts +++ b/ts/structs/BestBlock.mts @@ -361,12 +361,12 @@ import * as bindings from '../bindings.mjs' */ export class BestBlock extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.BestBlock_free); } - public clone_ptr(): number { - const ret: number = bindings.BestBlock_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.BestBlock_clone_ptr(this.ptr); return ret; } @@ -374,7 +374,7 @@ export class BestBlock extends CommonBase { * Creates a copy of the BestBlock */ public clone(): BestBlock { - const ret: number = bindings.BestBlock_clone(this.ptr); + const ret: bigint = bindings.BestBlock_clone(this.ptr); const ret_hu_conv: BestBlock = new BestBlock(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -385,7 +385,7 @@ export class BestBlock extends CommonBase { * network. */ public static constructor_from_genesis(network: Network): BestBlock { - const ret: number = bindings.BestBlock_from_genesis(network); + const ret: bigint = bindings.BestBlock_from_genesis(network); const ret_hu_conv: BestBlock = new BestBlock(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -395,7 +395,7 @@ export class BestBlock extends CommonBase { * Returns a `BestBlock` as identified by the given block hash and height. */ public static constructor_new(block_hash: Uint8Array, height: number): BestBlock { - const ret: number = bindings.BestBlock_new(bindings.encodeUint8Array(bindings.check_arr_len(block_hash, 32)), height); + const ret: bigint = bindings.BestBlock_new(bindings.encodeUint8Array(bindings.check_arr_len(block_hash, 32)), height); const ret_hu_conv: BestBlock = new BestBlock(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; diff --git a/ts/structs/BigSize.mts b/ts/structs/BigSize.mts index d36e582e..e0fd00ab 100644 --- a/ts/structs/BigSize.mts +++ b/ts/structs/BigSize.mts @@ -367,7 +367,7 @@ import * as bindings from '../bindings.mjs' */ export class BigSize extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.BigSize_free); } @@ -384,7 +384,7 @@ export class BigSize extends CommonBase { * Constructs a new BigSize given each field */ public static constructor_new(a_arg: bigint): BigSize { - const ret: number = bindings.BigSize_new(a_arg); + const ret: bigint = bindings.BigSize_new(a_arg); const ret_hu_conv: BigSize = new BigSize(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; diff --git a/ts/structs/BroadcasterInterface.mts b/ts/structs/BroadcasterInterface.mts index 45938631..338578ef 100644 --- a/ts/structs/BroadcasterInterface.mts +++ b/ts/structs/BroadcasterInterface.mts @@ -377,7 +377,7 @@ export class BroadcasterInterface extends CommonBase { public bindings_instance?: bindings.LDKBroadcasterInterface; /* @internal */ - constructor(_dummy: object, ptr: number) { + constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.BroadcasterInterface_free); this.bindings_instance = null; } @@ -391,7 +391,7 @@ export class BroadcasterInterface extends CommonBase { arg.broadcast_transaction(tx_conv); }, } as bindings.LDKBroadcasterInterface; - const ptr: number = bindings.LDKBroadcasterInterface_new(structImplementation); + const ptr: bigint = bindings.LDKBroadcasterInterface_new(structImplementation); impl_holder.held = new BroadcasterInterface(null, ptr); impl_holder.held.bindings_instance = structImplementation; diff --git a/ts/structs/BuiltCommitmentTransaction.mts b/ts/structs/BuiltCommitmentTransaction.mts index 2d5b7fbe..ecc98b78 100644 --- a/ts/structs/BuiltCommitmentTransaction.mts +++ b/ts/structs/BuiltCommitmentTransaction.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class BuiltCommitmentTransaction extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.BuiltCommitmentTransaction_free); } @@ -407,14 +407,14 @@ export class BuiltCommitmentTransaction extends CommonBase { * Constructs a new BuiltCommitmentTransaction given each field */ public static constructor_new(transaction_arg: Uint8Array, txid_arg: Uint8Array): BuiltCommitmentTransaction { - const ret: number = bindings.BuiltCommitmentTransaction_new(bindings.encodeUint8Array(transaction_arg), bindings.encodeUint8Array(bindings.check_arr_len(txid_arg, 32))); + const ret: bigint = bindings.BuiltCommitmentTransaction_new(bindings.encodeUint8Array(transaction_arg), bindings.encodeUint8Array(bindings.check_arr_len(txid_arg, 32))); const ret_hu_conv: BuiltCommitmentTransaction = new BuiltCommitmentTransaction(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.BuiltCommitmentTransaction_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.BuiltCommitmentTransaction_clone_ptr(this.ptr); return ret; } @@ -422,7 +422,7 @@ export class BuiltCommitmentTransaction extends CommonBase { * Creates a copy of the BuiltCommitmentTransaction */ public clone(): BuiltCommitmentTransaction { - const ret: number = bindings.BuiltCommitmentTransaction_clone(this.ptr); + const ret: bigint = bindings.BuiltCommitmentTransaction_clone(this.ptr); const ret_hu_conv: BuiltCommitmentTransaction = new BuiltCommitmentTransaction(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -441,7 +441,7 @@ export class BuiltCommitmentTransaction extends CommonBase { * Read a BuiltCommitmentTransaction from a byte array, created by BuiltCommitmentTransaction_write */ public static constructor_read(ser: Uint8Array): Result_BuiltCommitmentTransactionDecodeErrorZ { - const ret: number = bindings.BuiltCommitmentTransaction_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.BuiltCommitmentTransaction_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_BuiltCommitmentTransactionDecodeErrorZ = Result_BuiltCommitmentTransactionDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/ChainMonitor.mts b/ts/structs/ChainMonitor.mts index a5e2bf87..c42285df 100644 --- a/ts/structs/ChainMonitor.mts +++ b/ts/structs/ChainMonitor.mts @@ -369,7 +369,7 @@ import * as bindings from '../bindings.mjs' */ export class ChainMonitor extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.ChainMonitor_free); } @@ -383,7 +383,7 @@ export class ChainMonitor extends CommonBase { * transactions relevant to the watched channels. */ public static constructor_new(chain_source: Option_FilterZ, broadcaster: BroadcasterInterface, logger: Logger, feeest: FeeEstimator, persister: Persist): ChainMonitor { - const ret: number = bindings.ChainMonitor_new(CommonBase.get_ptr_of(chain_source), broadcaster == null ? 0 : CommonBase.get_ptr_of(broadcaster), logger == null ? 0 : CommonBase.get_ptr_of(logger), feeest == null ? 0 : CommonBase.get_ptr_of(feeest), persister == null ? 0 : CommonBase.get_ptr_of(persister)); + const ret: bigint = bindings.ChainMonitor_new(CommonBase.get_ptr_of(chain_source), broadcaster == null ? 0n : CommonBase.get_ptr_of(broadcaster), logger == null ? 0n : CommonBase.get_ptr_of(logger), feeest == null ? 0n : CommonBase.get_ptr_of(feeest), persister == null ? 0n : CommonBase.get_ptr_of(persister)); const ret_hu_conv: ChainMonitor = new ChainMonitor(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); CommonBase.add_ref_from(ret_hu_conv, chain_source); @@ -406,16 +406,17 @@ export class ChainMonitor extends CommonBase { * inclusion in the return value. */ public get_claimable_balances(ignored_channels: ChannelDetails[]): Balance[] { - const ret: number = bindings.ChainMonitor_get_claimable_balances(this.ptr, bindings.encodeUint32Array(ignored_channels != null ? ignored_channels.map(ignored_channels_conv_16 => ignored_channels_conv_16 == null ? 0 : CommonBase.get_ptr_of(ignored_channels_conv_16) & ~1) : null)); + const ret: number = bindings.ChainMonitor_get_claimable_balances(this.ptr, bindings.encodeUint64Array(ignored_channels != null ? ignored_channels.map(ignored_channels_conv_16 => ignored_channels_conv_16 == null ? 0n : CommonBase.get_ptr_of(ignored_channels_conv_16)) : null)); const ret_conv_9_len: number = bindings.getArrayLength(ret); const ret_conv_9_arr: Balance[] = new Array(ret_conv_9_len).fill(null); for (var j = 0; j < ret_conv_9_len; j++) { - const ret_conv_9: number = bindings.getU32ArrayElem(ret, j); + const ret_conv_9: bigint = bindings.getU64ArrayElem(ret, j); const ret_conv_9_hu_conv: Balance = Balance.constr_from_ptr(ret_conv_9); CommonBase.add_ref_from(ret_conv_9_hu_conv, this); ret_conv_9_arr[j] = ret_conv_9_hu_conv; } bindings.freeWasmMemory(ret) + ignored_channels.forEach((ignored_channels_conv_16: ChannelDetails) => { CommonBase.add_ref_from(this, ignored_channels_conv_16); }); return ret_conv_9_arr; } @@ -427,8 +428,9 @@ export class ChainMonitor extends CommonBase { * indefinitely. */ public get_monitor(funding_txo: OutPoint): Result_LockedChannelMonitorNoneZ { - const ret: number = bindings.ChainMonitor_get_monitor(this.ptr, funding_txo == null ? 0 : CommonBase.get_ptr_of(funding_txo) & ~1); + const ret: bigint = bindings.ChainMonitor_get_monitor(this.ptr, funding_txo == null ? 0n : CommonBase.get_ptr_of(funding_txo)); const ret_hu_conv: Result_LockedChannelMonitorNoneZ = Result_LockedChannelMonitorNoneZ.constr_from_ptr(ret); + CommonBase.add_ref_from(this, funding_txo); return ret_hu_conv; } @@ -443,7 +445,7 @@ export class ChainMonitor extends CommonBase { const ret_conv_10_len: number = bindings.getArrayLength(ret); const ret_conv_10_arr: OutPoint[] = new Array(ret_conv_10_len).fill(null); for (var k = 0; k < ret_conv_10_len; k++) { - const ret_conv_10: number = bindings.getU32ArrayElem(ret, k); + const ret_conv_10: bigint = bindings.getU64ArrayElem(ret, k); const ret_conv_10_hu_conv: OutPoint = new OutPoint(null, ret_conv_10); CommonBase.add_ref_from(ret_conv_10_hu_conv, this); ret_conv_10_arr[k] = ret_conv_10_hu_conv; @@ -468,8 +470,10 @@ export class ChainMonitor extends CommonBase { * registered [`ChannelMonitor`]s. */ public channel_monitor_updated(funding_txo: OutPoint, completed_update_id: MonitorUpdateId): Result_NoneAPIErrorZ { - const ret: number = bindings.ChainMonitor_channel_monitor_updated(this.ptr, funding_txo == null ? 0 : CommonBase.get_ptr_of(funding_txo) & ~1, completed_update_id == null ? 0 : CommonBase.get_ptr_of(completed_update_id) & ~1); + const ret: bigint = bindings.ChainMonitor_channel_monitor_updated(this.ptr, funding_txo == null ? 0n : CommonBase.get_ptr_of(funding_txo), completed_update_id == null ? 0n : CommonBase.get_ptr_of(completed_update_id)); const ret_hu_conv: Result_NoneAPIErrorZ = Result_NoneAPIErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(this, funding_txo); + CommonBase.add_ref_from(this, completed_update_id); return ret_hu_conv; } @@ -478,7 +482,7 @@ export class ChainMonitor extends CommonBase { * This copies the `inner` pointer in this_arg and thus the returned Listen must be freed before this_arg is */ public as_Listen(): Listen { - const ret: number = bindings.ChainMonitor_as_Listen(this.ptr); + const ret: bigint = bindings.ChainMonitor_as_Listen(this.ptr); const ret_hu_conv: Listen = new Listen(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -489,7 +493,7 @@ export class ChainMonitor extends CommonBase { * This copies the `inner` pointer in this_arg and thus the returned Confirm must be freed before this_arg is */ public as_Confirm(): Confirm { - const ret: number = bindings.ChainMonitor_as_Confirm(this.ptr); + const ret: bigint = bindings.ChainMonitor_as_Confirm(this.ptr); const ret_hu_conv: Confirm = new Confirm(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -500,7 +504,7 @@ export class ChainMonitor extends CommonBase { * This copies the `inner` pointer in this_arg and thus the returned Watch must be freed before this_arg is */ public as_Watch(): Watch { - const ret: number = bindings.ChainMonitor_as_Watch(this.ptr); + const ret: bigint = bindings.ChainMonitor_as_Watch(this.ptr); const ret_hu_conv: Watch = new Watch(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -511,7 +515,7 @@ export class ChainMonitor extends CommonBase { * This copies the `inner` pointer in this_arg and thus the returned EventsProvider must be freed before this_arg is */ public as_EventsProvider(): EventsProvider { - const ret: number = bindings.ChainMonitor_as_EventsProvider(this.ptr); + const ret: bigint = bindings.ChainMonitor_as_EventsProvider(this.ptr); const ret_hu_conv: EventsProvider = new EventsProvider(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; diff --git a/ts/structs/ChainParameters.mts b/ts/structs/ChainParameters.mts index 374a5200..37f2675a 100644 --- a/ts/structs/ChainParameters.mts +++ b/ts/structs/ChainParameters.mts @@ -365,7 +365,7 @@ import * as bindings from '../bindings.mjs' */ export class ChainParameters extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.ChainParameters_free); } @@ -390,7 +390,7 @@ export class ChainParameters extends CommonBase { * Used to track on-chain channel funding outputs and send payments with reliable timelocks. */ public get_best_block(): BestBlock { - const ret: number = bindings.ChainParameters_get_best_block(this.ptr); + const ret: bigint = bindings.ChainParameters_get_best_block(this.ptr); const ret_hu_conv: BestBlock = new BestBlock(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -402,21 +402,23 @@ export class ChainParameters extends CommonBase { * Used to track on-chain channel funding outputs and send payments with reliable timelocks. */ public set_best_block(val: BestBlock): void { - bindings.ChainParameters_set_best_block(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.ChainParameters_set_best_block(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** * Constructs a new ChainParameters given each field */ public static constructor_new(network_arg: Network, best_block_arg: BestBlock): ChainParameters { - const ret: number = bindings.ChainParameters_new(network_arg, best_block_arg == null ? 0 : CommonBase.get_ptr_of(best_block_arg) & ~1); + const ret: bigint = bindings.ChainParameters_new(network_arg, best_block_arg == null ? 0n : CommonBase.get_ptr_of(best_block_arg)); const ret_hu_conv: ChainParameters = new ChainParameters(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, best_block_arg); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.ChainParameters_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.ChainParameters_clone_ptr(this.ptr); return ret; } @@ -424,7 +426,7 @@ export class ChainParameters extends CommonBase { * Creates a copy of the ChainParameters */ public clone(): ChainParameters { - const ret: number = bindings.ChainParameters_clone(this.ptr); + const ret: bigint = bindings.ChainParameters_clone(this.ptr); const ret_hu_conv: ChainParameters = new ChainParameters(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; diff --git a/ts/structs/ChannelAnnouncement.mts b/ts/structs/ChannelAnnouncement.mts index 7e9a3c8a..e7adad0c 100644 --- a/ts/structs/ChannelAnnouncement.mts +++ b/ts/structs/ChannelAnnouncement.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class ChannelAnnouncement extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.ChannelAnnouncement_free); } @@ -433,7 +433,7 @@ export class ChannelAnnouncement extends CommonBase { * The actual announcement */ public get_contents(): UnsignedChannelAnnouncement { - const ret: number = bindings.ChannelAnnouncement_get_contents(this.ptr); + const ret: bigint = bindings.ChannelAnnouncement_get_contents(this.ptr); const ret_hu_conv: UnsignedChannelAnnouncement = new UnsignedChannelAnnouncement(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -443,21 +443,23 @@ export class ChannelAnnouncement extends CommonBase { * The actual announcement */ public set_contents(val: UnsignedChannelAnnouncement): void { - bindings.ChannelAnnouncement_set_contents(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.ChannelAnnouncement_set_contents(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** * Constructs a new ChannelAnnouncement given each field */ public static constructor_new(node_signature_1_arg: Uint8Array, node_signature_2_arg: Uint8Array, bitcoin_signature_1_arg: Uint8Array, bitcoin_signature_2_arg: Uint8Array, contents_arg: UnsignedChannelAnnouncement): ChannelAnnouncement { - const ret: number = bindings.ChannelAnnouncement_new(bindings.encodeUint8Array(bindings.check_arr_len(node_signature_1_arg, 64)), bindings.encodeUint8Array(bindings.check_arr_len(node_signature_2_arg, 64)), bindings.encodeUint8Array(bindings.check_arr_len(bitcoin_signature_1_arg, 64)), bindings.encodeUint8Array(bindings.check_arr_len(bitcoin_signature_2_arg, 64)), contents_arg == null ? 0 : CommonBase.get_ptr_of(contents_arg) & ~1); + const ret: bigint = bindings.ChannelAnnouncement_new(bindings.encodeUint8Array(bindings.check_arr_len(node_signature_1_arg, 64)), bindings.encodeUint8Array(bindings.check_arr_len(node_signature_2_arg, 64)), bindings.encodeUint8Array(bindings.check_arr_len(bitcoin_signature_1_arg, 64)), bindings.encodeUint8Array(bindings.check_arr_len(bitcoin_signature_2_arg, 64)), contents_arg == null ? 0n : CommonBase.get_ptr_of(contents_arg)); const ret_hu_conv: ChannelAnnouncement = new ChannelAnnouncement(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, contents_arg); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.ChannelAnnouncement_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.ChannelAnnouncement_clone_ptr(this.ptr); return ret; } @@ -465,7 +467,7 @@ export class ChannelAnnouncement extends CommonBase { * Creates a copy of the ChannelAnnouncement */ public clone(): ChannelAnnouncement { - const ret: number = bindings.ChannelAnnouncement_clone(this.ptr); + const ret: bigint = bindings.ChannelAnnouncement_clone(this.ptr); const ret_hu_conv: ChannelAnnouncement = new ChannelAnnouncement(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -484,7 +486,7 @@ export class ChannelAnnouncement extends CommonBase { * Read a ChannelAnnouncement from a byte array, created by ChannelAnnouncement_write */ public static constructor_read(ser: Uint8Array): Result_ChannelAnnouncementDecodeErrorZ { - const ret: number = bindings.ChannelAnnouncement_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.ChannelAnnouncement_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_ChannelAnnouncementDecodeErrorZ = Result_ChannelAnnouncementDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/ChannelConfig.mts b/ts/structs/ChannelConfig.mts index f7ea8a1a..30f9b33e 100644 --- a/ts/structs/ChannelConfig.mts +++ b/ts/structs/ChannelConfig.mts @@ -362,7 +362,7 @@ import * as bindings from '../bindings.mjs' */ export class ChannelConfig extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.ChannelConfig_free); } @@ -583,14 +583,14 @@ export class ChannelConfig extends CommonBase { * Constructs a new ChannelConfig given each field */ public static constructor_new(forwarding_fee_proportional_millionths_arg: number, forwarding_fee_base_msat_arg: number, cltv_expiry_delta_arg: number, max_dust_htlc_exposure_msat_arg: bigint, force_close_avoidance_max_fee_satoshis_arg: bigint): ChannelConfig { - const ret: number = bindings.ChannelConfig_new(forwarding_fee_proportional_millionths_arg, forwarding_fee_base_msat_arg, cltv_expiry_delta_arg, max_dust_htlc_exposure_msat_arg, force_close_avoidance_max_fee_satoshis_arg); + const ret: bigint = bindings.ChannelConfig_new(forwarding_fee_proportional_millionths_arg, forwarding_fee_base_msat_arg, cltv_expiry_delta_arg, max_dust_htlc_exposure_msat_arg, force_close_avoidance_max_fee_satoshis_arg); const ret_hu_conv: ChannelConfig = new ChannelConfig(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.ChannelConfig_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.ChannelConfig_clone_ptr(this.ptr); return ret; } @@ -598,7 +598,7 @@ export class ChannelConfig extends CommonBase { * Creates a copy of the ChannelConfig */ public clone(): ChannelConfig { - const ret: number = bindings.ChannelConfig_clone(this.ptr); + const ret: bigint = bindings.ChannelConfig_clone(this.ptr); const ret_hu_conv: ChannelConfig = new ChannelConfig(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -608,7 +608,7 @@ export class ChannelConfig extends CommonBase { * Creates a "default" ChannelConfig. See struct and individual field documentaiton for details on which values are used. */ public static constructor_default(): ChannelConfig { - const ret: number = bindings.ChannelConfig_default(); + const ret: bigint = bindings.ChannelConfig_default(); const ret_hu_conv: ChannelConfig = new ChannelConfig(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -627,7 +627,7 @@ export class ChannelConfig extends CommonBase { * Read a ChannelConfig from a byte array, created by ChannelConfig_write */ public static constructor_read(ser: Uint8Array): Result_ChannelConfigDecodeErrorZ { - const ret: number = bindings.ChannelConfig_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.ChannelConfig_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_ChannelConfigDecodeErrorZ = Result_ChannelConfigDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/ChannelCounterparty.mts b/ts/structs/ChannelCounterparty.mts index 791d860d..13f59176 100644 --- a/ts/structs/ChannelCounterparty.mts +++ b/ts/structs/ChannelCounterparty.mts @@ -362,7 +362,7 @@ import * as bindings from '../bindings.mjs' */ export class ChannelCounterparty extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.ChannelCounterparty_free); } @@ -388,7 +388,7 @@ export class ChannelCounterparty extends CommonBase { * many routing-relevant features are present in the init context. */ public get_features(): InitFeatures { - const ret: number = bindings.ChannelCounterparty_get_features(this.ptr); + const ret: bigint = bindings.ChannelCounterparty_get_features(this.ptr); const ret_hu_conv: InitFeatures = new InitFeatures(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -400,7 +400,8 @@ export class ChannelCounterparty extends CommonBase { * many routing-relevant features are present in the init context. */ public set_features(val: InitFeatures): void { - bindings.ChannelCounterparty_set_features(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.ChannelCounterparty_set_features(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** @@ -437,7 +438,7 @@ export class ChannelCounterparty extends CommonBase { * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None */ public get_forwarding_info(): CounterpartyForwardingInfo { - const ret: number = bindings.ChannelCounterparty_get_forwarding_info(this.ptr); + const ret: bigint = bindings.ChannelCounterparty_get_forwarding_info(this.ptr); const ret_hu_conv: CounterpartyForwardingInfo = new CounterpartyForwardingInfo(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -450,7 +451,8 @@ export class ChannelCounterparty extends CommonBase { * Note that val (or a relevant inner pointer) may be NULL or all-0s to represent None */ public set_forwarding_info(val: CounterpartyForwardingInfo): void { - bindings.ChannelCounterparty_set_forwarding_info(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.ChannelCounterparty_set_forwarding_info(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** @@ -459,7 +461,7 @@ export class ChannelCounterparty extends CommonBase { * from the remote peer, or for `ChannelCounterparty` objects serialized prior to LDK 0.0.107. */ public get_outbound_htlc_minimum_msat(): Option_u64Z { - const ret: number = bindings.ChannelCounterparty_get_outbound_htlc_minimum_msat(this.ptr); + const ret: bigint = bindings.ChannelCounterparty_get_outbound_htlc_minimum_msat(this.ptr); const ret_hu_conv: Option_u64Z = Option_u64Z.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -478,7 +480,7 @@ export class ChannelCounterparty extends CommonBase { * The largest value HTLC (in msat) the remote peer currently will accept, for this channel. */ public get_outbound_htlc_maximum_msat(): Option_u64Z { - const ret: number = bindings.ChannelCounterparty_get_outbound_htlc_maximum_msat(this.ptr); + const ret: bigint = bindings.ChannelCounterparty_get_outbound_htlc_maximum_msat(this.ptr); const ret_hu_conv: Option_u64Z = Option_u64Z.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -495,14 +497,16 @@ export class ChannelCounterparty extends CommonBase { * Constructs a new ChannelCounterparty given each field */ public static constructor_new(node_id_arg: Uint8Array, features_arg: InitFeatures, unspendable_punishment_reserve_arg: bigint, forwarding_info_arg: CounterpartyForwardingInfo, outbound_htlc_minimum_msat_arg: Option_u64Z, outbound_htlc_maximum_msat_arg: Option_u64Z): ChannelCounterparty { - const ret: number = bindings.ChannelCounterparty_new(bindings.encodeUint8Array(bindings.check_arr_len(node_id_arg, 33)), features_arg == null ? 0 : CommonBase.get_ptr_of(features_arg) & ~1, unspendable_punishment_reserve_arg, forwarding_info_arg == null ? 0 : CommonBase.get_ptr_of(forwarding_info_arg) & ~1, CommonBase.get_ptr_of(outbound_htlc_minimum_msat_arg), CommonBase.get_ptr_of(outbound_htlc_maximum_msat_arg)); + const ret: bigint = bindings.ChannelCounterparty_new(bindings.encodeUint8Array(bindings.check_arr_len(node_id_arg, 33)), features_arg == null ? 0n : CommonBase.get_ptr_of(features_arg), unspendable_punishment_reserve_arg, forwarding_info_arg == null ? 0n : CommonBase.get_ptr_of(forwarding_info_arg), CommonBase.get_ptr_of(outbound_htlc_minimum_msat_arg), CommonBase.get_ptr_of(outbound_htlc_maximum_msat_arg)); const ret_hu_conv: ChannelCounterparty = new ChannelCounterparty(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, features_arg); + CommonBase.add_ref_from(ret_hu_conv, forwarding_info_arg); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.ChannelCounterparty_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.ChannelCounterparty_clone_ptr(this.ptr); return ret; } @@ -510,7 +514,7 @@ export class ChannelCounterparty extends CommonBase { * Creates a copy of the ChannelCounterparty */ public clone(): ChannelCounterparty { - const ret: number = bindings.ChannelCounterparty_clone(this.ptr); + const ret: bigint = bindings.ChannelCounterparty_clone(this.ptr); const ret_hu_conv: ChannelCounterparty = new ChannelCounterparty(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -529,7 +533,7 @@ export class ChannelCounterparty extends CommonBase { * Read a ChannelCounterparty from a byte array, created by ChannelCounterparty_write */ public static constructor_read(ser: Uint8Array): Result_ChannelCounterpartyDecodeErrorZ { - const ret: number = bindings.ChannelCounterparty_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.ChannelCounterparty_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_ChannelCounterpartyDecodeErrorZ = Result_ChannelCounterpartyDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/ChannelDetails.mts b/ts/structs/ChannelDetails.mts index 8ccaab53..6c864aa1 100644 --- a/ts/structs/ChannelDetails.mts +++ b/ts/structs/ChannelDetails.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class ChannelDetails extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.ChannelDetails_free); } @@ -391,7 +391,7 @@ export class ChannelDetails extends CommonBase { * Parameters which apply to our counterparty. See individual fields for more information. */ public get_counterparty(): ChannelCounterparty { - const ret: number = bindings.ChannelDetails_get_counterparty(this.ptr); + const ret: bigint = bindings.ChannelDetails_get_counterparty(this.ptr); const ret_hu_conv: ChannelCounterparty = new ChannelCounterparty(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -401,7 +401,8 @@ export class ChannelDetails extends CommonBase { * Parameters which apply to our counterparty. See individual fields for more information. */ public set_counterparty(val: ChannelCounterparty): void { - bindings.ChannelDetails_set_counterparty(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.ChannelDetails_set_counterparty(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** @@ -414,7 +415,7 @@ export class ChannelDetails extends CommonBase { * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None */ public get_funding_txo(): OutPoint { - const ret: number = bindings.ChannelDetails_get_funding_txo(this.ptr); + const ret: bigint = bindings.ChannelDetails_get_funding_txo(this.ptr); const ret_hu_conv: OutPoint = new OutPoint(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -430,7 +431,8 @@ export class ChannelDetails extends CommonBase { * Note that val (or a relevant inner pointer) may be NULL or all-0s to represent None */ public set_funding_txo(val: OutPoint): void { - bindings.ChannelDetails_set_funding_txo(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.ChannelDetails_set_funding_txo(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** @@ -441,7 +443,7 @@ export class ChannelDetails extends CommonBase { * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None */ public get_channel_type(): ChannelTypeFeatures { - const ret: number = bindings.ChannelDetails_get_channel_type(this.ptr); + const ret: bigint = bindings.ChannelDetails_get_channel_type(this.ptr); const ret_hu_conv: ChannelTypeFeatures = new ChannelTypeFeatures(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -455,7 +457,8 @@ export class ChannelDetails extends CommonBase { * Note that val (or a relevant inner pointer) may be NULL or all-0s to represent None */ public set_channel_type(val: ChannelTypeFeatures): void { - bindings.ChannelDetails_set_channel_type(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.ChannelDetails_set_channel_type(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** @@ -475,7 +478,7 @@ export class ChannelDetails extends CommonBase { * [`confirmations_required`]: Self::confirmations_required */ public get_short_channel_id(): Option_u64Z { - const ret: number = bindings.ChannelDetails_get_short_channel_id(this.ptr); + const ret: bigint = bindings.ChannelDetails_get_short_channel_id(this.ptr); const ret_hu_conv: Option_u64Z = Option_u64Z.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -513,7 +516,7 @@ export class ChannelDetails extends CommonBase { * [`confirmations_required`]: Self::confirmations_required */ public get_outbound_scid_alias(): Option_u64Z { - const ret: number = bindings.ChannelDetails_get_outbound_scid_alias(this.ptr); + const ret: bigint = bindings.ChannelDetails_get_outbound_scid_alias(this.ptr); const ret_hu_conv: Option_u64Z = Option_u64Z.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -546,7 +549,7 @@ export class ChannelDetails extends CommonBase { * [`short_channel_id`]: Self::short_channel_id */ public get_inbound_scid_alias(): Option_u64Z { - const ret: number = bindings.ChannelDetails_get_inbound_scid_alias(this.ptr); + const ret: bigint = bindings.ChannelDetails_get_inbound_scid_alias(this.ptr); const ret_hu_conv: Option_u64Z = Option_u64Z.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -594,7 +597,7 @@ export class ChannelDetails extends CommonBase { * [`outbound_capacity_msat`]: ChannelDetails::outbound_capacity_msat */ public get_unspendable_punishment_reserve(): Option_u64Z { - const ret: number = bindings.ChannelDetails_get_unspendable_punishment_reserve(this.ptr); + const ret: bigint = bindings.ChannelDetails_get_unspendable_punishment_reserve(this.ptr); const ret_hu_conv: Option_u64Z = Option_u64Z.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -766,7 +769,7 @@ export class ChannelDetails extends CommonBase { * [`ChannelHandshakeLimits::max_minimum_depth`]: crate::util::config::ChannelHandshakeLimits::max_minimum_depth */ public get_confirmations_required(): Option_u32Z { - const ret: number = bindings.ChannelDetails_get_confirmations_required(this.ptr); + const ret: bigint = bindings.ChannelDetails_get_confirmations_required(this.ptr); const ret_hu_conv: Option_u32Z = Option_u32Z.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -799,7 +802,7 @@ export class ChannelDetails extends CommonBase { * This value will be `None` for outbound channels until the counterparty accepts the channel. */ public get_force_close_spend_delay(): Option_u16Z { - const ret: number = bindings.ChannelDetails_get_force_close_spend_delay(this.ptr); + const ret: bigint = bindings.ChannelDetails_get_force_close_spend_delay(this.ptr); const ret_hu_conv: Option_u16Z = Option_u16Z.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -901,7 +904,7 @@ export class ChannelDetails extends CommonBase { * is only `None` for `ChannelDetails` objects serialized prior to LDK 0.0.107 */ public get_inbound_htlc_minimum_msat(): Option_u64Z { - const ret: number = bindings.ChannelDetails_get_inbound_htlc_minimum_msat(this.ptr); + const ret: bigint = bindings.ChannelDetails_get_inbound_htlc_minimum_msat(this.ptr); const ret_hu_conv: Option_u64Z = Option_u64Z.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -919,7 +922,7 @@ export class ChannelDetails extends CommonBase { * The largest value HTLC (in msat) we currently will accept, for this channel. */ public get_inbound_htlc_maximum_msat(): Option_u64Z { - const ret: number = bindings.ChannelDetails_get_inbound_htlc_maximum_msat(this.ptr); + const ret: bigint = bindings.ChannelDetails_get_inbound_htlc_maximum_msat(this.ptr); const ret_hu_conv: Option_u64Z = Option_u64Z.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -940,7 +943,7 @@ export class ChannelDetails extends CommonBase { * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None */ public get_config(): ChannelConfig { - const ret: number = bindings.ChannelDetails_get_config(this.ptr); + const ret: bigint = bindings.ChannelDetails_get_config(this.ptr); const ret_hu_conv: ChannelConfig = new ChannelConfig(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -954,21 +957,26 @@ export class ChannelDetails extends CommonBase { * Note that val (or a relevant inner pointer) may be NULL or all-0s to represent None */ public set_config(val: ChannelConfig): void { - bindings.ChannelDetails_set_config(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.ChannelDetails_set_config(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** * Constructs a new ChannelDetails given each field */ public static constructor_new(channel_id_arg: Uint8Array, counterparty_arg: ChannelCounterparty, funding_txo_arg: OutPoint, channel_type_arg: ChannelTypeFeatures, short_channel_id_arg: Option_u64Z, outbound_scid_alias_arg: Option_u64Z, inbound_scid_alias_arg: Option_u64Z, channel_value_satoshis_arg: bigint, unspendable_punishment_reserve_arg: Option_u64Z, user_channel_id_arg: bigint, balance_msat_arg: bigint, outbound_capacity_msat_arg: bigint, next_outbound_htlc_limit_msat_arg: bigint, inbound_capacity_msat_arg: bigint, confirmations_required_arg: Option_u32Z, force_close_spend_delay_arg: Option_u16Z, is_outbound_arg: boolean, is_channel_ready_arg: boolean, is_usable_arg: boolean, is_public_arg: boolean, inbound_htlc_minimum_msat_arg: Option_u64Z, inbound_htlc_maximum_msat_arg: Option_u64Z, config_arg: ChannelConfig): ChannelDetails { - const ret: number = bindings.ChannelDetails_new(bindings.encodeUint8Array(bindings.check_arr_len(channel_id_arg, 32)), counterparty_arg == null ? 0 : CommonBase.get_ptr_of(counterparty_arg) & ~1, funding_txo_arg == null ? 0 : CommonBase.get_ptr_of(funding_txo_arg) & ~1, channel_type_arg == null ? 0 : CommonBase.get_ptr_of(channel_type_arg) & ~1, CommonBase.get_ptr_of(short_channel_id_arg), CommonBase.get_ptr_of(outbound_scid_alias_arg), CommonBase.get_ptr_of(inbound_scid_alias_arg), channel_value_satoshis_arg, CommonBase.get_ptr_of(unspendable_punishment_reserve_arg), user_channel_id_arg, balance_msat_arg, outbound_capacity_msat_arg, next_outbound_htlc_limit_msat_arg, inbound_capacity_msat_arg, CommonBase.get_ptr_of(confirmations_required_arg), CommonBase.get_ptr_of(force_close_spend_delay_arg), is_outbound_arg, is_channel_ready_arg, is_usable_arg, is_public_arg, CommonBase.get_ptr_of(inbound_htlc_minimum_msat_arg), CommonBase.get_ptr_of(inbound_htlc_maximum_msat_arg), config_arg == null ? 0 : CommonBase.get_ptr_of(config_arg) & ~1); + const ret: bigint = bindings.ChannelDetails_new(bindings.encodeUint8Array(bindings.check_arr_len(channel_id_arg, 32)), counterparty_arg == null ? 0n : CommonBase.get_ptr_of(counterparty_arg), funding_txo_arg == null ? 0n : CommonBase.get_ptr_of(funding_txo_arg), channel_type_arg == null ? 0n : CommonBase.get_ptr_of(channel_type_arg), CommonBase.get_ptr_of(short_channel_id_arg), CommonBase.get_ptr_of(outbound_scid_alias_arg), CommonBase.get_ptr_of(inbound_scid_alias_arg), channel_value_satoshis_arg, CommonBase.get_ptr_of(unspendable_punishment_reserve_arg), user_channel_id_arg, balance_msat_arg, outbound_capacity_msat_arg, next_outbound_htlc_limit_msat_arg, inbound_capacity_msat_arg, CommonBase.get_ptr_of(confirmations_required_arg), CommonBase.get_ptr_of(force_close_spend_delay_arg), is_outbound_arg, is_channel_ready_arg, is_usable_arg, is_public_arg, CommonBase.get_ptr_of(inbound_htlc_minimum_msat_arg), CommonBase.get_ptr_of(inbound_htlc_maximum_msat_arg), config_arg == null ? 0n : CommonBase.get_ptr_of(config_arg)); const ret_hu_conv: ChannelDetails = new ChannelDetails(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, counterparty_arg); + CommonBase.add_ref_from(ret_hu_conv, funding_txo_arg); + CommonBase.add_ref_from(ret_hu_conv, channel_type_arg); + CommonBase.add_ref_from(ret_hu_conv, config_arg); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.ChannelDetails_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.ChannelDetails_clone_ptr(this.ptr); return ret; } @@ -976,7 +984,7 @@ export class ChannelDetails extends CommonBase { * Creates a copy of the ChannelDetails */ public clone(): ChannelDetails { - const ret: number = bindings.ChannelDetails_clone(this.ptr); + const ret: bigint = bindings.ChannelDetails_clone(this.ptr); const ret_hu_conv: ChannelDetails = new ChannelDetails(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -991,7 +999,7 @@ export class ChannelDetails extends CommonBase { * [`ChannelDetails::short_channel_id`]. See those for more information. */ public get_inbound_payment_scid(): Option_u64Z { - const ret: number = bindings.ChannelDetails_get_inbound_payment_scid(this.ptr); + const ret: bigint = bindings.ChannelDetails_get_inbound_payment_scid(this.ptr); const ret_hu_conv: Option_u64Z = Option_u64Z.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -1006,7 +1014,7 @@ export class ChannelDetails extends CommonBase { * [`ChannelDetails::outbound_scid_alias`]. See those for more information. */ public get_outbound_payment_scid(): Option_u64Z { - const ret: number = bindings.ChannelDetails_get_outbound_payment_scid(this.ptr); + const ret: bigint = bindings.ChannelDetails_get_outbound_payment_scid(this.ptr); const ret_hu_conv: Option_u64Z = Option_u64Z.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -1025,7 +1033,7 @@ export class ChannelDetails extends CommonBase { * Read a ChannelDetails from a byte array, created by ChannelDetails_write */ public static constructor_read(ser: Uint8Array): Result_ChannelDetailsDecodeErrorZ { - const ret: number = bindings.ChannelDetails_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.ChannelDetails_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_ChannelDetailsDecodeErrorZ = Result_ChannelDetailsDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/ChannelFeatures.mts b/ts/structs/ChannelFeatures.mts index 98491b64..bc32bd18 100644 --- a/ts/structs/ChannelFeatures.mts +++ b/ts/structs/ChannelFeatures.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class ChannelFeatures extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.ChannelFeatures_free); } @@ -371,13 +371,13 @@ export class ChannelFeatures extends CommonBase { * Two objects with NULL inner values will be considered "equal" here. */ public eq(b: ChannelFeatures): boolean { - const ret: boolean = bindings.ChannelFeatures_eq(this.ptr, b == null ? 0 : CommonBase.get_ptr_of(b) & ~1); + const ret: boolean = bindings.ChannelFeatures_eq(this.ptr, b == null ? 0n : CommonBase.get_ptr_of(b)); CommonBase.add_ref_from(this, b); return ret; } - public clone_ptr(): number { - const ret: number = bindings.ChannelFeatures_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.ChannelFeatures_clone_ptr(this.ptr); return ret; } @@ -385,7 +385,7 @@ export class ChannelFeatures extends CommonBase { * Creates a copy of the ChannelFeatures */ public clone(): ChannelFeatures { - const ret: number = bindings.ChannelFeatures_clone(this.ptr); + const ret: bigint = bindings.ChannelFeatures_clone(this.ptr); const ret_hu_conv: ChannelFeatures = new ChannelFeatures(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -395,7 +395,7 @@ export class ChannelFeatures extends CommonBase { * Create a blank Features with no features set */ public static constructor_empty(): ChannelFeatures { - const ret: number = bindings.ChannelFeatures_empty(); + const ret: bigint = bindings.ChannelFeatures_empty(); const ret_hu_conv: ChannelFeatures = new ChannelFeatures(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -405,7 +405,7 @@ export class ChannelFeatures extends CommonBase { * Creates a Features with the bits set which are known by the implementation */ public static constructor_known(): ChannelFeatures { - const ret: number = bindings.ChannelFeatures_known(); + const ret: bigint = bindings.ChannelFeatures_known(); const ret_hu_conv: ChannelFeatures = new ChannelFeatures(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -433,7 +433,7 @@ export class ChannelFeatures extends CommonBase { * Read a ChannelFeatures from a byte array, created by ChannelFeatures_write */ public static constructor_read(ser: Uint8Array): Result_ChannelFeaturesDecodeErrorZ { - const ret: number = bindings.ChannelFeatures_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.ChannelFeatures_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_ChannelFeaturesDecodeErrorZ = Result_ChannelFeaturesDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/ChannelHandshakeConfig.mts b/ts/structs/ChannelHandshakeConfig.mts index 67c24d7b..92a33bd4 100644 --- a/ts/structs/ChannelHandshakeConfig.mts +++ b/ts/structs/ChannelHandshakeConfig.mts @@ -363,7 +363,7 @@ import * as bindings from '../bindings.mjs' */ export class ChannelHandshakeConfig extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.ChannelHandshakeConfig_free); } @@ -664,14 +664,14 @@ export class ChannelHandshakeConfig extends CommonBase { * Constructs a new ChannelHandshakeConfig given each field */ public static constructor_new(minimum_depth_arg: number, our_to_self_delay_arg: number, our_htlc_minimum_msat_arg: bigint, max_inbound_htlc_value_in_flight_percent_of_channel_arg: number, negotiate_scid_privacy_arg: boolean, announced_channel_arg: boolean, commit_upfront_shutdown_pubkey_arg: boolean): ChannelHandshakeConfig { - const ret: number = bindings.ChannelHandshakeConfig_new(minimum_depth_arg, our_to_self_delay_arg, our_htlc_minimum_msat_arg, max_inbound_htlc_value_in_flight_percent_of_channel_arg, negotiate_scid_privacy_arg, announced_channel_arg, commit_upfront_shutdown_pubkey_arg); + const ret: bigint = bindings.ChannelHandshakeConfig_new(minimum_depth_arg, our_to_self_delay_arg, our_htlc_minimum_msat_arg, max_inbound_htlc_value_in_flight_percent_of_channel_arg, negotiate_scid_privacy_arg, announced_channel_arg, commit_upfront_shutdown_pubkey_arg); const ret_hu_conv: ChannelHandshakeConfig = new ChannelHandshakeConfig(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.ChannelHandshakeConfig_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.ChannelHandshakeConfig_clone_ptr(this.ptr); return ret; } @@ -679,7 +679,7 @@ export class ChannelHandshakeConfig extends CommonBase { * Creates a copy of the ChannelHandshakeConfig */ public clone(): ChannelHandshakeConfig { - const ret: number = bindings.ChannelHandshakeConfig_clone(this.ptr); + const ret: bigint = bindings.ChannelHandshakeConfig_clone(this.ptr); const ret_hu_conv: ChannelHandshakeConfig = new ChannelHandshakeConfig(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -689,7 +689,7 @@ export class ChannelHandshakeConfig extends CommonBase { * Creates a "default" ChannelHandshakeConfig. See struct and individual field documentaiton for details on which values are used. */ public static constructor_default(): ChannelHandshakeConfig { - const ret: number = bindings.ChannelHandshakeConfig_default(); + const ret: bigint = bindings.ChannelHandshakeConfig_default(); const ret_hu_conv: ChannelHandshakeConfig = new ChannelHandshakeConfig(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; diff --git a/ts/structs/ChannelHandshakeLimits.mts b/ts/structs/ChannelHandshakeLimits.mts index e9409805..d188707b 100644 --- a/ts/structs/ChannelHandshakeLimits.mts +++ b/ts/structs/ChannelHandshakeLimits.mts @@ -371,7 +371,7 @@ import * as bindings from '../bindings.mjs' */ export class ChannelHandshakeLimits extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.ChannelHandshakeLimits_free); } @@ -635,14 +635,14 @@ export class ChannelHandshakeLimits extends CommonBase { * Constructs a new ChannelHandshakeLimits given each field */ public static constructor_new(min_funding_satoshis_arg: bigint, max_funding_satoshis_arg: bigint, max_htlc_minimum_msat_arg: bigint, min_max_htlc_value_in_flight_msat_arg: bigint, max_channel_reserve_satoshis_arg: bigint, min_max_accepted_htlcs_arg: number, max_minimum_depth_arg: number, trust_own_funding_0conf_arg: boolean, force_announced_channel_preference_arg: boolean, their_to_self_delay_arg: number): ChannelHandshakeLimits { - const ret: number = bindings.ChannelHandshakeLimits_new(min_funding_satoshis_arg, max_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, trust_own_funding_0conf_arg, force_announced_channel_preference_arg, their_to_self_delay_arg); + const ret: bigint = bindings.ChannelHandshakeLimits_new(min_funding_satoshis_arg, max_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, trust_own_funding_0conf_arg, force_announced_channel_preference_arg, their_to_self_delay_arg); const ret_hu_conv: ChannelHandshakeLimits = new ChannelHandshakeLimits(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.ChannelHandshakeLimits_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.ChannelHandshakeLimits_clone_ptr(this.ptr); return ret; } @@ -650,7 +650,7 @@ export class ChannelHandshakeLimits extends CommonBase { * Creates a copy of the ChannelHandshakeLimits */ public clone(): ChannelHandshakeLimits { - const ret: number = bindings.ChannelHandshakeLimits_clone(this.ptr); + const ret: bigint = bindings.ChannelHandshakeLimits_clone(this.ptr); const ret_hu_conv: ChannelHandshakeLimits = new ChannelHandshakeLimits(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -660,7 +660,7 @@ export class ChannelHandshakeLimits extends CommonBase { * Creates a "default" ChannelHandshakeLimits. See struct and individual field documentaiton for details on which values are used. */ public static constructor_default(): ChannelHandshakeLimits { - const ret: number = bindings.ChannelHandshakeLimits_default(); + const ret: bigint = bindings.ChannelHandshakeLimits_default(); const ret_hu_conv: ChannelHandshakeLimits = new ChannelHandshakeLimits(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; diff --git a/ts/structs/ChannelInfo.mts b/ts/structs/ChannelInfo.mts index 6dda9bd9..ba076425 100644 --- a/ts/structs/ChannelInfo.mts +++ b/ts/structs/ChannelInfo.mts @@ -362,7 +362,7 @@ import * as bindings from '../bindings.mjs' */ export class ChannelInfo extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.ChannelInfo_free); } @@ -370,7 +370,7 @@ export class ChannelInfo extends CommonBase { * Protocol features of a channel communicated during its announcement */ public get_features(): ChannelFeatures { - const ret: number = bindings.ChannelInfo_get_features(this.ptr); + const ret: bigint = bindings.ChannelInfo_get_features(this.ptr); const ret_hu_conv: ChannelFeatures = new ChannelFeatures(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -380,14 +380,15 @@ export class ChannelInfo extends CommonBase { * Protocol features of a channel communicated during its announcement */ public set_features(val: ChannelFeatures): void { - bindings.ChannelInfo_set_features(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.ChannelInfo_set_features(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** * Source node of the first direction of a channel */ public get_node_one(): NodeId { - const ret: number = bindings.ChannelInfo_get_node_one(this.ptr); + const ret: bigint = bindings.ChannelInfo_get_node_one(this.ptr); const ret_hu_conv: NodeId = new NodeId(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -397,7 +398,8 @@ export class ChannelInfo extends CommonBase { * Source node of the first direction of a channel */ public set_node_one(val: NodeId): void { - bindings.ChannelInfo_set_node_one(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.ChannelInfo_set_node_one(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** @@ -406,7 +408,7 @@ export class ChannelInfo extends CommonBase { * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None */ public get_one_to_two(): ChannelUpdateInfo { - const ret: number = bindings.ChannelInfo_get_one_to_two(this.ptr); + const ret: bigint = bindings.ChannelInfo_get_one_to_two(this.ptr); const ret_hu_conv: ChannelUpdateInfo = new ChannelUpdateInfo(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -418,14 +420,15 @@ export class ChannelInfo extends CommonBase { * Note that val (or a relevant inner pointer) may be NULL or all-0s to represent None */ public set_one_to_two(val: ChannelUpdateInfo): void { - bindings.ChannelInfo_set_one_to_two(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.ChannelInfo_set_one_to_two(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** * Source node of the second direction of a channel */ public get_node_two(): NodeId { - const ret: number = bindings.ChannelInfo_get_node_two(this.ptr); + const ret: bigint = bindings.ChannelInfo_get_node_two(this.ptr); const ret_hu_conv: NodeId = new NodeId(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -435,7 +438,8 @@ export class ChannelInfo extends CommonBase { * Source node of the second direction of a channel */ public set_node_two(val: NodeId): void { - bindings.ChannelInfo_set_node_two(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.ChannelInfo_set_node_two(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** @@ -444,7 +448,7 @@ export class ChannelInfo extends CommonBase { * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None */ public get_two_to_one(): ChannelUpdateInfo { - const ret: number = bindings.ChannelInfo_get_two_to_one(this.ptr); + const ret: bigint = bindings.ChannelInfo_get_two_to_one(this.ptr); const ret_hu_conv: ChannelUpdateInfo = new ChannelUpdateInfo(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -456,14 +460,15 @@ export class ChannelInfo extends CommonBase { * Note that val (or a relevant inner pointer) may be NULL or all-0s to represent None */ public set_two_to_one(val: ChannelUpdateInfo): void { - bindings.ChannelInfo_set_two_to_one(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.ChannelInfo_set_two_to_one(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** * The channel capacity as seen on-chain, if chain lookup is available. */ public get_capacity_sats(): Option_u64Z { - const ret: number = bindings.ChannelInfo_get_capacity_sats(this.ptr); + const ret: bigint = bindings.ChannelInfo_get_capacity_sats(this.ptr); const ret_hu_conv: Option_u64Z = Option_u64Z.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -485,7 +490,7 @@ export class ChannelInfo extends CommonBase { * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None */ public get_announcement_message(): ChannelAnnouncement { - const ret: number = bindings.ChannelInfo_get_announcement_message(this.ptr); + const ret: bigint = bindings.ChannelInfo_get_announcement_message(this.ptr); const ret_hu_conv: ChannelAnnouncement = new ChannelAnnouncement(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -500,11 +505,12 @@ export class ChannelInfo extends CommonBase { * Note that val (or a relevant inner pointer) may be NULL or all-0s to represent None */ public set_announcement_message(val: ChannelAnnouncement): void { - bindings.ChannelInfo_set_announcement_message(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.ChannelInfo_set_announcement_message(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } - public clone_ptr(): number { - const ret: number = bindings.ChannelInfo_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.ChannelInfo_clone_ptr(this.ptr); return ret; } @@ -512,7 +518,7 @@ export class ChannelInfo extends CommonBase { * Creates a copy of the ChannelInfo */ public clone(): ChannelInfo { - const ret: number = bindings.ChannelInfo_clone(this.ptr); + const ret: bigint = bindings.ChannelInfo_clone(this.ptr); const ret_hu_conv: ChannelInfo = new ChannelInfo(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -524,7 +530,7 @@ export class ChannelInfo extends CommonBase { * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None */ public get_directional_info(channel_flags: number): ChannelUpdateInfo { - const ret: number = bindings.ChannelInfo_get_directional_info(this.ptr, channel_flags); + const ret: bigint = bindings.ChannelInfo_get_directional_info(this.ptr, channel_flags); const ret_hu_conv: ChannelUpdateInfo = new ChannelUpdateInfo(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -543,7 +549,7 @@ export class ChannelInfo extends CommonBase { * Read a ChannelInfo from a byte array, created by ChannelInfo_write */ public static constructor_read(ser: Uint8Array): Result_ChannelInfoDecodeErrorZ { - const ret: number = bindings.ChannelInfo_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.ChannelInfo_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_ChannelInfoDecodeErrorZ = Result_ChannelInfoDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/ChannelManager.mts b/ts/structs/ChannelManager.mts index 3bc9b301..3fcfff45 100644 --- a/ts/structs/ChannelManager.mts +++ b/ts/structs/ChannelManager.mts @@ -396,7 +396,7 @@ import * as bindings from '../bindings.mjs' */ export class ChannelManager extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.ChannelManager_free); } @@ -413,7 +413,7 @@ export class ChannelManager extends CommonBase { * from after `params.latest_hash`. */ public static constructor_new(fee_est: FeeEstimator, chain_monitor: Watch, tx_broadcaster: BroadcasterInterface, logger: Logger, keys_manager: KeysInterface, config: UserConfig, params: ChainParameters): ChannelManager { - const ret: number = bindings.ChannelManager_new(fee_est == null ? 0 : CommonBase.get_ptr_of(fee_est), chain_monitor == null ? 0 : CommonBase.get_ptr_of(chain_monitor), tx_broadcaster == null ? 0 : CommonBase.get_ptr_of(tx_broadcaster), logger == null ? 0 : CommonBase.get_ptr_of(logger), keys_manager == null ? 0 : CommonBase.get_ptr_of(keys_manager), config == null ? 0 : CommonBase.get_ptr_of(config) & ~1, params == null ? 0 : CommonBase.get_ptr_of(params) & ~1); + const ret: bigint = bindings.ChannelManager_new(fee_est == null ? 0n : CommonBase.get_ptr_of(fee_est), chain_monitor == null ? 0n : CommonBase.get_ptr_of(chain_monitor), tx_broadcaster == null ? 0n : CommonBase.get_ptr_of(tx_broadcaster), logger == null ? 0n : CommonBase.get_ptr_of(logger), keys_manager == null ? 0n : CommonBase.get_ptr_of(keys_manager), config == null ? 0n : CommonBase.get_ptr_of(config), params == null ? 0n : CommonBase.get_ptr_of(params)); const ret_hu_conv: ChannelManager = new ChannelManager(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); CommonBase.add_ref_from(ret_hu_conv, fee_est); @@ -421,6 +421,8 @@ export class ChannelManager extends CommonBase { CommonBase.add_ref_from(ret_hu_conv, tx_broadcaster); CommonBase.add_ref_from(ret_hu_conv, logger); CommonBase.add_ref_from(ret_hu_conv, keys_manager); + CommonBase.add_ref_from(ret_hu_conv, config); + CommonBase.add_ref_from(ret_hu_conv, params); return ret_hu_conv; } @@ -428,7 +430,7 @@ export class ChannelManager extends CommonBase { * Gets the current configuration applied to all new channels, as */ public get_current_default_configuration(): UserConfig { - const ret: number = bindings.ChannelManager_get_current_default_configuration(this.ptr); + const ret: bigint = bindings.ChannelManager_get_current_default_configuration(this.ptr); const ret_hu_conv: UserConfig = new UserConfig(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -465,8 +467,9 @@ export class ChannelManager extends CommonBase { * Note that override_config (or a relevant inner pointer) may be NULL or all-0s to represent None */ public create_channel(their_network_key: Uint8Array, channel_value_satoshis: bigint, push_msat: bigint, user_channel_id: bigint, override_config: UserConfig): Result__u832APIErrorZ { - const ret: number = bindings.ChannelManager_create_channel(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_network_key, 33)), channel_value_satoshis, push_msat, user_channel_id, override_config == null ? 0 : CommonBase.get_ptr_of(override_config) & ~1); + const ret: bigint = bindings.ChannelManager_create_channel(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_network_key, 33)), channel_value_satoshis, push_msat, user_channel_id, override_config == null ? 0n : CommonBase.get_ptr_of(override_config)); const ret_hu_conv: Result__u832APIErrorZ = Result__u832APIErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(this, override_config); return ret_hu_conv; } @@ -479,7 +482,7 @@ export class ChannelManager extends CommonBase { const ret_conv_16_len: number = bindings.getArrayLength(ret); const ret_conv_16_arr: ChannelDetails[] = new Array(ret_conv_16_len).fill(null); for (var q = 0; q < ret_conv_16_len; q++) { - const ret_conv_16: number = bindings.getU32ArrayElem(ret, q); + const ret_conv_16: bigint = bindings.getU64ArrayElem(ret, q); const ret_conv_16_hu_conv: ChannelDetails = new ChannelDetails(null, ret_conv_16); CommonBase.add_ref_from(ret_conv_16_hu_conv, this); ret_conv_16_arr[q] = ret_conv_16_hu_conv; @@ -503,7 +506,7 @@ export class ChannelManager extends CommonBase { const ret_conv_16_len: number = bindings.getArrayLength(ret); const ret_conv_16_arr: ChannelDetails[] = new Array(ret_conv_16_len).fill(null); for (var q = 0; q < ret_conv_16_len; q++) { - const ret_conv_16: number = bindings.getU32ArrayElem(ret, q); + const ret_conv_16: bigint = bindings.getU64ArrayElem(ret, q); const ret_conv_16_hu_conv: ChannelDetails = new ChannelDetails(null, ret_conv_16); CommonBase.add_ref_from(ret_conv_16_hu_conv, this); ret_conv_16_arr[q] = ret_conv_16_hu_conv; @@ -532,7 +535,7 @@ export class ChannelManager extends CommonBase { * [`Normal`]: crate::chain::chaininterface::ConfirmationTarget::Normal */ public close_channel(channel_id: Uint8Array, counterparty_node_id: Uint8Array): Result_NoneAPIErrorZ { - const ret: number = bindings.ChannelManager_close_channel(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(channel_id, 32)), bindings.encodeUint8Array(bindings.check_arr_len(counterparty_node_id, 33))); + const ret: bigint = bindings.ChannelManager_close_channel(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(channel_id, 32)), bindings.encodeUint8Array(bindings.check_arr_len(counterparty_node_id, 33))); const ret_hu_conv: Result_NoneAPIErrorZ = Result_NoneAPIErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -559,7 +562,7 @@ export class ChannelManager extends CommonBase { * [`Normal`]: crate::chain::chaininterface::ConfirmationTarget::Normal */ public close_channel_with_target_feerate(channel_id: Uint8Array, counterparty_node_id: Uint8Array, target_feerate_sats_per_1000_weight: number): Result_NoneAPIErrorZ { - const ret: number = bindings.ChannelManager_close_channel_with_target_feerate(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(channel_id, 32)), bindings.encodeUint8Array(bindings.check_arr_len(counterparty_node_id, 33)), target_feerate_sats_per_1000_weight); + const ret: bigint = bindings.ChannelManager_close_channel_with_target_feerate(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(channel_id, 32)), bindings.encodeUint8Array(bindings.check_arr_len(counterparty_node_id, 33)), target_feerate_sats_per_1000_weight); const ret_hu_conv: Result_NoneAPIErrorZ = Result_NoneAPIErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -571,7 +574,7 @@ export class ChannelManager extends CommonBase { * channel. */ public force_close_broadcasting_latest_txn(channel_id: Uint8Array, counterparty_node_id: Uint8Array): Result_NoneAPIErrorZ { - const ret: number = bindings.ChannelManager_force_close_broadcasting_latest_txn(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(channel_id, 32)), bindings.encodeUint8Array(bindings.check_arr_len(counterparty_node_id, 33))); + const ret: bigint = bindings.ChannelManager_force_close_broadcasting_latest_txn(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(channel_id, 32)), bindings.encodeUint8Array(bindings.check_arr_len(counterparty_node_id, 33))); const ret_hu_conv: Result_NoneAPIErrorZ = Result_NoneAPIErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -585,7 +588,7 @@ export class ChannelManager extends CommonBase { * [`ChannelMonitor::get_latest_holder_commitment_txn`]. */ public force_close_without_broadcasting_txn(channel_id: Uint8Array, counterparty_node_id: Uint8Array): Result_NoneAPIErrorZ { - const ret: number = bindings.ChannelManager_force_close_without_broadcasting_txn(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(channel_id, 32)), bindings.encodeUint8Array(bindings.check_arr_len(counterparty_node_id, 33))); + const ret: bigint = bindings.ChannelManager_force_close_without_broadcasting_txn(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(channel_id, 32)), bindings.encodeUint8Array(bindings.check_arr_len(counterparty_node_id, 33))); const ret_hu_conv: Result_NoneAPIErrorZ = Result_NoneAPIErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -650,7 +653,7 @@ export class ChannelManager extends CommonBase { * Note that payment_secret (or a relevant inner pointer) may be NULL or all-0s to represent None */ public send_payment(route: Route, payment_hash: Uint8Array, payment_secret: Uint8Array): Result_PaymentIdPaymentSendFailureZ { - const ret: number = bindings.ChannelManager_send_payment(this.ptr, route == null ? 0 : CommonBase.get_ptr_of(route) & ~1, bindings.encodeUint8Array(bindings.check_arr_len(payment_hash, 32)), bindings.encodeUint8Array(bindings.check_arr_len(payment_secret, 32))); + const ret: bigint = bindings.ChannelManager_send_payment(this.ptr, route == null ? 0n : CommonBase.get_ptr_of(route), bindings.encodeUint8Array(bindings.check_arr_len(payment_hash, 32)), bindings.encodeUint8Array(bindings.check_arr_len(payment_secret, 32))); const ret_hu_conv: Result_PaymentIdPaymentSendFailureZ = Result_PaymentIdPaymentSendFailureZ.constr_from_ptr(ret); CommonBase.add_ref_from(this, route); return ret_hu_conv; @@ -669,7 +672,7 @@ export class ChannelManager extends CommonBase { * [`abandon_payment`]: [`ChannelManager::abandon_payment`] */ public retry_payment(route: Route, payment_id: Uint8Array): Result_NonePaymentSendFailureZ { - const ret: number = bindings.ChannelManager_retry_payment(this.ptr, route == null ? 0 : CommonBase.get_ptr_of(route) & ~1, bindings.encodeUint8Array(bindings.check_arr_len(payment_id, 32))); + const ret: bigint = bindings.ChannelManager_retry_payment(this.ptr, route == null ? 0n : CommonBase.get_ptr_of(route), bindings.encodeUint8Array(bindings.check_arr_len(payment_id, 32))); const ret_hu_conv: Result_NonePaymentSendFailureZ = Result_NonePaymentSendFailureZ.constr_from_ptr(ret); CommonBase.add_ref_from(this, route); return ret_hu_conv; @@ -714,7 +717,7 @@ export class ChannelManager extends CommonBase { * Note that payment_preimage (or a relevant inner pointer) may be NULL or all-0s to represent None */ public send_spontaneous_payment(route: Route, payment_preimage: Uint8Array): Result_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ { - const ret: number = bindings.ChannelManager_send_spontaneous_payment(this.ptr, route == null ? 0 : CommonBase.get_ptr_of(route) & ~1, bindings.encodeUint8Array(bindings.check_arr_len(payment_preimage, 32))); + const ret: bigint = bindings.ChannelManager_send_spontaneous_payment(this.ptr, route == null ? 0n : CommonBase.get_ptr_of(route), bindings.encodeUint8Array(bindings.check_arr_len(payment_preimage, 32))); const ret_hu_conv: Result_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ = Result_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ.constr_from_ptr(ret); CommonBase.add_ref_from(this, route); return ret_hu_conv; @@ -726,8 +729,9 @@ export class ChannelManager extends CommonBase { * us to easily discern them from real payments. */ public send_probe(hops: RouteHop[]): Result_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ { - const ret: number = bindings.ChannelManager_send_probe(this.ptr, bindings.encodeUint32Array(hops != null ? hops.map(hops_conv_10 => hops_conv_10 == null ? 0 : CommonBase.get_ptr_of(hops_conv_10) & ~1) : null)); + const ret: bigint = bindings.ChannelManager_send_probe(this.ptr, bindings.encodeUint64Array(hops != null ? hops.map(hops_conv_10 => hops_conv_10 == null ? 0n : CommonBase.get_ptr_of(hops_conv_10)) : null)); const ret_hu_conv: Result_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ = Result_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ.constr_from_ptr(ret); + hops.forEach((hops_conv_10: RouteHop) => { CommonBase.add_ref_from(this, hops_conv_10); }); return ret_hu_conv; } @@ -764,7 +768,7 @@ export class ChannelManager extends CommonBase { * [`Event::ChannelClosed`]: crate::util::events::Event::ChannelClosed */ public funding_transaction_generated(temporary_channel_id: Uint8Array, counterparty_node_id: Uint8Array, funding_transaction: Uint8Array): Result_NoneAPIErrorZ { - const ret: number = bindings.ChannelManager_funding_transaction_generated(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(temporary_channel_id, 32)), bindings.encodeUint8Array(bindings.check_arr_len(counterparty_node_id, 33)), bindings.encodeUint8Array(funding_transaction)); + const ret: bigint = bindings.ChannelManager_funding_transaction_generated(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(temporary_channel_id, 32)), bindings.encodeUint8Array(bindings.check_arr_len(counterparty_node_id, 33)), bindings.encodeUint8Array(funding_transaction)); const ret_hu_conv: Result_NoneAPIErrorZ = Result_NoneAPIErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -790,7 +794,7 @@ export class ChannelManager extends CommonBase { * [`get_and_clear_pending_msg_events`]: MessageSendEventsProvider::get_and_clear_pending_msg_events */ public broadcast_node_announcement(rgb: Uint8Array, alias: Uint8Array, addresses: NetAddress[]): void { - bindings.ChannelManager_broadcast_node_announcement(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(rgb, 3)), bindings.encodeUint8Array(bindings.check_arr_len(alias, 32)), bindings.encodeUint32Array(addresses != null ? addresses.map(addresses_conv_12 => CommonBase.get_ptr_of(addresses_conv_12)) : null)); + bindings.ChannelManager_broadcast_node_announcement(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(rgb, 3)), bindings.encodeUint8Array(bindings.check_arr_len(alias, 32)), bindings.encodeUint64Array(addresses != null ? addresses.map(addresses_conv_12 => CommonBase.get_ptr_of(addresses_conv_12)) : null)); } /** @@ -818,7 +822,7 @@ export class ChannelManager extends CommonBase { * [`APIMisuseError`]: APIError::APIMisuseError */ public update_channel_config(counterparty_node_id: Uint8Array, channel_ids: Uint8Array[], config: ChannelConfig): Result_NoneAPIErrorZ { - const ret: number = bindings.ChannelManager_update_channel_config(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(counterparty_node_id, 33)), bindings.encodeUint32Array(channel_ids != null ? channel_ids.map(channel_ids_conv_12 => bindings.encodeUint8Array(bindings.check_arr_len(channel_ids_conv_12, 32))) : null), config == null ? 0 : CommonBase.get_ptr_of(config) & ~1); + const ret: bigint = bindings.ChannelManager_update_channel_config(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(counterparty_node_id, 33)), bindings.encodeUint32Array(channel_ids != null ? channel_ids.map(channel_ids_conv_12 => bindings.encodeUint8Array(bindings.check_arr_len(channel_ids_conv_12, 32))) : null), config == null ? 0n : CommonBase.get_ptr_of(config)); const ret_hu_conv: Result_NoneAPIErrorZ = Result_NoneAPIErrorZ.constr_from_ptr(ret); CommonBase.add_ref_from(this, config); return ret_hu_conv; @@ -923,7 +927,7 @@ export class ChannelManager extends CommonBase { * [`Event::ChannelClosed::user_channel_id`]: events::Event::ChannelClosed::user_channel_id */ public accept_inbound_channel(temporary_channel_id: Uint8Array, counterparty_node_id: Uint8Array, user_channel_id: bigint): Result_NoneAPIErrorZ { - const ret: number = bindings.ChannelManager_accept_inbound_channel(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(temporary_channel_id, 32)), bindings.encodeUint8Array(bindings.check_arr_len(counterparty_node_id, 33)), user_channel_id); + const ret: bigint = bindings.ChannelManager_accept_inbound_channel(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(temporary_channel_id, 32)), bindings.encodeUint8Array(bindings.check_arr_len(counterparty_node_id, 33)), user_channel_id); const ret_hu_conv: Result_NoneAPIErrorZ = Result_NoneAPIErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -949,7 +953,7 @@ export class ChannelManager extends CommonBase { * [`Event::ChannelClosed::user_channel_id`]: events::Event::ChannelClosed::user_channel_id */ public accept_inbound_channel_from_trusted_peer_0conf(temporary_channel_id: Uint8Array, counterparty_node_id: Uint8Array, user_channel_id: bigint): Result_NoneAPIErrorZ { - const ret: number = bindings.ChannelManager_accept_inbound_channel_from_trusted_peer_0conf(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(temporary_channel_id, 32)), bindings.encodeUint8Array(bindings.check_arr_len(counterparty_node_id, 33)), user_channel_id); + const ret: bigint = bindings.ChannelManager_accept_inbound_channel_from_trusted_peer_0conf(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(temporary_channel_id, 32)), bindings.encodeUint8Array(bindings.check_arr_len(counterparty_node_id, 33)), user_channel_id); const ret_hu_conv: Result_NoneAPIErrorZ = Result_NoneAPIErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -983,7 +987,7 @@ export class ChannelManager extends CommonBase { * [`create_inbound_payment_for_hash`]: Self::create_inbound_payment_for_hash */ public create_inbound_payment(min_value_msat: Option_u64Z, invoice_expiry_delta_secs: number): Result_C2Tuple_PaymentHashPaymentSecretZNoneZ { - const ret: number = bindings.ChannelManager_create_inbound_payment(this.ptr, CommonBase.get_ptr_of(min_value_msat), invoice_expiry_delta_secs); + const ret: bigint = bindings.ChannelManager_create_inbound_payment(this.ptr, CommonBase.get_ptr_of(min_value_msat), invoice_expiry_delta_secs); const ret_hu_conv: Result_C2Tuple_PaymentHashPaymentSecretZNoneZ = Result_C2Tuple_PaymentHashPaymentSecretZNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -1000,7 +1004,7 @@ export class ChannelManager extends CommonBase { * [`create_inbound_payment`]: Self::create_inbound_payment */ public create_inbound_payment_legacy(min_value_msat: Option_u64Z, invoice_expiry_delta_secs: number): Result_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ { - const ret: number = bindings.ChannelManager_create_inbound_payment_legacy(this.ptr, CommonBase.get_ptr_of(min_value_msat), invoice_expiry_delta_secs); + const ret: bigint = bindings.ChannelManager_create_inbound_payment_legacy(this.ptr, CommonBase.get_ptr_of(min_value_msat), invoice_expiry_delta_secs); const ret_hu_conv: Result_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ = Result_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -1051,7 +1055,7 @@ export class ChannelManager extends CommonBase { * [`PaymentReceived`]: events::Event::PaymentReceived */ public create_inbound_payment_for_hash(payment_hash: Uint8Array, min_value_msat: Option_u64Z, invoice_expiry_delta_secs: number): Result_PaymentSecretNoneZ { - const ret: number = bindings.ChannelManager_create_inbound_payment_for_hash(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(payment_hash, 32)), CommonBase.get_ptr_of(min_value_msat), invoice_expiry_delta_secs); + const ret: bigint = bindings.ChannelManager_create_inbound_payment_for_hash(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(payment_hash, 32)), CommonBase.get_ptr_of(min_value_msat), invoice_expiry_delta_secs); const ret_hu_conv: Result_PaymentSecretNoneZ = Result_PaymentSecretNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -1068,7 +1072,7 @@ export class ChannelManager extends CommonBase { * [`create_inbound_payment_for_hash`]: Self::create_inbound_payment_for_hash */ public create_inbound_payment_for_hash_legacy(payment_hash: Uint8Array, min_value_msat: Option_u64Z, invoice_expiry_delta_secs: number): Result_PaymentSecretAPIErrorZ { - const ret: number = bindings.ChannelManager_create_inbound_payment_for_hash_legacy(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(payment_hash, 32)), CommonBase.get_ptr_of(min_value_msat), invoice_expiry_delta_secs); + const ret: bigint = bindings.ChannelManager_create_inbound_payment_for_hash_legacy(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(payment_hash, 32)), CommonBase.get_ptr_of(min_value_msat), invoice_expiry_delta_secs); const ret_hu_conv: Result_PaymentSecretAPIErrorZ = Result_PaymentSecretAPIErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -1080,7 +1084,7 @@ export class ChannelManager extends CommonBase { * [`create_inbound_payment`]: Self::create_inbound_payment */ public get_payment_preimage(payment_hash: Uint8Array, payment_secret: Uint8Array): Result_PaymentPreimageAPIErrorZ { - const ret: number = bindings.ChannelManager_get_payment_preimage(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(payment_hash, 32)), bindings.encodeUint8Array(bindings.check_arr_len(payment_secret, 32))); + const ret: bigint = bindings.ChannelManager_get_payment_preimage(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(payment_hash, 32)), bindings.encodeUint8Array(bindings.check_arr_len(payment_secret, 32))); const ret_hu_conv: Result_PaymentPreimageAPIErrorZ = Result_PaymentPreimageAPIErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -1102,7 +1106,7 @@ export class ChannelManager extends CommonBase { * [phantom node payments]: crate::chain::keysinterface::PhantomKeysManager */ public get_phantom_route_hints(): PhantomRouteHints { - const ret: number = bindings.ChannelManager_get_phantom_route_hints(this.ptr); + const ret: bigint = bindings.ChannelManager_get_phantom_route_hints(this.ptr); const ret_hu_conv: PhantomRouteHints = new PhantomRouteHints(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -1113,7 +1117,7 @@ export class ChannelManager extends CommonBase { * This copies the `inner` pointer in this_arg and thus the returned MessageSendEventsProvider must be freed before this_arg is */ public as_MessageSendEventsProvider(): MessageSendEventsProvider { - const ret: number = bindings.ChannelManager_as_MessageSendEventsProvider(this.ptr); + const ret: bigint = bindings.ChannelManager_as_MessageSendEventsProvider(this.ptr); const ret_hu_conv: MessageSendEventsProvider = new MessageSendEventsProvider(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -1124,7 +1128,7 @@ export class ChannelManager extends CommonBase { * This copies the `inner` pointer in this_arg and thus the returned EventsProvider must be freed before this_arg is */ public as_EventsProvider(): EventsProvider { - const ret: number = bindings.ChannelManager_as_EventsProvider(this.ptr); + const ret: bigint = bindings.ChannelManager_as_EventsProvider(this.ptr); const ret_hu_conv: EventsProvider = new EventsProvider(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -1135,7 +1139,7 @@ export class ChannelManager extends CommonBase { * This copies the `inner` pointer in this_arg and thus the returned Listen must be freed before this_arg is */ public as_Listen(): Listen { - const ret: number = bindings.ChannelManager_as_Listen(this.ptr); + const ret: bigint = bindings.ChannelManager_as_Listen(this.ptr); const ret_hu_conv: Listen = new Listen(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -1146,7 +1150,7 @@ export class ChannelManager extends CommonBase { * This copies the `inner` pointer in this_arg and thus the returned Confirm must be freed before this_arg is */ public as_Confirm(): Confirm { - const ret: number = bindings.ChannelManager_as_Confirm(this.ptr); + const ret: bigint = bindings.ChannelManager_as_Confirm(this.ptr); const ret_hu_conv: Confirm = new Confirm(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -1166,7 +1170,7 @@ export class ChannelManager extends CommonBase { * [`chain::Confirm`] interfaces. */ public current_best_block(): BestBlock { - const ret: number = bindings.ChannelManager_current_best_block(this.ptr); + const ret: bigint = bindings.ChannelManager_current_best_block(this.ptr); const ret_hu_conv: BestBlock = new BestBlock(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -1177,7 +1181,7 @@ export class ChannelManager extends CommonBase { * This copies the `inner` pointer in this_arg and thus the returned ChannelMessageHandler must be freed before this_arg is */ public as_ChannelMessageHandler(): ChannelMessageHandler { - const ret: number = bindings.ChannelManager_as_ChannelMessageHandler(this.ptr); + const ret: bigint = bindings.ChannelManager_as_ChannelMessageHandler(this.ptr); const ret_hu_conv: ChannelMessageHandler = new ChannelMessageHandler(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -1197,7 +1201,7 @@ export class ChannelManager extends CommonBase { * This copies the `inner` pointer in this_arg and thus the returned Payer must be freed before this_arg is */ public as_Payer(): Payer { - const ret: number = bindings.ChannelManager_as_Payer(this.ptr); + const ret: bigint = bindings.ChannelManager_as_Payer(this.ptr); const ret_hu_conv: Payer = new Payer(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; diff --git a/ts/structs/ChannelManagerReadArgs.mts b/ts/structs/ChannelManagerReadArgs.mts index a827fe99..e5318402 100644 --- a/ts/structs/ChannelManagerReadArgs.mts +++ b/ts/structs/ChannelManagerReadArgs.mts @@ -392,7 +392,7 @@ import * as bindings from '../bindings.mjs' */ export class ChannelManagerReadArgs extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.ChannelManagerReadArgs_free); } @@ -402,7 +402,7 @@ export class ChannelManagerReadArgs extends CommonBase { * signing data. */ public get_keys_manager(): KeysInterface { - const ret: number = bindings.ChannelManagerReadArgs_get_keys_manager(this.ptr); + const ret: bigint = bindings.ChannelManagerReadArgs_get_keys_manager(this.ptr); const ret_hu_conv: KeysInterface = new KeysInterface(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -414,7 +414,7 @@ export class ChannelManagerReadArgs extends CommonBase { * signing data. */ public set_keys_manager(val: KeysInterface): void { - bindings.ChannelManagerReadArgs_set_keys_manager(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val)); + bindings.ChannelManagerReadArgs_set_keys_manager(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); CommonBase.add_ref_from(this, val); } @@ -424,7 +424,7 @@ export class ChannelManagerReadArgs extends CommonBase { * No calls to the FeeEstimator will be made during deserialization. */ public get_fee_estimator(): FeeEstimator { - const ret: number = bindings.ChannelManagerReadArgs_get_fee_estimator(this.ptr); + const ret: bigint = bindings.ChannelManagerReadArgs_get_fee_estimator(this.ptr); const ret_hu_conv: FeeEstimator = new FeeEstimator(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -436,7 +436,7 @@ export class ChannelManagerReadArgs extends CommonBase { * No calls to the FeeEstimator will be made during deserialization. */ public set_fee_estimator(val: FeeEstimator): void { - bindings.ChannelManagerReadArgs_set_fee_estimator(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val)); + bindings.ChannelManagerReadArgs_set_fee_estimator(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); CommonBase.add_ref_from(this, val); } @@ -448,7 +448,7 @@ export class ChannelManagerReadArgs extends CommonBase { * chain::Watch after deserializing this ChannelManager. */ public get_chain_monitor(): Watch { - const ret: number = bindings.ChannelManagerReadArgs_get_chain_monitor(this.ptr); + const ret: bigint = bindings.ChannelManagerReadArgs_get_chain_monitor(this.ptr); const ret_hu_conv: Watch = new Watch(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -462,7 +462,7 @@ export class ChannelManagerReadArgs extends CommonBase { * chain::Watch after deserializing this ChannelManager. */ public set_chain_monitor(val: Watch): void { - bindings.ChannelManagerReadArgs_set_chain_monitor(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val)); + bindings.ChannelManagerReadArgs_set_chain_monitor(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); CommonBase.add_ref_from(this, val); } @@ -472,7 +472,7 @@ export class ChannelManagerReadArgs extends CommonBase { * force-closed during deserialization. */ public get_tx_broadcaster(): BroadcasterInterface { - const ret: number = bindings.ChannelManagerReadArgs_get_tx_broadcaster(this.ptr); + const ret: bigint = bindings.ChannelManagerReadArgs_get_tx_broadcaster(this.ptr); const ret_hu_conv: BroadcasterInterface = new BroadcasterInterface(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -484,7 +484,7 @@ export class ChannelManagerReadArgs extends CommonBase { * force-closed during deserialization. */ public set_tx_broadcaster(val: BroadcasterInterface): void { - bindings.ChannelManagerReadArgs_set_tx_broadcaster(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val)); + bindings.ChannelManagerReadArgs_set_tx_broadcaster(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); CommonBase.add_ref_from(this, val); } @@ -493,7 +493,7 @@ export class ChannelManagerReadArgs extends CommonBase { * deserialization. */ public get_logger(): Logger { - const ret: number = bindings.ChannelManagerReadArgs_get_logger(this.ptr); + const ret: bigint = bindings.ChannelManagerReadArgs_get_logger(this.ptr); const ret_hu_conv: Logger = new Logger(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -504,7 +504,7 @@ export class ChannelManagerReadArgs extends CommonBase { * deserialization. */ public set_logger(val: Logger): void { - bindings.ChannelManagerReadArgs_set_logger(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val)); + bindings.ChannelManagerReadArgs_set_logger(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); CommonBase.add_ref_from(this, val); } @@ -513,7 +513,7 @@ export class ChannelManagerReadArgs extends CommonBase { * runtime settings which were stored when the ChannelManager was serialized. */ public get_default_config(): UserConfig { - const ret: number = bindings.ChannelManagerReadArgs_get_default_config(this.ptr); + const ret: bigint = bindings.ChannelManagerReadArgs_get_default_config(this.ptr); const ret_hu_conv: UserConfig = new UserConfig(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -524,7 +524,8 @@ export class ChannelManagerReadArgs extends CommonBase { * runtime settings which were stored when the ChannelManager was serialized. */ public set_default_config(val: UserConfig): void { - bindings.ChannelManagerReadArgs_set_default_config(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.ChannelManagerReadArgs_set_default_config(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** @@ -533,7 +534,7 @@ export class ChannelManagerReadArgs extends CommonBase { * populate a HashMap directly from C. */ public static constructor_new(keys_manager: KeysInterface, fee_estimator: FeeEstimator, chain_monitor: Watch, tx_broadcaster: BroadcasterInterface, logger: Logger, default_config: UserConfig, channel_monitors: ChannelMonitor[]): ChannelManagerReadArgs { - const ret: number = bindings.ChannelManagerReadArgs_new(keys_manager == null ? 0 : CommonBase.get_ptr_of(keys_manager), fee_estimator == null ? 0 : CommonBase.get_ptr_of(fee_estimator), chain_monitor == null ? 0 : CommonBase.get_ptr_of(chain_monitor), tx_broadcaster == null ? 0 : CommonBase.get_ptr_of(tx_broadcaster), logger == null ? 0 : CommonBase.get_ptr_of(logger), default_config == null ? 0 : CommonBase.get_ptr_of(default_config) & ~1, bindings.encodeUint32Array(channel_monitors != null ? channel_monitors.map(channel_monitors_conv_16 => channel_monitors_conv_16 == null ? 0 : CommonBase.get_ptr_of(channel_monitors_conv_16) & ~1) : null)); + const ret: bigint = bindings.ChannelManagerReadArgs_new(keys_manager == null ? 0n : CommonBase.get_ptr_of(keys_manager), fee_estimator == null ? 0n : CommonBase.get_ptr_of(fee_estimator), chain_monitor == null ? 0n : CommonBase.get_ptr_of(chain_monitor), tx_broadcaster == null ? 0n : CommonBase.get_ptr_of(tx_broadcaster), logger == null ? 0n : CommonBase.get_ptr_of(logger), default_config == null ? 0n : CommonBase.get_ptr_of(default_config), bindings.encodeUint64Array(channel_monitors != null ? channel_monitors.map(channel_monitors_conv_16 => channel_monitors_conv_16 == null ? 0n : CommonBase.get_ptr_of(channel_monitors_conv_16)) : null)); const ret_hu_conv: ChannelManagerReadArgs = new ChannelManagerReadArgs(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); CommonBase.add_ref_from(ret_hu_conv, keys_manager); @@ -541,6 +542,7 @@ export class ChannelManagerReadArgs extends CommonBase { CommonBase.add_ref_from(ret_hu_conv, chain_monitor); CommonBase.add_ref_from(ret_hu_conv, tx_broadcaster); CommonBase.add_ref_from(ret_hu_conv, logger); + CommonBase.add_ref_from(ret_hu_conv, default_config); channel_monitors.forEach((channel_monitors_conv_16: ChannelMonitor) => { CommonBase.add_ref_from(ret_hu_conv, channel_monitors_conv_16); }); return ret_hu_conv; } diff --git a/ts/structs/ChannelMessageHandler.mts b/ts/structs/ChannelMessageHandler.mts index 574e0647..295ecbf3 100644 --- a/ts/structs/ChannelMessageHandler.mts +++ b/ts/structs/ChannelMessageHandler.mts @@ -440,7 +440,7 @@ export class ChannelMessageHandler extends CommonBase { public bindings_instance?: bindings.LDKChannelMessageHandler; /* @internal */ - constructor(_dummy: object, ptr: number) { + constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.ChannelMessageHandler_free); this.bindings_instance = null; } @@ -449,82 +449,82 @@ export class ChannelMessageHandler extends CommonBase { public static new_impl(arg: ChannelMessageHandlerInterface, messageSendEventsProvider_impl: MessageSendEventsProviderInterface): ChannelMessageHandler { const impl_holder: LDKChannelMessageHandlerHolder = new LDKChannelMessageHandlerHolder(); let structImplementation = { - handle_open_channel (their_node_id: number, their_features: number, msg: number): void { + handle_open_channel (their_node_id: number, their_features: bigint, msg: bigint): void { const their_node_id_conv: Uint8Array = bindings.decodeUint8Array(their_node_id); const their_features_hu_conv: InitFeatures = new InitFeatures(null, their_features); CommonBase.add_ref_from(their_features_hu_conv, this); const msg_hu_conv: OpenChannel = new OpenChannel(null, msg); arg.handle_open_channel(their_node_id_conv, their_features_hu_conv, msg_hu_conv); }, - handle_accept_channel (their_node_id: number, their_features: number, msg: number): void { + handle_accept_channel (their_node_id: number, their_features: bigint, msg: bigint): void { const their_node_id_conv: Uint8Array = bindings.decodeUint8Array(their_node_id); const their_features_hu_conv: InitFeatures = new InitFeatures(null, their_features); CommonBase.add_ref_from(their_features_hu_conv, this); const msg_hu_conv: AcceptChannel = new AcceptChannel(null, msg); arg.handle_accept_channel(their_node_id_conv, their_features_hu_conv, msg_hu_conv); }, - handle_funding_created (their_node_id: number, msg: number): void { + handle_funding_created (their_node_id: number, msg: bigint): void { const their_node_id_conv: Uint8Array = bindings.decodeUint8Array(their_node_id); const msg_hu_conv: FundingCreated = new FundingCreated(null, msg); arg.handle_funding_created(their_node_id_conv, msg_hu_conv); }, - handle_funding_signed (their_node_id: number, msg: number): void { + handle_funding_signed (their_node_id: number, msg: bigint): void { const their_node_id_conv: Uint8Array = bindings.decodeUint8Array(their_node_id); const msg_hu_conv: FundingSigned = new FundingSigned(null, msg); arg.handle_funding_signed(their_node_id_conv, msg_hu_conv); }, - handle_channel_ready (their_node_id: number, msg: number): void { + handle_channel_ready (their_node_id: number, msg: bigint): void { const their_node_id_conv: Uint8Array = bindings.decodeUint8Array(their_node_id); const msg_hu_conv: ChannelReady = new ChannelReady(null, msg); arg.handle_channel_ready(their_node_id_conv, msg_hu_conv); }, - handle_shutdown (their_node_id: number, their_features: number, msg: number): void { + handle_shutdown (their_node_id: number, their_features: bigint, msg: bigint): void { const their_node_id_conv: Uint8Array = bindings.decodeUint8Array(their_node_id); const their_features_hu_conv: InitFeatures = new InitFeatures(null, their_features); const msg_hu_conv: Shutdown = new Shutdown(null, msg); arg.handle_shutdown(their_node_id_conv, their_features_hu_conv, msg_hu_conv); }, - handle_closing_signed (their_node_id: number, msg: number): void { + handle_closing_signed (their_node_id: number, msg: bigint): void { const their_node_id_conv: Uint8Array = bindings.decodeUint8Array(their_node_id); const msg_hu_conv: ClosingSigned = new ClosingSigned(null, msg); arg.handle_closing_signed(their_node_id_conv, msg_hu_conv); }, - handle_update_add_htlc (their_node_id: number, msg: number): void { + handle_update_add_htlc (their_node_id: number, msg: bigint): void { const their_node_id_conv: Uint8Array = bindings.decodeUint8Array(their_node_id); const msg_hu_conv: UpdateAddHTLC = new UpdateAddHTLC(null, msg); arg.handle_update_add_htlc(their_node_id_conv, msg_hu_conv); }, - handle_update_fulfill_htlc (their_node_id: number, msg: number): void { + handle_update_fulfill_htlc (their_node_id: number, msg: bigint): void { const their_node_id_conv: Uint8Array = bindings.decodeUint8Array(their_node_id); const msg_hu_conv: UpdateFulfillHTLC = new UpdateFulfillHTLC(null, msg); arg.handle_update_fulfill_htlc(their_node_id_conv, msg_hu_conv); }, - handle_update_fail_htlc (their_node_id: number, msg: number): void { + handle_update_fail_htlc (their_node_id: number, msg: bigint): void { const their_node_id_conv: Uint8Array = bindings.decodeUint8Array(their_node_id); const msg_hu_conv: UpdateFailHTLC = new UpdateFailHTLC(null, msg); arg.handle_update_fail_htlc(their_node_id_conv, msg_hu_conv); }, - handle_update_fail_malformed_htlc (their_node_id: number, msg: number): void { + handle_update_fail_malformed_htlc (their_node_id: number, msg: bigint): void { const their_node_id_conv: Uint8Array = bindings.decodeUint8Array(their_node_id); const msg_hu_conv: UpdateFailMalformedHTLC = new UpdateFailMalformedHTLC(null, msg); arg.handle_update_fail_malformed_htlc(their_node_id_conv, msg_hu_conv); }, - handle_commitment_signed (their_node_id: number, msg: number): void { + handle_commitment_signed (their_node_id: number, msg: bigint): void { const their_node_id_conv: Uint8Array = bindings.decodeUint8Array(their_node_id); const msg_hu_conv: CommitmentSigned = new CommitmentSigned(null, msg); arg.handle_commitment_signed(their_node_id_conv, msg_hu_conv); }, - handle_revoke_and_ack (their_node_id: number, msg: number): void { + handle_revoke_and_ack (their_node_id: number, msg: bigint): void { const their_node_id_conv: Uint8Array = bindings.decodeUint8Array(their_node_id); const msg_hu_conv: RevokeAndACK = new RevokeAndACK(null, msg); arg.handle_revoke_and_ack(their_node_id_conv, msg_hu_conv); }, - handle_update_fee (their_node_id: number, msg: number): void { + handle_update_fee (their_node_id: number, msg: bigint): void { const their_node_id_conv: Uint8Array = bindings.decodeUint8Array(their_node_id); const msg_hu_conv: UpdateFee = new UpdateFee(null, msg); arg.handle_update_fee(their_node_id_conv, msg_hu_conv); }, - handle_announcement_signatures (their_node_id: number, msg: number): void { + handle_announcement_signatures (their_node_id: number, msg: bigint): void { const their_node_id_conv: Uint8Array = bindings.decodeUint8Array(their_node_id); const msg_hu_conv: AnnouncementSignatures = new AnnouncementSignatures(null, msg); arg.handle_announcement_signatures(their_node_id_conv, msg_hu_conv); @@ -533,29 +533,29 @@ export class ChannelMessageHandler extends CommonBase { const their_node_id_conv: Uint8Array = bindings.decodeUint8Array(their_node_id); arg.peer_disconnected(their_node_id_conv, no_connection_possible); }, - peer_connected (their_node_id: number, msg: number): void { + peer_connected (their_node_id: number, msg: bigint): void { const their_node_id_conv: Uint8Array = bindings.decodeUint8Array(their_node_id); const msg_hu_conv: Init = new Init(null, msg); arg.peer_connected(their_node_id_conv, msg_hu_conv); }, - handle_channel_reestablish (their_node_id: number, msg: number): void { + handle_channel_reestablish (their_node_id: number, msg: bigint): void { const their_node_id_conv: Uint8Array = bindings.decodeUint8Array(their_node_id); const msg_hu_conv: ChannelReestablish = new ChannelReestablish(null, msg); arg.handle_channel_reestablish(their_node_id_conv, msg_hu_conv); }, - handle_channel_update (their_node_id: number, msg: number): void { + handle_channel_update (their_node_id: number, msg: bigint): void { const their_node_id_conv: Uint8Array = bindings.decodeUint8Array(their_node_id); const msg_hu_conv: ChannelUpdate = new ChannelUpdate(null, msg); arg.handle_channel_update(their_node_id_conv, msg_hu_conv); }, - handle_error (their_node_id: number, msg: number): void { + handle_error (their_node_id: number, msg: bigint): void { const their_node_id_conv: Uint8Array = bindings.decodeUint8Array(their_node_id); const msg_hu_conv: ErrorMessage = new ErrorMessage(null, msg); arg.handle_error(their_node_id_conv, msg_hu_conv); }, } as bindings.LDKChannelMessageHandler; const messageSendEventsProvider = MessageSendEventsProvider.new_impl(messageSendEventsProvider_impl, ); - const ptr: number = bindings.LDKChannelMessageHandler_new(structImplementation, messageSendEventsProvider.bindings_instance); + const ptr: bigint = bindings.LDKChannelMessageHandler_new(structImplementation, messageSendEventsProvider.bindings_instance); impl_holder.held = new ChannelMessageHandler(null, ptr); impl_holder.held.bindings_instance = structImplementation; @@ -567,7 +567,8 @@ export class ChannelMessageHandler extends CommonBase { * Handle an incoming open_channel message from the given peer. */ public handle_open_channel(their_node_id: Uint8Array, their_features: InitFeatures, msg: OpenChannel): void { - bindings.ChannelMessageHandler_handle_open_channel(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), their_features == null ? 0 : CommonBase.get_ptr_of(their_features) & ~1, msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + bindings.ChannelMessageHandler_handle_open_channel(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), their_features == null ? 0n : CommonBase.get_ptr_of(their_features), msg == null ? 0n : CommonBase.get_ptr_of(msg)); + CommonBase.add_ref_from(this, their_features); CommonBase.add_ref_from(this, msg); } @@ -575,7 +576,8 @@ export class ChannelMessageHandler extends CommonBase { * Handle an incoming accept_channel message from the given peer. */ public handle_accept_channel(their_node_id: Uint8Array, their_features: InitFeatures, msg: AcceptChannel): void { - bindings.ChannelMessageHandler_handle_accept_channel(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), their_features == null ? 0 : CommonBase.get_ptr_of(their_features) & ~1, msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + bindings.ChannelMessageHandler_handle_accept_channel(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), their_features == null ? 0n : CommonBase.get_ptr_of(their_features), msg == null ? 0n : CommonBase.get_ptr_of(msg)); + CommonBase.add_ref_from(this, their_features); CommonBase.add_ref_from(this, msg); } @@ -583,7 +585,7 @@ export class ChannelMessageHandler extends CommonBase { * Handle an incoming funding_created message from the given peer. */ public handle_funding_created(their_node_id: Uint8Array, msg: FundingCreated): void { - bindings.ChannelMessageHandler_handle_funding_created(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + bindings.ChannelMessageHandler_handle_funding_created(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), msg == null ? 0n : CommonBase.get_ptr_of(msg)); CommonBase.add_ref_from(this, msg); } @@ -591,7 +593,7 @@ export class ChannelMessageHandler extends CommonBase { * Handle an incoming funding_signed message from the given peer. */ public handle_funding_signed(their_node_id: Uint8Array, msg: FundingSigned): void { - bindings.ChannelMessageHandler_handle_funding_signed(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + bindings.ChannelMessageHandler_handle_funding_signed(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), msg == null ? 0n : CommonBase.get_ptr_of(msg)); CommonBase.add_ref_from(this, msg); } @@ -599,7 +601,7 @@ export class ChannelMessageHandler extends CommonBase { * Handle an incoming channel_ready message from the given peer. */ public handle_channel_ready(their_node_id: Uint8Array, msg: ChannelReady): void { - bindings.ChannelMessageHandler_handle_channel_ready(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + bindings.ChannelMessageHandler_handle_channel_ready(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), msg == null ? 0n : CommonBase.get_ptr_of(msg)); CommonBase.add_ref_from(this, msg); } @@ -607,7 +609,7 @@ export class ChannelMessageHandler extends CommonBase { * Handle an incoming shutdown message from the given peer. */ public handle_shutdown(their_node_id: Uint8Array, their_features: InitFeatures, msg: Shutdown): void { - bindings.ChannelMessageHandler_handle_shutdown(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), their_features == null ? 0 : CommonBase.get_ptr_of(their_features) & ~1, msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + bindings.ChannelMessageHandler_handle_shutdown(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), their_features == null ? 0n : CommonBase.get_ptr_of(their_features), msg == null ? 0n : CommonBase.get_ptr_of(msg)); CommonBase.add_ref_from(this, their_features); CommonBase.add_ref_from(this, msg); } @@ -616,7 +618,7 @@ export class ChannelMessageHandler extends CommonBase { * Handle an incoming closing_signed message from the given peer. */ public handle_closing_signed(their_node_id: Uint8Array, msg: ClosingSigned): void { - bindings.ChannelMessageHandler_handle_closing_signed(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + bindings.ChannelMessageHandler_handle_closing_signed(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), msg == null ? 0n : CommonBase.get_ptr_of(msg)); CommonBase.add_ref_from(this, msg); } @@ -624,7 +626,7 @@ export class ChannelMessageHandler extends CommonBase { * Handle an incoming update_add_htlc message from the given peer. */ public handle_update_add_htlc(their_node_id: Uint8Array, msg: UpdateAddHTLC): void { - bindings.ChannelMessageHandler_handle_update_add_htlc(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + bindings.ChannelMessageHandler_handle_update_add_htlc(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), msg == null ? 0n : CommonBase.get_ptr_of(msg)); CommonBase.add_ref_from(this, msg); } @@ -632,7 +634,7 @@ export class ChannelMessageHandler extends CommonBase { * Handle an incoming update_fulfill_htlc message from the given peer. */ public handle_update_fulfill_htlc(their_node_id: Uint8Array, msg: UpdateFulfillHTLC): void { - bindings.ChannelMessageHandler_handle_update_fulfill_htlc(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + bindings.ChannelMessageHandler_handle_update_fulfill_htlc(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), msg == null ? 0n : CommonBase.get_ptr_of(msg)); CommonBase.add_ref_from(this, msg); } @@ -640,7 +642,7 @@ export class ChannelMessageHandler extends CommonBase { * Handle an incoming update_fail_htlc message from the given peer. */ public handle_update_fail_htlc(their_node_id: Uint8Array, msg: UpdateFailHTLC): void { - bindings.ChannelMessageHandler_handle_update_fail_htlc(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + bindings.ChannelMessageHandler_handle_update_fail_htlc(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), msg == null ? 0n : CommonBase.get_ptr_of(msg)); CommonBase.add_ref_from(this, msg); } @@ -648,7 +650,7 @@ export class ChannelMessageHandler extends CommonBase { * Handle an incoming update_fail_malformed_htlc message from the given peer. */ public handle_update_fail_malformed_htlc(their_node_id: Uint8Array, msg: UpdateFailMalformedHTLC): void { - bindings.ChannelMessageHandler_handle_update_fail_malformed_htlc(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + bindings.ChannelMessageHandler_handle_update_fail_malformed_htlc(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), msg == null ? 0n : CommonBase.get_ptr_of(msg)); CommonBase.add_ref_from(this, msg); } @@ -656,7 +658,7 @@ export class ChannelMessageHandler extends CommonBase { * Handle an incoming commitment_signed message from the given peer. */ public handle_commitment_signed(their_node_id: Uint8Array, msg: CommitmentSigned): void { - bindings.ChannelMessageHandler_handle_commitment_signed(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + bindings.ChannelMessageHandler_handle_commitment_signed(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), msg == null ? 0n : CommonBase.get_ptr_of(msg)); CommonBase.add_ref_from(this, msg); } @@ -664,7 +666,7 @@ export class ChannelMessageHandler extends CommonBase { * Handle an incoming revoke_and_ack message from the given peer. */ public handle_revoke_and_ack(their_node_id: Uint8Array, msg: RevokeAndACK): void { - bindings.ChannelMessageHandler_handle_revoke_and_ack(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + bindings.ChannelMessageHandler_handle_revoke_and_ack(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), msg == null ? 0n : CommonBase.get_ptr_of(msg)); CommonBase.add_ref_from(this, msg); } @@ -672,7 +674,7 @@ export class ChannelMessageHandler extends CommonBase { * Handle an incoming update_fee message from the given peer. */ public handle_update_fee(their_node_id: Uint8Array, msg: UpdateFee): void { - bindings.ChannelMessageHandler_handle_update_fee(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + bindings.ChannelMessageHandler_handle_update_fee(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), msg == null ? 0n : CommonBase.get_ptr_of(msg)); CommonBase.add_ref_from(this, msg); } @@ -680,7 +682,7 @@ export class ChannelMessageHandler extends CommonBase { * Handle an incoming announcement_signatures message from the given peer. */ public handle_announcement_signatures(their_node_id: Uint8Array, msg: AnnouncementSignatures): void { - bindings.ChannelMessageHandler_handle_announcement_signatures(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + bindings.ChannelMessageHandler_handle_announcement_signatures(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), msg == null ? 0n : CommonBase.get_ptr_of(msg)); CommonBase.add_ref_from(this, msg); } @@ -698,7 +700,7 @@ export class ChannelMessageHandler extends CommonBase { * Handle a peer reconnecting, possibly generating channel_reestablish message(s). */ public peer_connected(their_node_id: Uint8Array, msg: Init): void { - bindings.ChannelMessageHandler_peer_connected(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + bindings.ChannelMessageHandler_peer_connected(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), msg == null ? 0n : CommonBase.get_ptr_of(msg)); CommonBase.add_ref_from(this, msg); } @@ -706,7 +708,7 @@ export class ChannelMessageHandler extends CommonBase { * Handle an incoming channel_reestablish message from the given peer. */ public handle_channel_reestablish(their_node_id: Uint8Array, msg: ChannelReestablish): void { - bindings.ChannelMessageHandler_handle_channel_reestablish(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + bindings.ChannelMessageHandler_handle_channel_reestablish(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), msg == null ? 0n : CommonBase.get_ptr_of(msg)); CommonBase.add_ref_from(this, msg); } @@ -714,7 +716,7 @@ export class ChannelMessageHandler extends CommonBase { * Handle an incoming channel update from the given peer. */ public handle_channel_update(their_node_id: Uint8Array, msg: ChannelUpdate): void { - bindings.ChannelMessageHandler_handle_channel_update(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + bindings.ChannelMessageHandler_handle_channel_update(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), msg == null ? 0n : CommonBase.get_ptr_of(msg)); CommonBase.add_ref_from(this, msg); } @@ -722,7 +724,7 @@ export class ChannelMessageHandler extends CommonBase { * Handle an incoming error message from the given peer. */ public handle_error(their_node_id: Uint8Array, msg: ErrorMessage): void { - bindings.ChannelMessageHandler_handle_error(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + bindings.ChannelMessageHandler_handle_error(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), msg == null ? 0n : CommonBase.get_ptr_of(msg)); CommonBase.add_ref_from(this, msg); } diff --git a/ts/structs/ChannelMonitor.mts b/ts/structs/ChannelMonitor.mts index cfc80634..943cbcde 100644 --- a/ts/structs/ChannelMonitor.mts +++ b/ts/structs/ChannelMonitor.mts @@ -376,12 +376,12 @@ import * as bindings from '../bindings.mjs' */ export class ChannelMonitor extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.ChannelMonitor_free); } - public clone_ptr(): number { - const ret: number = bindings.ChannelMonitor_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.ChannelMonitor_clone_ptr(this.ptr); return ret; } @@ -389,7 +389,7 @@ export class ChannelMonitor extends CommonBase { * Creates a copy of the ChannelMonitor */ public clone(): ChannelMonitor { - const ret: number = bindings.ChannelMonitor_clone(this.ptr); + const ret: bigint = bindings.ChannelMonitor_clone(this.ptr); const ret_hu_conv: ChannelMonitor = new ChannelMonitor(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -411,7 +411,7 @@ export class ChannelMonitor extends CommonBase { * panics if the given update is not the next update by update_id. */ public update_monitor(updates: ChannelMonitorUpdate, broadcaster: BroadcasterInterface, fee_estimator: FeeEstimator, logger: Logger): Result_NoneNoneZ { - const ret: number = bindings.ChannelMonitor_update_monitor(this.ptr, updates == null ? 0 : CommonBase.get_ptr_of(updates) & ~1, broadcaster == null ? 0 : CommonBase.get_ptr_of(broadcaster), fee_estimator == null ? 0 : CommonBase.get_ptr_of(fee_estimator), logger == null ? 0 : CommonBase.get_ptr_of(logger)); + const ret: bigint = bindings.ChannelMonitor_update_monitor(this.ptr, updates == null ? 0n : CommonBase.get_ptr_of(updates), broadcaster == null ? 0n : CommonBase.get_ptr_of(broadcaster), fee_estimator == null ? 0n : CommonBase.get_ptr_of(fee_estimator), logger == null ? 0n : CommonBase.get_ptr_of(logger)); const ret_hu_conv: Result_NoneNoneZ = Result_NoneNoneZ.constr_from_ptr(ret); CommonBase.add_ref_from(this, updates); CommonBase.add_ref_from(this, broadcaster); @@ -433,7 +433,7 @@ export class ChannelMonitor extends CommonBase { * Gets the funding transaction outpoint of the channel this ChannelMonitor is monitoring for. */ public get_funding_txo(): TwoTuple_OutPointScriptZ { - const ret: number = bindings.ChannelMonitor_get_funding_txo(this.ptr); + const ret: bigint = bindings.ChannelMonitor_get_funding_txo(this.ptr); const ret_hu_conv: TwoTuple_OutPointScriptZ = new TwoTuple_OutPointScriptZ(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -448,7 +448,7 @@ export class ChannelMonitor extends CommonBase { const ret_conv_40_len: number = bindings.getArrayLength(ret); const ret_conv_40_arr: TwoTuple_TxidCVec_C2Tuple_u32ScriptZZZ[] = new Array(ret_conv_40_len).fill(null); for (var o = 0; o < ret_conv_40_len; o++) { - const ret_conv_40: number = bindings.getU32ArrayElem(ret, o); + const ret_conv_40: bigint = bindings.getU64ArrayElem(ret, o); const ret_conv_40_hu_conv: TwoTuple_TxidCVec_C2Tuple_u32ScriptZZZ = new TwoTuple_TxidCVec_C2Tuple_u32ScriptZZZ(null, ret_conv_40); CommonBase.add_ref_from(ret_conv_40_hu_conv, this); ret_conv_40_arr[o] = ret_conv_40_hu_conv; @@ -463,7 +463,7 @@ export class ChannelMonitor extends CommonBase { * have been registered. */ public load_outputs_to_watch(filter: Filter): void { - bindings.ChannelMonitor_load_outputs_to_watch(this.ptr, filter == null ? 0 : CommonBase.get_ptr_of(filter)); + bindings.ChannelMonitor_load_outputs_to_watch(this.ptr, filter == null ? 0n : CommonBase.get_ptr_of(filter)); CommonBase.add_ref_from(this, filter); } @@ -476,7 +476,7 @@ export class ChannelMonitor extends CommonBase { const ret_conv_14_len: number = bindings.getArrayLength(ret); const ret_conv_14_arr: MonitorEvent[] = new Array(ret_conv_14_len).fill(null); for (var o = 0; o < ret_conv_14_len; o++) { - const ret_conv_14: number = bindings.getU32ArrayElem(ret, o); + const ret_conv_14: bigint = bindings.getU64ArrayElem(ret, o); const ret_conv_14_hu_conv: MonitorEvent = MonitorEvent.constr_from_ptr(ret_conv_14); CommonBase.add_ref_from(ret_conv_14_hu_conv, this); ret_conv_14_arr[o] = ret_conv_14_hu_conv; @@ -498,7 +498,7 @@ export class ChannelMonitor extends CommonBase { const ret_conv_7_len: number = bindings.getArrayLength(ret); const ret_conv_7_arr: Event[] = new Array(ret_conv_7_len).fill(null); for (var h = 0; h < ret_conv_7_len; h++) { - const ret_conv_7: number = bindings.getU32ArrayElem(ret, h); + const ret_conv_7: bigint = bindings.getU64ArrayElem(ret, h); const ret_conv_7_hu_conv: Event = Event.constr_from_ptr(ret_conv_7); CommonBase.add_ref_from(ret_conv_7_hu_conv, this); ret_conv_7_arr[h] = ret_conv_7_hu_conv; @@ -533,7 +533,7 @@ export class ChannelMonitor extends CommonBase { * In any-case, choice is up to the user. */ public get_latest_holder_commitment_txn(logger: Logger): Uint8Array[] { - const ret: number = bindings.ChannelMonitor_get_latest_holder_commitment_txn(this.ptr, logger == null ? 0 : CommonBase.get_ptr_of(logger)); + const ret: number = bindings.ChannelMonitor_get_latest_holder_commitment_txn(this.ptr, logger == null ? 0n : CommonBase.get_ptr_of(logger)); const ret_conv_12_len: number = bindings.getArrayLength(ret); const ret_conv_12_arr: Uint8Array[] = new Array(ret_conv_12_len).fill(null); for (var m = 0; m < ret_conv_12_len; m++) { @@ -560,11 +560,11 @@ export class ChannelMonitor extends CommonBase { * [`get_outputs_to_watch`]: #method.get_outputs_to_watch */ public block_connected(header: Uint8Array, txdata: TwoTuple_usizeTransactionZ[], height: number, broadcaster: BroadcasterInterface, fee_estimator: FeeEstimator, logger: Logger): TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ[] { - const ret: number = bindings.ChannelMonitor_block_connected(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(header, 80)), bindings.encodeUint32Array(txdata != null ? txdata.map(txdata_conv_28 => txdata_conv_28 != null ? CommonBase.get_ptr_of(txdata_conv_28) : 0) : null), height, broadcaster == null ? 0 : CommonBase.get_ptr_of(broadcaster), fee_estimator == null ? 0 : CommonBase.get_ptr_of(fee_estimator), logger == null ? 0 : CommonBase.get_ptr_of(logger)); + const ret: number = bindings.ChannelMonitor_block_connected(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(header, 80)), bindings.encodeUint64Array(txdata != null ? txdata.map(txdata_conv_28 => txdata_conv_28 != null ? CommonBase.get_ptr_of(txdata_conv_28) : 0n) : null), height, broadcaster == null ? 0n : CommonBase.get_ptr_of(broadcaster), fee_estimator == null ? 0n : CommonBase.get_ptr_of(fee_estimator), logger == null ? 0n : CommonBase.get_ptr_of(logger)); const ret_conv_39_len: number = bindings.getArrayLength(ret); const ret_conv_39_arr: TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ[] = new Array(ret_conv_39_len).fill(null); for (var n = 0; n < ret_conv_39_len; n++) { - const ret_conv_39: number = bindings.getU32ArrayElem(ret, n); + const ret_conv_39: bigint = bindings.getU64ArrayElem(ret, n); const ret_conv_39_hu_conv: TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ = new TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ(null, ret_conv_39); CommonBase.add_ref_from(ret_conv_39_hu_conv, this); ret_conv_39_arr[n] = ret_conv_39_hu_conv; @@ -581,7 +581,7 @@ export class ChannelMonitor extends CommonBase { * appropriately. */ public block_disconnected(header: Uint8Array, height: number, broadcaster: BroadcasterInterface, fee_estimator: FeeEstimator, logger: Logger): void { - bindings.ChannelMonitor_block_disconnected(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(header, 80)), height, broadcaster == null ? 0 : CommonBase.get_ptr_of(broadcaster), fee_estimator == null ? 0 : CommonBase.get_ptr_of(fee_estimator), logger == null ? 0 : CommonBase.get_ptr_of(logger)); + bindings.ChannelMonitor_block_disconnected(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(header, 80)), height, broadcaster == null ? 0n : CommonBase.get_ptr_of(broadcaster), fee_estimator == null ? 0n : CommonBase.get_ptr_of(fee_estimator), logger == null ? 0n : CommonBase.get_ptr_of(logger)); CommonBase.add_ref_from(this, broadcaster); CommonBase.add_ref_from(this, fee_estimator); CommonBase.add_ref_from(this, logger); @@ -597,11 +597,11 @@ export class ChannelMonitor extends CommonBase { * [`block_connected`]: Self::block_connected */ public transactions_confirmed(header: Uint8Array, txdata: TwoTuple_usizeTransactionZ[], height: number, broadcaster: BroadcasterInterface, fee_estimator: FeeEstimator, logger: Logger): TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ[] { - const ret: number = bindings.ChannelMonitor_transactions_confirmed(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(header, 80)), bindings.encodeUint32Array(txdata != null ? txdata.map(txdata_conv_28 => txdata_conv_28 != null ? CommonBase.get_ptr_of(txdata_conv_28) : 0) : null), height, broadcaster == null ? 0 : CommonBase.get_ptr_of(broadcaster), fee_estimator == null ? 0 : CommonBase.get_ptr_of(fee_estimator), logger == null ? 0 : CommonBase.get_ptr_of(logger)); + const ret: number = bindings.ChannelMonitor_transactions_confirmed(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(header, 80)), bindings.encodeUint64Array(txdata != null ? txdata.map(txdata_conv_28 => txdata_conv_28 != null ? CommonBase.get_ptr_of(txdata_conv_28) : 0n) : null), height, broadcaster == null ? 0n : CommonBase.get_ptr_of(broadcaster), fee_estimator == null ? 0n : CommonBase.get_ptr_of(fee_estimator), logger == null ? 0n : CommonBase.get_ptr_of(logger)); const ret_conv_39_len: number = bindings.getArrayLength(ret); const ret_conv_39_arr: TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ[] = new Array(ret_conv_39_len).fill(null); for (var n = 0; n < ret_conv_39_len; n++) { - const ret_conv_39: number = bindings.getU32ArrayElem(ret, n); + const ret_conv_39: bigint = bindings.getU64ArrayElem(ret, n); const ret_conv_39_hu_conv: TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ = new TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ(null, ret_conv_39); CommonBase.add_ref_from(ret_conv_39_hu_conv, this); ret_conv_39_arr[n] = ret_conv_39_hu_conv; @@ -622,7 +622,7 @@ export class ChannelMonitor extends CommonBase { * [`block_disconnected`]: Self::block_disconnected */ public transaction_unconfirmed(txid: Uint8Array, broadcaster: BroadcasterInterface, fee_estimator: FeeEstimator, logger: Logger): void { - bindings.ChannelMonitor_transaction_unconfirmed(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(txid, 32)), broadcaster == null ? 0 : CommonBase.get_ptr_of(broadcaster), fee_estimator == null ? 0 : CommonBase.get_ptr_of(fee_estimator), logger == null ? 0 : CommonBase.get_ptr_of(logger)); + bindings.ChannelMonitor_transaction_unconfirmed(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(txid, 32)), broadcaster == null ? 0n : CommonBase.get_ptr_of(broadcaster), fee_estimator == null ? 0n : CommonBase.get_ptr_of(fee_estimator), logger == null ? 0n : CommonBase.get_ptr_of(logger)); CommonBase.add_ref_from(this, broadcaster); CommonBase.add_ref_from(this, fee_estimator); CommonBase.add_ref_from(this, logger); @@ -638,11 +638,11 @@ export class ChannelMonitor extends CommonBase { * [`block_connected`]: Self::block_connected */ public best_block_updated(header: Uint8Array, height: number, broadcaster: BroadcasterInterface, fee_estimator: FeeEstimator, logger: Logger): TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ[] { - const ret: number = bindings.ChannelMonitor_best_block_updated(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(header, 80)), height, broadcaster == null ? 0 : CommonBase.get_ptr_of(broadcaster), fee_estimator == null ? 0 : CommonBase.get_ptr_of(fee_estimator), logger == null ? 0 : CommonBase.get_ptr_of(logger)); + const ret: number = bindings.ChannelMonitor_best_block_updated(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(header, 80)), height, broadcaster == null ? 0n : CommonBase.get_ptr_of(broadcaster), fee_estimator == null ? 0n : CommonBase.get_ptr_of(fee_estimator), logger == null ? 0n : CommonBase.get_ptr_of(logger)); const ret_conv_39_len: number = bindings.getArrayLength(ret); const ret_conv_39_arr: TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ[] = new Array(ret_conv_39_len).fill(null); for (var n = 0; n < ret_conv_39_len; n++) { - const ret_conv_39: number = bindings.getU32ArrayElem(ret, n); + const ret_conv_39: bigint = bindings.getU64ArrayElem(ret, n); const ret_conv_39_hu_conv: TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ = new TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ(null, ret_conv_39); CommonBase.add_ref_from(ret_conv_39_hu_conv, this); ret_conv_39_arr[n] = ret_conv_39_hu_conv; @@ -675,7 +675,7 @@ export class ChannelMonitor extends CommonBase { * [`chain::Confirm`] interfaces. */ public current_best_block(): BestBlock { - const ret: number = bindings.ChannelMonitor_current_best_block(this.ptr); + const ret: bigint = bindings.ChannelMonitor_current_best_block(this.ptr); const ret_hu_conv: BestBlock = new BestBlock(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -702,7 +702,7 @@ export class ChannelMonitor extends CommonBase { const ret_conv_9_len: number = bindings.getArrayLength(ret); const ret_conv_9_arr: Balance[] = new Array(ret_conv_9_len).fill(null); for (var j = 0; j < ret_conv_9_len; j++) { - const ret_conv_9: number = bindings.getU32ArrayElem(ret, j); + const ret_conv_9: bigint = bindings.getU64ArrayElem(ret, j); const ret_conv_9_hu_conv: Balance = Balance.constr_from_ptr(ret_conv_9); CommonBase.add_ref_from(ret_conv_9_hu_conv, this); ret_conv_9_arr[j] = ret_conv_9_hu_conv; diff --git a/ts/structs/ChannelMonitorUpdate.mts b/ts/structs/ChannelMonitorUpdate.mts index 567216b1..fc528b4b 100644 --- a/ts/structs/ChannelMonitorUpdate.mts +++ b/ts/structs/ChannelMonitorUpdate.mts @@ -362,7 +362,7 @@ import * as bindings from '../bindings.mjs' */ export class ChannelMonitorUpdate extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.ChannelMonitorUpdate_free); } @@ -401,8 +401,8 @@ export class ChannelMonitorUpdate extends CommonBase { bindings.ChannelMonitorUpdate_set_update_id(this.ptr, val); } - public clone_ptr(): number { - const ret: number = bindings.ChannelMonitorUpdate_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.ChannelMonitorUpdate_clone_ptr(this.ptr); return ret; } @@ -410,7 +410,7 @@ export class ChannelMonitorUpdate extends CommonBase { * Creates a copy of the ChannelMonitorUpdate */ public clone(): ChannelMonitorUpdate { - const ret: number = bindings.ChannelMonitorUpdate_clone(this.ptr); + const ret: bigint = bindings.ChannelMonitorUpdate_clone(this.ptr); const ret_hu_conv: ChannelMonitorUpdate = new ChannelMonitorUpdate(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -429,7 +429,7 @@ export class ChannelMonitorUpdate extends CommonBase { * Read a ChannelMonitorUpdate from a byte array, created by ChannelMonitorUpdate_write */ public static constructor_read(ser: Uint8Array): Result_ChannelMonitorUpdateDecodeErrorZ { - const ret: number = bindings.ChannelMonitorUpdate_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.ChannelMonitorUpdate_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_ChannelMonitorUpdateDecodeErrorZ = Result_ChannelMonitorUpdateDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/ChannelPublicKeys.mts b/ts/structs/ChannelPublicKeys.mts index 034a493b..7a0a0559 100644 --- a/ts/structs/ChannelPublicKeys.mts +++ b/ts/structs/ChannelPublicKeys.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class ChannelPublicKeys extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.ChannelPublicKeys_free); } @@ -467,14 +467,14 @@ export class ChannelPublicKeys extends CommonBase { * Constructs a new ChannelPublicKeys given each field */ public static constructor_new(funding_pubkey_arg: Uint8Array, revocation_basepoint_arg: Uint8Array, payment_point_arg: Uint8Array, delayed_payment_basepoint_arg: Uint8Array, htlc_basepoint_arg: Uint8Array): ChannelPublicKeys { - const ret: number = bindings.ChannelPublicKeys_new(bindings.encodeUint8Array(bindings.check_arr_len(funding_pubkey_arg, 33)), bindings.encodeUint8Array(bindings.check_arr_len(revocation_basepoint_arg, 33)), bindings.encodeUint8Array(bindings.check_arr_len(payment_point_arg, 33)), bindings.encodeUint8Array(bindings.check_arr_len(delayed_payment_basepoint_arg, 33)), bindings.encodeUint8Array(bindings.check_arr_len(htlc_basepoint_arg, 33))); + const ret: bigint = bindings.ChannelPublicKeys_new(bindings.encodeUint8Array(bindings.check_arr_len(funding_pubkey_arg, 33)), bindings.encodeUint8Array(bindings.check_arr_len(revocation_basepoint_arg, 33)), bindings.encodeUint8Array(bindings.check_arr_len(payment_point_arg, 33)), bindings.encodeUint8Array(bindings.check_arr_len(delayed_payment_basepoint_arg, 33)), bindings.encodeUint8Array(bindings.check_arr_len(htlc_basepoint_arg, 33))); const ret_hu_conv: ChannelPublicKeys = new ChannelPublicKeys(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.ChannelPublicKeys_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.ChannelPublicKeys_clone_ptr(this.ptr); return ret; } @@ -482,7 +482,7 @@ export class ChannelPublicKeys extends CommonBase { * Creates a copy of the ChannelPublicKeys */ public clone(): ChannelPublicKeys { - const ret: number = bindings.ChannelPublicKeys_clone(this.ptr); + const ret: bigint = bindings.ChannelPublicKeys_clone(this.ptr); const ret_hu_conv: ChannelPublicKeys = new ChannelPublicKeys(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -501,7 +501,7 @@ export class ChannelPublicKeys extends CommonBase { * Read a ChannelPublicKeys from a byte array, created by ChannelPublicKeys_write */ public static constructor_read(ser: Uint8Array): Result_ChannelPublicKeysDecodeErrorZ { - const ret: number = bindings.ChannelPublicKeys_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.ChannelPublicKeys_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_ChannelPublicKeysDecodeErrorZ = Result_ChannelPublicKeysDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/ChannelReady.mts b/ts/structs/ChannelReady.mts index 1d01b480..275f6919 100644 --- a/ts/structs/ChannelReady.mts +++ b/ts/structs/ChannelReady.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class ChannelReady extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.ChannelReady_free); } @@ -402,7 +402,7 @@ export class ChannelReady extends CommonBase { * to be forwarded over this SCID and forward them to this messages' recipient. */ public get_short_channel_id_alias(): Option_u64Z { - const ret: number = bindings.ChannelReady_get_short_channel_id_alias(this.ptr); + const ret: bigint = bindings.ChannelReady_get_short_channel_id_alias(this.ptr); const ret_hu_conv: Option_u64Z = Option_u64Z.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -420,14 +420,14 @@ export class ChannelReady extends CommonBase { * Constructs a new ChannelReady given each field */ public static constructor_new(channel_id_arg: Uint8Array, next_per_commitment_point_arg: Uint8Array, short_channel_id_alias_arg: Option_u64Z): ChannelReady { - const ret: number = bindings.ChannelReady_new(bindings.encodeUint8Array(bindings.check_arr_len(channel_id_arg, 32)), bindings.encodeUint8Array(bindings.check_arr_len(next_per_commitment_point_arg, 33)), CommonBase.get_ptr_of(short_channel_id_alias_arg)); + const ret: bigint = bindings.ChannelReady_new(bindings.encodeUint8Array(bindings.check_arr_len(channel_id_arg, 32)), bindings.encodeUint8Array(bindings.check_arr_len(next_per_commitment_point_arg, 33)), CommonBase.get_ptr_of(short_channel_id_alias_arg)); const ret_hu_conv: ChannelReady = new ChannelReady(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.ChannelReady_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.ChannelReady_clone_ptr(this.ptr); return ret; } @@ -435,7 +435,7 @@ export class ChannelReady extends CommonBase { * Creates a copy of the ChannelReady */ public clone(): ChannelReady { - const ret: number = bindings.ChannelReady_clone(this.ptr); + const ret: bigint = bindings.ChannelReady_clone(this.ptr); const ret_hu_conv: ChannelReady = new ChannelReady(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -454,7 +454,7 @@ export class ChannelReady extends CommonBase { * Read a ChannelReady from a byte array, created by ChannelReady_write */ public static constructor_read(ser: Uint8Array): Result_ChannelReadyDecodeErrorZ { - const ret: number = bindings.ChannelReady_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.ChannelReady_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_ChannelReadyDecodeErrorZ = Result_ChannelReadyDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/ChannelReestablish.mts b/ts/structs/ChannelReestablish.mts index 0dd59032..38f9f202 100644 --- a/ts/structs/ChannelReestablish.mts +++ b/ts/structs/ChannelReestablish.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class ChannelReestablish extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.ChannelReestablish_free); } @@ -411,8 +411,8 @@ export class ChannelReestablish extends CommonBase { bindings.ChannelReestablish_set_next_remote_commitment_number(this.ptr, val); } - public clone_ptr(): number { - const ret: number = bindings.ChannelReestablish_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.ChannelReestablish_clone_ptr(this.ptr); return ret; } @@ -420,7 +420,7 @@ export class ChannelReestablish extends CommonBase { * Creates a copy of the ChannelReestablish */ public clone(): ChannelReestablish { - const ret: number = bindings.ChannelReestablish_clone(this.ptr); + const ret: bigint = bindings.ChannelReestablish_clone(this.ptr); const ret_hu_conv: ChannelReestablish = new ChannelReestablish(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -439,7 +439,7 @@ export class ChannelReestablish extends CommonBase { * Read a ChannelReestablish from a byte array, created by ChannelReestablish_write */ public static constructor_read(ser: Uint8Array): Result_ChannelReestablishDecodeErrorZ { - const ret: number = bindings.ChannelReestablish_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.ChannelReestablish_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_ChannelReestablishDecodeErrorZ = Result_ChannelReestablishDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/ChannelTransactionParameters.mts b/ts/structs/ChannelTransactionParameters.mts index 9481bf51..66830c09 100644 --- a/ts/structs/ChannelTransactionParameters.mts +++ b/ts/structs/ChannelTransactionParameters.mts @@ -365,7 +365,7 @@ import * as bindings from '../bindings.mjs' */ export class ChannelTransactionParameters extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.ChannelTransactionParameters_free); } @@ -373,7 +373,7 @@ export class ChannelTransactionParameters extends CommonBase { * Holder public keys */ public get_holder_pubkeys(): ChannelPublicKeys { - const ret: number = bindings.ChannelTransactionParameters_get_holder_pubkeys(this.ptr); + const ret: bigint = bindings.ChannelTransactionParameters_get_holder_pubkeys(this.ptr); const ret_hu_conv: ChannelPublicKeys = new ChannelPublicKeys(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -383,7 +383,8 @@ export class ChannelTransactionParameters extends CommonBase { * Holder public keys */ public set_holder_pubkeys(val: ChannelPublicKeys): void { - bindings.ChannelTransactionParameters_set_holder_pubkeys(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.ChannelTransactionParameters_set_holder_pubkeys(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** @@ -425,7 +426,7 @@ export class ChannelTransactionParameters extends CommonBase { * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None */ public get_counterparty_parameters(): CounterpartyChannelTransactionParameters { - const ret: number = bindings.ChannelTransactionParameters_get_counterparty_parameters(this.ptr); + const ret: bigint = bindings.ChannelTransactionParameters_get_counterparty_parameters(this.ptr); const ret_hu_conv: CounterpartyChannelTransactionParameters = new CounterpartyChannelTransactionParameters(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -438,7 +439,8 @@ export class ChannelTransactionParameters extends CommonBase { * Note that val (or a relevant inner pointer) may be NULL or all-0s to represent None */ public set_counterparty_parameters(val: CounterpartyChannelTransactionParameters): void { - bindings.ChannelTransactionParameters_set_counterparty_parameters(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.ChannelTransactionParameters_set_counterparty_parameters(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** @@ -447,7 +449,7 @@ export class ChannelTransactionParameters extends CommonBase { * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None */ public get_funding_outpoint(): OutPoint { - const ret: number = bindings.ChannelTransactionParameters_get_funding_outpoint(this.ptr); + const ret: bigint = bindings.ChannelTransactionParameters_get_funding_outpoint(this.ptr); const ret_hu_conv: OutPoint = new OutPoint(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -459,7 +461,8 @@ export class ChannelTransactionParameters extends CommonBase { * Note that val (or a relevant inner pointer) may be NULL or all-0s to represent None */ public set_funding_outpoint(val: OutPoint): void { - bindings.ChannelTransactionParameters_set_funding_outpoint(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.ChannelTransactionParameters_set_funding_outpoint(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** @@ -481,14 +484,17 @@ export class ChannelTransactionParameters extends CommonBase { * Constructs a new ChannelTransactionParameters given each field */ public static constructor_new(holder_pubkeys_arg: ChannelPublicKeys, holder_selected_contest_delay_arg: number, is_outbound_from_holder_arg: boolean, counterparty_parameters_arg: CounterpartyChannelTransactionParameters, funding_outpoint_arg: OutPoint, opt_anchors_arg: COption_NoneZ): ChannelTransactionParameters { - const ret: number = bindings.ChannelTransactionParameters_new(holder_pubkeys_arg == null ? 0 : CommonBase.get_ptr_of(holder_pubkeys_arg) & ~1, holder_selected_contest_delay_arg, is_outbound_from_holder_arg, counterparty_parameters_arg == null ? 0 : CommonBase.get_ptr_of(counterparty_parameters_arg) & ~1, funding_outpoint_arg == null ? 0 : CommonBase.get_ptr_of(funding_outpoint_arg) & ~1, opt_anchors_arg); + const ret: bigint = bindings.ChannelTransactionParameters_new(holder_pubkeys_arg == null ? 0n : CommonBase.get_ptr_of(holder_pubkeys_arg), holder_selected_contest_delay_arg, is_outbound_from_holder_arg, counterparty_parameters_arg == null ? 0n : CommonBase.get_ptr_of(counterparty_parameters_arg), funding_outpoint_arg == null ? 0n : CommonBase.get_ptr_of(funding_outpoint_arg), opt_anchors_arg); const ret_hu_conv: ChannelTransactionParameters = new ChannelTransactionParameters(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, holder_pubkeys_arg); + CommonBase.add_ref_from(ret_hu_conv, counterparty_parameters_arg); + CommonBase.add_ref_from(ret_hu_conv, funding_outpoint_arg); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.ChannelTransactionParameters_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.ChannelTransactionParameters_clone_ptr(this.ptr); return ret; } @@ -496,7 +502,7 @@ export class ChannelTransactionParameters extends CommonBase { * Creates a copy of the ChannelTransactionParameters */ public clone(): ChannelTransactionParameters { - const ret: number = bindings.ChannelTransactionParameters_clone(this.ptr); + const ret: bigint = bindings.ChannelTransactionParameters_clone(this.ptr); const ret_hu_conv: ChannelTransactionParameters = new ChannelTransactionParameters(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -517,7 +523,7 @@ export class ChannelTransactionParameters extends CommonBase { * self.is_populated() must be true before calling this function. */ public as_holder_broadcastable(): DirectedChannelTransactionParameters { - const ret: number = bindings.ChannelTransactionParameters_as_holder_broadcastable(this.ptr); + const ret: bigint = bindings.ChannelTransactionParameters_as_holder_broadcastable(this.ptr); const ret_hu_conv: DirectedChannelTransactionParameters = new DirectedChannelTransactionParameters(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -530,7 +536,7 @@ export class ChannelTransactionParameters extends CommonBase { * self.is_populated() must be true before calling this function. */ public as_counterparty_broadcastable(): DirectedChannelTransactionParameters { - const ret: number = bindings.ChannelTransactionParameters_as_counterparty_broadcastable(this.ptr); + const ret: bigint = bindings.ChannelTransactionParameters_as_counterparty_broadcastable(this.ptr); const ret_hu_conv: DirectedChannelTransactionParameters = new DirectedChannelTransactionParameters(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -549,7 +555,7 @@ export class ChannelTransactionParameters extends CommonBase { * Read a ChannelTransactionParameters from a byte array, created by ChannelTransactionParameters_write */ public static constructor_read(ser: Uint8Array): Result_ChannelTransactionParametersDecodeErrorZ { - const ret: number = bindings.ChannelTransactionParameters_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.ChannelTransactionParameters_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_ChannelTransactionParametersDecodeErrorZ = Result_ChannelTransactionParametersDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/ChannelTypeFeatures.mts b/ts/structs/ChannelTypeFeatures.mts index f9dd5167..e6eb070f 100644 --- a/ts/structs/ChannelTypeFeatures.mts +++ b/ts/structs/ChannelTypeFeatures.mts @@ -370,7 +370,7 @@ import * as bindings from '../bindings.mjs' */ export class ChannelTypeFeatures extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.ChannelTypeFeatures_free); } @@ -380,13 +380,13 @@ export class ChannelTypeFeatures extends CommonBase { * Two objects with NULL inner values will be considered "equal" here. */ public eq(b: ChannelTypeFeatures): boolean { - const ret: boolean = bindings.ChannelTypeFeatures_eq(this.ptr, b == null ? 0 : CommonBase.get_ptr_of(b) & ~1); + const ret: boolean = bindings.ChannelTypeFeatures_eq(this.ptr, b == null ? 0n : CommonBase.get_ptr_of(b)); CommonBase.add_ref_from(this, b); return ret; } - public clone_ptr(): number { - const ret: number = bindings.ChannelTypeFeatures_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.ChannelTypeFeatures_clone_ptr(this.ptr); return ret; } @@ -394,7 +394,7 @@ export class ChannelTypeFeatures extends CommonBase { * Creates a copy of the ChannelTypeFeatures */ public clone(): ChannelTypeFeatures { - const ret: number = bindings.ChannelTypeFeatures_clone(this.ptr); + const ret: bigint = bindings.ChannelTypeFeatures_clone(this.ptr); const ret_hu_conv: ChannelTypeFeatures = new ChannelTypeFeatures(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -404,7 +404,7 @@ export class ChannelTypeFeatures extends CommonBase { * Create a blank Features with no features set */ public static constructor_empty(): ChannelTypeFeatures { - const ret: number = bindings.ChannelTypeFeatures_empty(); + const ret: bigint = bindings.ChannelTypeFeatures_empty(); const ret_hu_conv: ChannelTypeFeatures = new ChannelTypeFeatures(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -414,7 +414,7 @@ export class ChannelTypeFeatures extends CommonBase { * Creates a Features with the bits set which are known by the implementation */ public static constructor_known(): ChannelTypeFeatures { - const ret: number = bindings.ChannelTypeFeatures_known(); + const ret: bigint = bindings.ChannelTypeFeatures_known(); const ret_hu_conv: ChannelTypeFeatures = new ChannelTypeFeatures(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -442,7 +442,7 @@ export class ChannelTypeFeatures extends CommonBase { * Read a ChannelTypeFeatures from a byte array, created by ChannelTypeFeatures_write */ public static constructor_read(ser: Uint8Array): Result_ChannelTypeFeaturesDecodeErrorZ { - const ret: number = bindings.ChannelTypeFeatures_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.ChannelTypeFeatures_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_ChannelTypeFeaturesDecodeErrorZ = Result_ChannelTypeFeaturesDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/ChannelUpdate.mts b/ts/structs/ChannelUpdate.mts index 09f966ec..d1bd9bd3 100644 --- a/ts/structs/ChannelUpdate.mts +++ b/ts/structs/ChannelUpdate.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class ChannelUpdate extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.ChannelUpdate_free); } @@ -385,7 +385,7 @@ export class ChannelUpdate extends CommonBase { * The actual channel update */ public get_contents(): UnsignedChannelUpdate { - const ret: number = bindings.ChannelUpdate_get_contents(this.ptr); + const ret: bigint = bindings.ChannelUpdate_get_contents(this.ptr); const ret_hu_conv: UnsignedChannelUpdate = new UnsignedChannelUpdate(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -395,21 +395,23 @@ export class ChannelUpdate extends CommonBase { * The actual channel update */ public set_contents(val: UnsignedChannelUpdate): void { - bindings.ChannelUpdate_set_contents(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.ChannelUpdate_set_contents(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** * Constructs a new ChannelUpdate given each field */ public static constructor_new(signature_arg: Uint8Array, contents_arg: UnsignedChannelUpdate): ChannelUpdate { - const ret: number = bindings.ChannelUpdate_new(bindings.encodeUint8Array(bindings.check_arr_len(signature_arg, 64)), contents_arg == null ? 0 : CommonBase.get_ptr_of(contents_arg) & ~1); + const ret: bigint = bindings.ChannelUpdate_new(bindings.encodeUint8Array(bindings.check_arr_len(signature_arg, 64)), contents_arg == null ? 0n : CommonBase.get_ptr_of(contents_arg)); const ret_hu_conv: ChannelUpdate = new ChannelUpdate(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, contents_arg); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.ChannelUpdate_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.ChannelUpdate_clone_ptr(this.ptr); return ret; } @@ -417,7 +419,7 @@ export class ChannelUpdate extends CommonBase { * Creates a copy of the ChannelUpdate */ public clone(): ChannelUpdate { - const ret: number = bindings.ChannelUpdate_clone(this.ptr); + const ret: bigint = bindings.ChannelUpdate_clone(this.ptr); const ret_hu_conv: ChannelUpdate = new ChannelUpdate(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -436,7 +438,7 @@ export class ChannelUpdate extends CommonBase { * Read a ChannelUpdate from a byte array, created by ChannelUpdate_write */ public static constructor_read(ser: Uint8Array): Result_ChannelUpdateDecodeErrorZ { - const ret: number = bindings.ChannelUpdate_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.ChannelUpdate_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_ChannelUpdateDecodeErrorZ = Result_ChannelUpdateDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/ChannelUpdateInfo.mts b/ts/structs/ChannelUpdateInfo.mts index 82953cf5..95078c21 100644 --- a/ts/structs/ChannelUpdateInfo.mts +++ b/ts/structs/ChannelUpdateInfo.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class ChannelUpdateInfo extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.ChannelUpdateInfo_free); } @@ -446,7 +446,7 @@ export class ChannelUpdateInfo extends CommonBase { * Fees charged when the channel is used for routing */ public get_fees(): RoutingFees { - const ret: number = bindings.ChannelUpdateInfo_get_fees(this.ptr); + const ret: bigint = bindings.ChannelUpdateInfo_get_fees(this.ptr); const ret_hu_conv: RoutingFees = new RoutingFees(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -456,7 +456,8 @@ export class ChannelUpdateInfo extends CommonBase { * Fees charged when the channel is used for routing */ public set_fees(val: RoutingFees): void { - bindings.ChannelUpdateInfo_set_fees(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.ChannelUpdateInfo_set_fees(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** @@ -468,7 +469,7 @@ export class ChannelUpdateInfo extends CommonBase { * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None */ public get_last_update_message(): ChannelUpdate { - const ret: number = bindings.ChannelUpdateInfo_get_last_update_message(this.ptr); + const ret: bigint = bindings.ChannelUpdateInfo_get_last_update_message(this.ptr); const ret_hu_conv: ChannelUpdate = new ChannelUpdate(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -483,21 +484,24 @@ export class ChannelUpdateInfo extends CommonBase { * Note that val (or a relevant inner pointer) may be NULL or all-0s to represent None */ public set_last_update_message(val: ChannelUpdate): void { - bindings.ChannelUpdateInfo_set_last_update_message(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.ChannelUpdateInfo_set_last_update_message(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** * Constructs a new ChannelUpdateInfo given each field */ public static constructor_new(last_update_arg: number, enabled_arg: boolean, cltv_expiry_delta_arg: number, htlc_minimum_msat_arg: bigint, htlc_maximum_msat_arg: bigint, fees_arg: RoutingFees, last_update_message_arg: ChannelUpdate): ChannelUpdateInfo { - const ret: number = bindings.ChannelUpdateInfo_new(last_update_arg, enabled_arg, cltv_expiry_delta_arg, htlc_minimum_msat_arg, htlc_maximum_msat_arg, fees_arg == null ? 0 : CommonBase.get_ptr_of(fees_arg) & ~1, last_update_message_arg == null ? 0 : CommonBase.get_ptr_of(last_update_message_arg) & ~1); + const ret: bigint = bindings.ChannelUpdateInfo_new(last_update_arg, enabled_arg, cltv_expiry_delta_arg, htlc_minimum_msat_arg, htlc_maximum_msat_arg, fees_arg == null ? 0n : CommonBase.get_ptr_of(fees_arg), last_update_message_arg == null ? 0n : CommonBase.get_ptr_of(last_update_message_arg)); const ret_hu_conv: ChannelUpdateInfo = new ChannelUpdateInfo(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, fees_arg); + CommonBase.add_ref_from(ret_hu_conv, last_update_message_arg); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.ChannelUpdateInfo_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.ChannelUpdateInfo_clone_ptr(this.ptr); return ret; } @@ -505,7 +509,7 @@ export class ChannelUpdateInfo extends CommonBase { * Creates a copy of the ChannelUpdateInfo */ public clone(): ChannelUpdateInfo { - const ret: number = bindings.ChannelUpdateInfo_clone(this.ptr); + const ret: bigint = bindings.ChannelUpdateInfo_clone(this.ptr); const ret_hu_conv: ChannelUpdateInfo = new ChannelUpdateInfo(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -524,7 +528,7 @@ export class ChannelUpdateInfo extends CommonBase { * Read a ChannelUpdateInfo from a byte array, created by ChannelUpdateInfo_write */ public static constructor_read(ser: Uint8Array): Result_ChannelUpdateInfoDecodeErrorZ { - const ret: number = bindings.ChannelUpdateInfo_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.ChannelUpdateInfo_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_ChannelUpdateInfoDecodeErrorZ = Result_ChannelUpdateInfoDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/ChannelUsage.mts b/ts/structs/ChannelUsage.mts index 1ea23171..c88af004 100644 --- a/ts/structs/ChannelUsage.mts +++ b/ts/structs/ChannelUsage.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class ChannelUsage extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.ChannelUsage_free); } @@ -401,7 +401,7 @@ export class ChannelUsage extends CommonBase { * The effective capacity of the channel. */ public get_effective_capacity(): EffectiveCapacity { - const ret: number = bindings.ChannelUsage_get_effective_capacity(this.ptr); + const ret: bigint = bindings.ChannelUsage_get_effective_capacity(this.ptr); const ret_hu_conv: EffectiveCapacity = EffectiveCapacity.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -418,14 +418,14 @@ export class ChannelUsage extends CommonBase { * Constructs a new ChannelUsage given each field */ public static constructor_new(amount_msat_arg: bigint, inflight_htlc_msat_arg: bigint, effective_capacity_arg: EffectiveCapacity): ChannelUsage { - const ret: number = bindings.ChannelUsage_new(amount_msat_arg, inflight_htlc_msat_arg, CommonBase.get_ptr_of(effective_capacity_arg)); + const ret: bigint = bindings.ChannelUsage_new(amount_msat_arg, inflight_htlc_msat_arg, CommonBase.get_ptr_of(effective_capacity_arg)); const ret_hu_conv: ChannelUsage = new ChannelUsage(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.ChannelUsage_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.ChannelUsage_clone_ptr(this.ptr); return ret; } @@ -433,7 +433,7 @@ export class ChannelUsage extends CommonBase { * Creates a copy of the ChannelUsage */ public clone(): ChannelUsage { - const ret: number = bindings.ChannelUsage_clone(this.ptr); + const ret: bigint = bindings.ChannelUsage_clone(this.ptr); const ret_hu_conv: ChannelUsage = new ChannelUsage(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; diff --git a/ts/structs/ClosingSigned.mts b/ts/structs/ClosingSigned.mts index 9bf6a028..167e665f 100644 --- a/ts/structs/ClosingSigned.mts +++ b/ts/structs/ClosingSigned.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class ClosingSigned extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.ClosingSigned_free); } @@ -419,7 +419,7 @@ export class ClosingSigned extends CommonBase { * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None */ public get_fee_range(): ClosingSignedFeeRange { - const ret: number = bindings.ClosingSigned_get_fee_range(this.ptr); + const ret: bigint = bindings.ClosingSigned_get_fee_range(this.ptr); const ret_hu_conv: ClosingSignedFeeRange = new ClosingSignedFeeRange(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -432,21 +432,23 @@ export class ClosingSigned extends CommonBase { * Note that val (or a relevant inner pointer) may be NULL or all-0s to represent None */ public set_fee_range(val: ClosingSignedFeeRange): void { - bindings.ClosingSigned_set_fee_range(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.ClosingSigned_set_fee_range(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** * Constructs a new ClosingSigned given each field */ public static constructor_new(channel_id_arg: Uint8Array, fee_satoshis_arg: bigint, signature_arg: Uint8Array, fee_range_arg: ClosingSignedFeeRange): ClosingSigned { - const ret: number = bindings.ClosingSigned_new(bindings.encodeUint8Array(bindings.check_arr_len(channel_id_arg, 32)), fee_satoshis_arg, bindings.encodeUint8Array(bindings.check_arr_len(signature_arg, 64)), fee_range_arg == null ? 0 : CommonBase.get_ptr_of(fee_range_arg) & ~1); + const ret: bigint = bindings.ClosingSigned_new(bindings.encodeUint8Array(bindings.check_arr_len(channel_id_arg, 32)), fee_satoshis_arg, bindings.encodeUint8Array(bindings.check_arr_len(signature_arg, 64)), fee_range_arg == null ? 0n : CommonBase.get_ptr_of(fee_range_arg)); const ret_hu_conv: ClosingSigned = new ClosingSigned(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, fee_range_arg); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.ClosingSigned_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.ClosingSigned_clone_ptr(this.ptr); return ret; } @@ -454,7 +456,7 @@ export class ClosingSigned extends CommonBase { * Creates a copy of the ClosingSigned */ public clone(): ClosingSigned { - const ret: number = bindings.ClosingSigned_clone(this.ptr); + const ret: bigint = bindings.ClosingSigned_clone(this.ptr); const ret_hu_conv: ClosingSigned = new ClosingSigned(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -473,7 +475,7 @@ export class ClosingSigned extends CommonBase { * Read a ClosingSigned from a byte array, created by ClosingSigned_write */ public static constructor_read(ser: Uint8Array): Result_ClosingSignedDecodeErrorZ { - const ret: number = bindings.ClosingSigned_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.ClosingSigned_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_ClosingSignedDecodeErrorZ = Result_ClosingSignedDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/ClosingSignedFeeRange.mts b/ts/structs/ClosingSignedFeeRange.mts index 9e6fb53d..d90532c7 100644 --- a/ts/structs/ClosingSignedFeeRange.mts +++ b/ts/structs/ClosingSignedFeeRange.mts @@ -363,7 +363,7 @@ import * as bindings from '../bindings.mjs' */ export class ClosingSignedFeeRange extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.ClosingSignedFeeRange_free); } @@ -405,14 +405,14 @@ export class ClosingSignedFeeRange extends CommonBase { * Constructs a new ClosingSignedFeeRange given each field */ public static constructor_new(min_fee_satoshis_arg: bigint, max_fee_satoshis_arg: bigint): ClosingSignedFeeRange { - const ret: number = bindings.ClosingSignedFeeRange_new(min_fee_satoshis_arg, max_fee_satoshis_arg); + const ret: bigint = bindings.ClosingSignedFeeRange_new(min_fee_satoshis_arg, max_fee_satoshis_arg); const ret_hu_conv: ClosingSignedFeeRange = new ClosingSignedFeeRange(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.ClosingSignedFeeRange_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.ClosingSignedFeeRange_clone_ptr(this.ptr); return ret; } @@ -420,7 +420,7 @@ export class ClosingSignedFeeRange extends CommonBase { * Creates a copy of the ClosingSignedFeeRange */ public clone(): ClosingSignedFeeRange { - const ret: number = bindings.ClosingSignedFeeRange_clone(this.ptr); + const ret: bigint = bindings.ClosingSignedFeeRange_clone(this.ptr); const ret_hu_conv: ClosingSignedFeeRange = new ClosingSignedFeeRange(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -439,7 +439,7 @@ export class ClosingSignedFeeRange extends CommonBase { * Read a ClosingSignedFeeRange from a byte array, created by ClosingSignedFeeRange_write */ public static constructor_read(ser: Uint8Array): Result_ClosingSignedFeeRangeDecodeErrorZ { - const ret: number = bindings.ClosingSignedFeeRange_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.ClosingSignedFeeRange_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_ClosingSignedFeeRangeDecodeErrorZ = Result_ClosingSignedFeeRangeDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/ClosingTransaction.mts b/ts/structs/ClosingTransaction.mts index 568b4cee..4dcb8f39 100644 --- a/ts/structs/ClosingTransaction.mts +++ b/ts/structs/ClosingTransaction.mts @@ -365,12 +365,12 @@ import * as bindings from '../bindings.mjs' */ export class ClosingTransaction extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.ClosingTransaction_free); } - public clone_ptr(): number { - const ret: number = bindings.ClosingTransaction_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.ClosingTransaction_clone_ptr(this.ptr); return ret; } @@ -378,7 +378,7 @@ export class ClosingTransaction extends CommonBase { * Creates a copy of the ClosingTransaction */ public clone(): ClosingTransaction { - const ret: number = bindings.ClosingTransaction_clone(this.ptr); + const ret: bigint = bindings.ClosingTransaction_clone(this.ptr); const ret_hu_conv: ClosingTransaction = new ClosingTransaction(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -396,9 +396,10 @@ export class ClosingTransaction extends CommonBase { * Construct an object of the class */ public static constructor_new(to_holder_value_sat: bigint, to_counterparty_value_sat: bigint, to_holder_script: Uint8Array, to_counterparty_script: Uint8Array, funding_outpoint: OutPoint): ClosingTransaction { - const ret: number = bindings.ClosingTransaction_new(to_holder_value_sat, to_counterparty_value_sat, bindings.encodeUint8Array(to_holder_script), bindings.encodeUint8Array(to_counterparty_script), funding_outpoint == null ? 0 : CommonBase.get_ptr_of(funding_outpoint) & ~1); + const ret: bigint = bindings.ClosingTransaction_new(to_holder_value_sat, to_counterparty_value_sat, bindings.encodeUint8Array(to_holder_script), bindings.encodeUint8Array(to_counterparty_script), funding_outpoint == null ? 0n : CommonBase.get_ptr_of(funding_outpoint)); const ret_hu_conv: ClosingTransaction = new ClosingTransaction(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, funding_outpoint); return ret_hu_conv; } @@ -411,7 +412,7 @@ export class ClosingTransaction extends CommonBase { * be used by an external signer - instead use the verify function. */ public trust(): TrustedClosingTransaction { - const ret: number = bindings.ClosingTransaction_trust(this.ptr); + const ret: bigint = bindings.ClosingTransaction_trust(this.ptr); const ret_hu_conv: TrustedClosingTransaction = new TrustedClosingTransaction(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -426,8 +427,9 @@ export class ClosingTransaction extends CommonBase { * or using the built transaction. */ public verify(funding_outpoint: OutPoint): Result_TrustedClosingTransactionNoneZ { - const ret: number = bindings.ClosingTransaction_verify(this.ptr, funding_outpoint == null ? 0 : CommonBase.get_ptr_of(funding_outpoint) & ~1); + const ret: bigint = bindings.ClosingTransaction_verify(this.ptr, funding_outpoint == null ? 0n : CommonBase.get_ptr_of(funding_outpoint)); const ret_hu_conv: Result_TrustedClosingTransactionNoneZ = Result_TrustedClosingTransactionNoneZ.constr_from_ptr(ret); + CommonBase.add_ref_from(this, funding_outpoint); return ret_hu_conv; } diff --git a/ts/structs/ClosureReason.mts b/ts/structs/ClosureReason.mts index 671537b0..9326ef39 100644 --- a/ts/structs/ClosureReason.mts +++ b/ts/structs/ClosureReason.mts @@ -359,9 +359,9 @@ import * as bindings from '../bindings.mjs' * The reason the channel was closed. See individual variants more details. */ export class ClosureReason extends CommonBase { - protected constructor(_dummy: object, ptr: number) { super(ptr, bindings.ClosureReason_free); } + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.ClosureReason_free); } /* @internal */ - public static constr_from_ptr(ptr: number): ClosureReason { + public static constr_from_ptr(ptr: bigint): ClosureReason { const raw_ty: number = bindings.LDKClosureReason_ty_from_ptr(ptr); switch (raw_ty) { case 0: return new ClosureReason_CounterpartyForceClosed(ptr); @@ -377,8 +377,8 @@ export class ClosureReason extends CommonBase { } } - public clone_ptr(): number { - const ret: number = bindings.ClosureReason_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.ClosureReason_clone_ptr(this.ptr); return ret; } @@ -386,7 +386,7 @@ export class ClosureReason extends CommonBase { * Creates a copy of the ClosureReason */ public clone(): ClosureReason { - const ret: number = bindings.ClosureReason_clone(this.ptr); + const ret: bigint = bindings.ClosureReason_clone(this.ptr); const ret_hu_conv: ClosureReason = ClosureReason.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -396,7 +396,7 @@ export class ClosureReason extends CommonBase { * Utility method to constructs a new CounterpartyForceClosed-variant ClosureReason */ public static constructor_counterparty_force_closed(peer_msg: string): ClosureReason { - const ret: number = bindings.ClosureReason_counterparty_force_closed(bindings.encodeString(peer_msg)); + const ret: bigint = bindings.ClosureReason_counterparty_force_closed(bindings.encodeString(peer_msg)); const ret_hu_conv: ClosureReason = ClosureReason.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -406,7 +406,7 @@ export class ClosureReason extends CommonBase { * Utility method to constructs a new HolderForceClosed-variant ClosureReason */ public static constructor_holder_force_closed(): ClosureReason { - const ret: number = bindings.ClosureReason_holder_force_closed(); + const ret: bigint = bindings.ClosureReason_holder_force_closed(); const ret_hu_conv: ClosureReason = ClosureReason.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -416,7 +416,7 @@ export class ClosureReason extends CommonBase { * Utility method to constructs a new CooperativeClosure-variant ClosureReason */ public static constructor_cooperative_closure(): ClosureReason { - const ret: number = bindings.ClosureReason_cooperative_closure(); + const ret: bigint = bindings.ClosureReason_cooperative_closure(); const ret_hu_conv: ClosureReason = ClosureReason.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -426,7 +426,7 @@ export class ClosureReason extends CommonBase { * Utility method to constructs a new CommitmentTxConfirmed-variant ClosureReason */ public static constructor_commitment_tx_confirmed(): ClosureReason { - const ret: number = bindings.ClosureReason_commitment_tx_confirmed(); + const ret: bigint = bindings.ClosureReason_commitment_tx_confirmed(); const ret_hu_conv: ClosureReason = ClosureReason.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -436,7 +436,7 @@ export class ClosureReason extends CommonBase { * Utility method to constructs a new FundingTimedOut-variant ClosureReason */ public static constructor_funding_timed_out(): ClosureReason { - const ret: number = bindings.ClosureReason_funding_timed_out(); + const ret: bigint = bindings.ClosureReason_funding_timed_out(); const ret_hu_conv: ClosureReason = ClosureReason.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -446,7 +446,7 @@ export class ClosureReason extends CommonBase { * Utility method to constructs a new ProcessingError-variant ClosureReason */ public static constructor_processing_error(err: string): ClosureReason { - const ret: number = bindings.ClosureReason_processing_error(bindings.encodeString(err)); + const ret: bigint = bindings.ClosureReason_processing_error(bindings.encodeString(err)); const ret_hu_conv: ClosureReason = ClosureReason.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -456,7 +456,7 @@ export class ClosureReason extends CommonBase { * Utility method to constructs a new DisconnectedPeer-variant ClosureReason */ public static constructor_disconnected_peer(): ClosureReason { - const ret: number = bindings.ClosureReason_disconnected_peer(); + const ret: bigint = bindings.ClosureReason_disconnected_peer(); const ret_hu_conv: ClosureReason = ClosureReason.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -466,7 +466,7 @@ export class ClosureReason extends CommonBase { * Utility method to constructs a new OutdatedChannelManager-variant ClosureReason */ public static constructor_outdated_channel_manager(): ClosureReason { - const ret: number = bindings.ClosureReason_outdated_channel_manager(); + const ret: bigint = bindings.ClosureReason_outdated_channel_manager(); const ret_hu_conv: ClosureReason = ClosureReason.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -493,7 +493,7 @@ export class ClosureReason_CounterpartyForceClosed extends ClosureReason { */ public peer_msg: string; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const peer_msg: number = bindings.LDKClosureReason_CounterpartyForceClosed_get_peer_msg(ptr); const peer_msg_conv: string = bindings.decodeString(peer_msg); @@ -503,28 +503,28 @@ export class ClosureReason_CounterpartyForceClosed extends ClosureReason { /** A ClosureReason of type HolderForceClosed */ export class ClosureReason_HolderForceClosed extends ClosureReason { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } /** A ClosureReason of type CooperativeClosure */ export class ClosureReason_CooperativeClosure extends ClosureReason { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } /** A ClosureReason of type CommitmentTxConfirmed */ export class ClosureReason_CommitmentTxConfirmed extends ClosureReason { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } /** A ClosureReason of type FundingTimedOut */ export class ClosureReason_FundingTimedOut extends ClosureReason { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } @@ -535,7 +535,7 @@ export class ClosureReason_ProcessingError extends ClosureReason { */ public err: string; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const err: number = bindings.LDKClosureReason_ProcessingError_get_err(ptr); const err_conv: string = bindings.decodeString(err); @@ -545,14 +545,14 @@ export class ClosureReason_ProcessingError extends ClosureReason { /** A ClosureReason of type DisconnectedPeer */ export class ClosureReason_DisconnectedPeer extends ClosureReason { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } /** A ClosureReason of type OutdatedChannelManager */ export class ClosureReason_OutdatedChannelManager extends ClosureReason { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } diff --git a/ts/structs/CommitmentSigned.mts b/ts/structs/CommitmentSigned.mts index 00707165..bef79688 100644 --- a/ts/structs/CommitmentSigned.mts +++ b/ts/structs/CommitmentSigned.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class CommitmentSigned extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CommitmentSigned_free); } @@ -426,14 +426,14 @@ export class CommitmentSigned extends CommonBase { * Constructs a new CommitmentSigned given each field */ public static constructor_new(channel_id_arg: Uint8Array, signature_arg: Uint8Array, htlc_signatures_arg: Uint8Array[]): CommitmentSigned { - const ret: number = bindings.CommitmentSigned_new(bindings.encodeUint8Array(bindings.check_arr_len(channel_id_arg, 32)), bindings.encodeUint8Array(bindings.check_arr_len(signature_arg, 64)), bindings.encodeUint32Array(htlc_signatures_arg != null ? htlc_signatures_arg.map(htlc_signatures_arg_conv_12 => bindings.encodeUint8Array(bindings.check_arr_len(htlc_signatures_arg_conv_12, 64))) : null)); + const ret: bigint = bindings.CommitmentSigned_new(bindings.encodeUint8Array(bindings.check_arr_len(channel_id_arg, 32)), bindings.encodeUint8Array(bindings.check_arr_len(signature_arg, 64)), bindings.encodeUint32Array(htlc_signatures_arg != null ? htlc_signatures_arg.map(htlc_signatures_arg_conv_12 => bindings.encodeUint8Array(bindings.check_arr_len(htlc_signatures_arg_conv_12, 64))) : null)); const ret_hu_conv: CommitmentSigned = new CommitmentSigned(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.CommitmentSigned_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CommitmentSigned_clone_ptr(this.ptr); return ret; } @@ -441,7 +441,7 @@ export class CommitmentSigned extends CommonBase { * Creates a copy of the CommitmentSigned */ public clone(): CommitmentSigned { - const ret: number = bindings.CommitmentSigned_clone(this.ptr); + const ret: bigint = bindings.CommitmentSigned_clone(this.ptr); const ret_hu_conv: CommitmentSigned = new CommitmentSigned(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -460,7 +460,7 @@ export class CommitmentSigned extends CommonBase { * Read a CommitmentSigned from a byte array, created by CommitmentSigned_write */ public static constructor_read(ser: Uint8Array): Result_CommitmentSignedDecodeErrorZ { - const ret: number = bindings.CommitmentSigned_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.CommitmentSigned_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_CommitmentSignedDecodeErrorZ = Result_CommitmentSignedDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/CommitmentTransaction.mts b/ts/structs/CommitmentTransaction.mts index 90e47ab5..d14fb061 100644 --- a/ts/structs/CommitmentTransaction.mts +++ b/ts/structs/CommitmentTransaction.mts @@ -366,12 +366,12 @@ import * as bindings from '../bindings.mjs' */ export class CommitmentTransaction extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CommitmentTransaction_free); } - public clone_ptr(): number { - const ret: number = bindings.CommitmentTransaction_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CommitmentTransaction_clone_ptr(this.ptr); return ret; } @@ -379,7 +379,7 @@ export class CommitmentTransaction extends CommonBase { * Creates a copy of the CommitmentTransaction */ public clone(): CommitmentTransaction { - const ret: number = bindings.CommitmentTransaction_clone(this.ptr); + const ret: bigint = bindings.CommitmentTransaction_clone(this.ptr); const ret_hu_conv: CommitmentTransaction = new CommitmentTransaction(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -398,7 +398,7 @@ export class CommitmentTransaction extends CommonBase { * Read a CommitmentTransaction from a byte array, created by CommitmentTransaction_write */ public static constructor_read(ser: Uint8Array): Result_CommitmentTransactionDecodeErrorZ { - const ret: number = bindings.CommitmentTransaction_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.CommitmentTransaction_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_CommitmentTransactionDecodeErrorZ = Result_CommitmentTransactionDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -444,7 +444,7 @@ export class CommitmentTransaction extends CommonBase { * be used by an external signer - instead use the verify function. */ public trust(): TrustedCommitmentTransaction { - const ret: number = bindings.CommitmentTransaction_trust(this.ptr); + const ret: bigint = bindings.CommitmentTransaction_trust(this.ptr); const ret_hu_conv: TrustedCommitmentTransaction = new TrustedCommitmentTransaction(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -459,7 +459,7 @@ export class CommitmentTransaction extends CommonBase { * or using the built transaction. */ public verify(channel_parameters: DirectedChannelTransactionParameters, broadcaster_keys: ChannelPublicKeys, countersignatory_keys: ChannelPublicKeys): Result_TrustedCommitmentTransactionNoneZ { - const ret: number = bindings.CommitmentTransaction_verify(this.ptr, channel_parameters == null ? 0 : CommonBase.get_ptr_of(channel_parameters) & ~1, broadcaster_keys == null ? 0 : CommonBase.get_ptr_of(broadcaster_keys) & ~1, countersignatory_keys == null ? 0 : CommonBase.get_ptr_of(countersignatory_keys) & ~1); + const ret: bigint = bindings.CommitmentTransaction_verify(this.ptr, channel_parameters == null ? 0n : CommonBase.get_ptr_of(channel_parameters), broadcaster_keys == null ? 0n : CommonBase.get_ptr_of(broadcaster_keys), countersignatory_keys == null ? 0n : CommonBase.get_ptr_of(countersignatory_keys)); const ret_hu_conv: Result_TrustedCommitmentTransactionNoneZ = Result_TrustedCommitmentTransactionNoneZ.constr_from_ptr(ret); CommonBase.add_ref_from(this, channel_parameters); CommonBase.add_ref_from(this, broadcaster_keys); diff --git a/ts/structs/CommitmentUpdate.mts b/ts/structs/CommitmentUpdate.mts index a82ff036..ae860556 100644 --- a/ts/structs/CommitmentUpdate.mts +++ b/ts/structs/CommitmentUpdate.mts @@ -362,7 +362,7 @@ import * as bindings from '../bindings.mjs' */ export class CommitmentUpdate extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CommitmentUpdate_free); } @@ -374,7 +374,7 @@ export class CommitmentUpdate extends CommonBase { const ret_conv_15_len: number = bindings.getArrayLength(ret); const ret_conv_15_arr: UpdateAddHTLC[] = new Array(ret_conv_15_len).fill(null); for (var p = 0; p < ret_conv_15_len; p++) { - const ret_conv_15: number = bindings.getU32ArrayElem(ret, p); + const ret_conv_15: bigint = bindings.getU64ArrayElem(ret, p); const ret_conv_15_hu_conv: UpdateAddHTLC = new UpdateAddHTLC(null, ret_conv_15); CommonBase.add_ref_from(ret_conv_15_hu_conv, this); ret_conv_15_arr[p] = ret_conv_15_hu_conv; @@ -387,7 +387,8 @@ export class CommitmentUpdate extends CommonBase { * update_add_htlc messages which should be sent */ public set_update_add_htlcs(val: UpdateAddHTLC[]): void { - bindings.CommitmentUpdate_set_update_add_htlcs(this.ptr, bindings.encodeUint32Array(val != null ? val.map(val_conv_15 => val_conv_15 == null ? 0 : CommonBase.get_ptr_of(val_conv_15) & ~1) : null)); + bindings.CommitmentUpdate_set_update_add_htlcs(this.ptr, bindings.encodeUint64Array(val != null ? val.map(val_conv_15 => val_conv_15 == null ? 0n : CommonBase.get_ptr_of(val_conv_15)) : null)); + val.forEach((val_conv_15: UpdateAddHTLC) => { CommonBase.add_ref_from(this, val_conv_15); }); } /** @@ -398,7 +399,7 @@ export class CommitmentUpdate extends CommonBase { const ret_conv_19_len: number = bindings.getArrayLength(ret); const ret_conv_19_arr: UpdateFulfillHTLC[] = new Array(ret_conv_19_len).fill(null); for (var t = 0; t < ret_conv_19_len; t++) { - const ret_conv_19: number = bindings.getU32ArrayElem(ret, t); + const ret_conv_19: bigint = bindings.getU64ArrayElem(ret, t); const ret_conv_19_hu_conv: UpdateFulfillHTLC = new UpdateFulfillHTLC(null, ret_conv_19); CommonBase.add_ref_from(ret_conv_19_hu_conv, this); ret_conv_19_arr[t] = ret_conv_19_hu_conv; @@ -411,7 +412,8 @@ export class CommitmentUpdate extends CommonBase { * update_fulfill_htlc messages which should be sent */ public set_update_fulfill_htlcs(val: UpdateFulfillHTLC[]): void { - bindings.CommitmentUpdate_set_update_fulfill_htlcs(this.ptr, bindings.encodeUint32Array(val != null ? val.map(val_conv_19 => val_conv_19 == null ? 0 : CommonBase.get_ptr_of(val_conv_19) & ~1) : null)); + bindings.CommitmentUpdate_set_update_fulfill_htlcs(this.ptr, bindings.encodeUint64Array(val != null ? val.map(val_conv_19 => val_conv_19 == null ? 0n : CommonBase.get_ptr_of(val_conv_19)) : null)); + val.forEach((val_conv_19: UpdateFulfillHTLC) => { CommonBase.add_ref_from(this, val_conv_19); }); } /** @@ -422,7 +424,7 @@ export class CommitmentUpdate extends CommonBase { const ret_conv_16_len: number = bindings.getArrayLength(ret); const ret_conv_16_arr: UpdateFailHTLC[] = new Array(ret_conv_16_len).fill(null); for (var q = 0; q < ret_conv_16_len; q++) { - const ret_conv_16: number = bindings.getU32ArrayElem(ret, q); + const ret_conv_16: bigint = bindings.getU64ArrayElem(ret, q); const ret_conv_16_hu_conv: UpdateFailHTLC = new UpdateFailHTLC(null, ret_conv_16); CommonBase.add_ref_from(ret_conv_16_hu_conv, this); ret_conv_16_arr[q] = ret_conv_16_hu_conv; @@ -435,7 +437,8 @@ export class CommitmentUpdate extends CommonBase { * update_fail_htlc messages which should be sent */ public set_update_fail_htlcs(val: UpdateFailHTLC[]): void { - bindings.CommitmentUpdate_set_update_fail_htlcs(this.ptr, bindings.encodeUint32Array(val != null ? val.map(val_conv_16 => val_conv_16 == null ? 0 : CommonBase.get_ptr_of(val_conv_16) & ~1) : null)); + bindings.CommitmentUpdate_set_update_fail_htlcs(this.ptr, bindings.encodeUint64Array(val != null ? val.map(val_conv_16 => val_conv_16 == null ? 0n : CommonBase.get_ptr_of(val_conv_16)) : null)); + val.forEach((val_conv_16: UpdateFailHTLC) => { CommonBase.add_ref_from(this, val_conv_16); }); } /** @@ -446,7 +449,7 @@ export class CommitmentUpdate extends CommonBase { const ret_conv_25_len: number = bindings.getArrayLength(ret); const ret_conv_25_arr: UpdateFailMalformedHTLC[] = new Array(ret_conv_25_len).fill(null); for (var z = 0; z < ret_conv_25_len; z++) { - const ret_conv_25: number = bindings.getU32ArrayElem(ret, z); + const ret_conv_25: bigint = bindings.getU64ArrayElem(ret, z); const ret_conv_25_hu_conv: UpdateFailMalformedHTLC = new UpdateFailMalformedHTLC(null, ret_conv_25); CommonBase.add_ref_from(ret_conv_25_hu_conv, this); ret_conv_25_arr[z] = ret_conv_25_hu_conv; @@ -459,7 +462,8 @@ export class CommitmentUpdate extends CommonBase { * update_fail_malformed_htlc messages which should be sent */ public set_update_fail_malformed_htlcs(val: UpdateFailMalformedHTLC[]): void { - bindings.CommitmentUpdate_set_update_fail_malformed_htlcs(this.ptr, bindings.encodeUint32Array(val != null ? val.map(val_conv_25 => val_conv_25 == null ? 0 : CommonBase.get_ptr_of(val_conv_25) & ~1) : null)); + bindings.CommitmentUpdate_set_update_fail_malformed_htlcs(this.ptr, bindings.encodeUint64Array(val != null ? val.map(val_conv_25 => val_conv_25 == null ? 0n : CommonBase.get_ptr_of(val_conv_25)) : null)); + val.forEach((val_conv_25: UpdateFailMalformedHTLC) => { CommonBase.add_ref_from(this, val_conv_25); }); } /** @@ -468,7 +472,7 @@ export class CommitmentUpdate extends CommonBase { * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None */ public get_update_fee(): UpdateFee { - const ret: number = bindings.CommitmentUpdate_get_update_fee(this.ptr); + const ret: bigint = bindings.CommitmentUpdate_get_update_fee(this.ptr); const ret_hu_conv: UpdateFee = new UpdateFee(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -480,14 +484,15 @@ export class CommitmentUpdate extends CommonBase { * Note that val (or a relevant inner pointer) may be NULL or all-0s to represent None */ public set_update_fee(val: UpdateFee): void { - bindings.CommitmentUpdate_set_update_fee(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.CommitmentUpdate_set_update_fee(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** * Finally, the commitment_signed message which should be sent */ public get_commitment_signed(): CommitmentSigned { - const ret: number = bindings.CommitmentUpdate_get_commitment_signed(this.ptr); + const ret: bigint = bindings.CommitmentUpdate_get_commitment_signed(this.ptr); const ret_hu_conv: CommitmentSigned = new CommitmentSigned(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -497,21 +502,28 @@ export class CommitmentUpdate extends CommonBase { * Finally, the commitment_signed message which should be sent */ public set_commitment_signed(val: CommitmentSigned): void { - bindings.CommitmentUpdate_set_commitment_signed(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.CommitmentUpdate_set_commitment_signed(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** * Constructs a new CommitmentUpdate given each field */ public static constructor_new(update_add_htlcs_arg: UpdateAddHTLC[], update_fulfill_htlcs_arg: UpdateFulfillHTLC[], update_fail_htlcs_arg: UpdateFailHTLC[], update_fail_malformed_htlcs_arg: UpdateFailMalformedHTLC[], update_fee_arg: UpdateFee, commitment_signed_arg: CommitmentSigned): CommitmentUpdate { - const ret: number = bindings.CommitmentUpdate_new(bindings.encodeUint32Array(update_add_htlcs_arg != null ? update_add_htlcs_arg.map(update_add_htlcs_arg_conv_15 => update_add_htlcs_arg_conv_15 == null ? 0 : CommonBase.get_ptr_of(update_add_htlcs_arg_conv_15) & ~1) : null), bindings.encodeUint32Array(update_fulfill_htlcs_arg != null ? update_fulfill_htlcs_arg.map(update_fulfill_htlcs_arg_conv_19 => update_fulfill_htlcs_arg_conv_19 == null ? 0 : CommonBase.get_ptr_of(update_fulfill_htlcs_arg_conv_19) & ~1) : null), bindings.encodeUint32Array(update_fail_htlcs_arg != null ? update_fail_htlcs_arg.map(update_fail_htlcs_arg_conv_16 => update_fail_htlcs_arg_conv_16 == null ? 0 : CommonBase.get_ptr_of(update_fail_htlcs_arg_conv_16) & ~1) : null), bindings.encodeUint32Array(update_fail_malformed_htlcs_arg != null ? update_fail_malformed_htlcs_arg.map(update_fail_malformed_htlcs_arg_conv_25 => update_fail_malformed_htlcs_arg_conv_25 == null ? 0 : CommonBase.get_ptr_of(update_fail_malformed_htlcs_arg_conv_25) & ~1) : null), update_fee_arg == null ? 0 : CommonBase.get_ptr_of(update_fee_arg) & ~1, commitment_signed_arg == null ? 0 : CommonBase.get_ptr_of(commitment_signed_arg) & ~1); + const ret: bigint = bindings.CommitmentUpdate_new(bindings.encodeUint64Array(update_add_htlcs_arg != null ? update_add_htlcs_arg.map(update_add_htlcs_arg_conv_15 => update_add_htlcs_arg_conv_15 == null ? 0n : CommonBase.get_ptr_of(update_add_htlcs_arg_conv_15)) : null), bindings.encodeUint64Array(update_fulfill_htlcs_arg != null ? update_fulfill_htlcs_arg.map(update_fulfill_htlcs_arg_conv_19 => update_fulfill_htlcs_arg_conv_19 == null ? 0n : CommonBase.get_ptr_of(update_fulfill_htlcs_arg_conv_19)) : null), bindings.encodeUint64Array(update_fail_htlcs_arg != null ? update_fail_htlcs_arg.map(update_fail_htlcs_arg_conv_16 => update_fail_htlcs_arg_conv_16 == null ? 0n : CommonBase.get_ptr_of(update_fail_htlcs_arg_conv_16)) : null), bindings.encodeUint64Array(update_fail_malformed_htlcs_arg != null ? update_fail_malformed_htlcs_arg.map(update_fail_malformed_htlcs_arg_conv_25 => update_fail_malformed_htlcs_arg_conv_25 == null ? 0n : CommonBase.get_ptr_of(update_fail_malformed_htlcs_arg_conv_25)) : null), update_fee_arg == null ? 0n : CommonBase.get_ptr_of(update_fee_arg), commitment_signed_arg == null ? 0n : CommonBase.get_ptr_of(commitment_signed_arg)); const ret_hu_conv: CommitmentUpdate = new CommitmentUpdate(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + update_add_htlcs_arg.forEach((update_add_htlcs_arg_conv_15: UpdateAddHTLC) => { CommonBase.add_ref_from(ret_hu_conv, update_add_htlcs_arg_conv_15); }); + update_fulfill_htlcs_arg.forEach((update_fulfill_htlcs_arg_conv_19: UpdateFulfillHTLC) => { CommonBase.add_ref_from(ret_hu_conv, update_fulfill_htlcs_arg_conv_19); }); + update_fail_htlcs_arg.forEach((update_fail_htlcs_arg_conv_16: UpdateFailHTLC) => { CommonBase.add_ref_from(ret_hu_conv, update_fail_htlcs_arg_conv_16); }); + update_fail_malformed_htlcs_arg.forEach((update_fail_malformed_htlcs_arg_conv_25: UpdateFailMalformedHTLC) => { CommonBase.add_ref_from(ret_hu_conv, update_fail_malformed_htlcs_arg_conv_25); }); + CommonBase.add_ref_from(ret_hu_conv, update_fee_arg); + CommonBase.add_ref_from(ret_hu_conv, commitment_signed_arg); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.CommitmentUpdate_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CommitmentUpdate_clone_ptr(this.ptr); return ret; } @@ -519,7 +531,7 @@ export class CommitmentUpdate extends CommonBase { * Creates a copy of the CommitmentUpdate */ public clone(): CommitmentUpdate { - const ret: number = bindings.CommitmentUpdate_clone(this.ptr); + const ret: bigint = bindings.CommitmentUpdate_clone(this.ptr); const ret_hu_conv: CommitmentUpdate = new CommitmentUpdate(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; diff --git a/ts/structs/CommonBase.mts b/ts/structs/CommonBase.mts index 75630f91..8ce5766a 100644 --- a/ts/structs/CommonBase.mts +++ b/ts/structs/CommonBase.mts @@ -355,18 +355,18 @@ import { DefaultRouter } from '../structs/DefaultRouter.mjs'; function freer(f: () => void) { f() } const finalizer = new FinalizationRegistry(freer); -function get_freeer(ptr: number, free_fn: (ptr: number) => void) { +function get_freeer(ptr: bigint, free_fn: (ptr: bigint) => void) { return () => { free_fn(ptr); } } export class CommonBase { - protected ptr: number; + protected ptr: bigint; protected ptrs_to: object[] = []; - protected constructor(ptr: number, free_fn: (ptr: number) => void) { + protected constructor(ptr: bigint, free_fn: (ptr: bigint) => void) { this.ptr = ptr; - if (Number.isFinite(ptr) && ptr != 0){ + if (ptr != 0n){ finalizer.register(this, get_freeer(ptr, free_fn), this); } } @@ -380,7 +380,7 @@ export class CommonBase { return o.ptr; } protected static set_null_skip_free(o: CommonBase) { - o.ptr = 0; + o.ptr = 0n; // @ts-ignore TypeScript is wrong about the returnvalue of unregister here! const did_unregister: boolean = finalizer.unregister(o); if (!did_unregister) diff --git a/ts/structs/Confirm.mts b/ts/structs/Confirm.mts index 0638b022..09298617 100644 --- a/ts/structs/Confirm.mts +++ b/ts/structs/Confirm.mts @@ -451,7 +451,7 @@ export class Confirm extends CommonBase { public bindings_instance?: bindings.LDKConfirm; /* @internal */ - constructor(_dummy: object, ptr: number) { + constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.Confirm_free); this.bindings_instance = null; } @@ -465,7 +465,7 @@ export class Confirm extends CommonBase { const txdata_conv_28_len: number = bindings.getArrayLength(txdata); const txdata_conv_28_arr: TwoTuple_usizeTransactionZ[] = new Array(txdata_conv_28_len).fill(null); for (var c = 0; c < txdata_conv_28_len; c++) { - const txdata_conv_28: number = bindings.getU32ArrayElem(txdata, c); + const txdata_conv_28: bigint = bindings.getU64ArrayElem(txdata, c); const txdata_conv_28_hu_conv: TwoTuple_usizeTransactionZ = new TwoTuple_usizeTransactionZ(null, txdata_conv_28); CommonBase.add_ref_from(txdata_conv_28_hu_conv, this); txdata_conv_28_arr[c] = txdata_conv_28_hu_conv; @@ -487,7 +487,7 @@ export class Confirm extends CommonBase { return result; }, } as bindings.LDKConfirm; - const ptr: number = bindings.LDKConfirm_new(structImplementation); + const ptr: bigint = bindings.LDKConfirm_new(structImplementation); impl_holder.held = new Confirm(null, ptr); impl_holder.held.bindings_instance = structImplementation; @@ -510,7 +510,7 @@ export class Confirm extends CommonBase { * [`best_block_updated`]: Self::best_block_updated */ public transactions_confirmed(header: Uint8Array, txdata: TwoTuple_usizeTransactionZ[], height: number): void { - bindings.Confirm_transactions_confirmed(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(header, 80)), bindings.encodeUint32Array(txdata != null ? txdata.map(txdata_conv_28 => txdata_conv_28 != null ? CommonBase.get_ptr_of(txdata_conv_28) : 0) : null), height); + bindings.Confirm_transactions_confirmed(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(header, 80)), bindings.encodeUint64Array(txdata != null ? txdata.map(txdata_conv_28 => txdata_conv_28 != null ? CommonBase.get_ptr_of(txdata_conv_28) : 0n) : null), height); } /** diff --git a/ts/structs/CounterpartyChannelTransactionParameters.mts b/ts/structs/CounterpartyChannelTransactionParameters.mts index f253f130..e2fbfbe7 100644 --- a/ts/structs/CounterpartyChannelTransactionParameters.mts +++ b/ts/structs/CounterpartyChannelTransactionParameters.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class CounterpartyChannelTransactionParameters extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CounterpartyChannelTransactionParameters_free); } @@ -369,7 +369,7 @@ export class CounterpartyChannelTransactionParameters extends CommonBase { * Counter-party public keys */ public get_pubkeys(): ChannelPublicKeys { - const ret: number = bindings.CounterpartyChannelTransactionParameters_get_pubkeys(this.ptr); + const ret: bigint = bindings.CounterpartyChannelTransactionParameters_get_pubkeys(this.ptr); const ret_hu_conv: ChannelPublicKeys = new ChannelPublicKeys(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -379,7 +379,8 @@ export class CounterpartyChannelTransactionParameters extends CommonBase { * Counter-party public keys */ public set_pubkeys(val: ChannelPublicKeys): void { - bindings.CounterpartyChannelTransactionParameters_set_pubkeys(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.CounterpartyChannelTransactionParameters_set_pubkeys(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** @@ -401,14 +402,15 @@ export class CounterpartyChannelTransactionParameters extends CommonBase { * Constructs a new CounterpartyChannelTransactionParameters given each field */ public static constructor_new(pubkeys_arg: ChannelPublicKeys, selected_contest_delay_arg: number): CounterpartyChannelTransactionParameters { - const ret: number = bindings.CounterpartyChannelTransactionParameters_new(pubkeys_arg == null ? 0 : CommonBase.get_ptr_of(pubkeys_arg) & ~1, selected_contest_delay_arg); + const ret: bigint = bindings.CounterpartyChannelTransactionParameters_new(pubkeys_arg == null ? 0n : CommonBase.get_ptr_of(pubkeys_arg), selected_contest_delay_arg); const ret_hu_conv: CounterpartyChannelTransactionParameters = new CounterpartyChannelTransactionParameters(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, pubkeys_arg); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.CounterpartyChannelTransactionParameters_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CounterpartyChannelTransactionParameters_clone_ptr(this.ptr); return ret; } @@ -416,7 +418,7 @@ export class CounterpartyChannelTransactionParameters extends CommonBase { * Creates a copy of the CounterpartyChannelTransactionParameters */ public clone(): CounterpartyChannelTransactionParameters { - const ret: number = bindings.CounterpartyChannelTransactionParameters_clone(this.ptr); + const ret: bigint = bindings.CounterpartyChannelTransactionParameters_clone(this.ptr); const ret_hu_conv: CounterpartyChannelTransactionParameters = new CounterpartyChannelTransactionParameters(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -435,7 +437,7 @@ export class CounterpartyChannelTransactionParameters extends CommonBase { * Read a CounterpartyChannelTransactionParameters from a byte array, created by CounterpartyChannelTransactionParameters_write */ public static constructor_read(ser: Uint8Array): Result_CounterpartyChannelTransactionParametersDecodeErrorZ { - const ret: number = bindings.CounterpartyChannelTransactionParameters_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.CounterpartyChannelTransactionParameters_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_CounterpartyChannelTransactionParametersDecodeErrorZ = Result_CounterpartyChannelTransactionParametersDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/CounterpartyCommitmentSecrets.mts b/ts/structs/CounterpartyCommitmentSecrets.mts index 878537fd..9b6d8cfb 100644 --- a/ts/structs/CounterpartyCommitmentSecrets.mts +++ b/ts/structs/CounterpartyCommitmentSecrets.mts @@ -365,12 +365,12 @@ import * as bindings from '../bindings.mjs' */ export class CounterpartyCommitmentSecrets extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CounterpartyCommitmentSecrets_free); } - public clone_ptr(): number { - const ret: number = bindings.CounterpartyCommitmentSecrets_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CounterpartyCommitmentSecrets_clone_ptr(this.ptr); return ret; } @@ -378,7 +378,7 @@ export class CounterpartyCommitmentSecrets extends CommonBase { * Creates a copy of the CounterpartyCommitmentSecrets */ public clone(): CounterpartyCommitmentSecrets { - const ret: number = bindings.CounterpartyCommitmentSecrets_clone(this.ptr); + const ret: bigint = bindings.CounterpartyCommitmentSecrets_clone(this.ptr); const ret_hu_conv: CounterpartyCommitmentSecrets = new CounterpartyCommitmentSecrets(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -388,7 +388,7 @@ export class CounterpartyCommitmentSecrets extends CommonBase { * Creates a new empty `CounterpartyCommitmentSecrets` structure. */ public static constructor_new(): CounterpartyCommitmentSecrets { - const ret: number = bindings.CounterpartyCommitmentSecrets_new(); + const ret: bigint = bindings.CounterpartyCommitmentSecrets_new(); const ret_hu_conv: CounterpartyCommitmentSecrets = new CounterpartyCommitmentSecrets(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -408,7 +408,7 @@ export class CounterpartyCommitmentSecrets extends CommonBase { * was generated in accordance with BOLT 3 and is consistent with previous secrets. */ public provide_secret(idx: bigint, secret: Uint8Array): Result_NoneNoneZ { - const ret: number = bindings.CounterpartyCommitmentSecrets_provide_secret(this.ptr, idx, bindings.encodeUint8Array(bindings.check_arr_len(secret, 32))); + const ret: bigint = bindings.CounterpartyCommitmentSecrets_provide_secret(this.ptr, idx, bindings.encodeUint8Array(bindings.check_arr_len(secret, 32))); const ret_hu_conv: Result_NoneNoneZ = Result_NoneNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -438,7 +438,7 @@ export class CounterpartyCommitmentSecrets extends CommonBase { * Read a CounterpartyCommitmentSecrets from a byte array, created by CounterpartyCommitmentSecrets_write */ public static constructor_read(ser: Uint8Array): Result_CounterpartyCommitmentSecretsDecodeErrorZ { - const ret: number = bindings.CounterpartyCommitmentSecrets_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.CounterpartyCommitmentSecrets_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_CounterpartyCommitmentSecretsDecodeErrorZ = Result_CounterpartyCommitmentSecretsDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/CounterpartyForwardingInfo.mts b/ts/structs/CounterpartyForwardingInfo.mts index 19768328..9a39da17 100644 --- a/ts/structs/CounterpartyForwardingInfo.mts +++ b/ts/structs/CounterpartyForwardingInfo.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class CounterpartyForwardingInfo extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CounterpartyForwardingInfo_free); } @@ -418,14 +418,14 @@ export class CounterpartyForwardingInfo extends CommonBase { * Constructs a new CounterpartyForwardingInfo given each field */ public static constructor_new(fee_base_msat_arg: number, fee_proportional_millionths_arg: number, cltv_expiry_delta_arg: number): CounterpartyForwardingInfo { - const ret: number = bindings.CounterpartyForwardingInfo_new(fee_base_msat_arg, fee_proportional_millionths_arg, cltv_expiry_delta_arg); + const ret: bigint = bindings.CounterpartyForwardingInfo_new(fee_base_msat_arg, fee_proportional_millionths_arg, cltv_expiry_delta_arg); const ret_hu_conv: CounterpartyForwardingInfo = new CounterpartyForwardingInfo(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.CounterpartyForwardingInfo_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CounterpartyForwardingInfo_clone_ptr(this.ptr); return ret; } @@ -433,7 +433,7 @@ export class CounterpartyForwardingInfo extends CommonBase { * Creates a copy of the CounterpartyForwardingInfo */ public clone(): CounterpartyForwardingInfo { - const ret: number = bindings.CounterpartyForwardingInfo_clone(this.ptr); + const ret: bigint = bindings.CounterpartyForwardingInfo_clone(this.ptr); const ret_hu_conv: CounterpartyForwardingInfo = new CounterpartyForwardingInfo(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -452,7 +452,7 @@ export class CounterpartyForwardingInfo extends CommonBase { * Read a CounterpartyForwardingInfo from a byte array, created by CounterpartyForwardingInfo_write */ public static constructor_read(ser: Uint8Array): Result_CounterpartyForwardingInfoDecodeErrorZ { - const ret: number = bindings.CounterpartyForwardingInfo_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.CounterpartyForwardingInfo_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_CounterpartyForwardingInfoDecodeErrorZ = Result_CounterpartyForwardingInfoDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/CustomMessageHandler.mts b/ts/structs/CustomMessageHandler.mts index 176f9949..0c98ee4b 100644 --- a/ts/structs/CustomMessageHandler.mts +++ b/ts/structs/CustomMessageHandler.mts @@ -384,7 +384,7 @@ export class CustomMessageHandler extends CommonBase { public bindings_instance?: bindings.LDKCustomMessageHandler; /* @internal */ - constructor(_dummy: object, ptr: number) { + constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CustomMessageHandler_free); this.bindings_instance = null; } @@ -393,22 +393,22 @@ export class CustomMessageHandler extends CommonBase { public static new_impl(arg: CustomMessageHandlerInterface, customMessageReader_impl: CustomMessageReaderInterface): CustomMessageHandler { const impl_holder: LDKCustomMessageHandlerHolder = new LDKCustomMessageHandlerHolder(); let structImplementation = { - handle_custom_message (msg: number, sender_node_id: number): number { + handle_custom_message (msg: bigint, sender_node_id: number): bigint { const ret_hu_conv: Type = new Type(null, msg); CommonBase.add_ref_from(ret_hu_conv, this); const sender_node_id_conv: Uint8Array = bindings.decodeUint8Array(sender_node_id); const ret: Result_NoneLightningErrorZ = arg.handle_custom_message(ret_hu_conv, sender_node_id_conv); - const result: number = ret == null ? 0 : ret.clone_ptr(); + const result: bigint = ret == null ? 0n : ret.clone_ptr(); return result; }, get_and_clear_pending_msg (): number { const ret: TwoTuple_PublicKeyTypeZ[] = arg.get_and_clear_pending_msg(); - const result: number = bindings.encodeUint32Array(ret != null ? ret.map(ret_conv_25 => ret_conv_25 == null ? 0 : ret_conv_25.clone_ptr()) : null); + const result: number = bindings.encodeUint64Array(ret != null ? ret.map(ret_conv_25 => ret_conv_25 == null ? 0n : ret_conv_25.clone_ptr()) : null); return result; }, } as bindings.LDKCustomMessageHandler; const customMessageReader = CustomMessageReader.new_impl(customMessageReader_impl, ); - const ptr: number = bindings.LDKCustomMessageHandler_new(structImplementation, customMessageReader.bindings_instance); + const ptr: bigint = bindings.LDKCustomMessageHandler_new(structImplementation, customMessageReader.bindings_instance); impl_holder.held = new CustomMessageHandler(null, ptr); impl_holder.held.bindings_instance = structImplementation; @@ -421,7 +421,7 @@ export class CustomMessageHandler extends CommonBase { * Can return a `MessageHandlingError` if the message could not be handled. */ public handle_custom_message(msg: Type, sender_node_id: Uint8Array): Result_NoneLightningErrorZ { - const ret: number = bindings.CustomMessageHandler_handle_custom_message(this.ptr, msg == null ? 0 : CommonBase.get_ptr_of(msg), bindings.encodeUint8Array(bindings.check_arr_len(sender_node_id, 33))); + const ret: bigint = bindings.CustomMessageHandler_handle_custom_message(this.ptr, msg == null ? 0n : CommonBase.get_ptr_of(msg), bindings.encodeUint8Array(bindings.check_arr_len(sender_node_id, 33))); const ret_hu_conv: Result_NoneLightningErrorZ = Result_NoneLightningErrorZ.constr_from_ptr(ret); CommonBase.add_ref_from(this, msg); return ret_hu_conv; @@ -438,7 +438,7 @@ export class CustomMessageHandler extends CommonBase { const ret_conv_25_len: number = bindings.getArrayLength(ret); const ret_conv_25_arr: TwoTuple_PublicKeyTypeZ[] = new Array(ret_conv_25_len).fill(null); for (var z = 0; z < ret_conv_25_len; z++) { - const ret_conv_25: number = bindings.getU32ArrayElem(ret, z); + const ret_conv_25: bigint = bindings.getU64ArrayElem(ret, z); const ret_conv_25_hu_conv: TwoTuple_PublicKeyTypeZ = new TwoTuple_PublicKeyTypeZ(null, ret_conv_25); CommonBase.add_ref_from(ret_conv_25_hu_conv, this); ret_conv_25_arr[z] = ret_conv_25_hu_conv; diff --git a/ts/structs/CustomMessageReader.mts b/ts/structs/CustomMessageReader.mts index f89564ed..105bf71c 100644 --- a/ts/structs/CustomMessageReader.mts +++ b/ts/structs/CustomMessageReader.mts @@ -381,7 +381,7 @@ export class CustomMessageReader extends CommonBase { public bindings_instance?: bindings.LDKCustomMessageReader; /* @internal */ - constructor(_dummy: object, ptr: number) { + constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CustomMessageReader_free); this.bindings_instance = null; } @@ -390,14 +390,14 @@ export class CustomMessageReader extends CommonBase { public static new_impl(arg: CustomMessageReaderInterface): CustomMessageReader { const impl_holder: LDKCustomMessageReaderHolder = new LDKCustomMessageReaderHolder(); let structImplementation = { - read (message_type: number, buffer: number): number { + read (message_type: number, buffer: number): bigint { const buffer_conv: Uint8Array = bindings.decodeUint8Array(buffer); const ret: Result_COption_TypeZDecodeErrorZ = arg.read(message_type, buffer_conv); - const result: number = ret == null ? 0 : ret.clone_ptr(); + const result: bigint = ret == null ? 0n : ret.clone_ptr(); return result; }, } as bindings.LDKCustomMessageReader; - const ptr: number = bindings.LDKCustomMessageReader_new(structImplementation); + const ptr: bigint = bindings.LDKCustomMessageReader_new(structImplementation); impl_holder.held = new CustomMessageReader(null, ptr); impl_holder.held.bindings_instance = structImplementation; @@ -411,7 +411,7 @@ export class CustomMessageReader extends CommonBase { * occur, must return `Err(DecodeError::X)` where `X` details the encountered error. */ public read(message_type: number, buffer: Uint8Array): Result_COption_TypeZDecodeErrorZ { - const ret: number = bindings.CustomMessageReader_read(this.ptr, message_type, bindings.encodeUint8Array(buffer)); + const ret: bigint = bindings.CustomMessageReader_read(this.ptr, message_type, bindings.encodeUint8Array(buffer)); const ret_hu_conv: Result_COption_TypeZDecodeErrorZ = Result_COption_TypeZDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/DataLossProtect.mts b/ts/structs/DataLossProtect.mts index 321113b5..f61cee27 100644 --- a/ts/structs/DataLossProtect.mts +++ b/ts/structs/DataLossProtect.mts @@ -364,7 +364,7 @@ import * as bindings from '../bindings.mjs' */ export class DataLossProtect extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.DataLossProtect_free); } @@ -406,14 +406,14 @@ export class DataLossProtect extends CommonBase { * Constructs a new DataLossProtect given each field */ public static constructor_new(your_last_per_commitment_secret_arg: Uint8Array, my_current_per_commitment_point_arg: Uint8Array): DataLossProtect { - const ret: number = bindings.DataLossProtect_new(bindings.encodeUint8Array(bindings.check_arr_len(your_last_per_commitment_secret_arg, 32)), bindings.encodeUint8Array(bindings.check_arr_len(my_current_per_commitment_point_arg, 33))); + const ret: bigint = bindings.DataLossProtect_new(bindings.encodeUint8Array(bindings.check_arr_len(your_last_per_commitment_secret_arg, 32)), bindings.encodeUint8Array(bindings.check_arr_len(my_current_per_commitment_point_arg, 33))); const ret_hu_conv: DataLossProtect = new DataLossProtect(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.DataLossProtect_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.DataLossProtect_clone_ptr(this.ptr); return ret; } @@ -421,7 +421,7 @@ export class DataLossProtect extends CommonBase { * Creates a copy of the DataLossProtect */ public clone(): DataLossProtect { - const ret: number = bindings.DataLossProtect_clone(this.ptr); + const ret: bigint = bindings.DataLossProtect_clone(this.ptr); const ret_hu_conv: DataLossProtect = new DataLossProtect(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; diff --git a/ts/structs/DecodeError.mts b/ts/structs/DecodeError.mts index f18d83d1..e92ce83d 100644 --- a/ts/structs/DecodeError.mts +++ b/ts/structs/DecodeError.mts @@ -361,12 +361,12 @@ import * as bindings from '../bindings.mjs' */ export class DecodeError extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.DecodeError_free); } - public clone_ptr(): number { - const ret: number = bindings.DecodeError_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.DecodeError_clone_ptr(this.ptr); return ret; } @@ -374,7 +374,7 @@ export class DecodeError extends CommonBase { * Creates a copy of the DecodeError */ public clone(): DecodeError { - const ret: number = bindings.DecodeError_clone(this.ptr); + const ret: bigint = bindings.DecodeError_clone(this.ptr); const ret_hu_conv: DecodeError = new DecodeError(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; diff --git a/ts/structs/DefaultRouter.mts b/ts/structs/DefaultRouter.mts index fdefc749..9d778bc2 100644 --- a/ts/structs/DefaultRouter.mts +++ b/ts/structs/DefaultRouter.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class DefaultRouter extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.DefaultRouter_free); } @@ -370,7 +370,7 @@ export class DefaultRouter extends CommonBase { * `random_seed_bytes`. */ public static constructor_new(network_graph: NetworkGraph, logger: Logger, random_seed_bytes: Uint8Array): DefaultRouter { - const ret: number = bindings.DefaultRouter_new(network_graph == null ? 0 : CommonBase.get_ptr_of(network_graph) & ~1, logger == null ? 0 : CommonBase.get_ptr_of(logger), bindings.encodeUint8Array(bindings.check_arr_len(random_seed_bytes, 32))); + const ret: bigint = bindings.DefaultRouter_new(network_graph == null ? 0n : CommonBase.get_ptr_of(network_graph), logger == null ? 0n : CommonBase.get_ptr_of(logger), bindings.encodeUint8Array(bindings.check_arr_len(random_seed_bytes, 32))); const ret_hu_conv: DefaultRouter = new DefaultRouter(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); CommonBase.add_ref_from(ret_hu_conv, network_graph); @@ -383,7 +383,7 @@ export class DefaultRouter extends CommonBase { * This copies the `inner` pointer in this_arg and thus the returned Router must be freed before this_arg is */ public as_Router(): Router { - const ret: number = bindings.DefaultRouter_as_Router(this.ptr); + const ret: bigint = bindings.DefaultRouter_as_Router(this.ptr); const ret_hu_conv: Router = new Router(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; diff --git a/ts/structs/DelayedPaymentOutputDescriptor.mts b/ts/structs/DelayedPaymentOutputDescriptor.mts index f5f1768c..e20500f6 100644 --- a/ts/structs/DelayedPaymentOutputDescriptor.mts +++ b/ts/structs/DelayedPaymentOutputDescriptor.mts @@ -362,7 +362,7 @@ import * as bindings from '../bindings.mjs' */ export class DelayedPaymentOutputDescriptor extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.DelayedPaymentOutputDescriptor_free); } @@ -370,7 +370,7 @@ export class DelayedPaymentOutputDescriptor extends CommonBase { * The outpoint which is spendable */ public get_outpoint(): OutPoint { - const ret: number = bindings.DelayedPaymentOutputDescriptor_get_outpoint(this.ptr); + const ret: bigint = bindings.DelayedPaymentOutputDescriptor_get_outpoint(this.ptr); const ret_hu_conv: OutPoint = new OutPoint(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -380,7 +380,8 @@ export class DelayedPaymentOutputDescriptor extends CommonBase { * The outpoint which is spendable */ public set_outpoint(val: OutPoint): void { - bindings.DelayedPaymentOutputDescriptor_set_outpoint(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.DelayedPaymentOutputDescriptor_set_outpoint(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** @@ -422,7 +423,7 @@ export class DelayedPaymentOutputDescriptor extends CommonBase { * Returns a copy of the field. */ public get_output(): TxOut { - const ret: number = bindings.DelayedPaymentOutputDescriptor_get_output(this.ptr); + const ret: bigint = bindings.DelayedPaymentOutputDescriptor_get_output(this.ptr); const ret_conv: TxOut = new TxOut(null, ret); return ret_conv; } @@ -491,14 +492,15 @@ export class DelayedPaymentOutputDescriptor extends CommonBase { * Constructs a new DelayedPaymentOutputDescriptor given each field */ public static constructor_new(outpoint_arg: OutPoint, per_commitment_point_arg: Uint8Array, to_self_delay_arg: number, output_arg: TxOut, revocation_pubkey_arg: Uint8Array, channel_keys_id_arg: Uint8Array, channel_value_satoshis_arg: bigint): DelayedPaymentOutputDescriptor { - const ret: number = bindings.DelayedPaymentOutputDescriptor_new(outpoint_arg == null ? 0 : CommonBase.get_ptr_of(outpoint_arg) & ~1, bindings.encodeUint8Array(bindings.check_arr_len(per_commitment_point_arg, 33)), to_self_delay_arg, CommonBase.get_ptr_of(output_arg), bindings.encodeUint8Array(bindings.check_arr_len(revocation_pubkey_arg, 33)), bindings.encodeUint8Array(bindings.check_arr_len(channel_keys_id_arg, 32)), channel_value_satoshis_arg); + const ret: bigint = bindings.DelayedPaymentOutputDescriptor_new(outpoint_arg == null ? 0n : CommonBase.get_ptr_of(outpoint_arg), bindings.encodeUint8Array(bindings.check_arr_len(per_commitment_point_arg, 33)), to_self_delay_arg, CommonBase.get_ptr_of(output_arg), bindings.encodeUint8Array(bindings.check_arr_len(revocation_pubkey_arg, 33)), bindings.encodeUint8Array(bindings.check_arr_len(channel_keys_id_arg, 32)), channel_value_satoshis_arg); const ret_hu_conv: DelayedPaymentOutputDescriptor = new DelayedPaymentOutputDescriptor(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, outpoint_arg); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.DelayedPaymentOutputDescriptor_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.DelayedPaymentOutputDescriptor_clone_ptr(this.ptr); return ret; } @@ -506,7 +508,7 @@ export class DelayedPaymentOutputDescriptor extends CommonBase { * Creates a copy of the DelayedPaymentOutputDescriptor */ public clone(): DelayedPaymentOutputDescriptor { - const ret: number = bindings.DelayedPaymentOutputDescriptor_clone(this.ptr); + const ret: bigint = bindings.DelayedPaymentOutputDescriptor_clone(this.ptr); const ret_hu_conv: DelayedPaymentOutputDescriptor = new DelayedPaymentOutputDescriptor(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -525,7 +527,7 @@ export class DelayedPaymentOutputDescriptor extends CommonBase { * Read a DelayedPaymentOutputDescriptor from a byte array, created by DelayedPaymentOutputDescriptor_write */ public static constructor_read(ser: Uint8Array): Result_DelayedPaymentOutputDescriptorDecodeErrorZ { - const ret: number = bindings.DelayedPaymentOutputDescriptor_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.DelayedPaymentOutputDescriptor_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_DelayedPaymentOutputDescriptorDecodeErrorZ = Result_DelayedPaymentOutputDescriptorDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/Description.mts b/ts/structs/Description.mts index 4e8ad72d..8d17e192 100644 --- a/ts/structs/Description.mts +++ b/ts/structs/Description.mts @@ -364,12 +364,12 @@ import * as bindings from '../bindings.mjs' */ export class Description extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.Description_free); } - public clone_ptr(): number { - const ret: number = bindings.Description_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.Description_clone_ptr(this.ptr); return ret; } @@ -377,7 +377,7 @@ export class Description extends CommonBase { * Creates a copy of the Description */ public clone(): Description { - const ret: number = bindings.Description_clone(this.ptr); + const ret: bigint = bindings.Description_clone(this.ptr); const ret_hu_conv: Description = new Description(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -397,7 +397,7 @@ export class Description extends CommonBase { * Two objects with NULL inner values will be considered "equal" here. */ public eq(b: Description): boolean { - const ret: boolean = bindings.Description_eq(this.ptr, b == null ? 0 : CommonBase.get_ptr_of(b) & ~1); + const ret: boolean = bindings.Description_eq(this.ptr, b == null ? 0n : CommonBase.get_ptr_of(b)); CommonBase.add_ref_from(this, b); return ret; } @@ -409,7 +409,7 @@ export class Description extends CommonBase { * Please note that single characters may use more than one byte due to UTF8 encoding. */ public static constructor_new(description: string): Result_DescriptionCreationErrorZ { - const ret: number = bindings.Description_new(bindings.encodeString(description)); + const ret: bigint = bindings.Description_new(bindings.encodeString(description)); const ret_hu_conv: Result_DescriptionCreationErrorZ = Result_DescriptionCreationErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/DirectedChannelInfo.mts b/ts/structs/DirectedChannelInfo.mts index 52893524..9c0ce7c1 100644 --- a/ts/structs/DirectedChannelInfo.mts +++ b/ts/structs/DirectedChannelInfo.mts @@ -362,12 +362,12 @@ import * as bindings from '../bindings.mjs' */ export class DirectedChannelInfo extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.DirectedChannelInfo_free); } - public clone_ptr(): number { - const ret: number = bindings.DirectedChannelInfo_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.DirectedChannelInfo_clone_ptr(this.ptr); return ret; } @@ -375,7 +375,7 @@ export class DirectedChannelInfo extends CommonBase { * Creates a copy of the DirectedChannelInfo */ public clone(): DirectedChannelInfo { - const ret: number = bindings.DirectedChannelInfo_clone(this.ptr); + const ret: bigint = bindings.DirectedChannelInfo_clone(this.ptr); const ret_hu_conv: DirectedChannelInfo = new DirectedChannelInfo(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -385,7 +385,7 @@ export class DirectedChannelInfo extends CommonBase { * Returns information for the channel. */ public channel(): ChannelInfo { - const ret: number = bindings.DirectedChannelInfo_channel(this.ptr); + const ret: bigint = bindings.DirectedChannelInfo_channel(this.ptr); const ret_hu_conv: ChannelInfo = new ChannelInfo(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -397,7 +397,7 @@ export class DirectedChannelInfo extends CommonBase { * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None */ public direction(): ChannelUpdateInfo { - const ret: number = bindings.DirectedChannelInfo_direction(this.ptr); + const ret: bigint = bindings.DirectedChannelInfo_direction(this.ptr); const ret_hu_conv: ChannelUpdateInfo = new ChannelUpdateInfo(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -419,7 +419,7 @@ export class DirectedChannelInfo extends CommonBase { * otherwise. */ public effective_capacity(): EffectiveCapacity { - const ret: number = bindings.DirectedChannelInfo_effective_capacity(this.ptr); + const ret: bigint = bindings.DirectedChannelInfo_effective_capacity(this.ptr); const ret_hu_conv: EffectiveCapacity = EffectiveCapacity.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; diff --git a/ts/structs/DirectedChannelTransactionParameters.mts b/ts/structs/DirectedChannelTransactionParameters.mts index 1e216df1..105e026d 100644 --- a/ts/structs/DirectedChannelTransactionParameters.mts +++ b/ts/structs/DirectedChannelTransactionParameters.mts @@ -365,7 +365,7 @@ import * as bindings from '../bindings.mjs' */ export class DirectedChannelTransactionParameters extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.DirectedChannelTransactionParameters_free); } @@ -373,7 +373,7 @@ export class DirectedChannelTransactionParameters extends CommonBase { * Get the channel pubkeys for the broadcaster */ public broadcaster_pubkeys(): ChannelPublicKeys { - const ret: number = bindings.DirectedChannelTransactionParameters_broadcaster_pubkeys(this.ptr); + const ret: bigint = bindings.DirectedChannelTransactionParameters_broadcaster_pubkeys(this.ptr); const ret_hu_conv: ChannelPublicKeys = new ChannelPublicKeys(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -383,7 +383,7 @@ export class DirectedChannelTransactionParameters extends CommonBase { * Get the channel pubkeys for the countersignatory */ public countersignatory_pubkeys(): ChannelPublicKeys { - const ret: number = bindings.DirectedChannelTransactionParameters_countersignatory_pubkeys(this.ptr); + const ret: bigint = bindings.DirectedChannelTransactionParameters_countersignatory_pubkeys(this.ptr); const ret_hu_conv: ChannelPublicKeys = new ChannelPublicKeys(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -413,7 +413,7 @@ export class DirectedChannelTransactionParameters extends CommonBase { * The funding outpoint */ public funding_outpoint(): OutPoint { - const ret: number = bindings.DirectedChannelTransactionParameters_funding_outpoint(this.ptr); + const ret: bigint = bindings.DirectedChannelTransactionParameters_funding_outpoint(this.ptr); const ret_hu_conv: OutPoint = new OutPoint(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; diff --git a/ts/structs/EffectiveCapacity.mts b/ts/structs/EffectiveCapacity.mts index b0393a61..f87dc53c 100644 --- a/ts/structs/EffectiveCapacity.mts +++ b/ts/structs/EffectiveCapacity.mts @@ -362,9 +362,9 @@ import * as bindings from '../bindings.mjs' * [`Self::as_msat`] should not be routed through the channel. */ export class EffectiveCapacity extends CommonBase { - protected constructor(_dummy: object, ptr: number) { super(ptr, bindings.EffectiveCapacity_free); } + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.EffectiveCapacity_free); } /* @internal */ - public static constr_from_ptr(ptr: number): EffectiveCapacity { + public static constr_from_ptr(ptr: bigint): EffectiveCapacity { const raw_ty: number = bindings.LDKEffectiveCapacity_ty_from_ptr(ptr); switch (raw_ty) { case 0: return new EffectiveCapacity_ExactLiquidity(ptr); @@ -377,8 +377,8 @@ export class EffectiveCapacity extends CommonBase { } } - public clone_ptr(): number { - const ret: number = bindings.EffectiveCapacity_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.EffectiveCapacity_clone_ptr(this.ptr); return ret; } @@ -386,7 +386,7 @@ export class EffectiveCapacity extends CommonBase { * Creates a copy of the EffectiveCapacity */ public clone(): EffectiveCapacity { - const ret: number = bindings.EffectiveCapacity_clone(this.ptr); + const ret: bigint = bindings.EffectiveCapacity_clone(this.ptr); const ret_hu_conv: EffectiveCapacity = EffectiveCapacity.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -396,7 +396,7 @@ export class EffectiveCapacity extends CommonBase { * Utility method to constructs a new ExactLiquidity-variant EffectiveCapacity */ public static constructor_exact_liquidity(liquidity_msat: bigint): EffectiveCapacity { - const ret: number = bindings.EffectiveCapacity_exact_liquidity(liquidity_msat); + const ret: bigint = bindings.EffectiveCapacity_exact_liquidity(liquidity_msat); const ret_hu_conv: EffectiveCapacity = EffectiveCapacity.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -406,7 +406,7 @@ export class EffectiveCapacity extends CommonBase { * Utility method to constructs a new MaximumHTLC-variant EffectiveCapacity */ public static constructor_maximum_htlc(amount_msat: bigint): EffectiveCapacity { - const ret: number = bindings.EffectiveCapacity_maximum_htlc(amount_msat); + const ret: bigint = bindings.EffectiveCapacity_maximum_htlc(amount_msat); const ret_hu_conv: EffectiveCapacity = EffectiveCapacity.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -416,7 +416,7 @@ export class EffectiveCapacity extends CommonBase { * Utility method to constructs a new Total-variant EffectiveCapacity */ public static constructor_total(capacity_msat: bigint, htlc_maximum_msat: Option_u64Z): EffectiveCapacity { - const ret: number = bindings.EffectiveCapacity_total(capacity_msat, CommonBase.get_ptr_of(htlc_maximum_msat)); + const ret: bigint = bindings.EffectiveCapacity_total(capacity_msat, CommonBase.get_ptr_of(htlc_maximum_msat)); const ret_hu_conv: EffectiveCapacity = EffectiveCapacity.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -426,7 +426,7 @@ export class EffectiveCapacity extends CommonBase { * Utility method to constructs a new Infinite-variant EffectiveCapacity */ public static constructor_infinite(): EffectiveCapacity { - const ret: number = bindings.EffectiveCapacity_infinite(); + const ret: bigint = bindings.EffectiveCapacity_infinite(); const ret_hu_conv: EffectiveCapacity = EffectiveCapacity.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -436,7 +436,7 @@ export class EffectiveCapacity extends CommonBase { * Utility method to constructs a new Unknown-variant EffectiveCapacity */ public static constructor_unknown(): EffectiveCapacity { - const ret: number = bindings.EffectiveCapacity_unknown(); + const ret: bigint = bindings.EffectiveCapacity_unknown(); const ret_hu_conv: EffectiveCapacity = EffectiveCapacity.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -459,7 +459,7 @@ export class EffectiveCapacity_ExactLiquidity extends EffectiveCapacity { */ public liquidity_msat: bigint; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); this.liquidity_msat = bindings.LDKEffectiveCapacity_ExactLiquidity_get_liquidity_msat(ptr); } @@ -471,7 +471,7 @@ export class EffectiveCapacity_MaximumHTLC extends EffectiveCapacity { */ public amount_msat: bigint; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); this.amount_msat = bindings.LDKEffectiveCapacity_MaximumHTLC_get_amount_msat(ptr); } @@ -487,10 +487,10 @@ export class EffectiveCapacity_Total extends EffectiveCapacity { */ public htlc_maximum_msat: Option_u64Z; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); this.capacity_msat = bindings.LDKEffectiveCapacity_Total_get_capacity_msat(ptr); - const htlc_maximum_msat: number = bindings.LDKEffectiveCapacity_Total_get_htlc_maximum_msat(ptr); + const htlc_maximum_msat: bigint = bindings.LDKEffectiveCapacity_Total_get_htlc_maximum_msat(ptr); const htlc_maximum_msat_hu_conv: Option_u64Z = Option_u64Z.constr_from_ptr(htlc_maximum_msat); CommonBase.add_ref_from(htlc_maximum_msat_hu_conv, this); this.htlc_maximum_msat = htlc_maximum_msat_hu_conv; @@ -499,14 +499,14 @@ export class EffectiveCapacity_Total extends EffectiveCapacity { /** A EffectiveCapacity of type Infinite */ export class EffectiveCapacity_Infinite extends EffectiveCapacity { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } /** A EffectiveCapacity of type Unknown */ export class EffectiveCapacity_Unknown extends EffectiveCapacity { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } diff --git a/ts/structs/ErrorAction.mts b/ts/structs/ErrorAction.mts index 2c3540f6..7926dc3f 100644 --- a/ts/structs/ErrorAction.mts +++ b/ts/structs/ErrorAction.mts @@ -359,9 +359,9 @@ import * as bindings from '../bindings.mjs' * Used to put an error message in a LightningError */ export class ErrorAction extends CommonBase { - protected constructor(_dummy: object, ptr: number) { super(ptr, bindings.ErrorAction_free); } + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.ErrorAction_free); } /* @internal */ - public static constr_from_ptr(ptr: number): ErrorAction { + public static constr_from_ptr(ptr: bigint): ErrorAction { const raw_ty: number = bindings.LDKErrorAction_ty_from_ptr(ptr); switch (raw_ty) { case 0: return new ErrorAction_DisconnectPeer(ptr); @@ -375,8 +375,8 @@ export class ErrorAction extends CommonBase { } } - public clone_ptr(): number { - const ret: number = bindings.ErrorAction_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.ErrorAction_clone_ptr(this.ptr); return ret; } @@ -384,7 +384,7 @@ export class ErrorAction extends CommonBase { * Creates a copy of the ErrorAction */ public clone(): ErrorAction { - const ret: number = bindings.ErrorAction_clone(this.ptr); + const ret: bigint = bindings.ErrorAction_clone(this.ptr); const ret_hu_conv: ErrorAction = ErrorAction.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -394,9 +394,10 @@ export class ErrorAction extends CommonBase { * Utility method to constructs a new DisconnectPeer-variant ErrorAction */ public static constructor_disconnect_peer(msg: ErrorMessage): ErrorAction { - const ret: number = bindings.ErrorAction_disconnect_peer(msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + const ret: bigint = bindings.ErrorAction_disconnect_peer(msg == null ? 0n : CommonBase.get_ptr_of(msg)); const ret_hu_conv: ErrorAction = ErrorAction.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, msg); return ret_hu_conv; } @@ -404,7 +405,7 @@ export class ErrorAction extends CommonBase { * Utility method to constructs a new IgnoreError-variant ErrorAction */ public static constructor_ignore_error(): ErrorAction { - const ret: number = bindings.ErrorAction_ignore_error(); + const ret: bigint = bindings.ErrorAction_ignore_error(); const ret_hu_conv: ErrorAction = ErrorAction.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -414,7 +415,7 @@ export class ErrorAction extends CommonBase { * Utility method to constructs a new IgnoreAndLog-variant ErrorAction */ public static constructor_ignore_and_log(a: Level): ErrorAction { - const ret: number = bindings.ErrorAction_ignore_and_log(a); + const ret: bigint = bindings.ErrorAction_ignore_and_log(a); const ret_hu_conv: ErrorAction = ErrorAction.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -424,7 +425,7 @@ export class ErrorAction extends CommonBase { * Utility method to constructs a new IgnoreDuplicateGossip-variant ErrorAction */ public static constructor_ignore_duplicate_gossip(): ErrorAction { - const ret: number = bindings.ErrorAction_ignore_duplicate_gossip(); + const ret: bigint = bindings.ErrorAction_ignore_duplicate_gossip(); const ret_hu_conv: ErrorAction = ErrorAction.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -434,9 +435,10 @@ export class ErrorAction extends CommonBase { * Utility method to constructs a new SendErrorMessage-variant ErrorAction */ public static constructor_send_error_message(msg: ErrorMessage): ErrorAction { - const ret: number = bindings.ErrorAction_send_error_message(msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + const ret: bigint = bindings.ErrorAction_send_error_message(msg == null ? 0n : CommonBase.get_ptr_of(msg)); const ret_hu_conv: ErrorAction = ErrorAction.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, msg); return ret_hu_conv; } @@ -444,9 +446,10 @@ export class ErrorAction extends CommonBase { * Utility method to constructs a new SendWarningMessage-variant ErrorAction */ public static constructor_send_warning_message(msg: WarningMessage, log_level: Level): ErrorAction { - const ret: number = bindings.ErrorAction_send_warning_message(msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1, log_level); + const ret: bigint = bindings.ErrorAction_send_warning_message(msg == null ? 0n : CommonBase.get_ptr_of(msg), log_level); const ret_hu_conv: ErrorAction = ErrorAction.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, msg); return ret_hu_conv; } @@ -460,9 +463,9 @@ export class ErrorAction_DisconnectPeer extends ErrorAction { */ public msg: ErrorMessage; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); - const msg: number = bindings.LDKErrorAction_DisconnectPeer_get_msg(ptr); + const msg: bigint = bindings.LDKErrorAction_DisconnectPeer_get_msg(ptr); const msg_hu_conv: ErrorMessage = new ErrorMessage(null, msg); CommonBase.add_ref_from(msg_hu_conv, this); this.msg = msg_hu_conv; @@ -471,7 +474,7 @@ export class ErrorAction_DisconnectPeer extends ErrorAction { /** A ErrorAction of type IgnoreError */ export class ErrorAction_IgnoreError extends ErrorAction { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } @@ -479,7 +482,7 @@ export class ErrorAction_IgnoreError extends ErrorAction { export class ErrorAction_IgnoreAndLog extends ErrorAction { public ignore_and_log: Level; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); this.ignore_and_log = bindings.LDKErrorAction_IgnoreAndLog_get_ignore_and_log(ptr); } @@ -487,7 +490,7 @@ export class ErrorAction_IgnoreAndLog extends ErrorAction { /** A ErrorAction of type IgnoreDuplicateGossip */ export class ErrorAction_IgnoreDuplicateGossip extends ErrorAction { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } @@ -498,9 +501,9 @@ export class ErrorAction_SendErrorMessage extends ErrorAction { */ public msg: ErrorMessage; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); - const msg: number = bindings.LDKErrorAction_SendErrorMessage_get_msg(ptr); + const msg: bigint = bindings.LDKErrorAction_SendErrorMessage_get_msg(ptr); const msg_hu_conv: ErrorMessage = new ErrorMessage(null, msg); CommonBase.add_ref_from(msg_hu_conv, this); this.msg = msg_hu_conv; @@ -519,9 +522,9 @@ export class ErrorAction_SendWarningMessage extends ErrorAction { */ public log_level: Level; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); - const msg: number = bindings.LDKErrorAction_SendWarningMessage_get_msg(ptr); + const msg: bigint = bindings.LDKErrorAction_SendWarningMessage_get_msg(ptr); const msg_hu_conv: WarningMessage = new WarningMessage(null, msg); CommonBase.add_ref_from(msg_hu_conv, this); this.msg = msg_hu_conv; diff --git a/ts/structs/ErrorMessage.mts b/ts/structs/ErrorMessage.mts index f84a1cfc..a4520b53 100644 --- a/ts/structs/ErrorMessage.mts +++ b/ts/structs/ErrorMessage.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class ErrorMessage extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.ErrorMessage_free); } @@ -413,14 +413,14 @@ export class ErrorMessage extends CommonBase { * Constructs a new ErrorMessage given each field */ public static constructor_new(channel_id_arg: Uint8Array, data_arg: string): ErrorMessage { - const ret: number = bindings.ErrorMessage_new(bindings.encodeUint8Array(bindings.check_arr_len(channel_id_arg, 32)), bindings.encodeString(data_arg)); + const ret: bigint = bindings.ErrorMessage_new(bindings.encodeUint8Array(bindings.check_arr_len(channel_id_arg, 32)), bindings.encodeString(data_arg)); const ret_hu_conv: ErrorMessage = new ErrorMessage(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.ErrorMessage_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.ErrorMessage_clone_ptr(this.ptr); return ret; } @@ -428,7 +428,7 @@ export class ErrorMessage extends CommonBase { * Creates a copy of the ErrorMessage */ public clone(): ErrorMessage { - const ret: number = bindings.ErrorMessage_clone(this.ptr); + const ret: bigint = bindings.ErrorMessage_clone(this.ptr); const ret_hu_conv: ErrorMessage = new ErrorMessage(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -447,7 +447,7 @@ export class ErrorMessage extends CommonBase { * Read a ErrorMessage from a byte array, created by ErrorMessage_write */ public static constructor_read(ser: Uint8Array): Result_ErrorMessageDecodeErrorZ { - const ret: number = bindings.ErrorMessage_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.ErrorMessage_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_ErrorMessageDecodeErrorZ = Result_ErrorMessageDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/ErroringMessageHandler.mts b/ts/structs/ErroringMessageHandler.mts index 03d2a591..30e58c2b 100644 --- a/ts/structs/ErroringMessageHandler.mts +++ b/ts/structs/ErroringMessageHandler.mts @@ -362,7 +362,7 @@ import * as bindings from '../bindings.mjs' */ export class ErroringMessageHandler extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.ErroringMessageHandler_free); } @@ -370,7 +370,7 @@ export class ErroringMessageHandler extends CommonBase { * Constructs a new ErroringMessageHandler */ public static constructor_new(): ErroringMessageHandler { - const ret: number = bindings.ErroringMessageHandler_new(); + const ret: bigint = bindings.ErroringMessageHandler_new(); const ret_hu_conv: ErroringMessageHandler = new ErroringMessageHandler(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -381,7 +381,7 @@ export class ErroringMessageHandler extends CommonBase { * This copies the `inner` pointer in this_arg and thus the returned MessageSendEventsProvider must be freed before this_arg is */ public as_MessageSendEventsProvider(): MessageSendEventsProvider { - const ret: number = bindings.ErroringMessageHandler_as_MessageSendEventsProvider(this.ptr); + const ret: bigint = bindings.ErroringMessageHandler_as_MessageSendEventsProvider(this.ptr); const ret_hu_conv: MessageSendEventsProvider = new MessageSendEventsProvider(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -392,7 +392,7 @@ export class ErroringMessageHandler extends CommonBase { * This copies the `inner` pointer in this_arg and thus the returned ChannelMessageHandler must be freed before this_arg is */ public as_ChannelMessageHandler(): ChannelMessageHandler { - const ret: number = bindings.ErroringMessageHandler_as_ChannelMessageHandler(this.ptr); + const ret: bigint = bindings.ErroringMessageHandler_as_ChannelMessageHandler(this.ptr); const ret_hu_conv: ChannelMessageHandler = new ChannelMessageHandler(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; diff --git a/ts/structs/Event.mts b/ts/structs/Event.mts index dd996b44..1d9213dd 100644 --- a/ts/structs/Event.mts +++ b/ts/structs/Event.mts @@ -363,9 +363,9 @@ import * as bindings from '../bindings.mjs' * written as it makes no sense to respond to it after reconnecting to peers). */ export class Event extends CommonBase { - protected constructor(_dummy: object, ptr: number) { super(ptr, bindings.Event_free); } + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.Event_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Event { + public static constr_from_ptr(ptr: bigint): Event { const raw_ty: number = bindings.LDKEvent_ty_from_ptr(ptr); switch (raw_ty) { case 0: return new Event_FundingGenerationReady(ptr); @@ -389,8 +389,8 @@ export class Event extends CommonBase { } } - public clone_ptr(): number { - const ret: number = bindings.Event_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.Event_clone_ptr(this.ptr); return ret; } @@ -398,7 +398,7 @@ export class Event extends CommonBase { * Creates a copy of the Event */ public clone(): Event { - const ret: number = bindings.Event_clone(this.ptr); + const ret: bigint = bindings.Event_clone(this.ptr); const ret_hu_conv: Event = Event.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -408,7 +408,7 @@ export class Event extends CommonBase { * Utility method to constructs a new FundingGenerationReady-variant Event */ public static constructor_funding_generation_ready(temporary_channel_id: Uint8Array, counterparty_node_id: Uint8Array, channel_value_satoshis: bigint, output_script: Uint8Array, user_channel_id: bigint): Event { - const ret: number = bindings.Event_funding_generation_ready(bindings.encodeUint8Array(bindings.check_arr_len(temporary_channel_id, 32)), bindings.encodeUint8Array(bindings.check_arr_len(counterparty_node_id, 33)), channel_value_satoshis, bindings.encodeUint8Array(output_script), user_channel_id); + const ret: bigint = bindings.Event_funding_generation_ready(bindings.encodeUint8Array(bindings.check_arr_len(temporary_channel_id, 32)), bindings.encodeUint8Array(bindings.check_arr_len(counterparty_node_id, 33)), channel_value_satoshis, bindings.encodeUint8Array(output_script), user_channel_id); const ret_hu_conv: Event = Event.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -418,7 +418,7 @@ export class Event extends CommonBase { * Utility method to constructs a new PaymentReceived-variant Event */ public static constructor_payment_received(payment_hash: Uint8Array, amount_msat: bigint, purpose: PaymentPurpose): Event { - const ret: number = bindings.Event_payment_received(bindings.encodeUint8Array(bindings.check_arr_len(payment_hash, 32)), amount_msat, CommonBase.get_ptr_of(purpose)); + const ret: bigint = bindings.Event_payment_received(bindings.encodeUint8Array(bindings.check_arr_len(payment_hash, 32)), amount_msat, CommonBase.get_ptr_of(purpose)); const ret_hu_conv: Event = Event.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -428,7 +428,7 @@ export class Event extends CommonBase { * Utility method to constructs a new PaymentClaimed-variant Event */ public static constructor_payment_claimed(payment_hash: Uint8Array, amount_msat: bigint, purpose: PaymentPurpose): Event { - const ret: number = bindings.Event_payment_claimed(bindings.encodeUint8Array(bindings.check_arr_len(payment_hash, 32)), amount_msat, CommonBase.get_ptr_of(purpose)); + const ret: bigint = bindings.Event_payment_claimed(bindings.encodeUint8Array(bindings.check_arr_len(payment_hash, 32)), amount_msat, CommonBase.get_ptr_of(purpose)); const ret_hu_conv: Event = Event.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -438,7 +438,7 @@ export class Event extends CommonBase { * Utility method to constructs a new PaymentSent-variant Event */ public static constructor_payment_sent(payment_id: Uint8Array, payment_preimage: Uint8Array, payment_hash: Uint8Array, fee_paid_msat: Option_u64Z): Event { - const ret: number = bindings.Event_payment_sent(bindings.encodeUint8Array(bindings.check_arr_len(payment_id, 32)), bindings.encodeUint8Array(bindings.check_arr_len(payment_preimage, 32)), bindings.encodeUint8Array(bindings.check_arr_len(payment_hash, 32)), CommonBase.get_ptr_of(fee_paid_msat)); + const ret: bigint = bindings.Event_payment_sent(bindings.encodeUint8Array(bindings.check_arr_len(payment_id, 32)), bindings.encodeUint8Array(bindings.check_arr_len(payment_preimage, 32)), bindings.encodeUint8Array(bindings.check_arr_len(payment_hash, 32)), CommonBase.get_ptr_of(fee_paid_msat)); const ret_hu_conv: Event = Event.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -448,7 +448,7 @@ export class Event extends CommonBase { * Utility method to constructs a new PaymentFailed-variant Event */ public static constructor_payment_failed(payment_id: Uint8Array, payment_hash: Uint8Array): Event { - const ret: number = bindings.Event_payment_failed(bindings.encodeUint8Array(bindings.check_arr_len(payment_id, 32)), bindings.encodeUint8Array(bindings.check_arr_len(payment_hash, 32))); + const ret: bigint = bindings.Event_payment_failed(bindings.encodeUint8Array(bindings.check_arr_len(payment_id, 32)), bindings.encodeUint8Array(bindings.check_arr_len(payment_hash, 32))); const ret_hu_conv: Event = Event.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -458,9 +458,10 @@ export class Event extends CommonBase { * Utility method to constructs a new PaymentPathSuccessful-variant Event */ public static constructor_payment_path_successful(payment_id: Uint8Array, payment_hash: Uint8Array, path: RouteHop[]): Event { - const ret: number = bindings.Event_payment_path_successful(bindings.encodeUint8Array(bindings.check_arr_len(payment_id, 32)), bindings.encodeUint8Array(bindings.check_arr_len(payment_hash, 32)), bindings.encodeUint32Array(path != null ? path.map(path_conv_10 => path_conv_10 == null ? 0 : CommonBase.get_ptr_of(path_conv_10) & ~1) : null)); + const ret: bigint = bindings.Event_payment_path_successful(bindings.encodeUint8Array(bindings.check_arr_len(payment_id, 32)), bindings.encodeUint8Array(bindings.check_arr_len(payment_hash, 32)), bindings.encodeUint64Array(path != null ? path.map(path_conv_10 => path_conv_10 == null ? 0n : CommonBase.get_ptr_of(path_conv_10)) : null)); const ret_hu_conv: Event = Event.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + path.forEach((path_conv_10: RouteHop) => { CommonBase.add_ref_from(ret_hu_conv, path_conv_10); }); return ret_hu_conv; } @@ -468,9 +469,11 @@ export class Event extends CommonBase { * Utility method to constructs a new PaymentPathFailed-variant Event */ public static constructor_payment_path_failed(payment_id: Uint8Array, payment_hash: Uint8Array, rejected_by_dest: boolean, network_update: Option_NetworkUpdateZ, all_paths_failed: boolean, path: RouteHop[], short_channel_id: Option_u64Z, retry: RouteParameters): Event { - const ret: number = bindings.Event_payment_path_failed(bindings.encodeUint8Array(bindings.check_arr_len(payment_id, 32)), bindings.encodeUint8Array(bindings.check_arr_len(payment_hash, 32)), rejected_by_dest, CommonBase.get_ptr_of(network_update), all_paths_failed, bindings.encodeUint32Array(path != null ? path.map(path_conv_10 => path_conv_10 == null ? 0 : CommonBase.get_ptr_of(path_conv_10) & ~1) : null), CommonBase.get_ptr_of(short_channel_id), retry == null ? 0 : CommonBase.get_ptr_of(retry) & ~1); + const ret: bigint = bindings.Event_payment_path_failed(bindings.encodeUint8Array(bindings.check_arr_len(payment_id, 32)), bindings.encodeUint8Array(bindings.check_arr_len(payment_hash, 32)), rejected_by_dest, CommonBase.get_ptr_of(network_update), all_paths_failed, bindings.encodeUint64Array(path != null ? path.map(path_conv_10 => path_conv_10 == null ? 0n : CommonBase.get_ptr_of(path_conv_10)) : null), CommonBase.get_ptr_of(short_channel_id), retry == null ? 0n : CommonBase.get_ptr_of(retry)); const ret_hu_conv: Event = Event.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + path.forEach((path_conv_10: RouteHop) => { CommonBase.add_ref_from(ret_hu_conv, path_conv_10); }); + CommonBase.add_ref_from(ret_hu_conv, retry); return ret_hu_conv; } @@ -478,9 +481,10 @@ export class Event extends CommonBase { * Utility method to constructs a new ProbeSuccessful-variant Event */ public static constructor_probe_successful(payment_id: Uint8Array, payment_hash: Uint8Array, path: RouteHop[]): Event { - const ret: number = bindings.Event_probe_successful(bindings.encodeUint8Array(bindings.check_arr_len(payment_id, 32)), bindings.encodeUint8Array(bindings.check_arr_len(payment_hash, 32)), bindings.encodeUint32Array(path != null ? path.map(path_conv_10 => path_conv_10 == null ? 0 : CommonBase.get_ptr_of(path_conv_10) & ~1) : null)); + const ret: bigint = bindings.Event_probe_successful(bindings.encodeUint8Array(bindings.check_arr_len(payment_id, 32)), bindings.encodeUint8Array(bindings.check_arr_len(payment_hash, 32)), bindings.encodeUint64Array(path != null ? path.map(path_conv_10 => path_conv_10 == null ? 0n : CommonBase.get_ptr_of(path_conv_10)) : null)); const ret_hu_conv: Event = Event.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + path.forEach((path_conv_10: RouteHop) => { CommonBase.add_ref_from(ret_hu_conv, path_conv_10); }); return ret_hu_conv; } @@ -488,9 +492,10 @@ export class Event extends CommonBase { * Utility method to constructs a new ProbeFailed-variant Event */ public static constructor_probe_failed(payment_id: Uint8Array, payment_hash: Uint8Array, path: RouteHop[], short_channel_id: Option_u64Z): Event { - const ret: number = bindings.Event_probe_failed(bindings.encodeUint8Array(bindings.check_arr_len(payment_id, 32)), bindings.encodeUint8Array(bindings.check_arr_len(payment_hash, 32)), bindings.encodeUint32Array(path != null ? path.map(path_conv_10 => path_conv_10 == null ? 0 : CommonBase.get_ptr_of(path_conv_10) & ~1) : null), CommonBase.get_ptr_of(short_channel_id)); + const ret: bigint = bindings.Event_probe_failed(bindings.encodeUint8Array(bindings.check_arr_len(payment_id, 32)), bindings.encodeUint8Array(bindings.check_arr_len(payment_hash, 32)), bindings.encodeUint64Array(path != null ? path.map(path_conv_10 => path_conv_10 == null ? 0n : CommonBase.get_ptr_of(path_conv_10)) : null), CommonBase.get_ptr_of(short_channel_id)); const ret_hu_conv: Event = Event.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + path.forEach((path_conv_10: RouteHop) => { CommonBase.add_ref_from(ret_hu_conv, path_conv_10); }); return ret_hu_conv; } @@ -498,7 +503,7 @@ export class Event extends CommonBase { * Utility method to constructs a new PendingHTLCsForwardable-variant Event */ public static constructor_pending_htlcs_forwardable(time_forwardable: bigint): Event { - const ret: number = bindings.Event_pending_htlcs_forwardable(time_forwardable); + const ret: bigint = bindings.Event_pending_htlcs_forwardable(time_forwardable); const ret_hu_conv: Event = Event.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -508,7 +513,7 @@ export class Event extends CommonBase { * Utility method to constructs a new SpendableOutputs-variant Event */ public static constructor_spendable_outputs(outputs: SpendableOutputDescriptor[]): Event { - const ret: number = bindings.Event_spendable_outputs(bindings.encodeUint32Array(outputs != null ? outputs.map(outputs_conv_27 => CommonBase.get_ptr_of(outputs_conv_27)) : null)); + const ret: bigint = bindings.Event_spendable_outputs(bindings.encodeUint64Array(outputs != null ? outputs.map(outputs_conv_27 => CommonBase.get_ptr_of(outputs_conv_27)) : null)); const ret_hu_conv: Event = Event.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -518,7 +523,7 @@ export class Event extends CommonBase { * Utility method to constructs a new PaymentForwarded-variant Event */ public static constructor_payment_forwarded(prev_channel_id: Uint8Array, next_channel_id: Uint8Array, fee_earned_msat: Option_u64Z, claim_from_onchain_tx: boolean): Event { - const ret: number = bindings.Event_payment_forwarded(bindings.encodeUint8Array(bindings.check_arr_len(prev_channel_id, 32)), bindings.encodeUint8Array(bindings.check_arr_len(next_channel_id, 32)), CommonBase.get_ptr_of(fee_earned_msat), claim_from_onchain_tx); + const ret: bigint = bindings.Event_payment_forwarded(bindings.encodeUint8Array(bindings.check_arr_len(prev_channel_id, 32)), bindings.encodeUint8Array(bindings.check_arr_len(next_channel_id, 32)), CommonBase.get_ptr_of(fee_earned_msat), claim_from_onchain_tx); const ret_hu_conv: Event = Event.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -528,7 +533,7 @@ export class Event extends CommonBase { * Utility method to constructs a new ChannelClosed-variant Event */ public static constructor_channel_closed(channel_id: Uint8Array, user_channel_id: bigint, reason: ClosureReason): Event { - const ret: number = bindings.Event_channel_closed(bindings.encodeUint8Array(bindings.check_arr_len(channel_id, 32)), user_channel_id, CommonBase.get_ptr_of(reason)); + const ret: bigint = bindings.Event_channel_closed(bindings.encodeUint8Array(bindings.check_arr_len(channel_id, 32)), user_channel_id, CommonBase.get_ptr_of(reason)); const ret_hu_conv: Event = Event.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -538,7 +543,7 @@ export class Event extends CommonBase { * Utility method to constructs a new DiscardFunding-variant Event */ public static constructor_discard_funding(channel_id: Uint8Array, transaction: Uint8Array): Event { - const ret: number = bindings.Event_discard_funding(bindings.encodeUint8Array(bindings.check_arr_len(channel_id, 32)), bindings.encodeUint8Array(transaction)); + const ret: bigint = bindings.Event_discard_funding(bindings.encodeUint8Array(bindings.check_arr_len(channel_id, 32)), bindings.encodeUint8Array(transaction)); const ret_hu_conv: Event = Event.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -548,9 +553,10 @@ export class Event extends CommonBase { * Utility method to constructs a new OpenChannelRequest-variant Event */ public static constructor_open_channel_request(temporary_channel_id: Uint8Array, counterparty_node_id: Uint8Array, funding_satoshis: bigint, push_msat: bigint, channel_type: ChannelTypeFeatures): Event { - const ret: number = bindings.Event_open_channel_request(bindings.encodeUint8Array(bindings.check_arr_len(temporary_channel_id, 32)), bindings.encodeUint8Array(bindings.check_arr_len(counterparty_node_id, 33)), funding_satoshis, push_msat, channel_type == null ? 0 : CommonBase.get_ptr_of(channel_type) & ~1); + const ret: bigint = bindings.Event_open_channel_request(bindings.encodeUint8Array(bindings.check_arr_len(temporary_channel_id, 32)), bindings.encodeUint8Array(bindings.check_arr_len(counterparty_node_id, 33)), funding_satoshis, push_msat, channel_type == null ? 0n : CommonBase.get_ptr_of(channel_type)); const ret_hu_conv: Event = Event.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, channel_type); return ret_hu_conv; } @@ -558,7 +564,7 @@ export class Event extends CommonBase { * Utility method to constructs a new HTLCHandlingFailed-variant Event */ public static constructor_htlchandling_failed(prev_channel_id: Uint8Array, failed_next_destination: HTLCDestination): Event { - const ret: number = bindings.Event_htlchandling_failed(bindings.encodeUint8Array(bindings.check_arr_len(prev_channel_id, 32)), CommonBase.get_ptr_of(failed_next_destination)); + const ret: bigint = bindings.Event_htlchandling_failed(bindings.encodeUint8Array(bindings.check_arr_len(prev_channel_id, 32)), CommonBase.get_ptr_of(failed_next_destination)); const ret_hu_conv: Event = Event.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -606,7 +612,7 @@ export class Event_FundingGenerationReady extends Event { */ public user_channel_id: bigint; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const temporary_channel_id: number = bindings.LDKEvent_FundingGenerationReady_get_temporary_channel_id(ptr); const temporary_channel_id_conv: Uint8Array = bindings.decodeUint8Array(temporary_channel_id); @@ -638,13 +644,13 @@ export class Event_PaymentReceived extends Event { */ public purpose: PaymentPurpose; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const payment_hash: number = bindings.LDKEvent_PaymentReceived_get_payment_hash(ptr); const payment_hash_conv: Uint8Array = bindings.decodeUint8Array(payment_hash); this.payment_hash = payment_hash_conv; this.amount_msat = bindings.LDKEvent_PaymentReceived_get_amount_msat(ptr); - const purpose: number = bindings.LDKEvent_PaymentReceived_get_purpose(ptr); + const purpose: bigint = bindings.LDKEvent_PaymentReceived_get_purpose(ptr); const purpose_hu_conv: PaymentPurpose = PaymentPurpose.constr_from_ptr(purpose); CommonBase.add_ref_from(purpose_hu_conv, this); this.purpose = purpose_hu_conv; @@ -667,13 +673,13 @@ export class Event_PaymentClaimed extends Event { */ public purpose: PaymentPurpose; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const payment_hash: number = bindings.LDKEvent_PaymentClaimed_get_payment_hash(ptr); const payment_hash_conv: Uint8Array = bindings.decodeUint8Array(payment_hash); this.payment_hash = payment_hash_conv; this.amount_msat = bindings.LDKEvent_PaymentClaimed_get_amount_msat(ptr); - const purpose: number = bindings.LDKEvent_PaymentClaimed_get_purpose(ptr); + const purpose: bigint = bindings.LDKEvent_PaymentClaimed_get_purpose(ptr); const purpose_hu_conv: PaymentPurpose = PaymentPurpose.constr_from_ptr(purpose); CommonBase.add_ref_from(purpose_hu_conv, this); this.purpose = purpose_hu_conv; @@ -716,7 +722,7 @@ export class Event_PaymentSent extends Event { */ public fee_paid_msat: Option_u64Z; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const payment_id: number = bindings.LDKEvent_PaymentSent_get_payment_id(ptr); const payment_id_conv: Uint8Array = bindings.decodeUint8Array(payment_id); @@ -727,7 +733,7 @@ export class Event_PaymentSent extends Event { const payment_hash: number = bindings.LDKEvent_PaymentSent_get_payment_hash(ptr); const payment_hash_conv: Uint8Array = bindings.decodeUint8Array(payment_hash); this.payment_hash = payment_hash_conv; - const fee_paid_msat: number = bindings.LDKEvent_PaymentSent_get_fee_paid_msat(ptr); + const fee_paid_msat: bigint = bindings.LDKEvent_PaymentSent_get_fee_paid_msat(ptr); const fee_paid_msat_hu_conv: Option_u64Z = Option_u64Z.constr_from_ptr(fee_paid_msat); CommonBase.add_ref_from(fee_paid_msat_hu_conv, this); this.fee_paid_msat = fee_paid_msat_hu_conv; @@ -751,7 +757,7 @@ export class Event_PaymentFailed extends Event { */ public payment_hash: Uint8Array; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const payment_id: number = bindings.LDKEvent_PaymentFailed_get_payment_id(ptr); const payment_id_conv: Uint8Array = bindings.decodeUint8Array(payment_id); @@ -786,7 +792,7 @@ export class Event_PaymentPathSuccessful extends Event { */ public path: RouteHop[]; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const payment_id: number = bindings.LDKEvent_PaymentPathSuccessful_get_payment_id(ptr); const payment_id_conv: Uint8Array = bindings.decodeUint8Array(payment_id); @@ -798,7 +804,7 @@ export class Event_PaymentPathSuccessful extends Event { const path_conv_10_len: number = bindings.getArrayLength(path); const path_conv_10_arr: RouteHop[] = new Array(path_conv_10_len).fill(null); for (var k = 0; k < path_conv_10_len; k++) { - const path_conv_10: number = bindings.getU32ArrayElem(path, k); + const path_conv_10: bigint = bindings.getU64ArrayElem(path, k); const path_conv_10_hu_conv: RouteHop = new RouteHop(null, path_conv_10); CommonBase.add_ref_from(path_conv_10_hu_conv, this); path_conv_10_arr[k] = path_conv_10_hu_conv; @@ -889,7 +895,7 @@ export class Event_PaymentPathFailed extends Event { */ public retry: RouteParameters; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const payment_id: number = bindings.LDKEvent_PaymentPathFailed_get_payment_id(ptr); const payment_id_conv: Uint8Array = bindings.decodeUint8Array(payment_id); @@ -898,7 +904,7 @@ export class Event_PaymentPathFailed extends Event { const payment_hash_conv: Uint8Array = bindings.decodeUint8Array(payment_hash); this.payment_hash = payment_hash_conv; this.rejected_by_dest = bindings.LDKEvent_PaymentPathFailed_get_rejected_by_dest(ptr); - const network_update: number = bindings.LDKEvent_PaymentPathFailed_get_network_update(ptr); + const network_update: bigint = bindings.LDKEvent_PaymentPathFailed_get_network_update(ptr); const network_update_hu_conv: Option_NetworkUpdateZ = Option_NetworkUpdateZ.constr_from_ptr(network_update); CommonBase.add_ref_from(network_update_hu_conv, this); this.network_update = network_update_hu_conv; @@ -907,18 +913,18 @@ export class Event_PaymentPathFailed extends Event { const path_conv_10_len: number = bindings.getArrayLength(path); const path_conv_10_arr: RouteHop[] = new Array(path_conv_10_len).fill(null); for (var k = 0; k < path_conv_10_len; k++) { - const path_conv_10: number = bindings.getU32ArrayElem(path, k); + const path_conv_10: bigint = bindings.getU64ArrayElem(path, k); const path_conv_10_hu_conv: RouteHop = new RouteHop(null, path_conv_10); CommonBase.add_ref_from(path_conv_10_hu_conv, this); path_conv_10_arr[k] = path_conv_10_hu_conv; } bindings.freeWasmMemory(path) this.path = path_conv_10_arr; - const short_channel_id: number = bindings.LDKEvent_PaymentPathFailed_get_short_channel_id(ptr); + const short_channel_id: bigint = bindings.LDKEvent_PaymentPathFailed_get_short_channel_id(ptr); const short_channel_id_hu_conv: Option_u64Z = Option_u64Z.constr_from_ptr(short_channel_id); CommonBase.add_ref_from(short_channel_id_hu_conv, this); this.short_channel_id = short_channel_id_hu_conv; - const retry: number = bindings.LDKEvent_PaymentPathFailed_get_retry(ptr); + const retry: bigint = bindings.LDKEvent_PaymentPathFailed_get_retry(ptr); const retry_hu_conv: RouteParameters = new RouteParameters(null, retry); CommonBase.add_ref_from(retry_hu_conv, this); this.retry = retry_hu_conv; @@ -943,7 +949,7 @@ export class Event_ProbeSuccessful extends Event { */ public path: RouteHop[]; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const payment_id: number = bindings.LDKEvent_ProbeSuccessful_get_payment_id(ptr); const payment_id_conv: Uint8Array = bindings.decodeUint8Array(payment_id); @@ -955,7 +961,7 @@ export class Event_ProbeSuccessful extends Event { const path_conv_10_len: number = bindings.getArrayLength(path); const path_conv_10_arr: RouteHop[] = new Array(path_conv_10_len).fill(null); for (var k = 0; k < path_conv_10_len; k++) { - const path_conv_10: number = bindings.getU32ArrayElem(path, k); + const path_conv_10: bigint = bindings.getU64ArrayElem(path, k); const path_conv_10_hu_conv: RouteHop = new RouteHop(null, path_conv_10); CommonBase.add_ref_from(path_conv_10_hu_conv, this); path_conv_10_arr[k] = path_conv_10_hu_conv; @@ -991,7 +997,7 @@ export class Event_ProbeFailed extends Event { */ public short_channel_id: Option_u64Z; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const payment_id: number = bindings.LDKEvent_ProbeFailed_get_payment_id(ptr); const payment_id_conv: Uint8Array = bindings.decodeUint8Array(payment_id); @@ -1003,14 +1009,14 @@ export class Event_ProbeFailed extends Event { const path_conv_10_len: number = bindings.getArrayLength(path); const path_conv_10_arr: RouteHop[] = new Array(path_conv_10_len).fill(null); for (var k = 0; k < path_conv_10_len; k++) { - const path_conv_10: number = bindings.getU32ArrayElem(path, k); + const path_conv_10: bigint = bindings.getU64ArrayElem(path, k); const path_conv_10_hu_conv: RouteHop = new RouteHop(null, path_conv_10); CommonBase.add_ref_from(path_conv_10_hu_conv, this); path_conv_10_arr[k] = path_conv_10_hu_conv; } bindings.freeWasmMemory(path) this.path = path_conv_10_arr; - const short_channel_id: number = bindings.LDKEvent_ProbeFailed_get_short_channel_id(ptr); + const short_channel_id: bigint = bindings.LDKEvent_ProbeFailed_get_short_channel_id(ptr); const short_channel_id_hu_conv: Option_u64Z = Option_u64Z.constr_from_ptr(short_channel_id); CommonBase.add_ref_from(short_channel_id_hu_conv, this); this.short_channel_id = short_channel_id_hu_conv; @@ -1026,7 +1032,7 @@ export class Event_PendingHTLCsForwardable extends Event { */ public time_forwardable: bigint; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); this.time_forwardable = bindings.LDKEvent_PendingHTLCsForwardable_get_time_forwardable(ptr); } @@ -1038,13 +1044,13 @@ export class Event_SpendableOutputs extends Event { */ public outputs: SpendableOutputDescriptor[]; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const outputs: number = bindings.LDKEvent_SpendableOutputs_get_outputs(ptr); const outputs_conv_27_len: number = bindings.getArrayLength(outputs); const outputs_conv_27_arr: SpendableOutputDescriptor[] = new Array(outputs_conv_27_len).fill(null); for (var b = 0; b < outputs_conv_27_len; b++) { - const outputs_conv_27: number = bindings.getU32ArrayElem(outputs, b); + const outputs_conv_27: bigint = bindings.getU64ArrayElem(outputs, b); const outputs_conv_27_hu_conv: SpendableOutputDescriptor = SpendableOutputDescriptor.constr_from_ptr(outputs_conv_27); CommonBase.add_ref_from(outputs_conv_27_hu_conv, this); outputs_conv_27_arr[b] = outputs_conv_27_hu_conv; @@ -1091,7 +1097,7 @@ export class Event_PaymentForwarded extends Event { */ public claim_from_onchain_tx: boolean; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const prev_channel_id: number = bindings.LDKEvent_PaymentForwarded_get_prev_channel_id(ptr); const prev_channel_id_conv: Uint8Array = bindings.decodeUint8Array(prev_channel_id); @@ -1099,7 +1105,7 @@ export class Event_PaymentForwarded extends Event { const next_channel_id: number = bindings.LDKEvent_PaymentForwarded_get_next_channel_id(ptr); const next_channel_id_conv: Uint8Array = bindings.decodeUint8Array(next_channel_id); this.next_channel_id = next_channel_id_conv; - const fee_earned_msat: number = bindings.LDKEvent_PaymentForwarded_get_fee_earned_msat(ptr); + const fee_earned_msat: bigint = bindings.LDKEvent_PaymentForwarded_get_fee_earned_msat(ptr); const fee_earned_msat_hu_conv: Option_u64Z = Option_u64Z.constr_from_ptr(fee_earned_msat); CommonBase.add_ref_from(fee_earned_msat_hu_conv, this); this.fee_earned_msat = fee_earned_msat_hu_conv; @@ -1130,13 +1136,13 @@ export class Event_ChannelClosed extends Event { */ public reason: ClosureReason; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const channel_id: number = bindings.LDKEvent_ChannelClosed_get_channel_id(ptr); const channel_id_conv: Uint8Array = bindings.decodeUint8Array(channel_id); this.channel_id = channel_id_conv; this.user_channel_id = bindings.LDKEvent_ChannelClosed_get_user_channel_id(ptr); - const reason: number = bindings.LDKEvent_ChannelClosed_get_reason(ptr); + const reason: bigint = bindings.LDKEvent_ChannelClosed_get_reason(ptr); const reason_hu_conv: ClosureReason = ClosureReason.constr_from_ptr(reason); CommonBase.add_ref_from(reason_hu_conv, this); this.reason = reason_hu_conv; @@ -1153,7 +1159,7 @@ export class Event_DiscardFunding extends Event { */ public transaction: Uint8Array; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const channel_id: number = bindings.LDKEvent_DiscardFunding_get_channel_id(ptr); const channel_id_conv: Uint8Array = bindings.decodeUint8Array(channel_id); @@ -1215,7 +1221,7 @@ export class Event_OpenChannelRequest extends Event { */ public channel_type: ChannelTypeFeatures; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const temporary_channel_id: number = bindings.LDKEvent_OpenChannelRequest_get_temporary_channel_id(ptr); const temporary_channel_id_conv: Uint8Array = bindings.decodeUint8Array(temporary_channel_id); @@ -1225,7 +1231,7 @@ export class Event_OpenChannelRequest extends Event { this.counterparty_node_id = counterparty_node_id_conv; this.funding_satoshis = bindings.LDKEvent_OpenChannelRequest_get_funding_satoshis(ptr); this.push_msat = bindings.LDKEvent_OpenChannelRequest_get_push_msat(ptr); - const channel_type: number = bindings.LDKEvent_OpenChannelRequest_get_channel_type(ptr); + const channel_type: bigint = bindings.LDKEvent_OpenChannelRequest_get_channel_type(ptr); const channel_type_hu_conv: ChannelTypeFeatures = new ChannelTypeFeatures(null, channel_type); CommonBase.add_ref_from(channel_type_hu_conv, this); this.channel_type = channel_type_hu_conv; @@ -1242,12 +1248,12 @@ export class Event_HTLCHandlingFailed extends Event { */ public failed_next_destination: HTLCDestination; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const prev_channel_id: number = bindings.LDKEvent_HTLCHandlingFailed_get_prev_channel_id(ptr); const prev_channel_id_conv: Uint8Array = bindings.decodeUint8Array(prev_channel_id); this.prev_channel_id = prev_channel_id_conv; - const failed_next_destination: number = bindings.LDKEvent_HTLCHandlingFailed_get_failed_next_destination(ptr); + const failed_next_destination: bigint = bindings.LDKEvent_HTLCHandlingFailed_get_failed_next_destination(ptr); const failed_next_destination_hu_conv: HTLCDestination = HTLCDestination.constr_from_ptr(failed_next_destination); CommonBase.add_ref_from(failed_next_destination_hu_conv, this); this.failed_next_destination = failed_next_destination_hu_conv; diff --git a/ts/structs/EventHandler.mts b/ts/structs/EventHandler.mts index d5cc9a80..1df66062 100644 --- a/ts/structs/EventHandler.mts +++ b/ts/structs/EventHandler.mts @@ -379,7 +379,7 @@ export class EventHandler extends CommonBase { public bindings_instance?: bindings.LDKEventHandler; /* @internal */ - constructor(_dummy: object, ptr: number) { + constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.EventHandler_free); this.bindings_instance = null; } @@ -388,12 +388,12 @@ export class EventHandler extends CommonBase { public static new_impl(arg: EventHandlerInterface): EventHandler { const impl_holder: LDKEventHandlerHolder = new LDKEventHandlerHolder(); let structImplementation = { - handle_event (event: number): void { + handle_event (event: bigint): void { const event_hu_conv: Event = Event.constr_from_ptr(event); arg.handle_event(event_hu_conv); }, } as bindings.LDKEventHandler; - const ptr: number = bindings.LDKEventHandler_new(structImplementation); + const ptr: bigint = bindings.LDKEventHandler_new(structImplementation); impl_holder.held = new EventHandler(null, ptr); impl_holder.held.bindings_instance = structImplementation; @@ -406,7 +406,7 @@ export class EventHandler extends CommonBase { * See [`EventsProvider`] for details that must be considered when implementing this method. */ public handle_event(event: Event): void { - bindings.EventHandler_handle_event(this.ptr, event == null ? 0 : CommonBase.get_ptr_of(event) & ~1); + bindings.EventHandler_handle_event(this.ptr, event == null ? 0n : CommonBase.get_ptr_of(event)); } } diff --git a/ts/structs/EventsProvider.mts b/ts/structs/EventsProvider.mts index fb3d4ad3..32ed86b8 100644 --- a/ts/structs/EventsProvider.mts +++ b/ts/structs/EventsProvider.mts @@ -404,7 +404,7 @@ export class EventsProvider extends CommonBase { public bindings_instance?: bindings.LDKEventsProvider; /* @internal */ - constructor(_dummy: object, ptr: number) { + constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.EventsProvider_free); this.bindings_instance = null; } @@ -413,13 +413,13 @@ export class EventsProvider extends CommonBase { public static new_impl(arg: EventsProviderInterface): EventsProvider { const impl_holder: LDKEventsProviderHolder = new LDKEventsProviderHolder(); let structImplementation = { - process_pending_events (handler: number): void { + process_pending_events (handler: bigint): void { const ret_hu_conv: EventHandler = new EventHandler(null, handler); CommonBase.add_ref_from(ret_hu_conv, this); arg.process_pending_events(ret_hu_conv); }, } as bindings.LDKEventsProvider; - const ptr: number = bindings.LDKEventsProvider_new(structImplementation); + const ptr: bigint = bindings.LDKEventsProvider_new(structImplementation); impl_holder.held = new EventsProvider(null, ptr); impl_holder.held.bindings_instance = structImplementation; @@ -434,7 +434,7 @@ export class EventsProvider extends CommonBase { * an old state (i.e., it hadn't been successfully persisted after processing pending events). */ public process_pending_events(handler: EventHandler): void { - bindings.EventsProvider_process_pending_events(this.ptr, handler == null ? 0 : CommonBase.get_ptr_of(handler)); + bindings.EventsProvider_process_pending_events(this.ptr, handler == null ? 0n : CommonBase.get_ptr_of(handler)); CommonBase.add_ref_from(this, handler); } diff --git a/ts/structs/ExpandedKey.mts b/ts/structs/ExpandedKey.mts index 7213b90d..3393018e 100644 --- a/ts/structs/ExpandedKey.mts +++ b/ts/structs/ExpandedKey.mts @@ -364,7 +364,7 @@ import * as bindings from '../bindings.mjs' */ export class ExpandedKey extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.ExpandedKey_free); } @@ -374,7 +374,7 @@ export class ExpandedKey extends CommonBase { * It is recommended to cache this value and not regenerate it for each new inbound payment. */ public static constructor_new(key_material: Uint8Array): ExpandedKey { - const ret: number = bindings.ExpandedKey_new(bindings.encodeUint8Array(bindings.check_arr_len(key_material, 32))); + const ret: bigint = bindings.ExpandedKey_new(bindings.encodeUint8Array(bindings.check_arr_len(key_material, 32))); const ret_hu_conv: ExpandedKey = new ExpandedKey(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; diff --git a/ts/structs/ExpiryTime.mts b/ts/structs/ExpiryTime.mts index 061279a8..8b4889d7 100644 --- a/ts/structs/ExpiryTime.mts +++ b/ts/structs/ExpiryTime.mts @@ -362,12 +362,12 @@ import * as bindings from '../bindings.mjs' */ export class ExpiryTime extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.ExpiryTime_free); } - public clone_ptr(): number { - const ret: number = bindings.ExpiryTime_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.ExpiryTime_clone_ptr(this.ptr); return ret; } @@ -375,7 +375,7 @@ export class ExpiryTime extends CommonBase { * Creates a copy of the ExpiryTime */ public clone(): ExpiryTime { - const ret: number = bindings.ExpiryTime_clone(this.ptr); + const ret: bigint = bindings.ExpiryTime_clone(this.ptr); const ret_hu_conv: ExpiryTime = new ExpiryTime(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -395,7 +395,7 @@ export class ExpiryTime extends CommonBase { * Two objects with NULL inner values will be considered "equal" here. */ public eq(b: ExpiryTime): boolean { - const ret: boolean = bindings.ExpiryTime_eq(this.ptr, b == null ? 0 : CommonBase.get_ptr_of(b) & ~1); + const ret: boolean = bindings.ExpiryTime_eq(this.ptr, b == null ? 0n : CommonBase.get_ptr_of(b)); CommonBase.add_ref_from(this, b); return ret; } @@ -404,7 +404,7 @@ export class ExpiryTime extends CommonBase { * Construct an `ExpiryTime` from seconds. */ public static constructor_from_seconds(seconds: bigint): ExpiryTime { - const ret: number = bindings.ExpiryTime_from_seconds(seconds); + const ret: bigint = bindings.ExpiryTime_from_seconds(seconds); const ret_hu_conv: ExpiryTime = new ExpiryTime(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -414,7 +414,7 @@ export class ExpiryTime extends CommonBase { * Construct an `ExpiryTime` from a `Duration`. */ public static constructor_from_duration(duration: bigint): ExpiryTime { - const ret: number = bindings.ExpiryTime_from_duration(duration); + const ret: bigint = bindings.ExpiryTime_from_duration(duration); const ret_hu_conv: ExpiryTime = new ExpiryTime(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; diff --git a/ts/structs/Fallback.mts b/ts/structs/Fallback.mts index f740139a..24d14086 100644 --- a/ts/structs/Fallback.mts +++ b/ts/structs/Fallback.mts @@ -359,9 +359,9 @@ import * as bindings from '../bindings.mjs' * Fallback address in case no LN payment is possible */ export class Fallback extends CommonBase { - protected constructor(_dummy: object, ptr: number) { super(ptr, bindings.Fallback_free); } + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.Fallback_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Fallback { + public static constr_from_ptr(ptr: bigint): Fallback { const raw_ty: number = bindings.LDKFallback_ty_from_ptr(ptr); switch (raw_ty) { case 0: return new Fallback_SegWitProgram(ptr); @@ -372,8 +372,8 @@ export class Fallback extends CommonBase { } } - public clone_ptr(): number { - const ret: number = bindings.Fallback_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.Fallback_clone_ptr(this.ptr); return ret; } @@ -381,7 +381,7 @@ export class Fallback extends CommonBase { * Creates a copy of the Fallback */ public clone(): Fallback { - const ret: number = bindings.Fallback_clone(this.ptr); + const ret: bigint = bindings.Fallback_clone(this.ptr); const ret_hu_conv: Fallback = Fallback.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -391,7 +391,7 @@ export class Fallback extends CommonBase { * Utility method to constructs a new SegWitProgram-variant Fallback */ public static constructor_seg_wit_program(version: UInt5, program: Uint8Array): Fallback { - const ret: number = bindings.Fallback_seg_wit_program(version.getVal(), bindings.encodeUint8Array(program)); + const ret: bigint = bindings.Fallback_seg_wit_program(version.getVal(), bindings.encodeUint8Array(program)); const ret_hu_conv: Fallback = Fallback.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -401,7 +401,7 @@ export class Fallback extends CommonBase { * Utility method to constructs a new PubKeyHash-variant Fallback */ public static constructor_pub_key_hash(a: Uint8Array): Fallback { - const ret: number = bindings.Fallback_pub_key_hash(bindings.encodeUint8Array(bindings.check_arr_len(a, 20))); + const ret: bigint = bindings.Fallback_pub_key_hash(bindings.encodeUint8Array(bindings.check_arr_len(a, 20))); const ret_hu_conv: Fallback = Fallback.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -411,7 +411,7 @@ export class Fallback extends CommonBase { * Utility method to constructs a new ScriptHash-variant Fallback */ public static constructor_script_hash(a: Uint8Array): Fallback { - const ret: number = bindings.Fallback_script_hash(bindings.encodeUint8Array(bindings.check_arr_len(a, 20))); + const ret: bigint = bindings.Fallback_script_hash(bindings.encodeUint8Array(bindings.check_arr_len(a, 20))); const ret_hu_conv: Fallback = Fallback.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -430,7 +430,7 @@ export class Fallback extends CommonBase { * This ignores pointers and is_owned flags and looks at the values in fields. */ public eq(b: Fallback): boolean { - const ret: boolean = bindings.Fallback_eq(this.ptr, b == null ? 0 : CommonBase.get_ptr_of(b) & ~1); + const ret: boolean = bindings.Fallback_eq(this.ptr, b == null ? 0n : CommonBase.get_ptr_of(b)); return ret; } @@ -440,7 +440,7 @@ export class Fallback_SegWitProgram extends Fallback { public version: UInt5; public program: Uint8Array; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const version: number = bindings.LDKFallback_SegWitProgram_get_version(ptr); const version_conv: UInt5 = new UInt5(version); @@ -454,7 +454,7 @@ export class Fallback_SegWitProgram extends Fallback { export class Fallback_PubKeyHash extends Fallback { public pub_key_hash: Uint8Array; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const pub_key_hash: number = bindings.LDKFallback_PubKeyHash_get_pub_key_hash(ptr); const pub_key_hash_conv: Uint8Array = bindings.decodeUint8Array(pub_key_hash); @@ -465,7 +465,7 @@ export class Fallback_PubKeyHash extends Fallback { export class Fallback_ScriptHash extends Fallback { public script_hash: Uint8Array; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const script_hash: number = bindings.LDKFallback_ScriptHash_get_script_hash(ptr); const script_hash_conv: Uint8Array = bindings.decodeUint8Array(script_hash); diff --git a/ts/structs/FeeEstimator.mts b/ts/structs/FeeEstimator.mts index 1c78f330..f201fb1e 100644 --- a/ts/structs/FeeEstimator.mts +++ b/ts/structs/FeeEstimator.mts @@ -388,7 +388,7 @@ export class FeeEstimator extends CommonBase { public bindings_instance?: bindings.LDKFeeEstimator; /* @internal */ - constructor(_dummy: object, ptr: number) { + constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.FeeEstimator_free); this.bindings_instance = null; } @@ -402,7 +402,7 @@ export class FeeEstimator extends CommonBase { return ret; }, } as bindings.LDKFeeEstimator; - const ptr: number = bindings.LDKFeeEstimator_new(structImplementation); + const ptr: bigint = bindings.LDKFeeEstimator_new(structImplementation); impl_holder.held = new FeeEstimator(null, ptr); impl_holder.held.bindings_instance = structImplementation; diff --git a/ts/structs/Filter.mts b/ts/structs/Filter.mts index bfc93622..c8368a5b 100644 --- a/ts/structs/Filter.mts +++ b/ts/structs/Filter.mts @@ -408,7 +408,7 @@ export class Filter extends CommonBase { public bindings_instance?: bindings.LDKFilter; /* @internal */ - constructor(_dummy: object, ptr: number) { + constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.Filter_free); this.bindings_instance = null; } @@ -422,15 +422,15 @@ export class Filter extends CommonBase { const script_pubkey_conv: Uint8Array = bindings.decodeUint8Array(script_pubkey); arg.register_tx(txid_conv, script_pubkey_conv); }, - register_output (output: number): number { + register_output (output: bigint): bigint { const output_hu_conv: WatchedOutput = new WatchedOutput(null, output); CommonBase.add_ref_from(output_hu_conv, this); const ret: Option_C2Tuple_usizeTransactionZZ = arg.register_output(output_hu_conv); - const result: number = ret == null ? 0 : ret.clone_ptr(); + const result: bigint = ret == null ? 0n : ret.clone_ptr(); return result; }, } as bindings.LDKFilter; - const ptr: number = bindings.LDKFilter_new(structImplementation); + const ptr: bigint = bindings.LDKFilter_new(structImplementation); impl_holder.held = new Filter(null, ptr); impl_holder.held.bindings_instance = structImplementation; @@ -457,9 +457,10 @@ export class Filter extends CommonBase { * full block). */ public register_output(output: WatchedOutput): Option_C2Tuple_usizeTransactionZZ { - const ret: number = bindings.Filter_register_output(this.ptr, output == null ? 0 : CommonBase.get_ptr_of(output) & ~1); + const ret: bigint = bindings.Filter_register_output(this.ptr, output == null ? 0n : CommonBase.get_ptr_of(output)); const ret_hu_conv: Option_C2Tuple_usizeTransactionZZ = Option_C2Tuple_usizeTransactionZZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); + CommonBase.add_ref_from(this, output); return ret_hu_conv; } diff --git a/ts/structs/FixedPenaltyScorer.mts b/ts/structs/FixedPenaltyScorer.mts index 89f82032..957d833e 100644 --- a/ts/structs/FixedPenaltyScorer.mts +++ b/ts/structs/FixedPenaltyScorer.mts @@ -361,12 +361,12 @@ import * as bindings from '../bindings.mjs' */ export class FixedPenaltyScorer extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.FixedPenaltyScorer_free); } - public clone_ptr(): number { - const ret: number = bindings.FixedPenaltyScorer_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.FixedPenaltyScorer_clone_ptr(this.ptr); return ret; } @@ -374,7 +374,7 @@ export class FixedPenaltyScorer extends CommonBase { * Creates a copy of the FixedPenaltyScorer */ public clone(): FixedPenaltyScorer { - const ret: number = bindings.FixedPenaltyScorer_clone(this.ptr); + const ret: bigint = bindings.FixedPenaltyScorer_clone(this.ptr); const ret_hu_conv: FixedPenaltyScorer = new FixedPenaltyScorer(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -384,7 +384,7 @@ export class FixedPenaltyScorer extends CommonBase { * Creates a new scorer using `penalty_msat`. */ public static constructor_with_penalty(penalty_msat: bigint): FixedPenaltyScorer { - const ret: number = bindings.FixedPenaltyScorer_with_penalty(penalty_msat); + const ret: bigint = bindings.FixedPenaltyScorer_with_penalty(penalty_msat); const ret_hu_conv: FixedPenaltyScorer = new FixedPenaltyScorer(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -395,7 +395,7 @@ export class FixedPenaltyScorer extends CommonBase { * This copies the `inner` pointer in this_arg and thus the returned Score must be freed before this_arg is */ public as_Score(): Score { - const ret: number = bindings.FixedPenaltyScorer_as_Score(this.ptr); + const ret: bigint = bindings.FixedPenaltyScorer_as_Score(this.ptr); const ret_hu_conv: Score = new Score(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -414,7 +414,7 @@ export class FixedPenaltyScorer extends CommonBase { * Read a FixedPenaltyScorer from a byte array, created by FixedPenaltyScorer_write */ public static constructor_read(ser: Uint8Array, arg: bigint): Result_FixedPenaltyScorerDecodeErrorZ { - const ret: number = bindings.FixedPenaltyScorer_read(bindings.encodeUint8Array(ser), arg); + const ret: bigint = bindings.FixedPenaltyScorer_read(bindings.encodeUint8Array(ser), arg); const ret_hu_conv: Result_FixedPenaltyScorerDecodeErrorZ = Result_FixedPenaltyScorerDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/FundingCreated.mts b/ts/structs/FundingCreated.mts index aec7f403..17e18ee4 100644 --- a/ts/structs/FundingCreated.mts +++ b/ts/structs/FundingCreated.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class FundingCreated extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.FundingCreated_free); } @@ -432,14 +432,14 @@ export class FundingCreated extends CommonBase { * Constructs a new FundingCreated given each field */ public static constructor_new(temporary_channel_id_arg: Uint8Array, funding_txid_arg: Uint8Array, funding_output_index_arg: number, signature_arg: Uint8Array): FundingCreated { - const ret: number = bindings.FundingCreated_new(bindings.encodeUint8Array(bindings.check_arr_len(temporary_channel_id_arg, 32)), bindings.encodeUint8Array(bindings.check_arr_len(funding_txid_arg, 32)), funding_output_index_arg, bindings.encodeUint8Array(bindings.check_arr_len(signature_arg, 64))); + const ret: bigint = bindings.FundingCreated_new(bindings.encodeUint8Array(bindings.check_arr_len(temporary_channel_id_arg, 32)), bindings.encodeUint8Array(bindings.check_arr_len(funding_txid_arg, 32)), funding_output_index_arg, bindings.encodeUint8Array(bindings.check_arr_len(signature_arg, 64))); const ret_hu_conv: FundingCreated = new FundingCreated(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.FundingCreated_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.FundingCreated_clone_ptr(this.ptr); return ret; } @@ -447,7 +447,7 @@ export class FundingCreated extends CommonBase { * Creates a copy of the FundingCreated */ public clone(): FundingCreated { - const ret: number = bindings.FundingCreated_clone(this.ptr); + const ret: bigint = bindings.FundingCreated_clone(this.ptr); const ret_hu_conv: FundingCreated = new FundingCreated(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -466,7 +466,7 @@ export class FundingCreated extends CommonBase { * Read a FundingCreated from a byte array, created by FundingCreated_write */ public static constructor_read(ser: Uint8Array): Result_FundingCreatedDecodeErrorZ { - const ret: number = bindings.FundingCreated_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.FundingCreated_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_FundingCreatedDecodeErrorZ = Result_FundingCreatedDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/FundingSigned.mts b/ts/structs/FundingSigned.mts index 5dc8d7d5..0cb862f2 100644 --- a/ts/structs/FundingSigned.mts +++ b/ts/structs/FundingSigned.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class FundingSigned extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.FundingSigned_free); } @@ -401,14 +401,14 @@ export class FundingSigned extends CommonBase { * Constructs a new FundingSigned given each field */ public static constructor_new(channel_id_arg: Uint8Array, signature_arg: Uint8Array): FundingSigned { - const ret: number = bindings.FundingSigned_new(bindings.encodeUint8Array(bindings.check_arr_len(channel_id_arg, 32)), bindings.encodeUint8Array(bindings.check_arr_len(signature_arg, 64))); + const ret: bigint = bindings.FundingSigned_new(bindings.encodeUint8Array(bindings.check_arr_len(channel_id_arg, 32)), bindings.encodeUint8Array(bindings.check_arr_len(signature_arg, 64))); const ret_hu_conv: FundingSigned = new FundingSigned(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.FundingSigned_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.FundingSigned_clone_ptr(this.ptr); return ret; } @@ -416,7 +416,7 @@ export class FundingSigned extends CommonBase { * Creates a copy of the FundingSigned */ public clone(): FundingSigned { - const ret: number = bindings.FundingSigned_clone(this.ptr); + const ret: bigint = bindings.FundingSigned_clone(this.ptr); const ret_hu_conv: FundingSigned = new FundingSigned(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -435,7 +435,7 @@ export class FundingSigned extends CommonBase { * Read a FundingSigned from a byte array, created by FundingSigned_write */ public static constructor_read(ser: Uint8Array): Result_FundingSignedDecodeErrorZ { - const ret: number = bindings.FundingSigned_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.FundingSigned_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_FundingSignedDecodeErrorZ = Result_FundingSignedDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/GossipTimestampFilter.mts b/ts/structs/GossipTimestampFilter.mts index ecd24a57..a8d6a4ef 100644 --- a/ts/structs/GossipTimestampFilter.mts +++ b/ts/structs/GossipTimestampFilter.mts @@ -363,7 +363,7 @@ import * as bindings from '../bindings.mjs' */ export class GossipTimestampFilter extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.GossipTimestampFilter_free); } @@ -417,14 +417,14 @@ export class GossipTimestampFilter extends CommonBase { * Constructs a new GossipTimestampFilter given each field */ public static constructor_new(chain_hash_arg: Uint8Array, first_timestamp_arg: number, timestamp_range_arg: number): GossipTimestampFilter { - const ret: number = bindings.GossipTimestampFilter_new(bindings.encodeUint8Array(bindings.check_arr_len(chain_hash_arg, 32)), first_timestamp_arg, timestamp_range_arg); + const ret: bigint = bindings.GossipTimestampFilter_new(bindings.encodeUint8Array(bindings.check_arr_len(chain_hash_arg, 32)), first_timestamp_arg, timestamp_range_arg); const ret_hu_conv: GossipTimestampFilter = new GossipTimestampFilter(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.GossipTimestampFilter_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.GossipTimestampFilter_clone_ptr(this.ptr); return ret; } @@ -432,7 +432,7 @@ export class GossipTimestampFilter extends CommonBase { * Creates a copy of the GossipTimestampFilter */ public clone(): GossipTimestampFilter { - const ret: number = bindings.GossipTimestampFilter_clone(this.ptr); + const ret: bigint = bindings.GossipTimestampFilter_clone(this.ptr); const ret_hu_conv: GossipTimestampFilter = new GossipTimestampFilter(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -451,7 +451,7 @@ export class GossipTimestampFilter extends CommonBase { * Read a GossipTimestampFilter from a byte array, created by GossipTimestampFilter_write */ public static constructor_read(ser: Uint8Array): Result_GossipTimestampFilterDecodeErrorZ { - const ret: number = bindings.GossipTimestampFilter_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.GossipTimestampFilter_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_GossipTimestampFilterDecodeErrorZ = Result_GossipTimestampFilterDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/HTLCDestination.mts b/ts/structs/HTLCDestination.mts index b5b64030..342387c7 100644 --- a/ts/structs/HTLCDestination.mts +++ b/ts/structs/HTLCDestination.mts @@ -359,9 +359,9 @@ import * as bindings from '../bindings.mjs' * Intended destination of a failed HTLC as indicated in [`Event::HTLCHandlingFailed`]. */ export class HTLCDestination extends CommonBase { - protected constructor(_dummy: object, ptr: number) { super(ptr, bindings.HTLCDestination_free); } + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.HTLCDestination_free); } /* @internal */ - public static constr_from_ptr(ptr: number): HTLCDestination { + public static constr_from_ptr(ptr: bigint): HTLCDestination { const raw_ty: number = bindings.LDKHTLCDestination_ty_from_ptr(ptr); switch (raw_ty) { case 0: return new HTLCDestination_NextHopChannel(ptr); @@ -372,8 +372,8 @@ export class HTLCDestination extends CommonBase { } } - public clone_ptr(): number { - const ret: number = bindings.HTLCDestination_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.HTLCDestination_clone_ptr(this.ptr); return ret; } @@ -381,7 +381,7 @@ export class HTLCDestination extends CommonBase { * Creates a copy of the HTLCDestination */ public clone(): HTLCDestination { - const ret: number = bindings.HTLCDestination_clone(this.ptr); + const ret: bigint = bindings.HTLCDestination_clone(this.ptr); const ret_hu_conv: HTLCDestination = HTLCDestination.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -391,7 +391,7 @@ export class HTLCDestination extends CommonBase { * Utility method to constructs a new NextHopChannel-variant HTLCDestination */ public static constructor_next_hop_channel(node_id: Uint8Array, channel_id: Uint8Array): HTLCDestination { - const ret: number = bindings.HTLCDestination_next_hop_channel(bindings.encodeUint8Array(bindings.check_arr_len(node_id, 33)), bindings.encodeUint8Array(bindings.check_arr_len(channel_id, 32))); + const ret: bigint = bindings.HTLCDestination_next_hop_channel(bindings.encodeUint8Array(bindings.check_arr_len(node_id, 33)), bindings.encodeUint8Array(bindings.check_arr_len(channel_id, 32))); const ret_hu_conv: HTLCDestination = HTLCDestination.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -401,7 +401,7 @@ export class HTLCDestination extends CommonBase { * Utility method to constructs a new UnknownNextHop-variant HTLCDestination */ public static constructor_unknown_next_hop(requested_forward_scid: bigint): HTLCDestination { - const ret: number = bindings.HTLCDestination_unknown_next_hop(requested_forward_scid); + const ret: bigint = bindings.HTLCDestination_unknown_next_hop(requested_forward_scid); const ret_hu_conv: HTLCDestination = HTLCDestination.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -411,7 +411,7 @@ export class HTLCDestination extends CommonBase { * Utility method to constructs a new FailedPayment-variant HTLCDestination */ public static constructor_failed_payment(payment_hash: Uint8Array): HTLCDestination { - const ret: number = bindings.HTLCDestination_failed_payment(bindings.encodeUint8Array(bindings.check_arr_len(payment_hash, 32))); + const ret: bigint = bindings.HTLCDestination_failed_payment(bindings.encodeUint8Array(bindings.check_arr_len(payment_hash, 32))); const ret_hu_conv: HTLCDestination = HTLCDestination.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -442,7 +442,7 @@ export class HTLCDestination_NextHopChannel extends HTLCDestination { */ public channel_id: Uint8Array; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const node_id: number = bindings.LDKHTLCDestination_NextHopChannel_get_node_id(ptr); const node_id_conv: Uint8Array = bindings.decodeUint8Array(node_id); @@ -459,7 +459,7 @@ export class HTLCDestination_UnknownNextHop extends HTLCDestination { */ public requested_forward_scid: bigint; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); this.requested_forward_scid = bindings.LDKHTLCDestination_UnknownNextHop_get_requested_forward_scid(ptr); } @@ -471,7 +471,7 @@ export class HTLCDestination_FailedPayment extends HTLCDestination { */ public payment_hash: Uint8Array; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const payment_hash: number = bindings.LDKHTLCDestination_FailedPayment_get_payment_hash(ptr); const payment_hash_conv: Uint8Array = bindings.decodeUint8Array(payment_hash); diff --git a/ts/structs/HTLCOutputInCommitment.mts b/ts/structs/HTLCOutputInCommitment.mts index dbfe2130..e1ac3132 100644 --- a/ts/structs/HTLCOutputInCommitment.mts +++ b/ts/structs/HTLCOutputInCommitment.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class HTLCOutputInCommitment extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.HTLCOutputInCommitment_free); } @@ -440,7 +440,7 @@ export class HTLCOutputInCommitment extends CommonBase { * value is spent to additional transaction fees). */ public get_transaction_output_index(): Option_u32Z { - const ret: number = bindings.HTLCOutputInCommitment_get_transaction_output_index(this.ptr); + const ret: bigint = bindings.HTLCOutputInCommitment_get_transaction_output_index(this.ptr); const ret_hu_conv: Option_u32Z = Option_u32Z.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -459,14 +459,14 @@ export class HTLCOutputInCommitment extends CommonBase { * Constructs a new HTLCOutputInCommitment given each field */ public static constructor_new(offered_arg: boolean, amount_msat_arg: bigint, cltv_expiry_arg: number, payment_hash_arg: Uint8Array, transaction_output_index_arg: Option_u32Z): HTLCOutputInCommitment { - const ret: number = bindings.HTLCOutputInCommitment_new(offered_arg, amount_msat_arg, cltv_expiry_arg, bindings.encodeUint8Array(bindings.check_arr_len(payment_hash_arg, 32)), CommonBase.get_ptr_of(transaction_output_index_arg)); + const ret: bigint = bindings.HTLCOutputInCommitment_new(offered_arg, amount_msat_arg, cltv_expiry_arg, bindings.encodeUint8Array(bindings.check_arr_len(payment_hash_arg, 32)), CommonBase.get_ptr_of(transaction_output_index_arg)); const ret_hu_conv: HTLCOutputInCommitment = new HTLCOutputInCommitment(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.HTLCOutputInCommitment_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.HTLCOutputInCommitment_clone_ptr(this.ptr); return ret; } @@ -474,7 +474,7 @@ export class HTLCOutputInCommitment extends CommonBase { * Creates a copy of the HTLCOutputInCommitment */ public clone(): HTLCOutputInCommitment { - const ret: number = bindings.HTLCOutputInCommitment_clone(this.ptr); + const ret: bigint = bindings.HTLCOutputInCommitment_clone(this.ptr); const ret_hu_conv: HTLCOutputInCommitment = new HTLCOutputInCommitment(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -493,7 +493,7 @@ export class HTLCOutputInCommitment extends CommonBase { * Read a HTLCOutputInCommitment from a byte array, created by HTLCOutputInCommitment_write */ public static constructor_read(ser: Uint8Array): Result_HTLCOutputInCommitmentDecodeErrorZ { - const ret: number = bindings.HTLCOutputInCommitment_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.HTLCOutputInCommitment_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_HTLCOutputInCommitmentDecodeErrorZ = Result_HTLCOutputInCommitmentDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/HTLCUpdate.mts b/ts/structs/HTLCUpdate.mts index f02ffb07..0f2ed22a 100644 --- a/ts/structs/HTLCUpdate.mts +++ b/ts/structs/HTLCUpdate.mts @@ -363,12 +363,12 @@ import * as bindings from '../bindings.mjs' */ export class HTLCUpdate extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.HTLCUpdate_free); } - public clone_ptr(): number { - const ret: number = bindings.HTLCUpdate_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.HTLCUpdate_clone_ptr(this.ptr); return ret; } @@ -376,7 +376,7 @@ export class HTLCUpdate extends CommonBase { * Creates a copy of the HTLCUpdate */ public clone(): HTLCUpdate { - const ret: number = bindings.HTLCUpdate_clone(this.ptr); + const ret: bigint = bindings.HTLCUpdate_clone(this.ptr); const ret_hu_conv: HTLCUpdate = new HTLCUpdate(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -395,7 +395,7 @@ export class HTLCUpdate extends CommonBase { * Read a HTLCUpdate from a byte array, created by HTLCUpdate_write */ public static constructor_read(ser: Uint8Array): Result_HTLCUpdateDecodeErrorZ { - const ret: number = bindings.HTLCUpdate_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.HTLCUpdate_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_HTLCUpdateDecodeErrorZ = Result_HTLCUpdateDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/HolderCommitmentTransaction.mts b/ts/structs/HolderCommitmentTransaction.mts index c34ffcd7..306b135a 100644 --- a/ts/structs/HolderCommitmentTransaction.mts +++ b/ts/structs/HolderCommitmentTransaction.mts @@ -363,7 +363,7 @@ import * as bindings from '../bindings.mjs' */ export class HolderCommitmentTransaction extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.HolderCommitmentTransaction_free); } @@ -408,8 +408,8 @@ export class HolderCommitmentTransaction extends CommonBase { bindings.HolderCommitmentTransaction_set_counterparty_htlc_sigs(this.ptr, bindings.encodeUint32Array(val != null ? val.map(val_conv_12 => bindings.encodeUint8Array(bindings.check_arr_len(val_conv_12, 64))) : null)); } - public clone_ptr(): number { - const ret: number = bindings.HolderCommitmentTransaction_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.HolderCommitmentTransaction_clone_ptr(this.ptr); return ret; } @@ -417,7 +417,7 @@ export class HolderCommitmentTransaction extends CommonBase { * Creates a copy of the HolderCommitmentTransaction */ public clone(): HolderCommitmentTransaction { - const ret: number = bindings.HolderCommitmentTransaction_clone(this.ptr); + const ret: bigint = bindings.HolderCommitmentTransaction_clone(this.ptr); const ret_hu_conv: HolderCommitmentTransaction = new HolderCommitmentTransaction(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -436,7 +436,7 @@ export class HolderCommitmentTransaction extends CommonBase { * Read a HolderCommitmentTransaction from a byte array, created by HolderCommitmentTransaction_write */ public static constructor_read(ser: Uint8Array): Result_HolderCommitmentTransactionDecodeErrorZ { - const ret: number = bindings.HolderCommitmentTransaction_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.HolderCommitmentTransaction_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_HolderCommitmentTransactionDecodeErrorZ = Result_HolderCommitmentTransactionDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -446,9 +446,10 @@ export class HolderCommitmentTransaction extends CommonBase { * The funding keys are used to figure out which signature should go first when building the transaction for broadcast. */ public static constructor_new(commitment_tx: CommitmentTransaction, counterparty_sig: Uint8Array, counterparty_htlc_sigs: Uint8Array[], holder_funding_key: Uint8Array, counterparty_funding_key: Uint8Array): HolderCommitmentTransaction { - const ret: number = bindings.HolderCommitmentTransaction_new(commitment_tx == null ? 0 : CommonBase.get_ptr_of(commitment_tx) & ~1, bindings.encodeUint8Array(bindings.check_arr_len(counterparty_sig, 64)), bindings.encodeUint32Array(counterparty_htlc_sigs != null ? counterparty_htlc_sigs.map(counterparty_htlc_sigs_conv_12 => bindings.encodeUint8Array(bindings.check_arr_len(counterparty_htlc_sigs_conv_12, 64))) : null), bindings.encodeUint8Array(bindings.check_arr_len(holder_funding_key, 33)), bindings.encodeUint8Array(bindings.check_arr_len(counterparty_funding_key, 33))); + const ret: bigint = bindings.HolderCommitmentTransaction_new(commitment_tx == null ? 0n : CommonBase.get_ptr_of(commitment_tx), bindings.encodeUint8Array(bindings.check_arr_len(counterparty_sig, 64)), bindings.encodeUint32Array(counterparty_htlc_sigs != null ? counterparty_htlc_sigs.map(counterparty_htlc_sigs_conv_12 => bindings.encodeUint8Array(bindings.check_arr_len(counterparty_htlc_sigs_conv_12, 64))) : null), bindings.encodeUint8Array(bindings.check_arr_len(holder_funding_key, 33)), bindings.encodeUint8Array(bindings.check_arr_len(counterparty_funding_key, 33))); const ret_hu_conv: HolderCommitmentTransaction = new HolderCommitmentTransaction(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, commitment_tx); return ret_hu_conv; } diff --git a/ts/structs/Hostname.mts b/ts/structs/Hostname.mts index 4b1a9d61..3ae27c93 100644 --- a/ts/structs/Hostname.mts +++ b/ts/structs/Hostname.mts @@ -365,12 +365,12 @@ import * as bindings from '../bindings.mjs' */ export class Hostname extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.Hostname_free); } - public clone_ptr(): number { - const ret: number = bindings.Hostname_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.Hostname_clone_ptr(this.ptr); return ret; } @@ -378,7 +378,7 @@ export class Hostname extends CommonBase { * Creates a copy of the Hostname */ public clone(): Hostname { - const ret: number = bindings.Hostname_clone(this.ptr); + const ret: bigint = bindings.Hostname_clone(this.ptr); const ret_hu_conv: Hostname = new Hostname(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; diff --git a/ts/structs/IgnoringMessageHandler.mts b/ts/structs/IgnoringMessageHandler.mts index 9a9b98d7..e8228d6c 100644 --- a/ts/structs/IgnoringMessageHandler.mts +++ b/ts/structs/IgnoringMessageHandler.mts @@ -362,7 +362,7 @@ import * as bindings from '../bindings.mjs' */ export class IgnoringMessageHandler extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.IgnoringMessageHandler_free); } @@ -370,7 +370,7 @@ export class IgnoringMessageHandler extends CommonBase { * Constructs a new IgnoringMessageHandler given each field */ public static constructor_new(): IgnoringMessageHandler { - const ret: number = bindings.IgnoringMessageHandler_new(); + const ret: bigint = bindings.IgnoringMessageHandler_new(); const ret_hu_conv: IgnoringMessageHandler = new IgnoringMessageHandler(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -381,7 +381,7 @@ export class IgnoringMessageHandler extends CommonBase { * This copies the `inner` pointer in this_arg and thus the returned MessageSendEventsProvider must be freed before this_arg is */ public as_MessageSendEventsProvider(): MessageSendEventsProvider { - const ret: number = bindings.IgnoringMessageHandler_as_MessageSendEventsProvider(this.ptr); + const ret: bigint = bindings.IgnoringMessageHandler_as_MessageSendEventsProvider(this.ptr); const ret_hu_conv: MessageSendEventsProvider = new MessageSendEventsProvider(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -392,7 +392,7 @@ export class IgnoringMessageHandler extends CommonBase { * This copies the `inner` pointer in this_arg and thus the returned RoutingMessageHandler must be freed before this_arg is */ public as_RoutingMessageHandler(): RoutingMessageHandler { - const ret: number = bindings.IgnoringMessageHandler_as_RoutingMessageHandler(this.ptr); + const ret: bigint = bindings.IgnoringMessageHandler_as_RoutingMessageHandler(this.ptr); const ret_hu_conv: RoutingMessageHandler = new RoutingMessageHandler(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -403,7 +403,7 @@ export class IgnoringMessageHandler extends CommonBase { * This copies the `inner` pointer in this_arg and thus the returned CustomMessageReader must be freed before this_arg is */ public as_CustomMessageReader(): CustomMessageReader { - const ret: number = bindings.IgnoringMessageHandler_as_CustomMessageReader(this.ptr); + const ret: bigint = bindings.IgnoringMessageHandler_as_CustomMessageReader(this.ptr); const ret_hu_conv: CustomMessageReader = new CustomMessageReader(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -414,7 +414,7 @@ export class IgnoringMessageHandler extends CommonBase { * This copies the `inner` pointer in this_arg and thus the returned CustomMessageHandler must be freed before this_arg is */ public as_CustomMessageHandler(): CustomMessageHandler { - const ret: number = bindings.IgnoringMessageHandler_as_CustomMessageHandler(this.ptr); + const ret: bigint = bindings.IgnoringMessageHandler_as_CustomMessageHandler(this.ptr); const ret_hu_conv: CustomMessageHandler = new CustomMessageHandler(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; diff --git a/ts/structs/InMemorySigner.mts b/ts/structs/InMemorySigner.mts index 2c7cf8fe..bdebc04d 100644 --- a/ts/structs/InMemorySigner.mts +++ b/ts/structs/InMemorySigner.mts @@ -364,7 +364,7 @@ import * as bindings from '../bindings.mjs' */ export class InMemorySigner extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.InMemorySigner_free); } @@ -464,8 +464,8 @@ export class InMemorySigner extends CommonBase { bindings.InMemorySigner_set_commitment_seed(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(val, 32))); } - public clone_ptr(): number { - const ret: number = bindings.InMemorySigner_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.InMemorySigner_clone_ptr(this.ptr); return ret; } @@ -473,7 +473,7 @@ export class InMemorySigner extends CommonBase { * Creates a copy of the InMemorySigner */ public clone(): InMemorySigner { - const ret: number = bindings.InMemorySigner_clone(this.ptr); + const ret: bigint = bindings.InMemorySigner_clone(this.ptr); const ret_hu_conv: InMemorySigner = new InMemorySigner(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -483,7 +483,7 @@ export class InMemorySigner extends CommonBase { * Create a new InMemorySigner */ public static constructor_new(node_secret: Uint8Array, funding_key: Uint8Array, revocation_base_key: Uint8Array, payment_key: Uint8Array, delayed_payment_base_key: Uint8Array, htlc_base_key: Uint8Array, commitment_seed: Uint8Array, channel_value_satoshis: bigint, channel_keys_id: Uint8Array): InMemorySigner { - const ret: number = bindings.InMemorySigner_new(bindings.encodeUint8Array(bindings.check_arr_len(node_secret, 32)), bindings.encodeUint8Array(bindings.check_arr_len(funding_key, 32)), bindings.encodeUint8Array(bindings.check_arr_len(revocation_base_key, 32)), bindings.encodeUint8Array(bindings.check_arr_len(payment_key, 32)), bindings.encodeUint8Array(bindings.check_arr_len(delayed_payment_base_key, 32)), bindings.encodeUint8Array(bindings.check_arr_len(htlc_base_key, 32)), bindings.encodeUint8Array(bindings.check_arr_len(commitment_seed, 32)), channel_value_satoshis, bindings.encodeUint8Array(bindings.check_arr_len(channel_keys_id, 32))); + const ret: bigint = bindings.InMemorySigner_new(bindings.encodeUint8Array(bindings.check_arr_len(node_secret, 32)), bindings.encodeUint8Array(bindings.check_arr_len(funding_key, 32)), bindings.encodeUint8Array(bindings.check_arr_len(revocation_base_key, 32)), bindings.encodeUint8Array(bindings.check_arr_len(payment_key, 32)), bindings.encodeUint8Array(bindings.check_arr_len(delayed_payment_base_key, 32)), bindings.encodeUint8Array(bindings.check_arr_len(htlc_base_key, 32)), bindings.encodeUint8Array(bindings.check_arr_len(commitment_seed, 32)), channel_value_satoshis, bindings.encodeUint8Array(bindings.check_arr_len(channel_keys_id, 32))); const ret_hu_conv: InMemorySigner = new InMemorySigner(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -494,7 +494,7 @@ export class InMemorySigner extends CommonBase { * Will panic if ready_channel wasn't called. */ public counterparty_pubkeys(): ChannelPublicKeys { - const ret: number = bindings.InMemorySigner_counterparty_pubkeys(this.ptr); + const ret: bigint = bindings.InMemorySigner_counterparty_pubkeys(this.ptr); const ret_hu_conv: ChannelPublicKeys = new ChannelPublicKeys(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -536,7 +536,7 @@ export class InMemorySigner extends CommonBase { * Will panic if ready_channel wasn't called. */ public funding_outpoint(): OutPoint { - const ret: number = bindings.InMemorySigner_funding_outpoint(this.ptr); + const ret: bigint = bindings.InMemorySigner_funding_outpoint(this.ptr); const ret_hu_conv: OutPoint = new OutPoint(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -549,7 +549,7 @@ export class InMemorySigner extends CommonBase { * Will panic if ready_channel wasn't called. */ public get_channel_parameters(): ChannelTransactionParameters { - const ret: number = bindings.InMemorySigner_get_channel_parameters(this.ptr); + const ret: bigint = bindings.InMemorySigner_get_channel_parameters(this.ptr); const ret_hu_conv: ChannelTransactionParameters = new ChannelTransactionParameters(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -573,7 +573,7 @@ export class InMemorySigner extends CommonBase { * or if an output descriptor script_pubkey does not match the one we can spend. */ public sign_counterparty_payment_input(spend_tx: Uint8Array, input_idx: number, descriptor: StaticPaymentOutputDescriptor): Result_CVec_CVec_u8ZZNoneZ { - const ret: number = bindings.InMemorySigner_sign_counterparty_payment_input(this.ptr, bindings.encodeUint8Array(spend_tx), input_idx, descriptor == null ? 0 : CommonBase.get_ptr_of(descriptor) & ~1); + const ret: bigint = bindings.InMemorySigner_sign_counterparty_payment_input(this.ptr, bindings.encodeUint8Array(spend_tx), input_idx, descriptor == null ? 0n : CommonBase.get_ptr_of(descriptor)); const ret_hu_conv: Result_CVec_CVec_u8ZZNoneZ = Result_CVec_CVec_u8ZZNoneZ.constr_from_ptr(ret); CommonBase.add_ref_from(this, descriptor); return ret_hu_conv; @@ -589,7 +589,7 @@ export class InMemorySigner extends CommonBase { * script_pubkey does not match the one we can spend. */ public sign_dynamic_p2wsh_input(spend_tx: Uint8Array, input_idx: number, descriptor: DelayedPaymentOutputDescriptor): Result_CVec_CVec_u8ZZNoneZ { - const ret: number = bindings.InMemorySigner_sign_dynamic_p2wsh_input(this.ptr, bindings.encodeUint8Array(spend_tx), input_idx, descriptor == null ? 0 : CommonBase.get_ptr_of(descriptor) & ~1); + const ret: bigint = bindings.InMemorySigner_sign_dynamic_p2wsh_input(this.ptr, bindings.encodeUint8Array(spend_tx), input_idx, descriptor == null ? 0n : CommonBase.get_ptr_of(descriptor)); const ret_hu_conv: Result_CVec_CVec_u8ZZNoneZ = Result_CVec_CVec_u8ZZNoneZ.constr_from_ptr(ret); CommonBase.add_ref_from(this, descriptor); return ret_hu_conv; @@ -600,7 +600,7 @@ export class InMemorySigner extends CommonBase { * This copies the `inner` pointer in this_arg and thus the returned BaseSign must be freed before this_arg is */ public as_BaseSign(): BaseSign { - const ret: number = bindings.InMemorySigner_as_BaseSign(this.ptr); + const ret: bigint = bindings.InMemorySigner_as_BaseSign(this.ptr); const ret_hu_conv: BaseSign = new BaseSign(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -611,7 +611,7 @@ export class InMemorySigner extends CommonBase { * This copies the `inner` pointer in this_arg and thus the returned Sign must be freed before this_arg is */ public as_Sign(): Sign { - const ret: number = bindings.InMemorySigner_as_Sign(this.ptr); + const ret: bigint = bindings.InMemorySigner_as_Sign(this.ptr); const ret_hu_conv: Sign = new Sign(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -630,7 +630,7 @@ export class InMemorySigner extends CommonBase { * Read a InMemorySigner from a byte array, created by InMemorySigner_write */ public static constructor_read(ser: Uint8Array, arg: Uint8Array): Result_InMemorySignerDecodeErrorZ { - const ret: number = bindings.InMemorySigner_read(bindings.encodeUint8Array(ser), bindings.encodeUint8Array(bindings.check_arr_len(arg, 32))); + const ret: bigint = bindings.InMemorySigner_read(bindings.encodeUint8Array(ser), bindings.encodeUint8Array(bindings.check_arr_len(arg, 32))); const ret_hu_conv: Result_InMemorySignerDecodeErrorZ = Result_InMemorySignerDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/Init.mts b/ts/structs/Init.mts index 9f0a6943..4d4883df 100644 --- a/ts/structs/Init.mts +++ b/ts/structs/Init.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class Init extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.Init_free); } @@ -369,7 +369,7 @@ export class Init extends CommonBase { * The relevant features which the sender supports */ public get_features(): InitFeatures { - const ret: number = bindings.Init_get_features(this.ptr); + const ret: bigint = bindings.Init_get_features(this.ptr); const ret_hu_conv: InitFeatures = new InitFeatures(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -379,7 +379,8 @@ export class Init extends CommonBase { * The relevant features which the sender supports */ public set_features(val: InitFeatures): void { - bindings.Init_set_features(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.Init_set_features(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** @@ -389,7 +390,7 @@ export class Init extends CommonBase { * that for a node_announcement update message containing the new address. */ public get_remote_network_address(): Option_NetAddressZ { - const ret: number = bindings.Init_get_remote_network_address(this.ptr); + const ret: bigint = bindings.Init_get_remote_network_address(this.ptr); const ret_hu_conv: Option_NetAddressZ = Option_NetAddressZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -409,14 +410,15 @@ export class Init extends CommonBase { * Constructs a new Init given each field */ public static constructor_new(features_arg: InitFeatures, remote_network_address_arg: Option_NetAddressZ): Init { - const ret: number = bindings.Init_new(features_arg == null ? 0 : CommonBase.get_ptr_of(features_arg) & ~1, CommonBase.get_ptr_of(remote_network_address_arg)); + const ret: bigint = bindings.Init_new(features_arg == null ? 0n : CommonBase.get_ptr_of(features_arg), CommonBase.get_ptr_of(remote_network_address_arg)); const ret_hu_conv: Init = new Init(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, features_arg); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.Init_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.Init_clone_ptr(this.ptr); return ret; } @@ -424,7 +426,7 @@ export class Init extends CommonBase { * Creates a copy of the Init */ public clone(): Init { - const ret: number = bindings.Init_clone(this.ptr); + const ret: bigint = bindings.Init_clone(this.ptr); const ret_hu_conv: Init = new Init(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -443,7 +445,7 @@ export class Init extends CommonBase { * Read a Init from a byte array, created by Init_write */ public static constructor_read(ser: Uint8Array): Result_InitDecodeErrorZ { - const ret: number = bindings.Init_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.Init_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_InitDecodeErrorZ = Result_InitDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/InitFeatures.mts b/ts/structs/InitFeatures.mts index 01e7378d..9128efe2 100644 --- a/ts/structs/InitFeatures.mts +++ b/ts/structs/InitFeatures.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class InitFeatures extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.InitFeatures_free); } @@ -371,13 +371,13 @@ export class InitFeatures extends CommonBase { * Two objects with NULL inner values will be considered "equal" here. */ public eq(b: InitFeatures): boolean { - const ret: boolean = bindings.InitFeatures_eq(this.ptr, b == null ? 0 : CommonBase.get_ptr_of(b) & ~1); + const ret: boolean = bindings.InitFeatures_eq(this.ptr, b == null ? 0n : CommonBase.get_ptr_of(b)); CommonBase.add_ref_from(this, b); return ret; } - public clone_ptr(): number { - const ret: number = bindings.InitFeatures_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.InitFeatures_clone_ptr(this.ptr); return ret; } @@ -385,7 +385,7 @@ export class InitFeatures extends CommonBase { * Creates a copy of the InitFeatures */ public clone(): InitFeatures { - const ret: number = bindings.InitFeatures_clone(this.ptr); + const ret: bigint = bindings.InitFeatures_clone(this.ptr); const ret_hu_conv: InitFeatures = new InitFeatures(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -395,7 +395,7 @@ export class InitFeatures extends CommonBase { * Create a blank Features with no features set */ public static constructor_empty(): InitFeatures { - const ret: number = bindings.InitFeatures_empty(); + const ret: bigint = bindings.InitFeatures_empty(); const ret_hu_conv: InitFeatures = new InitFeatures(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -405,7 +405,7 @@ export class InitFeatures extends CommonBase { * Creates a Features with the bits set which are known by the implementation */ public static constructor_known(): InitFeatures { - const ret: number = bindings.InitFeatures_known(); + const ret: bigint = bindings.InitFeatures_known(); const ret_hu_conv: InitFeatures = new InitFeatures(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -433,7 +433,7 @@ export class InitFeatures extends CommonBase { * Read a InitFeatures from a byte array, created by InitFeatures_write */ public static constructor_read(ser: Uint8Array): Result_InitFeaturesDecodeErrorZ { - const ret: number = bindings.InitFeatures_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.InitFeatures_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_InitFeaturesDecodeErrorZ = Result_InitFeaturesDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/InvalidShutdownScript.mts b/ts/structs/InvalidShutdownScript.mts index d0bee05d..91e24ba1 100644 --- a/ts/structs/InvalidShutdownScript.mts +++ b/ts/structs/InvalidShutdownScript.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class InvalidShutdownScript extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.InvalidShutdownScript_free); } @@ -389,14 +389,14 @@ export class InvalidShutdownScript extends CommonBase { * Constructs a new InvalidShutdownScript given each field */ public static constructor_new(script_arg: Uint8Array): InvalidShutdownScript { - const ret: number = bindings.InvalidShutdownScript_new(bindings.encodeUint8Array(script_arg)); + const ret: bigint = bindings.InvalidShutdownScript_new(bindings.encodeUint8Array(script_arg)); const ret_hu_conv: InvalidShutdownScript = new InvalidShutdownScript(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.InvalidShutdownScript_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.InvalidShutdownScript_clone_ptr(this.ptr); return ret; } @@ -404,7 +404,7 @@ export class InvalidShutdownScript extends CommonBase { * Creates a copy of the InvalidShutdownScript */ public clone(): InvalidShutdownScript { - const ret: number = bindings.InvalidShutdownScript_clone(this.ptr); + const ret: bigint = bindings.InvalidShutdownScript_clone(this.ptr); const ret_hu_conv: InvalidShutdownScript = new InvalidShutdownScript(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; diff --git a/ts/structs/Invoice.mts b/ts/structs/Invoice.mts index 46e2f4ab..25502951 100644 --- a/ts/structs/Invoice.mts +++ b/ts/structs/Invoice.mts @@ -366,7 +366,7 @@ import * as bindings from '../bindings.mjs' */ export class Invoice extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.Invoice_free); } @@ -376,13 +376,13 @@ export class Invoice extends CommonBase { * Two objects with NULL inner values will be considered "equal" here. */ public eq(b: Invoice): boolean { - const ret: boolean = bindings.Invoice_eq(this.ptr, b == null ? 0 : CommonBase.get_ptr_of(b) & ~1); + const ret: boolean = bindings.Invoice_eq(this.ptr, b == null ? 0n : CommonBase.get_ptr_of(b)); CommonBase.add_ref_from(this, b); return ret; } - public clone_ptr(): number { - const ret: number = bindings.Invoice_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.Invoice_clone_ptr(this.ptr); return ret; } @@ -390,7 +390,7 @@ export class Invoice extends CommonBase { * Creates a copy of the Invoice */ public clone(): Invoice { - const ret: number = bindings.Invoice_clone(this.ptr); + const ret: bigint = bindings.Invoice_clone(this.ptr); const ret_hu_conv: Invoice = new Invoice(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -400,7 +400,7 @@ export class Invoice extends CommonBase { * Transform the `Invoice` into it's unchecked version */ public into_signed_raw(): SignedRawInvoice { - const ret: number = bindings.Invoice_into_signed_raw(this.ptr); + const ret: bigint = bindings.Invoice_into_signed_raw(this.ptr); const ret_hu_conv: SignedRawInvoice = new SignedRawInvoice(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -410,7 +410,7 @@ export class Invoice extends CommonBase { * Check that the invoice is signed correctly and that key recovery works */ public check_signature(): Result_NoneSemanticErrorZ { - const ret: number = bindings.Invoice_check_signature(this.ptr); + const ret: bigint = bindings.Invoice_check_signature(this.ptr); const ret_hu_conv: Result_NoneSemanticErrorZ = Result_NoneSemanticErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -438,8 +438,9 @@ export class Invoice extends CommonBase { * ``` */ public static constructor_from_signed(signed_invoice: SignedRawInvoice): Result_InvoiceSemanticErrorZ { - const ret: number = bindings.Invoice_from_signed(signed_invoice == null ? 0 : CommonBase.get_ptr_of(signed_invoice) & ~1); + const ret: bigint = bindings.Invoice_from_signed(signed_invoice == null ? 0n : CommonBase.get_ptr_of(signed_invoice)); const ret_hu_conv: Result_InvoiceSemanticErrorZ = Result_InvoiceSemanticErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, signed_invoice); return ret_hu_conv; } @@ -486,7 +487,7 @@ export class Invoice extends CommonBase { * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None */ public features(): InvoiceFeatures { - const ret: number = bindings.Invoice_features(this.ptr); + const ret: bigint = bindings.Invoice_features(this.ptr); const ret_hu_conv: InvoiceFeatures = new InvoiceFeatures(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -535,7 +536,7 @@ export class Invoice extends CommonBase { const ret_conv_14_len: number = bindings.getArrayLength(ret); const ret_conv_14_arr: PrivateRoute[] = new Array(ret_conv_14_len).fill(null); for (var o = 0; o < ret_conv_14_len; o++) { - const ret_conv_14: number = bindings.getU32ArrayElem(ret, o); + const ret_conv_14: bigint = bindings.getU64ArrayElem(ret, o); const ret_conv_14_hu_conv: PrivateRoute = new PrivateRoute(null, ret_conv_14); CommonBase.add_ref_from(ret_conv_14_hu_conv, this); ret_conv_14_arr[o] = ret_conv_14_hu_conv; @@ -552,7 +553,7 @@ export class Invoice extends CommonBase { const ret_conv_11_len: number = bindings.getArrayLength(ret); const ret_conv_11_arr: RouteHint[] = new Array(ret_conv_11_len).fill(null); for (var l = 0; l < ret_conv_11_len; l++) { - const ret_conv_11: number = bindings.getU32ArrayElem(ret, l); + const ret_conv_11: bigint = bindings.getU64ArrayElem(ret, l); const ret_conv_11_hu_conv: RouteHint = new RouteHint(null, ret_conv_11); CommonBase.add_ref_from(ret_conv_11_hu_conv, this); ret_conv_11_arr[l] = ret_conv_11_hu_conv; @@ -573,7 +574,7 @@ export class Invoice extends CommonBase { * Returns the amount if specified in the invoice as millisatoshis. */ public amount_milli_satoshis(): Option_u64Z { - const ret: number = bindings.Invoice_amount_milli_satoshis(this.ptr); + const ret: bigint = bindings.Invoice_amount_milli_satoshis(this.ptr); const ret_hu_conv: Option_u64Z = Option_u64Z.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -583,7 +584,7 @@ export class Invoice extends CommonBase { * Read a Invoice object from a string */ public static constructor_from_str(s: string): Result_InvoiceParseOrSemanticErrorZ { - const ret: number = bindings.Invoice_from_str(bindings.encodeString(s)); + const ret: bigint = bindings.Invoice_from_str(bindings.encodeString(s)); const ret_hu_conv: Result_InvoiceParseOrSemanticErrorZ = Result_InvoiceParseOrSemanticErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/InvoiceFeatures.mts b/ts/structs/InvoiceFeatures.mts index f5e73858..247351b6 100644 --- a/ts/structs/InvoiceFeatures.mts +++ b/ts/structs/InvoiceFeatures.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class InvoiceFeatures extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.InvoiceFeatures_free); } @@ -371,13 +371,13 @@ export class InvoiceFeatures extends CommonBase { * Two objects with NULL inner values will be considered "equal" here. */ public eq(b: InvoiceFeatures): boolean { - const ret: boolean = bindings.InvoiceFeatures_eq(this.ptr, b == null ? 0 : CommonBase.get_ptr_of(b) & ~1); + const ret: boolean = bindings.InvoiceFeatures_eq(this.ptr, b == null ? 0n : CommonBase.get_ptr_of(b)); CommonBase.add_ref_from(this, b); return ret; } - public clone_ptr(): number { - const ret: number = bindings.InvoiceFeatures_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.InvoiceFeatures_clone_ptr(this.ptr); return ret; } @@ -385,7 +385,7 @@ export class InvoiceFeatures extends CommonBase { * Creates a copy of the InvoiceFeatures */ public clone(): InvoiceFeatures { - const ret: number = bindings.InvoiceFeatures_clone(this.ptr); + const ret: bigint = bindings.InvoiceFeatures_clone(this.ptr); const ret_hu_conv: InvoiceFeatures = new InvoiceFeatures(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -395,7 +395,7 @@ export class InvoiceFeatures extends CommonBase { * Create a blank Features with no features set */ public static constructor_empty(): InvoiceFeatures { - const ret: number = bindings.InvoiceFeatures_empty(); + const ret: bigint = bindings.InvoiceFeatures_empty(); const ret_hu_conv: InvoiceFeatures = new InvoiceFeatures(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -405,7 +405,7 @@ export class InvoiceFeatures extends CommonBase { * Creates a Features with the bits set which are known by the implementation */ public static constructor_known(): InvoiceFeatures { - const ret: number = bindings.InvoiceFeatures_known(); + const ret: bigint = bindings.InvoiceFeatures_known(); const ret_hu_conv: InvoiceFeatures = new InvoiceFeatures(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -433,7 +433,7 @@ export class InvoiceFeatures extends CommonBase { * Read a InvoiceFeatures from a byte array, created by InvoiceFeatures_write */ public static constructor_read(ser: Uint8Array): Result_InvoiceFeaturesDecodeErrorZ { - const ret: number = bindings.InvoiceFeatures_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.InvoiceFeatures_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_InvoiceFeaturesDecodeErrorZ = Result_InvoiceFeaturesDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/InvoicePayer.mts b/ts/structs/InvoicePayer.mts index a9e75078..ed0e2731 100644 --- a/ts/structs/InvoicePayer.mts +++ b/ts/structs/InvoicePayer.mts @@ -365,7 +365,7 @@ import * as bindings from '../bindings.mjs' */ export class InvoicePayer extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.InvoicePayer_free); } @@ -376,7 +376,7 @@ export class InvoicePayer extends CommonBase { * `retry` has been exceeded for a given [`Invoice`]. */ public static constructor_new(payer: Payer, router: Router, scorer: MultiThreadedLockableScore, logger: Logger, event_handler: EventHandler, retry: Retry): InvoicePayer { - const ret: number = bindings.InvoicePayer_new(payer == null ? 0 : CommonBase.get_ptr_of(payer), router == null ? 0 : CommonBase.get_ptr_of(router), scorer == null ? 0 : CommonBase.get_ptr_of(scorer) & ~1, logger == null ? 0 : CommonBase.get_ptr_of(logger), event_handler == null ? 0 : CommonBase.get_ptr_of(event_handler), CommonBase.get_ptr_of(retry)); + const ret: bigint = bindings.InvoicePayer_new(payer == null ? 0n : CommonBase.get_ptr_of(payer), router == null ? 0n : CommonBase.get_ptr_of(router), scorer == null ? 0n : CommonBase.get_ptr_of(scorer), logger == null ? 0n : CommonBase.get_ptr_of(logger), event_handler == null ? 0n : CommonBase.get_ptr_of(event_handler), CommonBase.get_ptr_of(retry)); const ret_hu_conv: InvoicePayer = new InvoicePayer(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); CommonBase.add_ref_from(ret_hu_conv, payer); @@ -395,7 +395,7 @@ export class InvoicePayer extends CommonBase { * for you. */ public pay_invoice(invoice: Invoice): Result_PaymentIdPaymentErrorZ { - const ret: number = bindings.InvoicePayer_pay_invoice(this.ptr, invoice == null ? 0 : CommonBase.get_ptr_of(invoice) & ~1); + const ret: bigint = bindings.InvoicePayer_pay_invoice(this.ptr, invoice == null ? 0n : CommonBase.get_ptr_of(invoice)); const ret_hu_conv: Result_PaymentIdPaymentErrorZ = Result_PaymentIdPaymentErrorZ.constr_from_ptr(ret); CommonBase.add_ref_from(this, invoice); return ret_hu_conv; @@ -410,7 +410,7 @@ export class InvoicePayer extends CommonBase { * for you. */ public pay_zero_value_invoice(invoice: Invoice, amount_msats: bigint): Result_PaymentIdPaymentErrorZ { - const ret: number = bindings.InvoicePayer_pay_zero_value_invoice(this.ptr, invoice == null ? 0 : CommonBase.get_ptr_of(invoice) & ~1, amount_msats); + const ret: bigint = bindings.InvoicePayer_pay_zero_value_invoice(this.ptr, invoice == null ? 0n : CommonBase.get_ptr_of(invoice), amount_msats); const ret_hu_conv: Result_PaymentIdPaymentErrorZ = Result_PaymentIdPaymentErrorZ.constr_from_ptr(ret); CommonBase.add_ref_from(this, invoice); return ret_hu_conv; @@ -424,7 +424,7 @@ export class InvoicePayer extends CommonBase { * been paid before. Because [`InvoicePayer`] is stateless no effort is made to do so for you. */ public pay_pubkey(pubkey: Uint8Array, payment_preimage: Uint8Array, amount_msats: bigint, final_cltv_expiry_delta: number): Result_PaymentIdPaymentErrorZ { - const ret: number = bindings.InvoicePayer_pay_pubkey(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(pubkey, 33)), bindings.encodeUint8Array(bindings.check_arr_len(payment_preimage, 32)), amount_msats, final_cltv_expiry_delta); + const ret: bigint = bindings.InvoicePayer_pay_pubkey(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(pubkey, 33)), bindings.encodeUint8Array(bindings.check_arr_len(payment_preimage, 32)), amount_msats, final_cltv_expiry_delta); const ret_hu_conv: Result_PaymentIdPaymentErrorZ = Result_PaymentIdPaymentErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -444,7 +444,7 @@ export class InvoicePayer extends CommonBase { * This copies the `inner` pointer in this_arg and thus the returned EventHandler must be freed before this_arg is */ public as_EventHandler(): EventHandler { - const ret: number = bindings.InvoicePayer_as_EventHandler(this.ptr); + const ret: bigint = bindings.InvoicePayer_as_EventHandler(this.ptr); const ret_hu_conv: EventHandler = new EventHandler(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; diff --git a/ts/structs/InvoiceSignature.mts b/ts/structs/InvoiceSignature.mts index 04b3049d..e0f80b15 100644 --- a/ts/structs/InvoiceSignature.mts +++ b/ts/structs/InvoiceSignature.mts @@ -361,12 +361,12 @@ import * as bindings from '../bindings.mjs' */ export class InvoiceSignature extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.InvoiceSignature_free); } - public clone_ptr(): number { - const ret: number = bindings.InvoiceSignature_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.InvoiceSignature_clone_ptr(this.ptr); return ret; } @@ -374,7 +374,7 @@ export class InvoiceSignature extends CommonBase { * Creates a copy of the InvoiceSignature */ public clone(): InvoiceSignature { - const ret: number = bindings.InvoiceSignature_clone(this.ptr); + const ret: bigint = bindings.InvoiceSignature_clone(this.ptr); const ret_hu_conv: InvoiceSignature = new InvoiceSignature(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -386,7 +386,7 @@ export class InvoiceSignature extends CommonBase { * Two objects with NULL inner values will be considered "equal" here. */ public eq(b: InvoiceSignature): boolean { - const ret: boolean = bindings.InvoiceSignature_eq(this.ptr, b == null ? 0 : CommonBase.get_ptr_of(b) & ~1); + const ret: boolean = bindings.InvoiceSignature_eq(this.ptr, b == null ? 0n : CommonBase.get_ptr_of(b)); CommonBase.add_ref_from(this, b); return ret; } diff --git a/ts/structs/KeysInterface.mts b/ts/structs/KeysInterface.mts index 5f59ab5a..deca3ae4 100644 --- a/ts/structs/KeysInterface.mts +++ b/ts/structs/KeysInterface.mts @@ -435,7 +435,7 @@ export class KeysInterface extends CommonBase { public bindings_instance?: bindings.LDKKeysInterface; /* @internal */ - constructor(_dummy: object, ptr: number) { + constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.KeysInterface_free); this.bindings_instance = null; } @@ -444,9 +444,9 @@ export class KeysInterface extends CommonBase { public static new_impl(arg: KeysInterfaceInterface): KeysInterface { const impl_holder: LDKKeysInterfaceHolder = new LDKKeysInterfaceHolder(); let structImplementation = { - get_node_secret (recipient: Recipient): number { + get_node_secret (recipient: Recipient): bigint { const ret: Result_SecretKeyNoneZ = arg.get_node_secret(recipient); - const result: number = ret == null ? 0 : ret.clone_ptr(); + const result: bigint = ret == null ? 0n : ret.clone_ptr(); return result; }, get_destination_script (): number { @@ -454,14 +454,14 @@ export class KeysInterface extends CommonBase { const result: number = bindings.encodeUint8Array(ret); return result; }, - get_shutdown_scriptpubkey (): number { + get_shutdown_scriptpubkey (): bigint { const ret: ShutdownScript = arg.get_shutdown_scriptpubkey(); - const result: number = ret == null ? 0 : ret.clone_ptr(); + const result: bigint = ret == null ? 0n : ret.clone_ptr(); return result; }, - get_channel_signer (inbound: boolean, channel_value_satoshis: bigint): number { + get_channel_signer (inbound: boolean, channel_value_satoshis: bigint): bigint { const ret: Sign = arg.get_channel_signer(inbound, channel_value_satoshis); - const result: number = ret == null ? 0 : ret.clone_ptr(); + const result: bigint = ret == null ? 0n : ret.clone_ptr(); CommonBase.add_ref_from(impl_holder.held, ret); return result; }, @@ -470,13 +470,13 @@ export class KeysInterface extends CommonBase { const result: number = bindings.encodeUint8Array(bindings.check_arr_len(ret, 32)); return result; }, - read_chan_signer (reader: number): number { + read_chan_signer (reader: number): bigint { const reader_conv: Uint8Array = bindings.decodeUint8Array(reader); const ret: Result_SignDecodeErrorZ = arg.read_chan_signer(reader_conv); - const result: number = ret == null ? 0 : ret.clone_ptr(); + const result: bigint = ret == null ? 0n : ret.clone_ptr(); return result; }, - sign_invoice (hrp_bytes: number, invoice_data: number, receipient: Recipient): number { + sign_invoice (hrp_bytes: number, invoice_data: number, receipient: Recipient): bigint { const hrp_bytes_conv: Uint8Array = bindings.decodeUint8Array(hrp_bytes); const invoice_data_conv_7_len: number = bindings.getArrayLength(invoice_data); const invoice_data_conv_7_arr: UInt5[] = new Array(invoice_data_conv_7_len).fill(null); @@ -487,7 +487,7 @@ export class KeysInterface extends CommonBase { } bindings.freeWasmMemory(invoice_data) const ret: Result_RecoverableSignatureNoneZ = arg.sign_invoice(hrp_bytes_conv, invoice_data_conv_7_arr, receipient); - const result: number = ret == null ? 0 : ret.clone_ptr(); + const result: bigint = ret == null ? 0n : ret.clone_ptr(); return result; }, get_inbound_payment_key_material (): number { @@ -496,7 +496,7 @@ export class KeysInterface extends CommonBase { return result; }, } as bindings.LDKKeysInterface; - const ptr: number = bindings.LDKKeysInterface_new(structImplementation); + const ptr: bigint = bindings.LDKKeysInterface_new(structImplementation); impl_holder.held = new KeysInterface(null, ptr); impl_holder.held.bindings_instance = structImplementation; @@ -512,7 +512,7 @@ export class KeysInterface extends CommonBase { * parameter. */ public get_node_secret(recipient: Recipient): Result_SecretKeyNoneZ { - const ret: number = bindings.KeysInterface_get_node_secret(this.ptr, recipient); + const ret: bigint = bindings.KeysInterface_get_node_secret(this.ptr, recipient); const ret_hu_conv: Result_SecretKeyNoneZ = Result_SecretKeyNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -536,7 +536,7 @@ export class KeysInterface extends CommonBase { * on-chain funds across channels as controlled to the same user. */ public get_shutdown_scriptpubkey(): ShutdownScript { - const ret: number = bindings.KeysInterface_get_shutdown_scriptpubkey(this.ptr); + const ret: bigint = bindings.KeysInterface_get_shutdown_scriptpubkey(this.ptr); const ret_hu_conv: ShutdownScript = new ShutdownScript(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -549,7 +549,7 @@ export class KeysInterface extends CommonBase { * This method must return a different value each time it is called. */ public get_channel_signer(inbound: boolean, channel_value_satoshis: bigint): Sign { - const ret: number = bindings.KeysInterface_get_channel_signer(this.ptr, inbound, channel_value_satoshis); + const ret: bigint = bindings.KeysInterface_get_channel_signer(this.ptr, inbound, channel_value_satoshis); const ret_hu_conv: Sign = new Sign(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -577,7 +577,7 @@ export class KeysInterface extends CommonBase { * you've read all of the provided bytes to ensure no corruption occurred. */ public read_chan_signer(reader: Uint8Array): Result_SignDecodeErrorZ { - const ret: number = bindings.KeysInterface_read_chan_signer(this.ptr, bindings.encodeUint8Array(reader)); + const ret: bigint = bindings.KeysInterface_read_chan_signer(this.ptr, bindings.encodeUint8Array(reader)); const ret_hu_conv: Result_SignDecodeErrorZ = Result_SignDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -592,7 +592,7 @@ export class KeysInterface extends CommonBase { * The secret key used to sign the invoice is dependent on the [`Recipient`]. */ public sign_invoice(hrp_bytes: Uint8Array, invoice_data: UInt5[], receipient: Recipient): Result_RecoverableSignatureNoneZ { - const ret: number = bindings.KeysInterface_sign_invoice(this.ptr, bindings.encodeUint8Array(hrp_bytes), bindings.encodeUint8Array(invoice_data != null ? bindings.uint5ArrToBytes(invoice_data) : null), receipient); + const ret: bigint = bindings.KeysInterface_sign_invoice(this.ptr, bindings.encodeUint8Array(hrp_bytes), bindings.encodeUint8Array(invoice_data != null ? bindings.uint5ArrToBytes(invoice_data) : null), receipient); const ret_hu_conv: Result_RecoverableSignatureNoneZ = Result_RecoverableSignatureNoneZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/KeysManager.mts b/ts/structs/KeysManager.mts index 56ab9085..f968be70 100644 --- a/ts/structs/KeysManager.mts +++ b/ts/structs/KeysManager.mts @@ -373,7 +373,7 @@ import * as bindings from '../bindings.mjs' */ export class KeysManager extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.KeysManager_free); } @@ -399,7 +399,7 @@ export class KeysManager extends CommonBase { * detailed description of the guarantee. */ public static constructor_new(seed: Uint8Array, starting_time_secs: bigint, starting_time_nanos: number): KeysManager { - const ret: number = bindings.KeysManager_new(bindings.encodeUint8Array(bindings.check_arr_len(seed, 32)), starting_time_secs, starting_time_nanos); + const ret: bigint = bindings.KeysManager_new(bindings.encodeUint8Array(bindings.check_arr_len(seed, 32)), starting_time_secs, starting_time_nanos); const ret_hu_conv: KeysManager = new KeysManager(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -413,7 +413,7 @@ export class KeysManager extends CommonBase { * onchain output detection for which a corresponding delayed_payment_key must be derived. */ public derive_channel_keys(channel_value_satoshis: bigint, params: Uint8Array): InMemorySigner { - const ret: number = bindings.KeysManager_derive_channel_keys(this.ptr, channel_value_satoshis, bindings.encodeUint8Array(bindings.check_arr_len(params, 32))); + const ret: bigint = bindings.KeysManager_derive_channel_keys(this.ptr, channel_value_satoshis, bindings.encodeUint8Array(bindings.check_arr_len(params, 32))); const ret_hu_conv: InMemorySigner = new InMemorySigner(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -434,7 +434,7 @@ export class KeysManager extends CommonBase { * this KeysManager or one of the `InMemorySigner` created by this KeysManager. */ public spend_spendable_outputs(descriptors: SpendableOutputDescriptor[], outputs: TxOut[], change_destination_script: Uint8Array, feerate_sat_per_1000_weight: number): Result_TransactionNoneZ { - const ret: number = bindings.KeysManager_spend_spendable_outputs(this.ptr, bindings.encodeUint32Array(descriptors != null ? descriptors.map(descriptors_conv_27 => CommonBase.get_ptr_of(descriptors_conv_27)) : null), bindings.encodeUint32Array(outputs != null ? outputs.map(outputs_conv_7 => CommonBase.get_ptr_of(outputs_conv_7)) : null), bindings.encodeUint8Array(change_destination_script), feerate_sat_per_1000_weight); + const ret: bigint = bindings.KeysManager_spend_spendable_outputs(this.ptr, bindings.encodeUint64Array(descriptors != null ? descriptors.map(descriptors_conv_27 => CommonBase.get_ptr_of(descriptors_conv_27)) : null), bindings.encodeUint64Array(outputs != null ? outputs.map(outputs_conv_7 => CommonBase.get_ptr_of(outputs_conv_7)) : null), bindings.encodeUint8Array(change_destination_script), feerate_sat_per_1000_weight); const ret_hu_conv: Result_TransactionNoneZ = Result_TransactionNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -444,7 +444,7 @@ export class KeysManager extends CommonBase { * This copies the `inner` pointer in this_arg and thus the returned KeysInterface must be freed before this_arg is */ public as_KeysInterface(): KeysInterface { - const ret: number = bindings.KeysManager_as_KeysInterface(this.ptr); + const ret: bigint = bindings.KeysManager_as_KeysInterface(this.ptr); const ret_hu_conv: KeysInterface = new KeysInterface(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; diff --git a/ts/structs/LightningError.mts b/ts/structs/LightningError.mts index 5e93d8c4..bfea0b28 100644 --- a/ts/structs/LightningError.mts +++ b/ts/structs/LightningError.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class LightningError extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.LightningError_free); } @@ -385,7 +385,7 @@ export class LightningError extends CommonBase { * The action which should be taken against the offending peer. */ public get_action(): ErrorAction { - const ret: number = bindings.LightningError_get_action(this.ptr); + const ret: bigint = bindings.LightningError_get_action(this.ptr); const ret_hu_conv: ErrorAction = ErrorAction.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -402,14 +402,14 @@ export class LightningError extends CommonBase { * Constructs a new LightningError given each field */ public static constructor_new(err_arg: string, action_arg: ErrorAction): LightningError { - const ret: number = bindings.LightningError_new(bindings.encodeString(err_arg), CommonBase.get_ptr_of(action_arg)); + const ret: bigint = bindings.LightningError_new(bindings.encodeString(err_arg), CommonBase.get_ptr_of(action_arg)); const ret_hu_conv: LightningError = new LightningError(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.LightningError_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.LightningError_clone_ptr(this.ptr); return ret; } @@ -417,7 +417,7 @@ export class LightningError extends CommonBase { * Creates a copy of the LightningError */ public clone(): LightningError { - const ret: number = bindings.LightningError_clone(this.ptr); + const ret: bigint = bindings.LightningError_clone(this.ptr); const ret_hu_conv: LightningError = new LightningError(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; diff --git a/ts/structs/Listen.mts b/ts/structs/Listen.mts index bd763e35..0b3b1776 100644 --- a/ts/structs/Listen.mts +++ b/ts/structs/Listen.mts @@ -394,7 +394,7 @@ export class Listen extends CommonBase { public bindings_instance?: bindings.LDKListen; /* @internal */ - constructor(_dummy: object, ptr: number) { + constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.Listen_free); this.bindings_instance = null; } @@ -408,7 +408,7 @@ export class Listen extends CommonBase { const txdata_conv_28_len: number = bindings.getArrayLength(txdata); const txdata_conv_28_arr: TwoTuple_usizeTransactionZ[] = new Array(txdata_conv_28_len).fill(null); for (var c = 0; c < txdata_conv_28_len; c++) { - const txdata_conv_28: number = bindings.getU32ArrayElem(txdata, c); + const txdata_conv_28: bigint = bindings.getU64ArrayElem(txdata, c); const txdata_conv_28_hu_conv: TwoTuple_usizeTransactionZ = new TwoTuple_usizeTransactionZ(null, txdata_conv_28); CommonBase.add_ref_from(txdata_conv_28_hu_conv, this); txdata_conv_28_arr[c] = txdata_conv_28_hu_conv; @@ -425,7 +425,7 @@ export class Listen extends CommonBase { arg.block_disconnected(header_conv, height); }, } as bindings.LDKListen; - const ptr: number = bindings.LDKListen_new(structImplementation); + const ptr: bigint = bindings.LDKListen_new(structImplementation); impl_holder.held = new Listen(null, ptr); impl_holder.held.bindings_instance = structImplementation; @@ -437,7 +437,7 @@ export class Listen extends CommonBase { * possibly filtered. */ public filtered_block_connected(header: Uint8Array, txdata: TwoTuple_usizeTransactionZ[], height: number): void { - bindings.Listen_filtered_block_connected(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(header, 80)), bindings.encodeUint32Array(txdata != null ? txdata.map(txdata_conv_28 => txdata_conv_28 != null ? CommonBase.get_ptr_of(txdata_conv_28) : 0) : null), height); + bindings.Listen_filtered_block_connected(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(header, 80)), bindings.encodeUint64Array(txdata != null ? txdata.map(txdata_conv_28 => txdata_conv_28 != null ? CommonBase.get_ptr_of(txdata_conv_28) : 0n) : null), height); } /** diff --git a/ts/structs/LockableScore.mts b/ts/structs/LockableScore.mts index 56f39be1..350e951c 100644 --- a/ts/structs/LockableScore.mts +++ b/ts/structs/LockableScore.mts @@ -384,7 +384,7 @@ export class LockableScore extends CommonBase { public bindings_instance?: bindings.LDKLockableScore; /* @internal */ - constructor(_dummy: object, ptr: number) { + constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.LockableScore_free); this.bindings_instance = null; } @@ -393,14 +393,14 @@ export class LockableScore extends CommonBase { public static new_impl(arg: LockableScoreInterface): LockableScore { const impl_holder: LDKLockableScoreHolder = new LDKLockableScoreHolder(); let structImplementation = { - lock (): number { + lock (): bigint { const ret: Score = arg.lock(); - const result: number = ret == null ? 0 : CommonBase.get_ptr_of(ret); + const result: bigint = ret == null ? 0n : CommonBase.get_ptr_of(ret); CommonBase.add_ref_from(impl_holder.held, ret); return result; }, } as bindings.LDKLockableScore; - const ptr: number = bindings.LDKLockableScore_new(structImplementation); + const ptr: bigint = bindings.LDKLockableScore_new(structImplementation); impl_holder.held = new LockableScore(null, ptr); impl_holder.held.bindings_instance = structImplementation; @@ -411,7 +411,7 @@ export class LockableScore extends CommonBase { * Returns the locked scorer. */ public lock(): Score { - const ret: number = bindings.LockableScore_lock(this.ptr); + const ret: bigint = bindings.LockableScore_lock(this.ptr); const ret_hu_conv: Score = new Score(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; diff --git a/ts/structs/LockedChannelMonitor.mts b/ts/structs/LockedChannelMonitor.mts index ff4d5bdd..5d5cbfda 100644 --- a/ts/structs/LockedChannelMonitor.mts +++ b/ts/structs/LockedChannelMonitor.mts @@ -365,7 +365,7 @@ import * as bindings from '../bindings.mjs' */ export class LockedChannelMonitor extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, () => { throw new Error("Locks must be manually freed with free()"); }); } /** Releases this lock */ diff --git a/ts/structs/Logger.mts b/ts/structs/Logger.mts index 643004be..a2e4bdb4 100644 --- a/ts/structs/Logger.mts +++ b/ts/structs/Logger.mts @@ -377,7 +377,7 @@ export class Logger extends CommonBase { public bindings_instance?: bindings.LDKLogger; /* @internal */ - constructor(_dummy: object, ptr: number) { + constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.Logger_free); this.bindings_instance = null; } @@ -386,12 +386,12 @@ export class Logger extends CommonBase { public static new_impl(arg: LoggerInterface): Logger { const impl_holder: LDKLoggerHolder = new LDKLoggerHolder(); let structImplementation = { - log (record: number): void { + log (record: bigint): void { const record_hu_conv: Record = new Record(null, record); arg.log(record_hu_conv); }, } as bindings.LDKLogger; - const ptr: number = bindings.LDKLogger_new(structImplementation); + const ptr: bigint = bindings.LDKLogger_new(structImplementation); impl_holder.held = new Logger(null, ptr); impl_holder.held.bindings_instance = structImplementation; diff --git a/ts/structs/MessageHandler.mts b/ts/structs/MessageHandler.mts index f3b7bbd4..7449c109 100644 --- a/ts/structs/MessageHandler.mts +++ b/ts/structs/MessageHandler.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class MessageHandler extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.MessageHandler_free); } @@ -372,7 +372,7 @@ export class MessageHandler extends CommonBase { * [`ChannelManager`]: crate::ln::channelmanager::ChannelManager */ public get_chan_handler(): ChannelMessageHandler { - const ret: number = bindings.MessageHandler_get_chan_handler(this.ptr); + const ret: bigint = bindings.MessageHandler_get_chan_handler(this.ptr); const ret_hu_conv: ChannelMessageHandler = new ChannelMessageHandler(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -385,7 +385,7 @@ export class MessageHandler extends CommonBase { * [`ChannelManager`]: crate::ln::channelmanager::ChannelManager */ public set_chan_handler(val: ChannelMessageHandler): void { - bindings.MessageHandler_set_chan_handler(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val)); + bindings.MessageHandler_set_chan_handler(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); CommonBase.add_ref_from(this, val); } @@ -396,7 +396,7 @@ export class MessageHandler extends CommonBase { * [`P2PGossipSync`]: crate::routing::gossip::P2PGossipSync */ public get_route_handler(): RoutingMessageHandler { - const ret: number = bindings.MessageHandler_get_route_handler(this.ptr); + const ret: bigint = bindings.MessageHandler_get_route_handler(this.ptr); const ret_hu_conv: RoutingMessageHandler = new RoutingMessageHandler(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -409,7 +409,7 @@ export class MessageHandler extends CommonBase { * [`P2PGossipSync`]: crate::routing::gossip::P2PGossipSync */ public set_route_handler(val: RoutingMessageHandler): void { - bindings.MessageHandler_set_route_handler(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val)); + bindings.MessageHandler_set_route_handler(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); CommonBase.add_ref_from(this, val); } @@ -417,7 +417,7 @@ export class MessageHandler extends CommonBase { * Constructs a new MessageHandler given each field */ public static constructor_new(chan_handler_arg: ChannelMessageHandler, route_handler_arg: RoutingMessageHandler): MessageHandler { - const ret: number = bindings.MessageHandler_new(chan_handler_arg == null ? 0 : CommonBase.get_ptr_of(chan_handler_arg), route_handler_arg == null ? 0 : CommonBase.get_ptr_of(route_handler_arg)); + const ret: bigint = bindings.MessageHandler_new(chan_handler_arg == null ? 0n : CommonBase.get_ptr_of(chan_handler_arg), route_handler_arg == null ? 0n : CommonBase.get_ptr_of(route_handler_arg)); const ret_hu_conv: MessageHandler = new MessageHandler(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); CommonBase.add_ref_from(ret_hu_conv, chan_handler_arg); diff --git a/ts/structs/MessageSendEvent.mts b/ts/structs/MessageSendEvent.mts index 232c6550..b01eb93f 100644 --- a/ts/structs/MessageSendEvent.mts +++ b/ts/structs/MessageSendEvent.mts @@ -361,9 +361,9 @@ import * as bindings from '../bindings.mjs' * These events are handled by PeerManager::process_events if you are using a PeerManager. */ export class MessageSendEvent extends CommonBase { - protected constructor(_dummy: object, ptr: number) { super(ptr, bindings.MessageSendEvent_free); } + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.MessageSendEvent_free); } /* @internal */ - public static constr_from_ptr(ptr: number): MessageSendEvent { + public static constr_from_ptr(ptr: bigint): MessageSendEvent { const raw_ty: number = bindings.LDKMessageSendEvent_ty_from_ptr(ptr); switch (raw_ty) { case 0: return new MessageSendEvent_SendAcceptChannel(ptr); @@ -391,8 +391,8 @@ export class MessageSendEvent extends CommonBase { } } - public clone_ptr(): number { - const ret: number = bindings.MessageSendEvent_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.MessageSendEvent_clone_ptr(this.ptr); return ret; } @@ -400,7 +400,7 @@ export class MessageSendEvent extends CommonBase { * Creates a copy of the MessageSendEvent */ public clone(): MessageSendEvent { - const ret: number = bindings.MessageSendEvent_clone(this.ptr); + const ret: bigint = bindings.MessageSendEvent_clone(this.ptr); const ret_hu_conv: MessageSendEvent = MessageSendEvent.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -410,9 +410,10 @@ export class MessageSendEvent extends CommonBase { * Utility method to constructs a new SendAcceptChannel-variant MessageSendEvent */ public static constructor_send_accept_channel(node_id: Uint8Array, msg: AcceptChannel): MessageSendEvent { - const ret: number = bindings.MessageSendEvent_send_accept_channel(bindings.encodeUint8Array(bindings.check_arr_len(node_id, 33)), msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + const ret: bigint = bindings.MessageSendEvent_send_accept_channel(bindings.encodeUint8Array(bindings.check_arr_len(node_id, 33)), msg == null ? 0n : CommonBase.get_ptr_of(msg)); const ret_hu_conv: MessageSendEvent = MessageSendEvent.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, msg); return ret_hu_conv; } @@ -420,9 +421,10 @@ export class MessageSendEvent extends CommonBase { * Utility method to constructs a new SendOpenChannel-variant MessageSendEvent */ public static constructor_send_open_channel(node_id: Uint8Array, msg: OpenChannel): MessageSendEvent { - const ret: number = bindings.MessageSendEvent_send_open_channel(bindings.encodeUint8Array(bindings.check_arr_len(node_id, 33)), msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + const ret: bigint = bindings.MessageSendEvent_send_open_channel(bindings.encodeUint8Array(bindings.check_arr_len(node_id, 33)), msg == null ? 0n : CommonBase.get_ptr_of(msg)); const ret_hu_conv: MessageSendEvent = MessageSendEvent.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, msg); return ret_hu_conv; } @@ -430,9 +432,10 @@ export class MessageSendEvent extends CommonBase { * Utility method to constructs a new SendFundingCreated-variant MessageSendEvent */ public static constructor_send_funding_created(node_id: Uint8Array, msg: FundingCreated): MessageSendEvent { - const ret: number = bindings.MessageSendEvent_send_funding_created(bindings.encodeUint8Array(bindings.check_arr_len(node_id, 33)), msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + const ret: bigint = bindings.MessageSendEvent_send_funding_created(bindings.encodeUint8Array(bindings.check_arr_len(node_id, 33)), msg == null ? 0n : CommonBase.get_ptr_of(msg)); const ret_hu_conv: MessageSendEvent = MessageSendEvent.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, msg); return ret_hu_conv; } @@ -440,9 +443,10 @@ export class MessageSendEvent extends CommonBase { * Utility method to constructs a new SendFundingSigned-variant MessageSendEvent */ public static constructor_send_funding_signed(node_id: Uint8Array, msg: FundingSigned): MessageSendEvent { - const ret: number = bindings.MessageSendEvent_send_funding_signed(bindings.encodeUint8Array(bindings.check_arr_len(node_id, 33)), msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + const ret: bigint = bindings.MessageSendEvent_send_funding_signed(bindings.encodeUint8Array(bindings.check_arr_len(node_id, 33)), msg == null ? 0n : CommonBase.get_ptr_of(msg)); const ret_hu_conv: MessageSendEvent = MessageSendEvent.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, msg); return ret_hu_conv; } @@ -450,9 +454,10 @@ export class MessageSendEvent extends CommonBase { * Utility method to constructs a new SendChannelReady-variant MessageSendEvent */ public static constructor_send_channel_ready(node_id: Uint8Array, msg: ChannelReady): MessageSendEvent { - const ret: number = bindings.MessageSendEvent_send_channel_ready(bindings.encodeUint8Array(bindings.check_arr_len(node_id, 33)), msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + const ret: bigint = bindings.MessageSendEvent_send_channel_ready(bindings.encodeUint8Array(bindings.check_arr_len(node_id, 33)), msg == null ? 0n : CommonBase.get_ptr_of(msg)); const ret_hu_conv: MessageSendEvent = MessageSendEvent.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, msg); return ret_hu_conv; } @@ -460,9 +465,10 @@ export class MessageSendEvent extends CommonBase { * Utility method to constructs a new SendAnnouncementSignatures-variant MessageSendEvent */ public static constructor_send_announcement_signatures(node_id: Uint8Array, msg: AnnouncementSignatures): MessageSendEvent { - const ret: number = bindings.MessageSendEvent_send_announcement_signatures(bindings.encodeUint8Array(bindings.check_arr_len(node_id, 33)), msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + const ret: bigint = bindings.MessageSendEvent_send_announcement_signatures(bindings.encodeUint8Array(bindings.check_arr_len(node_id, 33)), msg == null ? 0n : CommonBase.get_ptr_of(msg)); const ret_hu_conv: MessageSendEvent = MessageSendEvent.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, msg); return ret_hu_conv; } @@ -470,9 +476,10 @@ export class MessageSendEvent extends CommonBase { * Utility method to constructs a new UpdateHTLCs-variant MessageSendEvent */ public static constructor_update_htlcs(node_id: Uint8Array, updates: CommitmentUpdate): MessageSendEvent { - const ret: number = bindings.MessageSendEvent_update_htlcs(bindings.encodeUint8Array(bindings.check_arr_len(node_id, 33)), updates == null ? 0 : CommonBase.get_ptr_of(updates) & ~1); + const ret: bigint = bindings.MessageSendEvent_update_htlcs(bindings.encodeUint8Array(bindings.check_arr_len(node_id, 33)), updates == null ? 0n : CommonBase.get_ptr_of(updates)); const ret_hu_conv: MessageSendEvent = MessageSendEvent.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, updates); return ret_hu_conv; } @@ -480,9 +487,10 @@ export class MessageSendEvent extends CommonBase { * Utility method to constructs a new SendRevokeAndACK-variant MessageSendEvent */ public static constructor_send_revoke_and_ack(node_id: Uint8Array, msg: RevokeAndACK): MessageSendEvent { - const ret: number = bindings.MessageSendEvent_send_revoke_and_ack(bindings.encodeUint8Array(bindings.check_arr_len(node_id, 33)), msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + const ret: bigint = bindings.MessageSendEvent_send_revoke_and_ack(bindings.encodeUint8Array(bindings.check_arr_len(node_id, 33)), msg == null ? 0n : CommonBase.get_ptr_of(msg)); const ret_hu_conv: MessageSendEvent = MessageSendEvent.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, msg); return ret_hu_conv; } @@ -490,9 +498,10 @@ export class MessageSendEvent extends CommonBase { * Utility method to constructs a new SendClosingSigned-variant MessageSendEvent */ public static constructor_send_closing_signed(node_id: Uint8Array, msg: ClosingSigned): MessageSendEvent { - const ret: number = bindings.MessageSendEvent_send_closing_signed(bindings.encodeUint8Array(bindings.check_arr_len(node_id, 33)), msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + const ret: bigint = bindings.MessageSendEvent_send_closing_signed(bindings.encodeUint8Array(bindings.check_arr_len(node_id, 33)), msg == null ? 0n : CommonBase.get_ptr_of(msg)); const ret_hu_conv: MessageSendEvent = MessageSendEvent.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, msg); return ret_hu_conv; } @@ -500,9 +509,10 @@ export class MessageSendEvent extends CommonBase { * Utility method to constructs a new SendShutdown-variant MessageSendEvent */ public static constructor_send_shutdown(node_id: Uint8Array, msg: Shutdown): MessageSendEvent { - const ret: number = bindings.MessageSendEvent_send_shutdown(bindings.encodeUint8Array(bindings.check_arr_len(node_id, 33)), msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + const ret: bigint = bindings.MessageSendEvent_send_shutdown(bindings.encodeUint8Array(bindings.check_arr_len(node_id, 33)), msg == null ? 0n : CommonBase.get_ptr_of(msg)); const ret_hu_conv: MessageSendEvent = MessageSendEvent.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, msg); return ret_hu_conv; } @@ -510,9 +520,10 @@ export class MessageSendEvent extends CommonBase { * Utility method to constructs a new SendChannelReestablish-variant MessageSendEvent */ public static constructor_send_channel_reestablish(node_id: Uint8Array, msg: ChannelReestablish): MessageSendEvent { - const ret: number = bindings.MessageSendEvent_send_channel_reestablish(bindings.encodeUint8Array(bindings.check_arr_len(node_id, 33)), msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + const ret: bigint = bindings.MessageSendEvent_send_channel_reestablish(bindings.encodeUint8Array(bindings.check_arr_len(node_id, 33)), msg == null ? 0n : CommonBase.get_ptr_of(msg)); const ret_hu_conv: MessageSendEvent = MessageSendEvent.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, msg); return ret_hu_conv; } @@ -520,9 +531,11 @@ export class MessageSendEvent extends CommonBase { * Utility method to constructs a new BroadcastChannelAnnouncement-variant MessageSendEvent */ public static constructor_broadcast_channel_announcement(msg: ChannelAnnouncement, update_msg: ChannelUpdate): MessageSendEvent { - const ret: number = bindings.MessageSendEvent_broadcast_channel_announcement(msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1, update_msg == null ? 0 : CommonBase.get_ptr_of(update_msg) & ~1); + const ret: bigint = bindings.MessageSendEvent_broadcast_channel_announcement(msg == null ? 0n : CommonBase.get_ptr_of(msg), update_msg == null ? 0n : CommonBase.get_ptr_of(update_msg)); const ret_hu_conv: MessageSendEvent = MessageSendEvent.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, msg); + CommonBase.add_ref_from(ret_hu_conv, update_msg); return ret_hu_conv; } @@ -530,9 +543,10 @@ export class MessageSendEvent extends CommonBase { * Utility method to constructs a new BroadcastNodeAnnouncement-variant MessageSendEvent */ public static constructor_broadcast_node_announcement(msg: NodeAnnouncement): MessageSendEvent { - const ret: number = bindings.MessageSendEvent_broadcast_node_announcement(msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + const ret: bigint = bindings.MessageSendEvent_broadcast_node_announcement(msg == null ? 0n : CommonBase.get_ptr_of(msg)); const ret_hu_conv: MessageSendEvent = MessageSendEvent.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, msg); return ret_hu_conv; } @@ -540,9 +554,10 @@ export class MessageSendEvent extends CommonBase { * Utility method to constructs a new BroadcastChannelUpdate-variant MessageSendEvent */ public static constructor_broadcast_channel_update(msg: ChannelUpdate): MessageSendEvent { - const ret: number = bindings.MessageSendEvent_broadcast_channel_update(msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + const ret: bigint = bindings.MessageSendEvent_broadcast_channel_update(msg == null ? 0n : CommonBase.get_ptr_of(msg)); const ret_hu_conv: MessageSendEvent = MessageSendEvent.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, msg); return ret_hu_conv; } @@ -550,9 +565,10 @@ export class MessageSendEvent extends CommonBase { * Utility method to constructs a new SendChannelUpdate-variant MessageSendEvent */ public static constructor_send_channel_update(node_id: Uint8Array, msg: ChannelUpdate): MessageSendEvent { - const ret: number = bindings.MessageSendEvent_send_channel_update(bindings.encodeUint8Array(bindings.check_arr_len(node_id, 33)), msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + const ret: bigint = bindings.MessageSendEvent_send_channel_update(bindings.encodeUint8Array(bindings.check_arr_len(node_id, 33)), msg == null ? 0n : CommonBase.get_ptr_of(msg)); const ret_hu_conv: MessageSendEvent = MessageSendEvent.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, msg); return ret_hu_conv; } @@ -560,7 +576,7 @@ export class MessageSendEvent extends CommonBase { * Utility method to constructs a new HandleError-variant MessageSendEvent */ public static constructor_handle_error(node_id: Uint8Array, action: ErrorAction): MessageSendEvent { - const ret: number = bindings.MessageSendEvent_handle_error(bindings.encodeUint8Array(bindings.check_arr_len(node_id, 33)), CommonBase.get_ptr_of(action)); + const ret: bigint = bindings.MessageSendEvent_handle_error(bindings.encodeUint8Array(bindings.check_arr_len(node_id, 33)), CommonBase.get_ptr_of(action)); const ret_hu_conv: MessageSendEvent = MessageSendEvent.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -570,9 +586,10 @@ export class MessageSendEvent extends CommonBase { * Utility method to constructs a new SendChannelRangeQuery-variant MessageSendEvent */ public static constructor_send_channel_range_query(node_id: Uint8Array, msg: QueryChannelRange): MessageSendEvent { - const ret: number = bindings.MessageSendEvent_send_channel_range_query(bindings.encodeUint8Array(bindings.check_arr_len(node_id, 33)), msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + const ret: bigint = bindings.MessageSendEvent_send_channel_range_query(bindings.encodeUint8Array(bindings.check_arr_len(node_id, 33)), msg == null ? 0n : CommonBase.get_ptr_of(msg)); const ret_hu_conv: MessageSendEvent = MessageSendEvent.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, msg); return ret_hu_conv; } @@ -580,9 +597,10 @@ export class MessageSendEvent extends CommonBase { * Utility method to constructs a new SendShortIdsQuery-variant MessageSendEvent */ public static constructor_send_short_ids_query(node_id: Uint8Array, msg: QueryShortChannelIds): MessageSendEvent { - const ret: number = bindings.MessageSendEvent_send_short_ids_query(bindings.encodeUint8Array(bindings.check_arr_len(node_id, 33)), msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + const ret: bigint = bindings.MessageSendEvent_send_short_ids_query(bindings.encodeUint8Array(bindings.check_arr_len(node_id, 33)), msg == null ? 0n : CommonBase.get_ptr_of(msg)); const ret_hu_conv: MessageSendEvent = MessageSendEvent.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, msg); return ret_hu_conv; } @@ -590,9 +608,10 @@ export class MessageSendEvent extends CommonBase { * Utility method to constructs a new SendReplyChannelRange-variant MessageSendEvent */ public static constructor_send_reply_channel_range(node_id: Uint8Array, msg: ReplyChannelRange): MessageSendEvent { - const ret: number = bindings.MessageSendEvent_send_reply_channel_range(bindings.encodeUint8Array(bindings.check_arr_len(node_id, 33)), msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + const ret: bigint = bindings.MessageSendEvent_send_reply_channel_range(bindings.encodeUint8Array(bindings.check_arr_len(node_id, 33)), msg == null ? 0n : CommonBase.get_ptr_of(msg)); const ret_hu_conv: MessageSendEvent = MessageSendEvent.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, msg); return ret_hu_conv; } @@ -600,9 +619,10 @@ export class MessageSendEvent extends CommonBase { * Utility method to constructs a new SendGossipTimestampFilter-variant MessageSendEvent */ public static constructor_send_gossip_timestamp_filter(node_id: Uint8Array, msg: GossipTimestampFilter): MessageSendEvent { - const ret: number = bindings.MessageSendEvent_send_gossip_timestamp_filter(bindings.encodeUint8Array(bindings.check_arr_len(node_id, 33)), msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + const ret: bigint = bindings.MessageSendEvent_send_gossip_timestamp_filter(bindings.encodeUint8Array(bindings.check_arr_len(node_id, 33)), msg == null ? 0n : CommonBase.get_ptr_of(msg)); const ret_hu_conv: MessageSendEvent = MessageSendEvent.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, msg); return ret_hu_conv; } @@ -618,12 +638,12 @@ export class MessageSendEvent_SendAcceptChannel extends MessageSendEvent { */ public msg: AcceptChannel; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const node_id: number = bindings.LDKMessageSendEvent_SendAcceptChannel_get_node_id(ptr); const node_id_conv: Uint8Array = bindings.decodeUint8Array(node_id); this.node_id = node_id_conv; - const msg: number = bindings.LDKMessageSendEvent_SendAcceptChannel_get_msg(ptr); + const msg: bigint = bindings.LDKMessageSendEvent_SendAcceptChannel_get_msg(ptr); const msg_hu_conv: AcceptChannel = new AcceptChannel(null, msg); CommonBase.add_ref_from(msg_hu_conv, this); this.msg = msg_hu_conv; @@ -640,12 +660,12 @@ export class MessageSendEvent_SendOpenChannel extends MessageSendEvent { */ public msg: OpenChannel; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const node_id: number = bindings.LDKMessageSendEvent_SendOpenChannel_get_node_id(ptr); const node_id_conv: Uint8Array = bindings.decodeUint8Array(node_id); this.node_id = node_id_conv; - const msg: number = bindings.LDKMessageSendEvent_SendOpenChannel_get_msg(ptr); + const msg: bigint = bindings.LDKMessageSendEvent_SendOpenChannel_get_msg(ptr); const msg_hu_conv: OpenChannel = new OpenChannel(null, msg); CommonBase.add_ref_from(msg_hu_conv, this); this.msg = msg_hu_conv; @@ -662,12 +682,12 @@ export class MessageSendEvent_SendFundingCreated extends MessageSendEvent { */ public msg: FundingCreated; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const node_id: number = bindings.LDKMessageSendEvent_SendFundingCreated_get_node_id(ptr); const node_id_conv: Uint8Array = bindings.decodeUint8Array(node_id); this.node_id = node_id_conv; - const msg: number = bindings.LDKMessageSendEvent_SendFundingCreated_get_msg(ptr); + const msg: bigint = bindings.LDKMessageSendEvent_SendFundingCreated_get_msg(ptr); const msg_hu_conv: FundingCreated = new FundingCreated(null, msg); CommonBase.add_ref_from(msg_hu_conv, this); this.msg = msg_hu_conv; @@ -684,12 +704,12 @@ export class MessageSendEvent_SendFundingSigned extends MessageSendEvent { */ public msg: FundingSigned; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const node_id: number = bindings.LDKMessageSendEvent_SendFundingSigned_get_node_id(ptr); const node_id_conv: Uint8Array = bindings.decodeUint8Array(node_id); this.node_id = node_id_conv; - const msg: number = bindings.LDKMessageSendEvent_SendFundingSigned_get_msg(ptr); + const msg: bigint = bindings.LDKMessageSendEvent_SendFundingSigned_get_msg(ptr); const msg_hu_conv: FundingSigned = new FundingSigned(null, msg); CommonBase.add_ref_from(msg_hu_conv, this); this.msg = msg_hu_conv; @@ -706,12 +726,12 @@ export class MessageSendEvent_SendChannelReady extends MessageSendEvent { */ public msg: ChannelReady; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const node_id: number = bindings.LDKMessageSendEvent_SendChannelReady_get_node_id(ptr); const node_id_conv: Uint8Array = bindings.decodeUint8Array(node_id); this.node_id = node_id_conv; - const msg: number = bindings.LDKMessageSendEvent_SendChannelReady_get_msg(ptr); + const msg: bigint = bindings.LDKMessageSendEvent_SendChannelReady_get_msg(ptr); const msg_hu_conv: ChannelReady = new ChannelReady(null, msg); CommonBase.add_ref_from(msg_hu_conv, this); this.msg = msg_hu_conv; @@ -728,12 +748,12 @@ export class MessageSendEvent_SendAnnouncementSignatures extends MessageSendEven */ public msg: AnnouncementSignatures; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const node_id: number = bindings.LDKMessageSendEvent_SendAnnouncementSignatures_get_node_id(ptr); const node_id_conv: Uint8Array = bindings.decodeUint8Array(node_id); this.node_id = node_id_conv; - const msg: number = bindings.LDKMessageSendEvent_SendAnnouncementSignatures_get_msg(ptr); + const msg: bigint = bindings.LDKMessageSendEvent_SendAnnouncementSignatures_get_msg(ptr); const msg_hu_conv: AnnouncementSignatures = new AnnouncementSignatures(null, msg); CommonBase.add_ref_from(msg_hu_conv, this); this.msg = msg_hu_conv; @@ -750,12 +770,12 @@ export class MessageSendEvent_UpdateHTLCs extends MessageSendEvent { */ public updates: CommitmentUpdate; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const node_id: number = bindings.LDKMessageSendEvent_UpdateHTLCs_get_node_id(ptr); const node_id_conv: Uint8Array = bindings.decodeUint8Array(node_id); this.node_id = node_id_conv; - const updates: number = bindings.LDKMessageSendEvent_UpdateHTLCs_get_updates(ptr); + const updates: bigint = bindings.LDKMessageSendEvent_UpdateHTLCs_get_updates(ptr); const updates_hu_conv: CommitmentUpdate = new CommitmentUpdate(null, updates); CommonBase.add_ref_from(updates_hu_conv, this); this.updates = updates_hu_conv; @@ -772,12 +792,12 @@ export class MessageSendEvent_SendRevokeAndACK extends MessageSendEvent { */ public msg: RevokeAndACK; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const node_id: number = bindings.LDKMessageSendEvent_SendRevokeAndACK_get_node_id(ptr); const node_id_conv: Uint8Array = bindings.decodeUint8Array(node_id); this.node_id = node_id_conv; - const msg: number = bindings.LDKMessageSendEvent_SendRevokeAndACK_get_msg(ptr); + const msg: bigint = bindings.LDKMessageSendEvent_SendRevokeAndACK_get_msg(ptr); const msg_hu_conv: RevokeAndACK = new RevokeAndACK(null, msg); CommonBase.add_ref_from(msg_hu_conv, this); this.msg = msg_hu_conv; @@ -794,12 +814,12 @@ export class MessageSendEvent_SendClosingSigned extends MessageSendEvent { */ public msg: ClosingSigned; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const node_id: number = bindings.LDKMessageSendEvent_SendClosingSigned_get_node_id(ptr); const node_id_conv: Uint8Array = bindings.decodeUint8Array(node_id); this.node_id = node_id_conv; - const msg: number = bindings.LDKMessageSendEvent_SendClosingSigned_get_msg(ptr); + const msg: bigint = bindings.LDKMessageSendEvent_SendClosingSigned_get_msg(ptr); const msg_hu_conv: ClosingSigned = new ClosingSigned(null, msg); CommonBase.add_ref_from(msg_hu_conv, this); this.msg = msg_hu_conv; @@ -816,12 +836,12 @@ export class MessageSendEvent_SendShutdown extends MessageSendEvent { */ public msg: Shutdown; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const node_id: number = bindings.LDKMessageSendEvent_SendShutdown_get_node_id(ptr); const node_id_conv: Uint8Array = bindings.decodeUint8Array(node_id); this.node_id = node_id_conv; - const msg: number = bindings.LDKMessageSendEvent_SendShutdown_get_msg(ptr); + const msg: bigint = bindings.LDKMessageSendEvent_SendShutdown_get_msg(ptr); const msg_hu_conv: Shutdown = new Shutdown(null, msg); CommonBase.add_ref_from(msg_hu_conv, this); this.msg = msg_hu_conv; @@ -838,12 +858,12 @@ export class MessageSendEvent_SendChannelReestablish extends MessageSendEvent { */ public msg: ChannelReestablish; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const node_id: number = bindings.LDKMessageSendEvent_SendChannelReestablish_get_node_id(ptr); const node_id_conv: Uint8Array = bindings.decodeUint8Array(node_id); this.node_id = node_id_conv; - const msg: number = bindings.LDKMessageSendEvent_SendChannelReestablish_get_msg(ptr); + const msg: bigint = bindings.LDKMessageSendEvent_SendChannelReestablish_get_msg(ptr); const msg_hu_conv: ChannelReestablish = new ChannelReestablish(null, msg); CommonBase.add_ref_from(msg_hu_conv, this); this.msg = msg_hu_conv; @@ -860,13 +880,13 @@ export class MessageSendEvent_BroadcastChannelAnnouncement extends MessageSendEv */ public update_msg: ChannelUpdate; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); - const msg: number = bindings.LDKMessageSendEvent_BroadcastChannelAnnouncement_get_msg(ptr); + const msg: bigint = bindings.LDKMessageSendEvent_BroadcastChannelAnnouncement_get_msg(ptr); const msg_hu_conv: ChannelAnnouncement = new ChannelAnnouncement(null, msg); CommonBase.add_ref_from(msg_hu_conv, this); this.msg = msg_hu_conv; - const update_msg: number = bindings.LDKMessageSendEvent_BroadcastChannelAnnouncement_get_update_msg(ptr); + const update_msg: bigint = bindings.LDKMessageSendEvent_BroadcastChannelAnnouncement_get_update_msg(ptr); const update_msg_hu_conv: ChannelUpdate = new ChannelUpdate(null, update_msg); CommonBase.add_ref_from(update_msg_hu_conv, this); this.update_msg = update_msg_hu_conv; @@ -879,9 +899,9 @@ export class MessageSendEvent_BroadcastNodeAnnouncement extends MessageSendEvent */ public msg: NodeAnnouncement; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); - const msg: number = bindings.LDKMessageSendEvent_BroadcastNodeAnnouncement_get_msg(ptr); + const msg: bigint = bindings.LDKMessageSendEvent_BroadcastNodeAnnouncement_get_msg(ptr); const msg_hu_conv: NodeAnnouncement = new NodeAnnouncement(null, msg); CommonBase.add_ref_from(msg_hu_conv, this); this.msg = msg_hu_conv; @@ -894,9 +914,9 @@ export class MessageSendEvent_BroadcastChannelUpdate extends MessageSendEvent { */ public msg: ChannelUpdate; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); - const msg: number = bindings.LDKMessageSendEvent_BroadcastChannelUpdate_get_msg(ptr); + const msg: bigint = bindings.LDKMessageSendEvent_BroadcastChannelUpdate_get_msg(ptr); const msg_hu_conv: ChannelUpdate = new ChannelUpdate(null, msg); CommonBase.add_ref_from(msg_hu_conv, this); this.msg = msg_hu_conv; @@ -913,12 +933,12 @@ export class MessageSendEvent_SendChannelUpdate extends MessageSendEvent { */ public msg: ChannelUpdate; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const node_id: number = bindings.LDKMessageSendEvent_SendChannelUpdate_get_node_id(ptr); const node_id_conv: Uint8Array = bindings.decodeUint8Array(node_id); this.node_id = node_id_conv; - const msg: number = bindings.LDKMessageSendEvent_SendChannelUpdate_get_msg(ptr); + const msg: bigint = bindings.LDKMessageSendEvent_SendChannelUpdate_get_msg(ptr); const msg_hu_conv: ChannelUpdate = new ChannelUpdate(null, msg); CommonBase.add_ref_from(msg_hu_conv, this); this.msg = msg_hu_conv; @@ -935,12 +955,12 @@ export class MessageSendEvent_HandleError extends MessageSendEvent { */ public action: ErrorAction; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const node_id: number = bindings.LDKMessageSendEvent_HandleError_get_node_id(ptr); const node_id_conv: Uint8Array = bindings.decodeUint8Array(node_id); this.node_id = node_id_conv; - const action: number = bindings.LDKMessageSendEvent_HandleError_get_action(ptr); + const action: bigint = bindings.LDKMessageSendEvent_HandleError_get_action(ptr); const action_hu_conv: ErrorAction = ErrorAction.constr_from_ptr(action); CommonBase.add_ref_from(action_hu_conv, this); this.action = action_hu_conv; @@ -957,12 +977,12 @@ export class MessageSendEvent_SendChannelRangeQuery extends MessageSendEvent { */ public msg: QueryChannelRange; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const node_id: number = bindings.LDKMessageSendEvent_SendChannelRangeQuery_get_node_id(ptr); const node_id_conv: Uint8Array = bindings.decodeUint8Array(node_id); this.node_id = node_id_conv; - const msg: number = bindings.LDKMessageSendEvent_SendChannelRangeQuery_get_msg(ptr); + const msg: bigint = bindings.LDKMessageSendEvent_SendChannelRangeQuery_get_msg(ptr); const msg_hu_conv: QueryChannelRange = new QueryChannelRange(null, msg); CommonBase.add_ref_from(msg_hu_conv, this); this.msg = msg_hu_conv; @@ -979,12 +999,12 @@ export class MessageSendEvent_SendShortIdsQuery extends MessageSendEvent { */ public msg: QueryShortChannelIds; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const node_id: number = bindings.LDKMessageSendEvent_SendShortIdsQuery_get_node_id(ptr); const node_id_conv: Uint8Array = bindings.decodeUint8Array(node_id); this.node_id = node_id_conv; - const msg: number = bindings.LDKMessageSendEvent_SendShortIdsQuery_get_msg(ptr); + const msg: bigint = bindings.LDKMessageSendEvent_SendShortIdsQuery_get_msg(ptr); const msg_hu_conv: QueryShortChannelIds = new QueryShortChannelIds(null, msg); CommonBase.add_ref_from(msg_hu_conv, this); this.msg = msg_hu_conv; @@ -1001,12 +1021,12 @@ export class MessageSendEvent_SendReplyChannelRange extends MessageSendEvent { */ public msg: ReplyChannelRange; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const node_id: number = bindings.LDKMessageSendEvent_SendReplyChannelRange_get_node_id(ptr); const node_id_conv: Uint8Array = bindings.decodeUint8Array(node_id); this.node_id = node_id_conv; - const msg: number = bindings.LDKMessageSendEvent_SendReplyChannelRange_get_msg(ptr); + const msg: bigint = bindings.LDKMessageSendEvent_SendReplyChannelRange_get_msg(ptr); const msg_hu_conv: ReplyChannelRange = new ReplyChannelRange(null, msg); CommonBase.add_ref_from(msg_hu_conv, this); this.msg = msg_hu_conv; @@ -1023,12 +1043,12 @@ export class MessageSendEvent_SendGossipTimestampFilter extends MessageSendEvent */ public msg: GossipTimestampFilter; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const node_id: number = bindings.LDKMessageSendEvent_SendGossipTimestampFilter_get_node_id(ptr); const node_id_conv: Uint8Array = bindings.decodeUint8Array(node_id); this.node_id = node_id_conv; - const msg: number = bindings.LDKMessageSendEvent_SendGossipTimestampFilter_get_msg(ptr); + const msg: bigint = bindings.LDKMessageSendEvent_SendGossipTimestampFilter_get_msg(ptr); const msg_hu_conv: GossipTimestampFilter = new GossipTimestampFilter(null, msg); CommonBase.add_ref_from(msg_hu_conv, this); this.msg = msg_hu_conv; diff --git a/ts/structs/MessageSendEventsProvider.mts b/ts/structs/MessageSendEventsProvider.mts index e81ff943..4d62daf2 100644 --- a/ts/structs/MessageSendEventsProvider.mts +++ b/ts/structs/MessageSendEventsProvider.mts @@ -378,7 +378,7 @@ export class MessageSendEventsProvider extends CommonBase { public bindings_instance?: bindings.LDKMessageSendEventsProvider; /* @internal */ - constructor(_dummy: object, ptr: number) { + constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.MessageSendEventsProvider_free); this.bindings_instance = null; } @@ -389,11 +389,11 @@ export class MessageSendEventsProvider extends CommonBase { let structImplementation = { get_and_clear_pending_msg_events (): number { const ret: MessageSendEvent[] = arg.get_and_clear_pending_msg_events(); - const result: number = bindings.encodeUint32Array(ret != null ? ret.map(ret_conv_18 => ret_conv_18 == null ? 0 : ret_conv_18.clone_ptr()) : null); + const result: number = bindings.encodeUint64Array(ret != null ? ret.map(ret_conv_18 => ret_conv_18 == null ? 0n : ret_conv_18.clone_ptr()) : null); return result; }, } as bindings.LDKMessageSendEventsProvider; - const ptr: number = bindings.LDKMessageSendEventsProvider_new(structImplementation); + const ptr: bigint = bindings.LDKMessageSendEventsProvider_new(structImplementation); impl_holder.held = new MessageSendEventsProvider(null, ptr); impl_holder.held.bindings_instance = structImplementation; @@ -409,7 +409,7 @@ export class MessageSendEventsProvider extends CommonBase { const ret_conv_18_len: number = bindings.getArrayLength(ret); const ret_conv_18_arr: MessageSendEvent[] = new Array(ret_conv_18_len).fill(null); for (var s = 0; s < ret_conv_18_len; s++) { - const ret_conv_18: number = bindings.getU32ArrayElem(ret, s); + const ret_conv_18: bigint = bindings.getU64ArrayElem(ret, s); const ret_conv_18_hu_conv: MessageSendEvent = MessageSendEvent.constr_from_ptr(ret_conv_18); CommonBase.add_ref_from(ret_conv_18_hu_conv, this); ret_conv_18_arr[s] = ret_conv_18_hu_conv; diff --git a/ts/structs/MinFinalCltvExpiry.mts b/ts/structs/MinFinalCltvExpiry.mts index 84884568..5e00c563 100644 --- a/ts/structs/MinFinalCltvExpiry.mts +++ b/ts/structs/MinFinalCltvExpiry.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class MinFinalCltvExpiry extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.MinFinalCltvExpiry_free); } @@ -378,14 +378,14 @@ export class MinFinalCltvExpiry extends CommonBase { * Constructs a new MinFinalCltvExpiry given each field */ public static constructor_new(a_arg: bigint): MinFinalCltvExpiry { - const ret: number = bindings.MinFinalCltvExpiry_new(a_arg); + const ret: bigint = bindings.MinFinalCltvExpiry_new(a_arg); const ret_hu_conv: MinFinalCltvExpiry = new MinFinalCltvExpiry(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.MinFinalCltvExpiry_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.MinFinalCltvExpiry_clone_ptr(this.ptr); return ret; } @@ -393,7 +393,7 @@ export class MinFinalCltvExpiry extends CommonBase { * Creates a copy of the MinFinalCltvExpiry */ public clone(): MinFinalCltvExpiry { - const ret: number = bindings.MinFinalCltvExpiry_clone(this.ptr); + const ret: bigint = bindings.MinFinalCltvExpiry_clone(this.ptr); const ret_hu_conv: MinFinalCltvExpiry = new MinFinalCltvExpiry(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -413,7 +413,7 @@ export class MinFinalCltvExpiry extends CommonBase { * Two objects with NULL inner values will be considered "equal" here. */ public eq(b: MinFinalCltvExpiry): boolean { - const ret: boolean = bindings.MinFinalCltvExpiry_eq(this.ptr, b == null ? 0 : CommonBase.get_ptr_of(b) & ~1); + const ret: boolean = bindings.MinFinalCltvExpiry_eq(this.ptr, b == null ? 0n : CommonBase.get_ptr_of(b)); CommonBase.add_ref_from(this, b); return ret; } diff --git a/ts/structs/MonitorEvent.mts b/ts/structs/MonitorEvent.mts index d615ded4..63bdd036 100644 --- a/ts/structs/MonitorEvent.mts +++ b/ts/structs/MonitorEvent.mts @@ -359,9 +359,9 @@ import * as bindings from '../bindings.mjs' * An event to be processed by the ChannelManager. */ export class MonitorEvent extends CommonBase { - protected constructor(_dummy: object, ptr: number) { super(ptr, bindings.MonitorEvent_free); } + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.MonitorEvent_free); } /* @internal */ - public static constr_from_ptr(ptr: number): MonitorEvent { + public static constr_from_ptr(ptr: bigint): MonitorEvent { const raw_ty: number = bindings.LDKMonitorEvent_ty_from_ptr(ptr); switch (raw_ty) { case 0: return new MonitorEvent_HTLCEvent(ptr); @@ -373,8 +373,8 @@ export class MonitorEvent extends CommonBase { } } - public clone_ptr(): number { - const ret: number = bindings.MonitorEvent_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.MonitorEvent_clone_ptr(this.ptr); return ret; } @@ -382,7 +382,7 @@ export class MonitorEvent extends CommonBase { * Creates a copy of the MonitorEvent */ public clone(): MonitorEvent { - const ret: number = bindings.MonitorEvent_clone(this.ptr); + const ret: bigint = bindings.MonitorEvent_clone(this.ptr); const ret_hu_conv: MonitorEvent = MonitorEvent.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -392,9 +392,10 @@ export class MonitorEvent extends CommonBase { * Utility method to constructs a new HTLCEvent-variant MonitorEvent */ public static constructor_htlcevent(a: HTLCUpdate): MonitorEvent { - const ret: number = bindings.MonitorEvent_htlcevent(a == null ? 0 : CommonBase.get_ptr_of(a) & ~1); + const ret: bigint = bindings.MonitorEvent_htlcevent(a == null ? 0n : CommonBase.get_ptr_of(a)); const ret_hu_conv: MonitorEvent = MonitorEvent.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, a); return ret_hu_conv; } @@ -402,9 +403,10 @@ export class MonitorEvent extends CommonBase { * Utility method to constructs a new CommitmentTxConfirmed-variant MonitorEvent */ public static constructor_commitment_tx_confirmed(a: OutPoint): MonitorEvent { - const ret: number = bindings.MonitorEvent_commitment_tx_confirmed(a == null ? 0 : CommonBase.get_ptr_of(a) & ~1); + const ret: bigint = bindings.MonitorEvent_commitment_tx_confirmed(a == null ? 0n : CommonBase.get_ptr_of(a)); const ret_hu_conv: MonitorEvent = MonitorEvent.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, a); return ret_hu_conv; } @@ -412,9 +414,10 @@ export class MonitorEvent extends CommonBase { * Utility method to constructs a new UpdateCompleted-variant MonitorEvent */ public static constructor_update_completed(funding_txo: OutPoint, monitor_update_id: bigint): MonitorEvent { - const ret: number = bindings.MonitorEvent_update_completed(funding_txo == null ? 0 : CommonBase.get_ptr_of(funding_txo) & ~1, monitor_update_id); + const ret: bigint = bindings.MonitorEvent_update_completed(funding_txo == null ? 0n : CommonBase.get_ptr_of(funding_txo), monitor_update_id); const ret_hu_conv: MonitorEvent = MonitorEvent.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, funding_txo); return ret_hu_conv; } @@ -422,9 +425,10 @@ export class MonitorEvent extends CommonBase { * Utility method to constructs a new UpdateFailed-variant MonitorEvent */ public static constructor_update_failed(a: OutPoint): MonitorEvent { - const ret: number = bindings.MonitorEvent_update_failed(a == null ? 0 : CommonBase.get_ptr_of(a) & ~1); + const ret: bigint = bindings.MonitorEvent_update_failed(a == null ? 0n : CommonBase.get_ptr_of(a)); const ret_hu_conv: MonitorEvent = MonitorEvent.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, a); return ret_hu_conv; } @@ -442,9 +446,9 @@ export class MonitorEvent extends CommonBase { export class MonitorEvent_HTLCEvent extends MonitorEvent { public htlc_event: HTLCUpdate; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); - const htlc_event: number = bindings.LDKMonitorEvent_HTLCEvent_get_htlc_event(ptr); + const htlc_event: bigint = bindings.LDKMonitorEvent_HTLCEvent_get_htlc_event(ptr); const htlc_event_hu_conv: HTLCUpdate = new HTLCUpdate(null, htlc_event); CommonBase.add_ref_from(htlc_event_hu_conv, this); this.htlc_event = htlc_event_hu_conv; @@ -454,9 +458,9 @@ export class MonitorEvent_HTLCEvent extends MonitorEvent { export class MonitorEvent_CommitmentTxConfirmed extends MonitorEvent { public commitment_tx_confirmed: OutPoint; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); - const commitment_tx_confirmed: number = bindings.LDKMonitorEvent_CommitmentTxConfirmed_get_commitment_tx_confirmed(ptr); + const commitment_tx_confirmed: bigint = bindings.LDKMonitorEvent_CommitmentTxConfirmed_get_commitment_tx_confirmed(ptr); const commitment_tx_confirmed_hu_conv: OutPoint = new OutPoint(null, commitment_tx_confirmed); CommonBase.add_ref_from(commitment_tx_confirmed_hu_conv, this); this.commitment_tx_confirmed = commitment_tx_confirmed_hu_conv; @@ -477,9 +481,9 @@ export class MonitorEvent_UpdateCompleted extends MonitorEvent { */ public monitor_update_id: bigint; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); - const funding_txo: number = bindings.LDKMonitorEvent_UpdateCompleted_get_funding_txo(ptr); + const funding_txo: bigint = bindings.LDKMonitorEvent_UpdateCompleted_get_funding_txo(ptr); const funding_txo_hu_conv: OutPoint = new OutPoint(null, funding_txo); CommonBase.add_ref_from(funding_txo_hu_conv, this); this.funding_txo = funding_txo_hu_conv; @@ -490,9 +494,9 @@ export class MonitorEvent_UpdateCompleted extends MonitorEvent { export class MonitorEvent_UpdateFailed extends MonitorEvent { public update_failed: OutPoint; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); - const update_failed: number = bindings.LDKMonitorEvent_UpdateFailed_get_update_failed(ptr); + const update_failed: bigint = bindings.LDKMonitorEvent_UpdateFailed_get_update_failed(ptr); const update_failed_hu_conv: OutPoint = new OutPoint(null, update_failed); CommonBase.add_ref_from(update_failed_hu_conv, this); this.update_failed = update_failed_hu_conv; diff --git a/ts/structs/MonitorUpdateId.mts b/ts/structs/MonitorUpdateId.mts index 3eb6f9ed..e4209b0e 100644 --- a/ts/structs/MonitorUpdateId.mts +++ b/ts/structs/MonitorUpdateId.mts @@ -361,12 +361,12 @@ import * as bindings from '../bindings.mjs' */ export class MonitorUpdateId extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.MonitorUpdateId_free); } - public clone_ptr(): number { - const ret: number = bindings.MonitorUpdateId_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.MonitorUpdateId_clone_ptr(this.ptr); return ret; } @@ -374,7 +374,7 @@ export class MonitorUpdateId extends CommonBase { * Creates a copy of the MonitorUpdateId */ public clone(): MonitorUpdateId { - const ret: number = bindings.MonitorUpdateId_clone(this.ptr); + const ret: bigint = bindings.MonitorUpdateId_clone(this.ptr); const ret_hu_conv: MonitorUpdateId = new MonitorUpdateId(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -394,7 +394,7 @@ export class MonitorUpdateId extends CommonBase { * Two objects with NULL inner values will be considered "equal" here. */ public eq(b: MonitorUpdateId): boolean { - const ret: boolean = bindings.MonitorUpdateId_eq(this.ptr, b == null ? 0 : CommonBase.get_ptr_of(b) & ~1); + const ret: boolean = bindings.MonitorUpdateId_eq(this.ptr, b == null ? 0n : CommonBase.get_ptr_of(b)); CommonBase.add_ref_from(this, b); return ret; } diff --git a/ts/structs/MultiThreadedLockableScore.mts b/ts/structs/MultiThreadedLockableScore.mts index 74a39fe6..1737bb79 100644 --- a/ts/structs/MultiThreadedLockableScore.mts +++ b/ts/structs/MultiThreadedLockableScore.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class MultiThreadedLockableScore extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.MultiThreadedLockableScore_free); } @@ -378,7 +378,7 @@ export class MultiThreadedLockableScore extends CommonBase { * Creates a new [`MultiThreadedLockableScore`] given an underlying [`Score`]. */ public static constructor_new(score: Score): MultiThreadedLockableScore { - const ret: number = bindings.MultiThreadedLockableScore_new(score == null ? 0 : CommonBase.get_ptr_of(score)); + const ret: bigint = bindings.MultiThreadedLockableScore_new(score == null ? 0n : CommonBase.get_ptr_of(score)); const ret_hu_conv: MultiThreadedLockableScore = new MultiThreadedLockableScore(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); CommonBase.add_ref_from(ret_hu_conv, score); diff --git a/ts/structs/NetAddress.mts b/ts/structs/NetAddress.mts index 3b61cb17..5ce77e5f 100644 --- a/ts/structs/NetAddress.mts +++ b/ts/structs/NetAddress.mts @@ -359,9 +359,9 @@ import * as bindings from '../bindings.mjs' * An address which can be used to connect to a remote peer */ export class NetAddress extends CommonBase { - protected constructor(_dummy: object, ptr: number) { super(ptr, bindings.NetAddress_free); } + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.NetAddress_free); } /* @internal */ - public static constr_from_ptr(ptr: number): NetAddress { + public static constr_from_ptr(ptr: bigint): NetAddress { const raw_ty: number = bindings.LDKNetAddress_ty_from_ptr(ptr); switch (raw_ty) { case 0: return new NetAddress_IPv4(ptr); @@ -374,8 +374,8 @@ export class NetAddress extends CommonBase { } } - public clone_ptr(): number { - const ret: number = bindings.NetAddress_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.NetAddress_clone_ptr(this.ptr); return ret; } @@ -383,7 +383,7 @@ export class NetAddress extends CommonBase { * Creates a copy of the NetAddress */ public clone(): NetAddress { - const ret: number = bindings.NetAddress_clone(this.ptr); + const ret: bigint = bindings.NetAddress_clone(this.ptr); const ret_hu_conv: NetAddress = NetAddress.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -393,7 +393,7 @@ export class NetAddress extends CommonBase { * Utility method to constructs a new IPv4-variant NetAddress */ public static constructor_ipv4(addr: Uint8Array, port: number): NetAddress { - const ret: number = bindings.NetAddress_ipv4(bindings.encodeUint8Array(bindings.check_arr_len(addr, 4)), port); + const ret: bigint = bindings.NetAddress_ipv4(bindings.encodeUint8Array(bindings.check_arr_len(addr, 4)), port); const ret_hu_conv: NetAddress = NetAddress.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -403,7 +403,7 @@ export class NetAddress extends CommonBase { * Utility method to constructs a new IPv6-variant NetAddress */ public static constructor_ipv6(addr: Uint8Array, port: number): NetAddress { - const ret: number = bindings.NetAddress_ipv6(bindings.encodeUint8Array(bindings.check_arr_len(addr, 16)), port); + const ret: bigint = bindings.NetAddress_ipv6(bindings.encodeUint8Array(bindings.check_arr_len(addr, 16)), port); const ret_hu_conv: NetAddress = NetAddress.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -413,7 +413,7 @@ export class NetAddress extends CommonBase { * Utility method to constructs a new OnionV2-variant NetAddress */ public static constructor_onion_v2(a: Uint8Array): NetAddress { - const ret: number = bindings.NetAddress_onion_v2(bindings.encodeUint8Array(bindings.check_arr_len(a, 12))); + const ret: bigint = bindings.NetAddress_onion_v2(bindings.encodeUint8Array(bindings.check_arr_len(a, 12))); const ret_hu_conv: NetAddress = NetAddress.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -423,7 +423,7 @@ export class NetAddress extends CommonBase { * Utility method to constructs a new OnionV3-variant NetAddress */ public static constructor_onion_v3(ed25519_pubkey: Uint8Array, checksum: number, version: number, port: number): NetAddress { - const ret: number = bindings.NetAddress_onion_v3(bindings.encodeUint8Array(bindings.check_arr_len(ed25519_pubkey, 32)), checksum, version, port); + const ret: bigint = bindings.NetAddress_onion_v3(bindings.encodeUint8Array(bindings.check_arr_len(ed25519_pubkey, 32)), checksum, version, port); const ret_hu_conv: NetAddress = NetAddress.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -433,9 +433,10 @@ export class NetAddress extends CommonBase { * Utility method to constructs a new Hostname-variant NetAddress */ public static constructor_hostname(hostname: Hostname, port: number): NetAddress { - const ret: number = bindings.NetAddress_hostname(hostname == null ? 0 : CommonBase.get_ptr_of(hostname) & ~1, port); + const ret: bigint = bindings.NetAddress_hostname(hostname == null ? 0n : CommonBase.get_ptr_of(hostname), port); const ret_hu_conv: NetAddress = NetAddress.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, hostname); return ret_hu_conv; } @@ -452,7 +453,7 @@ export class NetAddress extends CommonBase { * Read a NetAddress from a byte array, created by NetAddress_write */ public static constructor_read(ser: Uint8Array): Result_NetAddressDecodeErrorZ { - const ret: number = bindings.NetAddress_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.NetAddress_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_NetAddressDecodeErrorZ = Result_NetAddressDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -469,7 +470,7 @@ export class NetAddress_IPv4 extends NetAddress { */ public port: number; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const addr: number = bindings.LDKNetAddress_IPv4_get_addr(ptr); const addr_conv: Uint8Array = bindings.decodeUint8Array(addr); @@ -488,7 +489,7 @@ export class NetAddress_IPv6 extends NetAddress { */ public port: number; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const addr: number = bindings.LDKNetAddress_IPv6_get_addr(ptr); const addr_conv: Uint8Array = bindings.decodeUint8Array(addr); @@ -500,7 +501,7 @@ export class NetAddress_IPv6 extends NetAddress { export class NetAddress_OnionV2 extends NetAddress { public onion_v2: Uint8Array; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const onion_v2: number = bindings.LDKNetAddress_OnionV2_get_onion_v2(ptr); const onion_v2_conv: Uint8Array = bindings.decodeUint8Array(onion_v2); @@ -526,7 +527,7 @@ export class NetAddress_OnionV3 extends NetAddress { */ public port: number; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const ed25519_pubkey: number = bindings.LDKNetAddress_OnionV3_get_ed25519_pubkey(ptr); const ed25519_pubkey_conv: Uint8Array = bindings.decodeUint8Array(ed25519_pubkey); @@ -547,9 +548,9 @@ export class NetAddress_Hostname extends NetAddress { */ public port: number; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); - const hostname: number = bindings.LDKNetAddress_Hostname_get_hostname(ptr); + const hostname: bigint = bindings.LDKNetAddress_Hostname_get_hostname(ptr); const hostname_hu_conv: Hostname = new Hostname(null, hostname); CommonBase.add_ref_from(hostname_hu_conv, this); this.hostname = hostname_hu_conv; diff --git a/ts/structs/NetworkGraph.mts b/ts/structs/NetworkGraph.mts index f9154b51..3756f20e 100644 --- a/ts/structs/NetworkGraph.mts +++ b/ts/structs/NetworkGraph.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class NetworkGraph extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.NetworkGraph_free); } @@ -370,7 +370,7 @@ export class NetworkGraph extends CommonBase { * This copies the `inner` pointer in this_arg and thus the returned EventHandler must be freed before this_arg is */ public as_EventHandler(): EventHandler { - const ret: number = bindings.NetworkGraph_as_EventHandler(this.ptr); + const ret: bigint = bindings.NetworkGraph_as_EventHandler(this.ptr); const ret_hu_conv: EventHandler = new EventHandler(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -389,7 +389,7 @@ export class NetworkGraph extends CommonBase { * Read a NetworkGraph from a byte array, created by NetworkGraph_write */ public static constructor_read(ser: Uint8Array, arg: Logger): Result_NetworkGraphDecodeErrorZ { - const ret: number = bindings.NetworkGraph_read(bindings.encodeUint8Array(ser), arg == null ? 0 : CommonBase.get_ptr_of(arg)); + const ret: bigint = bindings.NetworkGraph_read(bindings.encodeUint8Array(ser), arg == null ? 0n : CommonBase.get_ptr_of(arg)); const ret_hu_conv: Result_NetworkGraphDecodeErrorZ = Result_NetworkGraphDecodeErrorZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, arg); return ret_hu_conv; @@ -399,7 +399,7 @@ export class NetworkGraph extends CommonBase { * Creates a new, empty, network graph. */ public static constructor_new(genesis_hash: Uint8Array, logger: Logger): NetworkGraph { - const ret: number = bindings.NetworkGraph_new(bindings.encodeUint8Array(bindings.check_arr_len(genesis_hash, 32)), logger == null ? 0 : CommonBase.get_ptr_of(logger)); + const ret: bigint = bindings.NetworkGraph_new(bindings.encodeUint8Array(bindings.check_arr_len(genesis_hash, 32)), logger == null ? 0n : CommonBase.get_ptr_of(logger)); const ret_hu_conv: NetworkGraph = new NetworkGraph(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); CommonBase.add_ref_from(ret_hu_conv, logger); @@ -410,7 +410,7 @@ export class NetworkGraph extends CommonBase { * Returns a read-only view of the network graph. */ public read_only(): ReadOnlyNetworkGraph { - const ret: number = bindings.NetworkGraph_read_only(this.ptr); + const ret: bigint = bindings.NetworkGraph_read_only(this.ptr); const ret_hu_conv: ReadOnlyNetworkGraph = new ReadOnlyNetworkGraph(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -421,7 +421,7 @@ export class NetworkGraph extends CommonBase { * It will be set by the rapid sync process after every sync completion. */ public get_last_rapid_gossip_sync_timestamp(): Option_u32Z { - const ret: number = bindings.NetworkGraph_get_last_rapid_gossip_sync_timestamp(this.ptr); + const ret: bigint = bindings.NetworkGraph_get_last_rapid_gossip_sync_timestamp(this.ptr); const ret_hu_conv: Option_u32Z = Option_u32Z.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -444,7 +444,7 @@ export class NetworkGraph extends CommonBase { * routing messages from a source using a protocol other than the lightning P2P protocol. */ public update_node_from_announcement(msg: NodeAnnouncement): Result_NoneLightningErrorZ { - const ret: number = bindings.NetworkGraph_update_node_from_announcement(this.ptr, msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + const ret: bigint = bindings.NetworkGraph_update_node_from_announcement(this.ptr, msg == null ? 0n : CommonBase.get_ptr_of(msg)); const ret_hu_conv: Result_NoneLightningErrorZ = Result_NoneLightningErrorZ.constr_from_ptr(ret); CommonBase.add_ref_from(this, msg); return ret_hu_conv; @@ -457,7 +457,7 @@ export class NetworkGraph extends CommonBase { * peers. */ public update_node_from_unsigned_announcement(msg: UnsignedNodeAnnouncement): Result_NoneLightningErrorZ { - const ret: number = bindings.NetworkGraph_update_node_from_unsigned_announcement(this.ptr, msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + const ret: bigint = bindings.NetworkGraph_update_node_from_unsigned_announcement(this.ptr, msg == null ? 0n : CommonBase.get_ptr_of(msg)); const ret_hu_conv: Result_NoneLightningErrorZ = Result_NoneLightningErrorZ.constr_from_ptr(ret); CommonBase.add_ref_from(this, msg); return ret_hu_conv; @@ -474,7 +474,7 @@ export class NetworkGraph extends CommonBase { * the corresponding UTXO exists on chain and is correctly-formatted. */ public update_channel_from_announcement(msg: ChannelAnnouncement, chain_access: Option_AccessZ): Result_NoneLightningErrorZ { - const ret: number = bindings.NetworkGraph_update_channel_from_announcement(this.ptr, msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1, CommonBase.get_ptr_of(chain_access)); + const ret: bigint = bindings.NetworkGraph_update_channel_from_announcement(this.ptr, msg == null ? 0n : CommonBase.get_ptr_of(msg), CommonBase.get_ptr_of(chain_access)); const ret_hu_conv: Result_NoneLightningErrorZ = Result_NoneLightningErrorZ.constr_from_ptr(ret); CommonBase.add_ref_from(this, msg); CommonBase.add_ref_from(this, chain_access); @@ -490,7 +490,7 @@ export class NetworkGraph extends CommonBase { * the corresponding UTXO exists on chain and is correctly-formatted. */ public update_channel_from_unsigned_announcement(msg: UnsignedChannelAnnouncement, chain_access: Option_AccessZ): Result_NoneLightningErrorZ { - const ret: number = bindings.NetworkGraph_update_channel_from_unsigned_announcement(this.ptr, msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1, CommonBase.get_ptr_of(chain_access)); + const ret: bigint = bindings.NetworkGraph_update_channel_from_unsigned_announcement(this.ptr, msg == null ? 0n : CommonBase.get_ptr_of(msg), CommonBase.get_ptr_of(chain_access)); const ret_hu_conv: Result_NoneLightningErrorZ = Result_NoneLightningErrorZ.constr_from_ptr(ret); CommonBase.add_ref_from(this, msg); CommonBase.add_ref_from(this, chain_access); @@ -506,8 +506,9 @@ export class NetworkGraph extends CommonBase { * All other parameters as used in [`msgs::UnsignedChannelAnnouncement`] fields. */ public add_channel_from_partial_announcement(short_channel_id: bigint, timestamp: bigint, features: ChannelFeatures, node_id_1: Uint8Array, node_id_2: Uint8Array): Result_NoneLightningErrorZ { - const ret: number = bindings.NetworkGraph_add_channel_from_partial_announcement(this.ptr, short_channel_id, timestamp, features == null ? 0 : CommonBase.get_ptr_of(features) & ~1, bindings.encodeUint8Array(bindings.check_arr_len(node_id_1, 33)), bindings.encodeUint8Array(bindings.check_arr_len(node_id_2, 33))); + const ret: bigint = bindings.NetworkGraph_add_channel_from_partial_announcement(this.ptr, short_channel_id, timestamp, features == null ? 0n : CommonBase.get_ptr_of(features), bindings.encodeUint8Array(bindings.check_arr_len(node_id_1, 33)), bindings.encodeUint8Array(bindings.check_arr_len(node_id_2, 33))); const ret_hu_conv: Result_NoneLightningErrorZ = Result_NoneLightningErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(this, features); return ret_hu_conv; } @@ -556,7 +557,7 @@ export class NetworkGraph extends CommonBase { * materially in the future will be rejected. */ public update_channel(msg: ChannelUpdate): Result_NoneLightningErrorZ { - const ret: number = bindings.NetworkGraph_update_channel(this.ptr, msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + const ret: bigint = bindings.NetworkGraph_update_channel(this.ptr, msg == null ? 0n : CommonBase.get_ptr_of(msg)); const ret_hu_conv: Result_NoneLightningErrorZ = Result_NoneLightningErrorZ.constr_from_ptr(ret); CommonBase.add_ref_from(this, msg); return ret_hu_conv; @@ -571,7 +572,7 @@ export class NetworkGraph extends CommonBase { * materially in the future will be rejected. */ public update_channel_unsigned(msg: UnsignedChannelUpdate): Result_NoneLightningErrorZ { - const ret: number = bindings.NetworkGraph_update_channel_unsigned(this.ptr, msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + const ret: bigint = bindings.NetworkGraph_update_channel_unsigned(this.ptr, msg == null ? 0n : CommonBase.get_ptr_of(msg)); const ret_hu_conv: Result_NoneLightningErrorZ = Result_NoneLightningErrorZ.constr_from_ptr(ret); CommonBase.add_ref_from(this, msg); return ret_hu_conv; diff --git a/ts/structs/NetworkUpdate.mts b/ts/structs/NetworkUpdate.mts index 5da7b68d..037d2a97 100644 --- a/ts/structs/NetworkUpdate.mts +++ b/ts/structs/NetworkUpdate.mts @@ -362,9 +362,9 @@ import * as bindings from '../bindings.mjs' * [BOLT #4]: https://github.com/lightning/bolts/blob/master/04-onion-routing.md */ export class NetworkUpdate extends CommonBase { - protected constructor(_dummy: object, ptr: number) { super(ptr, bindings.NetworkUpdate_free); } + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.NetworkUpdate_free); } /* @internal */ - public static constr_from_ptr(ptr: number): NetworkUpdate { + public static constr_from_ptr(ptr: bigint): NetworkUpdate { const raw_ty: number = bindings.LDKNetworkUpdate_ty_from_ptr(ptr); switch (raw_ty) { case 0: return new NetworkUpdate_ChannelUpdateMessage(ptr); @@ -375,8 +375,8 @@ export class NetworkUpdate extends CommonBase { } } - public clone_ptr(): number { - const ret: number = bindings.NetworkUpdate_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.NetworkUpdate_clone_ptr(this.ptr); return ret; } @@ -384,7 +384,7 @@ export class NetworkUpdate extends CommonBase { * Creates a copy of the NetworkUpdate */ public clone(): NetworkUpdate { - const ret: number = bindings.NetworkUpdate_clone(this.ptr); + const ret: bigint = bindings.NetworkUpdate_clone(this.ptr); const ret_hu_conv: NetworkUpdate = NetworkUpdate.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -394,9 +394,10 @@ export class NetworkUpdate extends CommonBase { * Utility method to constructs a new ChannelUpdateMessage-variant NetworkUpdate */ public static constructor_channel_update_message(msg: ChannelUpdate): NetworkUpdate { - const ret: number = bindings.NetworkUpdate_channel_update_message(msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + const ret: bigint = bindings.NetworkUpdate_channel_update_message(msg == null ? 0n : CommonBase.get_ptr_of(msg)); const ret_hu_conv: NetworkUpdate = NetworkUpdate.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, msg); return ret_hu_conv; } @@ -404,7 +405,7 @@ export class NetworkUpdate extends CommonBase { * Utility method to constructs a new ChannelFailure-variant NetworkUpdate */ public static constructor_channel_failure(short_channel_id: bigint, is_permanent: boolean): NetworkUpdate { - const ret: number = bindings.NetworkUpdate_channel_failure(short_channel_id, is_permanent); + const ret: bigint = bindings.NetworkUpdate_channel_failure(short_channel_id, is_permanent); const ret_hu_conv: NetworkUpdate = NetworkUpdate.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -414,7 +415,7 @@ export class NetworkUpdate extends CommonBase { * Utility method to constructs a new NodeFailure-variant NetworkUpdate */ public static constructor_node_failure(node_id: Uint8Array, is_permanent: boolean): NetworkUpdate { - const ret: number = bindings.NetworkUpdate_node_failure(bindings.encodeUint8Array(bindings.check_arr_len(node_id, 33)), is_permanent); + const ret: bigint = bindings.NetworkUpdate_node_failure(bindings.encodeUint8Array(bindings.check_arr_len(node_id, 33)), is_permanent); const ret_hu_conv: NetworkUpdate = NetworkUpdate.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -437,9 +438,9 @@ export class NetworkUpdate_ChannelUpdateMessage extends NetworkUpdate { */ public msg: ChannelUpdate; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); - const msg: number = bindings.LDKNetworkUpdate_ChannelUpdateMessage_get_msg(ptr); + const msg: bigint = bindings.LDKNetworkUpdate_ChannelUpdateMessage_get_msg(ptr); const msg_hu_conv: ChannelUpdate = new ChannelUpdate(null, msg); CommonBase.add_ref_from(msg_hu_conv, this); this.msg = msg_hu_conv; @@ -457,7 +458,7 @@ export class NetworkUpdate_ChannelFailure extends NetworkUpdate { */ public is_permanent: boolean; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); this.short_channel_id = bindings.LDKNetworkUpdate_ChannelFailure_get_short_channel_id(ptr); this.is_permanent = bindings.LDKNetworkUpdate_ChannelFailure_get_is_permanent(ptr); @@ -475,7 +476,7 @@ export class NetworkUpdate_NodeFailure extends NetworkUpdate { */ public is_permanent: boolean; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const node_id: number = bindings.LDKNetworkUpdate_NodeFailure_get_node_id(ptr); const node_id_conv: Uint8Array = bindings.decodeUint8Array(node_id); diff --git a/ts/structs/NodeAlias.mts b/ts/structs/NodeAlias.mts index 21ccb185..8168a93e 100644 --- a/ts/structs/NodeAlias.mts +++ b/ts/structs/NodeAlias.mts @@ -364,7 +364,7 @@ import * as bindings from '../bindings.mjs' */ export class NodeAlias extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.NodeAlias_free); } @@ -382,14 +382,14 @@ export class NodeAlias extends CommonBase { * Constructs a new NodeAlias given each field */ public static constructor_new(a_arg: Uint8Array): NodeAlias { - const ret: number = bindings.NodeAlias_new(bindings.encodeUint8Array(bindings.check_arr_len(a_arg, 32))); + const ret: bigint = bindings.NodeAlias_new(bindings.encodeUint8Array(bindings.check_arr_len(a_arg, 32))); const ret_hu_conv: NodeAlias = new NodeAlias(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.NodeAlias_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.NodeAlias_clone_ptr(this.ptr); return ret; } @@ -397,7 +397,7 @@ export class NodeAlias extends CommonBase { * Creates a copy of the NodeAlias */ public clone(): NodeAlias { - const ret: number = bindings.NodeAlias_clone(this.ptr); + const ret: bigint = bindings.NodeAlias_clone(this.ptr); const ret_hu_conv: NodeAlias = new NodeAlias(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -416,7 +416,7 @@ export class NodeAlias extends CommonBase { * Read a NodeAlias from a byte array, created by NodeAlias_write */ public static constructor_read(ser: Uint8Array): Result_NodeAliasDecodeErrorZ { - const ret: number = bindings.NodeAlias_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.NodeAlias_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_NodeAliasDecodeErrorZ = Result_NodeAliasDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/NodeAnnouncement.mts b/ts/structs/NodeAnnouncement.mts index 9fe9b93b..f009385a 100644 --- a/ts/structs/NodeAnnouncement.mts +++ b/ts/structs/NodeAnnouncement.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class NodeAnnouncement extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.NodeAnnouncement_free); } @@ -385,7 +385,7 @@ export class NodeAnnouncement extends CommonBase { * The actual content of the announcement */ public get_contents(): UnsignedNodeAnnouncement { - const ret: number = bindings.NodeAnnouncement_get_contents(this.ptr); + const ret: bigint = bindings.NodeAnnouncement_get_contents(this.ptr); const ret_hu_conv: UnsignedNodeAnnouncement = new UnsignedNodeAnnouncement(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -395,21 +395,23 @@ export class NodeAnnouncement extends CommonBase { * The actual content of the announcement */ public set_contents(val: UnsignedNodeAnnouncement): void { - bindings.NodeAnnouncement_set_contents(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.NodeAnnouncement_set_contents(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** * Constructs a new NodeAnnouncement given each field */ public static constructor_new(signature_arg: Uint8Array, contents_arg: UnsignedNodeAnnouncement): NodeAnnouncement { - const ret: number = bindings.NodeAnnouncement_new(bindings.encodeUint8Array(bindings.check_arr_len(signature_arg, 64)), contents_arg == null ? 0 : CommonBase.get_ptr_of(contents_arg) & ~1); + const ret: bigint = bindings.NodeAnnouncement_new(bindings.encodeUint8Array(bindings.check_arr_len(signature_arg, 64)), contents_arg == null ? 0n : CommonBase.get_ptr_of(contents_arg)); const ret_hu_conv: NodeAnnouncement = new NodeAnnouncement(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, contents_arg); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.NodeAnnouncement_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.NodeAnnouncement_clone_ptr(this.ptr); return ret; } @@ -417,7 +419,7 @@ export class NodeAnnouncement extends CommonBase { * Creates a copy of the NodeAnnouncement */ public clone(): NodeAnnouncement { - const ret: number = bindings.NodeAnnouncement_clone(this.ptr); + const ret: bigint = bindings.NodeAnnouncement_clone(this.ptr); const ret_hu_conv: NodeAnnouncement = new NodeAnnouncement(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -436,7 +438,7 @@ export class NodeAnnouncement extends CommonBase { * Read a NodeAnnouncement from a byte array, created by NodeAnnouncement_write */ public static constructor_read(ser: Uint8Array): Result_NodeAnnouncementDecodeErrorZ { - const ret: number = bindings.NodeAnnouncement_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.NodeAnnouncement_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_NodeAnnouncementDecodeErrorZ = Result_NodeAnnouncementDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/NodeAnnouncementInfo.mts b/ts/structs/NodeAnnouncementInfo.mts index 216a2db9..78ca1208 100644 --- a/ts/structs/NodeAnnouncementInfo.mts +++ b/ts/structs/NodeAnnouncementInfo.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class NodeAnnouncementInfo extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.NodeAnnouncementInfo_free); } @@ -369,7 +369,7 @@ export class NodeAnnouncementInfo extends CommonBase { * Protocol features the node announced support for */ public get_features(): NodeFeatures { - const ret: number = bindings.NodeAnnouncementInfo_get_features(this.ptr); + const ret: bigint = bindings.NodeAnnouncementInfo_get_features(this.ptr); const ret_hu_conv: NodeFeatures = new NodeFeatures(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -379,7 +379,8 @@ export class NodeAnnouncementInfo extends CommonBase { * Protocol features the node announced support for */ public set_features(val: NodeFeatures): void { - bindings.NodeAnnouncementInfo_set_features(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.NodeAnnouncementInfo_set_features(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** @@ -421,7 +422,7 @@ export class NodeAnnouncementInfo extends CommonBase { * should not be exposed to the user. */ public get_alias(): NodeAlias { - const ret: number = bindings.NodeAnnouncementInfo_get_alias(this.ptr); + const ret: bigint = bindings.NodeAnnouncementInfo_get_alias(this.ptr); const ret_hu_conv: NodeAlias = new NodeAlias(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -433,7 +434,8 @@ export class NodeAnnouncementInfo extends CommonBase { * should not be exposed to the user. */ public set_alias(val: NodeAlias): void { - bindings.NodeAnnouncementInfo_set_alias(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.NodeAnnouncementInfo_set_alias(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** @@ -446,7 +448,7 @@ export class NodeAnnouncementInfo extends CommonBase { const ret_conv_12_len: number = bindings.getArrayLength(ret); const ret_conv_12_arr: NetAddress[] = new Array(ret_conv_12_len).fill(null); for (var m = 0; m < ret_conv_12_len; m++) { - const ret_conv_12: number = bindings.getU32ArrayElem(ret, m); + const ret_conv_12: bigint = bindings.getU64ArrayElem(ret, m); const ret_conv_12_hu_conv: NetAddress = NetAddress.constr_from_ptr(ret_conv_12); CommonBase.add_ref_from(ret_conv_12_hu_conv, this); ret_conv_12_arr[m] = ret_conv_12_hu_conv; @@ -459,7 +461,7 @@ export class NodeAnnouncementInfo extends CommonBase { * Internet-level addresses via which one can connect to the node */ public set_addresses(val: NetAddress[]): void { - bindings.NodeAnnouncementInfo_set_addresses(this.ptr, bindings.encodeUint32Array(val != null ? val.map(val_conv_12 => CommonBase.get_ptr_of(val_conv_12)) : null)); + bindings.NodeAnnouncementInfo_set_addresses(this.ptr, bindings.encodeUint64Array(val != null ? val.map(val_conv_12 => CommonBase.get_ptr_of(val_conv_12)) : null)); } /** @@ -471,7 +473,7 @@ export class NodeAnnouncementInfo extends CommonBase { * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None */ public get_announcement_message(): NodeAnnouncement { - const ret: number = bindings.NodeAnnouncementInfo_get_announcement_message(this.ptr); + const ret: bigint = bindings.NodeAnnouncementInfo_get_announcement_message(this.ptr); const ret_hu_conv: NodeAnnouncement = new NodeAnnouncement(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -486,21 +488,25 @@ export class NodeAnnouncementInfo extends CommonBase { * Note that val (or a relevant inner pointer) may be NULL or all-0s to represent None */ public set_announcement_message(val: NodeAnnouncement): void { - bindings.NodeAnnouncementInfo_set_announcement_message(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.NodeAnnouncementInfo_set_announcement_message(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** * Constructs a new NodeAnnouncementInfo given each field */ public static constructor_new(features_arg: NodeFeatures, last_update_arg: number, rgb_arg: Uint8Array, alias_arg: NodeAlias, addresses_arg: NetAddress[], announcement_message_arg: NodeAnnouncement): NodeAnnouncementInfo { - const ret: number = bindings.NodeAnnouncementInfo_new(features_arg == null ? 0 : CommonBase.get_ptr_of(features_arg) & ~1, last_update_arg, bindings.encodeUint8Array(bindings.check_arr_len(rgb_arg, 3)), alias_arg == null ? 0 : CommonBase.get_ptr_of(alias_arg) & ~1, bindings.encodeUint32Array(addresses_arg != null ? addresses_arg.map(addresses_arg_conv_12 => CommonBase.get_ptr_of(addresses_arg_conv_12)) : null), announcement_message_arg == null ? 0 : CommonBase.get_ptr_of(announcement_message_arg) & ~1); + const ret: bigint = bindings.NodeAnnouncementInfo_new(features_arg == null ? 0n : CommonBase.get_ptr_of(features_arg), last_update_arg, bindings.encodeUint8Array(bindings.check_arr_len(rgb_arg, 3)), alias_arg == null ? 0n : CommonBase.get_ptr_of(alias_arg), bindings.encodeUint64Array(addresses_arg != null ? addresses_arg.map(addresses_arg_conv_12 => CommonBase.get_ptr_of(addresses_arg_conv_12)) : null), announcement_message_arg == null ? 0n : CommonBase.get_ptr_of(announcement_message_arg)); const ret_hu_conv: NodeAnnouncementInfo = new NodeAnnouncementInfo(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, features_arg); + CommonBase.add_ref_from(ret_hu_conv, alias_arg); + CommonBase.add_ref_from(ret_hu_conv, announcement_message_arg); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.NodeAnnouncementInfo_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.NodeAnnouncementInfo_clone_ptr(this.ptr); return ret; } @@ -508,7 +514,7 @@ export class NodeAnnouncementInfo extends CommonBase { * Creates a copy of the NodeAnnouncementInfo */ public clone(): NodeAnnouncementInfo { - const ret: number = bindings.NodeAnnouncementInfo_clone(this.ptr); + const ret: bigint = bindings.NodeAnnouncementInfo_clone(this.ptr); const ret_hu_conv: NodeAnnouncementInfo = new NodeAnnouncementInfo(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -527,7 +533,7 @@ export class NodeAnnouncementInfo extends CommonBase { * Read a NodeAnnouncementInfo from a byte array, created by NodeAnnouncementInfo_write */ public static constructor_read(ser: Uint8Array): Result_NodeAnnouncementInfoDecodeErrorZ { - const ret: number = bindings.NodeAnnouncementInfo_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.NodeAnnouncementInfo_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_NodeAnnouncementInfoDecodeErrorZ = Result_NodeAnnouncementInfoDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/NodeFeatures.mts b/ts/structs/NodeFeatures.mts index c9ab4e26..12f6a2cd 100644 --- a/ts/structs/NodeFeatures.mts +++ b/ts/structs/NodeFeatures.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class NodeFeatures extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.NodeFeatures_free); } @@ -371,13 +371,13 @@ export class NodeFeatures extends CommonBase { * Two objects with NULL inner values will be considered "equal" here. */ public eq(b: NodeFeatures): boolean { - const ret: boolean = bindings.NodeFeatures_eq(this.ptr, b == null ? 0 : CommonBase.get_ptr_of(b) & ~1); + const ret: boolean = bindings.NodeFeatures_eq(this.ptr, b == null ? 0n : CommonBase.get_ptr_of(b)); CommonBase.add_ref_from(this, b); return ret; } - public clone_ptr(): number { - const ret: number = bindings.NodeFeatures_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.NodeFeatures_clone_ptr(this.ptr); return ret; } @@ -385,7 +385,7 @@ export class NodeFeatures extends CommonBase { * Creates a copy of the NodeFeatures */ public clone(): NodeFeatures { - const ret: number = bindings.NodeFeatures_clone(this.ptr); + const ret: bigint = bindings.NodeFeatures_clone(this.ptr); const ret_hu_conv: NodeFeatures = new NodeFeatures(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -395,7 +395,7 @@ export class NodeFeatures extends CommonBase { * Create a blank Features with no features set */ public static constructor_empty(): NodeFeatures { - const ret: number = bindings.NodeFeatures_empty(); + const ret: bigint = bindings.NodeFeatures_empty(); const ret_hu_conv: NodeFeatures = new NodeFeatures(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -405,7 +405,7 @@ export class NodeFeatures extends CommonBase { * Creates a Features with the bits set which are known by the implementation */ public static constructor_known(): NodeFeatures { - const ret: number = bindings.NodeFeatures_known(); + const ret: bigint = bindings.NodeFeatures_known(); const ret_hu_conv: NodeFeatures = new NodeFeatures(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -433,7 +433,7 @@ export class NodeFeatures extends CommonBase { * Read a NodeFeatures from a byte array, created by NodeFeatures_write */ public static constructor_read(ser: Uint8Array): Result_NodeFeaturesDecodeErrorZ { - const ret: number = bindings.NodeFeatures_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.NodeFeatures_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_NodeFeaturesDecodeErrorZ = Result_NodeFeaturesDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/NodeId.mts b/ts/structs/NodeId.mts index 00b63fdb..1566d099 100644 --- a/ts/structs/NodeId.mts +++ b/ts/structs/NodeId.mts @@ -361,12 +361,12 @@ import * as bindings from '../bindings.mjs' */ export class NodeId extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.NodeId_free); } - public clone_ptr(): number { - const ret: number = bindings.NodeId_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.NodeId_clone_ptr(this.ptr); return ret; } @@ -374,7 +374,7 @@ export class NodeId extends CommonBase { * Creates a copy of the NodeId */ public clone(): NodeId { - const ret: number = bindings.NodeId_clone(this.ptr); + const ret: bigint = bindings.NodeId_clone(this.ptr); const ret_hu_conv: NodeId = new NodeId(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -384,7 +384,7 @@ export class NodeId extends CommonBase { * Create a new NodeId from a public key */ public static constructor_from_pubkey(pubkey: Uint8Array): NodeId { - const ret: number = bindings.NodeId_from_pubkey(bindings.encodeUint8Array(bindings.check_arr_len(pubkey, 33))); + const ret: bigint = bindings.NodeId_from_pubkey(bindings.encodeUint8Array(bindings.check_arr_len(pubkey, 33))); const ret_hu_conv: NodeId = new NodeId(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -420,7 +420,7 @@ export class NodeId extends CommonBase { * Read a NodeId from a byte array, created by NodeId_write */ public static constructor_read(ser: Uint8Array): Result_NodeIdDecodeErrorZ { - const ret: number = bindings.NodeId_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.NodeId_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_NodeIdDecodeErrorZ = Result_NodeIdDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/NodeInfo.mts b/ts/structs/NodeInfo.mts index 0fa45212..e02aa018 100644 --- a/ts/structs/NodeInfo.mts +++ b/ts/structs/NodeInfo.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class NodeInfo extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.NodeInfo_free); } @@ -391,7 +391,7 @@ export class NodeInfo extends CommonBase { * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None */ public get_lowest_inbound_channel_fees(): RoutingFees { - const ret: number = bindings.NodeInfo_get_lowest_inbound_channel_fees(this.ptr); + const ret: bigint = bindings.NodeInfo_get_lowest_inbound_channel_fees(this.ptr); const ret_hu_conv: RoutingFees = new RoutingFees(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -405,7 +405,8 @@ export class NodeInfo extends CommonBase { * Note that val (or a relevant inner pointer) may be NULL or all-0s to represent None */ public set_lowest_inbound_channel_fees(val: RoutingFees): void { - bindings.NodeInfo_set_lowest_inbound_channel_fees(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.NodeInfo_set_lowest_inbound_channel_fees(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** @@ -416,7 +417,7 @@ export class NodeInfo extends CommonBase { * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None */ public get_announcement_info(): NodeAnnouncementInfo { - const ret: number = bindings.NodeInfo_get_announcement_info(this.ptr); + const ret: bigint = bindings.NodeInfo_get_announcement_info(this.ptr); const ret_hu_conv: NodeAnnouncementInfo = new NodeAnnouncementInfo(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -430,21 +431,24 @@ export class NodeInfo extends CommonBase { * Note that val (or a relevant inner pointer) may be NULL or all-0s to represent None */ public set_announcement_info(val: NodeAnnouncementInfo): void { - bindings.NodeInfo_set_announcement_info(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.NodeInfo_set_announcement_info(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** * Constructs a new NodeInfo given each field */ public static constructor_new(channels_arg: bigint[], lowest_inbound_channel_fees_arg: RoutingFees, announcement_info_arg: NodeAnnouncementInfo): NodeInfo { - const ret: number = bindings.NodeInfo_new(bindings.encodeUint64Array(channels_arg), lowest_inbound_channel_fees_arg == null ? 0 : CommonBase.get_ptr_of(lowest_inbound_channel_fees_arg) & ~1, announcement_info_arg == null ? 0 : CommonBase.get_ptr_of(announcement_info_arg) & ~1); + const ret: bigint = bindings.NodeInfo_new(bindings.encodeUint64Array(channels_arg), lowest_inbound_channel_fees_arg == null ? 0n : CommonBase.get_ptr_of(lowest_inbound_channel_fees_arg), announcement_info_arg == null ? 0n : CommonBase.get_ptr_of(announcement_info_arg)); const ret_hu_conv: NodeInfo = new NodeInfo(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, lowest_inbound_channel_fees_arg); + CommonBase.add_ref_from(ret_hu_conv, announcement_info_arg); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.NodeInfo_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.NodeInfo_clone_ptr(this.ptr); return ret; } @@ -452,7 +456,7 @@ export class NodeInfo extends CommonBase { * Creates a copy of the NodeInfo */ public clone(): NodeInfo { - const ret: number = bindings.NodeInfo_clone(this.ptr); + const ret: bigint = bindings.NodeInfo_clone(this.ptr); const ret_hu_conv: NodeInfo = new NodeInfo(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -471,7 +475,7 @@ export class NodeInfo extends CommonBase { * Read a NodeInfo from a byte array, created by NodeInfo_write */ public static constructor_read(ser: Uint8Array): Result_NodeInfoDecodeErrorZ { - const ret: number = bindings.NodeInfo_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.NodeInfo_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_NodeInfoDecodeErrorZ = Result_NodeInfoDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/OpenChannel.mts b/ts/structs/OpenChannel.mts index 58d90e59..db832754 100644 --- a/ts/structs/OpenChannel.mts +++ b/ts/structs/OpenChannel.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class OpenChannel extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.OpenChannel_free); } @@ -651,7 +651,7 @@ export class OpenChannel extends CommonBase { * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None */ public get_channel_type(): ChannelTypeFeatures { - const ret: number = bindings.OpenChannel_get_channel_type(this.ptr); + const ret: bigint = bindings.OpenChannel_get_channel_type(this.ptr); const ret_hu_conv: ChannelTypeFeatures = new ChannelTypeFeatures(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -665,11 +665,12 @@ export class OpenChannel extends CommonBase { * Note that val (or a relevant inner pointer) may be NULL or all-0s to represent None */ public set_channel_type(val: ChannelTypeFeatures): void { - bindings.OpenChannel_set_channel_type(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.OpenChannel_set_channel_type(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } - public clone_ptr(): number { - const ret: number = bindings.OpenChannel_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.OpenChannel_clone_ptr(this.ptr); return ret; } @@ -677,7 +678,7 @@ export class OpenChannel extends CommonBase { * Creates a copy of the OpenChannel */ public clone(): OpenChannel { - const ret: number = bindings.OpenChannel_clone(this.ptr); + const ret: bigint = bindings.OpenChannel_clone(this.ptr); const ret_hu_conv: OpenChannel = new OpenChannel(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -696,7 +697,7 @@ export class OpenChannel extends CommonBase { * Read a OpenChannel from a byte array, created by OpenChannel_write */ public static constructor_read(ser: Uint8Array): Result_OpenChannelDecodeErrorZ { - const ret: number = bindings.OpenChannel_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.OpenChannel_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_OpenChannelDecodeErrorZ = Result_OpenChannelDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/Option_AccessZ.mts b/ts/structs/Option_AccessZ.mts index 7002d876..2d24583c 100644 --- a/ts/structs/Option_AccessZ.mts +++ b/ts/structs/Option_AccessZ.mts @@ -359,9 +359,9 @@ import * as bindings from '../bindings.mjs' * An enum which can either contain a crate::lightning::chain::Access or not */ export class Option_AccessZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { super(ptr, bindings.COption_AccessZ_free); } + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.COption_AccessZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Option_AccessZ { + public static constr_from_ptr(ptr: bigint): Option_AccessZ { const raw_ty: number = bindings.LDKCOption_AccessZ_ty_from_ptr(ptr); switch (raw_ty) { case 0: return new Option_AccessZ_Some(ptr); @@ -375,7 +375,7 @@ export class Option_AccessZ extends CommonBase { * Constructs a new COption_AccessZ containing a crate::lightning::chain::Access */ public static constructor_some(o: Access): Option_AccessZ { - const ret: number = bindings.COption_AccessZ_some(o == null ? 0 : CommonBase.get_ptr_of(o)); + const ret: bigint = bindings.COption_AccessZ_some(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Option_AccessZ = Option_AccessZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); CommonBase.add_ref_from(ret_hu_conv, o); @@ -386,7 +386,7 @@ export class Option_AccessZ extends CommonBase { * Constructs a new COption_AccessZ containing nothing */ public static constructor_none(): Option_AccessZ { - const ret: number = bindings.COption_AccessZ_none(); + const ret: bigint = bindings.COption_AccessZ_none(); const ret_hu_conv: Option_AccessZ = Option_AccessZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -397,9 +397,9 @@ export class Option_AccessZ extends CommonBase { export class Option_AccessZ_Some extends Option_AccessZ { public some: Access; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); - const some: number = bindings.LDKCOption_AccessZ_Some_get_some(ptr); + const some: bigint = bindings.LDKCOption_AccessZ_Some_get_some(ptr); const ret_hu_conv: Access = new Access(null, some); CommonBase.add_ref_from(ret_hu_conv, this); this.some = ret_hu_conv; @@ -408,7 +408,7 @@ export class Option_AccessZ_Some extends Option_AccessZ { /** A Option_AccessZ of type None */ export class Option_AccessZ_None extends Option_AccessZ { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } diff --git a/ts/structs/Option_C2Tuple_u64u64ZZ.mts b/ts/structs/Option_C2Tuple_u64u64ZZ.mts index 17c0b045..8b3023fd 100644 --- a/ts/structs/Option_C2Tuple_u64u64ZZ.mts +++ b/ts/structs/Option_C2Tuple_u64u64ZZ.mts @@ -359,9 +359,9 @@ import * as bindings from '../bindings.mjs' * An enum which can either contain a crate::c_types::derived::C2Tuple_u64u64Z or not */ export class Option_C2Tuple_u64u64ZZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { super(ptr, bindings.COption_C2Tuple_u64u64ZZ_free); } + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.COption_C2Tuple_u64u64ZZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Option_C2Tuple_u64u64ZZ { + public static constr_from_ptr(ptr: bigint): Option_C2Tuple_u64u64ZZ { const raw_ty: number = bindings.LDKCOption_C2Tuple_u64u64ZZ_ty_from_ptr(ptr); switch (raw_ty) { case 0: return new Option_C2Tuple_u64u64ZZ_Some(ptr); @@ -375,7 +375,7 @@ export class Option_C2Tuple_u64u64ZZ extends CommonBase { * Constructs a new COption_C2Tuple_u64u64ZZ containing a crate::c_types::derived::C2Tuple_u64u64Z */ public static constructor_some(o: TwoTuple_u64u64Z): Option_C2Tuple_u64u64ZZ { - const ret: number = bindings.COption_C2Tuple_u64u64ZZ_some(o != null ? CommonBase.get_ptr_of(o) : 0); + const ret: bigint = bindings.COption_C2Tuple_u64u64ZZ_some(o != null ? CommonBase.get_ptr_of(o) : 0n); const ret_hu_conv: Option_C2Tuple_u64u64ZZ = Option_C2Tuple_u64u64ZZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -385,14 +385,14 @@ export class Option_C2Tuple_u64u64ZZ extends CommonBase { * Constructs a new COption_C2Tuple_u64u64ZZ containing nothing */ public static constructor_none(): Option_C2Tuple_u64u64ZZ { - const ret: number = bindings.COption_C2Tuple_u64u64ZZ_none(); + const ret: bigint = bindings.COption_C2Tuple_u64u64ZZ_none(); const ret_hu_conv: Option_C2Tuple_u64u64ZZ = Option_C2Tuple_u64u64ZZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.COption_C2Tuple_u64u64ZZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.COption_C2Tuple_u64u64ZZ_clone_ptr(this.ptr); return ret; } @@ -401,7 +401,7 @@ export class Option_C2Tuple_u64u64ZZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Option_C2Tuple_u64u64ZZ { - const ret: number = bindings.COption_C2Tuple_u64u64ZZ_clone(this.ptr); + const ret: bigint = bindings.COption_C2Tuple_u64u64ZZ_clone(this.ptr); const ret_hu_conv: Option_C2Tuple_u64u64ZZ = Option_C2Tuple_u64u64ZZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -412,9 +412,9 @@ export class Option_C2Tuple_u64u64ZZ extends CommonBase { export class Option_C2Tuple_u64u64ZZ_Some extends Option_C2Tuple_u64u64ZZ { public some: TwoTuple_u64u64Z; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); - const some: number = bindings.LDKCOption_C2Tuple_u64u64ZZ_Some_get_some(ptr); + const some: bigint = bindings.LDKCOption_C2Tuple_u64u64ZZ_Some_get_some(ptr); const some_hu_conv: TwoTuple_u64u64Z = new TwoTuple_u64u64Z(null, some); CommonBase.add_ref_from(some_hu_conv, this); this.some = some_hu_conv; @@ -423,7 +423,7 @@ export class Option_C2Tuple_u64u64ZZ_Some extends Option_C2Tuple_u64u64ZZ { /** A Option_C2Tuple_u64u64ZZ of type None */ export class Option_C2Tuple_u64u64ZZ_None extends Option_C2Tuple_u64u64ZZ { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } diff --git a/ts/structs/Option_C2Tuple_usizeTransactionZZ.mts b/ts/structs/Option_C2Tuple_usizeTransactionZZ.mts index 2e02b02b..109913e3 100644 --- a/ts/structs/Option_C2Tuple_usizeTransactionZZ.mts +++ b/ts/structs/Option_C2Tuple_usizeTransactionZZ.mts @@ -359,9 +359,9 @@ import * as bindings from '../bindings.mjs' * An enum which can either contain a crate::c_types::derived::C2Tuple_usizeTransactionZ or not */ export class Option_C2Tuple_usizeTransactionZZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { super(ptr, bindings.COption_C2Tuple_usizeTransactionZZ_free); } + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.COption_C2Tuple_usizeTransactionZZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Option_C2Tuple_usizeTransactionZZ { + public static constr_from_ptr(ptr: bigint): Option_C2Tuple_usizeTransactionZZ { const raw_ty: number = bindings.LDKCOption_C2Tuple_usizeTransactionZZ_ty_from_ptr(ptr); switch (raw_ty) { case 0: return new Option_C2Tuple_usizeTransactionZZ_Some(ptr); @@ -375,7 +375,7 @@ export class Option_C2Tuple_usizeTransactionZZ extends CommonBase { * Constructs a new COption_C2Tuple_usizeTransactionZZ containing a crate::c_types::derived::C2Tuple_usizeTransactionZ */ public static constructor_some(o: TwoTuple_usizeTransactionZ): Option_C2Tuple_usizeTransactionZZ { - const ret: number = bindings.COption_C2Tuple_usizeTransactionZZ_some(o != null ? CommonBase.get_ptr_of(o) : 0); + const ret: bigint = bindings.COption_C2Tuple_usizeTransactionZZ_some(o != null ? CommonBase.get_ptr_of(o) : 0n); const ret_hu_conv: Option_C2Tuple_usizeTransactionZZ = Option_C2Tuple_usizeTransactionZZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -385,14 +385,14 @@ export class Option_C2Tuple_usizeTransactionZZ extends CommonBase { * Constructs a new COption_C2Tuple_usizeTransactionZZ containing nothing */ public static constructor_none(): Option_C2Tuple_usizeTransactionZZ { - const ret: number = bindings.COption_C2Tuple_usizeTransactionZZ_none(); + const ret: bigint = bindings.COption_C2Tuple_usizeTransactionZZ_none(); const ret_hu_conv: Option_C2Tuple_usizeTransactionZZ = Option_C2Tuple_usizeTransactionZZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.COption_C2Tuple_usizeTransactionZZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.COption_C2Tuple_usizeTransactionZZ_clone_ptr(this.ptr); return ret; } @@ -401,7 +401,7 @@ export class Option_C2Tuple_usizeTransactionZZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Option_C2Tuple_usizeTransactionZZ { - const ret: number = bindings.COption_C2Tuple_usizeTransactionZZ_clone(this.ptr); + const ret: bigint = bindings.COption_C2Tuple_usizeTransactionZZ_clone(this.ptr); const ret_hu_conv: Option_C2Tuple_usizeTransactionZZ = Option_C2Tuple_usizeTransactionZZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -412,9 +412,9 @@ export class Option_C2Tuple_usizeTransactionZZ extends CommonBase { export class Option_C2Tuple_usizeTransactionZZ_Some extends Option_C2Tuple_usizeTransactionZZ { public some: TwoTuple_usizeTransactionZ; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); - const some: number = bindings.LDKCOption_C2Tuple_usizeTransactionZZ_Some_get_some(ptr); + const some: bigint = bindings.LDKCOption_C2Tuple_usizeTransactionZZ_Some_get_some(ptr); const some_hu_conv: TwoTuple_usizeTransactionZ = new TwoTuple_usizeTransactionZ(null, some); CommonBase.add_ref_from(some_hu_conv, this); this.some = some_hu_conv; @@ -423,7 +423,7 @@ export class Option_C2Tuple_usizeTransactionZZ_Some extends Option_C2Tuple_usize /** A Option_C2Tuple_usizeTransactionZZ of type None */ export class Option_C2Tuple_usizeTransactionZZ_None extends Option_C2Tuple_usizeTransactionZZ { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } diff --git a/ts/structs/Option_CVec_NetAddressZZ.mts b/ts/structs/Option_CVec_NetAddressZZ.mts index dea9e3f6..125c43d7 100644 --- a/ts/structs/Option_CVec_NetAddressZZ.mts +++ b/ts/structs/Option_CVec_NetAddressZZ.mts @@ -359,9 +359,9 @@ import * as bindings from '../bindings.mjs' * An enum which can either contain a crate::c_types::derived::CVec_NetAddressZ or not */ export class Option_CVec_NetAddressZZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { super(ptr, bindings.COption_CVec_NetAddressZZ_free); } + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.COption_CVec_NetAddressZZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Option_CVec_NetAddressZZ { + public static constr_from_ptr(ptr: bigint): Option_CVec_NetAddressZZ { const raw_ty: number = bindings.LDKCOption_CVec_NetAddressZZ_ty_from_ptr(ptr); switch (raw_ty) { case 0: return new Option_CVec_NetAddressZZ_Some(ptr); @@ -375,7 +375,7 @@ export class Option_CVec_NetAddressZZ extends CommonBase { * Constructs a new COption_CVec_NetAddressZZ containing a crate::c_types::derived::CVec_NetAddressZ */ public static constructor_some(o: NetAddress[]): Option_CVec_NetAddressZZ { - const ret: number = bindings.COption_CVec_NetAddressZZ_some(bindings.encodeUint32Array(o != null ? o.map(o_conv_12 => CommonBase.get_ptr_of(o_conv_12)) : null)); + const ret: bigint = bindings.COption_CVec_NetAddressZZ_some(bindings.encodeUint64Array(o != null ? o.map(o_conv_12 => CommonBase.get_ptr_of(o_conv_12)) : null)); const ret_hu_conv: Option_CVec_NetAddressZZ = Option_CVec_NetAddressZZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -385,14 +385,14 @@ export class Option_CVec_NetAddressZZ extends CommonBase { * Constructs a new COption_CVec_NetAddressZZ containing nothing */ public static constructor_none(): Option_CVec_NetAddressZZ { - const ret: number = bindings.COption_CVec_NetAddressZZ_none(); + const ret: bigint = bindings.COption_CVec_NetAddressZZ_none(); const ret_hu_conv: Option_CVec_NetAddressZZ = Option_CVec_NetAddressZZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.COption_CVec_NetAddressZZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.COption_CVec_NetAddressZZ_clone_ptr(this.ptr); return ret; } @@ -401,7 +401,7 @@ export class Option_CVec_NetAddressZZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Option_CVec_NetAddressZZ { - const ret: number = bindings.COption_CVec_NetAddressZZ_clone(this.ptr); + const ret: bigint = bindings.COption_CVec_NetAddressZZ_clone(this.ptr); const ret_hu_conv: Option_CVec_NetAddressZZ = Option_CVec_NetAddressZZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -412,13 +412,13 @@ export class Option_CVec_NetAddressZZ extends CommonBase { export class Option_CVec_NetAddressZZ_Some extends Option_CVec_NetAddressZZ { public some: NetAddress[]; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const some: number = bindings.LDKCOption_CVec_NetAddressZZ_Some_get_some(ptr); const some_conv_12_len: number = bindings.getArrayLength(some); const some_conv_12_arr: NetAddress[] = new Array(some_conv_12_len).fill(null); for (var m = 0; m < some_conv_12_len; m++) { - const some_conv_12: number = bindings.getU32ArrayElem(some, m); + const some_conv_12: bigint = bindings.getU64ArrayElem(some, m); const some_conv_12_hu_conv: NetAddress = NetAddress.constr_from_ptr(some_conv_12); CommonBase.add_ref_from(some_conv_12_hu_conv, this); some_conv_12_arr[m] = some_conv_12_hu_conv; @@ -430,7 +430,7 @@ export class Option_CVec_NetAddressZZ_Some extends Option_CVec_NetAddressZZ { /** A Option_CVec_NetAddressZZ of type None */ export class Option_CVec_NetAddressZZ_None extends Option_CVec_NetAddressZZ { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } diff --git a/ts/structs/Option_ClosureReasonZ.mts b/ts/structs/Option_ClosureReasonZ.mts index d2a9bb6f..977a335f 100644 --- a/ts/structs/Option_ClosureReasonZ.mts +++ b/ts/structs/Option_ClosureReasonZ.mts @@ -359,9 +359,9 @@ import * as bindings from '../bindings.mjs' * An enum which can either contain a crate::lightning::util::events::ClosureReason or not */ export class Option_ClosureReasonZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { super(ptr, bindings.COption_ClosureReasonZ_free); } + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.COption_ClosureReasonZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Option_ClosureReasonZ { + public static constr_from_ptr(ptr: bigint): Option_ClosureReasonZ { const raw_ty: number = bindings.LDKCOption_ClosureReasonZ_ty_from_ptr(ptr); switch (raw_ty) { case 0: return new Option_ClosureReasonZ_Some(ptr); @@ -375,7 +375,7 @@ export class Option_ClosureReasonZ extends CommonBase { * Constructs a new COption_ClosureReasonZ containing a crate::lightning::util::events::ClosureReason */ public static constructor_some(o: ClosureReason): Option_ClosureReasonZ { - const ret: number = bindings.COption_ClosureReasonZ_some(CommonBase.get_ptr_of(o)); + const ret: bigint = bindings.COption_ClosureReasonZ_some(CommonBase.get_ptr_of(o)); const ret_hu_conv: Option_ClosureReasonZ = Option_ClosureReasonZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -385,14 +385,14 @@ export class Option_ClosureReasonZ extends CommonBase { * Constructs a new COption_ClosureReasonZ containing nothing */ public static constructor_none(): Option_ClosureReasonZ { - const ret: number = bindings.COption_ClosureReasonZ_none(); + const ret: bigint = bindings.COption_ClosureReasonZ_none(); const ret_hu_conv: Option_ClosureReasonZ = Option_ClosureReasonZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.COption_ClosureReasonZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.COption_ClosureReasonZ_clone_ptr(this.ptr); return ret; } @@ -401,7 +401,7 @@ export class Option_ClosureReasonZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Option_ClosureReasonZ { - const ret: number = bindings.COption_ClosureReasonZ_clone(this.ptr); + const ret: bigint = bindings.COption_ClosureReasonZ_clone(this.ptr); const ret_hu_conv: Option_ClosureReasonZ = Option_ClosureReasonZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -412,9 +412,9 @@ export class Option_ClosureReasonZ extends CommonBase { export class Option_ClosureReasonZ_Some extends Option_ClosureReasonZ { public some: ClosureReason; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); - const some: number = bindings.LDKCOption_ClosureReasonZ_Some_get_some(ptr); + const some: bigint = bindings.LDKCOption_ClosureReasonZ_Some_get_some(ptr); const some_hu_conv: ClosureReason = ClosureReason.constr_from_ptr(some); CommonBase.add_ref_from(some_hu_conv, this); this.some = some_hu_conv; @@ -423,7 +423,7 @@ export class Option_ClosureReasonZ_Some extends Option_ClosureReasonZ { /** A Option_ClosureReasonZ of type None */ export class Option_ClosureReasonZ_None extends Option_ClosureReasonZ { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } diff --git a/ts/structs/Option_EventZ.mts b/ts/structs/Option_EventZ.mts index ea83cca4..4d48baf4 100644 --- a/ts/structs/Option_EventZ.mts +++ b/ts/structs/Option_EventZ.mts @@ -359,9 +359,9 @@ import * as bindings from '../bindings.mjs' * An enum which can either contain a crate::lightning::util::events::Event or not */ export class Option_EventZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { super(ptr, bindings.COption_EventZ_free); } + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.COption_EventZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Option_EventZ { + public static constr_from_ptr(ptr: bigint): Option_EventZ { const raw_ty: number = bindings.LDKCOption_EventZ_ty_from_ptr(ptr); switch (raw_ty) { case 0: return new Option_EventZ_Some(ptr); @@ -375,7 +375,7 @@ export class Option_EventZ extends CommonBase { * Constructs a new COption_EventZ containing a crate::lightning::util::events::Event */ public static constructor_some(o: Event): Option_EventZ { - const ret: number = bindings.COption_EventZ_some(CommonBase.get_ptr_of(o)); + const ret: bigint = bindings.COption_EventZ_some(CommonBase.get_ptr_of(o)); const ret_hu_conv: Option_EventZ = Option_EventZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -385,14 +385,14 @@ export class Option_EventZ extends CommonBase { * Constructs a new COption_EventZ containing nothing */ public static constructor_none(): Option_EventZ { - const ret: number = bindings.COption_EventZ_none(); + const ret: bigint = bindings.COption_EventZ_none(); const ret_hu_conv: Option_EventZ = Option_EventZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.COption_EventZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.COption_EventZ_clone_ptr(this.ptr); return ret; } @@ -401,7 +401,7 @@ export class Option_EventZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Option_EventZ { - const ret: number = bindings.COption_EventZ_clone(this.ptr); + const ret: bigint = bindings.COption_EventZ_clone(this.ptr); const ret_hu_conv: Option_EventZ = Option_EventZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -412,9 +412,9 @@ export class Option_EventZ extends CommonBase { export class Option_EventZ_Some extends Option_EventZ { public some: Event; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); - const some: number = bindings.LDKCOption_EventZ_Some_get_some(ptr); + const some: bigint = bindings.LDKCOption_EventZ_Some_get_some(ptr); const some_hu_conv: Event = Event.constr_from_ptr(some); CommonBase.add_ref_from(some_hu_conv, this); this.some = some_hu_conv; @@ -423,7 +423,7 @@ export class Option_EventZ_Some extends Option_EventZ { /** A Option_EventZ of type None */ export class Option_EventZ_None extends Option_EventZ { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } diff --git a/ts/structs/Option_FilterZ.mts b/ts/structs/Option_FilterZ.mts index 40d2c70a..1d7b022b 100644 --- a/ts/structs/Option_FilterZ.mts +++ b/ts/structs/Option_FilterZ.mts @@ -359,9 +359,9 @@ import * as bindings from '../bindings.mjs' * An enum which can either contain a crate::lightning::chain::Filter or not */ export class Option_FilterZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { super(ptr, bindings.COption_FilterZ_free); } + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.COption_FilterZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Option_FilterZ { + public static constr_from_ptr(ptr: bigint): Option_FilterZ { const raw_ty: number = bindings.LDKCOption_FilterZ_ty_from_ptr(ptr); switch (raw_ty) { case 0: return new Option_FilterZ_Some(ptr); @@ -375,7 +375,7 @@ export class Option_FilterZ extends CommonBase { * Constructs a new COption_FilterZ containing a crate::lightning::chain::Filter */ public static constructor_some(o: Filter): Option_FilterZ { - const ret: number = bindings.COption_FilterZ_some(o == null ? 0 : CommonBase.get_ptr_of(o)); + const ret: bigint = bindings.COption_FilterZ_some(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Option_FilterZ = Option_FilterZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); CommonBase.add_ref_from(ret_hu_conv, o); @@ -386,7 +386,7 @@ export class Option_FilterZ extends CommonBase { * Constructs a new COption_FilterZ containing nothing */ public static constructor_none(): Option_FilterZ { - const ret: number = bindings.COption_FilterZ_none(); + const ret: bigint = bindings.COption_FilterZ_none(); const ret_hu_conv: Option_FilterZ = Option_FilterZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -397,9 +397,9 @@ export class Option_FilterZ extends CommonBase { export class Option_FilterZ_Some extends Option_FilterZ { public some: Filter; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); - const some: number = bindings.LDKCOption_FilterZ_Some_get_some(ptr); + const some: bigint = bindings.LDKCOption_FilterZ_Some_get_some(ptr); const ret_hu_conv: Filter = new Filter(null, some); CommonBase.add_ref_from(ret_hu_conv, this); this.some = ret_hu_conv; @@ -408,7 +408,7 @@ export class Option_FilterZ_Some extends Option_FilterZ { /** A Option_FilterZ of type None */ export class Option_FilterZ_None extends Option_FilterZ { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } diff --git a/ts/structs/Option_HTLCDestinationZ.mts b/ts/structs/Option_HTLCDestinationZ.mts index 38132428..0661bb89 100644 --- a/ts/structs/Option_HTLCDestinationZ.mts +++ b/ts/structs/Option_HTLCDestinationZ.mts @@ -359,9 +359,9 @@ import * as bindings from '../bindings.mjs' * An enum which can either contain a crate::lightning::util::events::HTLCDestination or not */ export class Option_HTLCDestinationZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { super(ptr, bindings.COption_HTLCDestinationZ_free); } + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.COption_HTLCDestinationZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Option_HTLCDestinationZ { + public static constr_from_ptr(ptr: bigint): Option_HTLCDestinationZ { const raw_ty: number = bindings.LDKCOption_HTLCDestinationZ_ty_from_ptr(ptr); switch (raw_ty) { case 0: return new Option_HTLCDestinationZ_Some(ptr); @@ -375,7 +375,7 @@ export class Option_HTLCDestinationZ extends CommonBase { * Constructs a new COption_HTLCDestinationZ containing a crate::lightning::util::events::HTLCDestination */ public static constructor_some(o: HTLCDestination): Option_HTLCDestinationZ { - const ret: number = bindings.COption_HTLCDestinationZ_some(CommonBase.get_ptr_of(o)); + const ret: bigint = bindings.COption_HTLCDestinationZ_some(CommonBase.get_ptr_of(o)); const ret_hu_conv: Option_HTLCDestinationZ = Option_HTLCDestinationZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -385,14 +385,14 @@ export class Option_HTLCDestinationZ extends CommonBase { * Constructs a new COption_HTLCDestinationZ containing nothing */ public static constructor_none(): Option_HTLCDestinationZ { - const ret: number = bindings.COption_HTLCDestinationZ_none(); + const ret: bigint = bindings.COption_HTLCDestinationZ_none(); const ret_hu_conv: Option_HTLCDestinationZ = Option_HTLCDestinationZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.COption_HTLCDestinationZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.COption_HTLCDestinationZ_clone_ptr(this.ptr); return ret; } @@ -401,7 +401,7 @@ export class Option_HTLCDestinationZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Option_HTLCDestinationZ { - const ret: number = bindings.COption_HTLCDestinationZ_clone(this.ptr); + const ret: bigint = bindings.COption_HTLCDestinationZ_clone(this.ptr); const ret_hu_conv: Option_HTLCDestinationZ = Option_HTLCDestinationZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -412,9 +412,9 @@ export class Option_HTLCDestinationZ extends CommonBase { export class Option_HTLCDestinationZ_Some extends Option_HTLCDestinationZ { public some: HTLCDestination; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); - const some: number = bindings.LDKCOption_HTLCDestinationZ_Some_get_some(ptr); + const some: bigint = bindings.LDKCOption_HTLCDestinationZ_Some_get_some(ptr); const some_hu_conv: HTLCDestination = HTLCDestination.constr_from_ptr(some); CommonBase.add_ref_from(some_hu_conv, this); this.some = some_hu_conv; @@ -423,7 +423,7 @@ export class Option_HTLCDestinationZ_Some extends Option_HTLCDestinationZ { /** A Option_HTLCDestinationZ of type None */ export class Option_HTLCDestinationZ_None extends Option_HTLCDestinationZ { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } diff --git a/ts/structs/Option_MonitorEventZ.mts b/ts/structs/Option_MonitorEventZ.mts index 20111ced..a0260fba 100644 --- a/ts/structs/Option_MonitorEventZ.mts +++ b/ts/structs/Option_MonitorEventZ.mts @@ -359,9 +359,9 @@ import * as bindings from '../bindings.mjs' * An enum which can either contain a crate::lightning::chain::channelmonitor::MonitorEvent or not */ export class Option_MonitorEventZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { super(ptr, bindings.COption_MonitorEventZ_free); } + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.COption_MonitorEventZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Option_MonitorEventZ { + public static constr_from_ptr(ptr: bigint): Option_MonitorEventZ { const raw_ty: number = bindings.LDKCOption_MonitorEventZ_ty_from_ptr(ptr); switch (raw_ty) { case 0: return new Option_MonitorEventZ_Some(ptr); @@ -375,7 +375,7 @@ export class Option_MonitorEventZ extends CommonBase { * Constructs a new COption_MonitorEventZ containing a crate::lightning::chain::channelmonitor::MonitorEvent */ public static constructor_some(o: MonitorEvent): Option_MonitorEventZ { - const ret: number = bindings.COption_MonitorEventZ_some(CommonBase.get_ptr_of(o)); + const ret: bigint = bindings.COption_MonitorEventZ_some(CommonBase.get_ptr_of(o)); const ret_hu_conv: Option_MonitorEventZ = Option_MonitorEventZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -385,14 +385,14 @@ export class Option_MonitorEventZ extends CommonBase { * Constructs a new COption_MonitorEventZ containing nothing */ public static constructor_none(): Option_MonitorEventZ { - const ret: number = bindings.COption_MonitorEventZ_none(); + const ret: bigint = bindings.COption_MonitorEventZ_none(); const ret_hu_conv: Option_MonitorEventZ = Option_MonitorEventZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.COption_MonitorEventZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.COption_MonitorEventZ_clone_ptr(this.ptr); return ret; } @@ -401,7 +401,7 @@ export class Option_MonitorEventZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Option_MonitorEventZ { - const ret: number = bindings.COption_MonitorEventZ_clone(this.ptr); + const ret: bigint = bindings.COption_MonitorEventZ_clone(this.ptr); const ret_hu_conv: Option_MonitorEventZ = Option_MonitorEventZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -412,9 +412,9 @@ export class Option_MonitorEventZ extends CommonBase { export class Option_MonitorEventZ_Some extends Option_MonitorEventZ { public some: MonitorEvent; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); - const some: number = bindings.LDKCOption_MonitorEventZ_Some_get_some(ptr); + const some: bigint = bindings.LDKCOption_MonitorEventZ_Some_get_some(ptr); const some_hu_conv: MonitorEvent = MonitorEvent.constr_from_ptr(some); CommonBase.add_ref_from(some_hu_conv, this); this.some = some_hu_conv; @@ -423,7 +423,7 @@ export class Option_MonitorEventZ_Some extends Option_MonitorEventZ { /** A Option_MonitorEventZ of type None */ export class Option_MonitorEventZ_None extends Option_MonitorEventZ { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } diff --git a/ts/structs/Option_NetAddressZ.mts b/ts/structs/Option_NetAddressZ.mts index 6ef2ccef..04b85384 100644 --- a/ts/structs/Option_NetAddressZ.mts +++ b/ts/structs/Option_NetAddressZ.mts @@ -359,9 +359,9 @@ import * as bindings from '../bindings.mjs' * An enum which can either contain a crate::lightning::ln::msgs::NetAddress or not */ export class Option_NetAddressZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { super(ptr, bindings.COption_NetAddressZ_free); } + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.COption_NetAddressZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Option_NetAddressZ { + public static constr_from_ptr(ptr: bigint): Option_NetAddressZ { const raw_ty: number = bindings.LDKCOption_NetAddressZ_ty_from_ptr(ptr); switch (raw_ty) { case 0: return new Option_NetAddressZ_Some(ptr); @@ -375,7 +375,7 @@ export class Option_NetAddressZ extends CommonBase { * Constructs a new COption_NetAddressZ containing a crate::lightning::ln::msgs::NetAddress */ public static constructor_some(o: NetAddress): Option_NetAddressZ { - const ret: number = bindings.COption_NetAddressZ_some(CommonBase.get_ptr_of(o)); + const ret: bigint = bindings.COption_NetAddressZ_some(CommonBase.get_ptr_of(o)); const ret_hu_conv: Option_NetAddressZ = Option_NetAddressZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -385,14 +385,14 @@ export class Option_NetAddressZ extends CommonBase { * Constructs a new COption_NetAddressZ containing nothing */ public static constructor_none(): Option_NetAddressZ { - const ret: number = bindings.COption_NetAddressZ_none(); + const ret: bigint = bindings.COption_NetAddressZ_none(); const ret_hu_conv: Option_NetAddressZ = Option_NetAddressZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.COption_NetAddressZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.COption_NetAddressZ_clone_ptr(this.ptr); return ret; } @@ -401,7 +401,7 @@ export class Option_NetAddressZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Option_NetAddressZ { - const ret: number = bindings.COption_NetAddressZ_clone(this.ptr); + const ret: bigint = bindings.COption_NetAddressZ_clone(this.ptr); const ret_hu_conv: Option_NetAddressZ = Option_NetAddressZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -412,9 +412,9 @@ export class Option_NetAddressZ extends CommonBase { export class Option_NetAddressZ_Some extends Option_NetAddressZ { public some: NetAddress; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); - const some: number = bindings.LDKCOption_NetAddressZ_Some_get_some(ptr); + const some: bigint = bindings.LDKCOption_NetAddressZ_Some_get_some(ptr); const some_hu_conv: NetAddress = NetAddress.constr_from_ptr(some); CommonBase.add_ref_from(some_hu_conv, this); this.some = some_hu_conv; @@ -423,7 +423,7 @@ export class Option_NetAddressZ_Some extends Option_NetAddressZ { /** A Option_NetAddressZ of type None */ export class Option_NetAddressZ_None extends Option_NetAddressZ { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } diff --git a/ts/structs/Option_NetworkUpdateZ.mts b/ts/structs/Option_NetworkUpdateZ.mts index f3965240..79fa115a 100644 --- a/ts/structs/Option_NetworkUpdateZ.mts +++ b/ts/structs/Option_NetworkUpdateZ.mts @@ -359,9 +359,9 @@ import * as bindings from '../bindings.mjs' * An enum which can either contain a crate::lightning::routing::gossip::NetworkUpdate or not */ export class Option_NetworkUpdateZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { super(ptr, bindings.COption_NetworkUpdateZ_free); } + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.COption_NetworkUpdateZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Option_NetworkUpdateZ { + public static constr_from_ptr(ptr: bigint): Option_NetworkUpdateZ { const raw_ty: number = bindings.LDKCOption_NetworkUpdateZ_ty_from_ptr(ptr); switch (raw_ty) { case 0: return new Option_NetworkUpdateZ_Some(ptr); @@ -375,7 +375,7 @@ export class Option_NetworkUpdateZ extends CommonBase { * Constructs a new COption_NetworkUpdateZ containing a crate::lightning::routing::gossip::NetworkUpdate */ public static constructor_some(o: NetworkUpdate): Option_NetworkUpdateZ { - const ret: number = bindings.COption_NetworkUpdateZ_some(CommonBase.get_ptr_of(o)); + const ret: bigint = bindings.COption_NetworkUpdateZ_some(CommonBase.get_ptr_of(o)); const ret_hu_conv: Option_NetworkUpdateZ = Option_NetworkUpdateZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -385,14 +385,14 @@ export class Option_NetworkUpdateZ extends CommonBase { * Constructs a new COption_NetworkUpdateZ containing nothing */ public static constructor_none(): Option_NetworkUpdateZ { - const ret: number = bindings.COption_NetworkUpdateZ_none(); + const ret: bigint = bindings.COption_NetworkUpdateZ_none(); const ret_hu_conv: Option_NetworkUpdateZ = Option_NetworkUpdateZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.COption_NetworkUpdateZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.COption_NetworkUpdateZ_clone_ptr(this.ptr); return ret; } @@ -401,7 +401,7 @@ export class Option_NetworkUpdateZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Option_NetworkUpdateZ { - const ret: number = bindings.COption_NetworkUpdateZ_clone(this.ptr); + const ret: bigint = bindings.COption_NetworkUpdateZ_clone(this.ptr); const ret_hu_conv: Option_NetworkUpdateZ = Option_NetworkUpdateZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -412,9 +412,9 @@ export class Option_NetworkUpdateZ extends CommonBase { export class Option_NetworkUpdateZ_Some extends Option_NetworkUpdateZ { public some: NetworkUpdate; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); - const some: number = bindings.LDKCOption_NetworkUpdateZ_Some_get_some(ptr); + const some: bigint = bindings.LDKCOption_NetworkUpdateZ_Some_get_some(ptr); const some_hu_conv: NetworkUpdate = NetworkUpdate.constr_from_ptr(some); CommonBase.add_ref_from(some_hu_conv, this); this.some = some_hu_conv; @@ -423,7 +423,7 @@ export class Option_NetworkUpdateZ_Some extends Option_NetworkUpdateZ { /** A Option_NetworkUpdateZ of type None */ export class Option_NetworkUpdateZ_None extends Option_NetworkUpdateZ { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } diff --git a/ts/structs/Option_TypeZ.mts b/ts/structs/Option_TypeZ.mts index caddc94b..5176306c 100644 --- a/ts/structs/Option_TypeZ.mts +++ b/ts/structs/Option_TypeZ.mts @@ -359,9 +359,9 @@ import * as bindings from '../bindings.mjs' * An enum which can either contain a crate::lightning::ln::wire::Type or not */ export class Option_TypeZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { super(ptr, bindings.COption_TypeZ_free); } + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.COption_TypeZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Option_TypeZ { + public static constr_from_ptr(ptr: bigint): Option_TypeZ { const raw_ty: number = bindings.LDKCOption_TypeZ_ty_from_ptr(ptr); switch (raw_ty) { case 0: return new Option_TypeZ_Some(ptr); @@ -375,7 +375,7 @@ export class Option_TypeZ extends CommonBase { * Constructs a new COption_TypeZ containing a crate::lightning::ln::wire::Type */ public static constructor_some(o: Type): Option_TypeZ { - const ret: number = bindings.COption_TypeZ_some(o == null ? 0 : CommonBase.get_ptr_of(o)); + const ret: bigint = bindings.COption_TypeZ_some(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Option_TypeZ = Option_TypeZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); CommonBase.add_ref_from(ret_hu_conv, o); @@ -386,14 +386,14 @@ export class Option_TypeZ extends CommonBase { * Constructs a new COption_TypeZ containing nothing */ public static constructor_none(): Option_TypeZ { - const ret: number = bindings.COption_TypeZ_none(); + const ret: bigint = bindings.COption_TypeZ_none(); const ret_hu_conv: Option_TypeZ = Option_TypeZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.COption_TypeZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.COption_TypeZ_clone_ptr(this.ptr); return ret; } @@ -402,7 +402,7 @@ export class Option_TypeZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Option_TypeZ { - const ret: number = bindings.COption_TypeZ_clone(this.ptr); + const ret: bigint = bindings.COption_TypeZ_clone(this.ptr); const ret_hu_conv: Option_TypeZ = Option_TypeZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -413,9 +413,9 @@ export class Option_TypeZ extends CommonBase { export class Option_TypeZ_Some extends Option_TypeZ { public some: Type; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); - const some: number = bindings.LDKCOption_TypeZ_Some_get_some(ptr); + const some: bigint = bindings.LDKCOption_TypeZ_Some_get_some(ptr); const ret_hu_conv: Type = new Type(null, some); CommonBase.add_ref_from(ret_hu_conv, this); this.some = ret_hu_conv; @@ -424,7 +424,7 @@ export class Option_TypeZ_Some extends Option_TypeZ { /** A Option_TypeZ of type None */ export class Option_TypeZ_None extends Option_TypeZ { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } diff --git a/ts/structs/Option_u16Z.mts b/ts/structs/Option_u16Z.mts index 889fcdf7..98520701 100644 --- a/ts/structs/Option_u16Z.mts +++ b/ts/structs/Option_u16Z.mts @@ -359,9 +359,9 @@ import * as bindings from '../bindings.mjs' * An enum which can either contain a u16 or not */ export class Option_u16Z extends CommonBase { - protected constructor(_dummy: object, ptr: number) { super(ptr, bindings.COption_u16Z_free); } + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.COption_u16Z_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Option_u16Z { + public static constr_from_ptr(ptr: bigint): Option_u16Z { const raw_ty: number = bindings.LDKCOption_u16Z_ty_from_ptr(ptr); switch (raw_ty) { case 0: return new Option_u16Z_Some(ptr); @@ -375,7 +375,7 @@ export class Option_u16Z extends CommonBase { * Constructs a new COption_u16Z containing a u16 */ public static constructor_some(o: number): Option_u16Z { - const ret: number = bindings.COption_u16Z_some(o); + const ret: bigint = bindings.COption_u16Z_some(o); const ret_hu_conv: Option_u16Z = Option_u16Z.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -385,14 +385,14 @@ export class Option_u16Z extends CommonBase { * Constructs a new COption_u16Z containing nothing */ public static constructor_none(): Option_u16Z { - const ret: number = bindings.COption_u16Z_none(); + const ret: bigint = bindings.COption_u16Z_none(); const ret_hu_conv: Option_u16Z = Option_u16Z.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.COption_u16Z_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.COption_u16Z_clone_ptr(this.ptr); return ret; } @@ -401,7 +401,7 @@ export class Option_u16Z extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Option_u16Z { - const ret: number = bindings.COption_u16Z_clone(this.ptr); + const ret: bigint = bindings.COption_u16Z_clone(this.ptr); const ret_hu_conv: Option_u16Z = Option_u16Z.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -412,7 +412,7 @@ export class Option_u16Z extends CommonBase { export class Option_u16Z_Some extends Option_u16Z { public some: number; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); this.some = bindings.LDKCOption_u16Z_Some_get_some(ptr); } @@ -420,7 +420,7 @@ export class Option_u16Z_Some extends Option_u16Z { /** A Option_u16Z of type None */ export class Option_u16Z_None extends Option_u16Z { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } diff --git a/ts/structs/Option_u32Z.mts b/ts/structs/Option_u32Z.mts index f6e724b7..81afa399 100644 --- a/ts/structs/Option_u32Z.mts +++ b/ts/structs/Option_u32Z.mts @@ -359,9 +359,9 @@ import * as bindings from '../bindings.mjs' * An enum which can either contain a u32 or not */ export class Option_u32Z extends CommonBase { - protected constructor(_dummy: object, ptr: number) { super(ptr, bindings.COption_u32Z_free); } + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.COption_u32Z_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Option_u32Z { + public static constr_from_ptr(ptr: bigint): Option_u32Z { const raw_ty: number = bindings.LDKCOption_u32Z_ty_from_ptr(ptr); switch (raw_ty) { case 0: return new Option_u32Z_Some(ptr); @@ -375,7 +375,7 @@ export class Option_u32Z extends CommonBase { * Constructs a new COption_u32Z containing a u32 */ public static constructor_some(o: number): Option_u32Z { - const ret: number = bindings.COption_u32Z_some(o); + const ret: bigint = bindings.COption_u32Z_some(o); const ret_hu_conv: Option_u32Z = Option_u32Z.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -385,14 +385,14 @@ export class Option_u32Z extends CommonBase { * Constructs a new COption_u32Z containing nothing */ public static constructor_none(): Option_u32Z { - const ret: number = bindings.COption_u32Z_none(); + const ret: bigint = bindings.COption_u32Z_none(); const ret_hu_conv: Option_u32Z = Option_u32Z.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.COption_u32Z_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.COption_u32Z_clone_ptr(this.ptr); return ret; } @@ -401,7 +401,7 @@ export class Option_u32Z extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Option_u32Z { - const ret: number = bindings.COption_u32Z_clone(this.ptr); + const ret: bigint = bindings.COption_u32Z_clone(this.ptr); const ret_hu_conv: Option_u32Z = Option_u32Z.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -412,7 +412,7 @@ export class Option_u32Z extends CommonBase { export class Option_u32Z_Some extends Option_u32Z { public some: number; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); this.some = bindings.LDKCOption_u32Z_Some_get_some(ptr); } @@ -420,7 +420,7 @@ export class Option_u32Z_Some extends Option_u32Z { /** A Option_u32Z of type None */ export class Option_u32Z_None extends Option_u32Z { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } diff --git a/ts/structs/Option_u64Z.mts b/ts/structs/Option_u64Z.mts index 932ec89d..aa2530e7 100644 --- a/ts/structs/Option_u64Z.mts +++ b/ts/structs/Option_u64Z.mts @@ -359,9 +359,9 @@ import * as bindings from '../bindings.mjs' * An enum which can either contain a u64 or not */ export class Option_u64Z extends CommonBase { - protected constructor(_dummy: object, ptr: number) { super(ptr, bindings.COption_u64Z_free); } + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.COption_u64Z_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Option_u64Z { + public static constr_from_ptr(ptr: bigint): Option_u64Z { const raw_ty: number = bindings.LDKCOption_u64Z_ty_from_ptr(ptr); switch (raw_ty) { case 0: return new Option_u64Z_Some(ptr); @@ -375,7 +375,7 @@ export class Option_u64Z extends CommonBase { * Constructs a new COption_u64Z containing a u64 */ public static constructor_some(o: bigint): Option_u64Z { - const ret: number = bindings.COption_u64Z_some(o); + const ret: bigint = bindings.COption_u64Z_some(o); const ret_hu_conv: Option_u64Z = Option_u64Z.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -385,14 +385,14 @@ export class Option_u64Z extends CommonBase { * Constructs a new COption_u64Z containing nothing */ public static constructor_none(): Option_u64Z { - const ret: number = bindings.COption_u64Z_none(); + const ret: bigint = bindings.COption_u64Z_none(); const ret_hu_conv: Option_u64Z = Option_u64Z.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.COption_u64Z_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.COption_u64Z_clone_ptr(this.ptr); return ret; } @@ -401,7 +401,7 @@ export class Option_u64Z extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Option_u64Z { - const ret: number = bindings.COption_u64Z_clone(this.ptr); + const ret: bigint = bindings.COption_u64Z_clone(this.ptr); const ret_hu_conv: Option_u64Z = Option_u64Z.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -412,7 +412,7 @@ export class Option_u64Z extends CommonBase { export class Option_u64Z_Some extends Option_u64Z { public some: bigint; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); this.some = bindings.LDKCOption_u64Z_Some_get_some(ptr); } @@ -420,7 +420,7 @@ export class Option_u64Z_Some extends Option_u64Z { /** A Option_u64Z of type None */ export class Option_u64Z_None extends Option_u64Z { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } diff --git a/ts/structs/OutPoint.mts b/ts/structs/OutPoint.mts index 86b76d25..200601bc 100644 --- a/ts/structs/OutPoint.mts +++ b/ts/structs/OutPoint.mts @@ -364,7 +364,7 @@ import * as bindings from '../bindings.mjs' */ export class OutPoint extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.OutPoint_free); } @@ -403,14 +403,14 @@ export class OutPoint extends CommonBase { * Constructs a new OutPoint given each field */ public static constructor_new(txid_arg: Uint8Array, index_arg: number): OutPoint { - const ret: number = bindings.OutPoint_new(bindings.encodeUint8Array(bindings.check_arr_len(txid_arg, 32)), index_arg); + const ret: bigint = bindings.OutPoint_new(bindings.encodeUint8Array(bindings.check_arr_len(txid_arg, 32)), index_arg); const ret_hu_conv: OutPoint = new OutPoint(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.OutPoint_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.OutPoint_clone_ptr(this.ptr); return ret; } @@ -418,7 +418,7 @@ export class OutPoint extends CommonBase { * Creates a copy of the OutPoint */ public clone(): OutPoint { - const ret: number = bindings.OutPoint_clone(this.ptr); + const ret: bigint = bindings.OutPoint_clone(this.ptr); const ret_hu_conv: OutPoint = new OutPoint(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -430,7 +430,7 @@ export class OutPoint extends CommonBase { * Two objects with NULL inner values will be considered "equal" here. */ public eq(b: OutPoint): boolean { - const ret: boolean = bindings.OutPoint_eq(this.ptr, b == null ? 0 : CommonBase.get_ptr_of(b) & ~1); + const ret: boolean = bindings.OutPoint_eq(this.ptr, b == null ? 0n : CommonBase.get_ptr_of(b)); CommonBase.add_ref_from(this, b); return ret; } @@ -465,7 +465,7 @@ export class OutPoint extends CommonBase { * Read a OutPoint from a byte array, created by OutPoint_write */ public static constructor_read(ser: Uint8Array): Result_OutPointDecodeErrorZ { - const ret: number = bindings.OutPoint_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.OutPoint_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_OutPointDecodeErrorZ = Result_OutPointDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/P2PGossipSync.mts b/ts/structs/P2PGossipSync.mts index 5b7e1315..f0a9520c 100644 --- a/ts/structs/P2PGossipSync.mts +++ b/ts/structs/P2PGossipSync.mts @@ -368,7 +368,7 @@ import * as bindings from '../bindings.mjs' */ export class P2PGossipSync extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.P2PGossipSync_free); } @@ -380,7 +380,7 @@ export class P2PGossipSync extends CommonBase { * channel owners' keys. */ public static constructor_new(network_graph: NetworkGraph, chain_access: Option_AccessZ, logger: Logger): P2PGossipSync { - const ret: number = bindings.P2PGossipSync_new(network_graph == null ? 0 : CommonBase.get_ptr_of(network_graph) & ~1, CommonBase.get_ptr_of(chain_access), logger == null ? 0 : CommonBase.get_ptr_of(logger)); + const ret: bigint = bindings.P2PGossipSync_new(network_graph == null ? 0n : CommonBase.get_ptr_of(network_graph), CommonBase.get_ptr_of(chain_access), logger == null ? 0n : CommonBase.get_ptr_of(logger)); const ret_hu_conv: P2PGossipSync = new P2PGossipSync(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); CommonBase.add_ref_from(ret_hu_conv, network_graph); @@ -404,7 +404,7 @@ export class P2PGossipSync extends CommonBase { * This copies the `inner` pointer in this_arg and thus the returned RoutingMessageHandler must be freed before this_arg is */ public as_RoutingMessageHandler(): RoutingMessageHandler { - const ret: number = bindings.P2PGossipSync_as_RoutingMessageHandler(this.ptr); + const ret: bigint = bindings.P2PGossipSync_as_RoutingMessageHandler(this.ptr); const ret_hu_conv: RoutingMessageHandler = new RoutingMessageHandler(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -415,7 +415,7 @@ export class P2PGossipSync extends CommonBase { * This copies the `inner` pointer in this_arg and thus the returned MessageSendEventsProvider must be freed before this_arg is */ public as_MessageSendEventsProvider(): MessageSendEventsProvider { - const ret: number = bindings.P2PGossipSync_as_MessageSendEventsProvider(this.ptr); + const ret: bigint = bindings.P2PGossipSync_as_MessageSendEventsProvider(this.ptr); const ret_hu_conv: MessageSendEventsProvider = new MessageSendEventsProvider(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; diff --git a/ts/structs/ParseError.mts b/ts/structs/ParseError.mts index fe510ae7..4ee5bb53 100644 --- a/ts/structs/ParseError.mts +++ b/ts/structs/ParseError.mts @@ -360,9 +360,9 @@ import * as bindings from '../bindings.mjs' * reasons, but should generally result in an \"invalid BOLT11 invoice\" message for the user. */ export class ParseError extends CommonBase { - protected constructor(_dummy: object, ptr: number) { super(ptr, bindings.ParseError_free); } + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.ParseError_free); } /* @internal */ - public static constr_from_ptr(ptr: number): ParseError { + public static constr_from_ptr(ptr: bigint): ParseError { const raw_ty: number = bindings.LDKParseError_ty_from_ptr(ptr); switch (raw_ty) { case 0: return new ParseError_Bech32Error(ptr); @@ -388,8 +388,8 @@ export class ParseError extends CommonBase { } } - public clone_ptr(): number { - const ret: number = bindings.ParseError_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.ParseError_clone_ptr(this.ptr); return ret; } @@ -397,7 +397,7 @@ export class ParseError extends CommonBase { * Creates a copy of the ParseError */ public clone(): ParseError { - const ret: number = bindings.ParseError_clone(this.ptr); + const ret: bigint = bindings.ParseError_clone(this.ptr); const ret_hu_conv: ParseError = ParseError.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -407,7 +407,7 @@ export class ParseError extends CommonBase { * Utility method to constructs a new Bech32Error-variant ParseError */ public static constructor_bech32_error(a: Bech32Error): ParseError { - const ret: number = bindings.ParseError_bech32_error(CommonBase.get_ptr_of(a)); + const ret: bigint = bindings.ParseError_bech32_error(CommonBase.get_ptr_of(a)); const ret_hu_conv: ParseError = ParseError.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -417,7 +417,7 @@ export class ParseError extends CommonBase { * Utility method to constructs a new ParseAmountError-variant ParseError */ public static constructor_parse_amount_error(a: UnqualifiedError): ParseError { - const ret: number = bindings.ParseError_parse_amount_error(0); + const ret: bigint = bindings.ParseError_parse_amount_error(0); const ret_hu_conv: ParseError = ParseError.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -427,7 +427,7 @@ export class ParseError extends CommonBase { * Utility method to constructs a new MalformedSignature-variant ParseError */ public static constructor_malformed_signature(a: Secp256k1Error): ParseError { - const ret: number = bindings.ParseError_malformed_signature(a); + const ret: bigint = bindings.ParseError_malformed_signature(a); const ret_hu_conv: ParseError = ParseError.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -437,7 +437,7 @@ export class ParseError extends CommonBase { * Utility method to constructs a new BadPrefix-variant ParseError */ public static constructor_bad_prefix(): ParseError { - const ret: number = bindings.ParseError_bad_prefix(); + const ret: bigint = bindings.ParseError_bad_prefix(); const ret_hu_conv: ParseError = ParseError.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -447,7 +447,7 @@ export class ParseError extends CommonBase { * Utility method to constructs a new UnknownCurrency-variant ParseError */ public static constructor_unknown_currency(): ParseError { - const ret: number = bindings.ParseError_unknown_currency(); + const ret: bigint = bindings.ParseError_unknown_currency(); const ret_hu_conv: ParseError = ParseError.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -457,7 +457,7 @@ export class ParseError extends CommonBase { * Utility method to constructs a new UnknownSiPrefix-variant ParseError */ public static constructor_unknown_si_prefix(): ParseError { - const ret: number = bindings.ParseError_unknown_si_prefix(); + const ret: bigint = bindings.ParseError_unknown_si_prefix(); const ret_hu_conv: ParseError = ParseError.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -467,7 +467,7 @@ export class ParseError extends CommonBase { * Utility method to constructs a new MalformedHRP-variant ParseError */ public static constructor_malformed_hrp(): ParseError { - const ret: number = bindings.ParseError_malformed_hrp(); + const ret: bigint = bindings.ParseError_malformed_hrp(); const ret_hu_conv: ParseError = ParseError.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -477,7 +477,7 @@ export class ParseError extends CommonBase { * Utility method to constructs a new TooShortDataPart-variant ParseError */ public static constructor_too_short_data_part(): ParseError { - const ret: number = bindings.ParseError_too_short_data_part(); + const ret: bigint = bindings.ParseError_too_short_data_part(); const ret_hu_conv: ParseError = ParseError.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -487,7 +487,7 @@ export class ParseError extends CommonBase { * Utility method to constructs a new UnexpectedEndOfTaggedFields-variant ParseError */ public static constructor_unexpected_end_of_tagged_fields(): ParseError { - const ret: number = bindings.ParseError_unexpected_end_of_tagged_fields(); + const ret: bigint = bindings.ParseError_unexpected_end_of_tagged_fields(); const ret_hu_conv: ParseError = ParseError.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -497,7 +497,7 @@ export class ParseError extends CommonBase { * Utility method to constructs a new DescriptionDecodeError-variant ParseError */ public static constructor_description_decode_error(a: UnqualifiedError): ParseError { - const ret: number = bindings.ParseError_description_decode_error(0); + const ret: bigint = bindings.ParseError_description_decode_error(0); const ret_hu_conv: ParseError = ParseError.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -507,7 +507,7 @@ export class ParseError extends CommonBase { * Utility method to constructs a new PaddingError-variant ParseError */ public static constructor_padding_error(): ParseError { - const ret: number = bindings.ParseError_padding_error(); + const ret: bigint = bindings.ParseError_padding_error(); const ret_hu_conv: ParseError = ParseError.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -517,7 +517,7 @@ export class ParseError extends CommonBase { * Utility method to constructs a new IntegerOverflowError-variant ParseError */ public static constructor_integer_overflow_error(): ParseError { - const ret: number = bindings.ParseError_integer_overflow_error(); + const ret: bigint = bindings.ParseError_integer_overflow_error(); const ret_hu_conv: ParseError = ParseError.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -527,7 +527,7 @@ export class ParseError extends CommonBase { * Utility method to constructs a new InvalidSegWitProgramLength-variant ParseError */ public static constructor_invalid_seg_wit_program_length(): ParseError { - const ret: number = bindings.ParseError_invalid_seg_wit_program_length(); + const ret: bigint = bindings.ParseError_invalid_seg_wit_program_length(); const ret_hu_conv: ParseError = ParseError.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -537,7 +537,7 @@ export class ParseError extends CommonBase { * Utility method to constructs a new InvalidPubKeyHashLength-variant ParseError */ public static constructor_invalid_pub_key_hash_length(): ParseError { - const ret: number = bindings.ParseError_invalid_pub_key_hash_length(); + const ret: bigint = bindings.ParseError_invalid_pub_key_hash_length(); const ret_hu_conv: ParseError = ParseError.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -547,7 +547,7 @@ export class ParseError extends CommonBase { * Utility method to constructs a new InvalidScriptHashLength-variant ParseError */ public static constructor_invalid_script_hash_length(): ParseError { - const ret: number = bindings.ParseError_invalid_script_hash_length(); + const ret: bigint = bindings.ParseError_invalid_script_hash_length(); const ret_hu_conv: ParseError = ParseError.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -557,7 +557,7 @@ export class ParseError extends CommonBase { * Utility method to constructs a new InvalidRecoveryId-variant ParseError */ public static constructor_invalid_recovery_id(): ParseError { - const ret: number = bindings.ParseError_invalid_recovery_id(); + const ret: bigint = bindings.ParseError_invalid_recovery_id(); const ret_hu_conv: ParseError = ParseError.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -567,7 +567,7 @@ export class ParseError extends CommonBase { * Utility method to constructs a new InvalidSliceLength-variant ParseError */ public static constructor_invalid_slice_length(a: string): ParseError { - const ret: number = bindings.ParseError_invalid_slice_length(bindings.encodeString(a)); + const ret: bigint = bindings.ParseError_invalid_slice_length(bindings.encodeString(a)); const ret_hu_conv: ParseError = ParseError.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -577,7 +577,7 @@ export class ParseError extends CommonBase { * Utility method to constructs a new Skip-variant ParseError */ public static constructor_skip(): ParseError { - const ret: number = bindings.ParseError_skip(); + const ret: bigint = bindings.ParseError_skip(); const ret_hu_conv: ParseError = ParseError.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -597,9 +597,9 @@ export class ParseError extends CommonBase { export class ParseError_Bech32Error extends ParseError { public bech32_error: Bech32Error; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); - const bech32_error: number = bindings.LDKParseError_Bech32Error_get_bech32_error(ptr); + const bech32_error: bigint = bindings.LDKParseError_Bech32Error_get_bech32_error(ptr); const bech32_error_hu_conv: Bech32Error = Bech32Error.constr_from_ptr(bech32_error); CommonBase.add_ref_from(bech32_error_hu_conv, this); this.bech32_error = bech32_error_hu_conv; @@ -609,7 +609,7 @@ export class ParseError_Bech32Error extends ParseError { export class ParseError_ParseAmountError extends ParseError { public parse_amount_error: UnqualifiedError; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const parse_amount_error: number = bindings.LDKParseError_ParseAmountError_get_parse_amount_error(ptr); const parse_amount_error_conv: UnqualifiedError = new UnqualifiedError(parse_amount_error); @@ -620,7 +620,7 @@ export class ParseError_ParseAmountError extends ParseError { export class ParseError_MalformedSignature extends ParseError { public malformed_signature: Secp256k1Error; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); this.malformed_signature = bindings.LDKParseError_MalformedSignature_get_malformed_signature(ptr); } @@ -628,42 +628,42 @@ export class ParseError_MalformedSignature extends ParseError { /** A ParseError of type BadPrefix */ export class ParseError_BadPrefix extends ParseError { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } /** A ParseError of type UnknownCurrency */ export class ParseError_UnknownCurrency extends ParseError { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } /** A ParseError of type UnknownSiPrefix */ export class ParseError_UnknownSiPrefix extends ParseError { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } /** A ParseError of type MalformedHRP */ export class ParseError_MalformedHRP extends ParseError { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } /** A ParseError of type TooShortDataPart */ export class ParseError_TooShortDataPart extends ParseError { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } /** A ParseError of type UnexpectedEndOfTaggedFields */ export class ParseError_UnexpectedEndOfTaggedFields extends ParseError { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } @@ -671,7 +671,7 @@ export class ParseError_UnexpectedEndOfTaggedFields extends ParseError { export class ParseError_DescriptionDecodeError extends ParseError { public description_decode_error: UnqualifiedError; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const description_decode_error: number = bindings.LDKParseError_DescriptionDecodeError_get_description_decode_error(ptr); const description_decode_error_conv: UnqualifiedError = new UnqualifiedError(description_decode_error); @@ -681,42 +681,42 @@ export class ParseError_DescriptionDecodeError extends ParseError { /** A ParseError of type PaddingError */ export class ParseError_PaddingError extends ParseError { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } /** A ParseError of type IntegerOverflowError */ export class ParseError_IntegerOverflowError extends ParseError { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } /** A ParseError of type InvalidSegWitProgramLength */ export class ParseError_InvalidSegWitProgramLength extends ParseError { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } /** A ParseError of type InvalidPubKeyHashLength */ export class ParseError_InvalidPubKeyHashLength extends ParseError { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } /** A ParseError of type InvalidScriptHashLength */ export class ParseError_InvalidScriptHashLength extends ParseError { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } /** A ParseError of type InvalidRecoveryId */ export class ParseError_InvalidRecoveryId extends ParseError { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } @@ -724,7 +724,7 @@ export class ParseError_InvalidRecoveryId extends ParseError { export class ParseError_InvalidSliceLength extends ParseError { public invalid_slice_length: string; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const invalid_slice_length: number = bindings.LDKParseError_InvalidSliceLength_get_invalid_slice_length(ptr); const invalid_slice_length_conv: string = bindings.decodeString(invalid_slice_length); @@ -734,7 +734,7 @@ export class ParseError_InvalidSliceLength extends ParseError { /** A ParseError of type Skip */ export class ParseError_Skip extends ParseError { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } diff --git a/ts/structs/ParseOrSemanticError.mts b/ts/structs/ParseOrSemanticError.mts index 601f6318..d9c076a7 100644 --- a/ts/structs/ParseOrSemanticError.mts +++ b/ts/structs/ParseOrSemanticError.mts @@ -361,9 +361,9 @@ import * as bindings from '../bindings.mjs' * like wrong signatures, missing fields etc. could mean that someone tampered with the invoice. */ export class ParseOrSemanticError extends CommonBase { - protected constructor(_dummy: object, ptr: number) { super(ptr, bindings.ParseOrSemanticError_free); } + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.ParseOrSemanticError_free); } /* @internal */ - public static constr_from_ptr(ptr: number): ParseOrSemanticError { + public static constr_from_ptr(ptr: bigint): ParseOrSemanticError { const raw_ty: number = bindings.LDKParseOrSemanticError_ty_from_ptr(ptr); switch (raw_ty) { case 0: return new ParseOrSemanticError_ParseError(ptr); @@ -373,8 +373,8 @@ export class ParseOrSemanticError extends CommonBase { } } - public clone_ptr(): number { - const ret: number = bindings.ParseOrSemanticError_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.ParseOrSemanticError_clone_ptr(this.ptr); return ret; } @@ -382,7 +382,7 @@ export class ParseOrSemanticError extends CommonBase { * Creates a copy of the ParseOrSemanticError */ public clone(): ParseOrSemanticError { - const ret: number = bindings.ParseOrSemanticError_clone(this.ptr); + const ret: bigint = bindings.ParseOrSemanticError_clone(this.ptr); const ret_hu_conv: ParseOrSemanticError = ParseOrSemanticError.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -392,7 +392,7 @@ export class ParseOrSemanticError extends CommonBase { * Utility method to constructs a new ParseError-variant ParseOrSemanticError */ public static constructor_parse_error(a: ParseError): ParseOrSemanticError { - const ret: number = bindings.ParseOrSemanticError_parse_error(CommonBase.get_ptr_of(a)); + const ret: bigint = bindings.ParseOrSemanticError_parse_error(CommonBase.get_ptr_of(a)); const ret_hu_conv: ParseOrSemanticError = ParseOrSemanticError.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -402,7 +402,7 @@ export class ParseOrSemanticError extends CommonBase { * Utility method to constructs a new SemanticError-variant ParseOrSemanticError */ public static constructor_semantic_error(a: SemanticError): ParseOrSemanticError { - const ret: number = bindings.ParseOrSemanticError_semantic_error(a); + const ret: bigint = bindings.ParseOrSemanticError_semantic_error(a); const ret_hu_conv: ParseOrSemanticError = ParseOrSemanticError.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -422,9 +422,9 @@ export class ParseOrSemanticError extends CommonBase { export class ParseOrSemanticError_ParseError extends ParseOrSemanticError { public parse_error: ParseError; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); - const parse_error: number = bindings.LDKParseOrSemanticError_ParseError_get_parse_error(ptr); + const parse_error: bigint = bindings.LDKParseOrSemanticError_ParseError_get_parse_error(ptr); const parse_error_hu_conv: ParseError = ParseError.constr_from_ptr(parse_error); CommonBase.add_ref_from(parse_error_hu_conv, this); this.parse_error = parse_error_hu_conv; @@ -434,7 +434,7 @@ export class ParseOrSemanticError_ParseError extends ParseOrSemanticError { export class ParseOrSemanticError_SemanticError extends ParseOrSemanticError { public semantic_error: SemanticError; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); this.semantic_error = bindings.LDKParseOrSemanticError_SemanticError_get_semantic_error(ptr); } diff --git a/ts/structs/PayeePubKey.mts b/ts/structs/PayeePubKey.mts index 9a2bfc90..76fc868a 100644 --- a/ts/structs/PayeePubKey.mts +++ b/ts/structs/PayeePubKey.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class PayeePubKey extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.PayeePubKey_free); } @@ -379,14 +379,14 @@ export class PayeePubKey extends CommonBase { * Constructs a new PayeePubKey given each field */ public static constructor_new(a_arg: Uint8Array): PayeePubKey { - const ret: number = bindings.PayeePubKey_new(bindings.encodeUint8Array(bindings.check_arr_len(a_arg, 33))); + const ret: bigint = bindings.PayeePubKey_new(bindings.encodeUint8Array(bindings.check_arr_len(a_arg, 33))); const ret_hu_conv: PayeePubKey = new PayeePubKey(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.PayeePubKey_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.PayeePubKey_clone_ptr(this.ptr); return ret; } @@ -394,7 +394,7 @@ export class PayeePubKey extends CommonBase { * Creates a copy of the PayeePubKey */ public clone(): PayeePubKey { - const ret: number = bindings.PayeePubKey_clone(this.ptr); + const ret: bigint = bindings.PayeePubKey_clone(this.ptr); const ret_hu_conv: PayeePubKey = new PayeePubKey(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -414,7 +414,7 @@ export class PayeePubKey extends CommonBase { * Two objects with NULL inner values will be considered "equal" here. */ public eq(b: PayeePubKey): boolean { - const ret: boolean = bindings.PayeePubKey_eq(this.ptr, b == null ? 0 : CommonBase.get_ptr_of(b) & ~1); + const ret: boolean = bindings.PayeePubKey_eq(this.ptr, b == null ? 0n : CommonBase.get_ptr_of(b)); CommonBase.add_ref_from(this, b); return ret; } diff --git a/ts/structs/Payer.mts b/ts/structs/Payer.mts index aee8cf7a..fab94504 100644 --- a/ts/structs/Payer.mts +++ b/ts/structs/Payer.mts @@ -394,7 +394,7 @@ export class Payer extends CommonBase { public bindings_instance?: bindings.LDKPayer; /* @internal */ - constructor(_dummy: object, ptr: number) { + constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.Payer_free); this.bindings_instance = null; } @@ -410,29 +410,29 @@ export class Payer extends CommonBase { }, first_hops (): number { const ret: ChannelDetails[] = arg.first_hops(); - const result: number = bindings.encodeUint32Array(ret != null ? ret.map(ret_conv_16 => ret_conv_16 == null ? 0 : ret_conv_16.clone_ptr()) : null); + const result: number = bindings.encodeUint64Array(ret != null ? ret.map(ret_conv_16 => ret_conv_16 == null ? 0n : ret_conv_16.clone_ptr()) : null); return result; }, - send_payment (route: number, payment_hash: number, payment_secret: number): number { + send_payment (route: bigint, payment_hash: number, payment_secret: number): bigint { const route_hu_conv: Route = new Route(null, route); const payment_hash_conv: Uint8Array = bindings.decodeUint8Array(payment_hash); const payment_secret_conv: Uint8Array = bindings.decodeUint8Array(payment_secret); const ret: Result_PaymentIdPaymentSendFailureZ = arg.send_payment(route_hu_conv, payment_hash_conv, payment_secret_conv); - const result: number = ret == null ? 0 : ret.clone_ptr(); + const result: bigint = ret == null ? 0n : ret.clone_ptr(); return result; }, - send_spontaneous_payment (route: number, payment_preimage: number): number { + send_spontaneous_payment (route: bigint, payment_preimage: number): bigint { const route_hu_conv: Route = new Route(null, route); const payment_preimage_conv: Uint8Array = bindings.decodeUint8Array(payment_preimage); const ret: Result_PaymentIdPaymentSendFailureZ = arg.send_spontaneous_payment(route_hu_conv, payment_preimage_conv); - const result: number = ret == null ? 0 : ret.clone_ptr(); + const result: bigint = ret == null ? 0n : ret.clone_ptr(); return result; }, - retry_payment (route: number, payment_id: number): number { + retry_payment (route: bigint, payment_id: number): bigint { const route_hu_conv: Route = new Route(null, route); const payment_id_conv: Uint8Array = bindings.decodeUint8Array(payment_id); const ret: Result_NonePaymentSendFailureZ = arg.retry_payment(route_hu_conv, payment_id_conv); - const result: number = ret == null ? 0 : ret.clone_ptr(); + const result: bigint = ret == null ? 0n : ret.clone_ptr(); return result; }, abandon_payment (payment_id: number): void { @@ -440,7 +440,7 @@ export class Payer extends CommonBase { arg.abandon_payment(payment_id_conv); }, } as bindings.LDKPayer; - const ptr: number = bindings.LDKPayer_new(structImplementation); + const ptr: bigint = bindings.LDKPayer_new(structImplementation); impl_holder.held = new Payer(null, ptr); impl_holder.held.bindings_instance = structImplementation; @@ -464,7 +464,7 @@ export class Payer extends CommonBase { const ret_conv_16_len: number = bindings.getArrayLength(ret); const ret_conv_16_arr: ChannelDetails[] = new Array(ret_conv_16_len).fill(null); for (var q = 0; q < ret_conv_16_len; q++) { - const ret_conv_16: number = bindings.getU32ArrayElem(ret, q); + const ret_conv_16: bigint = bindings.getU64ArrayElem(ret, q); const ret_conv_16_hu_conv: ChannelDetails = new ChannelDetails(null, ret_conv_16); CommonBase.add_ref_from(ret_conv_16_hu_conv, this); ret_conv_16_arr[q] = ret_conv_16_hu_conv; @@ -479,7 +479,7 @@ export class Payer extends CommonBase { * Note that payment_secret (or a relevant inner pointer) may be NULL or all-0s to represent None */ public send_payment(route: Route, payment_hash: Uint8Array, payment_secret: Uint8Array): Result_PaymentIdPaymentSendFailureZ { - const ret: number = bindings.Payer_send_payment(this.ptr, route == null ? 0 : CommonBase.get_ptr_of(route) & ~1, bindings.encodeUint8Array(bindings.check_arr_len(payment_hash, 32)), bindings.encodeUint8Array(bindings.check_arr_len(payment_secret, 32))); + const ret: bigint = bindings.Payer_send_payment(this.ptr, route == null ? 0n : CommonBase.get_ptr_of(route), bindings.encodeUint8Array(bindings.check_arr_len(payment_hash, 32)), bindings.encodeUint8Array(bindings.check_arr_len(payment_secret, 32))); const ret_hu_conv: Result_PaymentIdPaymentSendFailureZ = Result_PaymentIdPaymentSendFailureZ.constr_from_ptr(ret); CommonBase.add_ref_from(this, route); return ret_hu_conv; @@ -489,7 +489,7 @@ export class Payer extends CommonBase { * Sends a spontaneous payment over the Lightning Network using the given [`Route`]. */ public send_spontaneous_payment(route: Route, payment_preimage: Uint8Array): Result_PaymentIdPaymentSendFailureZ { - const ret: number = bindings.Payer_send_spontaneous_payment(this.ptr, route == null ? 0 : CommonBase.get_ptr_of(route) & ~1, bindings.encodeUint8Array(bindings.check_arr_len(payment_preimage, 32))); + const ret: bigint = bindings.Payer_send_spontaneous_payment(this.ptr, route == null ? 0n : CommonBase.get_ptr_of(route), bindings.encodeUint8Array(bindings.check_arr_len(payment_preimage, 32))); const ret_hu_conv: Result_PaymentIdPaymentSendFailureZ = Result_PaymentIdPaymentSendFailureZ.constr_from_ptr(ret); CommonBase.add_ref_from(this, route); return ret_hu_conv; @@ -499,7 +499,7 @@ export class Payer extends CommonBase { * Retries a failed payment path for the [`PaymentId`] using the given [`Route`]. */ public retry_payment(route: Route, payment_id: Uint8Array): Result_NonePaymentSendFailureZ { - const ret: number = bindings.Payer_retry_payment(this.ptr, route == null ? 0 : CommonBase.get_ptr_of(route) & ~1, bindings.encodeUint8Array(bindings.check_arr_len(payment_id, 32))); + const ret: bigint = bindings.Payer_retry_payment(this.ptr, route == null ? 0n : CommonBase.get_ptr_of(route), bindings.encodeUint8Array(bindings.check_arr_len(payment_id, 32))); const ret_hu_conv: Result_NonePaymentSendFailureZ = Result_NonePaymentSendFailureZ.constr_from_ptr(ret); CommonBase.add_ref_from(this, route); return ret_hu_conv; diff --git a/ts/structs/PaymentError.mts b/ts/structs/PaymentError.mts index 22a2a221..f2545b90 100644 --- a/ts/structs/PaymentError.mts +++ b/ts/structs/PaymentError.mts @@ -359,9 +359,9 @@ import * as bindings from '../bindings.mjs' * An error that may occur when making a payment. */ export class PaymentError extends CommonBase { - protected constructor(_dummy: object, ptr: number) { super(ptr, bindings.PaymentError_free); } + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.PaymentError_free); } /* @internal */ - public static constr_from_ptr(ptr: number): PaymentError { + public static constr_from_ptr(ptr: bigint): PaymentError { const raw_ty: number = bindings.LDKPaymentError_ty_from_ptr(ptr); switch (raw_ty) { case 0: return new PaymentError_Invoice(ptr); @@ -372,8 +372,8 @@ export class PaymentError extends CommonBase { } } - public clone_ptr(): number { - const ret: number = bindings.PaymentError_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.PaymentError_clone_ptr(this.ptr); return ret; } @@ -381,7 +381,7 @@ export class PaymentError extends CommonBase { * Creates a copy of the PaymentError */ public clone(): PaymentError { - const ret: number = bindings.PaymentError_clone(this.ptr); + const ret: bigint = bindings.PaymentError_clone(this.ptr); const ret_hu_conv: PaymentError = PaymentError.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -391,7 +391,7 @@ export class PaymentError extends CommonBase { * Utility method to constructs a new Invoice-variant PaymentError */ public static constructor_invoice(a: string): PaymentError { - const ret: number = bindings.PaymentError_invoice(bindings.encodeString(a)); + const ret: bigint = bindings.PaymentError_invoice(bindings.encodeString(a)); const ret_hu_conv: PaymentError = PaymentError.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -401,9 +401,10 @@ export class PaymentError extends CommonBase { * Utility method to constructs a new Routing-variant PaymentError */ public static constructor_routing(a: LightningError): PaymentError { - const ret: number = bindings.PaymentError_routing(a == null ? 0 : CommonBase.get_ptr_of(a) & ~1); + const ret: bigint = bindings.PaymentError_routing(a == null ? 0n : CommonBase.get_ptr_of(a)); const ret_hu_conv: PaymentError = PaymentError.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, a); return ret_hu_conv; } @@ -411,7 +412,7 @@ export class PaymentError extends CommonBase { * Utility method to constructs a new Sending-variant PaymentError */ public static constructor_sending(a: PaymentSendFailure): PaymentError { - const ret: number = bindings.PaymentError_sending(CommonBase.get_ptr_of(a)); + const ret: bigint = bindings.PaymentError_sending(CommonBase.get_ptr_of(a)); const ret_hu_conv: PaymentError = PaymentError.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -422,7 +423,7 @@ export class PaymentError extends CommonBase { export class PaymentError_Invoice extends PaymentError { public invoice: string; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const invoice: number = bindings.LDKPaymentError_Invoice_get_invoice(ptr); const invoice_conv: string = bindings.decodeString(invoice); @@ -433,9 +434,9 @@ export class PaymentError_Invoice extends PaymentError { export class PaymentError_Routing extends PaymentError { public routing: LightningError; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); - const routing: number = bindings.LDKPaymentError_Routing_get_routing(ptr); + const routing: bigint = bindings.LDKPaymentError_Routing_get_routing(ptr); const routing_hu_conv: LightningError = new LightningError(null, routing); CommonBase.add_ref_from(routing_hu_conv, this); this.routing = routing_hu_conv; @@ -445,9 +446,9 @@ export class PaymentError_Routing extends PaymentError { export class PaymentError_Sending extends PaymentError { public sending: PaymentSendFailure; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); - const sending: number = bindings.LDKPaymentError_Sending_get_sending(ptr); + const sending: bigint = bindings.LDKPaymentError_Sending_get_sending(ptr); const sending_hu_conv: PaymentSendFailure = PaymentSendFailure.constr_from_ptr(sending); CommonBase.add_ref_from(sending_hu_conv, this); this.sending = sending_hu_conv; diff --git a/ts/structs/PaymentParameters.mts b/ts/structs/PaymentParameters.mts index a71ce7de..20da218f 100644 --- a/ts/structs/PaymentParameters.mts +++ b/ts/structs/PaymentParameters.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class PaymentParameters extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.PaymentParameters_free); } @@ -392,7 +392,7 @@ export class PaymentParameters extends CommonBase { * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None */ public get_features(): InvoiceFeatures { - const ret: number = bindings.PaymentParameters_get_features(this.ptr); + const ret: bigint = bindings.PaymentParameters_get_features(this.ptr); const ret_hu_conv: InvoiceFeatures = new InvoiceFeatures(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -409,7 +409,8 @@ export class PaymentParameters extends CommonBase { * Note that val (or a relevant inner pointer) may be NULL or all-0s to represent None */ public set_features(val: InvoiceFeatures): void { - bindings.PaymentParameters_set_features(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.PaymentParameters_set_features(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** @@ -420,7 +421,7 @@ export class PaymentParameters extends CommonBase { const ret_conv_11_len: number = bindings.getArrayLength(ret); const ret_conv_11_arr: RouteHint[] = new Array(ret_conv_11_len).fill(null); for (var l = 0; l < ret_conv_11_len; l++) { - const ret_conv_11: number = bindings.getU32ArrayElem(ret, l); + const ret_conv_11: bigint = bindings.getU64ArrayElem(ret, l); const ret_conv_11_hu_conv: RouteHint = new RouteHint(null, ret_conv_11); CommonBase.add_ref_from(ret_conv_11_hu_conv, this); ret_conv_11_arr[l] = ret_conv_11_hu_conv; @@ -433,14 +434,15 @@ export class PaymentParameters extends CommonBase { * Hints for routing to the payee, containing channels connecting the payee to public nodes. */ public set_route_hints(val: RouteHint[]): void { - bindings.PaymentParameters_set_route_hints(this.ptr, bindings.encodeUint32Array(val != null ? val.map(val_conv_11 => val_conv_11 == null ? 0 : CommonBase.get_ptr_of(val_conv_11) & ~1) : null)); + bindings.PaymentParameters_set_route_hints(this.ptr, bindings.encodeUint64Array(val != null ? val.map(val_conv_11 => val_conv_11 == null ? 0n : CommonBase.get_ptr_of(val_conv_11)) : null)); + val.forEach((val_conv_11: RouteHint) => { CommonBase.add_ref_from(this, val_conv_11); }); } /** * Expiration of a payment to the payee, in seconds relative to the UNIX epoch. */ public get_expiry_time(): Option_u64Z { - const ret: number = bindings.PaymentParameters_get_expiry_time(this.ptr); + const ret: bigint = bindings.PaymentParameters_get_expiry_time(this.ptr); const ret_hu_conv: Option_u64Z = Option_u64Z.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -552,14 +554,16 @@ export class PaymentParameters extends CommonBase { * Constructs a new PaymentParameters given each field */ public static constructor_new(payee_pubkey_arg: Uint8Array, features_arg: InvoiceFeatures, route_hints_arg: RouteHint[], expiry_time_arg: Option_u64Z, max_total_cltv_expiry_delta_arg: number, max_path_count_arg: number, max_channel_saturation_power_of_half_arg: number, previously_failed_channels_arg: bigint[]): PaymentParameters { - const ret: number = bindings.PaymentParameters_new(bindings.encodeUint8Array(bindings.check_arr_len(payee_pubkey_arg, 33)), features_arg == null ? 0 : CommonBase.get_ptr_of(features_arg) & ~1, bindings.encodeUint32Array(route_hints_arg != null ? route_hints_arg.map(route_hints_arg_conv_11 => route_hints_arg_conv_11 == null ? 0 : CommonBase.get_ptr_of(route_hints_arg_conv_11) & ~1) : null), CommonBase.get_ptr_of(expiry_time_arg), max_total_cltv_expiry_delta_arg, max_path_count_arg, max_channel_saturation_power_of_half_arg, bindings.encodeUint64Array(previously_failed_channels_arg)); + const ret: bigint = bindings.PaymentParameters_new(bindings.encodeUint8Array(bindings.check_arr_len(payee_pubkey_arg, 33)), features_arg == null ? 0n : CommonBase.get_ptr_of(features_arg), bindings.encodeUint64Array(route_hints_arg != null ? route_hints_arg.map(route_hints_arg_conv_11 => route_hints_arg_conv_11 == null ? 0n : CommonBase.get_ptr_of(route_hints_arg_conv_11)) : null), CommonBase.get_ptr_of(expiry_time_arg), max_total_cltv_expiry_delta_arg, max_path_count_arg, max_channel_saturation_power_of_half_arg, bindings.encodeUint64Array(previously_failed_channels_arg)); const ret_hu_conv: PaymentParameters = new PaymentParameters(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, features_arg); + route_hints_arg.forEach((route_hints_arg_conv_11: RouteHint) => { CommonBase.add_ref_from(ret_hu_conv, route_hints_arg_conv_11); }); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.PaymentParameters_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.PaymentParameters_clone_ptr(this.ptr); return ret; } @@ -567,7 +571,7 @@ export class PaymentParameters extends CommonBase { * Creates a copy of the PaymentParameters */ public clone(): PaymentParameters { - const ret: number = bindings.PaymentParameters_clone(this.ptr); + const ret: bigint = bindings.PaymentParameters_clone(this.ptr); const ret_hu_conv: PaymentParameters = new PaymentParameters(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -587,7 +591,7 @@ export class PaymentParameters extends CommonBase { * Two objects with NULL inner values will be considered "equal" here. */ public eq(b: PaymentParameters): boolean { - const ret: boolean = bindings.PaymentParameters_eq(this.ptr, b == null ? 0 : CommonBase.get_ptr_of(b) & ~1); + const ret: boolean = bindings.PaymentParameters_eq(this.ptr, b == null ? 0n : CommonBase.get_ptr_of(b)); CommonBase.add_ref_from(this, b); return ret; } @@ -605,7 +609,7 @@ export class PaymentParameters extends CommonBase { * Read a PaymentParameters from a byte array, created by PaymentParameters_write */ public static constructor_read(ser: Uint8Array): Result_PaymentParametersDecodeErrorZ { - const ret: number = bindings.PaymentParameters_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.PaymentParameters_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_PaymentParametersDecodeErrorZ = Result_PaymentParametersDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -614,7 +618,7 @@ export class PaymentParameters extends CommonBase { * Creates a payee with the node id of the given `pubkey`. */ public static constructor_from_node_id(payee_pubkey: Uint8Array): PaymentParameters { - const ret: number = bindings.PaymentParameters_from_node_id(bindings.encodeUint8Array(bindings.check_arr_len(payee_pubkey, 33))); + const ret: bigint = bindings.PaymentParameters_from_node_id(bindings.encodeUint8Array(bindings.check_arr_len(payee_pubkey, 33))); const ret_hu_conv: PaymentParameters = new PaymentParameters(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -624,7 +628,7 @@ export class PaymentParameters extends CommonBase { * Creates a payee with the node id of the given `pubkey` to use for keysend payments. */ public static constructor_for_keysend(payee_pubkey: Uint8Array): PaymentParameters { - const ret: number = bindings.PaymentParameters_for_keysend(bindings.encodeUint8Array(bindings.check_arr_len(payee_pubkey, 33))); + const ret: bigint = bindings.PaymentParameters_for_keysend(bindings.encodeUint8Array(bindings.check_arr_len(payee_pubkey, 33))); const ret_hu_conv: PaymentParameters = new PaymentParameters(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; diff --git a/ts/structs/PaymentPurpose.mts b/ts/structs/PaymentPurpose.mts index 191c84cc..96852db3 100644 --- a/ts/structs/PaymentPurpose.mts +++ b/ts/structs/PaymentPurpose.mts @@ -360,9 +360,9 @@ import * as bindings from '../bindings.mjs' * spontaneous payment or a \"conventional\" lightning payment that's paying an invoice. */ export class PaymentPurpose extends CommonBase { - protected constructor(_dummy: object, ptr: number) { super(ptr, bindings.PaymentPurpose_free); } + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.PaymentPurpose_free); } /* @internal */ - public static constr_from_ptr(ptr: number): PaymentPurpose { + public static constr_from_ptr(ptr: bigint): PaymentPurpose { const raw_ty: number = bindings.LDKPaymentPurpose_ty_from_ptr(ptr); switch (raw_ty) { case 0: return new PaymentPurpose_InvoicePayment(ptr); @@ -372,8 +372,8 @@ export class PaymentPurpose extends CommonBase { } } - public clone_ptr(): number { - const ret: number = bindings.PaymentPurpose_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.PaymentPurpose_clone_ptr(this.ptr); return ret; } @@ -381,7 +381,7 @@ export class PaymentPurpose extends CommonBase { * Creates a copy of the PaymentPurpose */ public clone(): PaymentPurpose { - const ret: number = bindings.PaymentPurpose_clone(this.ptr); + const ret: bigint = bindings.PaymentPurpose_clone(this.ptr); const ret_hu_conv: PaymentPurpose = PaymentPurpose.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -391,7 +391,7 @@ export class PaymentPurpose extends CommonBase { * Utility method to constructs a new InvoicePayment-variant PaymentPurpose */ public static constructor_invoice_payment(payment_preimage: Uint8Array, payment_secret: Uint8Array): PaymentPurpose { - const ret: number = bindings.PaymentPurpose_invoice_payment(bindings.encodeUint8Array(bindings.check_arr_len(payment_preimage, 32)), bindings.encodeUint8Array(bindings.check_arr_len(payment_secret, 32))); + const ret: bigint = bindings.PaymentPurpose_invoice_payment(bindings.encodeUint8Array(bindings.check_arr_len(payment_preimage, 32)), bindings.encodeUint8Array(bindings.check_arr_len(payment_secret, 32))); const ret_hu_conv: PaymentPurpose = PaymentPurpose.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -401,7 +401,7 @@ export class PaymentPurpose extends CommonBase { * Utility method to constructs a new SpontaneousPayment-variant PaymentPurpose */ public static constructor_spontaneous_payment(a: Uint8Array): PaymentPurpose { - const ret: number = bindings.PaymentPurpose_spontaneous_payment(bindings.encodeUint8Array(bindings.check_arr_len(a, 32))); + const ret: bigint = bindings.PaymentPurpose_spontaneous_payment(bindings.encodeUint8Array(bindings.check_arr_len(a, 32))); const ret_hu_conv: PaymentPurpose = PaymentPurpose.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -420,7 +420,7 @@ export class PaymentPurpose extends CommonBase { * Read a PaymentPurpose from a byte array, created by PaymentPurpose_write */ public static constructor_read(ser: Uint8Array): Result_PaymentPurposeDecodeErrorZ { - const ret: number = bindings.PaymentPurpose_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.PaymentPurpose_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_PaymentPurposeDecodeErrorZ = Result_PaymentPurposeDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -453,7 +453,7 @@ export class PaymentPurpose_InvoicePayment extends PaymentPurpose { */ public payment_secret: Uint8Array; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const payment_preimage: number = bindings.LDKPaymentPurpose_InvoicePayment_get_payment_preimage(ptr); const payment_preimage_conv: Uint8Array = bindings.decodeUint8Array(payment_preimage); @@ -467,7 +467,7 @@ export class PaymentPurpose_InvoicePayment extends PaymentPurpose { export class PaymentPurpose_SpontaneousPayment extends PaymentPurpose { public spontaneous_payment: Uint8Array; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const spontaneous_payment: number = bindings.LDKPaymentPurpose_SpontaneousPayment_get_spontaneous_payment(ptr); const spontaneous_payment_conv: Uint8Array = bindings.decodeUint8Array(spontaneous_payment); diff --git a/ts/structs/PaymentSendFailure.mts b/ts/structs/PaymentSendFailure.mts index 9cac4c02..f293a67a 100644 --- a/ts/structs/PaymentSendFailure.mts +++ b/ts/structs/PaymentSendFailure.mts @@ -361,9 +361,9 @@ import * as bindings from '../bindings.mjs' * states for more. */ export class PaymentSendFailure extends CommonBase { - protected constructor(_dummy: object, ptr: number) { super(ptr, bindings.PaymentSendFailure_free); } + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.PaymentSendFailure_free); } /* @internal */ - public static constr_from_ptr(ptr: number): PaymentSendFailure { + public static constr_from_ptr(ptr: bigint): PaymentSendFailure { const raw_ty: number = bindings.LDKPaymentSendFailure_ty_from_ptr(ptr); switch (raw_ty) { case 0: return new PaymentSendFailure_ParameterError(ptr); @@ -375,8 +375,8 @@ export class PaymentSendFailure extends CommonBase { } } - public clone_ptr(): number { - const ret: number = bindings.PaymentSendFailure_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.PaymentSendFailure_clone_ptr(this.ptr); return ret; } @@ -384,7 +384,7 @@ export class PaymentSendFailure extends CommonBase { * Creates a copy of the PaymentSendFailure */ public clone(): PaymentSendFailure { - const ret: number = bindings.PaymentSendFailure_clone(this.ptr); + const ret: bigint = bindings.PaymentSendFailure_clone(this.ptr); const ret_hu_conv: PaymentSendFailure = PaymentSendFailure.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -394,7 +394,7 @@ export class PaymentSendFailure extends CommonBase { * Utility method to constructs a new ParameterError-variant PaymentSendFailure */ public static constructor_parameter_error(a: APIError): PaymentSendFailure { - const ret: number = bindings.PaymentSendFailure_parameter_error(CommonBase.get_ptr_of(a)); + const ret: bigint = bindings.PaymentSendFailure_parameter_error(CommonBase.get_ptr_of(a)); const ret_hu_conv: PaymentSendFailure = PaymentSendFailure.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -404,7 +404,7 @@ export class PaymentSendFailure extends CommonBase { * Utility method to constructs a new PathParameterError-variant PaymentSendFailure */ public static constructor_path_parameter_error(a: Result_NoneAPIErrorZ[]): PaymentSendFailure { - const ret: number = bindings.PaymentSendFailure_path_parameter_error(bindings.encodeUint32Array(a != null ? a.map(a_conv_22 => a_conv_22 != null ? CommonBase.get_ptr_of(a_conv_22) : 0) : null)); + const ret: bigint = bindings.PaymentSendFailure_path_parameter_error(bindings.encodeUint64Array(a != null ? a.map(a_conv_22 => a_conv_22 != null ? CommonBase.get_ptr_of(a_conv_22) : 0n) : null)); const ret_hu_conv: PaymentSendFailure = PaymentSendFailure.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -414,7 +414,7 @@ export class PaymentSendFailure extends CommonBase { * Utility method to constructs a new AllFailedRetrySafe-variant PaymentSendFailure */ public static constructor_all_failed_retry_safe(a: APIError[]): PaymentSendFailure { - const ret: number = bindings.PaymentSendFailure_all_failed_retry_safe(bindings.encodeUint32Array(a != null ? a.map(a_conv_10 => CommonBase.get_ptr_of(a_conv_10)) : null)); + const ret: bigint = bindings.PaymentSendFailure_all_failed_retry_safe(bindings.encodeUint64Array(a != null ? a.map(a_conv_10 => CommonBase.get_ptr_of(a_conv_10)) : null)); const ret_hu_conv: PaymentSendFailure = PaymentSendFailure.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -424,9 +424,10 @@ export class PaymentSendFailure extends CommonBase { * Utility method to constructs a new PartialFailure-variant PaymentSendFailure */ public static constructor_partial_failure(results: Result_NoneAPIErrorZ[], failed_paths_retry: RouteParameters, payment_id: Uint8Array): PaymentSendFailure { - const ret: number = bindings.PaymentSendFailure_partial_failure(bindings.encodeUint32Array(results != null ? results.map(results_conv_22 => results_conv_22 != null ? CommonBase.get_ptr_of(results_conv_22) : 0) : null), failed_paths_retry == null ? 0 : CommonBase.get_ptr_of(failed_paths_retry) & ~1, bindings.encodeUint8Array(bindings.check_arr_len(payment_id, 32))); + const ret: bigint = bindings.PaymentSendFailure_partial_failure(bindings.encodeUint64Array(results != null ? results.map(results_conv_22 => results_conv_22 != null ? CommonBase.get_ptr_of(results_conv_22) : 0n) : null), failed_paths_retry == null ? 0n : CommonBase.get_ptr_of(failed_paths_retry), bindings.encodeUint8Array(bindings.check_arr_len(payment_id, 32))); const ret_hu_conv: PaymentSendFailure = PaymentSendFailure.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, failed_paths_retry); return ret_hu_conv; } @@ -435,9 +436,9 @@ export class PaymentSendFailure extends CommonBase { export class PaymentSendFailure_ParameterError extends PaymentSendFailure { public parameter_error: APIError; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); - const parameter_error: number = bindings.LDKPaymentSendFailure_ParameterError_get_parameter_error(ptr); + const parameter_error: bigint = bindings.LDKPaymentSendFailure_ParameterError_get_parameter_error(ptr); const parameter_error_hu_conv: APIError = APIError.constr_from_ptr(parameter_error); CommonBase.add_ref_from(parameter_error_hu_conv, this); this.parameter_error = parameter_error_hu_conv; @@ -447,13 +448,13 @@ export class PaymentSendFailure_ParameterError extends PaymentSendFailure { export class PaymentSendFailure_PathParameterError extends PaymentSendFailure { public path_parameter_error: Result_NoneAPIErrorZ[]; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const path_parameter_error: number = bindings.LDKPaymentSendFailure_PathParameterError_get_path_parameter_error(ptr); const path_parameter_error_conv_22_len: number = bindings.getArrayLength(path_parameter_error); const path_parameter_error_conv_22_arr: Result_NoneAPIErrorZ[] = new Array(path_parameter_error_conv_22_len).fill(null); for (var w = 0; w < path_parameter_error_conv_22_len; w++) { - const path_parameter_error_conv_22: number = bindings.getU32ArrayElem(path_parameter_error, w); + const path_parameter_error_conv_22: bigint = bindings.getU64ArrayElem(path_parameter_error, w); const path_parameter_error_conv_22_hu_conv: Result_NoneAPIErrorZ = Result_NoneAPIErrorZ.constr_from_ptr(path_parameter_error_conv_22); path_parameter_error_conv_22_arr[w] = path_parameter_error_conv_22_hu_conv; } @@ -465,13 +466,13 @@ export class PaymentSendFailure_PathParameterError extends PaymentSendFailure { export class PaymentSendFailure_AllFailedRetrySafe extends PaymentSendFailure { public all_failed_retry_safe: APIError[]; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const all_failed_retry_safe: number = bindings.LDKPaymentSendFailure_AllFailedRetrySafe_get_all_failed_retry_safe(ptr); const all_failed_retry_safe_conv_10_len: number = bindings.getArrayLength(all_failed_retry_safe); const all_failed_retry_safe_conv_10_arr: APIError[] = new Array(all_failed_retry_safe_conv_10_len).fill(null); for (var k = 0; k < all_failed_retry_safe_conv_10_len; k++) { - const all_failed_retry_safe_conv_10: number = bindings.getU32ArrayElem(all_failed_retry_safe, k); + const all_failed_retry_safe_conv_10: bigint = bindings.getU64ArrayElem(all_failed_retry_safe, k); const all_failed_retry_safe_conv_10_hu_conv: APIError = APIError.constr_from_ptr(all_failed_retry_safe_conv_10); CommonBase.add_ref_from(all_failed_retry_safe_conv_10_hu_conv, this); all_failed_retry_safe_conv_10_arr[k] = all_failed_retry_safe_conv_10_hu_conv; @@ -499,19 +500,19 @@ export class PaymentSendFailure_PartialFailure extends PaymentSendFailure { */ public payment_id: Uint8Array; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); const results: number = bindings.LDKPaymentSendFailure_PartialFailure_get_results(ptr); const results_conv_22_len: number = bindings.getArrayLength(results); const results_conv_22_arr: Result_NoneAPIErrorZ[] = new Array(results_conv_22_len).fill(null); for (var w = 0; w < results_conv_22_len; w++) { - const results_conv_22: number = bindings.getU32ArrayElem(results, w); + const results_conv_22: bigint = bindings.getU64ArrayElem(results, w); const results_conv_22_hu_conv: Result_NoneAPIErrorZ = Result_NoneAPIErrorZ.constr_from_ptr(results_conv_22); results_conv_22_arr[w] = results_conv_22_hu_conv; } bindings.freeWasmMemory(results) this.results = results_conv_22_arr; - const failed_paths_retry: number = bindings.LDKPaymentSendFailure_PartialFailure_get_failed_paths_retry(ptr); + const failed_paths_retry: bigint = bindings.LDKPaymentSendFailure_PartialFailure_get_failed_paths_retry(ptr); const failed_paths_retry_hu_conv: RouteParameters = new RouteParameters(null, failed_paths_retry); CommonBase.add_ref_from(failed_paths_retry_hu_conv, this); this.failed_paths_retry = failed_paths_retry_hu_conv; diff --git a/ts/structs/PeerHandleError.mts b/ts/structs/PeerHandleError.mts index bc1fa049..eab36424 100644 --- a/ts/structs/PeerHandleError.mts +++ b/ts/structs/PeerHandleError.mts @@ -363,7 +363,7 @@ import * as bindings from '../bindings.mjs' */ export class PeerHandleError extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.PeerHandleError_free); } @@ -398,14 +398,14 @@ export class PeerHandleError extends CommonBase { * Constructs a new PeerHandleError given each field */ public static constructor_new(no_connection_possible_arg: boolean): PeerHandleError { - const ret: number = bindings.PeerHandleError_new(no_connection_possible_arg); + const ret: bigint = bindings.PeerHandleError_new(no_connection_possible_arg); const ret_hu_conv: PeerHandleError = new PeerHandleError(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.PeerHandleError_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.PeerHandleError_clone_ptr(this.ptr); return ret; } @@ -413,7 +413,7 @@ export class PeerHandleError extends CommonBase { * Creates a copy of the PeerHandleError */ public clone(): PeerHandleError { - const ret: number = bindings.PeerHandleError_clone(this.ptr); + const ret: bigint = bindings.PeerHandleError_clone(this.ptr); const ret_hu_conv: PeerHandleError = new PeerHandleError(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; diff --git a/ts/structs/PeerManager.mts b/ts/structs/PeerManager.mts index 3b19e9a9..feba9ec7 100644 --- a/ts/structs/PeerManager.mts +++ b/ts/structs/PeerManager.mts @@ -379,7 +379,7 @@ import * as bindings from '../bindings.mjs' */ export class PeerManager extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.PeerManager_free); } @@ -389,7 +389,7 @@ export class PeerManager extends CommonBase { * cryptographically secure random bytes. */ public static constructor_new(message_handler_chan_handler_arg: ChannelMessageHandler, message_handler_route_handler_arg: RoutingMessageHandler, our_node_secret: Uint8Array, ephemeral_random_data: Uint8Array, logger: Logger, custom_message_handler: CustomMessageHandler): PeerManager { - const ret: number = bindings.PeerManager_new(bindings.MessageHandler_new(message_handler_chan_handler_arg == null ? 0 : CommonBase.get_ptr_of(message_handler_chan_handler_arg), message_handler_route_handler_arg == null ? 0 : CommonBase.get_ptr_of(message_handler_route_handler_arg)), bindings.encodeUint8Array(bindings.check_arr_len(our_node_secret, 32)), bindings.encodeUint8Array(bindings.check_arr_len(ephemeral_random_data, 32)), logger == null ? 0 : CommonBase.get_ptr_of(logger), custom_message_handler == null ? 0 : CommonBase.get_ptr_of(custom_message_handler)); + const ret: bigint = bindings.PeerManager_new(bindings.MessageHandler_new(message_handler_chan_handler_arg == null ? 0n : CommonBase.get_ptr_of(message_handler_chan_handler_arg), message_handler_route_handler_arg == null ? 0n : CommonBase.get_ptr_of(message_handler_route_handler_arg)), bindings.encodeUint8Array(bindings.check_arr_len(our_node_secret, 32)), bindings.encodeUint8Array(bindings.check_arr_len(ephemeral_random_data, 32)), logger == null ? 0n : CommonBase.get_ptr_of(logger), custom_message_handler == null ? 0n : CommonBase.get_ptr_of(custom_message_handler)); const ret_hu_conv: PeerManager = new PeerManager(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); CommonBase.add_ref_from(ret_hu_conv, message_handler_chan_handler_arg); @@ -437,7 +437,7 @@ export class PeerManager extends CommonBase { * [`socket_disconnected()`]: PeerManager::socket_disconnected */ public new_outbound_connection(their_node_id: Uint8Array, descriptor: SocketDescriptor, remote_network_address: Option_NetAddressZ): Result_CVec_u8ZPeerHandleErrorZ { - const ret: number = bindings.PeerManager_new_outbound_connection(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), descriptor == null ? 0 : CommonBase.get_ptr_of(descriptor), CommonBase.get_ptr_of(remote_network_address)); + const ret: bigint = bindings.PeerManager_new_outbound_connection(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), descriptor == null ? 0n : CommonBase.get_ptr_of(descriptor), CommonBase.get_ptr_of(remote_network_address)); const ret_hu_conv: Result_CVec_u8ZPeerHandleErrorZ = Result_CVec_u8ZPeerHandleErrorZ.constr_from_ptr(ret); CommonBase.add_ref_from(this, descriptor); return ret_hu_conv; @@ -461,7 +461,7 @@ export class PeerManager extends CommonBase { * [`socket_disconnected()`]: PeerManager::socket_disconnected */ public new_inbound_connection(descriptor: SocketDescriptor, remote_network_address: Option_NetAddressZ): Result_NonePeerHandleErrorZ { - const ret: number = bindings.PeerManager_new_inbound_connection(this.ptr, descriptor == null ? 0 : CommonBase.get_ptr_of(descriptor), CommonBase.get_ptr_of(remote_network_address)); + const ret: bigint = bindings.PeerManager_new_inbound_connection(this.ptr, descriptor == null ? 0n : CommonBase.get_ptr_of(descriptor), CommonBase.get_ptr_of(remote_network_address)); const ret_hu_conv: Result_NonePeerHandleErrorZ = Result_NonePeerHandleErrorZ.constr_from_ptr(ret); CommonBase.add_ref_from(this, descriptor); return ret_hu_conv; @@ -482,7 +482,7 @@ export class PeerManager extends CommonBase { * [`write_buffer_space_avail`]: PeerManager::write_buffer_space_avail */ public write_buffer_space_avail(descriptor: SocketDescriptor): Result_NonePeerHandleErrorZ { - const ret: number = bindings.PeerManager_write_buffer_space_avail(this.ptr, descriptor == null ? 0 : CommonBase.get_ptr_of(descriptor)); + const ret: bigint = bindings.PeerManager_write_buffer_space_avail(this.ptr, descriptor == null ? 0n : CommonBase.get_ptr_of(descriptor)); const ret_hu_conv: Result_NonePeerHandleErrorZ = Result_NonePeerHandleErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -504,7 +504,7 @@ export class PeerManager extends CommonBase { * [`process_events`]: PeerManager::process_events */ public read_event(peer_descriptor: SocketDescriptor, data: Uint8Array): Result_boolPeerHandleErrorZ { - const ret: number = bindings.PeerManager_read_event(this.ptr, peer_descriptor == null ? 0 : CommonBase.get_ptr_of(peer_descriptor), bindings.encodeUint8Array(data)); + const ret: bigint = bindings.PeerManager_read_event(this.ptr, peer_descriptor == null ? 0n : CommonBase.get_ptr_of(peer_descriptor), bindings.encodeUint8Array(data)); const ret_hu_conv: Result_boolPeerHandleErrorZ = Result_boolPeerHandleErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -536,7 +536,7 @@ export class PeerManager extends CommonBase { * Indicates that the given socket descriptor's connection is now closed. */ public socket_disconnected(descriptor: SocketDescriptor): void { - bindings.PeerManager_socket_disconnected(this.ptr, descriptor == null ? 0 : CommonBase.get_ptr_of(descriptor)); + bindings.PeerManager_socket_disconnected(this.ptr, descriptor == null ? 0n : CommonBase.get_ptr_of(descriptor)); } /** diff --git a/ts/structs/Persist.mts b/ts/structs/Persist.mts index c2474622..812d3370 100644 --- a/ts/structs/Persist.mts +++ b/ts/structs/Persist.mts @@ -446,7 +446,7 @@ export class Persist extends CommonBase { public bindings_instance?: bindings.LDKPersist; /* @internal */ - constructor(_dummy: object, ptr: number) { + constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.Persist_free); this.bindings_instance = null; } @@ -455,17 +455,17 @@ export class Persist extends CommonBase { public static new_impl(arg: PersistInterface): Persist { const impl_holder: LDKPersistHolder = new LDKPersistHolder(); let structImplementation = { - persist_new_channel (channel_id: number, data: number, update_id: number): number { + persist_new_channel (channel_id: bigint, data: bigint, update_id: bigint): bigint { const channel_id_hu_conv: OutPoint = new OutPoint(null, channel_id); CommonBase.add_ref_from(channel_id_hu_conv, this); const data_hu_conv: ChannelMonitor = new ChannelMonitor(null, data); const update_id_hu_conv: MonitorUpdateId = new MonitorUpdateId(null, update_id); CommonBase.add_ref_from(update_id_hu_conv, this); const ret: Result_NoneChannelMonitorUpdateErrZ = arg.persist_new_channel(channel_id_hu_conv, data_hu_conv, update_id_hu_conv); - const result: number = ret == null ? 0 : ret.clone_ptr(); + const result: bigint = ret == null ? 0n : ret.clone_ptr(); return result; }, - update_persisted_channel (channel_id: number, update: number, data: number, update_id: number): number { + update_persisted_channel (channel_id: bigint, update: bigint, data: bigint, update_id: bigint): bigint { const channel_id_hu_conv: OutPoint = new OutPoint(null, channel_id); CommonBase.add_ref_from(channel_id_hu_conv, this); const update_hu_conv: ChannelMonitorUpdate = new ChannelMonitorUpdate(null, update); @@ -473,11 +473,11 @@ export class Persist extends CommonBase { const update_id_hu_conv: MonitorUpdateId = new MonitorUpdateId(null, update_id); CommonBase.add_ref_from(update_id_hu_conv, this); const ret: Result_NoneChannelMonitorUpdateErrZ = arg.update_persisted_channel(channel_id_hu_conv, update_hu_conv, data_hu_conv, update_id_hu_conv); - const result: number = ret == null ? 0 : ret.clone_ptr(); + const result: bigint = ret == null ? 0n : ret.clone_ptr(); return result; }, } as bindings.LDKPersist; - const ptr: number = bindings.LDKPersist_new(structImplementation); + const ptr: bigint = bindings.LDKPersist_new(structImplementation); impl_holder.held = new Persist(null, ptr); impl_holder.held.bindings_instance = structImplementation; @@ -502,9 +502,11 @@ export class Persist extends CommonBase { * [`Writeable::write`]: crate::util::ser::Writeable::write */ public persist_new_channel(channel_id: OutPoint, data: ChannelMonitor, update_id: MonitorUpdateId): Result_NoneChannelMonitorUpdateErrZ { - const ret: number = bindings.Persist_persist_new_channel(this.ptr, channel_id == null ? 0 : CommonBase.get_ptr_of(channel_id) & ~1, data == null ? 0 : CommonBase.get_ptr_of(data) & ~1, update_id == null ? 0 : CommonBase.get_ptr_of(update_id) & ~1); + const ret: bigint = bindings.Persist_persist_new_channel(this.ptr, channel_id == null ? 0n : CommonBase.get_ptr_of(channel_id), data == null ? 0n : CommonBase.get_ptr_of(data), update_id == null ? 0n : CommonBase.get_ptr_of(update_id)); const ret_hu_conv: Result_NoneChannelMonitorUpdateErrZ = Result_NoneChannelMonitorUpdateErrZ.constr_from_ptr(ret); + CommonBase.add_ref_from(this, channel_id); CommonBase.add_ref_from(this, data); + CommonBase.add_ref_from(this, update_id); return ret_hu_conv; } @@ -546,10 +548,12 @@ export class Persist extends CommonBase { * Note that update (or a relevant inner pointer) may be NULL or all-0s to represent None */ public update_persisted_channel(channel_id: OutPoint, update: ChannelMonitorUpdate, data: ChannelMonitor, update_id: MonitorUpdateId): Result_NoneChannelMonitorUpdateErrZ { - const ret: number = bindings.Persist_update_persisted_channel(this.ptr, channel_id == null ? 0 : CommonBase.get_ptr_of(channel_id) & ~1, update == null ? 0 : CommonBase.get_ptr_of(update) & ~1, data == null ? 0 : CommonBase.get_ptr_of(data) & ~1, update_id == null ? 0 : CommonBase.get_ptr_of(update_id) & ~1); + const ret: bigint = bindings.Persist_update_persisted_channel(this.ptr, channel_id == null ? 0n : CommonBase.get_ptr_of(channel_id), update == null ? 0n : CommonBase.get_ptr_of(update), data == null ? 0n : CommonBase.get_ptr_of(data), update_id == null ? 0n : CommonBase.get_ptr_of(update_id)); const ret_hu_conv: Result_NoneChannelMonitorUpdateErrZ = Result_NoneChannelMonitorUpdateErrZ.constr_from_ptr(ret); + CommonBase.add_ref_from(this, channel_id); CommonBase.add_ref_from(this, update); CommonBase.add_ref_from(this, data); + CommonBase.add_ref_from(this, update_id); return ret_hu_conv; } diff --git a/ts/structs/Persister.mts b/ts/structs/Persister.mts index 0a1ef37c..cfe2c3db 100644 --- a/ts/structs/Persister.mts +++ b/ts/structs/Persister.mts @@ -383,7 +383,7 @@ export class Persister extends CommonBase { public bindings_instance?: bindings.LDKPersister; /* @internal */ - constructor(_dummy: object, ptr: number) { + constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.Persister_free); this.bindings_instance = null; } @@ -392,26 +392,26 @@ export class Persister extends CommonBase { public static new_impl(arg: PersisterInterface): Persister { const impl_holder: LDKPersisterHolder = new LDKPersisterHolder(); let structImplementation = { - persist_manager (channel_manager: number): number { + persist_manager (channel_manager: bigint): bigint { const channel_manager_hu_conv: ChannelManager = new ChannelManager(null, channel_manager); const ret: Result_NoneErrorZ = arg.persist_manager(channel_manager_hu_conv); - const result: number = ret == null ? 0 : ret.clone_ptr(); + const result: bigint = ret == null ? 0n : ret.clone_ptr(); return result; }, - persist_graph (network_graph: number): number { + persist_graph (network_graph: bigint): bigint { const network_graph_hu_conv: NetworkGraph = new NetworkGraph(null, network_graph); const ret: Result_NoneErrorZ = arg.persist_graph(network_graph_hu_conv); - const result: number = ret == null ? 0 : ret.clone_ptr(); + const result: bigint = ret == null ? 0n : ret.clone_ptr(); return result; }, - persist_scorer (scorer: number): number { + persist_scorer (scorer: bigint): bigint { const scorer_hu_conv: MultiThreadedLockableScore = new MultiThreadedLockableScore(null, scorer); const ret: Result_NoneErrorZ = arg.persist_scorer(scorer_hu_conv); - const result: number = ret == null ? 0 : ret.clone_ptr(); + const result: bigint = ret == null ? 0n : ret.clone_ptr(); return result; }, } as bindings.LDKPersister; - const ptr: number = bindings.LDKPersister_new(structImplementation); + const ptr: bigint = bindings.LDKPersister_new(structImplementation); impl_holder.held = new Persister(null, ptr); impl_holder.held.bindings_instance = structImplementation; @@ -422,7 +422,7 @@ export class Persister extends CommonBase { * Persist the given ['ChannelManager'] to disk, returning an error if persistence failed. */ public persist_manager(channel_manager: ChannelManager): Result_NoneErrorZ { - const ret: number = bindings.Persister_persist_manager(this.ptr, channel_manager == null ? 0 : CommonBase.get_ptr_of(channel_manager) & ~1); + const ret: bigint = bindings.Persister_persist_manager(this.ptr, channel_manager == null ? 0n : CommonBase.get_ptr_of(channel_manager)); const ret_hu_conv: Result_NoneErrorZ = Result_NoneErrorZ.constr_from_ptr(ret); CommonBase.add_ref_from(this, channel_manager); return ret_hu_conv; @@ -432,7 +432,7 @@ export class Persister extends CommonBase { * Persist the given [`NetworkGraph`] to disk, returning an error if persistence failed. */ public persist_graph(network_graph: NetworkGraph): Result_NoneErrorZ { - const ret: number = bindings.Persister_persist_graph(this.ptr, network_graph == null ? 0 : CommonBase.get_ptr_of(network_graph) & ~1); + const ret: bigint = bindings.Persister_persist_graph(this.ptr, network_graph == null ? 0n : CommonBase.get_ptr_of(network_graph)); const ret_hu_conv: Result_NoneErrorZ = Result_NoneErrorZ.constr_from_ptr(ret); CommonBase.add_ref_from(this, network_graph); return ret_hu_conv; @@ -442,7 +442,7 @@ export class Persister extends CommonBase { * Persist the given [`MultiThreadedLockableScore`] to disk, returning an error if persistence failed. */ public persist_scorer(scorer: MultiThreadedLockableScore): Result_NoneErrorZ { - const ret: number = bindings.Persister_persist_scorer(this.ptr, scorer == null ? 0 : CommonBase.get_ptr_of(scorer) & ~1); + const ret: bigint = bindings.Persister_persist_scorer(this.ptr, scorer == null ? 0n : CommonBase.get_ptr_of(scorer)); const ret_hu_conv: Result_NoneErrorZ = Result_NoneErrorZ.constr_from_ptr(ret); CommonBase.add_ref_from(this, scorer); return ret_hu_conv; diff --git a/ts/structs/PhantomKeysManager.mts b/ts/structs/PhantomKeysManager.mts index 013075f6..7731706c 100644 --- a/ts/structs/PhantomKeysManager.mts +++ b/ts/structs/PhantomKeysManager.mts @@ -375,7 +375,7 @@ import * as bindings from '../bindings.mjs' */ export class PhantomKeysManager extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.PhantomKeysManager_free); } @@ -384,7 +384,7 @@ export class PhantomKeysManager extends CommonBase { * This copies the `inner` pointer in this_arg and thus the returned KeysInterface must be freed before this_arg is */ public as_KeysInterface(): KeysInterface { - const ret: number = bindings.PhantomKeysManager_as_KeysInterface(this.ptr); + const ret: bigint = bindings.PhantomKeysManager_as_KeysInterface(this.ptr); const ret_hu_conv: KeysInterface = new KeysInterface(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -403,7 +403,7 @@ export class PhantomKeysManager extends CommonBase { * [phantom node payments]: PhantomKeysManager */ public static constructor_new(seed: Uint8Array, starting_time_secs: bigint, starting_time_nanos: number, cross_node_seed: Uint8Array): PhantomKeysManager { - const ret: number = bindings.PhantomKeysManager_new(bindings.encodeUint8Array(bindings.check_arr_len(seed, 32)), starting_time_secs, starting_time_nanos, bindings.encodeUint8Array(bindings.check_arr_len(cross_node_seed, 32))); + const ret: bigint = bindings.PhantomKeysManager_new(bindings.encodeUint8Array(bindings.check_arr_len(seed, 32)), starting_time_secs, starting_time_nanos, bindings.encodeUint8Array(bindings.check_arr_len(cross_node_seed, 32))); const ret_hu_conv: PhantomKeysManager = new PhantomKeysManager(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -413,7 +413,7 @@ export class PhantomKeysManager extends CommonBase { * See [`KeysManager::spend_spendable_outputs`] for documentation on this method. */ public spend_spendable_outputs(descriptors: SpendableOutputDescriptor[], outputs: TxOut[], change_destination_script: Uint8Array, feerate_sat_per_1000_weight: number): Result_TransactionNoneZ { - const ret: number = bindings.PhantomKeysManager_spend_spendable_outputs(this.ptr, bindings.encodeUint32Array(descriptors != null ? descriptors.map(descriptors_conv_27 => CommonBase.get_ptr_of(descriptors_conv_27)) : null), bindings.encodeUint32Array(outputs != null ? outputs.map(outputs_conv_7 => CommonBase.get_ptr_of(outputs_conv_7)) : null), bindings.encodeUint8Array(change_destination_script), feerate_sat_per_1000_weight); + const ret: bigint = bindings.PhantomKeysManager_spend_spendable_outputs(this.ptr, bindings.encodeUint64Array(descriptors != null ? descriptors.map(descriptors_conv_27 => CommonBase.get_ptr_of(descriptors_conv_27)) : null), bindings.encodeUint64Array(outputs != null ? outputs.map(outputs_conv_7 => CommonBase.get_ptr_of(outputs_conv_7)) : null), bindings.encodeUint8Array(change_destination_script), feerate_sat_per_1000_weight); const ret_hu_conv: Result_TransactionNoneZ = Result_TransactionNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -422,7 +422,7 @@ export class PhantomKeysManager extends CommonBase { * See [`KeysManager::derive_channel_keys`] for documentation on this method. */ public derive_channel_keys(channel_value_satoshis: bigint, params: Uint8Array): InMemorySigner { - const ret: number = bindings.PhantomKeysManager_derive_channel_keys(this.ptr, channel_value_satoshis, bindings.encodeUint8Array(bindings.check_arr_len(params, 32))); + const ret: bigint = bindings.PhantomKeysManager_derive_channel_keys(this.ptr, channel_value_satoshis, bindings.encodeUint8Array(bindings.check_arr_len(params, 32))); const ret_hu_conv: InMemorySigner = new InMemorySigner(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; diff --git a/ts/structs/PhantomRouteHints.mts b/ts/structs/PhantomRouteHints.mts index 14255dc4..40ec7943 100644 --- a/ts/structs/PhantomRouteHints.mts +++ b/ts/structs/PhantomRouteHints.mts @@ -363,7 +363,7 @@ import * as bindings from '../bindings.mjs' */ export class PhantomRouteHints extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.PhantomRouteHints_free); } @@ -375,7 +375,7 @@ export class PhantomRouteHints extends CommonBase { const ret_conv_16_len: number = bindings.getArrayLength(ret); const ret_conv_16_arr: ChannelDetails[] = new Array(ret_conv_16_len).fill(null); for (var q = 0; q < ret_conv_16_len; q++) { - const ret_conv_16: number = bindings.getU32ArrayElem(ret, q); + const ret_conv_16: bigint = bindings.getU64ArrayElem(ret, q); const ret_conv_16_hu_conv: ChannelDetails = new ChannelDetails(null, ret_conv_16); CommonBase.add_ref_from(ret_conv_16_hu_conv, this); ret_conv_16_arr[q] = ret_conv_16_hu_conv; @@ -388,7 +388,8 @@ export class PhantomRouteHints extends CommonBase { * The list of channels to be included in the invoice route hints. */ public set_channels(val: ChannelDetails[]): void { - bindings.PhantomRouteHints_set_channels(this.ptr, bindings.encodeUint32Array(val != null ? val.map(val_conv_16 => val_conv_16 == null ? 0 : CommonBase.get_ptr_of(val_conv_16) & ~1) : null)); + bindings.PhantomRouteHints_set_channels(this.ptr, bindings.encodeUint64Array(val != null ? val.map(val_conv_16 => val_conv_16 == null ? 0n : CommonBase.get_ptr_of(val_conv_16)) : null)); + val.forEach((val_conv_16: ChannelDetails) => { CommonBase.add_ref_from(this, val_conv_16); }); } /** @@ -428,14 +429,15 @@ export class PhantomRouteHints extends CommonBase { * Constructs a new PhantomRouteHints given each field */ public static constructor_new(channels_arg: ChannelDetails[], phantom_scid_arg: bigint, real_node_pubkey_arg: Uint8Array): PhantomRouteHints { - const ret: number = bindings.PhantomRouteHints_new(bindings.encodeUint32Array(channels_arg != null ? channels_arg.map(channels_arg_conv_16 => channels_arg_conv_16 == null ? 0 : CommonBase.get_ptr_of(channels_arg_conv_16) & ~1) : null), phantom_scid_arg, bindings.encodeUint8Array(bindings.check_arr_len(real_node_pubkey_arg, 33))); + const ret: bigint = bindings.PhantomRouteHints_new(bindings.encodeUint64Array(channels_arg != null ? channels_arg.map(channels_arg_conv_16 => channels_arg_conv_16 == null ? 0n : CommonBase.get_ptr_of(channels_arg_conv_16)) : null), phantom_scid_arg, bindings.encodeUint8Array(bindings.check_arr_len(real_node_pubkey_arg, 33))); const ret_hu_conv: PhantomRouteHints = new PhantomRouteHints(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + channels_arg.forEach((channels_arg_conv_16: ChannelDetails) => { CommonBase.add_ref_from(ret_hu_conv, channels_arg_conv_16); }); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.PhantomRouteHints_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.PhantomRouteHints_clone_ptr(this.ptr); return ret; } @@ -443,7 +445,7 @@ export class PhantomRouteHints extends CommonBase { * Creates a copy of the PhantomRouteHints */ public clone(): PhantomRouteHints { - const ret: number = bindings.PhantomRouteHints_clone(this.ptr); + const ret: bigint = bindings.PhantomRouteHints_clone(this.ptr); const ret_hu_conv: PhantomRouteHints = new PhantomRouteHints(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -462,7 +464,7 @@ export class PhantomRouteHints extends CommonBase { * Read a PhantomRouteHints from a byte array, created by PhantomRouteHints_write */ public static constructor_read(ser: Uint8Array): Result_PhantomRouteHintsDecodeErrorZ { - const ret: number = bindings.PhantomRouteHints_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.PhantomRouteHints_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_PhantomRouteHintsDecodeErrorZ = Result_PhantomRouteHintsDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/Ping.mts b/ts/structs/Ping.mts index f9c1f153..3d68b0b8 100644 --- a/ts/structs/Ping.mts +++ b/ts/structs/Ping.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class Ping extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.Ping_free); } @@ -401,14 +401,14 @@ export class Ping extends CommonBase { * Constructs a new Ping given each field */ public static constructor_new(ponglen_arg: number, byteslen_arg: number): Ping { - const ret: number = bindings.Ping_new(ponglen_arg, byteslen_arg); + const ret: bigint = bindings.Ping_new(ponglen_arg, byteslen_arg); const ret_hu_conv: Ping = new Ping(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.Ping_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.Ping_clone_ptr(this.ptr); return ret; } @@ -416,7 +416,7 @@ export class Ping extends CommonBase { * Creates a copy of the Ping */ public clone(): Ping { - const ret: number = bindings.Ping_clone(this.ptr); + const ret: bigint = bindings.Ping_clone(this.ptr); const ret_hu_conv: Ping = new Ping(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -435,7 +435,7 @@ export class Ping extends CommonBase { * Read a Ping from a byte array, created by Ping_write */ public static constructor_read(ser: Uint8Array): Result_PingDecodeErrorZ { - const ret: number = bindings.Ping_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.Ping_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_PingDecodeErrorZ = Result_PingDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/Pong.mts b/ts/structs/Pong.mts index 0043bda8..f9872a20 100644 --- a/ts/structs/Pong.mts +++ b/ts/structs/Pong.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class Pong extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.Pong_free); } @@ -386,14 +386,14 @@ export class Pong extends CommonBase { * Constructs a new Pong given each field */ public static constructor_new(byteslen_arg: number): Pong { - const ret: number = bindings.Pong_new(byteslen_arg); + const ret: bigint = bindings.Pong_new(byteslen_arg); const ret_hu_conv: Pong = new Pong(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.Pong_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.Pong_clone_ptr(this.ptr); return ret; } @@ -401,7 +401,7 @@ export class Pong extends CommonBase { * Creates a copy of the Pong */ public clone(): Pong { - const ret: number = bindings.Pong_clone(this.ptr); + const ret: bigint = bindings.Pong_clone(this.ptr); const ret_hu_conv: Pong = new Pong(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -420,7 +420,7 @@ export class Pong extends CommonBase { * Read a Pong from a byte array, created by Pong_write */ public static constructor_read(ser: Uint8Array): Result_PongDecodeErrorZ { - const ret: number = bindings.Pong_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.Pong_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_PongDecodeErrorZ = Result_PongDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/PositiveTimestamp.mts b/ts/structs/PositiveTimestamp.mts index 95fe32e5..45c647dc 100644 --- a/ts/structs/PositiveTimestamp.mts +++ b/ts/structs/PositiveTimestamp.mts @@ -366,7 +366,7 @@ import * as bindings from '../bindings.mjs' */ export class PositiveTimestamp extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.PositiveTimestamp_free); } @@ -376,13 +376,13 @@ export class PositiveTimestamp extends CommonBase { * Two objects with NULL inner values will be considered "equal" here. */ public eq(b: PositiveTimestamp): boolean { - const ret: boolean = bindings.PositiveTimestamp_eq(this.ptr, b == null ? 0 : CommonBase.get_ptr_of(b) & ~1); + const ret: boolean = bindings.PositiveTimestamp_eq(this.ptr, b == null ? 0n : CommonBase.get_ptr_of(b)); CommonBase.add_ref_from(this, b); return ret; } - public clone_ptr(): number { - const ret: number = bindings.PositiveTimestamp_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.PositiveTimestamp_clone_ptr(this.ptr); return ret; } @@ -390,7 +390,7 @@ export class PositiveTimestamp extends CommonBase { * Creates a copy of the PositiveTimestamp */ public clone(): PositiveTimestamp { - const ret: number = bindings.PositiveTimestamp_clone(this.ptr); + const ret: bigint = bindings.PositiveTimestamp_clone(this.ptr); const ret_hu_conv: PositiveTimestamp = new PositiveTimestamp(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -402,7 +402,7 @@ export class PositiveTimestamp extends CommonBase { * Otherwise, returns a [`CreationError::TimestampOutOfBounds`]. */ public static constructor_from_unix_timestamp(unix_seconds: bigint): Result_PositiveTimestampCreationErrorZ { - const ret: number = bindings.PositiveTimestamp_from_unix_timestamp(unix_seconds); + const ret: bigint = bindings.PositiveTimestamp_from_unix_timestamp(unix_seconds); const ret_hu_conv: Result_PositiveTimestampCreationErrorZ = Result_PositiveTimestampCreationErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -414,7 +414,7 @@ export class PositiveTimestamp extends CommonBase { * Otherwise, returns a [`CreationError::TimestampOutOfBounds`]. */ public static constructor_from_duration_since_epoch(duration: bigint): Result_PositiveTimestampCreationErrorZ { - const ret: number = bindings.PositiveTimestamp_from_duration_since_epoch(duration); + const ret: bigint = bindings.PositiveTimestamp_from_duration_since_epoch(duration); const ret_hu_conv: Result_PositiveTimestampCreationErrorZ = Result_PositiveTimestampCreationErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/PrivateRoute.mts b/ts/structs/PrivateRoute.mts index 5287663a..1b29b814 100644 --- a/ts/structs/PrivateRoute.mts +++ b/ts/structs/PrivateRoute.mts @@ -364,12 +364,12 @@ import * as bindings from '../bindings.mjs' */ export class PrivateRoute extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.PrivateRoute_free); } - public clone_ptr(): number { - const ret: number = bindings.PrivateRoute_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.PrivateRoute_clone_ptr(this.ptr); return ret; } @@ -377,7 +377,7 @@ export class PrivateRoute extends CommonBase { * Creates a copy of the PrivateRoute */ public clone(): PrivateRoute { - const ret: number = bindings.PrivateRoute_clone(this.ptr); + const ret: bigint = bindings.PrivateRoute_clone(this.ptr); const ret_hu_conv: PrivateRoute = new PrivateRoute(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -397,7 +397,7 @@ export class PrivateRoute extends CommonBase { * Two objects with NULL inner values will be considered "equal" here. */ public eq(b: PrivateRoute): boolean { - const ret: boolean = bindings.PrivateRoute_eq(this.ptr, b == null ? 0 : CommonBase.get_ptr_of(b) & ~1); + const ret: boolean = bindings.PrivateRoute_eq(this.ptr, b == null ? 0n : CommonBase.get_ptr_of(b)); CommonBase.add_ref_from(this, b); return ret; } @@ -406,8 +406,9 @@ export class PrivateRoute extends CommonBase { * Creates a new (partial) route from a list of hops */ public static constructor_new(hops: RouteHint): Result_PrivateRouteCreationErrorZ { - const ret: number = bindings.PrivateRoute_new(hops == null ? 0 : CommonBase.get_ptr_of(hops) & ~1); + const ret: bigint = bindings.PrivateRoute_new(hops == null ? 0n : CommonBase.get_ptr_of(hops)); const ret_hu_conv: Result_PrivateRouteCreationErrorZ = Result_PrivateRouteCreationErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, hops); return ret_hu_conv; } @@ -415,7 +416,7 @@ export class PrivateRoute extends CommonBase { * Returns the underlying list of hops */ public into_inner(): RouteHint { - const ret: number = bindings.PrivateRoute_into_inner(this.ptr); + const ret: bigint = bindings.PrivateRoute_into_inner(this.ptr); const ret_hu_conv: RouteHint = new RouteHint(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; diff --git a/ts/structs/ProbabilisticScorer.mts b/ts/structs/ProbabilisticScorer.mts index d6863b71..3f6b4a98 100644 --- a/ts/structs/ProbabilisticScorer.mts +++ b/ts/structs/ProbabilisticScorer.mts @@ -382,7 +382,7 @@ import * as bindings from '../bindings.mjs' */ export class ProbabilisticScorer extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.ProbabilisticScorer_free); } @@ -391,9 +391,10 @@ export class ProbabilisticScorer extends CommonBase { * through a network graph. */ public static constructor_new(params: ProbabilisticScoringParameters, network_graph: NetworkGraph, logger: Logger): ProbabilisticScorer { - const ret: number = bindings.ProbabilisticScorer_new(params == null ? 0 : CommonBase.get_ptr_of(params) & ~1, network_graph == null ? 0 : CommonBase.get_ptr_of(network_graph) & ~1, logger == null ? 0 : CommonBase.get_ptr_of(logger)); + const ret: bigint = bindings.ProbabilisticScorer_new(params == null ? 0n : CommonBase.get_ptr_of(params), network_graph == null ? 0n : CommonBase.get_ptr_of(network_graph), logger == null ? 0n : CommonBase.get_ptr_of(logger)); const ret_hu_conv: ProbabilisticScorer = new ProbabilisticScorer(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, params); CommonBase.add_ref_from(ret_hu_conv, network_graph); CommonBase.add_ref_from(ret_hu_conv, logger); return ret_hu_conv; @@ -414,7 +415,7 @@ export class ProbabilisticScorer extends CommonBase { * channel with `scid` towards the given `target` node. */ public estimated_channel_liquidity_range(scid: bigint, target: NodeId): Option_C2Tuple_u64u64ZZ { - const ret: number = bindings.ProbabilisticScorer_estimated_channel_liquidity_range(this.ptr, scid, target == null ? 0 : CommonBase.get_ptr_of(target) & ~1); + const ret: bigint = bindings.ProbabilisticScorer_estimated_channel_liquidity_range(this.ptr, scid, target == null ? 0n : CommonBase.get_ptr_of(target)); const ret_hu_conv: Option_C2Tuple_u64u64ZZ = Option_C2Tuple_u64u64ZZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); CommonBase.add_ref_from(this, target); @@ -426,7 +427,7 @@ export class ProbabilisticScorer extends CommonBase { * it will be avoided during path finding. */ public add_banned(node_id: NodeId): void { - bindings.ProbabilisticScorer_add_banned(this.ptr, node_id == null ? 0 : CommonBase.get_ptr_of(node_id) & ~1); + bindings.ProbabilisticScorer_add_banned(this.ptr, node_id == null ? 0n : CommonBase.get_ptr_of(node_id)); CommonBase.add_ref_from(this, node_id); } @@ -434,7 +435,7 @@ export class ProbabilisticScorer extends CommonBase { * Removes the node with the given `node_id` from the list of nodes to avoid. */ public remove_banned(node_id: NodeId): void { - bindings.ProbabilisticScorer_remove_banned(this.ptr, node_id == null ? 0 : CommonBase.get_ptr_of(node_id) & ~1); + bindings.ProbabilisticScorer_remove_banned(this.ptr, node_id == null ? 0n : CommonBase.get_ptr_of(node_id)); CommonBase.add_ref_from(this, node_id); } @@ -442,7 +443,7 @@ export class ProbabilisticScorer extends CommonBase { * Sets a manual penalty for the given node. */ public set_manual_penalty(node_id: NodeId, penalty: bigint): void { - bindings.ProbabilisticScorer_set_manual_penalty(this.ptr, node_id == null ? 0 : CommonBase.get_ptr_of(node_id) & ~1, penalty); + bindings.ProbabilisticScorer_set_manual_penalty(this.ptr, node_id == null ? 0n : CommonBase.get_ptr_of(node_id), penalty); CommonBase.add_ref_from(this, node_id); } @@ -450,7 +451,7 @@ export class ProbabilisticScorer extends CommonBase { * Removes the node with the given `node_id` from the list of manual penalties. */ public remove_manual_penalty(node_id: NodeId): void { - bindings.ProbabilisticScorer_remove_manual_penalty(this.ptr, node_id == null ? 0 : CommonBase.get_ptr_of(node_id) & ~1); + bindings.ProbabilisticScorer_remove_manual_penalty(this.ptr, node_id == null ? 0n : CommonBase.get_ptr_of(node_id)); CommonBase.add_ref_from(this, node_id); } @@ -466,7 +467,7 @@ export class ProbabilisticScorer extends CommonBase { * This copies the `inner` pointer in this_arg and thus the returned Score must be freed before this_arg is */ public as_Score(): Score { - const ret: number = bindings.ProbabilisticScorer_as_Score(this.ptr); + const ret: bigint = bindings.ProbabilisticScorer_as_Score(this.ptr); const ret_hu_conv: Score = new Score(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -485,8 +486,9 @@ export class ProbabilisticScorer extends CommonBase { * Read a ProbabilisticScorer from a byte array, created by ProbabilisticScorer_write */ public static constructor_read(ser: Uint8Array, arg_a: ProbabilisticScoringParameters, arg_b: NetworkGraph, arg_c: Logger): Result_ProbabilisticScorerDecodeErrorZ { - const ret: number = bindings.ProbabilisticScorer_read(bindings.encodeUint8Array(ser), arg_a == null ? 0 : CommonBase.get_ptr_of(arg_a) & ~1, arg_b == null ? 0 : CommonBase.get_ptr_of(arg_b) & ~1, arg_c == null ? 0 : CommonBase.get_ptr_of(arg_c)); + const ret: bigint = bindings.ProbabilisticScorer_read(bindings.encodeUint8Array(ser), arg_a == null ? 0n : CommonBase.get_ptr_of(arg_a), arg_b == null ? 0n : CommonBase.get_ptr_of(arg_b), arg_c == null ? 0n : CommonBase.get_ptr_of(arg_c)); const ret_hu_conv: Result_ProbabilisticScorerDecodeErrorZ = Result_ProbabilisticScorerDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, arg_a); CommonBase.add_ref_from(ret_hu_conv, arg_b); CommonBase.add_ref_from(ret_hu_conv, arg_c); return ret_hu_conv; diff --git a/ts/structs/ProbabilisticScoringParameters.mts b/ts/structs/ProbabilisticScoringParameters.mts index e789c694..5cd76b4f 100644 --- a/ts/structs/ProbabilisticScoringParameters.mts +++ b/ts/structs/ProbabilisticScoringParameters.mts @@ -367,7 +367,7 @@ import * as bindings from '../bindings.mjs' */ export class ProbabilisticScoringParameters extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.ProbabilisticScoringParameters_free); } @@ -624,8 +624,8 @@ export class ProbabilisticScoringParameters extends CommonBase { bindings.ProbabilisticScoringParameters_set_considered_impossible_penalty_msat(this.ptr, val); } - public clone_ptr(): number { - const ret: number = bindings.ProbabilisticScoringParameters_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.ProbabilisticScoringParameters_clone_ptr(this.ptr); return ret; } @@ -633,7 +633,7 @@ export class ProbabilisticScoringParameters extends CommonBase { * Creates a copy of the ProbabilisticScoringParameters */ public clone(): ProbabilisticScoringParameters { - const ret: number = bindings.ProbabilisticScoringParameters_clone(this.ptr); + const ret: bigint = bindings.ProbabilisticScoringParameters_clone(this.ptr); const ret_hu_conv: ProbabilisticScoringParameters = new ProbabilisticScoringParameters(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -644,14 +644,15 @@ export class ProbabilisticScoringParameters extends CommonBase { * they will be avoided during path finding. */ public add_banned_from_list(node_ids: NodeId[]): void { - bindings.ProbabilisticScoringParameters_add_banned_from_list(this.ptr, bindings.encodeUint32Array(node_ids != null ? node_ids.map(node_ids_conv_8 => node_ids_conv_8 == null ? 0 : CommonBase.get_ptr_of(node_ids_conv_8) & ~1) : null)); + bindings.ProbabilisticScoringParameters_add_banned_from_list(this.ptr, bindings.encodeUint64Array(node_ids != null ? node_ids.map(node_ids_conv_8 => node_ids_conv_8 == null ? 0n : CommonBase.get_ptr_of(node_ids_conv_8)) : null)); + node_ids.forEach((node_ids_conv_8: NodeId) => { CommonBase.add_ref_from(this, node_ids_conv_8); }); } /** * Creates a "default" ProbabilisticScoringParameters. See struct and individual field documentaiton for details on which values are used. */ public static constructor_default(): ProbabilisticScoringParameters { - const ret: number = bindings.ProbabilisticScoringParameters_default(); + const ret: bigint = bindings.ProbabilisticScoringParameters_default(); const ret_hu_conv: ProbabilisticScoringParameters = new ProbabilisticScoringParameters(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; diff --git a/ts/structs/QueryChannelRange.mts b/ts/structs/QueryChannelRange.mts index 2929cf10..c8f2f13f 100644 --- a/ts/structs/QueryChannelRange.mts +++ b/ts/structs/QueryChannelRange.mts @@ -364,7 +364,7 @@ import * as bindings from '../bindings.mjs' */ export class QueryChannelRange extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.QueryChannelRange_free); } @@ -418,14 +418,14 @@ export class QueryChannelRange extends CommonBase { * Constructs a new QueryChannelRange given each field */ public static constructor_new(chain_hash_arg: Uint8Array, first_blocknum_arg: number, number_of_blocks_arg: number): QueryChannelRange { - const ret: number = bindings.QueryChannelRange_new(bindings.encodeUint8Array(bindings.check_arr_len(chain_hash_arg, 32)), first_blocknum_arg, number_of_blocks_arg); + const ret: bigint = bindings.QueryChannelRange_new(bindings.encodeUint8Array(bindings.check_arr_len(chain_hash_arg, 32)), first_blocknum_arg, number_of_blocks_arg); const ret_hu_conv: QueryChannelRange = new QueryChannelRange(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.QueryChannelRange_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.QueryChannelRange_clone_ptr(this.ptr); return ret; } @@ -433,7 +433,7 @@ export class QueryChannelRange extends CommonBase { * Creates a copy of the QueryChannelRange */ public clone(): QueryChannelRange { - const ret: number = bindings.QueryChannelRange_clone(this.ptr); + const ret: bigint = bindings.QueryChannelRange_clone(this.ptr); const ret_hu_conv: QueryChannelRange = new QueryChannelRange(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -460,7 +460,7 @@ export class QueryChannelRange extends CommonBase { * Read a QueryChannelRange from a byte array, created by QueryChannelRange_write */ public static constructor_read(ser: Uint8Array): Result_QueryChannelRangeDecodeErrorZ { - const ret: number = bindings.QueryChannelRange_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.QueryChannelRange_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_QueryChannelRangeDecodeErrorZ = Result_QueryChannelRangeDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/QueryShortChannelIds.mts b/ts/structs/QueryShortChannelIds.mts index f84b4b25..8eac29b8 100644 --- a/ts/structs/QueryShortChannelIds.mts +++ b/ts/structs/QueryShortChannelIds.mts @@ -368,7 +368,7 @@ import * as bindings from '../bindings.mjs' */ export class QueryShortChannelIds extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.QueryShortChannelIds_free); } @@ -410,14 +410,14 @@ export class QueryShortChannelIds extends CommonBase { * Constructs a new QueryShortChannelIds given each field */ public static constructor_new(chain_hash_arg: Uint8Array, short_channel_ids_arg: bigint[]): QueryShortChannelIds { - const ret: number = bindings.QueryShortChannelIds_new(bindings.encodeUint8Array(bindings.check_arr_len(chain_hash_arg, 32)), bindings.encodeUint64Array(short_channel_ids_arg)); + const ret: bigint = bindings.QueryShortChannelIds_new(bindings.encodeUint8Array(bindings.check_arr_len(chain_hash_arg, 32)), bindings.encodeUint64Array(short_channel_ids_arg)); const ret_hu_conv: QueryShortChannelIds = new QueryShortChannelIds(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.QueryShortChannelIds_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.QueryShortChannelIds_clone_ptr(this.ptr); return ret; } @@ -425,7 +425,7 @@ export class QueryShortChannelIds extends CommonBase { * Creates a copy of the QueryShortChannelIds */ public clone(): QueryShortChannelIds { - const ret: number = bindings.QueryShortChannelIds_clone(this.ptr); + const ret: bigint = bindings.QueryShortChannelIds_clone(this.ptr); const ret_hu_conv: QueryShortChannelIds = new QueryShortChannelIds(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -435,7 +435,7 @@ export class QueryShortChannelIds extends CommonBase { * Read a QueryShortChannelIds from a byte array, created by QueryShortChannelIds_write */ public static constructor_read(ser: Uint8Array): Result_QueryShortChannelIdsDecodeErrorZ { - const ret: number = bindings.QueryShortChannelIds_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.QueryShortChannelIds_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_QueryShortChannelIdsDecodeErrorZ = Result_QueryShortChannelIdsDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/RawDataPart.mts b/ts/structs/RawDataPart.mts index 5652309c..6376b529 100644 --- a/ts/structs/RawDataPart.mts +++ b/ts/structs/RawDataPart.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class RawDataPart extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.RawDataPart_free); } @@ -369,7 +369,7 @@ export class RawDataPart extends CommonBase { * generation time of the invoice */ public get_timestamp(): PositiveTimestamp { - const ret: number = bindings.RawDataPart_get_timestamp(this.ptr); + const ret: bigint = bindings.RawDataPart_get_timestamp(this.ptr); const ret_hu_conv: PositiveTimestamp = new PositiveTimestamp(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -379,7 +379,8 @@ export class RawDataPart extends CommonBase { * generation time of the invoice */ public set_timestamp(val: PositiveTimestamp): void { - bindings.RawDataPart_set_timestamp(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.RawDataPart_set_timestamp(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** @@ -388,13 +389,13 @@ export class RawDataPart extends CommonBase { * Two objects with NULL inner values will be considered "equal" here. */ public eq(b: RawDataPart): boolean { - const ret: boolean = bindings.RawDataPart_eq(this.ptr, b == null ? 0 : CommonBase.get_ptr_of(b) & ~1); + const ret: boolean = bindings.RawDataPart_eq(this.ptr, b == null ? 0n : CommonBase.get_ptr_of(b)); CommonBase.add_ref_from(this, b); return ret; } - public clone_ptr(): number { - const ret: number = bindings.RawDataPart_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.RawDataPart_clone_ptr(this.ptr); return ret; } @@ -402,7 +403,7 @@ export class RawDataPart extends CommonBase { * Creates a copy of the RawDataPart */ public clone(): RawDataPart { - const ret: number = bindings.RawDataPart_clone(this.ptr); + const ret: bigint = bindings.RawDataPart_clone(this.ptr); const ret_hu_conv: RawDataPart = new RawDataPart(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; diff --git a/ts/structs/RawInvoice.mts b/ts/structs/RawInvoice.mts index 10a393c8..af1e8d9d 100644 --- a/ts/structs/RawInvoice.mts +++ b/ts/structs/RawInvoice.mts @@ -365,7 +365,7 @@ import * as bindings from '../bindings.mjs' */ export class RawInvoice extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.RawInvoice_free); } @@ -373,7 +373,7 @@ export class RawInvoice extends CommonBase { * data part */ public get_data(): RawDataPart { - const ret: number = bindings.RawInvoice_get_data(this.ptr); + const ret: bigint = bindings.RawInvoice_get_data(this.ptr); const ret_hu_conv: RawDataPart = new RawDataPart(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -383,7 +383,8 @@ export class RawInvoice extends CommonBase { * data part */ public set_data(val: RawDataPart): void { - bindings.RawInvoice_set_data(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.RawInvoice_set_data(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** @@ -392,13 +393,13 @@ export class RawInvoice extends CommonBase { * Two objects with NULL inner values will be considered "equal" here. */ public eq(b: RawInvoice): boolean { - const ret: boolean = bindings.RawInvoice_eq(this.ptr, b == null ? 0 : CommonBase.get_ptr_of(b) & ~1); + const ret: boolean = bindings.RawInvoice_eq(this.ptr, b == null ? 0n : CommonBase.get_ptr_of(b)); CommonBase.add_ref_from(this, b); return ret; } - public clone_ptr(): number { - const ret: number = bindings.RawInvoice_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.RawInvoice_clone_ptr(this.ptr); return ret; } @@ -406,7 +407,7 @@ export class RawInvoice extends CommonBase { * Creates a copy of the RawInvoice */ public clone(): RawInvoice { - const ret: number = bindings.RawInvoice_clone(this.ptr); + const ret: bigint = bindings.RawInvoice_clone(this.ptr); const ret_hu_conv: RawInvoice = new RawInvoice(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -425,7 +426,7 @@ export class RawInvoice extends CommonBase { * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None */ public payment_hash(): Sha256 { - const ret: number = bindings.RawInvoice_payment_hash(this.ptr); + const ret: bigint = bindings.RawInvoice_payment_hash(this.ptr); const ret_hu_conv: Sha256 = new Sha256(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -435,7 +436,7 @@ export class RawInvoice extends CommonBase { * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None */ public description(): Description { - const ret: number = bindings.RawInvoice_description(this.ptr); + const ret: bigint = bindings.RawInvoice_description(this.ptr); const ret_hu_conv: Description = new Description(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -445,7 +446,7 @@ export class RawInvoice extends CommonBase { * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None */ public payee_pub_key(): PayeePubKey { - const ret: number = bindings.RawInvoice_payee_pub_key(this.ptr); + const ret: bigint = bindings.RawInvoice_payee_pub_key(this.ptr); const ret_hu_conv: PayeePubKey = new PayeePubKey(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -455,7 +456,7 @@ export class RawInvoice extends CommonBase { * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None */ public description_hash(): Sha256 { - const ret: number = bindings.RawInvoice_description_hash(this.ptr); + const ret: bigint = bindings.RawInvoice_description_hash(this.ptr); const ret_hu_conv: Sha256 = new Sha256(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -465,7 +466,7 @@ export class RawInvoice extends CommonBase { * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None */ public expiry_time(): ExpiryTime { - const ret: number = bindings.RawInvoice_expiry_time(this.ptr); + const ret: bigint = bindings.RawInvoice_expiry_time(this.ptr); const ret_hu_conv: ExpiryTime = new ExpiryTime(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -475,7 +476,7 @@ export class RawInvoice extends CommonBase { * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None */ public min_final_cltv_expiry(): MinFinalCltvExpiry { - const ret: number = bindings.RawInvoice_min_final_cltv_expiry(this.ptr); + const ret: bigint = bindings.RawInvoice_min_final_cltv_expiry(this.ptr); const ret_hu_conv: MinFinalCltvExpiry = new MinFinalCltvExpiry(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -494,7 +495,7 @@ export class RawInvoice extends CommonBase { * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None */ public features(): InvoiceFeatures { - const ret: number = bindings.RawInvoice_features(this.ptr); + const ret: bigint = bindings.RawInvoice_features(this.ptr); const ret_hu_conv: InvoiceFeatures = new InvoiceFeatures(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -505,7 +506,7 @@ export class RawInvoice extends CommonBase { const ret_conv_14_len: number = bindings.getArrayLength(ret); const ret_conv_14_arr: PrivateRoute[] = new Array(ret_conv_14_len).fill(null); for (var o = 0; o < ret_conv_14_len; o++) { - const ret_conv_14: number = bindings.getU32ArrayElem(ret, o); + const ret_conv_14: bigint = bindings.getU64ArrayElem(ret, o); const ret_conv_14_hu_conv: PrivateRoute = new PrivateRoute(null, ret_conv_14); CommonBase.add_ref_from(ret_conv_14_hu_conv, this); ret_conv_14_arr[o] = ret_conv_14_hu_conv; @@ -515,7 +516,7 @@ export class RawInvoice extends CommonBase { } public amount_pico_btc(): Option_u64Z { - const ret: number = bindings.RawInvoice_amount_pico_btc(this.ptr); + const ret: bigint = bindings.RawInvoice_amount_pico_btc(this.ptr); const ret_hu_conv: Option_u64Z = Option_u64Z.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; diff --git a/ts/structs/ReadOnlyNetworkGraph.mts b/ts/structs/ReadOnlyNetworkGraph.mts index 87ddf1ff..c484f528 100644 --- a/ts/structs/ReadOnlyNetworkGraph.mts +++ b/ts/structs/ReadOnlyNetworkGraph.mts @@ -362,7 +362,7 @@ import * as bindings from '../bindings.mjs' */ export class ReadOnlyNetworkGraph extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, () => { throw new Error("Locks must be manually freed with free()"); }); } /** Releases this lock */ @@ -377,7 +377,7 @@ export class ReadOnlyNetworkGraph extends CommonBase { * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None */ public channel(short_channel_id: bigint): ChannelInfo { - const ret: number = bindings.ReadOnlyNetworkGraph_channel(this.ptr, short_channel_id); + const ret: bigint = bindings.ReadOnlyNetworkGraph_channel(this.ptr, short_channel_id); const ret_hu_conv: ChannelInfo = new ChannelInfo(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -398,7 +398,7 @@ export class ReadOnlyNetworkGraph extends CommonBase { * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None */ public node(node_id: NodeId): NodeInfo { - const ret: number = bindings.ReadOnlyNetworkGraph_node(this.ptr, node_id == null ? 0 : CommonBase.get_ptr_of(node_id) & ~1); + const ret: bigint = bindings.ReadOnlyNetworkGraph_node(this.ptr, node_id == null ? 0n : CommonBase.get_ptr_of(node_id)); const ret_hu_conv: NodeInfo = new NodeInfo(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); CommonBase.add_ref_from(this, node_id); @@ -413,7 +413,7 @@ export class ReadOnlyNetworkGraph extends CommonBase { const ret_conv_8_len: number = bindings.getArrayLength(ret); const ret_conv_8_arr: NodeId[] = new Array(ret_conv_8_len).fill(null); for (var i = 0; i < ret_conv_8_len; i++) { - const ret_conv_8: number = bindings.getU32ArrayElem(ret, i); + const ret_conv_8: bigint = bindings.getU64ArrayElem(ret, i); const ret_conv_8_hu_conv: NodeId = new NodeId(null, ret_conv_8); CommonBase.add_ref_from(ret_conv_8_hu_conv, this); ret_conv_8_arr[i] = ret_conv_8_hu_conv; @@ -428,7 +428,7 @@ export class ReadOnlyNetworkGraph extends CommonBase { * or if node announcement for the node was never received. */ public get_addresses(pubkey: Uint8Array): Option_CVec_NetAddressZZ { - const ret: number = bindings.ReadOnlyNetworkGraph_get_addresses(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(pubkey, 33))); + const ret: bigint = bindings.ReadOnlyNetworkGraph_get_addresses(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(pubkey, 33))); const ret_hu_conv: Option_CVec_NetAddressZZ = Option_CVec_NetAddressZZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; diff --git a/ts/structs/Record.mts b/ts/structs/Record.mts index f067b858..30647d96 100644 --- a/ts/structs/Record.mts +++ b/ts/structs/Record.mts @@ -362,7 +362,7 @@ import * as bindings from '../bindings.mjs' */ export class Record extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.Record_free); } @@ -444,8 +444,8 @@ export class Record extends CommonBase { bindings.Record_set_line(this.ptr, val); } - public clone_ptr(): number { - const ret: number = bindings.Record_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.Record_clone_ptr(this.ptr); return ret; } @@ -453,7 +453,7 @@ export class Record extends CommonBase { * Creates a copy of the Record */ public clone(): Record { - const ret: number = bindings.Record_clone(this.ptr); + const ret: bigint = bindings.Record_clone(this.ptr); const ret_hu_conv: Record = new Record(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; diff --git a/ts/structs/ReplyChannelRange.mts b/ts/structs/ReplyChannelRange.mts index 54ca9911..45ab3b1a 100644 --- a/ts/structs/ReplyChannelRange.mts +++ b/ts/structs/ReplyChannelRange.mts @@ -367,7 +367,7 @@ import * as bindings from '../bindings.mjs' */ export class ReplyChannelRange extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.ReplyChannelRange_free); } @@ -454,14 +454,14 @@ export class ReplyChannelRange extends CommonBase { * Constructs a new ReplyChannelRange given each field */ public static constructor_new(chain_hash_arg: Uint8Array, first_blocknum_arg: number, number_of_blocks_arg: number, sync_complete_arg: boolean, short_channel_ids_arg: bigint[]): ReplyChannelRange { - const ret: number = bindings.ReplyChannelRange_new(bindings.encodeUint8Array(bindings.check_arr_len(chain_hash_arg, 32)), first_blocknum_arg, number_of_blocks_arg, sync_complete_arg, bindings.encodeUint64Array(short_channel_ids_arg)); + const ret: bigint = bindings.ReplyChannelRange_new(bindings.encodeUint8Array(bindings.check_arr_len(chain_hash_arg, 32)), first_blocknum_arg, number_of_blocks_arg, sync_complete_arg, bindings.encodeUint64Array(short_channel_ids_arg)); const ret_hu_conv: ReplyChannelRange = new ReplyChannelRange(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.ReplyChannelRange_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.ReplyChannelRange_clone_ptr(this.ptr); return ret; } @@ -469,7 +469,7 @@ export class ReplyChannelRange extends CommonBase { * Creates a copy of the ReplyChannelRange */ public clone(): ReplyChannelRange { - const ret: number = bindings.ReplyChannelRange_clone(this.ptr); + const ret: bigint = bindings.ReplyChannelRange_clone(this.ptr); const ret_hu_conv: ReplyChannelRange = new ReplyChannelRange(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -479,7 +479,7 @@ export class ReplyChannelRange extends CommonBase { * Read a ReplyChannelRange from a byte array, created by ReplyChannelRange_write */ public static constructor_read(ser: Uint8Array): Result_ReplyChannelRangeDecodeErrorZ { - const ret: number = bindings.ReplyChannelRange_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.ReplyChannelRange_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_ReplyChannelRangeDecodeErrorZ = Result_ReplyChannelRangeDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/ReplyShortChannelIdsEnd.mts b/ts/structs/ReplyShortChannelIdsEnd.mts index 692618ed..dbdb4d39 100644 --- a/ts/structs/ReplyShortChannelIdsEnd.mts +++ b/ts/structs/ReplyShortChannelIdsEnd.mts @@ -364,7 +364,7 @@ import * as bindings from '../bindings.mjs' */ export class ReplyShortChannelIdsEnd extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.ReplyShortChannelIdsEnd_free); } @@ -405,14 +405,14 @@ export class ReplyShortChannelIdsEnd extends CommonBase { * Constructs a new ReplyShortChannelIdsEnd given each field */ public static constructor_new(chain_hash_arg: Uint8Array, full_information_arg: boolean): ReplyShortChannelIdsEnd { - const ret: number = bindings.ReplyShortChannelIdsEnd_new(bindings.encodeUint8Array(bindings.check_arr_len(chain_hash_arg, 32)), full_information_arg); + const ret: bigint = bindings.ReplyShortChannelIdsEnd_new(bindings.encodeUint8Array(bindings.check_arr_len(chain_hash_arg, 32)), full_information_arg); const ret_hu_conv: ReplyShortChannelIdsEnd = new ReplyShortChannelIdsEnd(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.ReplyShortChannelIdsEnd_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.ReplyShortChannelIdsEnd_clone_ptr(this.ptr); return ret; } @@ -420,7 +420,7 @@ export class ReplyShortChannelIdsEnd extends CommonBase { * Creates a copy of the ReplyShortChannelIdsEnd */ public clone(): ReplyShortChannelIdsEnd { - const ret: number = bindings.ReplyShortChannelIdsEnd_clone(this.ptr); + const ret: bigint = bindings.ReplyShortChannelIdsEnd_clone(this.ptr); const ret_hu_conv: ReplyShortChannelIdsEnd = new ReplyShortChannelIdsEnd(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -439,7 +439,7 @@ export class ReplyShortChannelIdsEnd extends CommonBase { * Read a ReplyShortChannelIdsEnd from a byte array, created by ReplyShortChannelIdsEnd_write */ public static constructor_read(ser: Uint8Array): Result_ReplyShortChannelIdsEndDecodeErrorZ { - const ret: number = bindings.ReplyShortChannelIdsEnd_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.ReplyShortChannelIdsEnd_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_ReplyShortChannelIdsEndDecodeErrorZ = Result_ReplyShortChannelIdsEndDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/Result_AcceptChannelDecodeErrorZ.mts b/ts/structs/Result_AcceptChannelDecodeErrorZ.mts index 12dd8a43..43a984ea 100644 --- a/ts/structs/Result_AcceptChannelDecodeErrorZ.mts +++ b/ts/structs/Result_AcceptChannelDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_AcceptChannelDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_AcceptChannelDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_AcceptChannelDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_AcceptChannelDecodeErrorZ { if (bindings.CResult_AcceptChannelDecodeErrorZ_is_ok(ptr)) { return new Result_AcceptChannelDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_AcceptChannelDecodeErrorZ extends CommonBase { * Creates a new CResult_AcceptChannelDecodeErrorZ in the success state. */ public static constructor_ok(o: AcceptChannel): Result_AcceptChannelDecodeErrorZ { - const ret: number = bindings.CResult_AcceptChannelDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_AcceptChannelDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_AcceptChannelDecodeErrorZ = Result_AcceptChannelDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_AcceptChannelDecodeErrorZ extends CommonBase { * Creates a new CResult_AcceptChannelDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_AcceptChannelDecodeErrorZ { - const ret: number = bindings.CResult_AcceptChannelDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_AcceptChannelDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_AcceptChannelDecodeErrorZ = Result_AcceptChannelDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_AcceptChannelDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_AcceptChannelDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_AcceptChannelDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_AcceptChannelDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_AcceptChannelDecodeErrorZ { - const ret: number = bindings.CResult_AcceptChannelDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_AcceptChannelDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_AcceptChannelDecodeErrorZ = Result_AcceptChannelDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_AcceptChannelDecodeErrorZ_OK extends Result_AcceptChannelDec public res: AcceptChannel; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_AcceptChannelDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_AcceptChannelDecodeErrorZ_get_ok(ptr); const res_hu_conv: AcceptChannel = new AcceptChannel(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_AcceptChannelDecodeErrorZ_Err extends Result_AcceptChannelDe public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_AcceptChannelDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_AcceptChannelDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_AnnouncementSignaturesDecodeErrorZ.mts b/ts/structs/Result_AnnouncementSignaturesDecodeErrorZ.mts index 33e6d1d2..24d170ac 100644 --- a/ts/structs/Result_AnnouncementSignaturesDecodeErrorZ.mts +++ b/ts/structs/Result_AnnouncementSignaturesDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_AnnouncementSignaturesDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_AnnouncementSignaturesDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_AnnouncementSignaturesDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_AnnouncementSignaturesDecodeErrorZ { if (bindings.CResult_AnnouncementSignaturesDecodeErrorZ_is_ok(ptr)) { return new Result_AnnouncementSignaturesDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_AnnouncementSignaturesDecodeErrorZ extends CommonBase { * Creates a new CResult_AnnouncementSignaturesDecodeErrorZ in the success state. */ public static constructor_ok(o: AnnouncementSignatures): Result_AnnouncementSignaturesDecodeErrorZ { - const ret: number = bindings.CResult_AnnouncementSignaturesDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_AnnouncementSignaturesDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_AnnouncementSignaturesDecodeErrorZ = Result_AnnouncementSignaturesDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_AnnouncementSignaturesDecodeErrorZ extends CommonBase { * Creates a new CResult_AnnouncementSignaturesDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_AnnouncementSignaturesDecodeErrorZ { - const ret: number = bindings.CResult_AnnouncementSignaturesDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_AnnouncementSignaturesDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_AnnouncementSignaturesDecodeErrorZ = Result_AnnouncementSignaturesDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_AnnouncementSignaturesDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_AnnouncementSignaturesDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_AnnouncementSignaturesDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_AnnouncementSignaturesDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_AnnouncementSignaturesDecodeErrorZ { - const ret: number = bindings.CResult_AnnouncementSignaturesDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_AnnouncementSignaturesDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_AnnouncementSignaturesDecodeErrorZ = Result_AnnouncementSignaturesDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_AnnouncementSignaturesDecodeErrorZ_OK extends Result_Announc public res: AnnouncementSignatures; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_AnnouncementSignaturesDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_AnnouncementSignaturesDecodeErrorZ_get_ok(ptr); const res_hu_conv: AnnouncementSignatures = new AnnouncementSignatures(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_AnnouncementSignaturesDecodeErrorZ_Err extends Result_Announ public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_AnnouncementSignaturesDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_AnnouncementSignaturesDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_BuiltCommitmentTransactionDecodeErrorZ.mts b/ts/structs/Result_BuiltCommitmentTransactionDecodeErrorZ.mts index 35082278..e8ccd6a8 100644 --- a/ts/structs/Result_BuiltCommitmentTransactionDecodeErrorZ.mts +++ b/ts/structs/Result_BuiltCommitmentTransactionDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_BuiltCommitmentTransactionDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_BuiltCommitmentTransactionDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_BuiltCommitmentTransactionDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_BuiltCommitmentTransactionDecodeErrorZ { if (bindings.CResult_BuiltCommitmentTransactionDecodeErrorZ_is_ok(ptr)) { return new Result_BuiltCommitmentTransactionDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_BuiltCommitmentTransactionDecodeErrorZ extends CommonBase { * Creates a new CResult_BuiltCommitmentTransactionDecodeErrorZ in the success state. */ public static constructor_ok(o: BuiltCommitmentTransaction): Result_BuiltCommitmentTransactionDecodeErrorZ { - const ret: number = bindings.CResult_BuiltCommitmentTransactionDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_BuiltCommitmentTransactionDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_BuiltCommitmentTransactionDecodeErrorZ = Result_BuiltCommitmentTransactionDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_BuiltCommitmentTransactionDecodeErrorZ extends CommonBase { * Creates a new CResult_BuiltCommitmentTransactionDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_BuiltCommitmentTransactionDecodeErrorZ { - const ret: number = bindings.CResult_BuiltCommitmentTransactionDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_BuiltCommitmentTransactionDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_BuiltCommitmentTransactionDecodeErrorZ = Result_BuiltCommitmentTransactionDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_BuiltCommitmentTransactionDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_BuiltCommitmentTransactionDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_BuiltCommitmentTransactionDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_BuiltCommitmentTransactionDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_BuiltCommitmentTransactionDecodeErrorZ { - const ret: number = bindings.CResult_BuiltCommitmentTransactionDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_BuiltCommitmentTransactionDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_BuiltCommitmentTransactionDecodeErrorZ = Result_BuiltCommitmentTransactionDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_BuiltCommitmentTransactionDecodeErrorZ_OK extends Result_Bui public res: BuiltCommitmentTransaction; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_BuiltCommitmentTransactionDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_BuiltCommitmentTransactionDecodeErrorZ_get_ok(ptr); const res_hu_conv: BuiltCommitmentTransaction = new BuiltCommitmentTransaction(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_BuiltCommitmentTransactionDecodeErrorZ_Err extends Result_Bu public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_BuiltCommitmentTransactionDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_BuiltCommitmentTransactionDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ.mts b/ts/structs/Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ.mts index f1dce1e9..10f25cb8 100644 --- a/ts/structs/Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ.mts +++ b/ts/structs/Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ { if (bindings.CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_is_ok(ptr)) { return new Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ extends CommonB * Creates a new CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ in the success state. */ public static constructor_ok(o: TwoTuple_BlockHashChannelManagerZ): Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ { - const ret: number = bindings.CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_ok(o != null ? CommonBase.get_ptr_of(o) : 0); + const ret: bigint = bindings.CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_ok(o != null ? CommonBase.get_ptr_of(o) : 0n); const ret_hu_conv: Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ = Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,8 +382,9 @@ export class Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ extends CommonB * Creates a new CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ { - const ret: number = bindings.CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ = Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -400,9 +401,9 @@ export class Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_OK extends Resu public res: TwoTuple_BlockHashChannelManagerZ; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_ok(ptr); const res_hu_conv: TwoTuple_BlockHashChannelManagerZ = new TwoTuple_BlockHashChannelManagerZ(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -412,9 +413,9 @@ export class Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_Err extends Res public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ.mts b/ts/structs/Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ.mts index 8fd46afc..e4057707 100644 --- a/ts/structs/Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ.mts +++ b/ts/structs/Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ { if (bindings.CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_is_ok(ptr)) { return new Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ extends CommonB * Creates a new CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ in the success state. */ public static constructor_ok(o: TwoTuple_BlockHashChannelMonitorZ): Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ { - const ret: number = bindings.CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_ok(o != null ? CommonBase.get_ptr_of(o) : 0); + const ret: bigint = bindings.CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_ok(o != null ? CommonBase.get_ptr_of(o) : 0n); const ret_hu_conv: Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ = Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,8 +382,9 @@ export class Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ extends CommonB * Creates a new CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ { - const ret: number = bindings.CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ = Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +396,8 @@ export class Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ extends CommonB return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +406,7 @@ export class Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ extends CommonB * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ { - const ret: number = bindings.CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ = Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +416,9 @@ export class Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_OK extends Resu public res: TwoTuple_BlockHashChannelMonitorZ; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_ok(ptr); const res_hu_conv: TwoTuple_BlockHashChannelMonitorZ = new TwoTuple_BlockHashChannelMonitorZ(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +428,9 @@ export class Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_Err extends Res public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ.mts b/ts/structs/Result_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ.mts index 6c949920..29ae73f8 100644 --- a/ts/structs/Result_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ.mts +++ b/ts/structs/Result_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ { + public static constr_from_ptr(ptr: bigint): Result_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ { if (bindings.CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_is_ok(ptr)) { return new Result_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ extends Com * Creates a new CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ in the success state. */ public static constructor_ok(o: TwoTuple_PaymentHashPaymentIdZ): Result_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ { - const ret: number = bindings.CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_ok(o != null ? CommonBase.get_ptr_of(o) : 0); + const ret: bigint = bindings.CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_ok(o != null ? CommonBase.get_ptr_of(o) : 0n); const ret_hu_conv: Result_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ = Result_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,7 +382,7 @@ export class Result_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ extends Com * Creates a new CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ in the error state. */ public static constructor_err(e: PaymentSendFailure): Result_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ { - const ret: number = bindings.CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_err(CommonBase.get_ptr_of(e)); + const ret: bigint = bindings.CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_err(CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ = Result_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -395,8 +395,8 @@ export class Result_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ extends Com return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +405,7 @@ export class Result_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ extends Com * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ { - const ret: number = bindings.CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone(this.ptr); + const ret: bigint = bindings.CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone(this.ptr); const ret_hu_conv: Result_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ = Result_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +415,9 @@ export class Result_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_OK extends public res: TwoTuple_PaymentHashPaymentIdZ; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_ok(ptr); + const res: bigint = bindings.CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_ok(ptr); const res_hu_conv: TwoTuple_PaymentHashPaymentIdZ = new TwoTuple_PaymentHashPaymentIdZ(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +427,9 @@ export class Result_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_Err extends public err: PaymentSendFailure; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_err(ptr); + const err: bigint = bindings.CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_err(ptr); const err_hu_conv: PaymentSendFailure = PaymentSendFailure.constr_from_ptr(err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ.mts b/ts/structs/Result_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ.mts index 92c6cd1b..6d13f22b 100644 --- a/ts/structs/Result_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ.mts +++ b/ts/structs/Result_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ { + public static constr_from_ptr(ptr: bigint): Result_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ { if (bindings.CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_is_ok(ptr)) { return new Result_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ extends CommonBas * Creates a new CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ in the success state. */ public static constructor_ok(o: TwoTuple_PaymentHashPaymentSecretZ): Result_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ { - const ret: number = bindings.CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_ok(o != null ? CommonBase.get_ptr_of(o) : 0); + const ret: bigint = bindings.CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_ok(o != null ? CommonBase.get_ptr_of(o) : 0n); const ret_hu_conv: Result_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ = Result_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,7 +382,7 @@ export class Result_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ extends CommonBas * Creates a new CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ in the error state. */ public static constructor_err(e: APIError): Result_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ { - const ret: number = bindings.CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_err(CommonBase.get_ptr_of(e)); + const ret: bigint = bindings.CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_err(CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ = Result_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -395,8 +395,8 @@ export class Result_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ extends CommonBas return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +405,7 @@ export class Result_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ extends CommonBas * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ { - const ret: number = bindings.CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone(this.ptr); const ret_hu_conv: Result_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ = Result_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +415,9 @@ export class Result_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_OK extends Result public res: TwoTuple_PaymentHashPaymentSecretZ; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_ok(ptr); const res_hu_conv: TwoTuple_PaymentHashPaymentSecretZ = new TwoTuple_PaymentHashPaymentSecretZ(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +427,9 @@ export class Result_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_Err extends Resul public err: APIError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_err(ptr); const err_hu_conv: APIError = APIError.constr_from_ptr(err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_C2Tuple_PaymentHashPaymentSecretZNoneZ.mts b/ts/structs/Result_C2Tuple_PaymentHashPaymentSecretZNoneZ.mts index 95c890d2..11d1aadb 100644 --- a/ts/structs/Result_C2Tuple_PaymentHashPaymentSecretZNoneZ.mts +++ b/ts/structs/Result_C2Tuple_PaymentHashPaymentSecretZNoneZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_C2Tuple_PaymentHashPaymentSecretZNoneZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_C2Tuple_PaymentHashPaymentSecretZNoneZ { + public static constr_from_ptr(ptr: bigint): Result_C2Tuple_PaymentHashPaymentSecretZNoneZ { if (bindings.CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_is_ok(ptr)) { return new Result_C2Tuple_PaymentHashPaymentSecretZNoneZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_C2Tuple_PaymentHashPaymentSecretZNoneZ extends CommonBase { * Creates a new CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ in the success state. */ public static constructor_ok(o: TwoTuple_PaymentHashPaymentSecretZ): Result_C2Tuple_PaymentHashPaymentSecretZNoneZ { - const ret: number = bindings.CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_ok(o != null ? CommonBase.get_ptr_of(o) : 0); + const ret: bigint = bindings.CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_ok(o != null ? CommonBase.get_ptr_of(o) : 0n); const ret_hu_conv: Result_C2Tuple_PaymentHashPaymentSecretZNoneZ = Result_C2Tuple_PaymentHashPaymentSecretZNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,7 +382,7 @@ export class Result_C2Tuple_PaymentHashPaymentSecretZNoneZ extends CommonBase { * Creates a new CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ in the error state. */ public static constructor_err(): Result_C2Tuple_PaymentHashPaymentSecretZNoneZ { - const ret: number = bindings.CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_err(); + const ret: bigint = bindings.CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_err(); const ret_hu_conv: Result_C2Tuple_PaymentHashPaymentSecretZNoneZ = Result_C2Tuple_PaymentHashPaymentSecretZNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -395,8 +395,8 @@ export class Result_C2Tuple_PaymentHashPaymentSecretZNoneZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +405,7 @@ export class Result_C2Tuple_PaymentHashPaymentSecretZNoneZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_C2Tuple_PaymentHashPaymentSecretZNoneZ { - const ret: number = bindings.CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone(this.ptr); + const ret: bigint = bindings.CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone(this.ptr); const ret_hu_conv: Result_C2Tuple_PaymentHashPaymentSecretZNoneZ = Result_C2Tuple_PaymentHashPaymentSecretZNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +415,9 @@ export class Result_C2Tuple_PaymentHashPaymentSecretZNoneZ_OK extends Result_C2T public res: TwoTuple_PaymentHashPaymentSecretZ; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_ok(ptr); + const res: bigint = bindings.CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_ok(ptr); const res_hu_conv: TwoTuple_PaymentHashPaymentSecretZ = new TwoTuple_PaymentHashPaymentSecretZ(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -426,7 +426,7 @@ export class Result_C2Tuple_PaymentHashPaymentSecretZNoneZ_OK extends Result_C2T export class Result_C2Tuple_PaymentHashPaymentSecretZNoneZ_Err extends Result_C2Tuple_PaymentHashPaymentSecretZNoneZ { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); } } \ No newline at end of file diff --git a/ts/structs/Result_C2Tuple_SignatureCVec_SignatureZZNoneZ.mts b/ts/structs/Result_C2Tuple_SignatureCVec_SignatureZZNoneZ.mts index 68784cac..11f01272 100644 --- a/ts/structs/Result_C2Tuple_SignatureCVec_SignatureZZNoneZ.mts +++ b/ts/structs/Result_C2Tuple_SignatureCVec_SignatureZZNoneZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_C2Tuple_SignatureCVec_SignatureZZNoneZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_C2Tuple_SignatureCVec_SignatureZZNoneZ { + public static constr_from_ptr(ptr: bigint): Result_C2Tuple_SignatureCVec_SignatureZZNoneZ { if (bindings.CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_is_ok(ptr)) { return new Result_C2Tuple_SignatureCVec_SignatureZZNoneZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_C2Tuple_SignatureCVec_SignatureZZNoneZ extends CommonBase { * Creates a new CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ in the success state. */ public static constructor_ok(o: TwoTuple_SignatureCVec_SignatureZZ): Result_C2Tuple_SignatureCVec_SignatureZZNoneZ { - const ret: number = bindings.CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_ok(o != null ? CommonBase.get_ptr_of(o) : 0); + const ret: bigint = bindings.CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_ok(o != null ? CommonBase.get_ptr_of(o) : 0n); const ret_hu_conv: Result_C2Tuple_SignatureCVec_SignatureZZNoneZ = Result_C2Tuple_SignatureCVec_SignatureZZNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,7 +382,7 @@ export class Result_C2Tuple_SignatureCVec_SignatureZZNoneZ extends CommonBase { * Creates a new CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ in the error state. */ public static constructor_err(): Result_C2Tuple_SignatureCVec_SignatureZZNoneZ { - const ret: number = bindings.CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_err(); + const ret: bigint = bindings.CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_err(); const ret_hu_conv: Result_C2Tuple_SignatureCVec_SignatureZZNoneZ = Result_C2Tuple_SignatureCVec_SignatureZZNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -395,8 +395,8 @@ export class Result_C2Tuple_SignatureCVec_SignatureZZNoneZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +405,7 @@ export class Result_C2Tuple_SignatureCVec_SignatureZZNoneZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_C2Tuple_SignatureCVec_SignatureZZNoneZ { - const ret: number = bindings.CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone(this.ptr); + const ret: bigint = bindings.CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone(this.ptr); const ret_hu_conv: Result_C2Tuple_SignatureCVec_SignatureZZNoneZ = Result_C2Tuple_SignatureCVec_SignatureZZNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +415,9 @@ export class Result_C2Tuple_SignatureCVec_SignatureZZNoneZ_OK extends Result_C2T public res: TwoTuple_SignatureCVec_SignatureZZ; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_ok(ptr); + const res: bigint = bindings.CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_ok(ptr); const res_hu_conv: TwoTuple_SignatureCVec_SignatureZZ = new TwoTuple_SignatureCVec_SignatureZZ(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -426,7 +426,7 @@ export class Result_C2Tuple_SignatureCVec_SignatureZZNoneZ_OK extends Result_C2T export class Result_C2Tuple_SignatureCVec_SignatureZZNoneZ_Err extends Result_C2Tuple_SignatureCVec_SignatureZZNoneZ { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); } } \ No newline at end of file diff --git a/ts/structs/Result_C2Tuple_SignatureSignatureZNoneZ.mts b/ts/structs/Result_C2Tuple_SignatureSignatureZNoneZ.mts index 194eabeb..0f96996b 100644 --- a/ts/structs/Result_C2Tuple_SignatureSignatureZNoneZ.mts +++ b/ts/structs/Result_C2Tuple_SignatureSignatureZNoneZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_C2Tuple_SignatureSignatureZNoneZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_C2Tuple_SignatureSignatureZNoneZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_C2Tuple_SignatureSignatureZNoneZ { + public static constr_from_ptr(ptr: bigint): Result_C2Tuple_SignatureSignatureZNoneZ { if (bindings.CResult_C2Tuple_SignatureSignatureZNoneZ_is_ok(ptr)) { return new Result_C2Tuple_SignatureSignatureZNoneZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_C2Tuple_SignatureSignatureZNoneZ extends CommonBase { * Creates a new CResult_C2Tuple_SignatureSignatureZNoneZ in the success state. */ public static constructor_ok(o: TwoTuple_SignatureSignatureZ): Result_C2Tuple_SignatureSignatureZNoneZ { - const ret: number = bindings.CResult_C2Tuple_SignatureSignatureZNoneZ_ok(o != null ? CommonBase.get_ptr_of(o) : 0); + const ret: bigint = bindings.CResult_C2Tuple_SignatureSignatureZNoneZ_ok(o != null ? CommonBase.get_ptr_of(o) : 0n); const ret_hu_conv: Result_C2Tuple_SignatureSignatureZNoneZ = Result_C2Tuple_SignatureSignatureZNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,7 +382,7 @@ export class Result_C2Tuple_SignatureSignatureZNoneZ extends CommonBase { * Creates a new CResult_C2Tuple_SignatureSignatureZNoneZ in the error state. */ public static constructor_err(): Result_C2Tuple_SignatureSignatureZNoneZ { - const ret: number = bindings.CResult_C2Tuple_SignatureSignatureZNoneZ_err(); + const ret: bigint = bindings.CResult_C2Tuple_SignatureSignatureZNoneZ_err(); const ret_hu_conv: Result_C2Tuple_SignatureSignatureZNoneZ = Result_C2Tuple_SignatureSignatureZNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -395,8 +395,8 @@ export class Result_C2Tuple_SignatureSignatureZNoneZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_C2Tuple_SignatureSignatureZNoneZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_C2Tuple_SignatureSignatureZNoneZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +405,7 @@ export class Result_C2Tuple_SignatureSignatureZNoneZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_C2Tuple_SignatureSignatureZNoneZ { - const ret: number = bindings.CResult_C2Tuple_SignatureSignatureZNoneZ_clone(this.ptr); + const ret: bigint = bindings.CResult_C2Tuple_SignatureSignatureZNoneZ_clone(this.ptr); const ret_hu_conv: Result_C2Tuple_SignatureSignatureZNoneZ = Result_C2Tuple_SignatureSignatureZNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +415,9 @@ export class Result_C2Tuple_SignatureSignatureZNoneZ_OK extends Result_C2Tuple_S public res: TwoTuple_SignatureSignatureZ; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_C2Tuple_SignatureSignatureZNoneZ_get_ok(ptr); + const res: bigint = bindings.CResult_C2Tuple_SignatureSignatureZNoneZ_get_ok(ptr); const res_hu_conv: TwoTuple_SignatureSignatureZ = new TwoTuple_SignatureSignatureZ(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -426,7 +426,7 @@ export class Result_C2Tuple_SignatureSignatureZNoneZ_OK extends Result_C2Tuple_S export class Result_C2Tuple_SignatureSignatureZNoneZ_Err extends Result_C2Tuple_SignatureSignatureZNoneZ { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); } } \ No newline at end of file diff --git a/ts/structs/Result_COption_ClosureReasonZDecodeErrorZ.mts b/ts/structs/Result_COption_ClosureReasonZDecodeErrorZ.mts index 61d3faae..be9d3149 100644 --- a/ts/structs/Result_COption_ClosureReasonZDecodeErrorZ.mts +++ b/ts/structs/Result_COption_ClosureReasonZDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_COption_ClosureReasonZDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_COption_ClosureReasonZDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_COption_ClosureReasonZDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_COption_ClosureReasonZDecodeErrorZ { if (bindings.CResult_COption_ClosureReasonZDecodeErrorZ_is_ok(ptr)) { return new Result_COption_ClosureReasonZDecodeErrorZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_COption_ClosureReasonZDecodeErrorZ extends CommonBase { * Creates a new CResult_COption_ClosureReasonZDecodeErrorZ in the success state. */ public static constructor_ok(o: Option_ClosureReasonZ): Result_COption_ClosureReasonZDecodeErrorZ { - const ret: number = bindings.CResult_COption_ClosureReasonZDecodeErrorZ_ok(CommonBase.get_ptr_of(o)); + const ret: bigint = bindings.CResult_COption_ClosureReasonZDecodeErrorZ_ok(CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_COption_ClosureReasonZDecodeErrorZ = Result_COption_ClosureReasonZDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,8 +382,9 @@ export class Result_COption_ClosureReasonZDecodeErrorZ extends CommonBase { * Creates a new CResult_COption_ClosureReasonZDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_COption_ClosureReasonZDecodeErrorZ { - const ret: number = bindings.CResult_COption_ClosureReasonZDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_COption_ClosureReasonZDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_COption_ClosureReasonZDecodeErrorZ = Result_COption_ClosureReasonZDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +396,8 @@ export class Result_COption_ClosureReasonZDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_COption_ClosureReasonZDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_COption_ClosureReasonZDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +406,7 @@ export class Result_COption_ClosureReasonZDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_COption_ClosureReasonZDecodeErrorZ { - const ret: number = bindings.CResult_COption_ClosureReasonZDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_COption_ClosureReasonZDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_COption_ClosureReasonZDecodeErrorZ = Result_COption_ClosureReasonZDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +416,9 @@ export class Result_COption_ClosureReasonZDecodeErrorZ_OK extends Result_COption public res: Option_ClosureReasonZ; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_COption_ClosureReasonZDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_COption_ClosureReasonZDecodeErrorZ_get_ok(ptr); const res_hu_conv: Option_ClosureReasonZ = Option_ClosureReasonZ.constr_from_ptr(res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +428,9 @@ export class Result_COption_ClosureReasonZDecodeErrorZ_Err extends Result_COptio public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_COption_ClosureReasonZDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_COption_ClosureReasonZDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_COption_EventZDecodeErrorZ.mts b/ts/structs/Result_COption_EventZDecodeErrorZ.mts index 32122f0b..27a2a9a5 100644 --- a/ts/structs/Result_COption_EventZDecodeErrorZ.mts +++ b/ts/structs/Result_COption_EventZDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_COption_EventZDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_COption_EventZDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_COption_EventZDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_COption_EventZDecodeErrorZ { if (bindings.CResult_COption_EventZDecodeErrorZ_is_ok(ptr)) { return new Result_COption_EventZDecodeErrorZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_COption_EventZDecodeErrorZ extends CommonBase { * Creates a new CResult_COption_EventZDecodeErrorZ in the success state. */ public static constructor_ok(o: Option_EventZ): Result_COption_EventZDecodeErrorZ { - const ret: number = bindings.CResult_COption_EventZDecodeErrorZ_ok(CommonBase.get_ptr_of(o)); + const ret: bigint = bindings.CResult_COption_EventZDecodeErrorZ_ok(CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_COption_EventZDecodeErrorZ = Result_COption_EventZDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,8 +382,9 @@ export class Result_COption_EventZDecodeErrorZ extends CommonBase { * Creates a new CResult_COption_EventZDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_COption_EventZDecodeErrorZ { - const ret: number = bindings.CResult_COption_EventZDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_COption_EventZDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_COption_EventZDecodeErrorZ = Result_COption_EventZDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +396,8 @@ export class Result_COption_EventZDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_COption_EventZDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_COption_EventZDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +406,7 @@ export class Result_COption_EventZDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_COption_EventZDecodeErrorZ { - const ret: number = bindings.CResult_COption_EventZDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_COption_EventZDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_COption_EventZDecodeErrorZ = Result_COption_EventZDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +416,9 @@ export class Result_COption_EventZDecodeErrorZ_OK extends Result_COption_EventZD public res: Option_EventZ; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_COption_EventZDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_COption_EventZDecodeErrorZ_get_ok(ptr); const res_hu_conv: Option_EventZ = Option_EventZ.constr_from_ptr(res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +428,9 @@ export class Result_COption_EventZDecodeErrorZ_Err extends Result_COption_EventZ public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_COption_EventZDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_COption_EventZDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_COption_HTLCDestinationZDecodeErrorZ.mts b/ts/structs/Result_COption_HTLCDestinationZDecodeErrorZ.mts index b84eb743..ee4588e1 100644 --- a/ts/structs/Result_COption_HTLCDestinationZDecodeErrorZ.mts +++ b/ts/structs/Result_COption_HTLCDestinationZDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_COption_HTLCDestinationZDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_COption_HTLCDestinationZDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_COption_HTLCDestinationZDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_COption_HTLCDestinationZDecodeErrorZ { if (bindings.CResult_COption_HTLCDestinationZDecodeErrorZ_is_ok(ptr)) { return new Result_COption_HTLCDestinationZDecodeErrorZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_COption_HTLCDestinationZDecodeErrorZ extends CommonBase { * Creates a new CResult_COption_HTLCDestinationZDecodeErrorZ in the success state. */ public static constructor_ok(o: Option_HTLCDestinationZ): Result_COption_HTLCDestinationZDecodeErrorZ { - const ret: number = bindings.CResult_COption_HTLCDestinationZDecodeErrorZ_ok(CommonBase.get_ptr_of(o)); + const ret: bigint = bindings.CResult_COption_HTLCDestinationZDecodeErrorZ_ok(CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_COption_HTLCDestinationZDecodeErrorZ = Result_COption_HTLCDestinationZDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,8 +382,9 @@ export class Result_COption_HTLCDestinationZDecodeErrorZ extends CommonBase { * Creates a new CResult_COption_HTLCDestinationZDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_COption_HTLCDestinationZDecodeErrorZ { - const ret: number = bindings.CResult_COption_HTLCDestinationZDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_COption_HTLCDestinationZDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_COption_HTLCDestinationZDecodeErrorZ = Result_COption_HTLCDestinationZDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +396,8 @@ export class Result_COption_HTLCDestinationZDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_COption_HTLCDestinationZDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_COption_HTLCDestinationZDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +406,7 @@ export class Result_COption_HTLCDestinationZDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_COption_HTLCDestinationZDecodeErrorZ { - const ret: number = bindings.CResult_COption_HTLCDestinationZDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_COption_HTLCDestinationZDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_COption_HTLCDestinationZDecodeErrorZ = Result_COption_HTLCDestinationZDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +416,9 @@ export class Result_COption_HTLCDestinationZDecodeErrorZ_OK extends Result_COpti public res: Option_HTLCDestinationZ; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_COption_HTLCDestinationZDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_COption_HTLCDestinationZDecodeErrorZ_get_ok(ptr); const res_hu_conv: Option_HTLCDestinationZ = Option_HTLCDestinationZ.constr_from_ptr(res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +428,9 @@ export class Result_COption_HTLCDestinationZDecodeErrorZ_Err extends Result_COpt public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_COption_HTLCDestinationZDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_COption_HTLCDestinationZDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_COption_MonitorEventZDecodeErrorZ.mts b/ts/structs/Result_COption_MonitorEventZDecodeErrorZ.mts index dfb77a45..c888e861 100644 --- a/ts/structs/Result_COption_MonitorEventZDecodeErrorZ.mts +++ b/ts/structs/Result_COption_MonitorEventZDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_COption_MonitorEventZDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_COption_MonitorEventZDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_COption_MonitorEventZDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_COption_MonitorEventZDecodeErrorZ { if (bindings.CResult_COption_MonitorEventZDecodeErrorZ_is_ok(ptr)) { return new Result_COption_MonitorEventZDecodeErrorZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_COption_MonitorEventZDecodeErrorZ extends CommonBase { * Creates a new CResult_COption_MonitorEventZDecodeErrorZ in the success state. */ public static constructor_ok(o: Option_MonitorEventZ): Result_COption_MonitorEventZDecodeErrorZ { - const ret: number = bindings.CResult_COption_MonitorEventZDecodeErrorZ_ok(CommonBase.get_ptr_of(o)); + const ret: bigint = bindings.CResult_COption_MonitorEventZDecodeErrorZ_ok(CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_COption_MonitorEventZDecodeErrorZ = Result_COption_MonitorEventZDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,8 +382,9 @@ export class Result_COption_MonitorEventZDecodeErrorZ extends CommonBase { * Creates a new CResult_COption_MonitorEventZDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_COption_MonitorEventZDecodeErrorZ { - const ret: number = bindings.CResult_COption_MonitorEventZDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_COption_MonitorEventZDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_COption_MonitorEventZDecodeErrorZ = Result_COption_MonitorEventZDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +396,8 @@ export class Result_COption_MonitorEventZDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_COption_MonitorEventZDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_COption_MonitorEventZDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +406,7 @@ export class Result_COption_MonitorEventZDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_COption_MonitorEventZDecodeErrorZ { - const ret: number = bindings.CResult_COption_MonitorEventZDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_COption_MonitorEventZDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_COption_MonitorEventZDecodeErrorZ = Result_COption_MonitorEventZDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +416,9 @@ export class Result_COption_MonitorEventZDecodeErrorZ_OK extends Result_COption_ public res: Option_MonitorEventZ; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_COption_MonitorEventZDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_COption_MonitorEventZDecodeErrorZ_get_ok(ptr); const res_hu_conv: Option_MonitorEventZ = Option_MonitorEventZ.constr_from_ptr(res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +428,9 @@ export class Result_COption_MonitorEventZDecodeErrorZ_Err extends Result_COption public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_COption_MonitorEventZDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_COption_MonitorEventZDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_COption_NetworkUpdateZDecodeErrorZ.mts b/ts/structs/Result_COption_NetworkUpdateZDecodeErrorZ.mts index f83b59dd..c1ff9ed1 100644 --- a/ts/structs/Result_COption_NetworkUpdateZDecodeErrorZ.mts +++ b/ts/structs/Result_COption_NetworkUpdateZDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_COption_NetworkUpdateZDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_COption_NetworkUpdateZDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_COption_NetworkUpdateZDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_COption_NetworkUpdateZDecodeErrorZ { if (bindings.CResult_COption_NetworkUpdateZDecodeErrorZ_is_ok(ptr)) { return new Result_COption_NetworkUpdateZDecodeErrorZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_COption_NetworkUpdateZDecodeErrorZ extends CommonBase { * Creates a new CResult_COption_NetworkUpdateZDecodeErrorZ in the success state. */ public static constructor_ok(o: Option_NetworkUpdateZ): Result_COption_NetworkUpdateZDecodeErrorZ { - const ret: number = bindings.CResult_COption_NetworkUpdateZDecodeErrorZ_ok(CommonBase.get_ptr_of(o)); + const ret: bigint = bindings.CResult_COption_NetworkUpdateZDecodeErrorZ_ok(CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_COption_NetworkUpdateZDecodeErrorZ = Result_COption_NetworkUpdateZDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,8 +382,9 @@ export class Result_COption_NetworkUpdateZDecodeErrorZ extends CommonBase { * Creates a new CResult_COption_NetworkUpdateZDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_COption_NetworkUpdateZDecodeErrorZ { - const ret: number = bindings.CResult_COption_NetworkUpdateZDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_COption_NetworkUpdateZDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_COption_NetworkUpdateZDecodeErrorZ = Result_COption_NetworkUpdateZDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +396,8 @@ export class Result_COption_NetworkUpdateZDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_COption_NetworkUpdateZDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_COption_NetworkUpdateZDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +406,7 @@ export class Result_COption_NetworkUpdateZDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_COption_NetworkUpdateZDecodeErrorZ { - const ret: number = bindings.CResult_COption_NetworkUpdateZDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_COption_NetworkUpdateZDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_COption_NetworkUpdateZDecodeErrorZ = Result_COption_NetworkUpdateZDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +416,9 @@ export class Result_COption_NetworkUpdateZDecodeErrorZ_OK extends Result_COption public res: Option_NetworkUpdateZ; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_COption_NetworkUpdateZDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_COption_NetworkUpdateZDecodeErrorZ_get_ok(ptr); const res_hu_conv: Option_NetworkUpdateZ = Option_NetworkUpdateZ.constr_from_ptr(res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +428,9 @@ export class Result_COption_NetworkUpdateZDecodeErrorZ_Err extends Result_COptio public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_COption_NetworkUpdateZDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_COption_NetworkUpdateZDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_COption_TypeZDecodeErrorZ.mts b/ts/structs/Result_COption_TypeZDecodeErrorZ.mts index f2d1ba59..3998aafa 100644 --- a/ts/structs/Result_COption_TypeZDecodeErrorZ.mts +++ b/ts/structs/Result_COption_TypeZDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_COption_TypeZDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_COption_TypeZDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_COption_TypeZDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_COption_TypeZDecodeErrorZ { if (bindings.CResult_COption_TypeZDecodeErrorZ_is_ok(ptr)) { return new Result_COption_TypeZDecodeErrorZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_COption_TypeZDecodeErrorZ extends CommonBase { * Creates a new CResult_COption_TypeZDecodeErrorZ in the success state. */ public static constructor_ok(o: Option_TypeZ): Result_COption_TypeZDecodeErrorZ { - const ret: number = bindings.CResult_COption_TypeZDecodeErrorZ_ok(CommonBase.get_ptr_of(o)); + const ret: bigint = bindings.CResult_COption_TypeZDecodeErrorZ_ok(CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_COption_TypeZDecodeErrorZ = Result_COption_TypeZDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,8 +382,9 @@ export class Result_COption_TypeZDecodeErrorZ extends CommonBase { * Creates a new CResult_COption_TypeZDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_COption_TypeZDecodeErrorZ { - const ret: number = bindings.CResult_COption_TypeZDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_COption_TypeZDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_COption_TypeZDecodeErrorZ = Result_COption_TypeZDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +396,8 @@ export class Result_COption_TypeZDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_COption_TypeZDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_COption_TypeZDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +406,7 @@ export class Result_COption_TypeZDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_COption_TypeZDecodeErrorZ { - const ret: number = bindings.CResult_COption_TypeZDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_COption_TypeZDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_COption_TypeZDecodeErrorZ = Result_COption_TypeZDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +416,9 @@ export class Result_COption_TypeZDecodeErrorZ_OK extends Result_COption_TypeZDec public res: Option_TypeZ; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_COption_TypeZDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_COption_TypeZDecodeErrorZ_get_ok(ptr); const res_hu_conv: Option_TypeZ = Option_TypeZ.constr_from_ptr(res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +428,9 @@ export class Result_COption_TypeZDecodeErrorZ_Err extends Result_COption_TypeZDe public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_COption_TypeZDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_COption_TypeZDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_CVec_CVec_u8ZZNoneZ.mts b/ts/structs/Result_CVec_CVec_u8ZZNoneZ.mts index c0f0aab6..64bd0d08 100644 --- a/ts/structs/Result_CVec_CVec_u8ZZNoneZ.mts +++ b/ts/structs/Result_CVec_CVec_u8ZZNoneZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_CVec_CVec_u8ZZNoneZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_CVec_CVec_u8ZZNoneZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_CVec_CVec_u8ZZNoneZ { + public static constr_from_ptr(ptr: bigint): Result_CVec_CVec_u8ZZNoneZ { if (bindings.CResult_CVec_CVec_u8ZZNoneZ_is_ok(ptr)) { return new Result_CVec_CVec_u8ZZNoneZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_CVec_CVec_u8ZZNoneZ extends CommonBase { * Creates a new CResult_CVec_CVec_u8ZZNoneZ in the success state. */ public static constructor_ok(o: Uint8Array[]): Result_CVec_CVec_u8ZZNoneZ { - const ret: number = bindings.CResult_CVec_CVec_u8ZZNoneZ_ok(bindings.encodeUint32Array(o != null ? o.map(o_conv_12 => bindings.encodeUint8Array(o_conv_12)) : null)); + const ret: bigint = bindings.CResult_CVec_CVec_u8ZZNoneZ_ok(bindings.encodeUint32Array(o != null ? o.map(o_conv_12 => bindings.encodeUint8Array(o_conv_12)) : null)); const ret_hu_conv: Result_CVec_CVec_u8ZZNoneZ = Result_CVec_CVec_u8ZZNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,7 +382,7 @@ export class Result_CVec_CVec_u8ZZNoneZ extends CommonBase { * Creates a new CResult_CVec_CVec_u8ZZNoneZ in the error state. */ public static constructor_err(): Result_CVec_CVec_u8ZZNoneZ { - const ret: number = bindings.CResult_CVec_CVec_u8ZZNoneZ_err(); + const ret: bigint = bindings.CResult_CVec_CVec_u8ZZNoneZ_err(); const ret_hu_conv: Result_CVec_CVec_u8ZZNoneZ = Result_CVec_CVec_u8ZZNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -395,8 +395,8 @@ export class Result_CVec_CVec_u8ZZNoneZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_CVec_CVec_u8ZZNoneZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_CVec_CVec_u8ZZNoneZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +405,7 @@ export class Result_CVec_CVec_u8ZZNoneZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_CVec_CVec_u8ZZNoneZ { - const ret: number = bindings.CResult_CVec_CVec_u8ZZNoneZ_clone(this.ptr); + const ret: bigint = bindings.CResult_CVec_CVec_u8ZZNoneZ_clone(this.ptr); const ret_hu_conv: Result_CVec_CVec_u8ZZNoneZ = Result_CVec_CVec_u8ZZNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,7 +415,7 @@ export class Result_CVec_CVec_u8ZZNoneZ_OK extends Result_CVec_CVec_u8ZZNoneZ { public res: Uint8Array[]; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); const res: number = bindings.CResult_CVec_CVec_u8ZZNoneZ_get_ok(ptr); const res_conv_12_len: number = bindings.getArrayLength(res); @@ -432,7 +432,7 @@ export class Result_CVec_CVec_u8ZZNoneZ_OK extends Result_CVec_CVec_u8ZZNoneZ { export class Result_CVec_CVec_u8ZZNoneZ_Err extends Result_CVec_CVec_u8ZZNoneZ { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); } } \ No newline at end of file diff --git a/ts/structs/Result_CVec_SignatureZNoneZ.mts b/ts/structs/Result_CVec_SignatureZNoneZ.mts index cbb9d2b8..6f14ad97 100644 --- a/ts/structs/Result_CVec_SignatureZNoneZ.mts +++ b/ts/structs/Result_CVec_SignatureZNoneZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_CVec_SignatureZNoneZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_CVec_SignatureZNoneZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_CVec_SignatureZNoneZ { + public static constr_from_ptr(ptr: bigint): Result_CVec_SignatureZNoneZ { if (bindings.CResult_CVec_SignatureZNoneZ_is_ok(ptr)) { return new Result_CVec_SignatureZNoneZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_CVec_SignatureZNoneZ extends CommonBase { * Creates a new CResult_CVec_SignatureZNoneZ in the success state. */ public static constructor_ok(o: Uint8Array[]): Result_CVec_SignatureZNoneZ { - const ret: number = bindings.CResult_CVec_SignatureZNoneZ_ok(bindings.encodeUint32Array(o != null ? o.map(o_conv_12 => bindings.encodeUint8Array(bindings.check_arr_len(o_conv_12, 64))) : null)); + const ret: bigint = bindings.CResult_CVec_SignatureZNoneZ_ok(bindings.encodeUint32Array(o != null ? o.map(o_conv_12 => bindings.encodeUint8Array(bindings.check_arr_len(o_conv_12, 64))) : null)); const ret_hu_conv: Result_CVec_SignatureZNoneZ = Result_CVec_SignatureZNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,7 +382,7 @@ export class Result_CVec_SignatureZNoneZ extends CommonBase { * Creates a new CResult_CVec_SignatureZNoneZ in the error state. */ public static constructor_err(): Result_CVec_SignatureZNoneZ { - const ret: number = bindings.CResult_CVec_SignatureZNoneZ_err(); + const ret: bigint = bindings.CResult_CVec_SignatureZNoneZ_err(); const ret_hu_conv: Result_CVec_SignatureZNoneZ = Result_CVec_SignatureZNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -395,8 +395,8 @@ export class Result_CVec_SignatureZNoneZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_CVec_SignatureZNoneZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_CVec_SignatureZNoneZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +405,7 @@ export class Result_CVec_SignatureZNoneZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_CVec_SignatureZNoneZ { - const ret: number = bindings.CResult_CVec_SignatureZNoneZ_clone(this.ptr); + const ret: bigint = bindings.CResult_CVec_SignatureZNoneZ_clone(this.ptr); const ret_hu_conv: Result_CVec_SignatureZNoneZ = Result_CVec_SignatureZNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,7 +415,7 @@ export class Result_CVec_SignatureZNoneZ_OK extends Result_CVec_SignatureZNoneZ public res: Uint8Array[]; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); const res: number = bindings.CResult_CVec_SignatureZNoneZ_get_ok(ptr); const res_conv_12_len: number = bindings.getArrayLength(res); @@ -432,7 +432,7 @@ export class Result_CVec_SignatureZNoneZ_OK extends Result_CVec_SignatureZNoneZ export class Result_CVec_SignatureZNoneZ_Err extends Result_CVec_SignatureZNoneZ { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); } } \ No newline at end of file diff --git a/ts/structs/Result_CVec_u8ZPeerHandleErrorZ.mts b/ts/structs/Result_CVec_u8ZPeerHandleErrorZ.mts index 11630b34..275b1a31 100644 --- a/ts/structs/Result_CVec_u8ZPeerHandleErrorZ.mts +++ b/ts/structs/Result_CVec_u8ZPeerHandleErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_CVec_u8ZPeerHandleErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_CVec_u8ZPeerHandleErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_CVec_u8ZPeerHandleErrorZ { + public static constr_from_ptr(ptr: bigint): Result_CVec_u8ZPeerHandleErrorZ { if (bindings.CResult_CVec_u8ZPeerHandleErrorZ_is_ok(ptr)) { return new Result_CVec_u8ZPeerHandleErrorZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_CVec_u8ZPeerHandleErrorZ extends CommonBase { * Creates a new CResult_CVec_u8ZPeerHandleErrorZ in the success state. */ public static constructor_ok(o: Uint8Array): Result_CVec_u8ZPeerHandleErrorZ { - const ret: number = bindings.CResult_CVec_u8ZPeerHandleErrorZ_ok(bindings.encodeUint8Array(o)); + const ret: bigint = bindings.CResult_CVec_u8ZPeerHandleErrorZ_ok(bindings.encodeUint8Array(o)); const ret_hu_conv: Result_CVec_u8ZPeerHandleErrorZ = Result_CVec_u8ZPeerHandleErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,8 +382,9 @@ export class Result_CVec_u8ZPeerHandleErrorZ extends CommonBase { * Creates a new CResult_CVec_u8ZPeerHandleErrorZ in the error state. */ public static constructor_err(e: PeerHandleError): Result_CVec_u8ZPeerHandleErrorZ { - const ret: number = bindings.CResult_CVec_u8ZPeerHandleErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_CVec_u8ZPeerHandleErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_CVec_u8ZPeerHandleErrorZ = Result_CVec_u8ZPeerHandleErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +396,8 @@ export class Result_CVec_u8ZPeerHandleErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_CVec_u8ZPeerHandleErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_CVec_u8ZPeerHandleErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +406,7 @@ export class Result_CVec_u8ZPeerHandleErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_CVec_u8ZPeerHandleErrorZ { - const ret: number = bindings.CResult_CVec_u8ZPeerHandleErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_CVec_u8ZPeerHandleErrorZ_clone(this.ptr); const ret_hu_conv: Result_CVec_u8ZPeerHandleErrorZ = Result_CVec_u8ZPeerHandleErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,7 +416,7 @@ export class Result_CVec_u8ZPeerHandleErrorZ_OK extends Result_CVec_u8ZPeerHandl public res: Uint8Array; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); const res: number = bindings.CResult_CVec_u8ZPeerHandleErrorZ_get_ok(ptr); const res_conv: Uint8Array = bindings.decodeUint8Array(res); @@ -426,9 +427,9 @@ export class Result_CVec_u8ZPeerHandleErrorZ_Err extends Result_CVec_u8ZPeerHand public err: PeerHandleError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_CVec_u8ZPeerHandleErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_CVec_u8ZPeerHandleErrorZ_get_err(ptr); const err_hu_conv: PeerHandleError = new PeerHandleError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_ChannelAnnouncementDecodeErrorZ.mts b/ts/structs/Result_ChannelAnnouncementDecodeErrorZ.mts index 98caae92..83677f1a 100644 --- a/ts/structs/Result_ChannelAnnouncementDecodeErrorZ.mts +++ b/ts/structs/Result_ChannelAnnouncementDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_ChannelAnnouncementDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_ChannelAnnouncementDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_ChannelAnnouncementDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_ChannelAnnouncementDecodeErrorZ { if (bindings.CResult_ChannelAnnouncementDecodeErrorZ_is_ok(ptr)) { return new Result_ChannelAnnouncementDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_ChannelAnnouncementDecodeErrorZ extends CommonBase { * Creates a new CResult_ChannelAnnouncementDecodeErrorZ in the success state. */ public static constructor_ok(o: ChannelAnnouncement): Result_ChannelAnnouncementDecodeErrorZ { - const ret: number = bindings.CResult_ChannelAnnouncementDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_ChannelAnnouncementDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_ChannelAnnouncementDecodeErrorZ = Result_ChannelAnnouncementDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_ChannelAnnouncementDecodeErrorZ extends CommonBase { * Creates a new CResult_ChannelAnnouncementDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_ChannelAnnouncementDecodeErrorZ { - const ret: number = bindings.CResult_ChannelAnnouncementDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_ChannelAnnouncementDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_ChannelAnnouncementDecodeErrorZ = Result_ChannelAnnouncementDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_ChannelAnnouncementDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_ChannelAnnouncementDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_ChannelAnnouncementDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_ChannelAnnouncementDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_ChannelAnnouncementDecodeErrorZ { - const ret: number = bindings.CResult_ChannelAnnouncementDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_ChannelAnnouncementDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_ChannelAnnouncementDecodeErrorZ = Result_ChannelAnnouncementDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_ChannelAnnouncementDecodeErrorZ_OK extends Result_ChannelAnn public res: ChannelAnnouncement; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_ChannelAnnouncementDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_ChannelAnnouncementDecodeErrorZ_get_ok(ptr); const res_hu_conv: ChannelAnnouncement = new ChannelAnnouncement(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_ChannelAnnouncementDecodeErrorZ_Err extends Result_ChannelAn public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_ChannelAnnouncementDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_ChannelAnnouncementDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_ChannelConfigDecodeErrorZ.mts b/ts/structs/Result_ChannelConfigDecodeErrorZ.mts index 7bb30237..4fbf931c 100644 --- a/ts/structs/Result_ChannelConfigDecodeErrorZ.mts +++ b/ts/structs/Result_ChannelConfigDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_ChannelConfigDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_ChannelConfigDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_ChannelConfigDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_ChannelConfigDecodeErrorZ { if (bindings.CResult_ChannelConfigDecodeErrorZ_is_ok(ptr)) { return new Result_ChannelConfigDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_ChannelConfigDecodeErrorZ extends CommonBase { * Creates a new CResult_ChannelConfigDecodeErrorZ in the success state. */ public static constructor_ok(o: ChannelConfig): Result_ChannelConfigDecodeErrorZ { - const ret: number = bindings.CResult_ChannelConfigDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_ChannelConfigDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_ChannelConfigDecodeErrorZ = Result_ChannelConfigDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_ChannelConfigDecodeErrorZ extends CommonBase { * Creates a new CResult_ChannelConfigDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_ChannelConfigDecodeErrorZ { - const ret: number = bindings.CResult_ChannelConfigDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_ChannelConfigDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_ChannelConfigDecodeErrorZ = Result_ChannelConfigDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_ChannelConfigDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_ChannelConfigDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_ChannelConfigDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_ChannelConfigDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_ChannelConfigDecodeErrorZ { - const ret: number = bindings.CResult_ChannelConfigDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_ChannelConfigDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_ChannelConfigDecodeErrorZ = Result_ChannelConfigDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_ChannelConfigDecodeErrorZ_OK extends Result_ChannelConfigDec public res: ChannelConfig; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_ChannelConfigDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_ChannelConfigDecodeErrorZ_get_ok(ptr); const res_hu_conv: ChannelConfig = new ChannelConfig(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_ChannelConfigDecodeErrorZ_Err extends Result_ChannelConfigDe public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_ChannelConfigDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_ChannelConfigDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_ChannelCounterpartyDecodeErrorZ.mts b/ts/structs/Result_ChannelCounterpartyDecodeErrorZ.mts index 9348c969..eae7aee7 100644 --- a/ts/structs/Result_ChannelCounterpartyDecodeErrorZ.mts +++ b/ts/structs/Result_ChannelCounterpartyDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_ChannelCounterpartyDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_ChannelCounterpartyDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_ChannelCounterpartyDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_ChannelCounterpartyDecodeErrorZ { if (bindings.CResult_ChannelCounterpartyDecodeErrorZ_is_ok(ptr)) { return new Result_ChannelCounterpartyDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_ChannelCounterpartyDecodeErrorZ extends CommonBase { * Creates a new CResult_ChannelCounterpartyDecodeErrorZ in the success state. */ public static constructor_ok(o: ChannelCounterparty): Result_ChannelCounterpartyDecodeErrorZ { - const ret: number = bindings.CResult_ChannelCounterpartyDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_ChannelCounterpartyDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_ChannelCounterpartyDecodeErrorZ = Result_ChannelCounterpartyDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_ChannelCounterpartyDecodeErrorZ extends CommonBase { * Creates a new CResult_ChannelCounterpartyDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_ChannelCounterpartyDecodeErrorZ { - const ret: number = bindings.CResult_ChannelCounterpartyDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_ChannelCounterpartyDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_ChannelCounterpartyDecodeErrorZ = Result_ChannelCounterpartyDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_ChannelCounterpartyDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_ChannelCounterpartyDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_ChannelCounterpartyDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_ChannelCounterpartyDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_ChannelCounterpartyDecodeErrorZ { - const ret: number = bindings.CResult_ChannelCounterpartyDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_ChannelCounterpartyDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_ChannelCounterpartyDecodeErrorZ = Result_ChannelCounterpartyDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_ChannelCounterpartyDecodeErrorZ_OK extends Result_ChannelCou public res: ChannelCounterparty; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_ChannelCounterpartyDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_ChannelCounterpartyDecodeErrorZ_get_ok(ptr); const res_hu_conv: ChannelCounterparty = new ChannelCounterparty(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_ChannelCounterpartyDecodeErrorZ_Err extends Result_ChannelCo public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_ChannelCounterpartyDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_ChannelCounterpartyDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_ChannelDetailsDecodeErrorZ.mts b/ts/structs/Result_ChannelDetailsDecodeErrorZ.mts index 9c96fc4a..94a94688 100644 --- a/ts/structs/Result_ChannelDetailsDecodeErrorZ.mts +++ b/ts/structs/Result_ChannelDetailsDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_ChannelDetailsDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_ChannelDetailsDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_ChannelDetailsDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_ChannelDetailsDecodeErrorZ { if (bindings.CResult_ChannelDetailsDecodeErrorZ_is_ok(ptr)) { return new Result_ChannelDetailsDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_ChannelDetailsDecodeErrorZ extends CommonBase { * Creates a new CResult_ChannelDetailsDecodeErrorZ in the success state. */ public static constructor_ok(o: ChannelDetails): Result_ChannelDetailsDecodeErrorZ { - const ret: number = bindings.CResult_ChannelDetailsDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_ChannelDetailsDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_ChannelDetailsDecodeErrorZ = Result_ChannelDetailsDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_ChannelDetailsDecodeErrorZ extends CommonBase { * Creates a new CResult_ChannelDetailsDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_ChannelDetailsDecodeErrorZ { - const ret: number = bindings.CResult_ChannelDetailsDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_ChannelDetailsDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_ChannelDetailsDecodeErrorZ = Result_ChannelDetailsDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_ChannelDetailsDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_ChannelDetailsDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_ChannelDetailsDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_ChannelDetailsDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_ChannelDetailsDecodeErrorZ { - const ret: number = bindings.CResult_ChannelDetailsDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_ChannelDetailsDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_ChannelDetailsDecodeErrorZ = Result_ChannelDetailsDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_ChannelDetailsDecodeErrorZ_OK extends Result_ChannelDetailsD public res: ChannelDetails; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_ChannelDetailsDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_ChannelDetailsDecodeErrorZ_get_ok(ptr); const res_hu_conv: ChannelDetails = new ChannelDetails(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_ChannelDetailsDecodeErrorZ_Err extends Result_ChannelDetails public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_ChannelDetailsDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_ChannelDetailsDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_ChannelFeaturesDecodeErrorZ.mts b/ts/structs/Result_ChannelFeaturesDecodeErrorZ.mts index 801e88fe..a52c2b53 100644 --- a/ts/structs/Result_ChannelFeaturesDecodeErrorZ.mts +++ b/ts/structs/Result_ChannelFeaturesDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_ChannelFeaturesDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_ChannelFeaturesDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_ChannelFeaturesDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_ChannelFeaturesDecodeErrorZ { if (bindings.CResult_ChannelFeaturesDecodeErrorZ_is_ok(ptr)) { return new Result_ChannelFeaturesDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_ChannelFeaturesDecodeErrorZ extends CommonBase { * Creates a new CResult_ChannelFeaturesDecodeErrorZ in the success state. */ public static constructor_ok(o: ChannelFeatures): Result_ChannelFeaturesDecodeErrorZ { - const ret: number = bindings.CResult_ChannelFeaturesDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_ChannelFeaturesDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_ChannelFeaturesDecodeErrorZ = Result_ChannelFeaturesDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_ChannelFeaturesDecodeErrorZ extends CommonBase { * Creates a new CResult_ChannelFeaturesDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_ChannelFeaturesDecodeErrorZ { - const ret: number = bindings.CResult_ChannelFeaturesDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_ChannelFeaturesDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_ChannelFeaturesDecodeErrorZ = Result_ChannelFeaturesDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_ChannelFeaturesDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_ChannelFeaturesDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_ChannelFeaturesDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_ChannelFeaturesDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_ChannelFeaturesDecodeErrorZ { - const ret: number = bindings.CResult_ChannelFeaturesDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_ChannelFeaturesDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_ChannelFeaturesDecodeErrorZ = Result_ChannelFeaturesDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_ChannelFeaturesDecodeErrorZ_OK extends Result_ChannelFeature public res: ChannelFeatures; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_ChannelFeaturesDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_ChannelFeaturesDecodeErrorZ_get_ok(ptr); const res_hu_conv: ChannelFeatures = new ChannelFeatures(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_ChannelFeaturesDecodeErrorZ_Err extends Result_ChannelFeatur public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_ChannelFeaturesDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_ChannelFeaturesDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_ChannelInfoDecodeErrorZ.mts b/ts/structs/Result_ChannelInfoDecodeErrorZ.mts index 6e0b0882..112d311d 100644 --- a/ts/structs/Result_ChannelInfoDecodeErrorZ.mts +++ b/ts/structs/Result_ChannelInfoDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_ChannelInfoDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_ChannelInfoDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_ChannelInfoDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_ChannelInfoDecodeErrorZ { if (bindings.CResult_ChannelInfoDecodeErrorZ_is_ok(ptr)) { return new Result_ChannelInfoDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_ChannelInfoDecodeErrorZ extends CommonBase { * Creates a new CResult_ChannelInfoDecodeErrorZ in the success state. */ public static constructor_ok(o: ChannelInfo): Result_ChannelInfoDecodeErrorZ { - const ret: number = bindings.CResult_ChannelInfoDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_ChannelInfoDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_ChannelInfoDecodeErrorZ = Result_ChannelInfoDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_ChannelInfoDecodeErrorZ extends CommonBase { * Creates a new CResult_ChannelInfoDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_ChannelInfoDecodeErrorZ { - const ret: number = bindings.CResult_ChannelInfoDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_ChannelInfoDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_ChannelInfoDecodeErrorZ = Result_ChannelInfoDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_ChannelInfoDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_ChannelInfoDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_ChannelInfoDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_ChannelInfoDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_ChannelInfoDecodeErrorZ { - const ret: number = bindings.CResult_ChannelInfoDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_ChannelInfoDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_ChannelInfoDecodeErrorZ = Result_ChannelInfoDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_ChannelInfoDecodeErrorZ_OK extends Result_ChannelInfoDecodeE public res: ChannelInfo; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_ChannelInfoDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_ChannelInfoDecodeErrorZ_get_ok(ptr); const res_hu_conv: ChannelInfo = new ChannelInfo(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_ChannelInfoDecodeErrorZ_Err extends Result_ChannelInfoDecode public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_ChannelInfoDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_ChannelInfoDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_ChannelMonitorUpdateDecodeErrorZ.mts b/ts/structs/Result_ChannelMonitorUpdateDecodeErrorZ.mts index 6d4314a9..26eb2e9d 100644 --- a/ts/structs/Result_ChannelMonitorUpdateDecodeErrorZ.mts +++ b/ts/structs/Result_ChannelMonitorUpdateDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_ChannelMonitorUpdateDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_ChannelMonitorUpdateDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_ChannelMonitorUpdateDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_ChannelMonitorUpdateDecodeErrorZ { if (bindings.CResult_ChannelMonitorUpdateDecodeErrorZ_is_ok(ptr)) { return new Result_ChannelMonitorUpdateDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_ChannelMonitorUpdateDecodeErrorZ extends CommonBase { * Creates a new CResult_ChannelMonitorUpdateDecodeErrorZ in the success state. */ public static constructor_ok(o: ChannelMonitorUpdate): Result_ChannelMonitorUpdateDecodeErrorZ { - const ret: number = bindings.CResult_ChannelMonitorUpdateDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_ChannelMonitorUpdateDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_ChannelMonitorUpdateDecodeErrorZ = Result_ChannelMonitorUpdateDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_ChannelMonitorUpdateDecodeErrorZ extends CommonBase { * Creates a new CResult_ChannelMonitorUpdateDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_ChannelMonitorUpdateDecodeErrorZ { - const ret: number = bindings.CResult_ChannelMonitorUpdateDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_ChannelMonitorUpdateDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_ChannelMonitorUpdateDecodeErrorZ = Result_ChannelMonitorUpdateDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_ChannelMonitorUpdateDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_ChannelMonitorUpdateDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_ChannelMonitorUpdateDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_ChannelMonitorUpdateDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_ChannelMonitorUpdateDecodeErrorZ { - const ret: number = bindings.CResult_ChannelMonitorUpdateDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_ChannelMonitorUpdateDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_ChannelMonitorUpdateDecodeErrorZ = Result_ChannelMonitorUpdateDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_ChannelMonitorUpdateDecodeErrorZ_OK extends Result_ChannelMo public res: ChannelMonitorUpdate; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_ChannelMonitorUpdateDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_ChannelMonitorUpdateDecodeErrorZ_get_ok(ptr); const res_hu_conv: ChannelMonitorUpdate = new ChannelMonitorUpdate(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_ChannelMonitorUpdateDecodeErrorZ_Err extends Result_ChannelM public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_ChannelMonitorUpdateDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_ChannelMonitorUpdateDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_ChannelPublicKeysDecodeErrorZ.mts b/ts/structs/Result_ChannelPublicKeysDecodeErrorZ.mts index 19252c60..e467cbb9 100644 --- a/ts/structs/Result_ChannelPublicKeysDecodeErrorZ.mts +++ b/ts/structs/Result_ChannelPublicKeysDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_ChannelPublicKeysDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_ChannelPublicKeysDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_ChannelPublicKeysDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_ChannelPublicKeysDecodeErrorZ { if (bindings.CResult_ChannelPublicKeysDecodeErrorZ_is_ok(ptr)) { return new Result_ChannelPublicKeysDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_ChannelPublicKeysDecodeErrorZ extends CommonBase { * Creates a new CResult_ChannelPublicKeysDecodeErrorZ in the success state. */ public static constructor_ok(o: ChannelPublicKeys): Result_ChannelPublicKeysDecodeErrorZ { - const ret: number = bindings.CResult_ChannelPublicKeysDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_ChannelPublicKeysDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_ChannelPublicKeysDecodeErrorZ = Result_ChannelPublicKeysDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_ChannelPublicKeysDecodeErrorZ extends CommonBase { * Creates a new CResult_ChannelPublicKeysDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_ChannelPublicKeysDecodeErrorZ { - const ret: number = bindings.CResult_ChannelPublicKeysDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_ChannelPublicKeysDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_ChannelPublicKeysDecodeErrorZ = Result_ChannelPublicKeysDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_ChannelPublicKeysDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_ChannelPublicKeysDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_ChannelPublicKeysDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_ChannelPublicKeysDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_ChannelPublicKeysDecodeErrorZ { - const ret: number = bindings.CResult_ChannelPublicKeysDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_ChannelPublicKeysDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_ChannelPublicKeysDecodeErrorZ = Result_ChannelPublicKeysDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_ChannelPublicKeysDecodeErrorZ_OK extends Result_ChannelPubli public res: ChannelPublicKeys; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_ChannelPublicKeysDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_ChannelPublicKeysDecodeErrorZ_get_ok(ptr); const res_hu_conv: ChannelPublicKeys = new ChannelPublicKeys(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_ChannelPublicKeysDecodeErrorZ_Err extends Result_ChannelPubl public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_ChannelPublicKeysDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_ChannelPublicKeysDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_ChannelReadyDecodeErrorZ.mts b/ts/structs/Result_ChannelReadyDecodeErrorZ.mts index 74fb6dec..f6c76df7 100644 --- a/ts/structs/Result_ChannelReadyDecodeErrorZ.mts +++ b/ts/structs/Result_ChannelReadyDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_ChannelReadyDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_ChannelReadyDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_ChannelReadyDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_ChannelReadyDecodeErrorZ { if (bindings.CResult_ChannelReadyDecodeErrorZ_is_ok(ptr)) { return new Result_ChannelReadyDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_ChannelReadyDecodeErrorZ extends CommonBase { * Creates a new CResult_ChannelReadyDecodeErrorZ in the success state. */ public static constructor_ok(o: ChannelReady): Result_ChannelReadyDecodeErrorZ { - const ret: number = bindings.CResult_ChannelReadyDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_ChannelReadyDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_ChannelReadyDecodeErrorZ = Result_ChannelReadyDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_ChannelReadyDecodeErrorZ extends CommonBase { * Creates a new CResult_ChannelReadyDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_ChannelReadyDecodeErrorZ { - const ret: number = bindings.CResult_ChannelReadyDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_ChannelReadyDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_ChannelReadyDecodeErrorZ = Result_ChannelReadyDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_ChannelReadyDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_ChannelReadyDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_ChannelReadyDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_ChannelReadyDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_ChannelReadyDecodeErrorZ { - const ret: number = bindings.CResult_ChannelReadyDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_ChannelReadyDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_ChannelReadyDecodeErrorZ = Result_ChannelReadyDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_ChannelReadyDecodeErrorZ_OK extends Result_ChannelReadyDecod public res: ChannelReady; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_ChannelReadyDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_ChannelReadyDecodeErrorZ_get_ok(ptr); const res_hu_conv: ChannelReady = new ChannelReady(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_ChannelReadyDecodeErrorZ_Err extends Result_ChannelReadyDeco public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_ChannelReadyDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_ChannelReadyDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_ChannelReestablishDecodeErrorZ.mts b/ts/structs/Result_ChannelReestablishDecodeErrorZ.mts index 52b8d6bb..e2e53392 100644 --- a/ts/structs/Result_ChannelReestablishDecodeErrorZ.mts +++ b/ts/structs/Result_ChannelReestablishDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_ChannelReestablishDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_ChannelReestablishDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_ChannelReestablishDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_ChannelReestablishDecodeErrorZ { if (bindings.CResult_ChannelReestablishDecodeErrorZ_is_ok(ptr)) { return new Result_ChannelReestablishDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_ChannelReestablishDecodeErrorZ extends CommonBase { * Creates a new CResult_ChannelReestablishDecodeErrorZ in the success state. */ public static constructor_ok(o: ChannelReestablish): Result_ChannelReestablishDecodeErrorZ { - const ret: number = bindings.CResult_ChannelReestablishDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_ChannelReestablishDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_ChannelReestablishDecodeErrorZ = Result_ChannelReestablishDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_ChannelReestablishDecodeErrorZ extends CommonBase { * Creates a new CResult_ChannelReestablishDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_ChannelReestablishDecodeErrorZ { - const ret: number = bindings.CResult_ChannelReestablishDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_ChannelReestablishDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_ChannelReestablishDecodeErrorZ = Result_ChannelReestablishDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_ChannelReestablishDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_ChannelReestablishDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_ChannelReestablishDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_ChannelReestablishDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_ChannelReestablishDecodeErrorZ { - const ret: number = bindings.CResult_ChannelReestablishDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_ChannelReestablishDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_ChannelReestablishDecodeErrorZ = Result_ChannelReestablishDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_ChannelReestablishDecodeErrorZ_OK extends Result_ChannelRees public res: ChannelReestablish; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_ChannelReestablishDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_ChannelReestablishDecodeErrorZ_get_ok(ptr); const res_hu_conv: ChannelReestablish = new ChannelReestablish(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_ChannelReestablishDecodeErrorZ_Err extends Result_ChannelRee public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_ChannelReestablishDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_ChannelReestablishDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_ChannelTransactionParametersDecodeErrorZ.mts b/ts/structs/Result_ChannelTransactionParametersDecodeErrorZ.mts index 5f419155..6a069ce3 100644 --- a/ts/structs/Result_ChannelTransactionParametersDecodeErrorZ.mts +++ b/ts/structs/Result_ChannelTransactionParametersDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_ChannelTransactionParametersDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_ChannelTransactionParametersDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_ChannelTransactionParametersDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_ChannelTransactionParametersDecodeErrorZ { if (bindings.CResult_ChannelTransactionParametersDecodeErrorZ_is_ok(ptr)) { return new Result_ChannelTransactionParametersDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_ChannelTransactionParametersDecodeErrorZ extends CommonBase * Creates a new CResult_ChannelTransactionParametersDecodeErrorZ in the success state. */ public static constructor_ok(o: ChannelTransactionParameters): Result_ChannelTransactionParametersDecodeErrorZ { - const ret: number = bindings.CResult_ChannelTransactionParametersDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_ChannelTransactionParametersDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_ChannelTransactionParametersDecodeErrorZ = Result_ChannelTransactionParametersDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_ChannelTransactionParametersDecodeErrorZ extends CommonBase * Creates a new CResult_ChannelTransactionParametersDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_ChannelTransactionParametersDecodeErrorZ { - const ret: number = bindings.CResult_ChannelTransactionParametersDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_ChannelTransactionParametersDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_ChannelTransactionParametersDecodeErrorZ = Result_ChannelTransactionParametersDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_ChannelTransactionParametersDecodeErrorZ extends CommonBase return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_ChannelTransactionParametersDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_ChannelTransactionParametersDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_ChannelTransactionParametersDecodeErrorZ extends CommonBase * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_ChannelTransactionParametersDecodeErrorZ { - const ret: number = bindings.CResult_ChannelTransactionParametersDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_ChannelTransactionParametersDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_ChannelTransactionParametersDecodeErrorZ = Result_ChannelTransactionParametersDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_ChannelTransactionParametersDecodeErrorZ_OK extends Result_C public res: ChannelTransactionParameters; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_ChannelTransactionParametersDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_ChannelTransactionParametersDecodeErrorZ_get_ok(ptr); const res_hu_conv: ChannelTransactionParameters = new ChannelTransactionParameters(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_ChannelTransactionParametersDecodeErrorZ_Err extends Result_ public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_ChannelTransactionParametersDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_ChannelTransactionParametersDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_ChannelTypeFeaturesDecodeErrorZ.mts b/ts/structs/Result_ChannelTypeFeaturesDecodeErrorZ.mts index 8a9c0be0..7ba036f8 100644 --- a/ts/structs/Result_ChannelTypeFeaturesDecodeErrorZ.mts +++ b/ts/structs/Result_ChannelTypeFeaturesDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_ChannelTypeFeaturesDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_ChannelTypeFeaturesDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_ChannelTypeFeaturesDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_ChannelTypeFeaturesDecodeErrorZ { if (bindings.CResult_ChannelTypeFeaturesDecodeErrorZ_is_ok(ptr)) { return new Result_ChannelTypeFeaturesDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_ChannelTypeFeaturesDecodeErrorZ extends CommonBase { * Creates a new CResult_ChannelTypeFeaturesDecodeErrorZ in the success state. */ public static constructor_ok(o: ChannelTypeFeatures): Result_ChannelTypeFeaturesDecodeErrorZ { - const ret: number = bindings.CResult_ChannelTypeFeaturesDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_ChannelTypeFeaturesDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_ChannelTypeFeaturesDecodeErrorZ = Result_ChannelTypeFeaturesDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_ChannelTypeFeaturesDecodeErrorZ extends CommonBase { * Creates a new CResult_ChannelTypeFeaturesDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_ChannelTypeFeaturesDecodeErrorZ { - const ret: number = bindings.CResult_ChannelTypeFeaturesDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_ChannelTypeFeaturesDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_ChannelTypeFeaturesDecodeErrorZ = Result_ChannelTypeFeaturesDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_ChannelTypeFeaturesDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_ChannelTypeFeaturesDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_ChannelTypeFeaturesDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_ChannelTypeFeaturesDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_ChannelTypeFeaturesDecodeErrorZ { - const ret: number = bindings.CResult_ChannelTypeFeaturesDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_ChannelTypeFeaturesDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_ChannelTypeFeaturesDecodeErrorZ = Result_ChannelTypeFeaturesDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_ChannelTypeFeaturesDecodeErrorZ_OK extends Result_ChannelTyp public res: ChannelTypeFeatures; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_ChannelTypeFeaturesDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_ChannelTypeFeaturesDecodeErrorZ_get_ok(ptr); const res_hu_conv: ChannelTypeFeatures = new ChannelTypeFeatures(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_ChannelTypeFeaturesDecodeErrorZ_Err extends Result_ChannelTy public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_ChannelTypeFeaturesDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_ChannelTypeFeaturesDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_ChannelUpdateDecodeErrorZ.mts b/ts/structs/Result_ChannelUpdateDecodeErrorZ.mts index daa0538b..2614a2ea 100644 --- a/ts/structs/Result_ChannelUpdateDecodeErrorZ.mts +++ b/ts/structs/Result_ChannelUpdateDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_ChannelUpdateDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_ChannelUpdateDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_ChannelUpdateDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_ChannelUpdateDecodeErrorZ { if (bindings.CResult_ChannelUpdateDecodeErrorZ_is_ok(ptr)) { return new Result_ChannelUpdateDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_ChannelUpdateDecodeErrorZ extends CommonBase { * Creates a new CResult_ChannelUpdateDecodeErrorZ in the success state. */ public static constructor_ok(o: ChannelUpdate): Result_ChannelUpdateDecodeErrorZ { - const ret: number = bindings.CResult_ChannelUpdateDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_ChannelUpdateDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_ChannelUpdateDecodeErrorZ = Result_ChannelUpdateDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_ChannelUpdateDecodeErrorZ extends CommonBase { * Creates a new CResult_ChannelUpdateDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_ChannelUpdateDecodeErrorZ { - const ret: number = bindings.CResult_ChannelUpdateDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_ChannelUpdateDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_ChannelUpdateDecodeErrorZ = Result_ChannelUpdateDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_ChannelUpdateDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_ChannelUpdateDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_ChannelUpdateDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_ChannelUpdateDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_ChannelUpdateDecodeErrorZ { - const ret: number = bindings.CResult_ChannelUpdateDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_ChannelUpdateDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_ChannelUpdateDecodeErrorZ = Result_ChannelUpdateDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_ChannelUpdateDecodeErrorZ_OK extends Result_ChannelUpdateDec public res: ChannelUpdate; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_ChannelUpdateDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_ChannelUpdateDecodeErrorZ_get_ok(ptr); const res_hu_conv: ChannelUpdate = new ChannelUpdate(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_ChannelUpdateDecodeErrorZ_Err extends Result_ChannelUpdateDe public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_ChannelUpdateDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_ChannelUpdateDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_ChannelUpdateInfoDecodeErrorZ.mts b/ts/structs/Result_ChannelUpdateInfoDecodeErrorZ.mts index 7558aa73..63ff7fac 100644 --- a/ts/structs/Result_ChannelUpdateInfoDecodeErrorZ.mts +++ b/ts/structs/Result_ChannelUpdateInfoDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_ChannelUpdateInfoDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_ChannelUpdateInfoDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_ChannelUpdateInfoDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_ChannelUpdateInfoDecodeErrorZ { if (bindings.CResult_ChannelUpdateInfoDecodeErrorZ_is_ok(ptr)) { return new Result_ChannelUpdateInfoDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_ChannelUpdateInfoDecodeErrorZ extends CommonBase { * Creates a new CResult_ChannelUpdateInfoDecodeErrorZ in the success state. */ public static constructor_ok(o: ChannelUpdateInfo): Result_ChannelUpdateInfoDecodeErrorZ { - const ret: number = bindings.CResult_ChannelUpdateInfoDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_ChannelUpdateInfoDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_ChannelUpdateInfoDecodeErrorZ = Result_ChannelUpdateInfoDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_ChannelUpdateInfoDecodeErrorZ extends CommonBase { * Creates a new CResult_ChannelUpdateInfoDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_ChannelUpdateInfoDecodeErrorZ { - const ret: number = bindings.CResult_ChannelUpdateInfoDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_ChannelUpdateInfoDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_ChannelUpdateInfoDecodeErrorZ = Result_ChannelUpdateInfoDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_ChannelUpdateInfoDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_ChannelUpdateInfoDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_ChannelUpdateInfoDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_ChannelUpdateInfoDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_ChannelUpdateInfoDecodeErrorZ { - const ret: number = bindings.CResult_ChannelUpdateInfoDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_ChannelUpdateInfoDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_ChannelUpdateInfoDecodeErrorZ = Result_ChannelUpdateInfoDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_ChannelUpdateInfoDecodeErrorZ_OK extends Result_ChannelUpdat public res: ChannelUpdateInfo; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_ChannelUpdateInfoDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_ChannelUpdateInfoDecodeErrorZ_get_ok(ptr); const res_hu_conv: ChannelUpdateInfo = new ChannelUpdateInfo(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_ChannelUpdateInfoDecodeErrorZ_Err extends Result_ChannelUpda public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_ChannelUpdateInfoDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_ChannelUpdateInfoDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_ClosingSignedDecodeErrorZ.mts b/ts/structs/Result_ClosingSignedDecodeErrorZ.mts index be8b3cdd..ea241ebc 100644 --- a/ts/structs/Result_ClosingSignedDecodeErrorZ.mts +++ b/ts/structs/Result_ClosingSignedDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_ClosingSignedDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_ClosingSignedDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_ClosingSignedDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_ClosingSignedDecodeErrorZ { if (bindings.CResult_ClosingSignedDecodeErrorZ_is_ok(ptr)) { return new Result_ClosingSignedDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_ClosingSignedDecodeErrorZ extends CommonBase { * Creates a new CResult_ClosingSignedDecodeErrorZ in the success state. */ public static constructor_ok(o: ClosingSigned): Result_ClosingSignedDecodeErrorZ { - const ret: number = bindings.CResult_ClosingSignedDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_ClosingSignedDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_ClosingSignedDecodeErrorZ = Result_ClosingSignedDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_ClosingSignedDecodeErrorZ extends CommonBase { * Creates a new CResult_ClosingSignedDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_ClosingSignedDecodeErrorZ { - const ret: number = bindings.CResult_ClosingSignedDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_ClosingSignedDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_ClosingSignedDecodeErrorZ = Result_ClosingSignedDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_ClosingSignedDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_ClosingSignedDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_ClosingSignedDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_ClosingSignedDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_ClosingSignedDecodeErrorZ { - const ret: number = bindings.CResult_ClosingSignedDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_ClosingSignedDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_ClosingSignedDecodeErrorZ = Result_ClosingSignedDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_ClosingSignedDecodeErrorZ_OK extends Result_ClosingSignedDec public res: ClosingSigned; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_ClosingSignedDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_ClosingSignedDecodeErrorZ_get_ok(ptr); const res_hu_conv: ClosingSigned = new ClosingSigned(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_ClosingSignedDecodeErrorZ_Err extends Result_ClosingSignedDe public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_ClosingSignedDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_ClosingSignedDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_ClosingSignedFeeRangeDecodeErrorZ.mts b/ts/structs/Result_ClosingSignedFeeRangeDecodeErrorZ.mts index 412928c1..d4d7bc42 100644 --- a/ts/structs/Result_ClosingSignedFeeRangeDecodeErrorZ.mts +++ b/ts/structs/Result_ClosingSignedFeeRangeDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_ClosingSignedFeeRangeDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_ClosingSignedFeeRangeDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_ClosingSignedFeeRangeDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_ClosingSignedFeeRangeDecodeErrorZ { if (bindings.CResult_ClosingSignedFeeRangeDecodeErrorZ_is_ok(ptr)) { return new Result_ClosingSignedFeeRangeDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_ClosingSignedFeeRangeDecodeErrorZ extends CommonBase { * Creates a new CResult_ClosingSignedFeeRangeDecodeErrorZ in the success state. */ public static constructor_ok(o: ClosingSignedFeeRange): Result_ClosingSignedFeeRangeDecodeErrorZ { - const ret: number = bindings.CResult_ClosingSignedFeeRangeDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_ClosingSignedFeeRangeDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_ClosingSignedFeeRangeDecodeErrorZ = Result_ClosingSignedFeeRangeDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_ClosingSignedFeeRangeDecodeErrorZ extends CommonBase { * Creates a new CResult_ClosingSignedFeeRangeDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_ClosingSignedFeeRangeDecodeErrorZ { - const ret: number = bindings.CResult_ClosingSignedFeeRangeDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_ClosingSignedFeeRangeDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_ClosingSignedFeeRangeDecodeErrorZ = Result_ClosingSignedFeeRangeDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_ClosingSignedFeeRangeDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_ClosingSignedFeeRangeDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_ClosingSignedFeeRangeDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_ClosingSignedFeeRangeDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_ClosingSignedFeeRangeDecodeErrorZ { - const ret: number = bindings.CResult_ClosingSignedFeeRangeDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_ClosingSignedFeeRangeDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_ClosingSignedFeeRangeDecodeErrorZ = Result_ClosingSignedFeeRangeDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_ClosingSignedFeeRangeDecodeErrorZ_OK extends Result_ClosingS public res: ClosingSignedFeeRange; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_ClosingSignedFeeRangeDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_ClosingSignedFeeRangeDecodeErrorZ_get_ok(ptr); const res_hu_conv: ClosingSignedFeeRange = new ClosingSignedFeeRange(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_ClosingSignedFeeRangeDecodeErrorZ_Err extends Result_Closing public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_ClosingSignedFeeRangeDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_ClosingSignedFeeRangeDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_CommitmentSignedDecodeErrorZ.mts b/ts/structs/Result_CommitmentSignedDecodeErrorZ.mts index f626652e..c9bb8bd1 100644 --- a/ts/structs/Result_CommitmentSignedDecodeErrorZ.mts +++ b/ts/structs/Result_CommitmentSignedDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_CommitmentSignedDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_CommitmentSignedDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_CommitmentSignedDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_CommitmentSignedDecodeErrorZ { if (bindings.CResult_CommitmentSignedDecodeErrorZ_is_ok(ptr)) { return new Result_CommitmentSignedDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_CommitmentSignedDecodeErrorZ extends CommonBase { * Creates a new CResult_CommitmentSignedDecodeErrorZ in the success state. */ public static constructor_ok(o: CommitmentSigned): Result_CommitmentSignedDecodeErrorZ { - const ret: number = bindings.CResult_CommitmentSignedDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_CommitmentSignedDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_CommitmentSignedDecodeErrorZ = Result_CommitmentSignedDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_CommitmentSignedDecodeErrorZ extends CommonBase { * Creates a new CResult_CommitmentSignedDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_CommitmentSignedDecodeErrorZ { - const ret: number = bindings.CResult_CommitmentSignedDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_CommitmentSignedDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_CommitmentSignedDecodeErrorZ = Result_CommitmentSignedDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_CommitmentSignedDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_CommitmentSignedDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_CommitmentSignedDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_CommitmentSignedDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_CommitmentSignedDecodeErrorZ { - const ret: number = bindings.CResult_CommitmentSignedDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_CommitmentSignedDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_CommitmentSignedDecodeErrorZ = Result_CommitmentSignedDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_CommitmentSignedDecodeErrorZ_OK extends Result_CommitmentSig public res: CommitmentSigned; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_CommitmentSignedDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_CommitmentSignedDecodeErrorZ_get_ok(ptr); const res_hu_conv: CommitmentSigned = new CommitmentSigned(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_CommitmentSignedDecodeErrorZ_Err extends Result_CommitmentSi public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_CommitmentSignedDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_CommitmentSignedDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_CommitmentTransactionDecodeErrorZ.mts b/ts/structs/Result_CommitmentTransactionDecodeErrorZ.mts index 7664333a..a9691083 100644 --- a/ts/structs/Result_CommitmentTransactionDecodeErrorZ.mts +++ b/ts/structs/Result_CommitmentTransactionDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_CommitmentTransactionDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_CommitmentTransactionDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_CommitmentTransactionDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_CommitmentTransactionDecodeErrorZ { if (bindings.CResult_CommitmentTransactionDecodeErrorZ_is_ok(ptr)) { return new Result_CommitmentTransactionDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_CommitmentTransactionDecodeErrorZ extends CommonBase { * Creates a new CResult_CommitmentTransactionDecodeErrorZ in the success state. */ public static constructor_ok(o: CommitmentTransaction): Result_CommitmentTransactionDecodeErrorZ { - const ret: number = bindings.CResult_CommitmentTransactionDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_CommitmentTransactionDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_CommitmentTransactionDecodeErrorZ = Result_CommitmentTransactionDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_CommitmentTransactionDecodeErrorZ extends CommonBase { * Creates a new CResult_CommitmentTransactionDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_CommitmentTransactionDecodeErrorZ { - const ret: number = bindings.CResult_CommitmentTransactionDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_CommitmentTransactionDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_CommitmentTransactionDecodeErrorZ = Result_CommitmentTransactionDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_CommitmentTransactionDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_CommitmentTransactionDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_CommitmentTransactionDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_CommitmentTransactionDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_CommitmentTransactionDecodeErrorZ { - const ret: number = bindings.CResult_CommitmentTransactionDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_CommitmentTransactionDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_CommitmentTransactionDecodeErrorZ = Result_CommitmentTransactionDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_CommitmentTransactionDecodeErrorZ_OK extends Result_Commitme public res: CommitmentTransaction; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_CommitmentTransactionDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_CommitmentTransactionDecodeErrorZ_get_ok(ptr); const res_hu_conv: CommitmentTransaction = new CommitmentTransaction(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_CommitmentTransactionDecodeErrorZ_Err extends Result_Commitm public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_CommitmentTransactionDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_CommitmentTransactionDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_CounterpartyChannelTransactionParametersDecodeErrorZ.mts b/ts/structs/Result_CounterpartyChannelTransactionParametersDecodeErrorZ.mts index ba39099a..88aa229b 100644 --- a/ts/structs/Result_CounterpartyChannelTransactionParametersDecodeErrorZ.mts +++ b/ts/structs/Result_CounterpartyChannelTransactionParametersDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_CounterpartyChannelTransactionParametersDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_CounterpartyChannelTransactionParametersDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_CounterpartyChannelTransactionParametersDecodeErrorZ { if (bindings.CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_is_ok(ptr)) { return new Result_CounterpartyChannelTransactionParametersDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_CounterpartyChannelTransactionParametersDecodeErrorZ extends * Creates a new CResult_CounterpartyChannelTransactionParametersDecodeErrorZ in the success state. */ public static constructor_ok(o: CounterpartyChannelTransactionParameters): Result_CounterpartyChannelTransactionParametersDecodeErrorZ { - const ret: number = bindings.CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_CounterpartyChannelTransactionParametersDecodeErrorZ = Result_CounterpartyChannelTransactionParametersDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_CounterpartyChannelTransactionParametersDecodeErrorZ extends * Creates a new CResult_CounterpartyChannelTransactionParametersDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_CounterpartyChannelTransactionParametersDecodeErrorZ { - const ret: number = bindings.CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_CounterpartyChannelTransactionParametersDecodeErrorZ = Result_CounterpartyChannelTransactionParametersDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_CounterpartyChannelTransactionParametersDecodeErrorZ extends return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_CounterpartyChannelTransactionParametersDecodeErrorZ extends * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_CounterpartyChannelTransactionParametersDecodeErrorZ { - const ret: number = bindings.CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_CounterpartyChannelTransactionParametersDecodeErrorZ = Result_CounterpartyChannelTransactionParametersDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_CounterpartyChannelTransactionParametersDecodeErrorZ_OK exte public res: CounterpartyChannelTransactionParameters; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_get_ok(ptr); const res_hu_conv: CounterpartyChannelTransactionParameters = new CounterpartyChannelTransactionParameters(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_CounterpartyChannelTransactionParametersDecodeErrorZ_Err ext public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_CounterpartyCommitmentSecretsDecodeErrorZ.mts b/ts/structs/Result_CounterpartyCommitmentSecretsDecodeErrorZ.mts index ef4985d1..9616bc56 100644 --- a/ts/structs/Result_CounterpartyCommitmentSecretsDecodeErrorZ.mts +++ b/ts/structs/Result_CounterpartyCommitmentSecretsDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_CounterpartyCommitmentSecretsDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_CounterpartyCommitmentSecretsDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_CounterpartyCommitmentSecretsDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_CounterpartyCommitmentSecretsDecodeErrorZ { if (bindings.CResult_CounterpartyCommitmentSecretsDecodeErrorZ_is_ok(ptr)) { return new Result_CounterpartyCommitmentSecretsDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_CounterpartyCommitmentSecretsDecodeErrorZ extends CommonBase * Creates a new CResult_CounterpartyCommitmentSecretsDecodeErrorZ in the success state. */ public static constructor_ok(o: CounterpartyCommitmentSecrets): Result_CounterpartyCommitmentSecretsDecodeErrorZ { - const ret: number = bindings.CResult_CounterpartyCommitmentSecretsDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_CounterpartyCommitmentSecretsDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_CounterpartyCommitmentSecretsDecodeErrorZ = Result_CounterpartyCommitmentSecretsDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_CounterpartyCommitmentSecretsDecodeErrorZ extends CommonBase * Creates a new CResult_CounterpartyCommitmentSecretsDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_CounterpartyCommitmentSecretsDecodeErrorZ { - const ret: number = bindings.CResult_CounterpartyCommitmentSecretsDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_CounterpartyCommitmentSecretsDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_CounterpartyCommitmentSecretsDecodeErrorZ = Result_CounterpartyCommitmentSecretsDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_CounterpartyCommitmentSecretsDecodeErrorZ extends CommonBase return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_CounterpartyCommitmentSecretsDecodeErrorZ extends CommonBase * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_CounterpartyCommitmentSecretsDecodeErrorZ { - const ret: number = bindings.CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_CounterpartyCommitmentSecretsDecodeErrorZ = Result_CounterpartyCommitmentSecretsDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_CounterpartyCommitmentSecretsDecodeErrorZ_OK extends Result_ public res: CounterpartyCommitmentSecrets; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_CounterpartyCommitmentSecretsDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_CounterpartyCommitmentSecretsDecodeErrorZ_get_ok(ptr); const res_hu_conv: CounterpartyCommitmentSecrets = new CounterpartyCommitmentSecrets(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_CounterpartyCommitmentSecretsDecodeErrorZ_Err extends Result public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_CounterpartyCommitmentSecretsDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_CounterpartyCommitmentSecretsDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_CounterpartyForwardingInfoDecodeErrorZ.mts b/ts/structs/Result_CounterpartyForwardingInfoDecodeErrorZ.mts index aec60c3d..0a7694cf 100644 --- a/ts/structs/Result_CounterpartyForwardingInfoDecodeErrorZ.mts +++ b/ts/structs/Result_CounterpartyForwardingInfoDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_CounterpartyForwardingInfoDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_CounterpartyForwardingInfoDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_CounterpartyForwardingInfoDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_CounterpartyForwardingInfoDecodeErrorZ { if (bindings.CResult_CounterpartyForwardingInfoDecodeErrorZ_is_ok(ptr)) { return new Result_CounterpartyForwardingInfoDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_CounterpartyForwardingInfoDecodeErrorZ extends CommonBase { * Creates a new CResult_CounterpartyForwardingInfoDecodeErrorZ in the success state. */ public static constructor_ok(o: CounterpartyForwardingInfo): Result_CounterpartyForwardingInfoDecodeErrorZ { - const ret: number = bindings.CResult_CounterpartyForwardingInfoDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_CounterpartyForwardingInfoDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_CounterpartyForwardingInfoDecodeErrorZ = Result_CounterpartyForwardingInfoDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_CounterpartyForwardingInfoDecodeErrorZ extends CommonBase { * Creates a new CResult_CounterpartyForwardingInfoDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_CounterpartyForwardingInfoDecodeErrorZ { - const ret: number = bindings.CResult_CounterpartyForwardingInfoDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_CounterpartyForwardingInfoDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_CounterpartyForwardingInfoDecodeErrorZ = Result_CounterpartyForwardingInfoDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_CounterpartyForwardingInfoDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_CounterpartyForwardingInfoDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_CounterpartyForwardingInfoDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_CounterpartyForwardingInfoDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_CounterpartyForwardingInfoDecodeErrorZ { - const ret: number = bindings.CResult_CounterpartyForwardingInfoDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_CounterpartyForwardingInfoDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_CounterpartyForwardingInfoDecodeErrorZ = Result_CounterpartyForwardingInfoDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_CounterpartyForwardingInfoDecodeErrorZ_OK extends Result_Cou public res: CounterpartyForwardingInfo; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_CounterpartyForwardingInfoDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_CounterpartyForwardingInfoDecodeErrorZ_get_ok(ptr); const res_hu_conv: CounterpartyForwardingInfo = new CounterpartyForwardingInfo(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_CounterpartyForwardingInfoDecodeErrorZ_Err extends Result_Co public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_CounterpartyForwardingInfoDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_CounterpartyForwardingInfoDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_DelayedPaymentOutputDescriptorDecodeErrorZ.mts b/ts/structs/Result_DelayedPaymentOutputDescriptorDecodeErrorZ.mts index c6dea781..1696b2ce 100644 --- a/ts/structs/Result_DelayedPaymentOutputDescriptorDecodeErrorZ.mts +++ b/ts/structs/Result_DelayedPaymentOutputDescriptorDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_DelayedPaymentOutputDescriptorDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_DelayedPaymentOutputDescriptorDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_DelayedPaymentOutputDescriptorDecodeErrorZ { if (bindings.CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_is_ok(ptr)) { return new Result_DelayedPaymentOutputDescriptorDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_DelayedPaymentOutputDescriptorDecodeErrorZ extends CommonBas * Creates a new CResult_DelayedPaymentOutputDescriptorDecodeErrorZ in the success state. */ public static constructor_ok(o: DelayedPaymentOutputDescriptor): Result_DelayedPaymentOutputDescriptorDecodeErrorZ { - const ret: number = bindings.CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_DelayedPaymentOutputDescriptorDecodeErrorZ = Result_DelayedPaymentOutputDescriptorDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_DelayedPaymentOutputDescriptorDecodeErrorZ extends CommonBas * Creates a new CResult_DelayedPaymentOutputDescriptorDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_DelayedPaymentOutputDescriptorDecodeErrorZ { - const ret: number = bindings.CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_DelayedPaymentOutputDescriptorDecodeErrorZ = Result_DelayedPaymentOutputDescriptorDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_DelayedPaymentOutputDescriptorDecodeErrorZ extends CommonBas return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_DelayedPaymentOutputDescriptorDecodeErrorZ extends CommonBas * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_DelayedPaymentOutputDescriptorDecodeErrorZ { - const ret: number = bindings.CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_DelayedPaymentOutputDescriptorDecodeErrorZ = Result_DelayedPaymentOutputDescriptorDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_DelayedPaymentOutputDescriptorDecodeErrorZ_OK extends Result public res: DelayedPaymentOutputDescriptor; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_ok(ptr); const res_hu_conv: DelayedPaymentOutputDescriptor = new DelayedPaymentOutputDescriptor(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_DelayedPaymentOutputDescriptorDecodeErrorZ_Err extends Resul public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_DescriptionCreationErrorZ.mts b/ts/structs/Result_DescriptionCreationErrorZ.mts index 8d164b3c..cf9bb723 100644 --- a/ts/structs/Result_DescriptionCreationErrorZ.mts +++ b/ts/structs/Result_DescriptionCreationErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_DescriptionCreationErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_DescriptionCreationErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_DescriptionCreationErrorZ { + public static constr_from_ptr(ptr: bigint): Result_DescriptionCreationErrorZ { if (bindings.CResult_DescriptionCreationErrorZ_is_ok(ptr)) { return new Result_DescriptionCreationErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_DescriptionCreationErrorZ extends CommonBase { * Creates a new CResult_DescriptionCreationErrorZ in the success state. */ public static constructor_ok(o: Description): Result_DescriptionCreationErrorZ { - const ret: number = bindings.CResult_DescriptionCreationErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_DescriptionCreationErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_DescriptionCreationErrorZ = Result_DescriptionCreationErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,7 +383,7 @@ export class Result_DescriptionCreationErrorZ extends CommonBase { * Creates a new CResult_DescriptionCreationErrorZ in the error state. */ public static constructor_err(e: CreationError): Result_DescriptionCreationErrorZ { - const ret: number = bindings.CResult_DescriptionCreationErrorZ_err(e); + const ret: bigint = bindings.CResult_DescriptionCreationErrorZ_err(e); const ret_hu_conv: Result_DescriptionCreationErrorZ = Result_DescriptionCreationErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -395,8 +396,8 @@ export class Result_DescriptionCreationErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_DescriptionCreationErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_DescriptionCreationErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +406,7 @@ export class Result_DescriptionCreationErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_DescriptionCreationErrorZ { - const ret: number = bindings.CResult_DescriptionCreationErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_DescriptionCreationErrorZ_clone(this.ptr); const ret_hu_conv: Result_DescriptionCreationErrorZ = Result_DescriptionCreationErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +416,9 @@ export class Result_DescriptionCreationErrorZ_OK extends Result_DescriptionCreat public res: Description; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_DescriptionCreationErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_DescriptionCreationErrorZ_get_ok(ptr); const res_hu_conv: Description = new Description(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,7 +428,7 @@ export class Result_DescriptionCreationErrorZ_Err extends Result_DescriptionCrea public err: CreationError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); this.err = bindings.CResult_DescriptionCreationErrorZ_get_err(ptr); } diff --git a/ts/structs/Result_ErrorMessageDecodeErrorZ.mts b/ts/structs/Result_ErrorMessageDecodeErrorZ.mts index aa0b4273..3723335c 100644 --- a/ts/structs/Result_ErrorMessageDecodeErrorZ.mts +++ b/ts/structs/Result_ErrorMessageDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_ErrorMessageDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_ErrorMessageDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_ErrorMessageDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_ErrorMessageDecodeErrorZ { if (bindings.CResult_ErrorMessageDecodeErrorZ_is_ok(ptr)) { return new Result_ErrorMessageDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_ErrorMessageDecodeErrorZ extends CommonBase { * Creates a new CResult_ErrorMessageDecodeErrorZ in the success state. */ public static constructor_ok(o: ErrorMessage): Result_ErrorMessageDecodeErrorZ { - const ret: number = bindings.CResult_ErrorMessageDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_ErrorMessageDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_ErrorMessageDecodeErrorZ = Result_ErrorMessageDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_ErrorMessageDecodeErrorZ extends CommonBase { * Creates a new CResult_ErrorMessageDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_ErrorMessageDecodeErrorZ { - const ret: number = bindings.CResult_ErrorMessageDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_ErrorMessageDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_ErrorMessageDecodeErrorZ = Result_ErrorMessageDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_ErrorMessageDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_ErrorMessageDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_ErrorMessageDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_ErrorMessageDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_ErrorMessageDecodeErrorZ { - const ret: number = bindings.CResult_ErrorMessageDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_ErrorMessageDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_ErrorMessageDecodeErrorZ = Result_ErrorMessageDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_ErrorMessageDecodeErrorZ_OK extends Result_ErrorMessageDecod public res: ErrorMessage; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_ErrorMessageDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_ErrorMessageDecodeErrorZ_get_ok(ptr); const res_hu_conv: ErrorMessage = new ErrorMessage(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_ErrorMessageDecodeErrorZ_Err extends Result_ErrorMessageDeco public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_ErrorMessageDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_ErrorMessageDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_FixedPenaltyScorerDecodeErrorZ.mts b/ts/structs/Result_FixedPenaltyScorerDecodeErrorZ.mts index 20385e47..72f3203d 100644 --- a/ts/structs/Result_FixedPenaltyScorerDecodeErrorZ.mts +++ b/ts/structs/Result_FixedPenaltyScorerDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_FixedPenaltyScorerDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_FixedPenaltyScorerDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_FixedPenaltyScorerDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_FixedPenaltyScorerDecodeErrorZ { if (bindings.CResult_FixedPenaltyScorerDecodeErrorZ_is_ok(ptr)) { return new Result_FixedPenaltyScorerDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_FixedPenaltyScorerDecodeErrorZ extends CommonBase { * Creates a new CResult_FixedPenaltyScorerDecodeErrorZ in the success state. */ public static constructor_ok(o: FixedPenaltyScorer): Result_FixedPenaltyScorerDecodeErrorZ { - const ret: number = bindings.CResult_FixedPenaltyScorerDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_FixedPenaltyScorerDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_FixedPenaltyScorerDecodeErrorZ = Result_FixedPenaltyScorerDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_FixedPenaltyScorerDecodeErrorZ extends CommonBase { * Creates a new CResult_FixedPenaltyScorerDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_FixedPenaltyScorerDecodeErrorZ { - const ret: number = bindings.CResult_FixedPenaltyScorerDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_FixedPenaltyScorerDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_FixedPenaltyScorerDecodeErrorZ = Result_FixedPenaltyScorerDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_FixedPenaltyScorerDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_FixedPenaltyScorerDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_FixedPenaltyScorerDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_FixedPenaltyScorerDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_FixedPenaltyScorerDecodeErrorZ { - const ret: number = bindings.CResult_FixedPenaltyScorerDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_FixedPenaltyScorerDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_FixedPenaltyScorerDecodeErrorZ = Result_FixedPenaltyScorerDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_FixedPenaltyScorerDecodeErrorZ_OK extends Result_FixedPenalt public res: FixedPenaltyScorer; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_FixedPenaltyScorerDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_FixedPenaltyScorerDecodeErrorZ_get_ok(ptr); const res_hu_conv: FixedPenaltyScorer = new FixedPenaltyScorer(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_FixedPenaltyScorerDecodeErrorZ_Err extends Result_FixedPenal public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_FixedPenaltyScorerDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_FixedPenaltyScorerDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_FundingCreatedDecodeErrorZ.mts b/ts/structs/Result_FundingCreatedDecodeErrorZ.mts index f16d45c8..46fa9f32 100644 --- a/ts/structs/Result_FundingCreatedDecodeErrorZ.mts +++ b/ts/structs/Result_FundingCreatedDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_FundingCreatedDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_FundingCreatedDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_FundingCreatedDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_FundingCreatedDecodeErrorZ { if (bindings.CResult_FundingCreatedDecodeErrorZ_is_ok(ptr)) { return new Result_FundingCreatedDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_FundingCreatedDecodeErrorZ extends CommonBase { * Creates a new CResult_FundingCreatedDecodeErrorZ in the success state. */ public static constructor_ok(o: FundingCreated): Result_FundingCreatedDecodeErrorZ { - const ret: number = bindings.CResult_FundingCreatedDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_FundingCreatedDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_FundingCreatedDecodeErrorZ = Result_FundingCreatedDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_FundingCreatedDecodeErrorZ extends CommonBase { * Creates a new CResult_FundingCreatedDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_FundingCreatedDecodeErrorZ { - const ret: number = bindings.CResult_FundingCreatedDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_FundingCreatedDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_FundingCreatedDecodeErrorZ = Result_FundingCreatedDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_FundingCreatedDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_FundingCreatedDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_FundingCreatedDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_FundingCreatedDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_FundingCreatedDecodeErrorZ { - const ret: number = bindings.CResult_FundingCreatedDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_FundingCreatedDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_FundingCreatedDecodeErrorZ = Result_FundingCreatedDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_FundingCreatedDecodeErrorZ_OK extends Result_FundingCreatedD public res: FundingCreated; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_FundingCreatedDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_FundingCreatedDecodeErrorZ_get_ok(ptr); const res_hu_conv: FundingCreated = new FundingCreated(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_FundingCreatedDecodeErrorZ_Err extends Result_FundingCreated public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_FundingCreatedDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_FundingCreatedDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_FundingSignedDecodeErrorZ.mts b/ts/structs/Result_FundingSignedDecodeErrorZ.mts index 31b2198c..09f10d27 100644 --- a/ts/structs/Result_FundingSignedDecodeErrorZ.mts +++ b/ts/structs/Result_FundingSignedDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_FundingSignedDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_FundingSignedDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_FundingSignedDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_FundingSignedDecodeErrorZ { if (bindings.CResult_FundingSignedDecodeErrorZ_is_ok(ptr)) { return new Result_FundingSignedDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_FundingSignedDecodeErrorZ extends CommonBase { * Creates a new CResult_FundingSignedDecodeErrorZ in the success state. */ public static constructor_ok(o: FundingSigned): Result_FundingSignedDecodeErrorZ { - const ret: number = bindings.CResult_FundingSignedDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_FundingSignedDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_FundingSignedDecodeErrorZ = Result_FundingSignedDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_FundingSignedDecodeErrorZ extends CommonBase { * Creates a new CResult_FundingSignedDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_FundingSignedDecodeErrorZ { - const ret: number = bindings.CResult_FundingSignedDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_FundingSignedDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_FundingSignedDecodeErrorZ = Result_FundingSignedDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_FundingSignedDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_FundingSignedDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_FundingSignedDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_FundingSignedDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_FundingSignedDecodeErrorZ { - const ret: number = bindings.CResult_FundingSignedDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_FundingSignedDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_FundingSignedDecodeErrorZ = Result_FundingSignedDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_FundingSignedDecodeErrorZ_OK extends Result_FundingSignedDec public res: FundingSigned; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_FundingSignedDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_FundingSignedDecodeErrorZ_get_ok(ptr); const res_hu_conv: FundingSigned = new FundingSigned(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_FundingSignedDecodeErrorZ_Err extends Result_FundingSignedDe public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_FundingSignedDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_FundingSignedDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_GossipTimestampFilterDecodeErrorZ.mts b/ts/structs/Result_GossipTimestampFilterDecodeErrorZ.mts index 6ca718db..b630cbf1 100644 --- a/ts/structs/Result_GossipTimestampFilterDecodeErrorZ.mts +++ b/ts/structs/Result_GossipTimestampFilterDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_GossipTimestampFilterDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_GossipTimestampFilterDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_GossipTimestampFilterDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_GossipTimestampFilterDecodeErrorZ { if (bindings.CResult_GossipTimestampFilterDecodeErrorZ_is_ok(ptr)) { return new Result_GossipTimestampFilterDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_GossipTimestampFilterDecodeErrorZ extends CommonBase { * Creates a new CResult_GossipTimestampFilterDecodeErrorZ in the success state. */ public static constructor_ok(o: GossipTimestampFilter): Result_GossipTimestampFilterDecodeErrorZ { - const ret: number = bindings.CResult_GossipTimestampFilterDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_GossipTimestampFilterDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_GossipTimestampFilterDecodeErrorZ = Result_GossipTimestampFilterDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_GossipTimestampFilterDecodeErrorZ extends CommonBase { * Creates a new CResult_GossipTimestampFilterDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_GossipTimestampFilterDecodeErrorZ { - const ret: number = bindings.CResult_GossipTimestampFilterDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_GossipTimestampFilterDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_GossipTimestampFilterDecodeErrorZ = Result_GossipTimestampFilterDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_GossipTimestampFilterDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_GossipTimestampFilterDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_GossipTimestampFilterDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_GossipTimestampFilterDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_GossipTimestampFilterDecodeErrorZ { - const ret: number = bindings.CResult_GossipTimestampFilterDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_GossipTimestampFilterDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_GossipTimestampFilterDecodeErrorZ = Result_GossipTimestampFilterDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_GossipTimestampFilterDecodeErrorZ_OK extends Result_GossipTi public res: GossipTimestampFilter; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_GossipTimestampFilterDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_GossipTimestampFilterDecodeErrorZ_get_ok(ptr); const res_hu_conv: GossipTimestampFilter = new GossipTimestampFilter(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_GossipTimestampFilterDecodeErrorZ_Err extends Result_GossipT public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_GossipTimestampFilterDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_GossipTimestampFilterDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_HTLCOutputInCommitmentDecodeErrorZ.mts b/ts/structs/Result_HTLCOutputInCommitmentDecodeErrorZ.mts index 6636035a..acf730d3 100644 --- a/ts/structs/Result_HTLCOutputInCommitmentDecodeErrorZ.mts +++ b/ts/structs/Result_HTLCOutputInCommitmentDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_HTLCOutputInCommitmentDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_HTLCOutputInCommitmentDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_HTLCOutputInCommitmentDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_HTLCOutputInCommitmentDecodeErrorZ { if (bindings.CResult_HTLCOutputInCommitmentDecodeErrorZ_is_ok(ptr)) { return new Result_HTLCOutputInCommitmentDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_HTLCOutputInCommitmentDecodeErrorZ extends CommonBase { * Creates a new CResult_HTLCOutputInCommitmentDecodeErrorZ in the success state. */ public static constructor_ok(o: HTLCOutputInCommitment): Result_HTLCOutputInCommitmentDecodeErrorZ { - const ret: number = bindings.CResult_HTLCOutputInCommitmentDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_HTLCOutputInCommitmentDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_HTLCOutputInCommitmentDecodeErrorZ = Result_HTLCOutputInCommitmentDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_HTLCOutputInCommitmentDecodeErrorZ extends CommonBase { * Creates a new CResult_HTLCOutputInCommitmentDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_HTLCOutputInCommitmentDecodeErrorZ { - const ret: number = bindings.CResult_HTLCOutputInCommitmentDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_HTLCOutputInCommitmentDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_HTLCOutputInCommitmentDecodeErrorZ = Result_HTLCOutputInCommitmentDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_HTLCOutputInCommitmentDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_HTLCOutputInCommitmentDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_HTLCOutputInCommitmentDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_HTLCOutputInCommitmentDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_HTLCOutputInCommitmentDecodeErrorZ { - const ret: number = bindings.CResult_HTLCOutputInCommitmentDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_HTLCOutputInCommitmentDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_HTLCOutputInCommitmentDecodeErrorZ = Result_HTLCOutputInCommitmentDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_HTLCOutputInCommitmentDecodeErrorZ_OK extends Result_HTLCOut public res: HTLCOutputInCommitment; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_HTLCOutputInCommitmentDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_HTLCOutputInCommitmentDecodeErrorZ_get_ok(ptr); const res_hu_conv: HTLCOutputInCommitment = new HTLCOutputInCommitment(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_HTLCOutputInCommitmentDecodeErrorZ_Err extends Result_HTLCOu public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_HTLCOutputInCommitmentDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_HTLCOutputInCommitmentDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_HTLCUpdateDecodeErrorZ.mts b/ts/structs/Result_HTLCUpdateDecodeErrorZ.mts index 14a8c20a..3437e3d6 100644 --- a/ts/structs/Result_HTLCUpdateDecodeErrorZ.mts +++ b/ts/structs/Result_HTLCUpdateDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_HTLCUpdateDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_HTLCUpdateDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_HTLCUpdateDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_HTLCUpdateDecodeErrorZ { if (bindings.CResult_HTLCUpdateDecodeErrorZ_is_ok(ptr)) { return new Result_HTLCUpdateDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_HTLCUpdateDecodeErrorZ extends CommonBase { * Creates a new CResult_HTLCUpdateDecodeErrorZ in the success state. */ public static constructor_ok(o: HTLCUpdate): Result_HTLCUpdateDecodeErrorZ { - const ret: number = bindings.CResult_HTLCUpdateDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_HTLCUpdateDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_HTLCUpdateDecodeErrorZ = Result_HTLCUpdateDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_HTLCUpdateDecodeErrorZ extends CommonBase { * Creates a new CResult_HTLCUpdateDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_HTLCUpdateDecodeErrorZ { - const ret: number = bindings.CResult_HTLCUpdateDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_HTLCUpdateDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_HTLCUpdateDecodeErrorZ = Result_HTLCUpdateDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_HTLCUpdateDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_HTLCUpdateDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_HTLCUpdateDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_HTLCUpdateDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_HTLCUpdateDecodeErrorZ { - const ret: number = bindings.CResult_HTLCUpdateDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_HTLCUpdateDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_HTLCUpdateDecodeErrorZ = Result_HTLCUpdateDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_HTLCUpdateDecodeErrorZ_OK extends Result_HTLCUpdateDecodeErr public res: HTLCUpdate; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_HTLCUpdateDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_HTLCUpdateDecodeErrorZ_get_ok(ptr); const res_hu_conv: HTLCUpdate = new HTLCUpdate(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_HTLCUpdateDecodeErrorZ_Err extends Result_HTLCUpdateDecodeEr public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_HTLCUpdateDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_HTLCUpdateDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_HolderCommitmentTransactionDecodeErrorZ.mts b/ts/structs/Result_HolderCommitmentTransactionDecodeErrorZ.mts index 96e33be9..d04e9e0d 100644 --- a/ts/structs/Result_HolderCommitmentTransactionDecodeErrorZ.mts +++ b/ts/structs/Result_HolderCommitmentTransactionDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_HolderCommitmentTransactionDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_HolderCommitmentTransactionDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_HolderCommitmentTransactionDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_HolderCommitmentTransactionDecodeErrorZ { if (bindings.CResult_HolderCommitmentTransactionDecodeErrorZ_is_ok(ptr)) { return new Result_HolderCommitmentTransactionDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_HolderCommitmentTransactionDecodeErrorZ extends CommonBase { * Creates a new CResult_HolderCommitmentTransactionDecodeErrorZ in the success state. */ public static constructor_ok(o: HolderCommitmentTransaction): Result_HolderCommitmentTransactionDecodeErrorZ { - const ret: number = bindings.CResult_HolderCommitmentTransactionDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_HolderCommitmentTransactionDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_HolderCommitmentTransactionDecodeErrorZ = Result_HolderCommitmentTransactionDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_HolderCommitmentTransactionDecodeErrorZ extends CommonBase { * Creates a new CResult_HolderCommitmentTransactionDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_HolderCommitmentTransactionDecodeErrorZ { - const ret: number = bindings.CResult_HolderCommitmentTransactionDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_HolderCommitmentTransactionDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_HolderCommitmentTransactionDecodeErrorZ = Result_HolderCommitmentTransactionDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_HolderCommitmentTransactionDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_HolderCommitmentTransactionDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_HolderCommitmentTransactionDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_HolderCommitmentTransactionDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_HolderCommitmentTransactionDecodeErrorZ { - const ret: number = bindings.CResult_HolderCommitmentTransactionDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_HolderCommitmentTransactionDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_HolderCommitmentTransactionDecodeErrorZ = Result_HolderCommitmentTransactionDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_HolderCommitmentTransactionDecodeErrorZ_OK extends Result_Ho public res: HolderCommitmentTransaction; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_HolderCommitmentTransactionDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_HolderCommitmentTransactionDecodeErrorZ_get_ok(ptr); const res_hu_conv: HolderCommitmentTransaction = new HolderCommitmentTransaction(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_HolderCommitmentTransactionDecodeErrorZ_Err extends Result_H public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_HolderCommitmentTransactionDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_HolderCommitmentTransactionDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_InMemorySignerDecodeErrorZ.mts b/ts/structs/Result_InMemorySignerDecodeErrorZ.mts index a9f379ad..03224e35 100644 --- a/ts/structs/Result_InMemorySignerDecodeErrorZ.mts +++ b/ts/structs/Result_InMemorySignerDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_InMemorySignerDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_InMemorySignerDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_InMemorySignerDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_InMemorySignerDecodeErrorZ { if (bindings.CResult_InMemorySignerDecodeErrorZ_is_ok(ptr)) { return new Result_InMemorySignerDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_InMemorySignerDecodeErrorZ extends CommonBase { * Creates a new CResult_InMemorySignerDecodeErrorZ in the success state. */ public static constructor_ok(o: InMemorySigner): Result_InMemorySignerDecodeErrorZ { - const ret: number = bindings.CResult_InMemorySignerDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_InMemorySignerDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_InMemorySignerDecodeErrorZ = Result_InMemorySignerDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_InMemorySignerDecodeErrorZ extends CommonBase { * Creates a new CResult_InMemorySignerDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_InMemorySignerDecodeErrorZ { - const ret: number = bindings.CResult_InMemorySignerDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_InMemorySignerDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_InMemorySignerDecodeErrorZ = Result_InMemorySignerDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_InMemorySignerDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_InMemorySignerDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_InMemorySignerDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_InMemorySignerDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_InMemorySignerDecodeErrorZ { - const ret: number = bindings.CResult_InMemorySignerDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_InMemorySignerDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_InMemorySignerDecodeErrorZ = Result_InMemorySignerDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_InMemorySignerDecodeErrorZ_OK extends Result_InMemorySignerD public res: InMemorySigner; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_InMemorySignerDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_InMemorySignerDecodeErrorZ_get_ok(ptr); const res_hu_conv: InMemorySigner = new InMemorySigner(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_InMemorySignerDecodeErrorZ_Err extends Result_InMemorySigner public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_InMemorySignerDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_InMemorySignerDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_InitDecodeErrorZ.mts b/ts/structs/Result_InitDecodeErrorZ.mts index a7fd2f5b..03beb3b6 100644 --- a/ts/structs/Result_InitDecodeErrorZ.mts +++ b/ts/structs/Result_InitDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_InitDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_InitDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_InitDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_InitDecodeErrorZ { if (bindings.CResult_InitDecodeErrorZ_is_ok(ptr)) { return new Result_InitDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_InitDecodeErrorZ extends CommonBase { * Creates a new CResult_InitDecodeErrorZ in the success state. */ public static constructor_ok(o: Init): Result_InitDecodeErrorZ { - const ret: number = bindings.CResult_InitDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_InitDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_InitDecodeErrorZ = Result_InitDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_InitDecodeErrorZ extends CommonBase { * Creates a new CResult_InitDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_InitDecodeErrorZ { - const ret: number = bindings.CResult_InitDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_InitDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_InitDecodeErrorZ = Result_InitDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_InitDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_InitDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_InitDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_InitDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_InitDecodeErrorZ { - const ret: number = bindings.CResult_InitDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_InitDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_InitDecodeErrorZ = Result_InitDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_InitDecodeErrorZ_OK extends Result_InitDecodeErrorZ { public res: Init; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_InitDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_InitDecodeErrorZ_get_ok(ptr); const res_hu_conv: Init = new Init(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_InitDecodeErrorZ_Err extends Result_InitDecodeErrorZ { public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_InitDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_InitDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_InitFeaturesDecodeErrorZ.mts b/ts/structs/Result_InitFeaturesDecodeErrorZ.mts index 8f67a275..1e78fa46 100644 --- a/ts/structs/Result_InitFeaturesDecodeErrorZ.mts +++ b/ts/structs/Result_InitFeaturesDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_InitFeaturesDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_InitFeaturesDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_InitFeaturesDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_InitFeaturesDecodeErrorZ { if (bindings.CResult_InitFeaturesDecodeErrorZ_is_ok(ptr)) { return new Result_InitFeaturesDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_InitFeaturesDecodeErrorZ extends CommonBase { * Creates a new CResult_InitFeaturesDecodeErrorZ in the success state. */ public static constructor_ok(o: InitFeatures): Result_InitFeaturesDecodeErrorZ { - const ret: number = bindings.CResult_InitFeaturesDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_InitFeaturesDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_InitFeaturesDecodeErrorZ = Result_InitFeaturesDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_InitFeaturesDecodeErrorZ extends CommonBase { * Creates a new CResult_InitFeaturesDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_InitFeaturesDecodeErrorZ { - const ret: number = bindings.CResult_InitFeaturesDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_InitFeaturesDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_InitFeaturesDecodeErrorZ = Result_InitFeaturesDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_InitFeaturesDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_InitFeaturesDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_InitFeaturesDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_InitFeaturesDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_InitFeaturesDecodeErrorZ { - const ret: number = bindings.CResult_InitFeaturesDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_InitFeaturesDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_InitFeaturesDecodeErrorZ = Result_InitFeaturesDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_InitFeaturesDecodeErrorZ_OK extends Result_InitFeaturesDecod public res: InitFeatures; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_InitFeaturesDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_InitFeaturesDecodeErrorZ_get_ok(ptr); const res_hu_conv: InitFeatures = new InitFeatures(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_InitFeaturesDecodeErrorZ_Err extends Result_InitFeaturesDeco public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_InitFeaturesDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_InitFeaturesDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_InvoiceFeaturesDecodeErrorZ.mts b/ts/structs/Result_InvoiceFeaturesDecodeErrorZ.mts index 69970cb2..7d572e2a 100644 --- a/ts/structs/Result_InvoiceFeaturesDecodeErrorZ.mts +++ b/ts/structs/Result_InvoiceFeaturesDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_InvoiceFeaturesDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_InvoiceFeaturesDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_InvoiceFeaturesDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_InvoiceFeaturesDecodeErrorZ { if (bindings.CResult_InvoiceFeaturesDecodeErrorZ_is_ok(ptr)) { return new Result_InvoiceFeaturesDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_InvoiceFeaturesDecodeErrorZ extends CommonBase { * Creates a new CResult_InvoiceFeaturesDecodeErrorZ in the success state. */ public static constructor_ok(o: InvoiceFeatures): Result_InvoiceFeaturesDecodeErrorZ { - const ret: number = bindings.CResult_InvoiceFeaturesDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_InvoiceFeaturesDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_InvoiceFeaturesDecodeErrorZ = Result_InvoiceFeaturesDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_InvoiceFeaturesDecodeErrorZ extends CommonBase { * Creates a new CResult_InvoiceFeaturesDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_InvoiceFeaturesDecodeErrorZ { - const ret: number = bindings.CResult_InvoiceFeaturesDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_InvoiceFeaturesDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_InvoiceFeaturesDecodeErrorZ = Result_InvoiceFeaturesDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_InvoiceFeaturesDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_InvoiceFeaturesDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_InvoiceFeaturesDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_InvoiceFeaturesDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_InvoiceFeaturesDecodeErrorZ { - const ret: number = bindings.CResult_InvoiceFeaturesDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_InvoiceFeaturesDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_InvoiceFeaturesDecodeErrorZ = Result_InvoiceFeaturesDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_InvoiceFeaturesDecodeErrorZ_OK extends Result_InvoiceFeature public res: InvoiceFeatures; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_InvoiceFeaturesDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_InvoiceFeaturesDecodeErrorZ_get_ok(ptr); const res_hu_conv: InvoiceFeatures = new InvoiceFeatures(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_InvoiceFeaturesDecodeErrorZ_Err extends Result_InvoiceFeatur public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_InvoiceFeaturesDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_InvoiceFeaturesDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_InvoiceParseOrSemanticErrorZ.mts b/ts/structs/Result_InvoiceParseOrSemanticErrorZ.mts index c0f017b0..f1747b62 100644 --- a/ts/structs/Result_InvoiceParseOrSemanticErrorZ.mts +++ b/ts/structs/Result_InvoiceParseOrSemanticErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_InvoiceParseOrSemanticErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_InvoiceParseOrSemanticErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_InvoiceParseOrSemanticErrorZ { + public static constr_from_ptr(ptr: bigint): Result_InvoiceParseOrSemanticErrorZ { if (bindings.CResult_InvoiceParseOrSemanticErrorZ_is_ok(ptr)) { return new Result_InvoiceParseOrSemanticErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_InvoiceParseOrSemanticErrorZ extends CommonBase { * Creates a new CResult_InvoiceParseOrSemanticErrorZ in the success state. */ public static constructor_ok(o: Invoice): Result_InvoiceParseOrSemanticErrorZ { - const ret: number = bindings.CResult_InvoiceParseOrSemanticErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_InvoiceParseOrSemanticErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_InvoiceParseOrSemanticErrorZ = Result_InvoiceParseOrSemanticErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,7 +383,7 @@ export class Result_InvoiceParseOrSemanticErrorZ extends CommonBase { * Creates a new CResult_InvoiceParseOrSemanticErrorZ in the error state. */ public static constructor_err(e: ParseOrSemanticError): Result_InvoiceParseOrSemanticErrorZ { - const ret: number = bindings.CResult_InvoiceParseOrSemanticErrorZ_err(CommonBase.get_ptr_of(e)); + const ret: bigint = bindings.CResult_InvoiceParseOrSemanticErrorZ_err(CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_InvoiceParseOrSemanticErrorZ = Result_InvoiceParseOrSemanticErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -395,8 +396,8 @@ export class Result_InvoiceParseOrSemanticErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_InvoiceParseOrSemanticErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_InvoiceParseOrSemanticErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +406,7 @@ export class Result_InvoiceParseOrSemanticErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_InvoiceParseOrSemanticErrorZ { - const ret: number = bindings.CResult_InvoiceParseOrSemanticErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_InvoiceParseOrSemanticErrorZ_clone(this.ptr); const ret_hu_conv: Result_InvoiceParseOrSemanticErrorZ = Result_InvoiceParseOrSemanticErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +416,9 @@ export class Result_InvoiceParseOrSemanticErrorZ_OK extends Result_InvoiceParseO public res: Invoice; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_InvoiceParseOrSemanticErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_InvoiceParseOrSemanticErrorZ_get_ok(ptr); const res_hu_conv: Invoice = new Invoice(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +428,9 @@ export class Result_InvoiceParseOrSemanticErrorZ_Err extends Result_InvoiceParse public err: ParseOrSemanticError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_InvoiceParseOrSemanticErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_InvoiceParseOrSemanticErrorZ_get_err(ptr); const err_hu_conv: ParseOrSemanticError = ParseOrSemanticError.constr_from_ptr(err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_InvoiceSemanticErrorZ.mts b/ts/structs/Result_InvoiceSemanticErrorZ.mts index 4f932dac..6a5e0213 100644 --- a/ts/structs/Result_InvoiceSemanticErrorZ.mts +++ b/ts/structs/Result_InvoiceSemanticErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_InvoiceSemanticErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_InvoiceSemanticErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_InvoiceSemanticErrorZ { + public static constr_from_ptr(ptr: bigint): Result_InvoiceSemanticErrorZ { if (bindings.CResult_InvoiceSemanticErrorZ_is_ok(ptr)) { return new Result_InvoiceSemanticErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_InvoiceSemanticErrorZ extends CommonBase { * Creates a new CResult_InvoiceSemanticErrorZ in the success state. */ public static constructor_ok(o: Invoice): Result_InvoiceSemanticErrorZ { - const ret: number = bindings.CResult_InvoiceSemanticErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_InvoiceSemanticErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_InvoiceSemanticErrorZ = Result_InvoiceSemanticErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,7 +383,7 @@ export class Result_InvoiceSemanticErrorZ extends CommonBase { * Creates a new CResult_InvoiceSemanticErrorZ in the error state. */ public static constructor_err(e: SemanticError): Result_InvoiceSemanticErrorZ { - const ret: number = bindings.CResult_InvoiceSemanticErrorZ_err(e); + const ret: bigint = bindings.CResult_InvoiceSemanticErrorZ_err(e); const ret_hu_conv: Result_InvoiceSemanticErrorZ = Result_InvoiceSemanticErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -395,8 +396,8 @@ export class Result_InvoiceSemanticErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_InvoiceSemanticErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_InvoiceSemanticErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +406,7 @@ export class Result_InvoiceSemanticErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_InvoiceSemanticErrorZ { - const ret: number = bindings.CResult_InvoiceSemanticErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_InvoiceSemanticErrorZ_clone(this.ptr); const ret_hu_conv: Result_InvoiceSemanticErrorZ = Result_InvoiceSemanticErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +416,9 @@ export class Result_InvoiceSemanticErrorZ_OK extends Result_InvoiceSemanticError public res: Invoice; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_InvoiceSemanticErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_InvoiceSemanticErrorZ_get_ok(ptr); const res_hu_conv: Invoice = new Invoice(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,7 +428,7 @@ export class Result_InvoiceSemanticErrorZ_Err extends Result_InvoiceSemanticErro public err: SemanticError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); this.err = bindings.CResult_InvoiceSemanticErrorZ_get_err(ptr); } diff --git a/ts/structs/Result_InvoiceSignOrCreationErrorZ.mts b/ts/structs/Result_InvoiceSignOrCreationErrorZ.mts index 21f43d07..82e0a31d 100644 --- a/ts/structs/Result_InvoiceSignOrCreationErrorZ.mts +++ b/ts/structs/Result_InvoiceSignOrCreationErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_InvoiceSignOrCreationErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_InvoiceSignOrCreationErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_InvoiceSignOrCreationErrorZ { + public static constr_from_ptr(ptr: bigint): Result_InvoiceSignOrCreationErrorZ { if (bindings.CResult_InvoiceSignOrCreationErrorZ_is_ok(ptr)) { return new Result_InvoiceSignOrCreationErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_InvoiceSignOrCreationErrorZ extends CommonBase { * Creates a new CResult_InvoiceSignOrCreationErrorZ in the success state. */ public static constructor_ok(o: Invoice): Result_InvoiceSignOrCreationErrorZ { - const ret: number = bindings.CResult_InvoiceSignOrCreationErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_InvoiceSignOrCreationErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_InvoiceSignOrCreationErrorZ = Result_InvoiceSignOrCreationErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,7 +383,7 @@ export class Result_InvoiceSignOrCreationErrorZ extends CommonBase { * Creates a new CResult_InvoiceSignOrCreationErrorZ in the error state. */ public static constructor_err(e: SignOrCreationError): Result_InvoiceSignOrCreationErrorZ { - const ret: number = bindings.CResult_InvoiceSignOrCreationErrorZ_err(CommonBase.get_ptr_of(e)); + const ret: bigint = bindings.CResult_InvoiceSignOrCreationErrorZ_err(CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_InvoiceSignOrCreationErrorZ = Result_InvoiceSignOrCreationErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -395,8 +396,8 @@ export class Result_InvoiceSignOrCreationErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_InvoiceSignOrCreationErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_InvoiceSignOrCreationErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +406,7 @@ export class Result_InvoiceSignOrCreationErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_InvoiceSignOrCreationErrorZ { - const ret: number = bindings.CResult_InvoiceSignOrCreationErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_InvoiceSignOrCreationErrorZ_clone(this.ptr); const ret_hu_conv: Result_InvoiceSignOrCreationErrorZ = Result_InvoiceSignOrCreationErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +416,9 @@ export class Result_InvoiceSignOrCreationErrorZ_OK extends Result_InvoiceSignOrC public res: Invoice; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_InvoiceSignOrCreationErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_InvoiceSignOrCreationErrorZ_get_ok(ptr); const res_hu_conv: Invoice = new Invoice(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +428,9 @@ export class Result_InvoiceSignOrCreationErrorZ_Err extends Result_InvoiceSignOr public err: SignOrCreationError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_InvoiceSignOrCreationErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_InvoiceSignOrCreationErrorZ_get_err(ptr); const err_hu_conv: SignOrCreationError = SignOrCreationError.constr_from_ptr(err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_LockedChannelMonitorNoneZ.mts b/ts/structs/Result_LockedChannelMonitorNoneZ.mts index 8596f5e1..104c3664 100644 --- a/ts/structs/Result_LockedChannelMonitorNoneZ.mts +++ b/ts/structs/Result_LockedChannelMonitorNoneZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_LockedChannelMonitorNoneZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_LockedChannelMonitorNoneZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_LockedChannelMonitorNoneZ { + public static constr_from_ptr(ptr: bigint): Result_LockedChannelMonitorNoneZ { if (bindings.CResult_LockedChannelMonitorNoneZ_is_ok(ptr)) { return new Result_LockedChannelMonitorNoneZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_LockedChannelMonitorNoneZ extends CommonBase { * Creates a new CResult_LockedChannelMonitorNoneZ in the success state. */ public static constructor_ok(o: LockedChannelMonitor): Result_LockedChannelMonitorNoneZ { - const ret: number = bindings.CResult_LockedChannelMonitorNoneZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_LockedChannelMonitorNoneZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_LockedChannelMonitorNoneZ = Result_LockedChannelMonitorNoneZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, o); // Due to rust's strict-ownership memory model, in some cases we need to "move" @@ -391,7 +391,7 @@ export class Result_LockedChannelMonitorNoneZ extends CommonBase { * Creates a new CResult_LockedChannelMonitorNoneZ in the error state. */ public static constructor_err(): Result_LockedChannelMonitorNoneZ { - const ret: number = bindings.CResult_LockedChannelMonitorNoneZ_err(); + const ret: bigint = bindings.CResult_LockedChannelMonitorNoneZ_err(); const ret_hu_conv: Result_LockedChannelMonitorNoneZ = Result_LockedChannelMonitorNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -409,9 +409,9 @@ export class Result_LockedChannelMonitorNoneZ_OK extends Result_LockedChannelMon public res: LockedChannelMonitor; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_LockedChannelMonitorNoneZ_get_ok(ptr); + const res: bigint = bindings.CResult_LockedChannelMonitorNoneZ_get_ok(ptr); const res_hu_conv: LockedChannelMonitor = new LockedChannelMonitor(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -420,7 +420,7 @@ export class Result_LockedChannelMonitorNoneZ_OK extends Result_LockedChannelMon export class Result_LockedChannelMonitorNoneZ_Err extends Result_LockedChannelMonitorNoneZ { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); } } \ No newline at end of file diff --git a/ts/structs/Result_NetAddressDecodeErrorZ.mts b/ts/structs/Result_NetAddressDecodeErrorZ.mts index 23480eb1..58f652c4 100644 --- a/ts/structs/Result_NetAddressDecodeErrorZ.mts +++ b/ts/structs/Result_NetAddressDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_NetAddressDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_NetAddressDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_NetAddressDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_NetAddressDecodeErrorZ { if (bindings.CResult_NetAddressDecodeErrorZ_is_ok(ptr)) { return new Result_NetAddressDecodeErrorZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_NetAddressDecodeErrorZ extends CommonBase { * Creates a new CResult_NetAddressDecodeErrorZ in the success state. */ public static constructor_ok(o: NetAddress): Result_NetAddressDecodeErrorZ { - const ret: number = bindings.CResult_NetAddressDecodeErrorZ_ok(CommonBase.get_ptr_of(o)); + const ret: bigint = bindings.CResult_NetAddressDecodeErrorZ_ok(CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_NetAddressDecodeErrorZ = Result_NetAddressDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,8 +382,9 @@ export class Result_NetAddressDecodeErrorZ extends CommonBase { * Creates a new CResult_NetAddressDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_NetAddressDecodeErrorZ { - const ret: number = bindings.CResult_NetAddressDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_NetAddressDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_NetAddressDecodeErrorZ = Result_NetAddressDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +396,8 @@ export class Result_NetAddressDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_NetAddressDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_NetAddressDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +406,7 @@ export class Result_NetAddressDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_NetAddressDecodeErrorZ { - const ret: number = bindings.CResult_NetAddressDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_NetAddressDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_NetAddressDecodeErrorZ = Result_NetAddressDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +416,9 @@ export class Result_NetAddressDecodeErrorZ_OK extends Result_NetAddressDecodeErr public res: NetAddress; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_NetAddressDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_NetAddressDecodeErrorZ_get_ok(ptr); const res_hu_conv: NetAddress = NetAddress.constr_from_ptr(res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +428,9 @@ export class Result_NetAddressDecodeErrorZ_Err extends Result_NetAddressDecodeEr public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_NetAddressDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_NetAddressDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_NetworkGraphDecodeErrorZ.mts b/ts/structs/Result_NetworkGraphDecodeErrorZ.mts index b8eb7709..7d56b7f6 100644 --- a/ts/structs/Result_NetworkGraphDecodeErrorZ.mts +++ b/ts/structs/Result_NetworkGraphDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_NetworkGraphDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_NetworkGraphDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_NetworkGraphDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_NetworkGraphDecodeErrorZ { if (bindings.CResult_NetworkGraphDecodeErrorZ_is_ok(ptr)) { return new Result_NetworkGraphDecodeErrorZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_NetworkGraphDecodeErrorZ extends CommonBase { * Creates a new CResult_NetworkGraphDecodeErrorZ in the success state. */ public static constructor_ok(o_genesis_hash: Uint8Array, o_logger: Logger): Result_NetworkGraphDecodeErrorZ { - const ret: number = bindings.CResult_NetworkGraphDecodeErrorZ_ok(bindings.NetworkGraph_new(bindings.encodeUint8Array(bindings.check_arr_len(o_genesis_hash, 32)), o_logger == null ? 0 : CommonBase.get_ptr_of(o_logger))); + const ret: bigint = bindings.CResult_NetworkGraphDecodeErrorZ_ok(bindings.NetworkGraph_new(bindings.encodeUint8Array(bindings.check_arr_len(o_genesis_hash, 32)), o_logger == null ? 0n : CommonBase.get_ptr_of(o_logger))); const ret_hu_conv: Result_NetworkGraphDecodeErrorZ = Result_NetworkGraphDecodeErrorZ.constr_from_ptr(ret); ; CommonBase.add_ref_from(ret_hu_conv, o_logger); @@ -384,8 +384,9 @@ export class Result_NetworkGraphDecodeErrorZ extends CommonBase { * Creates a new CResult_NetworkGraphDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_NetworkGraphDecodeErrorZ { - const ret: number = bindings.CResult_NetworkGraphDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_NetworkGraphDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_NetworkGraphDecodeErrorZ = Result_NetworkGraphDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -402,9 +403,9 @@ export class Result_NetworkGraphDecodeErrorZ_OK extends Result_NetworkGraphDecod public res: NetworkGraph; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_NetworkGraphDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_NetworkGraphDecodeErrorZ_get_ok(ptr); const res_hu_conv: NetworkGraph = new NetworkGraph(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -414,9 +415,9 @@ export class Result_NetworkGraphDecodeErrorZ_Err extends Result_NetworkGraphDeco public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_NetworkGraphDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_NetworkGraphDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_NodeAliasDecodeErrorZ.mts b/ts/structs/Result_NodeAliasDecodeErrorZ.mts index d33709d2..4ae2f869 100644 --- a/ts/structs/Result_NodeAliasDecodeErrorZ.mts +++ b/ts/structs/Result_NodeAliasDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_NodeAliasDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_NodeAliasDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_NodeAliasDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_NodeAliasDecodeErrorZ { if (bindings.CResult_NodeAliasDecodeErrorZ_is_ok(ptr)) { return new Result_NodeAliasDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_NodeAliasDecodeErrorZ extends CommonBase { * Creates a new CResult_NodeAliasDecodeErrorZ in the success state. */ public static constructor_ok(o: NodeAlias): Result_NodeAliasDecodeErrorZ { - const ret: number = bindings.CResult_NodeAliasDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_NodeAliasDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_NodeAliasDecodeErrorZ = Result_NodeAliasDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_NodeAliasDecodeErrorZ extends CommonBase { * Creates a new CResult_NodeAliasDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_NodeAliasDecodeErrorZ { - const ret: number = bindings.CResult_NodeAliasDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_NodeAliasDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_NodeAliasDecodeErrorZ = Result_NodeAliasDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_NodeAliasDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_NodeAliasDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_NodeAliasDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_NodeAliasDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_NodeAliasDecodeErrorZ { - const ret: number = bindings.CResult_NodeAliasDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_NodeAliasDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_NodeAliasDecodeErrorZ = Result_NodeAliasDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_NodeAliasDecodeErrorZ_OK extends Result_NodeAliasDecodeError public res: NodeAlias; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_NodeAliasDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_NodeAliasDecodeErrorZ_get_ok(ptr); const res_hu_conv: NodeAlias = new NodeAlias(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_NodeAliasDecodeErrorZ_Err extends Result_NodeAliasDecodeErro public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_NodeAliasDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_NodeAliasDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_NodeAnnouncementDecodeErrorZ.mts b/ts/structs/Result_NodeAnnouncementDecodeErrorZ.mts index 15af0e42..ede94096 100644 --- a/ts/structs/Result_NodeAnnouncementDecodeErrorZ.mts +++ b/ts/structs/Result_NodeAnnouncementDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_NodeAnnouncementDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_NodeAnnouncementDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_NodeAnnouncementDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_NodeAnnouncementDecodeErrorZ { if (bindings.CResult_NodeAnnouncementDecodeErrorZ_is_ok(ptr)) { return new Result_NodeAnnouncementDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_NodeAnnouncementDecodeErrorZ extends CommonBase { * Creates a new CResult_NodeAnnouncementDecodeErrorZ in the success state. */ public static constructor_ok(o: NodeAnnouncement): Result_NodeAnnouncementDecodeErrorZ { - const ret: number = bindings.CResult_NodeAnnouncementDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_NodeAnnouncementDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_NodeAnnouncementDecodeErrorZ = Result_NodeAnnouncementDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_NodeAnnouncementDecodeErrorZ extends CommonBase { * Creates a new CResult_NodeAnnouncementDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_NodeAnnouncementDecodeErrorZ { - const ret: number = bindings.CResult_NodeAnnouncementDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_NodeAnnouncementDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_NodeAnnouncementDecodeErrorZ = Result_NodeAnnouncementDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_NodeAnnouncementDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_NodeAnnouncementDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_NodeAnnouncementDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_NodeAnnouncementDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_NodeAnnouncementDecodeErrorZ { - const ret: number = bindings.CResult_NodeAnnouncementDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_NodeAnnouncementDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_NodeAnnouncementDecodeErrorZ = Result_NodeAnnouncementDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_NodeAnnouncementDecodeErrorZ_OK extends Result_NodeAnnouncem public res: NodeAnnouncement; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_NodeAnnouncementDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_NodeAnnouncementDecodeErrorZ_get_ok(ptr); const res_hu_conv: NodeAnnouncement = new NodeAnnouncement(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_NodeAnnouncementDecodeErrorZ_Err extends Result_NodeAnnounce public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_NodeAnnouncementDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_NodeAnnouncementDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_NodeAnnouncementInfoDecodeErrorZ.mts b/ts/structs/Result_NodeAnnouncementInfoDecodeErrorZ.mts index 13468419..7b521c02 100644 --- a/ts/structs/Result_NodeAnnouncementInfoDecodeErrorZ.mts +++ b/ts/structs/Result_NodeAnnouncementInfoDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_NodeAnnouncementInfoDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_NodeAnnouncementInfoDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_NodeAnnouncementInfoDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_NodeAnnouncementInfoDecodeErrorZ { if (bindings.CResult_NodeAnnouncementInfoDecodeErrorZ_is_ok(ptr)) { return new Result_NodeAnnouncementInfoDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_NodeAnnouncementInfoDecodeErrorZ extends CommonBase { * Creates a new CResult_NodeAnnouncementInfoDecodeErrorZ in the success state. */ public static constructor_ok(o: NodeAnnouncementInfo): Result_NodeAnnouncementInfoDecodeErrorZ { - const ret: number = bindings.CResult_NodeAnnouncementInfoDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_NodeAnnouncementInfoDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_NodeAnnouncementInfoDecodeErrorZ = Result_NodeAnnouncementInfoDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_NodeAnnouncementInfoDecodeErrorZ extends CommonBase { * Creates a new CResult_NodeAnnouncementInfoDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_NodeAnnouncementInfoDecodeErrorZ { - const ret: number = bindings.CResult_NodeAnnouncementInfoDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_NodeAnnouncementInfoDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_NodeAnnouncementInfoDecodeErrorZ = Result_NodeAnnouncementInfoDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_NodeAnnouncementInfoDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_NodeAnnouncementInfoDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_NodeAnnouncementInfoDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_NodeAnnouncementInfoDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_NodeAnnouncementInfoDecodeErrorZ { - const ret: number = bindings.CResult_NodeAnnouncementInfoDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_NodeAnnouncementInfoDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_NodeAnnouncementInfoDecodeErrorZ = Result_NodeAnnouncementInfoDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_NodeAnnouncementInfoDecodeErrorZ_OK extends Result_NodeAnnou public res: NodeAnnouncementInfo; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_NodeAnnouncementInfoDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_NodeAnnouncementInfoDecodeErrorZ_get_ok(ptr); const res_hu_conv: NodeAnnouncementInfo = new NodeAnnouncementInfo(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_NodeAnnouncementInfoDecodeErrorZ_Err extends Result_NodeAnno public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_NodeAnnouncementInfoDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_NodeAnnouncementInfoDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_NodeFeaturesDecodeErrorZ.mts b/ts/structs/Result_NodeFeaturesDecodeErrorZ.mts index f5484dd0..fee785cc 100644 --- a/ts/structs/Result_NodeFeaturesDecodeErrorZ.mts +++ b/ts/structs/Result_NodeFeaturesDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_NodeFeaturesDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_NodeFeaturesDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_NodeFeaturesDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_NodeFeaturesDecodeErrorZ { if (bindings.CResult_NodeFeaturesDecodeErrorZ_is_ok(ptr)) { return new Result_NodeFeaturesDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_NodeFeaturesDecodeErrorZ extends CommonBase { * Creates a new CResult_NodeFeaturesDecodeErrorZ in the success state. */ public static constructor_ok(o: NodeFeatures): Result_NodeFeaturesDecodeErrorZ { - const ret: number = bindings.CResult_NodeFeaturesDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_NodeFeaturesDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_NodeFeaturesDecodeErrorZ = Result_NodeFeaturesDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_NodeFeaturesDecodeErrorZ extends CommonBase { * Creates a new CResult_NodeFeaturesDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_NodeFeaturesDecodeErrorZ { - const ret: number = bindings.CResult_NodeFeaturesDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_NodeFeaturesDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_NodeFeaturesDecodeErrorZ = Result_NodeFeaturesDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_NodeFeaturesDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_NodeFeaturesDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_NodeFeaturesDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_NodeFeaturesDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_NodeFeaturesDecodeErrorZ { - const ret: number = bindings.CResult_NodeFeaturesDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_NodeFeaturesDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_NodeFeaturesDecodeErrorZ = Result_NodeFeaturesDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_NodeFeaturesDecodeErrorZ_OK extends Result_NodeFeaturesDecod public res: NodeFeatures; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_NodeFeaturesDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_NodeFeaturesDecodeErrorZ_get_ok(ptr); const res_hu_conv: NodeFeatures = new NodeFeatures(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_NodeFeaturesDecodeErrorZ_Err extends Result_NodeFeaturesDeco public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_NodeFeaturesDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_NodeFeaturesDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_NodeIdDecodeErrorZ.mts b/ts/structs/Result_NodeIdDecodeErrorZ.mts index f845386f..8977bca6 100644 --- a/ts/structs/Result_NodeIdDecodeErrorZ.mts +++ b/ts/structs/Result_NodeIdDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_NodeIdDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_NodeIdDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_NodeIdDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_NodeIdDecodeErrorZ { if (bindings.CResult_NodeIdDecodeErrorZ_is_ok(ptr)) { return new Result_NodeIdDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_NodeIdDecodeErrorZ extends CommonBase { * Creates a new CResult_NodeIdDecodeErrorZ in the success state. */ public static constructor_ok(o: NodeId): Result_NodeIdDecodeErrorZ { - const ret: number = bindings.CResult_NodeIdDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_NodeIdDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_NodeIdDecodeErrorZ = Result_NodeIdDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_NodeIdDecodeErrorZ extends CommonBase { * Creates a new CResult_NodeIdDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_NodeIdDecodeErrorZ { - const ret: number = bindings.CResult_NodeIdDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_NodeIdDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_NodeIdDecodeErrorZ = Result_NodeIdDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_NodeIdDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_NodeIdDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_NodeIdDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_NodeIdDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_NodeIdDecodeErrorZ { - const ret: number = bindings.CResult_NodeIdDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_NodeIdDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_NodeIdDecodeErrorZ = Result_NodeIdDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_NodeIdDecodeErrorZ_OK extends Result_NodeIdDecodeErrorZ { public res: NodeId; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_NodeIdDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_NodeIdDecodeErrorZ_get_ok(ptr); const res_hu_conv: NodeId = new NodeId(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_NodeIdDecodeErrorZ_Err extends Result_NodeIdDecodeErrorZ { public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_NodeIdDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_NodeIdDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_NodeInfoDecodeErrorZ.mts b/ts/structs/Result_NodeInfoDecodeErrorZ.mts index 397cfd53..84efcfb6 100644 --- a/ts/structs/Result_NodeInfoDecodeErrorZ.mts +++ b/ts/structs/Result_NodeInfoDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_NodeInfoDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_NodeInfoDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_NodeInfoDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_NodeInfoDecodeErrorZ { if (bindings.CResult_NodeInfoDecodeErrorZ_is_ok(ptr)) { return new Result_NodeInfoDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_NodeInfoDecodeErrorZ extends CommonBase { * Creates a new CResult_NodeInfoDecodeErrorZ in the success state. */ public static constructor_ok(o: NodeInfo): Result_NodeInfoDecodeErrorZ { - const ret: number = bindings.CResult_NodeInfoDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_NodeInfoDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_NodeInfoDecodeErrorZ = Result_NodeInfoDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_NodeInfoDecodeErrorZ extends CommonBase { * Creates a new CResult_NodeInfoDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_NodeInfoDecodeErrorZ { - const ret: number = bindings.CResult_NodeInfoDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_NodeInfoDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_NodeInfoDecodeErrorZ = Result_NodeInfoDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_NodeInfoDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_NodeInfoDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_NodeInfoDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_NodeInfoDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_NodeInfoDecodeErrorZ { - const ret: number = bindings.CResult_NodeInfoDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_NodeInfoDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_NodeInfoDecodeErrorZ = Result_NodeInfoDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_NodeInfoDecodeErrorZ_OK extends Result_NodeInfoDecodeErrorZ public res: NodeInfo; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_NodeInfoDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_NodeInfoDecodeErrorZ_get_ok(ptr); const res_hu_conv: NodeInfo = new NodeInfo(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_NodeInfoDecodeErrorZ_Err extends Result_NodeInfoDecodeErrorZ public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_NodeInfoDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_NodeInfoDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_NoneAPIErrorZ.mts b/ts/structs/Result_NoneAPIErrorZ.mts index ccad1cb2..811b7d98 100644 --- a/ts/structs/Result_NoneAPIErrorZ.mts +++ b/ts/structs/Result_NoneAPIErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_NoneAPIErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_NoneAPIErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_NoneAPIErrorZ { + public static constr_from_ptr(ptr: bigint): Result_NoneAPIErrorZ { if (bindings.CResult_NoneAPIErrorZ_is_ok(ptr)) { return new Result_NoneAPIErrorZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_NoneAPIErrorZ extends CommonBase { * Creates a new CResult_NoneAPIErrorZ in the success state. */ public static constructor_ok(): Result_NoneAPIErrorZ { - const ret: number = bindings.CResult_NoneAPIErrorZ_ok(); + const ret: bigint = bindings.CResult_NoneAPIErrorZ_ok(); const ret_hu_conv: Result_NoneAPIErrorZ = Result_NoneAPIErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,7 +382,7 @@ export class Result_NoneAPIErrorZ extends CommonBase { * Creates a new CResult_NoneAPIErrorZ in the error state. */ public static constructor_err(e: APIError): Result_NoneAPIErrorZ { - const ret: number = bindings.CResult_NoneAPIErrorZ_err(CommonBase.get_ptr_of(e)); + const ret: bigint = bindings.CResult_NoneAPIErrorZ_err(CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_NoneAPIErrorZ = Result_NoneAPIErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -395,8 +395,8 @@ export class Result_NoneAPIErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_NoneAPIErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_NoneAPIErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +405,7 @@ export class Result_NoneAPIErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_NoneAPIErrorZ { - const ret: number = bindings.CResult_NoneAPIErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_NoneAPIErrorZ_clone(this.ptr); const ret_hu_conv: Result_NoneAPIErrorZ = Result_NoneAPIErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -414,7 +414,7 @@ export class Result_NoneAPIErrorZ extends CommonBase { export class Result_NoneAPIErrorZ_OK extends Result_NoneAPIErrorZ { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); } } @@ -422,9 +422,9 @@ export class Result_NoneAPIErrorZ_Err extends Result_NoneAPIErrorZ { public err: APIError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_NoneAPIErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_NoneAPIErrorZ_get_err(ptr); const err_hu_conv: APIError = APIError.constr_from_ptr(err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_NoneChannelMonitorUpdateErrZ.mts b/ts/structs/Result_NoneChannelMonitorUpdateErrZ.mts index 3126ccaf..6d9b9011 100644 --- a/ts/structs/Result_NoneChannelMonitorUpdateErrZ.mts +++ b/ts/structs/Result_NoneChannelMonitorUpdateErrZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_NoneChannelMonitorUpdateErrZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_NoneChannelMonitorUpdateErrZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_NoneChannelMonitorUpdateErrZ { + public static constr_from_ptr(ptr: bigint): Result_NoneChannelMonitorUpdateErrZ { if (bindings.CResult_NoneChannelMonitorUpdateErrZ_is_ok(ptr)) { return new Result_NoneChannelMonitorUpdateErrZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_NoneChannelMonitorUpdateErrZ extends CommonBase { * Creates a new CResult_NoneChannelMonitorUpdateErrZ in the success state. */ public static constructor_ok(): Result_NoneChannelMonitorUpdateErrZ { - const ret: number = bindings.CResult_NoneChannelMonitorUpdateErrZ_ok(); + const ret: bigint = bindings.CResult_NoneChannelMonitorUpdateErrZ_ok(); const ret_hu_conv: Result_NoneChannelMonitorUpdateErrZ = Result_NoneChannelMonitorUpdateErrZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,7 +382,7 @@ export class Result_NoneChannelMonitorUpdateErrZ extends CommonBase { * Creates a new CResult_NoneChannelMonitorUpdateErrZ in the error state. */ public static constructor_err(e: ChannelMonitorUpdateErr): Result_NoneChannelMonitorUpdateErrZ { - const ret: number = bindings.CResult_NoneChannelMonitorUpdateErrZ_err(e); + const ret: bigint = bindings.CResult_NoneChannelMonitorUpdateErrZ_err(e); const ret_hu_conv: Result_NoneChannelMonitorUpdateErrZ = Result_NoneChannelMonitorUpdateErrZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -395,8 +395,8 @@ export class Result_NoneChannelMonitorUpdateErrZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_NoneChannelMonitorUpdateErrZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_NoneChannelMonitorUpdateErrZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +405,7 @@ export class Result_NoneChannelMonitorUpdateErrZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_NoneChannelMonitorUpdateErrZ { - const ret: number = bindings.CResult_NoneChannelMonitorUpdateErrZ_clone(this.ptr); + const ret: bigint = bindings.CResult_NoneChannelMonitorUpdateErrZ_clone(this.ptr); const ret_hu_conv: Result_NoneChannelMonitorUpdateErrZ = Result_NoneChannelMonitorUpdateErrZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -414,7 +414,7 @@ export class Result_NoneChannelMonitorUpdateErrZ extends CommonBase { export class Result_NoneChannelMonitorUpdateErrZ_OK extends Result_NoneChannelMonitorUpdateErrZ { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); } } @@ -422,7 +422,7 @@ export class Result_NoneChannelMonitorUpdateErrZ_Err extends Result_NoneChannelM public err: ChannelMonitorUpdateErr; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); this.err = bindings.CResult_NoneChannelMonitorUpdateErrZ_get_err(ptr); } diff --git a/ts/structs/Result_NoneErrorZ.mts b/ts/structs/Result_NoneErrorZ.mts index 2b6d25e4..7ad160cc 100644 --- a/ts/structs/Result_NoneErrorZ.mts +++ b/ts/structs/Result_NoneErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_NoneErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_NoneErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_NoneErrorZ { + public static constr_from_ptr(ptr: bigint): Result_NoneErrorZ { if (bindings.CResult_NoneErrorZ_is_ok(ptr)) { return new Result_NoneErrorZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_NoneErrorZ extends CommonBase { * Creates a new CResult_NoneErrorZ in the success state. */ public static constructor_ok(): Result_NoneErrorZ { - const ret: number = bindings.CResult_NoneErrorZ_ok(); + const ret: bigint = bindings.CResult_NoneErrorZ_ok(); const ret_hu_conv: Result_NoneErrorZ = Result_NoneErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,7 +382,7 @@ export class Result_NoneErrorZ extends CommonBase { * Creates a new CResult_NoneErrorZ in the error state. */ public static constructor_err(e: IOError): Result_NoneErrorZ { - const ret: number = bindings.CResult_NoneErrorZ_err(e); + const ret: bigint = bindings.CResult_NoneErrorZ_err(e); const ret_hu_conv: Result_NoneErrorZ = Result_NoneErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -395,8 +395,8 @@ export class Result_NoneErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_NoneErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_NoneErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +405,7 @@ export class Result_NoneErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_NoneErrorZ { - const ret: number = bindings.CResult_NoneErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_NoneErrorZ_clone(this.ptr); const ret_hu_conv: Result_NoneErrorZ = Result_NoneErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -414,7 +414,7 @@ export class Result_NoneErrorZ extends CommonBase { export class Result_NoneErrorZ_OK extends Result_NoneErrorZ { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); } } @@ -422,7 +422,7 @@ export class Result_NoneErrorZ_Err extends Result_NoneErrorZ { public err: IOError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); this.err = bindings.CResult_NoneErrorZ_get_err(ptr); } diff --git a/ts/structs/Result_NoneLightningErrorZ.mts b/ts/structs/Result_NoneLightningErrorZ.mts index 35bb5b14..9bb6bbcc 100644 --- a/ts/structs/Result_NoneLightningErrorZ.mts +++ b/ts/structs/Result_NoneLightningErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_NoneLightningErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_NoneLightningErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_NoneLightningErrorZ { + public static constr_from_ptr(ptr: bigint): Result_NoneLightningErrorZ { if (bindings.CResult_NoneLightningErrorZ_is_ok(ptr)) { return new Result_NoneLightningErrorZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_NoneLightningErrorZ extends CommonBase { * Creates a new CResult_NoneLightningErrorZ in the success state. */ public static constructor_ok(): Result_NoneLightningErrorZ { - const ret: number = bindings.CResult_NoneLightningErrorZ_ok(); + const ret: bigint = bindings.CResult_NoneLightningErrorZ_ok(); const ret_hu_conv: Result_NoneLightningErrorZ = Result_NoneLightningErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,8 +382,9 @@ export class Result_NoneLightningErrorZ extends CommonBase { * Creates a new CResult_NoneLightningErrorZ in the error state. */ public static constructor_err(e: LightningError): Result_NoneLightningErrorZ { - const ret: number = bindings.CResult_NoneLightningErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_NoneLightningErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_NoneLightningErrorZ = Result_NoneLightningErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +396,8 @@ export class Result_NoneLightningErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_NoneLightningErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_NoneLightningErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +406,7 @@ export class Result_NoneLightningErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_NoneLightningErrorZ { - const ret: number = bindings.CResult_NoneLightningErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_NoneLightningErrorZ_clone(this.ptr); const ret_hu_conv: Result_NoneLightningErrorZ = Result_NoneLightningErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -414,7 +415,7 @@ export class Result_NoneLightningErrorZ extends CommonBase { export class Result_NoneLightningErrorZ_OK extends Result_NoneLightningErrorZ { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); } } @@ -422,9 +423,9 @@ export class Result_NoneLightningErrorZ_Err extends Result_NoneLightningErrorZ { public err: LightningError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_NoneLightningErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_NoneLightningErrorZ_get_err(ptr); const err_hu_conv: LightningError = new LightningError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_NoneNoneZ.mts b/ts/structs/Result_NoneNoneZ.mts index 45433ded..f8c216f1 100644 --- a/ts/structs/Result_NoneNoneZ.mts +++ b/ts/structs/Result_NoneNoneZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_NoneNoneZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_NoneNoneZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_NoneNoneZ { + public static constr_from_ptr(ptr: bigint): Result_NoneNoneZ { if (bindings.CResult_NoneNoneZ_is_ok(ptr)) { return new Result_NoneNoneZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_NoneNoneZ extends CommonBase { * Creates a new CResult_NoneNoneZ in the success state. */ public static constructor_ok(): Result_NoneNoneZ { - const ret: number = bindings.CResult_NoneNoneZ_ok(); + const ret: bigint = bindings.CResult_NoneNoneZ_ok(); const ret_hu_conv: Result_NoneNoneZ = Result_NoneNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,7 +382,7 @@ export class Result_NoneNoneZ extends CommonBase { * Creates a new CResult_NoneNoneZ in the error state. */ public static constructor_err(): Result_NoneNoneZ { - const ret: number = bindings.CResult_NoneNoneZ_err(); + const ret: bigint = bindings.CResult_NoneNoneZ_err(); const ret_hu_conv: Result_NoneNoneZ = Result_NoneNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -395,8 +395,8 @@ export class Result_NoneNoneZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_NoneNoneZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_NoneNoneZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +405,7 @@ export class Result_NoneNoneZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_NoneNoneZ { - const ret: number = bindings.CResult_NoneNoneZ_clone(this.ptr); + const ret: bigint = bindings.CResult_NoneNoneZ_clone(this.ptr); const ret_hu_conv: Result_NoneNoneZ = Result_NoneNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -414,14 +414,14 @@ export class Result_NoneNoneZ extends CommonBase { export class Result_NoneNoneZ_OK extends Result_NoneNoneZ { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); } } export class Result_NoneNoneZ_Err extends Result_NoneNoneZ { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); } } \ No newline at end of file diff --git a/ts/structs/Result_NonePaymentSendFailureZ.mts b/ts/structs/Result_NonePaymentSendFailureZ.mts index 187b96d6..8a05c2db 100644 --- a/ts/structs/Result_NonePaymentSendFailureZ.mts +++ b/ts/structs/Result_NonePaymentSendFailureZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_NonePaymentSendFailureZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_NonePaymentSendFailureZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_NonePaymentSendFailureZ { + public static constr_from_ptr(ptr: bigint): Result_NonePaymentSendFailureZ { if (bindings.CResult_NonePaymentSendFailureZ_is_ok(ptr)) { return new Result_NonePaymentSendFailureZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_NonePaymentSendFailureZ extends CommonBase { * Creates a new CResult_NonePaymentSendFailureZ in the success state. */ public static constructor_ok(): Result_NonePaymentSendFailureZ { - const ret: number = bindings.CResult_NonePaymentSendFailureZ_ok(); + const ret: bigint = bindings.CResult_NonePaymentSendFailureZ_ok(); const ret_hu_conv: Result_NonePaymentSendFailureZ = Result_NonePaymentSendFailureZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,7 +382,7 @@ export class Result_NonePaymentSendFailureZ extends CommonBase { * Creates a new CResult_NonePaymentSendFailureZ in the error state. */ public static constructor_err(e: PaymentSendFailure): Result_NonePaymentSendFailureZ { - const ret: number = bindings.CResult_NonePaymentSendFailureZ_err(CommonBase.get_ptr_of(e)); + const ret: bigint = bindings.CResult_NonePaymentSendFailureZ_err(CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_NonePaymentSendFailureZ = Result_NonePaymentSendFailureZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -395,8 +395,8 @@ export class Result_NonePaymentSendFailureZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_NonePaymentSendFailureZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_NonePaymentSendFailureZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +405,7 @@ export class Result_NonePaymentSendFailureZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_NonePaymentSendFailureZ { - const ret: number = bindings.CResult_NonePaymentSendFailureZ_clone(this.ptr); + const ret: bigint = bindings.CResult_NonePaymentSendFailureZ_clone(this.ptr); const ret_hu_conv: Result_NonePaymentSendFailureZ = Result_NonePaymentSendFailureZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -414,7 +414,7 @@ export class Result_NonePaymentSendFailureZ extends CommonBase { export class Result_NonePaymentSendFailureZ_OK extends Result_NonePaymentSendFailureZ { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); } } @@ -422,9 +422,9 @@ export class Result_NonePaymentSendFailureZ_Err extends Result_NonePaymentSendFa public err: PaymentSendFailure; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_NonePaymentSendFailureZ_get_err(ptr); + const err: bigint = bindings.CResult_NonePaymentSendFailureZ_get_err(ptr); const err_hu_conv: PaymentSendFailure = PaymentSendFailure.constr_from_ptr(err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_NonePeerHandleErrorZ.mts b/ts/structs/Result_NonePeerHandleErrorZ.mts index f6a99c95..9c5bf814 100644 --- a/ts/structs/Result_NonePeerHandleErrorZ.mts +++ b/ts/structs/Result_NonePeerHandleErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_NonePeerHandleErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_NonePeerHandleErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_NonePeerHandleErrorZ { + public static constr_from_ptr(ptr: bigint): Result_NonePeerHandleErrorZ { if (bindings.CResult_NonePeerHandleErrorZ_is_ok(ptr)) { return new Result_NonePeerHandleErrorZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_NonePeerHandleErrorZ extends CommonBase { * Creates a new CResult_NonePeerHandleErrorZ in the success state. */ public static constructor_ok(): Result_NonePeerHandleErrorZ { - const ret: number = bindings.CResult_NonePeerHandleErrorZ_ok(); + const ret: bigint = bindings.CResult_NonePeerHandleErrorZ_ok(); const ret_hu_conv: Result_NonePeerHandleErrorZ = Result_NonePeerHandleErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,8 +382,9 @@ export class Result_NonePeerHandleErrorZ extends CommonBase { * Creates a new CResult_NonePeerHandleErrorZ in the error state. */ public static constructor_err(e: PeerHandleError): Result_NonePeerHandleErrorZ { - const ret: number = bindings.CResult_NonePeerHandleErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_NonePeerHandleErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_NonePeerHandleErrorZ = Result_NonePeerHandleErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +396,8 @@ export class Result_NonePeerHandleErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_NonePeerHandleErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_NonePeerHandleErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +406,7 @@ export class Result_NonePeerHandleErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_NonePeerHandleErrorZ { - const ret: number = bindings.CResult_NonePeerHandleErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_NonePeerHandleErrorZ_clone(this.ptr); const ret_hu_conv: Result_NonePeerHandleErrorZ = Result_NonePeerHandleErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -414,7 +415,7 @@ export class Result_NonePeerHandleErrorZ extends CommonBase { export class Result_NonePeerHandleErrorZ_OK extends Result_NonePeerHandleErrorZ { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); } } @@ -422,9 +423,9 @@ export class Result_NonePeerHandleErrorZ_Err extends Result_NonePeerHandleErrorZ public err: PeerHandleError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_NonePeerHandleErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_NonePeerHandleErrorZ_get_err(ptr); const err_hu_conv: PeerHandleError = new PeerHandleError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_NoneSemanticErrorZ.mts b/ts/structs/Result_NoneSemanticErrorZ.mts index b29dc9b8..9ce1f08c 100644 --- a/ts/structs/Result_NoneSemanticErrorZ.mts +++ b/ts/structs/Result_NoneSemanticErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_NoneSemanticErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_NoneSemanticErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_NoneSemanticErrorZ { + public static constr_from_ptr(ptr: bigint): Result_NoneSemanticErrorZ { if (bindings.CResult_NoneSemanticErrorZ_is_ok(ptr)) { return new Result_NoneSemanticErrorZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_NoneSemanticErrorZ extends CommonBase { * Creates a new CResult_NoneSemanticErrorZ in the success state. */ public static constructor_ok(): Result_NoneSemanticErrorZ { - const ret: number = bindings.CResult_NoneSemanticErrorZ_ok(); + const ret: bigint = bindings.CResult_NoneSemanticErrorZ_ok(); const ret_hu_conv: Result_NoneSemanticErrorZ = Result_NoneSemanticErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,7 +382,7 @@ export class Result_NoneSemanticErrorZ extends CommonBase { * Creates a new CResult_NoneSemanticErrorZ in the error state. */ public static constructor_err(e: SemanticError): Result_NoneSemanticErrorZ { - const ret: number = bindings.CResult_NoneSemanticErrorZ_err(e); + const ret: bigint = bindings.CResult_NoneSemanticErrorZ_err(e); const ret_hu_conv: Result_NoneSemanticErrorZ = Result_NoneSemanticErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -395,8 +395,8 @@ export class Result_NoneSemanticErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_NoneSemanticErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_NoneSemanticErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +405,7 @@ export class Result_NoneSemanticErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_NoneSemanticErrorZ { - const ret: number = bindings.CResult_NoneSemanticErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_NoneSemanticErrorZ_clone(this.ptr); const ret_hu_conv: Result_NoneSemanticErrorZ = Result_NoneSemanticErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -414,7 +414,7 @@ export class Result_NoneSemanticErrorZ extends CommonBase { export class Result_NoneSemanticErrorZ_OK extends Result_NoneSemanticErrorZ { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); } } @@ -422,7 +422,7 @@ export class Result_NoneSemanticErrorZ_Err extends Result_NoneSemanticErrorZ { public err: SemanticError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); this.err = bindings.CResult_NoneSemanticErrorZ_get_err(ptr); } diff --git a/ts/structs/Result_OpenChannelDecodeErrorZ.mts b/ts/structs/Result_OpenChannelDecodeErrorZ.mts index 8a478ede..47129154 100644 --- a/ts/structs/Result_OpenChannelDecodeErrorZ.mts +++ b/ts/structs/Result_OpenChannelDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_OpenChannelDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_OpenChannelDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_OpenChannelDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_OpenChannelDecodeErrorZ { if (bindings.CResult_OpenChannelDecodeErrorZ_is_ok(ptr)) { return new Result_OpenChannelDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_OpenChannelDecodeErrorZ extends CommonBase { * Creates a new CResult_OpenChannelDecodeErrorZ in the success state. */ public static constructor_ok(o: OpenChannel): Result_OpenChannelDecodeErrorZ { - const ret: number = bindings.CResult_OpenChannelDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_OpenChannelDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_OpenChannelDecodeErrorZ = Result_OpenChannelDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_OpenChannelDecodeErrorZ extends CommonBase { * Creates a new CResult_OpenChannelDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_OpenChannelDecodeErrorZ { - const ret: number = bindings.CResult_OpenChannelDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_OpenChannelDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_OpenChannelDecodeErrorZ = Result_OpenChannelDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_OpenChannelDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_OpenChannelDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_OpenChannelDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_OpenChannelDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_OpenChannelDecodeErrorZ { - const ret: number = bindings.CResult_OpenChannelDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_OpenChannelDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_OpenChannelDecodeErrorZ = Result_OpenChannelDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_OpenChannelDecodeErrorZ_OK extends Result_OpenChannelDecodeE public res: OpenChannel; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_OpenChannelDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_OpenChannelDecodeErrorZ_get_ok(ptr); const res_hu_conv: OpenChannel = new OpenChannel(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_OpenChannelDecodeErrorZ_Err extends Result_OpenChannelDecode public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_OpenChannelDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_OpenChannelDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_OutPointDecodeErrorZ.mts b/ts/structs/Result_OutPointDecodeErrorZ.mts index 3bc3d9b0..0bf8b19b 100644 --- a/ts/structs/Result_OutPointDecodeErrorZ.mts +++ b/ts/structs/Result_OutPointDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_OutPointDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_OutPointDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_OutPointDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_OutPointDecodeErrorZ { if (bindings.CResult_OutPointDecodeErrorZ_is_ok(ptr)) { return new Result_OutPointDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_OutPointDecodeErrorZ extends CommonBase { * Creates a new CResult_OutPointDecodeErrorZ in the success state. */ public static constructor_ok(o: OutPoint): Result_OutPointDecodeErrorZ { - const ret: number = bindings.CResult_OutPointDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_OutPointDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_OutPointDecodeErrorZ = Result_OutPointDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_OutPointDecodeErrorZ extends CommonBase { * Creates a new CResult_OutPointDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_OutPointDecodeErrorZ { - const ret: number = bindings.CResult_OutPointDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_OutPointDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_OutPointDecodeErrorZ = Result_OutPointDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_OutPointDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_OutPointDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_OutPointDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_OutPointDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_OutPointDecodeErrorZ { - const ret: number = bindings.CResult_OutPointDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_OutPointDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_OutPointDecodeErrorZ = Result_OutPointDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_OutPointDecodeErrorZ_OK extends Result_OutPointDecodeErrorZ public res: OutPoint; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_OutPointDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_OutPointDecodeErrorZ_get_ok(ptr); const res_hu_conv: OutPoint = new OutPoint(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_OutPointDecodeErrorZ_Err extends Result_OutPointDecodeErrorZ public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_OutPointDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_OutPointDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_PayeePubKeyErrorZ.mts b/ts/structs/Result_PayeePubKeyErrorZ.mts index 4128e054..6b7bc827 100644 --- a/ts/structs/Result_PayeePubKeyErrorZ.mts +++ b/ts/structs/Result_PayeePubKeyErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_PayeePubKeyErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_PayeePubKeyErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_PayeePubKeyErrorZ { + public static constr_from_ptr(ptr: bigint): Result_PayeePubKeyErrorZ { if (bindings.CResult_PayeePubKeyErrorZ_is_ok(ptr)) { return new Result_PayeePubKeyErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_PayeePubKeyErrorZ extends CommonBase { * Creates a new CResult_PayeePubKeyErrorZ in the success state. */ public static constructor_ok(o: PayeePubKey): Result_PayeePubKeyErrorZ { - const ret: number = bindings.CResult_PayeePubKeyErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_PayeePubKeyErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_PayeePubKeyErrorZ = Result_PayeePubKeyErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,7 +383,7 @@ export class Result_PayeePubKeyErrorZ extends CommonBase { * Creates a new CResult_PayeePubKeyErrorZ in the error state. */ public static constructor_err(e: Secp256k1Error): Result_PayeePubKeyErrorZ { - const ret: number = bindings.CResult_PayeePubKeyErrorZ_err(e); + const ret: bigint = bindings.CResult_PayeePubKeyErrorZ_err(e); const ret_hu_conv: Result_PayeePubKeyErrorZ = Result_PayeePubKeyErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -395,8 +396,8 @@ export class Result_PayeePubKeyErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_PayeePubKeyErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_PayeePubKeyErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +406,7 @@ export class Result_PayeePubKeyErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_PayeePubKeyErrorZ { - const ret: number = bindings.CResult_PayeePubKeyErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_PayeePubKeyErrorZ_clone(this.ptr); const ret_hu_conv: Result_PayeePubKeyErrorZ = Result_PayeePubKeyErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +416,9 @@ export class Result_PayeePubKeyErrorZ_OK extends Result_PayeePubKeyErrorZ { public res: PayeePubKey; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_PayeePubKeyErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_PayeePubKeyErrorZ_get_ok(ptr); const res_hu_conv: PayeePubKey = new PayeePubKey(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,7 +428,7 @@ export class Result_PayeePubKeyErrorZ_Err extends Result_PayeePubKeyErrorZ { public err: Secp256k1Error; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); this.err = bindings.CResult_PayeePubKeyErrorZ_get_err(ptr); } diff --git a/ts/structs/Result_PaymentIdPaymentErrorZ.mts b/ts/structs/Result_PaymentIdPaymentErrorZ.mts index 23c77202..1afd254c 100644 --- a/ts/structs/Result_PaymentIdPaymentErrorZ.mts +++ b/ts/structs/Result_PaymentIdPaymentErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_PaymentIdPaymentErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_PaymentIdPaymentErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_PaymentIdPaymentErrorZ { + public static constr_from_ptr(ptr: bigint): Result_PaymentIdPaymentErrorZ { if (bindings.CResult_PaymentIdPaymentErrorZ_is_ok(ptr)) { return new Result_PaymentIdPaymentErrorZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_PaymentIdPaymentErrorZ extends CommonBase { * Creates a new CResult_PaymentIdPaymentErrorZ in the success state. */ public static constructor_ok(o: Uint8Array): Result_PaymentIdPaymentErrorZ { - const ret: number = bindings.CResult_PaymentIdPaymentErrorZ_ok(bindings.encodeUint8Array(bindings.check_arr_len(o, 32))); + const ret: bigint = bindings.CResult_PaymentIdPaymentErrorZ_ok(bindings.encodeUint8Array(bindings.check_arr_len(o, 32))); const ret_hu_conv: Result_PaymentIdPaymentErrorZ = Result_PaymentIdPaymentErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,7 +382,7 @@ export class Result_PaymentIdPaymentErrorZ extends CommonBase { * Creates a new CResult_PaymentIdPaymentErrorZ in the error state. */ public static constructor_err(e: PaymentError): Result_PaymentIdPaymentErrorZ { - const ret: number = bindings.CResult_PaymentIdPaymentErrorZ_err(CommonBase.get_ptr_of(e)); + const ret: bigint = bindings.CResult_PaymentIdPaymentErrorZ_err(CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_PaymentIdPaymentErrorZ = Result_PaymentIdPaymentErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -395,8 +395,8 @@ export class Result_PaymentIdPaymentErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_PaymentIdPaymentErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_PaymentIdPaymentErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +405,7 @@ export class Result_PaymentIdPaymentErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_PaymentIdPaymentErrorZ { - const ret: number = bindings.CResult_PaymentIdPaymentErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_PaymentIdPaymentErrorZ_clone(this.ptr); const ret_hu_conv: Result_PaymentIdPaymentErrorZ = Result_PaymentIdPaymentErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,7 +415,7 @@ export class Result_PaymentIdPaymentErrorZ_OK extends Result_PaymentIdPaymentErr public res: Uint8Array; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); const res: number = bindings.CResult_PaymentIdPaymentErrorZ_get_ok(ptr); const res_conv: Uint8Array = bindings.decodeUint8Array(res); @@ -426,9 +426,9 @@ export class Result_PaymentIdPaymentErrorZ_Err extends Result_PaymentIdPaymentEr public err: PaymentError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_PaymentIdPaymentErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_PaymentIdPaymentErrorZ_get_err(ptr); const err_hu_conv: PaymentError = PaymentError.constr_from_ptr(err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_PaymentIdPaymentSendFailureZ.mts b/ts/structs/Result_PaymentIdPaymentSendFailureZ.mts index 5b05b964..c2862452 100644 --- a/ts/structs/Result_PaymentIdPaymentSendFailureZ.mts +++ b/ts/structs/Result_PaymentIdPaymentSendFailureZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_PaymentIdPaymentSendFailureZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_PaymentIdPaymentSendFailureZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_PaymentIdPaymentSendFailureZ { + public static constr_from_ptr(ptr: bigint): Result_PaymentIdPaymentSendFailureZ { if (bindings.CResult_PaymentIdPaymentSendFailureZ_is_ok(ptr)) { return new Result_PaymentIdPaymentSendFailureZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_PaymentIdPaymentSendFailureZ extends CommonBase { * Creates a new CResult_PaymentIdPaymentSendFailureZ in the success state. */ public static constructor_ok(o: Uint8Array): Result_PaymentIdPaymentSendFailureZ { - const ret: number = bindings.CResult_PaymentIdPaymentSendFailureZ_ok(bindings.encodeUint8Array(bindings.check_arr_len(o, 32))); + const ret: bigint = bindings.CResult_PaymentIdPaymentSendFailureZ_ok(bindings.encodeUint8Array(bindings.check_arr_len(o, 32))); const ret_hu_conv: Result_PaymentIdPaymentSendFailureZ = Result_PaymentIdPaymentSendFailureZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,7 +382,7 @@ export class Result_PaymentIdPaymentSendFailureZ extends CommonBase { * Creates a new CResult_PaymentIdPaymentSendFailureZ in the error state. */ public static constructor_err(e: PaymentSendFailure): Result_PaymentIdPaymentSendFailureZ { - const ret: number = bindings.CResult_PaymentIdPaymentSendFailureZ_err(CommonBase.get_ptr_of(e)); + const ret: bigint = bindings.CResult_PaymentIdPaymentSendFailureZ_err(CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_PaymentIdPaymentSendFailureZ = Result_PaymentIdPaymentSendFailureZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -395,8 +395,8 @@ export class Result_PaymentIdPaymentSendFailureZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_PaymentIdPaymentSendFailureZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_PaymentIdPaymentSendFailureZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +405,7 @@ export class Result_PaymentIdPaymentSendFailureZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_PaymentIdPaymentSendFailureZ { - const ret: number = bindings.CResult_PaymentIdPaymentSendFailureZ_clone(this.ptr); + const ret: bigint = bindings.CResult_PaymentIdPaymentSendFailureZ_clone(this.ptr); const ret_hu_conv: Result_PaymentIdPaymentSendFailureZ = Result_PaymentIdPaymentSendFailureZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,7 +415,7 @@ export class Result_PaymentIdPaymentSendFailureZ_OK extends Result_PaymentIdPaym public res: Uint8Array; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); const res: number = bindings.CResult_PaymentIdPaymentSendFailureZ_get_ok(ptr); const res_conv: Uint8Array = bindings.decodeUint8Array(res); @@ -426,9 +426,9 @@ export class Result_PaymentIdPaymentSendFailureZ_Err extends Result_PaymentIdPay public err: PaymentSendFailure; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_PaymentIdPaymentSendFailureZ_get_err(ptr); + const err: bigint = bindings.CResult_PaymentIdPaymentSendFailureZ_get_err(ptr); const err_hu_conv: PaymentSendFailure = PaymentSendFailure.constr_from_ptr(err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_PaymentParametersDecodeErrorZ.mts b/ts/structs/Result_PaymentParametersDecodeErrorZ.mts index 9f285e14..63e29c48 100644 --- a/ts/structs/Result_PaymentParametersDecodeErrorZ.mts +++ b/ts/structs/Result_PaymentParametersDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_PaymentParametersDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_PaymentParametersDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_PaymentParametersDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_PaymentParametersDecodeErrorZ { if (bindings.CResult_PaymentParametersDecodeErrorZ_is_ok(ptr)) { return new Result_PaymentParametersDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_PaymentParametersDecodeErrorZ extends CommonBase { * Creates a new CResult_PaymentParametersDecodeErrorZ in the success state. */ public static constructor_ok(o: PaymentParameters): Result_PaymentParametersDecodeErrorZ { - const ret: number = bindings.CResult_PaymentParametersDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_PaymentParametersDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_PaymentParametersDecodeErrorZ = Result_PaymentParametersDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_PaymentParametersDecodeErrorZ extends CommonBase { * Creates a new CResult_PaymentParametersDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_PaymentParametersDecodeErrorZ { - const ret: number = bindings.CResult_PaymentParametersDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_PaymentParametersDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_PaymentParametersDecodeErrorZ = Result_PaymentParametersDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_PaymentParametersDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_PaymentParametersDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_PaymentParametersDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_PaymentParametersDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_PaymentParametersDecodeErrorZ { - const ret: number = bindings.CResult_PaymentParametersDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_PaymentParametersDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_PaymentParametersDecodeErrorZ = Result_PaymentParametersDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_PaymentParametersDecodeErrorZ_OK extends Result_PaymentParam public res: PaymentParameters; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_PaymentParametersDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_PaymentParametersDecodeErrorZ_get_ok(ptr); const res_hu_conv: PaymentParameters = new PaymentParameters(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_PaymentParametersDecodeErrorZ_Err extends Result_PaymentPara public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_PaymentParametersDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_PaymentParametersDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_PaymentPreimageAPIErrorZ.mts b/ts/structs/Result_PaymentPreimageAPIErrorZ.mts index 0ef4a19d..4c148b09 100644 --- a/ts/structs/Result_PaymentPreimageAPIErrorZ.mts +++ b/ts/structs/Result_PaymentPreimageAPIErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_PaymentPreimageAPIErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_PaymentPreimageAPIErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_PaymentPreimageAPIErrorZ { + public static constr_from_ptr(ptr: bigint): Result_PaymentPreimageAPIErrorZ { if (bindings.CResult_PaymentPreimageAPIErrorZ_is_ok(ptr)) { return new Result_PaymentPreimageAPIErrorZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_PaymentPreimageAPIErrorZ extends CommonBase { * Creates a new CResult_PaymentPreimageAPIErrorZ in the success state. */ public static constructor_ok(o: Uint8Array): Result_PaymentPreimageAPIErrorZ { - const ret: number = bindings.CResult_PaymentPreimageAPIErrorZ_ok(bindings.encodeUint8Array(bindings.check_arr_len(o, 32))); + const ret: bigint = bindings.CResult_PaymentPreimageAPIErrorZ_ok(bindings.encodeUint8Array(bindings.check_arr_len(o, 32))); const ret_hu_conv: Result_PaymentPreimageAPIErrorZ = Result_PaymentPreimageAPIErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,7 +382,7 @@ export class Result_PaymentPreimageAPIErrorZ extends CommonBase { * Creates a new CResult_PaymentPreimageAPIErrorZ in the error state. */ public static constructor_err(e: APIError): Result_PaymentPreimageAPIErrorZ { - const ret: number = bindings.CResult_PaymentPreimageAPIErrorZ_err(CommonBase.get_ptr_of(e)); + const ret: bigint = bindings.CResult_PaymentPreimageAPIErrorZ_err(CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_PaymentPreimageAPIErrorZ = Result_PaymentPreimageAPIErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -395,8 +395,8 @@ export class Result_PaymentPreimageAPIErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_PaymentPreimageAPIErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_PaymentPreimageAPIErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +405,7 @@ export class Result_PaymentPreimageAPIErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_PaymentPreimageAPIErrorZ { - const ret: number = bindings.CResult_PaymentPreimageAPIErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_PaymentPreimageAPIErrorZ_clone(this.ptr); const ret_hu_conv: Result_PaymentPreimageAPIErrorZ = Result_PaymentPreimageAPIErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,7 +415,7 @@ export class Result_PaymentPreimageAPIErrorZ_OK extends Result_PaymentPreimageAP public res: Uint8Array; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); const res: number = bindings.CResult_PaymentPreimageAPIErrorZ_get_ok(ptr); const res_conv: Uint8Array = bindings.decodeUint8Array(res); @@ -426,9 +426,9 @@ export class Result_PaymentPreimageAPIErrorZ_Err extends Result_PaymentPreimageA public err: APIError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_PaymentPreimageAPIErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_PaymentPreimageAPIErrorZ_get_err(ptr); const err_hu_conv: APIError = APIError.constr_from_ptr(err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_PaymentPurposeDecodeErrorZ.mts b/ts/structs/Result_PaymentPurposeDecodeErrorZ.mts index 5d6214ed..b3fd883c 100644 --- a/ts/structs/Result_PaymentPurposeDecodeErrorZ.mts +++ b/ts/structs/Result_PaymentPurposeDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_PaymentPurposeDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_PaymentPurposeDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_PaymentPurposeDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_PaymentPurposeDecodeErrorZ { if (bindings.CResult_PaymentPurposeDecodeErrorZ_is_ok(ptr)) { return new Result_PaymentPurposeDecodeErrorZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_PaymentPurposeDecodeErrorZ extends CommonBase { * Creates a new CResult_PaymentPurposeDecodeErrorZ in the success state. */ public static constructor_ok(o: PaymentPurpose): Result_PaymentPurposeDecodeErrorZ { - const ret: number = bindings.CResult_PaymentPurposeDecodeErrorZ_ok(CommonBase.get_ptr_of(o)); + const ret: bigint = bindings.CResult_PaymentPurposeDecodeErrorZ_ok(CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_PaymentPurposeDecodeErrorZ = Result_PaymentPurposeDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,8 +382,9 @@ export class Result_PaymentPurposeDecodeErrorZ extends CommonBase { * Creates a new CResult_PaymentPurposeDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_PaymentPurposeDecodeErrorZ { - const ret: number = bindings.CResult_PaymentPurposeDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_PaymentPurposeDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_PaymentPurposeDecodeErrorZ = Result_PaymentPurposeDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +396,8 @@ export class Result_PaymentPurposeDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_PaymentPurposeDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_PaymentPurposeDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +406,7 @@ export class Result_PaymentPurposeDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_PaymentPurposeDecodeErrorZ { - const ret: number = bindings.CResult_PaymentPurposeDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_PaymentPurposeDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_PaymentPurposeDecodeErrorZ = Result_PaymentPurposeDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +416,9 @@ export class Result_PaymentPurposeDecodeErrorZ_OK extends Result_PaymentPurposeD public res: PaymentPurpose; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_PaymentPurposeDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_PaymentPurposeDecodeErrorZ_get_ok(ptr); const res_hu_conv: PaymentPurpose = PaymentPurpose.constr_from_ptr(res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +428,9 @@ export class Result_PaymentPurposeDecodeErrorZ_Err extends Result_PaymentPurpose public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_PaymentPurposeDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_PaymentPurposeDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_PaymentSecretAPIErrorZ.mts b/ts/structs/Result_PaymentSecretAPIErrorZ.mts index fca6a1af..a47af2d6 100644 --- a/ts/structs/Result_PaymentSecretAPIErrorZ.mts +++ b/ts/structs/Result_PaymentSecretAPIErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_PaymentSecretAPIErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_PaymentSecretAPIErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_PaymentSecretAPIErrorZ { + public static constr_from_ptr(ptr: bigint): Result_PaymentSecretAPIErrorZ { if (bindings.CResult_PaymentSecretAPIErrorZ_is_ok(ptr)) { return new Result_PaymentSecretAPIErrorZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_PaymentSecretAPIErrorZ extends CommonBase { * Creates a new CResult_PaymentSecretAPIErrorZ in the success state. */ public static constructor_ok(o: Uint8Array): Result_PaymentSecretAPIErrorZ { - const ret: number = bindings.CResult_PaymentSecretAPIErrorZ_ok(bindings.encodeUint8Array(bindings.check_arr_len(o, 32))); + const ret: bigint = bindings.CResult_PaymentSecretAPIErrorZ_ok(bindings.encodeUint8Array(bindings.check_arr_len(o, 32))); const ret_hu_conv: Result_PaymentSecretAPIErrorZ = Result_PaymentSecretAPIErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,7 +382,7 @@ export class Result_PaymentSecretAPIErrorZ extends CommonBase { * Creates a new CResult_PaymentSecretAPIErrorZ in the error state. */ public static constructor_err(e: APIError): Result_PaymentSecretAPIErrorZ { - const ret: number = bindings.CResult_PaymentSecretAPIErrorZ_err(CommonBase.get_ptr_of(e)); + const ret: bigint = bindings.CResult_PaymentSecretAPIErrorZ_err(CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_PaymentSecretAPIErrorZ = Result_PaymentSecretAPIErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -395,8 +395,8 @@ export class Result_PaymentSecretAPIErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_PaymentSecretAPIErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_PaymentSecretAPIErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +405,7 @@ export class Result_PaymentSecretAPIErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_PaymentSecretAPIErrorZ { - const ret: number = bindings.CResult_PaymentSecretAPIErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_PaymentSecretAPIErrorZ_clone(this.ptr); const ret_hu_conv: Result_PaymentSecretAPIErrorZ = Result_PaymentSecretAPIErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,7 +415,7 @@ export class Result_PaymentSecretAPIErrorZ_OK extends Result_PaymentSecretAPIErr public res: Uint8Array; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); const res: number = bindings.CResult_PaymentSecretAPIErrorZ_get_ok(ptr); const res_conv: Uint8Array = bindings.decodeUint8Array(res); @@ -426,9 +426,9 @@ export class Result_PaymentSecretAPIErrorZ_Err extends Result_PaymentSecretAPIEr public err: APIError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_PaymentSecretAPIErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_PaymentSecretAPIErrorZ_get_err(ptr); const err_hu_conv: APIError = APIError.constr_from_ptr(err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_PaymentSecretNoneZ.mts b/ts/structs/Result_PaymentSecretNoneZ.mts index e01cd9d2..e4dbbebd 100644 --- a/ts/structs/Result_PaymentSecretNoneZ.mts +++ b/ts/structs/Result_PaymentSecretNoneZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_PaymentSecretNoneZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_PaymentSecretNoneZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_PaymentSecretNoneZ { + public static constr_from_ptr(ptr: bigint): Result_PaymentSecretNoneZ { if (bindings.CResult_PaymentSecretNoneZ_is_ok(ptr)) { return new Result_PaymentSecretNoneZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_PaymentSecretNoneZ extends CommonBase { * Creates a new CResult_PaymentSecretNoneZ in the success state. */ public static constructor_ok(o: Uint8Array): Result_PaymentSecretNoneZ { - const ret: number = bindings.CResult_PaymentSecretNoneZ_ok(bindings.encodeUint8Array(bindings.check_arr_len(o, 32))); + const ret: bigint = bindings.CResult_PaymentSecretNoneZ_ok(bindings.encodeUint8Array(bindings.check_arr_len(o, 32))); const ret_hu_conv: Result_PaymentSecretNoneZ = Result_PaymentSecretNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,7 +382,7 @@ export class Result_PaymentSecretNoneZ extends CommonBase { * Creates a new CResult_PaymentSecretNoneZ in the error state. */ public static constructor_err(): Result_PaymentSecretNoneZ { - const ret: number = bindings.CResult_PaymentSecretNoneZ_err(); + const ret: bigint = bindings.CResult_PaymentSecretNoneZ_err(); const ret_hu_conv: Result_PaymentSecretNoneZ = Result_PaymentSecretNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -395,8 +395,8 @@ export class Result_PaymentSecretNoneZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_PaymentSecretNoneZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_PaymentSecretNoneZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +405,7 @@ export class Result_PaymentSecretNoneZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_PaymentSecretNoneZ { - const ret: number = bindings.CResult_PaymentSecretNoneZ_clone(this.ptr); + const ret: bigint = bindings.CResult_PaymentSecretNoneZ_clone(this.ptr); const ret_hu_conv: Result_PaymentSecretNoneZ = Result_PaymentSecretNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,7 +415,7 @@ export class Result_PaymentSecretNoneZ_OK extends Result_PaymentSecretNoneZ { public res: Uint8Array; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); const res: number = bindings.CResult_PaymentSecretNoneZ_get_ok(ptr); const res_conv: Uint8Array = bindings.decodeUint8Array(res); @@ -425,7 +425,7 @@ export class Result_PaymentSecretNoneZ_OK extends Result_PaymentSecretNoneZ { export class Result_PaymentSecretNoneZ_Err extends Result_PaymentSecretNoneZ { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); } } \ No newline at end of file diff --git a/ts/structs/Result_PhantomRouteHintsDecodeErrorZ.mts b/ts/structs/Result_PhantomRouteHintsDecodeErrorZ.mts index 67c864fc..9499c8a5 100644 --- a/ts/structs/Result_PhantomRouteHintsDecodeErrorZ.mts +++ b/ts/structs/Result_PhantomRouteHintsDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_PhantomRouteHintsDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_PhantomRouteHintsDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_PhantomRouteHintsDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_PhantomRouteHintsDecodeErrorZ { if (bindings.CResult_PhantomRouteHintsDecodeErrorZ_is_ok(ptr)) { return new Result_PhantomRouteHintsDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_PhantomRouteHintsDecodeErrorZ extends CommonBase { * Creates a new CResult_PhantomRouteHintsDecodeErrorZ in the success state. */ public static constructor_ok(o: PhantomRouteHints): Result_PhantomRouteHintsDecodeErrorZ { - const ret: number = bindings.CResult_PhantomRouteHintsDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_PhantomRouteHintsDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_PhantomRouteHintsDecodeErrorZ = Result_PhantomRouteHintsDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_PhantomRouteHintsDecodeErrorZ extends CommonBase { * Creates a new CResult_PhantomRouteHintsDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_PhantomRouteHintsDecodeErrorZ { - const ret: number = bindings.CResult_PhantomRouteHintsDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_PhantomRouteHintsDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_PhantomRouteHintsDecodeErrorZ = Result_PhantomRouteHintsDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_PhantomRouteHintsDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_PhantomRouteHintsDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_PhantomRouteHintsDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_PhantomRouteHintsDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_PhantomRouteHintsDecodeErrorZ { - const ret: number = bindings.CResult_PhantomRouteHintsDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_PhantomRouteHintsDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_PhantomRouteHintsDecodeErrorZ = Result_PhantomRouteHintsDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_PhantomRouteHintsDecodeErrorZ_OK extends Result_PhantomRoute public res: PhantomRouteHints; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_PhantomRouteHintsDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_PhantomRouteHintsDecodeErrorZ_get_ok(ptr); const res_hu_conv: PhantomRouteHints = new PhantomRouteHints(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_PhantomRouteHintsDecodeErrorZ_Err extends Result_PhantomRout public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_PhantomRouteHintsDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_PhantomRouteHintsDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_PingDecodeErrorZ.mts b/ts/structs/Result_PingDecodeErrorZ.mts index 119eda76..b699b94e 100644 --- a/ts/structs/Result_PingDecodeErrorZ.mts +++ b/ts/structs/Result_PingDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_PingDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_PingDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_PingDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_PingDecodeErrorZ { if (bindings.CResult_PingDecodeErrorZ_is_ok(ptr)) { return new Result_PingDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_PingDecodeErrorZ extends CommonBase { * Creates a new CResult_PingDecodeErrorZ in the success state. */ public static constructor_ok(o: Ping): Result_PingDecodeErrorZ { - const ret: number = bindings.CResult_PingDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_PingDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_PingDecodeErrorZ = Result_PingDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_PingDecodeErrorZ extends CommonBase { * Creates a new CResult_PingDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_PingDecodeErrorZ { - const ret: number = bindings.CResult_PingDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_PingDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_PingDecodeErrorZ = Result_PingDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_PingDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_PingDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_PingDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_PingDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_PingDecodeErrorZ { - const ret: number = bindings.CResult_PingDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_PingDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_PingDecodeErrorZ = Result_PingDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_PingDecodeErrorZ_OK extends Result_PingDecodeErrorZ { public res: Ping; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_PingDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_PingDecodeErrorZ_get_ok(ptr); const res_hu_conv: Ping = new Ping(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_PingDecodeErrorZ_Err extends Result_PingDecodeErrorZ { public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_PingDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_PingDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_PongDecodeErrorZ.mts b/ts/structs/Result_PongDecodeErrorZ.mts index 77985cc3..75aac2c6 100644 --- a/ts/structs/Result_PongDecodeErrorZ.mts +++ b/ts/structs/Result_PongDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_PongDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_PongDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_PongDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_PongDecodeErrorZ { if (bindings.CResult_PongDecodeErrorZ_is_ok(ptr)) { return new Result_PongDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_PongDecodeErrorZ extends CommonBase { * Creates a new CResult_PongDecodeErrorZ in the success state. */ public static constructor_ok(o: Pong): Result_PongDecodeErrorZ { - const ret: number = bindings.CResult_PongDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_PongDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_PongDecodeErrorZ = Result_PongDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_PongDecodeErrorZ extends CommonBase { * Creates a new CResult_PongDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_PongDecodeErrorZ { - const ret: number = bindings.CResult_PongDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_PongDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_PongDecodeErrorZ = Result_PongDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_PongDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_PongDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_PongDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_PongDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_PongDecodeErrorZ { - const ret: number = bindings.CResult_PongDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_PongDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_PongDecodeErrorZ = Result_PongDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_PongDecodeErrorZ_OK extends Result_PongDecodeErrorZ { public res: Pong; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_PongDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_PongDecodeErrorZ_get_ok(ptr); const res_hu_conv: Pong = new Pong(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_PongDecodeErrorZ_Err extends Result_PongDecodeErrorZ { public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_PongDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_PongDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_PositiveTimestampCreationErrorZ.mts b/ts/structs/Result_PositiveTimestampCreationErrorZ.mts index 252cc20a..4013f802 100644 --- a/ts/structs/Result_PositiveTimestampCreationErrorZ.mts +++ b/ts/structs/Result_PositiveTimestampCreationErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_PositiveTimestampCreationErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_PositiveTimestampCreationErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_PositiveTimestampCreationErrorZ { + public static constr_from_ptr(ptr: bigint): Result_PositiveTimestampCreationErrorZ { if (bindings.CResult_PositiveTimestampCreationErrorZ_is_ok(ptr)) { return new Result_PositiveTimestampCreationErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_PositiveTimestampCreationErrorZ extends CommonBase { * Creates a new CResult_PositiveTimestampCreationErrorZ in the success state. */ public static constructor_ok(o: PositiveTimestamp): Result_PositiveTimestampCreationErrorZ { - const ret: number = bindings.CResult_PositiveTimestampCreationErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_PositiveTimestampCreationErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_PositiveTimestampCreationErrorZ = Result_PositiveTimestampCreationErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,7 +383,7 @@ export class Result_PositiveTimestampCreationErrorZ extends CommonBase { * Creates a new CResult_PositiveTimestampCreationErrorZ in the error state. */ public static constructor_err(e: CreationError): Result_PositiveTimestampCreationErrorZ { - const ret: number = bindings.CResult_PositiveTimestampCreationErrorZ_err(e); + const ret: bigint = bindings.CResult_PositiveTimestampCreationErrorZ_err(e); const ret_hu_conv: Result_PositiveTimestampCreationErrorZ = Result_PositiveTimestampCreationErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -395,8 +396,8 @@ export class Result_PositiveTimestampCreationErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_PositiveTimestampCreationErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_PositiveTimestampCreationErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +406,7 @@ export class Result_PositiveTimestampCreationErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_PositiveTimestampCreationErrorZ { - const ret: number = bindings.CResult_PositiveTimestampCreationErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_PositiveTimestampCreationErrorZ_clone(this.ptr); const ret_hu_conv: Result_PositiveTimestampCreationErrorZ = Result_PositiveTimestampCreationErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +416,9 @@ export class Result_PositiveTimestampCreationErrorZ_OK extends Result_PositiveTi public res: PositiveTimestamp; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_PositiveTimestampCreationErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_PositiveTimestampCreationErrorZ_get_ok(ptr); const res_hu_conv: PositiveTimestamp = new PositiveTimestamp(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,7 +428,7 @@ export class Result_PositiveTimestampCreationErrorZ_Err extends Result_PositiveT public err: CreationError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); this.err = bindings.CResult_PositiveTimestampCreationErrorZ_get_err(ptr); } diff --git a/ts/structs/Result_PrivateRouteCreationErrorZ.mts b/ts/structs/Result_PrivateRouteCreationErrorZ.mts index 638682ed..59691258 100644 --- a/ts/structs/Result_PrivateRouteCreationErrorZ.mts +++ b/ts/structs/Result_PrivateRouteCreationErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_PrivateRouteCreationErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_PrivateRouteCreationErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_PrivateRouteCreationErrorZ { + public static constr_from_ptr(ptr: bigint): Result_PrivateRouteCreationErrorZ { if (bindings.CResult_PrivateRouteCreationErrorZ_is_ok(ptr)) { return new Result_PrivateRouteCreationErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_PrivateRouteCreationErrorZ extends CommonBase { * Creates a new CResult_PrivateRouteCreationErrorZ in the success state. */ public static constructor_ok(o: PrivateRoute): Result_PrivateRouteCreationErrorZ { - const ret: number = bindings.CResult_PrivateRouteCreationErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_PrivateRouteCreationErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_PrivateRouteCreationErrorZ = Result_PrivateRouteCreationErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,7 +383,7 @@ export class Result_PrivateRouteCreationErrorZ extends CommonBase { * Creates a new CResult_PrivateRouteCreationErrorZ in the error state. */ public static constructor_err(e: CreationError): Result_PrivateRouteCreationErrorZ { - const ret: number = bindings.CResult_PrivateRouteCreationErrorZ_err(e); + const ret: bigint = bindings.CResult_PrivateRouteCreationErrorZ_err(e); const ret_hu_conv: Result_PrivateRouteCreationErrorZ = Result_PrivateRouteCreationErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -395,8 +396,8 @@ export class Result_PrivateRouteCreationErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_PrivateRouteCreationErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_PrivateRouteCreationErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +406,7 @@ export class Result_PrivateRouteCreationErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_PrivateRouteCreationErrorZ { - const ret: number = bindings.CResult_PrivateRouteCreationErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_PrivateRouteCreationErrorZ_clone(this.ptr); const ret_hu_conv: Result_PrivateRouteCreationErrorZ = Result_PrivateRouteCreationErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +416,9 @@ export class Result_PrivateRouteCreationErrorZ_OK extends Result_PrivateRouteCre public res: PrivateRoute; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_PrivateRouteCreationErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_PrivateRouteCreationErrorZ_get_ok(ptr); const res_hu_conv: PrivateRoute = new PrivateRoute(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,7 +428,7 @@ export class Result_PrivateRouteCreationErrorZ_Err extends Result_PrivateRouteCr public err: CreationError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); this.err = bindings.CResult_PrivateRouteCreationErrorZ_get_err(ptr); } diff --git a/ts/structs/Result_ProbabilisticScorerDecodeErrorZ.mts b/ts/structs/Result_ProbabilisticScorerDecodeErrorZ.mts index 8b2b4c05..876ed0ad 100644 --- a/ts/structs/Result_ProbabilisticScorerDecodeErrorZ.mts +++ b/ts/structs/Result_ProbabilisticScorerDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_ProbabilisticScorerDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_ProbabilisticScorerDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_ProbabilisticScorerDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_ProbabilisticScorerDecodeErrorZ { if (bindings.CResult_ProbabilisticScorerDecodeErrorZ_is_ok(ptr)) { return new Result_ProbabilisticScorerDecodeErrorZ_OK(null, ptr); } else { @@ -373,9 +373,9 @@ export class Result_ProbabilisticScorerDecodeErrorZ extends CommonBase { * Creates a new CResult_ProbabilisticScorerDecodeErrorZ in the success state. */ public static constructor_ok(o_params: ProbabilisticScoringParameters, o_network_graph: NetworkGraph, o_logger: Logger): Result_ProbabilisticScorerDecodeErrorZ { - const ret: number = bindings.CResult_ProbabilisticScorerDecodeErrorZ_ok(bindings.ProbabilisticScorer_new(o_params == null ? 0 : CommonBase.get_ptr_of(o_params) & ~1, o_network_graph == null ? 0 : CommonBase.get_ptr_of(o_network_graph) & ~1, o_logger == null ? 0 : CommonBase.get_ptr_of(o_logger))); + const ret: bigint = bindings.CResult_ProbabilisticScorerDecodeErrorZ_ok(bindings.ProbabilisticScorer_new(o_params == null ? 0n : CommonBase.get_ptr_of(o_params), o_network_graph == null ? 0n : CommonBase.get_ptr_of(o_network_graph), o_logger == null ? 0n : CommonBase.get_ptr_of(o_logger))); const ret_hu_conv: Result_ProbabilisticScorerDecodeErrorZ = Result_ProbabilisticScorerDecodeErrorZ.constr_from_ptr(ret); - ; + CommonBase.add_ref_from(ret_hu_conv, o_params); CommonBase.add_ref_from(ret_hu_conv, o_network_graph); CommonBase.add_ref_from(ret_hu_conv, o_logger); return ret_hu_conv; @@ -385,8 +385,9 @@ export class Result_ProbabilisticScorerDecodeErrorZ extends CommonBase { * Creates a new CResult_ProbabilisticScorerDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_ProbabilisticScorerDecodeErrorZ { - const ret: number = bindings.CResult_ProbabilisticScorerDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_ProbabilisticScorerDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_ProbabilisticScorerDecodeErrorZ = Result_ProbabilisticScorerDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -403,9 +404,9 @@ export class Result_ProbabilisticScorerDecodeErrorZ_OK extends Result_Probabilis public res: ProbabilisticScorer; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_ProbabilisticScorerDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_ProbabilisticScorerDecodeErrorZ_get_ok(ptr); const res_hu_conv: ProbabilisticScorer = new ProbabilisticScorer(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -415,9 +416,9 @@ export class Result_ProbabilisticScorerDecodeErrorZ_Err extends Result_Probabili public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_ProbabilisticScorerDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_ProbabilisticScorerDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_PublicKeyErrorZ.mts b/ts/structs/Result_PublicKeyErrorZ.mts index 1c5c18a6..e710dc40 100644 --- a/ts/structs/Result_PublicKeyErrorZ.mts +++ b/ts/structs/Result_PublicKeyErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_PublicKeyErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_PublicKeyErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_PublicKeyErrorZ { + public static constr_from_ptr(ptr: bigint): Result_PublicKeyErrorZ { if (bindings.CResult_PublicKeyErrorZ_is_ok(ptr)) { return new Result_PublicKeyErrorZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_PublicKeyErrorZ extends CommonBase { * Creates a new CResult_PublicKeyErrorZ in the success state. */ public static constructor_ok(o: Uint8Array): Result_PublicKeyErrorZ { - const ret: number = bindings.CResult_PublicKeyErrorZ_ok(bindings.encodeUint8Array(bindings.check_arr_len(o, 33))); + const ret: bigint = bindings.CResult_PublicKeyErrorZ_ok(bindings.encodeUint8Array(bindings.check_arr_len(o, 33))); const ret_hu_conv: Result_PublicKeyErrorZ = Result_PublicKeyErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,7 +382,7 @@ export class Result_PublicKeyErrorZ extends CommonBase { * Creates a new CResult_PublicKeyErrorZ in the error state. */ public static constructor_err(e: Secp256k1Error): Result_PublicKeyErrorZ { - const ret: number = bindings.CResult_PublicKeyErrorZ_err(e); + const ret: bigint = bindings.CResult_PublicKeyErrorZ_err(e); const ret_hu_conv: Result_PublicKeyErrorZ = Result_PublicKeyErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -395,8 +395,8 @@ export class Result_PublicKeyErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_PublicKeyErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_PublicKeyErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +405,7 @@ export class Result_PublicKeyErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_PublicKeyErrorZ { - const ret: number = bindings.CResult_PublicKeyErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_PublicKeyErrorZ_clone(this.ptr); const ret_hu_conv: Result_PublicKeyErrorZ = Result_PublicKeyErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,7 +415,7 @@ export class Result_PublicKeyErrorZ_OK extends Result_PublicKeyErrorZ { public res: Uint8Array; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); const res: number = bindings.CResult_PublicKeyErrorZ_get_ok(ptr); const res_conv: Uint8Array = bindings.decodeUint8Array(res); @@ -426,7 +426,7 @@ export class Result_PublicKeyErrorZ_Err extends Result_PublicKeyErrorZ { public err: Secp256k1Error; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); this.err = bindings.CResult_PublicKeyErrorZ_get_err(ptr); } diff --git a/ts/structs/Result_QueryChannelRangeDecodeErrorZ.mts b/ts/structs/Result_QueryChannelRangeDecodeErrorZ.mts index da713698..da55de7c 100644 --- a/ts/structs/Result_QueryChannelRangeDecodeErrorZ.mts +++ b/ts/structs/Result_QueryChannelRangeDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_QueryChannelRangeDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_QueryChannelRangeDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_QueryChannelRangeDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_QueryChannelRangeDecodeErrorZ { if (bindings.CResult_QueryChannelRangeDecodeErrorZ_is_ok(ptr)) { return new Result_QueryChannelRangeDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_QueryChannelRangeDecodeErrorZ extends CommonBase { * Creates a new CResult_QueryChannelRangeDecodeErrorZ in the success state. */ public static constructor_ok(o: QueryChannelRange): Result_QueryChannelRangeDecodeErrorZ { - const ret: number = bindings.CResult_QueryChannelRangeDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_QueryChannelRangeDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_QueryChannelRangeDecodeErrorZ = Result_QueryChannelRangeDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_QueryChannelRangeDecodeErrorZ extends CommonBase { * Creates a new CResult_QueryChannelRangeDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_QueryChannelRangeDecodeErrorZ { - const ret: number = bindings.CResult_QueryChannelRangeDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_QueryChannelRangeDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_QueryChannelRangeDecodeErrorZ = Result_QueryChannelRangeDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_QueryChannelRangeDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_QueryChannelRangeDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_QueryChannelRangeDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_QueryChannelRangeDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_QueryChannelRangeDecodeErrorZ { - const ret: number = bindings.CResult_QueryChannelRangeDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_QueryChannelRangeDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_QueryChannelRangeDecodeErrorZ = Result_QueryChannelRangeDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_QueryChannelRangeDecodeErrorZ_OK extends Result_QueryChannel public res: QueryChannelRange; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_QueryChannelRangeDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_QueryChannelRangeDecodeErrorZ_get_ok(ptr); const res_hu_conv: QueryChannelRange = new QueryChannelRange(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_QueryChannelRangeDecodeErrorZ_Err extends Result_QueryChanne public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_QueryChannelRangeDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_QueryChannelRangeDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_QueryShortChannelIdsDecodeErrorZ.mts b/ts/structs/Result_QueryShortChannelIdsDecodeErrorZ.mts index 79e53743..c09e5c40 100644 --- a/ts/structs/Result_QueryShortChannelIdsDecodeErrorZ.mts +++ b/ts/structs/Result_QueryShortChannelIdsDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_QueryShortChannelIdsDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_QueryShortChannelIdsDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_QueryShortChannelIdsDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_QueryShortChannelIdsDecodeErrorZ { if (bindings.CResult_QueryShortChannelIdsDecodeErrorZ_is_ok(ptr)) { return new Result_QueryShortChannelIdsDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_QueryShortChannelIdsDecodeErrorZ extends CommonBase { * Creates a new CResult_QueryShortChannelIdsDecodeErrorZ in the success state. */ public static constructor_ok(o: QueryShortChannelIds): Result_QueryShortChannelIdsDecodeErrorZ { - const ret: number = bindings.CResult_QueryShortChannelIdsDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_QueryShortChannelIdsDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_QueryShortChannelIdsDecodeErrorZ = Result_QueryShortChannelIdsDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_QueryShortChannelIdsDecodeErrorZ extends CommonBase { * Creates a new CResult_QueryShortChannelIdsDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_QueryShortChannelIdsDecodeErrorZ { - const ret: number = bindings.CResult_QueryShortChannelIdsDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_QueryShortChannelIdsDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_QueryShortChannelIdsDecodeErrorZ = Result_QueryShortChannelIdsDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_QueryShortChannelIdsDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_QueryShortChannelIdsDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_QueryShortChannelIdsDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_QueryShortChannelIdsDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_QueryShortChannelIdsDecodeErrorZ { - const ret: number = bindings.CResult_QueryShortChannelIdsDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_QueryShortChannelIdsDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_QueryShortChannelIdsDecodeErrorZ = Result_QueryShortChannelIdsDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_QueryShortChannelIdsDecodeErrorZ_OK extends Result_QueryShor public res: QueryShortChannelIds; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_QueryShortChannelIdsDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_QueryShortChannelIdsDecodeErrorZ_get_ok(ptr); const res_hu_conv: QueryShortChannelIds = new QueryShortChannelIds(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_QueryShortChannelIdsDecodeErrorZ_Err extends Result_QuerySho public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_QueryShortChannelIdsDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_QueryShortChannelIdsDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_RecoverableSignatureNoneZ.mts b/ts/structs/Result_RecoverableSignatureNoneZ.mts index 918ca1f4..c826e2cf 100644 --- a/ts/structs/Result_RecoverableSignatureNoneZ.mts +++ b/ts/structs/Result_RecoverableSignatureNoneZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_RecoverableSignatureNoneZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_RecoverableSignatureNoneZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_RecoverableSignatureNoneZ { + public static constr_from_ptr(ptr: bigint): Result_RecoverableSignatureNoneZ { if (bindings.CResult_RecoverableSignatureNoneZ_is_ok(ptr)) { return new Result_RecoverableSignatureNoneZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_RecoverableSignatureNoneZ extends CommonBase { * Creates a new CResult_RecoverableSignatureNoneZ in the success state. */ public static constructor_ok(o: Uint8Array): Result_RecoverableSignatureNoneZ { - const ret: number = bindings.CResult_RecoverableSignatureNoneZ_ok(bindings.encodeUint8Array(bindings.check_arr_len(o, 68))); + const ret: bigint = bindings.CResult_RecoverableSignatureNoneZ_ok(bindings.encodeUint8Array(bindings.check_arr_len(o, 68))); const ret_hu_conv: Result_RecoverableSignatureNoneZ = Result_RecoverableSignatureNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,7 +382,7 @@ export class Result_RecoverableSignatureNoneZ extends CommonBase { * Creates a new CResult_RecoverableSignatureNoneZ in the error state. */ public static constructor_err(): Result_RecoverableSignatureNoneZ { - const ret: number = bindings.CResult_RecoverableSignatureNoneZ_err(); + const ret: bigint = bindings.CResult_RecoverableSignatureNoneZ_err(); const ret_hu_conv: Result_RecoverableSignatureNoneZ = Result_RecoverableSignatureNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -395,8 +395,8 @@ export class Result_RecoverableSignatureNoneZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_RecoverableSignatureNoneZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_RecoverableSignatureNoneZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +405,7 @@ export class Result_RecoverableSignatureNoneZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_RecoverableSignatureNoneZ { - const ret: number = bindings.CResult_RecoverableSignatureNoneZ_clone(this.ptr); + const ret: bigint = bindings.CResult_RecoverableSignatureNoneZ_clone(this.ptr); const ret_hu_conv: Result_RecoverableSignatureNoneZ = Result_RecoverableSignatureNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,7 +415,7 @@ export class Result_RecoverableSignatureNoneZ_OK extends Result_RecoverableSigna public res: Uint8Array; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); const res: number = bindings.CResult_RecoverableSignatureNoneZ_get_ok(ptr); const res_conv: Uint8Array = bindings.decodeUint8Array(res); @@ -425,7 +425,7 @@ export class Result_RecoverableSignatureNoneZ_OK extends Result_RecoverableSigna export class Result_RecoverableSignatureNoneZ_Err extends Result_RecoverableSignatureNoneZ { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); } } \ No newline at end of file diff --git a/ts/structs/Result_ReplyChannelRangeDecodeErrorZ.mts b/ts/structs/Result_ReplyChannelRangeDecodeErrorZ.mts index 4071b8dc..bfeeb21b 100644 --- a/ts/structs/Result_ReplyChannelRangeDecodeErrorZ.mts +++ b/ts/structs/Result_ReplyChannelRangeDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_ReplyChannelRangeDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_ReplyChannelRangeDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_ReplyChannelRangeDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_ReplyChannelRangeDecodeErrorZ { if (bindings.CResult_ReplyChannelRangeDecodeErrorZ_is_ok(ptr)) { return new Result_ReplyChannelRangeDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_ReplyChannelRangeDecodeErrorZ extends CommonBase { * Creates a new CResult_ReplyChannelRangeDecodeErrorZ in the success state. */ public static constructor_ok(o: ReplyChannelRange): Result_ReplyChannelRangeDecodeErrorZ { - const ret: number = bindings.CResult_ReplyChannelRangeDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_ReplyChannelRangeDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_ReplyChannelRangeDecodeErrorZ = Result_ReplyChannelRangeDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_ReplyChannelRangeDecodeErrorZ extends CommonBase { * Creates a new CResult_ReplyChannelRangeDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_ReplyChannelRangeDecodeErrorZ { - const ret: number = bindings.CResult_ReplyChannelRangeDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_ReplyChannelRangeDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_ReplyChannelRangeDecodeErrorZ = Result_ReplyChannelRangeDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_ReplyChannelRangeDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_ReplyChannelRangeDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_ReplyChannelRangeDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_ReplyChannelRangeDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_ReplyChannelRangeDecodeErrorZ { - const ret: number = bindings.CResult_ReplyChannelRangeDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_ReplyChannelRangeDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_ReplyChannelRangeDecodeErrorZ = Result_ReplyChannelRangeDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_ReplyChannelRangeDecodeErrorZ_OK extends Result_ReplyChannel public res: ReplyChannelRange; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_ReplyChannelRangeDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_ReplyChannelRangeDecodeErrorZ_get_ok(ptr); const res_hu_conv: ReplyChannelRange = new ReplyChannelRange(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_ReplyChannelRangeDecodeErrorZ_Err extends Result_ReplyChanne public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_ReplyChannelRangeDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_ReplyChannelRangeDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_ReplyShortChannelIdsEndDecodeErrorZ.mts b/ts/structs/Result_ReplyShortChannelIdsEndDecodeErrorZ.mts index 60a46e52..bc5d08f6 100644 --- a/ts/structs/Result_ReplyShortChannelIdsEndDecodeErrorZ.mts +++ b/ts/structs/Result_ReplyShortChannelIdsEndDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_ReplyShortChannelIdsEndDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_ReplyShortChannelIdsEndDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_ReplyShortChannelIdsEndDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_ReplyShortChannelIdsEndDecodeErrorZ { if (bindings.CResult_ReplyShortChannelIdsEndDecodeErrorZ_is_ok(ptr)) { return new Result_ReplyShortChannelIdsEndDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_ReplyShortChannelIdsEndDecodeErrorZ extends CommonBase { * Creates a new CResult_ReplyShortChannelIdsEndDecodeErrorZ in the success state. */ public static constructor_ok(o: ReplyShortChannelIdsEnd): Result_ReplyShortChannelIdsEndDecodeErrorZ { - const ret: number = bindings.CResult_ReplyShortChannelIdsEndDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_ReplyShortChannelIdsEndDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_ReplyShortChannelIdsEndDecodeErrorZ = Result_ReplyShortChannelIdsEndDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_ReplyShortChannelIdsEndDecodeErrorZ extends CommonBase { * Creates a new CResult_ReplyShortChannelIdsEndDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_ReplyShortChannelIdsEndDecodeErrorZ { - const ret: number = bindings.CResult_ReplyShortChannelIdsEndDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_ReplyShortChannelIdsEndDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_ReplyShortChannelIdsEndDecodeErrorZ = Result_ReplyShortChannelIdsEndDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_ReplyShortChannelIdsEndDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_ReplyShortChannelIdsEndDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_ReplyShortChannelIdsEndDecodeErrorZ { - const ret: number = bindings.CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_ReplyShortChannelIdsEndDecodeErrorZ = Result_ReplyShortChannelIdsEndDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_ReplyShortChannelIdsEndDecodeErrorZ_OK extends Result_ReplyS public res: ReplyShortChannelIdsEnd; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_ReplyShortChannelIdsEndDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_ReplyShortChannelIdsEndDecodeErrorZ_get_ok(ptr); const res_hu_conv: ReplyShortChannelIdsEnd = new ReplyShortChannelIdsEnd(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_ReplyShortChannelIdsEndDecodeErrorZ_Err extends Result_Reply public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_ReplyShortChannelIdsEndDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_ReplyShortChannelIdsEndDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_RevokeAndACKDecodeErrorZ.mts b/ts/structs/Result_RevokeAndACKDecodeErrorZ.mts index fceacc72..4df6d5cf 100644 --- a/ts/structs/Result_RevokeAndACKDecodeErrorZ.mts +++ b/ts/structs/Result_RevokeAndACKDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_RevokeAndACKDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_RevokeAndACKDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_RevokeAndACKDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_RevokeAndACKDecodeErrorZ { if (bindings.CResult_RevokeAndACKDecodeErrorZ_is_ok(ptr)) { return new Result_RevokeAndACKDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_RevokeAndACKDecodeErrorZ extends CommonBase { * Creates a new CResult_RevokeAndACKDecodeErrorZ in the success state. */ public static constructor_ok(o: RevokeAndACK): Result_RevokeAndACKDecodeErrorZ { - const ret: number = bindings.CResult_RevokeAndACKDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_RevokeAndACKDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_RevokeAndACKDecodeErrorZ = Result_RevokeAndACKDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_RevokeAndACKDecodeErrorZ extends CommonBase { * Creates a new CResult_RevokeAndACKDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_RevokeAndACKDecodeErrorZ { - const ret: number = bindings.CResult_RevokeAndACKDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_RevokeAndACKDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_RevokeAndACKDecodeErrorZ = Result_RevokeAndACKDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_RevokeAndACKDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_RevokeAndACKDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_RevokeAndACKDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_RevokeAndACKDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_RevokeAndACKDecodeErrorZ { - const ret: number = bindings.CResult_RevokeAndACKDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_RevokeAndACKDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_RevokeAndACKDecodeErrorZ = Result_RevokeAndACKDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_RevokeAndACKDecodeErrorZ_OK extends Result_RevokeAndACKDecod public res: RevokeAndACK; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_RevokeAndACKDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_RevokeAndACKDecodeErrorZ_get_ok(ptr); const res_hu_conv: RevokeAndACK = new RevokeAndACK(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_RevokeAndACKDecodeErrorZ_Err extends Result_RevokeAndACKDeco public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_RevokeAndACKDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_RevokeAndACKDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_RouteDecodeErrorZ.mts b/ts/structs/Result_RouteDecodeErrorZ.mts index f5e77e82..056f848f 100644 --- a/ts/structs/Result_RouteDecodeErrorZ.mts +++ b/ts/structs/Result_RouteDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_RouteDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_RouteDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_RouteDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_RouteDecodeErrorZ { if (bindings.CResult_RouteDecodeErrorZ_is_ok(ptr)) { return new Result_RouteDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_RouteDecodeErrorZ extends CommonBase { * Creates a new CResult_RouteDecodeErrorZ in the success state. */ public static constructor_ok(o: Route): Result_RouteDecodeErrorZ { - const ret: number = bindings.CResult_RouteDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_RouteDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_RouteDecodeErrorZ = Result_RouteDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_RouteDecodeErrorZ extends CommonBase { * Creates a new CResult_RouteDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_RouteDecodeErrorZ { - const ret: number = bindings.CResult_RouteDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_RouteDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_RouteDecodeErrorZ = Result_RouteDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_RouteDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_RouteDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_RouteDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_RouteDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_RouteDecodeErrorZ { - const ret: number = bindings.CResult_RouteDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_RouteDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_RouteDecodeErrorZ = Result_RouteDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_RouteDecodeErrorZ_OK extends Result_RouteDecodeErrorZ { public res: Route; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_RouteDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_RouteDecodeErrorZ_get_ok(ptr); const res_hu_conv: Route = new Route(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_RouteDecodeErrorZ_Err extends Result_RouteDecodeErrorZ { public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_RouteDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_RouteDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_RouteHintDecodeErrorZ.mts b/ts/structs/Result_RouteHintDecodeErrorZ.mts index 0691b8bc..08e9f648 100644 --- a/ts/structs/Result_RouteHintDecodeErrorZ.mts +++ b/ts/structs/Result_RouteHintDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_RouteHintDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_RouteHintDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_RouteHintDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_RouteHintDecodeErrorZ { if (bindings.CResult_RouteHintDecodeErrorZ_is_ok(ptr)) { return new Result_RouteHintDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_RouteHintDecodeErrorZ extends CommonBase { * Creates a new CResult_RouteHintDecodeErrorZ in the success state. */ public static constructor_ok(o: RouteHint): Result_RouteHintDecodeErrorZ { - const ret: number = bindings.CResult_RouteHintDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_RouteHintDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_RouteHintDecodeErrorZ = Result_RouteHintDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_RouteHintDecodeErrorZ extends CommonBase { * Creates a new CResult_RouteHintDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_RouteHintDecodeErrorZ { - const ret: number = bindings.CResult_RouteHintDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_RouteHintDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_RouteHintDecodeErrorZ = Result_RouteHintDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_RouteHintDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_RouteHintDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_RouteHintDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_RouteHintDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_RouteHintDecodeErrorZ { - const ret: number = bindings.CResult_RouteHintDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_RouteHintDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_RouteHintDecodeErrorZ = Result_RouteHintDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_RouteHintDecodeErrorZ_OK extends Result_RouteHintDecodeError public res: RouteHint; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_RouteHintDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_RouteHintDecodeErrorZ_get_ok(ptr); const res_hu_conv: RouteHint = new RouteHint(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_RouteHintDecodeErrorZ_Err extends Result_RouteHintDecodeErro public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_RouteHintDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_RouteHintDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_RouteHintHopDecodeErrorZ.mts b/ts/structs/Result_RouteHintHopDecodeErrorZ.mts index 88adfa84..b3e31534 100644 --- a/ts/structs/Result_RouteHintHopDecodeErrorZ.mts +++ b/ts/structs/Result_RouteHintHopDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_RouteHintHopDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_RouteHintHopDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_RouteHintHopDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_RouteHintHopDecodeErrorZ { if (bindings.CResult_RouteHintHopDecodeErrorZ_is_ok(ptr)) { return new Result_RouteHintHopDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_RouteHintHopDecodeErrorZ extends CommonBase { * Creates a new CResult_RouteHintHopDecodeErrorZ in the success state. */ public static constructor_ok(o: RouteHintHop): Result_RouteHintHopDecodeErrorZ { - const ret: number = bindings.CResult_RouteHintHopDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_RouteHintHopDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_RouteHintHopDecodeErrorZ = Result_RouteHintHopDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_RouteHintHopDecodeErrorZ extends CommonBase { * Creates a new CResult_RouteHintHopDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_RouteHintHopDecodeErrorZ { - const ret: number = bindings.CResult_RouteHintHopDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_RouteHintHopDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_RouteHintHopDecodeErrorZ = Result_RouteHintHopDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_RouteHintHopDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_RouteHintHopDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_RouteHintHopDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_RouteHintHopDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_RouteHintHopDecodeErrorZ { - const ret: number = bindings.CResult_RouteHintHopDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_RouteHintHopDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_RouteHintHopDecodeErrorZ = Result_RouteHintHopDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_RouteHintHopDecodeErrorZ_OK extends Result_RouteHintHopDecod public res: RouteHintHop; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_RouteHintHopDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_RouteHintHopDecodeErrorZ_get_ok(ptr); const res_hu_conv: RouteHintHop = new RouteHintHop(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_RouteHintHopDecodeErrorZ_Err extends Result_RouteHintHopDeco public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_RouteHintHopDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_RouteHintHopDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_RouteHopDecodeErrorZ.mts b/ts/structs/Result_RouteHopDecodeErrorZ.mts index c0651aa9..e2547644 100644 --- a/ts/structs/Result_RouteHopDecodeErrorZ.mts +++ b/ts/structs/Result_RouteHopDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_RouteHopDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_RouteHopDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_RouteHopDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_RouteHopDecodeErrorZ { if (bindings.CResult_RouteHopDecodeErrorZ_is_ok(ptr)) { return new Result_RouteHopDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_RouteHopDecodeErrorZ extends CommonBase { * Creates a new CResult_RouteHopDecodeErrorZ in the success state. */ public static constructor_ok(o: RouteHop): Result_RouteHopDecodeErrorZ { - const ret: number = bindings.CResult_RouteHopDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_RouteHopDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_RouteHopDecodeErrorZ = Result_RouteHopDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_RouteHopDecodeErrorZ extends CommonBase { * Creates a new CResult_RouteHopDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_RouteHopDecodeErrorZ { - const ret: number = bindings.CResult_RouteHopDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_RouteHopDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_RouteHopDecodeErrorZ = Result_RouteHopDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_RouteHopDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_RouteHopDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_RouteHopDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_RouteHopDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_RouteHopDecodeErrorZ { - const ret: number = bindings.CResult_RouteHopDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_RouteHopDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_RouteHopDecodeErrorZ = Result_RouteHopDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_RouteHopDecodeErrorZ_OK extends Result_RouteHopDecodeErrorZ public res: RouteHop; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_RouteHopDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_RouteHopDecodeErrorZ_get_ok(ptr); const res_hu_conv: RouteHop = new RouteHop(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_RouteHopDecodeErrorZ_Err extends Result_RouteHopDecodeErrorZ public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_RouteHopDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_RouteHopDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_RouteLightningErrorZ.mts b/ts/structs/Result_RouteLightningErrorZ.mts index bd34a0b6..3b1474f9 100644 --- a/ts/structs/Result_RouteLightningErrorZ.mts +++ b/ts/structs/Result_RouteLightningErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_RouteLightningErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_RouteLightningErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_RouteLightningErrorZ { + public static constr_from_ptr(ptr: bigint): Result_RouteLightningErrorZ { if (bindings.CResult_RouteLightningErrorZ_is_ok(ptr)) { return new Result_RouteLightningErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_RouteLightningErrorZ extends CommonBase { * Creates a new CResult_RouteLightningErrorZ in the success state. */ public static constructor_ok(o: Route): Result_RouteLightningErrorZ { - const ret: number = bindings.CResult_RouteLightningErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_RouteLightningErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_RouteLightningErrorZ = Result_RouteLightningErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_RouteLightningErrorZ extends CommonBase { * Creates a new CResult_RouteLightningErrorZ in the error state. */ public static constructor_err(e: LightningError): Result_RouteLightningErrorZ { - const ret: number = bindings.CResult_RouteLightningErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_RouteLightningErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_RouteLightningErrorZ = Result_RouteLightningErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_RouteLightningErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_RouteLightningErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_RouteLightningErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_RouteLightningErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_RouteLightningErrorZ { - const ret: number = bindings.CResult_RouteLightningErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_RouteLightningErrorZ_clone(this.ptr); const ret_hu_conv: Result_RouteLightningErrorZ = Result_RouteLightningErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_RouteLightningErrorZ_OK extends Result_RouteLightningErrorZ public res: Route; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_RouteLightningErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_RouteLightningErrorZ_get_ok(ptr); const res_hu_conv: Route = new Route(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_RouteLightningErrorZ_Err extends Result_RouteLightningErrorZ public err: LightningError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_RouteLightningErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_RouteLightningErrorZ_get_err(ptr); const err_hu_conv: LightningError = new LightningError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_RouteParametersDecodeErrorZ.mts b/ts/structs/Result_RouteParametersDecodeErrorZ.mts index 437d3b42..8dde5311 100644 --- a/ts/structs/Result_RouteParametersDecodeErrorZ.mts +++ b/ts/structs/Result_RouteParametersDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_RouteParametersDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_RouteParametersDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_RouteParametersDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_RouteParametersDecodeErrorZ { if (bindings.CResult_RouteParametersDecodeErrorZ_is_ok(ptr)) { return new Result_RouteParametersDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_RouteParametersDecodeErrorZ extends CommonBase { * Creates a new CResult_RouteParametersDecodeErrorZ in the success state. */ public static constructor_ok(o: RouteParameters): Result_RouteParametersDecodeErrorZ { - const ret: number = bindings.CResult_RouteParametersDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_RouteParametersDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_RouteParametersDecodeErrorZ = Result_RouteParametersDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_RouteParametersDecodeErrorZ extends CommonBase { * Creates a new CResult_RouteParametersDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_RouteParametersDecodeErrorZ { - const ret: number = bindings.CResult_RouteParametersDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_RouteParametersDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_RouteParametersDecodeErrorZ = Result_RouteParametersDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_RouteParametersDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_RouteParametersDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_RouteParametersDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_RouteParametersDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_RouteParametersDecodeErrorZ { - const ret: number = bindings.CResult_RouteParametersDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_RouteParametersDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_RouteParametersDecodeErrorZ = Result_RouteParametersDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_RouteParametersDecodeErrorZ_OK extends Result_RouteParameter public res: RouteParameters; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_RouteParametersDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_RouteParametersDecodeErrorZ_get_ok(ptr); const res_hu_conv: RouteParameters = new RouteParameters(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_RouteParametersDecodeErrorZ_Err extends Result_RouteParamete public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_RouteParametersDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_RouteParametersDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_RoutingFeesDecodeErrorZ.mts b/ts/structs/Result_RoutingFeesDecodeErrorZ.mts index aa413f4d..2e96faf6 100644 --- a/ts/structs/Result_RoutingFeesDecodeErrorZ.mts +++ b/ts/structs/Result_RoutingFeesDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_RoutingFeesDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_RoutingFeesDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_RoutingFeesDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_RoutingFeesDecodeErrorZ { if (bindings.CResult_RoutingFeesDecodeErrorZ_is_ok(ptr)) { return new Result_RoutingFeesDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_RoutingFeesDecodeErrorZ extends CommonBase { * Creates a new CResult_RoutingFeesDecodeErrorZ in the success state. */ public static constructor_ok(o: RoutingFees): Result_RoutingFeesDecodeErrorZ { - const ret: number = bindings.CResult_RoutingFeesDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_RoutingFeesDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_RoutingFeesDecodeErrorZ = Result_RoutingFeesDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_RoutingFeesDecodeErrorZ extends CommonBase { * Creates a new CResult_RoutingFeesDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_RoutingFeesDecodeErrorZ { - const ret: number = bindings.CResult_RoutingFeesDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_RoutingFeesDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_RoutingFeesDecodeErrorZ = Result_RoutingFeesDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_RoutingFeesDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_RoutingFeesDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_RoutingFeesDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_RoutingFeesDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_RoutingFeesDecodeErrorZ { - const ret: number = bindings.CResult_RoutingFeesDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_RoutingFeesDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_RoutingFeesDecodeErrorZ = Result_RoutingFeesDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_RoutingFeesDecodeErrorZ_OK extends Result_RoutingFeesDecodeE public res: RoutingFees; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_RoutingFeesDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_RoutingFeesDecodeErrorZ_get_ok(ptr); const res_hu_conv: RoutingFees = new RoutingFees(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_RoutingFeesDecodeErrorZ_Err extends Result_RoutingFeesDecode public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_RoutingFeesDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_RoutingFeesDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_SecretKeyErrorZ.mts b/ts/structs/Result_SecretKeyErrorZ.mts index 24e372f4..d7a56d2d 100644 --- a/ts/structs/Result_SecretKeyErrorZ.mts +++ b/ts/structs/Result_SecretKeyErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_SecretKeyErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_SecretKeyErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_SecretKeyErrorZ { + public static constr_from_ptr(ptr: bigint): Result_SecretKeyErrorZ { if (bindings.CResult_SecretKeyErrorZ_is_ok(ptr)) { return new Result_SecretKeyErrorZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_SecretKeyErrorZ extends CommonBase { * Creates a new CResult_SecretKeyErrorZ in the success state. */ public static constructor_ok(o: Uint8Array): Result_SecretKeyErrorZ { - const ret: number = bindings.CResult_SecretKeyErrorZ_ok(bindings.encodeUint8Array(bindings.check_arr_len(o, 32))); + const ret: bigint = bindings.CResult_SecretKeyErrorZ_ok(bindings.encodeUint8Array(bindings.check_arr_len(o, 32))); const ret_hu_conv: Result_SecretKeyErrorZ = Result_SecretKeyErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,7 +382,7 @@ export class Result_SecretKeyErrorZ extends CommonBase { * Creates a new CResult_SecretKeyErrorZ in the error state. */ public static constructor_err(e: Secp256k1Error): Result_SecretKeyErrorZ { - const ret: number = bindings.CResult_SecretKeyErrorZ_err(e); + const ret: bigint = bindings.CResult_SecretKeyErrorZ_err(e); const ret_hu_conv: Result_SecretKeyErrorZ = Result_SecretKeyErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -395,8 +395,8 @@ export class Result_SecretKeyErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_SecretKeyErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_SecretKeyErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +405,7 @@ export class Result_SecretKeyErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_SecretKeyErrorZ { - const ret: number = bindings.CResult_SecretKeyErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_SecretKeyErrorZ_clone(this.ptr); const ret_hu_conv: Result_SecretKeyErrorZ = Result_SecretKeyErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,7 +415,7 @@ export class Result_SecretKeyErrorZ_OK extends Result_SecretKeyErrorZ { public res: Uint8Array; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); const res: number = bindings.CResult_SecretKeyErrorZ_get_ok(ptr); const res_conv: Uint8Array = bindings.decodeUint8Array(res); @@ -426,7 +426,7 @@ export class Result_SecretKeyErrorZ_Err extends Result_SecretKeyErrorZ { public err: Secp256k1Error; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); this.err = bindings.CResult_SecretKeyErrorZ_get_err(ptr); } diff --git a/ts/structs/Result_SecretKeyNoneZ.mts b/ts/structs/Result_SecretKeyNoneZ.mts index a4d15bec..74a8f3c4 100644 --- a/ts/structs/Result_SecretKeyNoneZ.mts +++ b/ts/structs/Result_SecretKeyNoneZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_SecretKeyNoneZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_SecretKeyNoneZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_SecretKeyNoneZ { + public static constr_from_ptr(ptr: bigint): Result_SecretKeyNoneZ { if (bindings.CResult_SecretKeyNoneZ_is_ok(ptr)) { return new Result_SecretKeyNoneZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_SecretKeyNoneZ extends CommonBase { * Creates a new CResult_SecretKeyNoneZ in the success state. */ public static constructor_ok(o: Uint8Array): Result_SecretKeyNoneZ { - const ret: number = bindings.CResult_SecretKeyNoneZ_ok(bindings.encodeUint8Array(bindings.check_arr_len(o, 32))); + const ret: bigint = bindings.CResult_SecretKeyNoneZ_ok(bindings.encodeUint8Array(bindings.check_arr_len(o, 32))); const ret_hu_conv: Result_SecretKeyNoneZ = Result_SecretKeyNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,7 +382,7 @@ export class Result_SecretKeyNoneZ extends CommonBase { * Creates a new CResult_SecretKeyNoneZ in the error state. */ public static constructor_err(): Result_SecretKeyNoneZ { - const ret: number = bindings.CResult_SecretKeyNoneZ_err(); + const ret: bigint = bindings.CResult_SecretKeyNoneZ_err(); const ret_hu_conv: Result_SecretKeyNoneZ = Result_SecretKeyNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -395,8 +395,8 @@ export class Result_SecretKeyNoneZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_SecretKeyNoneZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_SecretKeyNoneZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +405,7 @@ export class Result_SecretKeyNoneZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_SecretKeyNoneZ { - const ret: number = bindings.CResult_SecretKeyNoneZ_clone(this.ptr); + const ret: bigint = bindings.CResult_SecretKeyNoneZ_clone(this.ptr); const ret_hu_conv: Result_SecretKeyNoneZ = Result_SecretKeyNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,7 +415,7 @@ export class Result_SecretKeyNoneZ_OK extends Result_SecretKeyNoneZ { public res: Uint8Array; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); const res: number = bindings.CResult_SecretKeyNoneZ_get_ok(ptr); const res_conv: Uint8Array = bindings.decodeUint8Array(res); @@ -425,7 +425,7 @@ export class Result_SecretKeyNoneZ_OK extends Result_SecretKeyNoneZ { export class Result_SecretKeyNoneZ_Err extends Result_SecretKeyNoneZ { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); } } \ No newline at end of file diff --git a/ts/structs/Result_ShutdownDecodeErrorZ.mts b/ts/structs/Result_ShutdownDecodeErrorZ.mts index 413fdb66..f90db97f 100644 --- a/ts/structs/Result_ShutdownDecodeErrorZ.mts +++ b/ts/structs/Result_ShutdownDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_ShutdownDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_ShutdownDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_ShutdownDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_ShutdownDecodeErrorZ { if (bindings.CResult_ShutdownDecodeErrorZ_is_ok(ptr)) { return new Result_ShutdownDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_ShutdownDecodeErrorZ extends CommonBase { * Creates a new CResult_ShutdownDecodeErrorZ in the success state. */ public static constructor_ok(o: Shutdown): Result_ShutdownDecodeErrorZ { - const ret: number = bindings.CResult_ShutdownDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_ShutdownDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_ShutdownDecodeErrorZ = Result_ShutdownDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_ShutdownDecodeErrorZ extends CommonBase { * Creates a new CResult_ShutdownDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_ShutdownDecodeErrorZ { - const ret: number = bindings.CResult_ShutdownDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_ShutdownDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_ShutdownDecodeErrorZ = Result_ShutdownDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_ShutdownDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_ShutdownDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_ShutdownDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_ShutdownDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_ShutdownDecodeErrorZ { - const ret: number = bindings.CResult_ShutdownDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_ShutdownDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_ShutdownDecodeErrorZ = Result_ShutdownDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_ShutdownDecodeErrorZ_OK extends Result_ShutdownDecodeErrorZ public res: Shutdown; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_ShutdownDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_ShutdownDecodeErrorZ_get_ok(ptr); const res_hu_conv: Shutdown = new Shutdown(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_ShutdownDecodeErrorZ_Err extends Result_ShutdownDecodeErrorZ public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_ShutdownDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_ShutdownDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_ShutdownScriptDecodeErrorZ.mts b/ts/structs/Result_ShutdownScriptDecodeErrorZ.mts index 47443eac..57aa348e 100644 --- a/ts/structs/Result_ShutdownScriptDecodeErrorZ.mts +++ b/ts/structs/Result_ShutdownScriptDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_ShutdownScriptDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_ShutdownScriptDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_ShutdownScriptDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_ShutdownScriptDecodeErrorZ { if (bindings.CResult_ShutdownScriptDecodeErrorZ_is_ok(ptr)) { return new Result_ShutdownScriptDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_ShutdownScriptDecodeErrorZ extends CommonBase { * Creates a new CResult_ShutdownScriptDecodeErrorZ in the success state. */ public static constructor_ok(o: ShutdownScript): Result_ShutdownScriptDecodeErrorZ { - const ret: number = bindings.CResult_ShutdownScriptDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_ShutdownScriptDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_ShutdownScriptDecodeErrorZ = Result_ShutdownScriptDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_ShutdownScriptDecodeErrorZ extends CommonBase { * Creates a new CResult_ShutdownScriptDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_ShutdownScriptDecodeErrorZ { - const ret: number = bindings.CResult_ShutdownScriptDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_ShutdownScriptDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_ShutdownScriptDecodeErrorZ = Result_ShutdownScriptDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_ShutdownScriptDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_ShutdownScriptDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_ShutdownScriptDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_ShutdownScriptDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_ShutdownScriptDecodeErrorZ { - const ret: number = bindings.CResult_ShutdownScriptDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_ShutdownScriptDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_ShutdownScriptDecodeErrorZ = Result_ShutdownScriptDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_ShutdownScriptDecodeErrorZ_OK extends Result_ShutdownScriptD public res: ShutdownScript; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_ShutdownScriptDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_ShutdownScriptDecodeErrorZ_get_ok(ptr); const res_hu_conv: ShutdownScript = new ShutdownScript(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_ShutdownScriptDecodeErrorZ_Err extends Result_ShutdownScript public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_ShutdownScriptDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_ShutdownScriptDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_ShutdownScriptInvalidShutdownScriptZ.mts b/ts/structs/Result_ShutdownScriptInvalidShutdownScriptZ.mts index fcfc43cb..6a46f92c 100644 --- a/ts/structs/Result_ShutdownScriptInvalidShutdownScriptZ.mts +++ b/ts/structs/Result_ShutdownScriptInvalidShutdownScriptZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_ShutdownScriptInvalidShutdownScriptZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_ShutdownScriptInvalidShutdownScriptZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_ShutdownScriptInvalidShutdownScriptZ { + public static constr_from_ptr(ptr: bigint): Result_ShutdownScriptInvalidShutdownScriptZ { if (bindings.CResult_ShutdownScriptInvalidShutdownScriptZ_is_ok(ptr)) { return new Result_ShutdownScriptInvalidShutdownScriptZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_ShutdownScriptInvalidShutdownScriptZ extends CommonBase { * Creates a new CResult_ShutdownScriptInvalidShutdownScriptZ in the success state. */ public static constructor_ok(o: ShutdownScript): Result_ShutdownScriptInvalidShutdownScriptZ { - const ret: number = bindings.CResult_ShutdownScriptInvalidShutdownScriptZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_ShutdownScriptInvalidShutdownScriptZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_ShutdownScriptInvalidShutdownScriptZ = Result_ShutdownScriptInvalidShutdownScriptZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_ShutdownScriptInvalidShutdownScriptZ extends CommonBase { * Creates a new CResult_ShutdownScriptInvalidShutdownScriptZ in the error state. */ public static constructor_err(e: InvalidShutdownScript): Result_ShutdownScriptInvalidShutdownScriptZ { - const ret: number = bindings.CResult_ShutdownScriptInvalidShutdownScriptZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_ShutdownScriptInvalidShutdownScriptZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_ShutdownScriptInvalidShutdownScriptZ = Result_ShutdownScriptInvalidShutdownScriptZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_ShutdownScriptInvalidShutdownScriptZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_ShutdownScriptInvalidShutdownScriptZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_ShutdownScriptInvalidShutdownScriptZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_ShutdownScriptInvalidShutdownScriptZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_ShutdownScriptInvalidShutdownScriptZ { - const ret: number = bindings.CResult_ShutdownScriptInvalidShutdownScriptZ_clone(this.ptr); + const ret: bigint = bindings.CResult_ShutdownScriptInvalidShutdownScriptZ_clone(this.ptr); const ret_hu_conv: Result_ShutdownScriptInvalidShutdownScriptZ = Result_ShutdownScriptInvalidShutdownScriptZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_ShutdownScriptInvalidShutdownScriptZ_OK extends Result_Shutd public res: ShutdownScript; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_ShutdownScriptInvalidShutdownScriptZ_get_ok(ptr); + const res: bigint = bindings.CResult_ShutdownScriptInvalidShutdownScriptZ_get_ok(ptr); const res_hu_conv: ShutdownScript = new ShutdownScript(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_ShutdownScriptInvalidShutdownScriptZ_Err extends Result_Shut public err: InvalidShutdownScript; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_ShutdownScriptInvalidShutdownScriptZ_get_err(ptr); + const err: bigint = bindings.CResult_ShutdownScriptInvalidShutdownScriptZ_get_err(ptr); const err_hu_conv: InvalidShutdownScript = new InvalidShutdownScript(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_SiPrefixParseErrorZ.mts b/ts/structs/Result_SiPrefixParseErrorZ.mts index ec1a746c..bdb0f5da 100644 --- a/ts/structs/Result_SiPrefixParseErrorZ.mts +++ b/ts/structs/Result_SiPrefixParseErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_SiPrefixParseErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_SiPrefixParseErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_SiPrefixParseErrorZ { + public static constr_from_ptr(ptr: bigint): Result_SiPrefixParseErrorZ { if (bindings.CResult_SiPrefixParseErrorZ_is_ok(ptr)) { return new Result_SiPrefixParseErrorZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_SiPrefixParseErrorZ extends CommonBase { * Creates a new CResult_SiPrefixParseErrorZ in the success state. */ public static constructor_ok(o: SiPrefix): Result_SiPrefixParseErrorZ { - const ret: number = bindings.CResult_SiPrefixParseErrorZ_ok(o); + const ret: bigint = bindings.CResult_SiPrefixParseErrorZ_ok(o); const ret_hu_conv: Result_SiPrefixParseErrorZ = Result_SiPrefixParseErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,7 +382,7 @@ export class Result_SiPrefixParseErrorZ extends CommonBase { * Creates a new CResult_SiPrefixParseErrorZ in the error state. */ public static constructor_err(e: ParseError): Result_SiPrefixParseErrorZ { - const ret: number = bindings.CResult_SiPrefixParseErrorZ_err(CommonBase.get_ptr_of(e)); + const ret: bigint = bindings.CResult_SiPrefixParseErrorZ_err(CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_SiPrefixParseErrorZ = Result_SiPrefixParseErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -395,8 +395,8 @@ export class Result_SiPrefixParseErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_SiPrefixParseErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_SiPrefixParseErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +405,7 @@ export class Result_SiPrefixParseErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_SiPrefixParseErrorZ { - const ret: number = bindings.CResult_SiPrefixParseErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_SiPrefixParseErrorZ_clone(this.ptr); const ret_hu_conv: Result_SiPrefixParseErrorZ = Result_SiPrefixParseErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,7 +415,7 @@ export class Result_SiPrefixParseErrorZ_OK extends Result_SiPrefixParseErrorZ { public res: SiPrefix; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); this.res = bindings.CResult_SiPrefixParseErrorZ_get_ok(ptr); } @@ -424,9 +424,9 @@ export class Result_SiPrefixParseErrorZ_Err extends Result_SiPrefixParseErrorZ { public err: ParseError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_SiPrefixParseErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_SiPrefixParseErrorZ_get_err(ptr); const err_hu_conv: ParseError = ParseError.constr_from_ptr(err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_SignDecodeErrorZ.mts b/ts/structs/Result_SignDecodeErrorZ.mts index 06faff20..7f23ac24 100644 --- a/ts/structs/Result_SignDecodeErrorZ.mts +++ b/ts/structs/Result_SignDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_SignDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_SignDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_SignDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_SignDecodeErrorZ { if (bindings.CResult_SignDecodeErrorZ_is_ok(ptr)) { return new Result_SignDecodeErrorZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_SignDecodeErrorZ extends CommonBase { * Creates a new CResult_SignDecodeErrorZ in the success state. */ public static constructor_ok(o: Sign): Result_SignDecodeErrorZ { - const ret: number = bindings.CResult_SignDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o)); + const ret: bigint = bindings.CResult_SignDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_SignDecodeErrorZ = Result_SignDecodeErrorZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; @@ -383,8 +383,9 @@ export class Result_SignDecodeErrorZ extends CommonBase { * Creates a new CResult_SignDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_SignDecodeErrorZ { - const ret: number = bindings.CResult_SignDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_SignDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_SignDecodeErrorZ = Result_SignDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -396,8 +397,8 @@ export class Result_SignDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_SignDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_SignDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -406,7 +407,7 @@ export class Result_SignDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_SignDecodeErrorZ { - const ret: number = bindings.CResult_SignDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_SignDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_SignDecodeErrorZ = Result_SignDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -416,9 +417,9 @@ export class Result_SignDecodeErrorZ_OK extends Result_SignDecodeErrorZ { public res: Sign; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_SignDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_SignDecodeErrorZ_get_ok(ptr); const ret_hu_conv: Sign = new Sign(null, res); CommonBase.add_ref_from(ret_hu_conv, this); this.res = ret_hu_conv; @@ -428,9 +429,9 @@ export class Result_SignDecodeErrorZ_Err extends Result_SignDecodeErrorZ { public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_SignDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_SignDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_SignatureNoneZ.mts b/ts/structs/Result_SignatureNoneZ.mts index cfe4fda8..ed2f65ac 100644 --- a/ts/structs/Result_SignatureNoneZ.mts +++ b/ts/structs/Result_SignatureNoneZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_SignatureNoneZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_SignatureNoneZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_SignatureNoneZ { + public static constr_from_ptr(ptr: bigint): Result_SignatureNoneZ { if (bindings.CResult_SignatureNoneZ_is_ok(ptr)) { return new Result_SignatureNoneZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_SignatureNoneZ extends CommonBase { * Creates a new CResult_SignatureNoneZ in the success state. */ public static constructor_ok(o: Uint8Array): Result_SignatureNoneZ { - const ret: number = bindings.CResult_SignatureNoneZ_ok(bindings.encodeUint8Array(bindings.check_arr_len(o, 64))); + const ret: bigint = bindings.CResult_SignatureNoneZ_ok(bindings.encodeUint8Array(bindings.check_arr_len(o, 64))); const ret_hu_conv: Result_SignatureNoneZ = Result_SignatureNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,7 +382,7 @@ export class Result_SignatureNoneZ extends CommonBase { * Creates a new CResult_SignatureNoneZ in the error state. */ public static constructor_err(): Result_SignatureNoneZ { - const ret: number = bindings.CResult_SignatureNoneZ_err(); + const ret: bigint = bindings.CResult_SignatureNoneZ_err(); const ret_hu_conv: Result_SignatureNoneZ = Result_SignatureNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -395,8 +395,8 @@ export class Result_SignatureNoneZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_SignatureNoneZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_SignatureNoneZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +405,7 @@ export class Result_SignatureNoneZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_SignatureNoneZ { - const ret: number = bindings.CResult_SignatureNoneZ_clone(this.ptr); + const ret: bigint = bindings.CResult_SignatureNoneZ_clone(this.ptr); const ret_hu_conv: Result_SignatureNoneZ = Result_SignatureNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,7 +415,7 @@ export class Result_SignatureNoneZ_OK extends Result_SignatureNoneZ { public res: Uint8Array; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); const res: number = bindings.CResult_SignatureNoneZ_get_ok(ptr); const res_conv: Uint8Array = bindings.decodeUint8Array(res); @@ -425,7 +425,7 @@ export class Result_SignatureNoneZ_OK extends Result_SignatureNoneZ { export class Result_SignatureNoneZ_Err extends Result_SignatureNoneZ { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); } } \ No newline at end of file diff --git a/ts/structs/Result_SignedRawInvoiceParseErrorZ.mts b/ts/structs/Result_SignedRawInvoiceParseErrorZ.mts index 29baa95a..fcf76864 100644 --- a/ts/structs/Result_SignedRawInvoiceParseErrorZ.mts +++ b/ts/structs/Result_SignedRawInvoiceParseErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_SignedRawInvoiceParseErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_SignedRawInvoiceParseErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_SignedRawInvoiceParseErrorZ { + public static constr_from_ptr(ptr: bigint): Result_SignedRawInvoiceParseErrorZ { if (bindings.CResult_SignedRawInvoiceParseErrorZ_is_ok(ptr)) { return new Result_SignedRawInvoiceParseErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_SignedRawInvoiceParseErrorZ extends CommonBase { * Creates a new CResult_SignedRawInvoiceParseErrorZ in the success state. */ public static constructor_ok(o: SignedRawInvoice): Result_SignedRawInvoiceParseErrorZ { - const ret: number = bindings.CResult_SignedRawInvoiceParseErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_SignedRawInvoiceParseErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_SignedRawInvoiceParseErrorZ = Result_SignedRawInvoiceParseErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,7 +383,7 @@ export class Result_SignedRawInvoiceParseErrorZ extends CommonBase { * Creates a new CResult_SignedRawInvoiceParseErrorZ in the error state. */ public static constructor_err(e: ParseError): Result_SignedRawInvoiceParseErrorZ { - const ret: number = bindings.CResult_SignedRawInvoiceParseErrorZ_err(CommonBase.get_ptr_of(e)); + const ret: bigint = bindings.CResult_SignedRawInvoiceParseErrorZ_err(CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_SignedRawInvoiceParseErrorZ = Result_SignedRawInvoiceParseErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -395,8 +396,8 @@ export class Result_SignedRawInvoiceParseErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_SignedRawInvoiceParseErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_SignedRawInvoiceParseErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +406,7 @@ export class Result_SignedRawInvoiceParseErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_SignedRawInvoiceParseErrorZ { - const ret: number = bindings.CResult_SignedRawInvoiceParseErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_SignedRawInvoiceParseErrorZ_clone(this.ptr); const ret_hu_conv: Result_SignedRawInvoiceParseErrorZ = Result_SignedRawInvoiceParseErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +416,9 @@ export class Result_SignedRawInvoiceParseErrorZ_OK extends Result_SignedRawInvoi public res: SignedRawInvoice; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_SignedRawInvoiceParseErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_SignedRawInvoiceParseErrorZ_get_ok(ptr); const res_hu_conv: SignedRawInvoice = new SignedRawInvoice(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +428,9 @@ export class Result_SignedRawInvoiceParseErrorZ_Err extends Result_SignedRawInvo public err: ParseError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_SignedRawInvoiceParseErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_SignedRawInvoiceParseErrorZ_get_err(ptr); const err_hu_conv: ParseError = ParseError.constr_from_ptr(err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_SpendableOutputDescriptorDecodeErrorZ.mts b/ts/structs/Result_SpendableOutputDescriptorDecodeErrorZ.mts index 721f6b11..16ce9c89 100644 --- a/ts/structs/Result_SpendableOutputDescriptorDecodeErrorZ.mts +++ b/ts/structs/Result_SpendableOutputDescriptorDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_SpendableOutputDescriptorDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_SpendableOutputDescriptorDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_SpendableOutputDescriptorDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_SpendableOutputDescriptorDecodeErrorZ { if (bindings.CResult_SpendableOutputDescriptorDecodeErrorZ_is_ok(ptr)) { return new Result_SpendableOutputDescriptorDecodeErrorZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_SpendableOutputDescriptorDecodeErrorZ extends CommonBase { * Creates a new CResult_SpendableOutputDescriptorDecodeErrorZ in the success state. */ public static constructor_ok(o: SpendableOutputDescriptor): Result_SpendableOutputDescriptorDecodeErrorZ { - const ret: number = bindings.CResult_SpendableOutputDescriptorDecodeErrorZ_ok(CommonBase.get_ptr_of(o)); + const ret: bigint = bindings.CResult_SpendableOutputDescriptorDecodeErrorZ_ok(CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_SpendableOutputDescriptorDecodeErrorZ = Result_SpendableOutputDescriptorDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,8 +382,9 @@ export class Result_SpendableOutputDescriptorDecodeErrorZ extends CommonBase { * Creates a new CResult_SpendableOutputDescriptorDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_SpendableOutputDescriptorDecodeErrorZ { - const ret: number = bindings.CResult_SpendableOutputDescriptorDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_SpendableOutputDescriptorDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_SpendableOutputDescriptorDecodeErrorZ = Result_SpendableOutputDescriptorDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +396,8 @@ export class Result_SpendableOutputDescriptorDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_SpendableOutputDescriptorDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_SpendableOutputDescriptorDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +406,7 @@ export class Result_SpendableOutputDescriptorDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_SpendableOutputDescriptorDecodeErrorZ { - const ret: number = bindings.CResult_SpendableOutputDescriptorDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_SpendableOutputDescriptorDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_SpendableOutputDescriptorDecodeErrorZ = Result_SpendableOutputDescriptorDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +416,9 @@ export class Result_SpendableOutputDescriptorDecodeErrorZ_OK extends Result_Spen public res: SpendableOutputDescriptor; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_SpendableOutputDescriptorDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_SpendableOutputDescriptorDecodeErrorZ_get_ok(ptr); const res_hu_conv: SpendableOutputDescriptor = SpendableOutputDescriptor.constr_from_ptr(res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +428,9 @@ export class Result_SpendableOutputDescriptorDecodeErrorZ_Err extends Result_Spe public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_SpendableOutputDescriptorDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_SpendableOutputDescriptorDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_StaticPaymentOutputDescriptorDecodeErrorZ.mts b/ts/structs/Result_StaticPaymentOutputDescriptorDecodeErrorZ.mts index 7e05c6df..8e3f08af 100644 --- a/ts/structs/Result_StaticPaymentOutputDescriptorDecodeErrorZ.mts +++ b/ts/structs/Result_StaticPaymentOutputDescriptorDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_StaticPaymentOutputDescriptorDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_StaticPaymentOutputDescriptorDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_StaticPaymentOutputDescriptorDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_StaticPaymentOutputDescriptorDecodeErrorZ { if (bindings.CResult_StaticPaymentOutputDescriptorDecodeErrorZ_is_ok(ptr)) { return new Result_StaticPaymentOutputDescriptorDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_StaticPaymentOutputDescriptorDecodeErrorZ extends CommonBase * Creates a new CResult_StaticPaymentOutputDescriptorDecodeErrorZ in the success state. */ public static constructor_ok(o: StaticPaymentOutputDescriptor): Result_StaticPaymentOutputDescriptorDecodeErrorZ { - const ret: number = bindings.CResult_StaticPaymentOutputDescriptorDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_StaticPaymentOutputDescriptorDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_StaticPaymentOutputDescriptorDecodeErrorZ = Result_StaticPaymentOutputDescriptorDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_StaticPaymentOutputDescriptorDecodeErrorZ extends CommonBase * Creates a new CResult_StaticPaymentOutputDescriptorDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_StaticPaymentOutputDescriptorDecodeErrorZ { - const ret: number = bindings.CResult_StaticPaymentOutputDescriptorDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_StaticPaymentOutputDescriptorDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_StaticPaymentOutputDescriptorDecodeErrorZ = Result_StaticPaymentOutputDescriptorDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_StaticPaymentOutputDescriptorDecodeErrorZ extends CommonBase return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_StaticPaymentOutputDescriptorDecodeErrorZ extends CommonBase * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_StaticPaymentOutputDescriptorDecodeErrorZ { - const ret: number = bindings.CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_StaticPaymentOutputDescriptorDecodeErrorZ = Result_StaticPaymentOutputDescriptorDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_StaticPaymentOutputDescriptorDecodeErrorZ_OK extends Result_ public res: StaticPaymentOutputDescriptor; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_ok(ptr); const res_hu_conv: StaticPaymentOutputDescriptor = new StaticPaymentOutputDescriptor(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_StaticPaymentOutputDescriptorDecodeErrorZ_Err extends Result public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_StringErrorZ.mts b/ts/structs/Result_StringErrorZ.mts index 1bd412d7..a6b87f92 100644 --- a/ts/structs/Result_StringErrorZ.mts +++ b/ts/structs/Result_StringErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_StringErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_StringErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_StringErrorZ { + public static constr_from_ptr(ptr: bigint): Result_StringErrorZ { if (bindings.CResult_StringErrorZ_is_ok(ptr)) { return new Result_StringErrorZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_StringErrorZ extends CommonBase { * Creates a new CResult_StringErrorZ in the success state. */ public static constructor_ok(o: string): Result_StringErrorZ { - const ret: number = bindings.CResult_StringErrorZ_ok(bindings.encodeString(o)); + const ret: bigint = bindings.CResult_StringErrorZ_ok(bindings.encodeString(o)); const ret_hu_conv: Result_StringErrorZ = Result_StringErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,7 +382,7 @@ export class Result_StringErrorZ extends CommonBase { * Creates a new CResult_StringErrorZ in the error state. */ public static constructor_err(e: Secp256k1Error): Result_StringErrorZ { - const ret: number = bindings.CResult_StringErrorZ_err(e); + const ret: bigint = bindings.CResult_StringErrorZ_err(e); const ret_hu_conv: Result_StringErrorZ = Result_StringErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -395,8 +395,8 @@ export class Result_StringErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_StringErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_StringErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +405,7 @@ export class Result_StringErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_StringErrorZ { - const ret: number = bindings.CResult_StringErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_StringErrorZ_clone(this.ptr); const ret_hu_conv: Result_StringErrorZ = Result_StringErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,7 +415,7 @@ export class Result_StringErrorZ_OK extends Result_StringErrorZ { public res: string; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); const res: number = bindings.CResult_StringErrorZ_get_ok(ptr); const res_conv: string = bindings.decodeString(res); @@ -426,7 +426,7 @@ export class Result_StringErrorZ_Err extends Result_StringErrorZ { public err: Secp256k1Error; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); this.err = bindings.CResult_StringErrorZ_get_err(ptr); } diff --git a/ts/structs/Result_TransactionNoneZ.mts b/ts/structs/Result_TransactionNoneZ.mts index 16570f0f..5eb87e42 100644 --- a/ts/structs/Result_TransactionNoneZ.mts +++ b/ts/structs/Result_TransactionNoneZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_TransactionNoneZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_TransactionNoneZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_TransactionNoneZ { + public static constr_from_ptr(ptr: bigint): Result_TransactionNoneZ { if (bindings.CResult_TransactionNoneZ_is_ok(ptr)) { return new Result_TransactionNoneZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_TransactionNoneZ extends CommonBase { * Creates a new CResult_TransactionNoneZ in the success state. */ public static constructor_ok(o: Uint8Array): Result_TransactionNoneZ { - const ret: number = bindings.CResult_TransactionNoneZ_ok(bindings.encodeUint8Array(o)); + const ret: bigint = bindings.CResult_TransactionNoneZ_ok(bindings.encodeUint8Array(o)); const ret_hu_conv: Result_TransactionNoneZ = Result_TransactionNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,7 +382,7 @@ export class Result_TransactionNoneZ extends CommonBase { * Creates a new CResult_TransactionNoneZ in the error state. */ public static constructor_err(): Result_TransactionNoneZ { - const ret: number = bindings.CResult_TransactionNoneZ_err(); + const ret: bigint = bindings.CResult_TransactionNoneZ_err(); const ret_hu_conv: Result_TransactionNoneZ = Result_TransactionNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -395,8 +395,8 @@ export class Result_TransactionNoneZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_TransactionNoneZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_TransactionNoneZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +405,7 @@ export class Result_TransactionNoneZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_TransactionNoneZ { - const ret: number = bindings.CResult_TransactionNoneZ_clone(this.ptr); + const ret: bigint = bindings.CResult_TransactionNoneZ_clone(this.ptr); const ret_hu_conv: Result_TransactionNoneZ = Result_TransactionNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,7 +415,7 @@ export class Result_TransactionNoneZ_OK extends Result_TransactionNoneZ { public res: Uint8Array; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); const res: number = bindings.CResult_TransactionNoneZ_get_ok(ptr); const res_conv: Uint8Array = bindings.decodeUint8Array(res); @@ -425,7 +425,7 @@ export class Result_TransactionNoneZ_OK extends Result_TransactionNoneZ { export class Result_TransactionNoneZ_Err extends Result_TransactionNoneZ { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); } } \ No newline at end of file diff --git a/ts/structs/Result_TrustedClosingTransactionNoneZ.mts b/ts/structs/Result_TrustedClosingTransactionNoneZ.mts index 665086ad..e49bd026 100644 --- a/ts/structs/Result_TrustedClosingTransactionNoneZ.mts +++ b/ts/structs/Result_TrustedClosingTransactionNoneZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_TrustedClosingTransactionNoneZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_TrustedClosingTransactionNoneZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_TrustedClosingTransactionNoneZ { + public static constr_from_ptr(ptr: bigint): Result_TrustedClosingTransactionNoneZ { if (bindings.CResult_TrustedClosingTransactionNoneZ_is_ok(ptr)) { return new Result_TrustedClosingTransactionNoneZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_TrustedClosingTransactionNoneZ extends CommonBase { * Creates a new CResult_TrustedClosingTransactionNoneZ in the success state. */ public static constructor_ok(o: TrustedClosingTransaction): Result_TrustedClosingTransactionNoneZ { - const ret: number = bindings.CResult_TrustedClosingTransactionNoneZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_TrustedClosingTransactionNoneZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_TrustedClosingTransactionNoneZ = Result_TrustedClosingTransactionNoneZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, o); // Due to rust's strict-ownership memory model, in some cases we need to "move" @@ -391,7 +391,7 @@ export class Result_TrustedClosingTransactionNoneZ extends CommonBase { * Creates a new CResult_TrustedClosingTransactionNoneZ in the error state. */ public static constructor_err(): Result_TrustedClosingTransactionNoneZ { - const ret: number = bindings.CResult_TrustedClosingTransactionNoneZ_err(); + const ret: bigint = bindings.CResult_TrustedClosingTransactionNoneZ_err(); const ret_hu_conv: Result_TrustedClosingTransactionNoneZ = Result_TrustedClosingTransactionNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -409,9 +409,9 @@ export class Result_TrustedClosingTransactionNoneZ_OK extends Result_TrustedClos public res: TrustedClosingTransaction; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_TrustedClosingTransactionNoneZ_get_ok(ptr); + const res: bigint = bindings.CResult_TrustedClosingTransactionNoneZ_get_ok(ptr); const res_hu_conv: TrustedClosingTransaction = new TrustedClosingTransaction(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -420,7 +420,7 @@ export class Result_TrustedClosingTransactionNoneZ_OK extends Result_TrustedClos export class Result_TrustedClosingTransactionNoneZ_Err extends Result_TrustedClosingTransactionNoneZ { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); } } \ No newline at end of file diff --git a/ts/structs/Result_TrustedCommitmentTransactionNoneZ.mts b/ts/structs/Result_TrustedCommitmentTransactionNoneZ.mts index 236192d3..ba93761d 100644 --- a/ts/structs/Result_TrustedCommitmentTransactionNoneZ.mts +++ b/ts/structs/Result_TrustedCommitmentTransactionNoneZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_TrustedCommitmentTransactionNoneZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_TrustedCommitmentTransactionNoneZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_TrustedCommitmentTransactionNoneZ { + public static constr_from_ptr(ptr: bigint): Result_TrustedCommitmentTransactionNoneZ { if (bindings.CResult_TrustedCommitmentTransactionNoneZ_is_ok(ptr)) { return new Result_TrustedCommitmentTransactionNoneZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_TrustedCommitmentTransactionNoneZ extends CommonBase { * Creates a new CResult_TrustedCommitmentTransactionNoneZ in the success state. */ public static constructor_ok(o: TrustedCommitmentTransaction): Result_TrustedCommitmentTransactionNoneZ { - const ret: number = bindings.CResult_TrustedCommitmentTransactionNoneZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_TrustedCommitmentTransactionNoneZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_TrustedCommitmentTransactionNoneZ = Result_TrustedCommitmentTransactionNoneZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, o); // Due to rust's strict-ownership memory model, in some cases we need to "move" @@ -391,7 +391,7 @@ export class Result_TrustedCommitmentTransactionNoneZ extends CommonBase { * Creates a new CResult_TrustedCommitmentTransactionNoneZ in the error state. */ public static constructor_err(): Result_TrustedCommitmentTransactionNoneZ { - const ret: number = bindings.CResult_TrustedCommitmentTransactionNoneZ_err(); + const ret: bigint = bindings.CResult_TrustedCommitmentTransactionNoneZ_err(); const ret_hu_conv: Result_TrustedCommitmentTransactionNoneZ = Result_TrustedCommitmentTransactionNoneZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -409,9 +409,9 @@ export class Result_TrustedCommitmentTransactionNoneZ_OK extends Result_TrustedC public res: TrustedCommitmentTransaction; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_TrustedCommitmentTransactionNoneZ_get_ok(ptr); + const res: bigint = bindings.CResult_TrustedCommitmentTransactionNoneZ_get_ok(ptr); const res_hu_conv: TrustedCommitmentTransaction = new TrustedCommitmentTransaction(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -420,7 +420,7 @@ export class Result_TrustedCommitmentTransactionNoneZ_OK extends Result_TrustedC export class Result_TrustedCommitmentTransactionNoneZ_Err extends Result_TrustedCommitmentTransactionNoneZ { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); } } \ No newline at end of file diff --git a/ts/structs/Result_TxCreationKeysDecodeErrorZ.mts b/ts/structs/Result_TxCreationKeysDecodeErrorZ.mts index 5a05f3ed..1299b5e2 100644 --- a/ts/structs/Result_TxCreationKeysDecodeErrorZ.mts +++ b/ts/structs/Result_TxCreationKeysDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_TxCreationKeysDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_TxCreationKeysDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_TxCreationKeysDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_TxCreationKeysDecodeErrorZ { if (bindings.CResult_TxCreationKeysDecodeErrorZ_is_ok(ptr)) { return new Result_TxCreationKeysDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_TxCreationKeysDecodeErrorZ extends CommonBase { * Creates a new CResult_TxCreationKeysDecodeErrorZ in the success state. */ public static constructor_ok(o: TxCreationKeys): Result_TxCreationKeysDecodeErrorZ { - const ret: number = bindings.CResult_TxCreationKeysDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_TxCreationKeysDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_TxCreationKeysDecodeErrorZ = Result_TxCreationKeysDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_TxCreationKeysDecodeErrorZ extends CommonBase { * Creates a new CResult_TxCreationKeysDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_TxCreationKeysDecodeErrorZ { - const ret: number = bindings.CResult_TxCreationKeysDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_TxCreationKeysDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_TxCreationKeysDecodeErrorZ = Result_TxCreationKeysDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_TxCreationKeysDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_TxCreationKeysDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_TxCreationKeysDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_TxCreationKeysDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_TxCreationKeysDecodeErrorZ { - const ret: number = bindings.CResult_TxCreationKeysDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_TxCreationKeysDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_TxCreationKeysDecodeErrorZ = Result_TxCreationKeysDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_TxCreationKeysDecodeErrorZ_OK extends Result_TxCreationKeysD public res: TxCreationKeys; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_TxCreationKeysDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_TxCreationKeysDecodeErrorZ_get_ok(ptr); const res_hu_conv: TxCreationKeys = new TxCreationKeys(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_TxCreationKeysDecodeErrorZ_Err extends Result_TxCreationKeys public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_TxCreationKeysDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_TxCreationKeysDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_TxCreationKeysErrorZ.mts b/ts/structs/Result_TxCreationKeysErrorZ.mts index 74cc0108..3e98a045 100644 --- a/ts/structs/Result_TxCreationKeysErrorZ.mts +++ b/ts/structs/Result_TxCreationKeysErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_TxCreationKeysErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_TxCreationKeysErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_TxCreationKeysErrorZ { + public static constr_from_ptr(ptr: bigint): Result_TxCreationKeysErrorZ { if (bindings.CResult_TxCreationKeysErrorZ_is_ok(ptr)) { return new Result_TxCreationKeysErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_TxCreationKeysErrorZ extends CommonBase { * Creates a new CResult_TxCreationKeysErrorZ in the success state. */ public static constructor_ok(o: TxCreationKeys): Result_TxCreationKeysErrorZ { - const ret: number = bindings.CResult_TxCreationKeysErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_TxCreationKeysErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_TxCreationKeysErrorZ = Result_TxCreationKeysErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,7 +383,7 @@ export class Result_TxCreationKeysErrorZ extends CommonBase { * Creates a new CResult_TxCreationKeysErrorZ in the error state. */ public static constructor_err(e: Secp256k1Error): Result_TxCreationKeysErrorZ { - const ret: number = bindings.CResult_TxCreationKeysErrorZ_err(e); + const ret: bigint = bindings.CResult_TxCreationKeysErrorZ_err(e); const ret_hu_conv: Result_TxCreationKeysErrorZ = Result_TxCreationKeysErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -395,8 +396,8 @@ export class Result_TxCreationKeysErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_TxCreationKeysErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_TxCreationKeysErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +406,7 @@ export class Result_TxCreationKeysErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_TxCreationKeysErrorZ { - const ret: number = bindings.CResult_TxCreationKeysErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_TxCreationKeysErrorZ_clone(this.ptr); const ret_hu_conv: Result_TxCreationKeysErrorZ = Result_TxCreationKeysErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +416,9 @@ export class Result_TxCreationKeysErrorZ_OK extends Result_TxCreationKeysErrorZ public res: TxCreationKeys; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_TxCreationKeysErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_TxCreationKeysErrorZ_get_ok(ptr); const res_hu_conv: TxCreationKeys = new TxCreationKeys(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,7 +428,7 @@ export class Result_TxCreationKeysErrorZ_Err extends Result_TxCreationKeysErrorZ public err: Secp256k1Error; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); this.err = bindings.CResult_TxCreationKeysErrorZ_get_err(ptr); } diff --git a/ts/structs/Result_TxOutAccessErrorZ.mts b/ts/structs/Result_TxOutAccessErrorZ.mts index c037f66e..25b34ba7 100644 --- a/ts/structs/Result_TxOutAccessErrorZ.mts +++ b/ts/structs/Result_TxOutAccessErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_TxOutAccessErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_TxOutAccessErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_TxOutAccessErrorZ { + public static constr_from_ptr(ptr: bigint): Result_TxOutAccessErrorZ { if (bindings.CResult_TxOutAccessErrorZ_is_ok(ptr)) { return new Result_TxOutAccessErrorZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_TxOutAccessErrorZ extends CommonBase { * Creates a new CResult_TxOutAccessErrorZ in the success state. */ public static constructor_ok(o: TxOut): Result_TxOutAccessErrorZ { - const ret: number = bindings.CResult_TxOutAccessErrorZ_ok(CommonBase.get_ptr_of(o)); + const ret: bigint = bindings.CResult_TxOutAccessErrorZ_ok(CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_TxOutAccessErrorZ = Result_TxOutAccessErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,7 +382,7 @@ export class Result_TxOutAccessErrorZ extends CommonBase { * Creates a new CResult_TxOutAccessErrorZ in the error state. */ public static constructor_err(e: AccessError): Result_TxOutAccessErrorZ { - const ret: number = bindings.CResult_TxOutAccessErrorZ_err(e); + const ret: bigint = bindings.CResult_TxOutAccessErrorZ_err(e); const ret_hu_conv: Result_TxOutAccessErrorZ = Result_TxOutAccessErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -395,8 +395,8 @@ export class Result_TxOutAccessErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_TxOutAccessErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_TxOutAccessErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +405,7 @@ export class Result_TxOutAccessErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_TxOutAccessErrorZ { - const ret: number = bindings.CResult_TxOutAccessErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_TxOutAccessErrorZ_clone(this.ptr); const ret_hu_conv: Result_TxOutAccessErrorZ = Result_TxOutAccessErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +415,9 @@ export class Result_TxOutAccessErrorZ_OK extends Result_TxOutAccessErrorZ { public res: TxOut; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_TxOutAccessErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_TxOutAccessErrorZ_get_ok(ptr); const res_conv: TxOut = new TxOut(null, res); this.res = res_conv; } @@ -426,7 +426,7 @@ export class Result_TxOutAccessErrorZ_Err extends Result_TxOutAccessErrorZ { public err: AccessError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); this.err = bindings.CResult_TxOutAccessErrorZ_get_err(ptr); } diff --git a/ts/structs/Result_UnsignedChannelAnnouncementDecodeErrorZ.mts b/ts/structs/Result_UnsignedChannelAnnouncementDecodeErrorZ.mts index 97bd7cf9..fa724b06 100644 --- a/ts/structs/Result_UnsignedChannelAnnouncementDecodeErrorZ.mts +++ b/ts/structs/Result_UnsignedChannelAnnouncementDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_UnsignedChannelAnnouncementDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_UnsignedChannelAnnouncementDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_UnsignedChannelAnnouncementDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_UnsignedChannelAnnouncementDecodeErrorZ { if (bindings.CResult_UnsignedChannelAnnouncementDecodeErrorZ_is_ok(ptr)) { return new Result_UnsignedChannelAnnouncementDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_UnsignedChannelAnnouncementDecodeErrorZ extends CommonBase { * Creates a new CResult_UnsignedChannelAnnouncementDecodeErrorZ in the success state. */ public static constructor_ok(o: UnsignedChannelAnnouncement): Result_UnsignedChannelAnnouncementDecodeErrorZ { - const ret: number = bindings.CResult_UnsignedChannelAnnouncementDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_UnsignedChannelAnnouncementDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_UnsignedChannelAnnouncementDecodeErrorZ = Result_UnsignedChannelAnnouncementDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_UnsignedChannelAnnouncementDecodeErrorZ extends CommonBase { * Creates a new CResult_UnsignedChannelAnnouncementDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_UnsignedChannelAnnouncementDecodeErrorZ { - const ret: number = bindings.CResult_UnsignedChannelAnnouncementDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_UnsignedChannelAnnouncementDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_UnsignedChannelAnnouncementDecodeErrorZ = Result_UnsignedChannelAnnouncementDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_UnsignedChannelAnnouncementDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_UnsignedChannelAnnouncementDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_UnsignedChannelAnnouncementDecodeErrorZ { - const ret: number = bindings.CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_UnsignedChannelAnnouncementDecodeErrorZ = Result_UnsignedChannelAnnouncementDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_UnsignedChannelAnnouncementDecodeErrorZ_OK extends Result_Un public res: UnsignedChannelAnnouncement; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_UnsignedChannelAnnouncementDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_UnsignedChannelAnnouncementDecodeErrorZ_get_ok(ptr); const res_hu_conv: UnsignedChannelAnnouncement = new UnsignedChannelAnnouncement(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_UnsignedChannelAnnouncementDecodeErrorZ_Err extends Result_U public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_UnsignedChannelAnnouncementDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_UnsignedChannelAnnouncementDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_UnsignedChannelUpdateDecodeErrorZ.mts b/ts/structs/Result_UnsignedChannelUpdateDecodeErrorZ.mts index 82f59b8d..bea35896 100644 --- a/ts/structs/Result_UnsignedChannelUpdateDecodeErrorZ.mts +++ b/ts/structs/Result_UnsignedChannelUpdateDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_UnsignedChannelUpdateDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_UnsignedChannelUpdateDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_UnsignedChannelUpdateDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_UnsignedChannelUpdateDecodeErrorZ { if (bindings.CResult_UnsignedChannelUpdateDecodeErrorZ_is_ok(ptr)) { return new Result_UnsignedChannelUpdateDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_UnsignedChannelUpdateDecodeErrorZ extends CommonBase { * Creates a new CResult_UnsignedChannelUpdateDecodeErrorZ in the success state. */ public static constructor_ok(o: UnsignedChannelUpdate): Result_UnsignedChannelUpdateDecodeErrorZ { - const ret: number = bindings.CResult_UnsignedChannelUpdateDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_UnsignedChannelUpdateDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_UnsignedChannelUpdateDecodeErrorZ = Result_UnsignedChannelUpdateDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_UnsignedChannelUpdateDecodeErrorZ extends CommonBase { * Creates a new CResult_UnsignedChannelUpdateDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_UnsignedChannelUpdateDecodeErrorZ { - const ret: number = bindings.CResult_UnsignedChannelUpdateDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_UnsignedChannelUpdateDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_UnsignedChannelUpdateDecodeErrorZ = Result_UnsignedChannelUpdateDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_UnsignedChannelUpdateDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_UnsignedChannelUpdateDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_UnsignedChannelUpdateDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_UnsignedChannelUpdateDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_UnsignedChannelUpdateDecodeErrorZ { - const ret: number = bindings.CResult_UnsignedChannelUpdateDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_UnsignedChannelUpdateDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_UnsignedChannelUpdateDecodeErrorZ = Result_UnsignedChannelUpdateDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_UnsignedChannelUpdateDecodeErrorZ_OK extends Result_Unsigned public res: UnsignedChannelUpdate; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_UnsignedChannelUpdateDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_UnsignedChannelUpdateDecodeErrorZ_get_ok(ptr); const res_hu_conv: UnsignedChannelUpdate = new UnsignedChannelUpdate(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_UnsignedChannelUpdateDecodeErrorZ_Err extends Result_Unsigne public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_UnsignedChannelUpdateDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_UnsignedChannelUpdateDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_UnsignedNodeAnnouncementDecodeErrorZ.mts b/ts/structs/Result_UnsignedNodeAnnouncementDecodeErrorZ.mts index f1289971..53d87d7c 100644 --- a/ts/structs/Result_UnsignedNodeAnnouncementDecodeErrorZ.mts +++ b/ts/structs/Result_UnsignedNodeAnnouncementDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_UnsignedNodeAnnouncementDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_UnsignedNodeAnnouncementDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_UnsignedNodeAnnouncementDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_UnsignedNodeAnnouncementDecodeErrorZ { if (bindings.CResult_UnsignedNodeAnnouncementDecodeErrorZ_is_ok(ptr)) { return new Result_UnsignedNodeAnnouncementDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_UnsignedNodeAnnouncementDecodeErrorZ extends CommonBase { * Creates a new CResult_UnsignedNodeAnnouncementDecodeErrorZ in the success state. */ public static constructor_ok(o: UnsignedNodeAnnouncement): Result_UnsignedNodeAnnouncementDecodeErrorZ { - const ret: number = bindings.CResult_UnsignedNodeAnnouncementDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_UnsignedNodeAnnouncementDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_UnsignedNodeAnnouncementDecodeErrorZ = Result_UnsignedNodeAnnouncementDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_UnsignedNodeAnnouncementDecodeErrorZ extends CommonBase { * Creates a new CResult_UnsignedNodeAnnouncementDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_UnsignedNodeAnnouncementDecodeErrorZ { - const ret: number = bindings.CResult_UnsignedNodeAnnouncementDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_UnsignedNodeAnnouncementDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_UnsignedNodeAnnouncementDecodeErrorZ = Result_UnsignedNodeAnnouncementDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_UnsignedNodeAnnouncementDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_UnsignedNodeAnnouncementDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_UnsignedNodeAnnouncementDecodeErrorZ { - const ret: number = bindings.CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_UnsignedNodeAnnouncementDecodeErrorZ = Result_UnsignedNodeAnnouncementDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_UnsignedNodeAnnouncementDecodeErrorZ_OK extends Result_Unsig public res: UnsignedNodeAnnouncement; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_UnsignedNodeAnnouncementDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_UnsignedNodeAnnouncementDecodeErrorZ_get_ok(ptr); const res_hu_conv: UnsignedNodeAnnouncement = new UnsignedNodeAnnouncement(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_UnsignedNodeAnnouncementDecodeErrorZ_Err extends Result_Unsi public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_UnsignedNodeAnnouncementDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_UnsignedNodeAnnouncementDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_UpdateAddHTLCDecodeErrorZ.mts b/ts/structs/Result_UpdateAddHTLCDecodeErrorZ.mts index 24b1fc76..a9b47511 100644 --- a/ts/structs/Result_UpdateAddHTLCDecodeErrorZ.mts +++ b/ts/structs/Result_UpdateAddHTLCDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_UpdateAddHTLCDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_UpdateAddHTLCDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_UpdateAddHTLCDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_UpdateAddHTLCDecodeErrorZ { if (bindings.CResult_UpdateAddHTLCDecodeErrorZ_is_ok(ptr)) { return new Result_UpdateAddHTLCDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_UpdateAddHTLCDecodeErrorZ extends CommonBase { * Creates a new CResult_UpdateAddHTLCDecodeErrorZ in the success state. */ public static constructor_ok(o: UpdateAddHTLC): Result_UpdateAddHTLCDecodeErrorZ { - const ret: number = bindings.CResult_UpdateAddHTLCDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_UpdateAddHTLCDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_UpdateAddHTLCDecodeErrorZ = Result_UpdateAddHTLCDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_UpdateAddHTLCDecodeErrorZ extends CommonBase { * Creates a new CResult_UpdateAddHTLCDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_UpdateAddHTLCDecodeErrorZ { - const ret: number = bindings.CResult_UpdateAddHTLCDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_UpdateAddHTLCDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_UpdateAddHTLCDecodeErrorZ = Result_UpdateAddHTLCDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_UpdateAddHTLCDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_UpdateAddHTLCDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_UpdateAddHTLCDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_UpdateAddHTLCDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_UpdateAddHTLCDecodeErrorZ { - const ret: number = bindings.CResult_UpdateAddHTLCDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_UpdateAddHTLCDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_UpdateAddHTLCDecodeErrorZ = Result_UpdateAddHTLCDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_UpdateAddHTLCDecodeErrorZ_OK extends Result_UpdateAddHTLCDec public res: UpdateAddHTLC; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_UpdateAddHTLCDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_UpdateAddHTLCDecodeErrorZ_get_ok(ptr); const res_hu_conv: UpdateAddHTLC = new UpdateAddHTLC(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_UpdateAddHTLCDecodeErrorZ_Err extends Result_UpdateAddHTLCDe public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_UpdateAddHTLCDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_UpdateAddHTLCDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_UpdateFailHTLCDecodeErrorZ.mts b/ts/structs/Result_UpdateFailHTLCDecodeErrorZ.mts index f1064c97..6a882655 100644 --- a/ts/structs/Result_UpdateFailHTLCDecodeErrorZ.mts +++ b/ts/structs/Result_UpdateFailHTLCDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_UpdateFailHTLCDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_UpdateFailHTLCDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_UpdateFailHTLCDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_UpdateFailHTLCDecodeErrorZ { if (bindings.CResult_UpdateFailHTLCDecodeErrorZ_is_ok(ptr)) { return new Result_UpdateFailHTLCDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_UpdateFailHTLCDecodeErrorZ extends CommonBase { * Creates a new CResult_UpdateFailHTLCDecodeErrorZ in the success state. */ public static constructor_ok(o: UpdateFailHTLC): Result_UpdateFailHTLCDecodeErrorZ { - const ret: number = bindings.CResult_UpdateFailHTLCDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_UpdateFailHTLCDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_UpdateFailHTLCDecodeErrorZ = Result_UpdateFailHTLCDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_UpdateFailHTLCDecodeErrorZ extends CommonBase { * Creates a new CResult_UpdateFailHTLCDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_UpdateFailHTLCDecodeErrorZ { - const ret: number = bindings.CResult_UpdateFailHTLCDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_UpdateFailHTLCDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_UpdateFailHTLCDecodeErrorZ = Result_UpdateFailHTLCDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_UpdateFailHTLCDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_UpdateFailHTLCDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_UpdateFailHTLCDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_UpdateFailHTLCDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_UpdateFailHTLCDecodeErrorZ { - const ret: number = bindings.CResult_UpdateFailHTLCDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_UpdateFailHTLCDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_UpdateFailHTLCDecodeErrorZ = Result_UpdateFailHTLCDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_UpdateFailHTLCDecodeErrorZ_OK extends Result_UpdateFailHTLCD public res: UpdateFailHTLC; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_UpdateFailHTLCDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_UpdateFailHTLCDecodeErrorZ_get_ok(ptr); const res_hu_conv: UpdateFailHTLC = new UpdateFailHTLC(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_UpdateFailHTLCDecodeErrorZ_Err extends Result_UpdateFailHTLC public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_UpdateFailHTLCDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_UpdateFailHTLCDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_UpdateFailMalformedHTLCDecodeErrorZ.mts b/ts/structs/Result_UpdateFailMalformedHTLCDecodeErrorZ.mts index de805054..5fbbf844 100644 --- a/ts/structs/Result_UpdateFailMalformedHTLCDecodeErrorZ.mts +++ b/ts/structs/Result_UpdateFailMalformedHTLCDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_UpdateFailMalformedHTLCDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_UpdateFailMalformedHTLCDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_UpdateFailMalformedHTLCDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_UpdateFailMalformedHTLCDecodeErrorZ { if (bindings.CResult_UpdateFailMalformedHTLCDecodeErrorZ_is_ok(ptr)) { return new Result_UpdateFailMalformedHTLCDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_UpdateFailMalformedHTLCDecodeErrorZ extends CommonBase { * Creates a new CResult_UpdateFailMalformedHTLCDecodeErrorZ in the success state. */ public static constructor_ok(o: UpdateFailMalformedHTLC): Result_UpdateFailMalformedHTLCDecodeErrorZ { - const ret: number = bindings.CResult_UpdateFailMalformedHTLCDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_UpdateFailMalformedHTLCDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_UpdateFailMalformedHTLCDecodeErrorZ = Result_UpdateFailMalformedHTLCDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_UpdateFailMalformedHTLCDecodeErrorZ extends CommonBase { * Creates a new CResult_UpdateFailMalformedHTLCDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_UpdateFailMalformedHTLCDecodeErrorZ { - const ret: number = bindings.CResult_UpdateFailMalformedHTLCDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_UpdateFailMalformedHTLCDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_UpdateFailMalformedHTLCDecodeErrorZ = Result_UpdateFailMalformedHTLCDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_UpdateFailMalformedHTLCDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_UpdateFailMalformedHTLCDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_UpdateFailMalformedHTLCDecodeErrorZ { - const ret: number = bindings.CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_UpdateFailMalformedHTLCDecodeErrorZ = Result_UpdateFailMalformedHTLCDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_UpdateFailMalformedHTLCDecodeErrorZ_OK extends Result_Update public res: UpdateFailMalformedHTLC; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_UpdateFailMalformedHTLCDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_UpdateFailMalformedHTLCDecodeErrorZ_get_ok(ptr); const res_hu_conv: UpdateFailMalformedHTLC = new UpdateFailMalformedHTLC(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_UpdateFailMalformedHTLCDecodeErrorZ_Err extends Result_Updat public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_UpdateFailMalformedHTLCDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_UpdateFailMalformedHTLCDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_UpdateFeeDecodeErrorZ.mts b/ts/structs/Result_UpdateFeeDecodeErrorZ.mts index 68bc5e40..d6cbd6b0 100644 --- a/ts/structs/Result_UpdateFeeDecodeErrorZ.mts +++ b/ts/structs/Result_UpdateFeeDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_UpdateFeeDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_UpdateFeeDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_UpdateFeeDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_UpdateFeeDecodeErrorZ { if (bindings.CResult_UpdateFeeDecodeErrorZ_is_ok(ptr)) { return new Result_UpdateFeeDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_UpdateFeeDecodeErrorZ extends CommonBase { * Creates a new CResult_UpdateFeeDecodeErrorZ in the success state. */ public static constructor_ok(o: UpdateFee): Result_UpdateFeeDecodeErrorZ { - const ret: number = bindings.CResult_UpdateFeeDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_UpdateFeeDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_UpdateFeeDecodeErrorZ = Result_UpdateFeeDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_UpdateFeeDecodeErrorZ extends CommonBase { * Creates a new CResult_UpdateFeeDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_UpdateFeeDecodeErrorZ { - const ret: number = bindings.CResult_UpdateFeeDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_UpdateFeeDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_UpdateFeeDecodeErrorZ = Result_UpdateFeeDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_UpdateFeeDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_UpdateFeeDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_UpdateFeeDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_UpdateFeeDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_UpdateFeeDecodeErrorZ { - const ret: number = bindings.CResult_UpdateFeeDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_UpdateFeeDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_UpdateFeeDecodeErrorZ = Result_UpdateFeeDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_UpdateFeeDecodeErrorZ_OK extends Result_UpdateFeeDecodeError public res: UpdateFee; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_UpdateFeeDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_UpdateFeeDecodeErrorZ_get_ok(ptr); const res_hu_conv: UpdateFee = new UpdateFee(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_UpdateFeeDecodeErrorZ_Err extends Result_UpdateFeeDecodeErro public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_UpdateFeeDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_UpdateFeeDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_UpdateFulfillHTLCDecodeErrorZ.mts b/ts/structs/Result_UpdateFulfillHTLCDecodeErrorZ.mts index a069df47..277785a3 100644 --- a/ts/structs/Result_UpdateFulfillHTLCDecodeErrorZ.mts +++ b/ts/structs/Result_UpdateFulfillHTLCDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_UpdateFulfillHTLCDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_UpdateFulfillHTLCDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_UpdateFulfillHTLCDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_UpdateFulfillHTLCDecodeErrorZ { if (bindings.CResult_UpdateFulfillHTLCDecodeErrorZ_is_ok(ptr)) { return new Result_UpdateFulfillHTLCDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_UpdateFulfillHTLCDecodeErrorZ extends CommonBase { * Creates a new CResult_UpdateFulfillHTLCDecodeErrorZ in the success state. */ public static constructor_ok(o: UpdateFulfillHTLC): Result_UpdateFulfillHTLCDecodeErrorZ { - const ret: number = bindings.CResult_UpdateFulfillHTLCDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_UpdateFulfillHTLCDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_UpdateFulfillHTLCDecodeErrorZ = Result_UpdateFulfillHTLCDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_UpdateFulfillHTLCDecodeErrorZ extends CommonBase { * Creates a new CResult_UpdateFulfillHTLCDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_UpdateFulfillHTLCDecodeErrorZ { - const ret: number = bindings.CResult_UpdateFulfillHTLCDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_UpdateFulfillHTLCDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_UpdateFulfillHTLCDecodeErrorZ = Result_UpdateFulfillHTLCDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_UpdateFulfillHTLCDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_UpdateFulfillHTLCDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_UpdateFulfillHTLCDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_UpdateFulfillHTLCDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_UpdateFulfillHTLCDecodeErrorZ { - const ret: number = bindings.CResult_UpdateFulfillHTLCDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_UpdateFulfillHTLCDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_UpdateFulfillHTLCDecodeErrorZ = Result_UpdateFulfillHTLCDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_UpdateFulfillHTLCDecodeErrorZ_OK extends Result_UpdateFulfil public res: UpdateFulfillHTLC; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_UpdateFulfillHTLCDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_UpdateFulfillHTLCDecodeErrorZ_get_ok(ptr); const res_hu_conv: UpdateFulfillHTLC = new UpdateFulfillHTLC(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_UpdateFulfillHTLCDecodeErrorZ_Err extends Result_UpdateFulfi public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_UpdateFulfillHTLCDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_UpdateFulfillHTLCDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_WarningMessageDecodeErrorZ.mts b/ts/structs/Result_WarningMessageDecodeErrorZ.mts index 6f84d07d..bee6b295 100644 --- a/ts/structs/Result_WarningMessageDecodeErrorZ.mts +++ b/ts/structs/Result_WarningMessageDecodeErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_WarningMessageDecodeErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_WarningMessageDecodeErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_WarningMessageDecodeErrorZ { + public static constr_from_ptr(ptr: bigint): Result_WarningMessageDecodeErrorZ { if (bindings.CResult_WarningMessageDecodeErrorZ_is_ok(ptr)) { return new Result_WarningMessageDecodeErrorZ_OK(null, ptr); } else { @@ -373,8 +373,9 @@ export class Result_WarningMessageDecodeErrorZ extends CommonBase { * Creates a new CResult_WarningMessageDecodeErrorZ in the success state. */ public static constructor_ok(o: WarningMessage): Result_WarningMessageDecodeErrorZ { - const ret: number = bindings.CResult_WarningMessageDecodeErrorZ_ok(o == null ? 0 : CommonBase.get_ptr_of(o) & ~1); + const ret: bigint = bindings.CResult_WarningMessageDecodeErrorZ_ok(o == null ? 0n : CommonBase.get_ptr_of(o)); const ret_hu_conv: Result_WarningMessageDecodeErrorZ = Result_WarningMessageDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, o); return ret_hu_conv; } @@ -382,8 +383,9 @@ export class Result_WarningMessageDecodeErrorZ extends CommonBase { * Creates a new CResult_WarningMessageDecodeErrorZ in the error state. */ public static constructor_err(e: DecodeError): Result_WarningMessageDecodeErrorZ { - const ret: number = bindings.CResult_WarningMessageDecodeErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_WarningMessageDecodeErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_WarningMessageDecodeErrorZ = Result_WarningMessageDecodeErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +397,8 @@ export class Result_WarningMessageDecodeErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_WarningMessageDecodeErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_WarningMessageDecodeErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +407,7 @@ export class Result_WarningMessageDecodeErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_WarningMessageDecodeErrorZ { - const ret: number = bindings.CResult_WarningMessageDecodeErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_WarningMessageDecodeErrorZ_clone(this.ptr); const ret_hu_conv: Result_WarningMessageDecodeErrorZ = Result_WarningMessageDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,9 +417,9 @@ export class Result_WarningMessageDecodeErrorZ_OK extends Result_WarningMessageD public res: WarningMessage; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const res: number = bindings.CResult_WarningMessageDecodeErrorZ_get_ok(ptr); + const res: bigint = bindings.CResult_WarningMessageDecodeErrorZ_get_ok(ptr); const res_hu_conv: WarningMessage = new WarningMessage(null, res); CommonBase.add_ref_from(res_hu_conv, this); this.res = res_hu_conv; @@ -427,9 +429,9 @@ export class Result_WarningMessageDecodeErrorZ_Err extends Result_WarningMessage public err: DecodeError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_WarningMessageDecodeErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_WarningMessageDecodeErrorZ_get_err(ptr); const err_hu_conv: DecodeError = new DecodeError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result__u832APIErrorZ.mts b/ts/structs/Result__u832APIErrorZ.mts index cab2f613..0bee0a04 100644 --- a/ts/structs/Result__u832APIErrorZ.mts +++ b/ts/structs/Result__u832APIErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result__u832APIErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult__u832APIErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result__u832APIErrorZ { + public static constr_from_ptr(ptr: bigint): Result__u832APIErrorZ { if (bindings.CResult__u832APIErrorZ_is_ok(ptr)) { return new Result__u832APIErrorZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result__u832APIErrorZ extends CommonBase { * Creates a new CResult__u832APIErrorZ in the success state. */ public static constructor_ok(o: Uint8Array): Result__u832APIErrorZ { - const ret: number = bindings.CResult__u832APIErrorZ_ok(bindings.encodeUint8Array(bindings.check_arr_len(o, 32))); + const ret: bigint = bindings.CResult__u832APIErrorZ_ok(bindings.encodeUint8Array(bindings.check_arr_len(o, 32))); const ret_hu_conv: Result__u832APIErrorZ = Result__u832APIErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,7 +382,7 @@ export class Result__u832APIErrorZ extends CommonBase { * Creates a new CResult__u832APIErrorZ in the error state. */ public static constructor_err(e: APIError): Result__u832APIErrorZ { - const ret: number = bindings.CResult__u832APIErrorZ_err(CommonBase.get_ptr_of(e)); + const ret: bigint = bindings.CResult__u832APIErrorZ_err(CommonBase.get_ptr_of(e)); const ret_hu_conv: Result__u832APIErrorZ = Result__u832APIErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -395,8 +395,8 @@ export class Result__u832APIErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult__u832APIErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult__u832APIErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +405,7 @@ export class Result__u832APIErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result__u832APIErrorZ { - const ret: number = bindings.CResult__u832APIErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult__u832APIErrorZ_clone(this.ptr); const ret_hu_conv: Result__u832APIErrorZ = Result__u832APIErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,7 +415,7 @@ export class Result__u832APIErrorZ_OK extends Result__u832APIErrorZ { public res: Uint8Array; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); const res: number = bindings.CResult__u832APIErrorZ_get_ok(ptr); const res_conv: Uint8Array = bindings.decodeUint8Array(res); @@ -426,9 +426,9 @@ export class Result__u832APIErrorZ_Err extends Result__u832APIErrorZ { public err: APIError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult__u832APIErrorZ_get_err(ptr); + const err: bigint = bindings.CResult__u832APIErrorZ_get_err(ptr); const err_hu_conv: APIError = APIError.constr_from_ptr(err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_boolLightningErrorZ.mts b/ts/structs/Result_boolLightningErrorZ.mts index 6229d14c..ace25d18 100644 --- a/ts/structs/Result_boolLightningErrorZ.mts +++ b/ts/structs/Result_boolLightningErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_boolLightningErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_boolLightningErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_boolLightningErrorZ { + public static constr_from_ptr(ptr: bigint): Result_boolLightningErrorZ { if (bindings.CResult_boolLightningErrorZ_is_ok(ptr)) { return new Result_boolLightningErrorZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_boolLightningErrorZ extends CommonBase { * Creates a new CResult_boolLightningErrorZ in the success state. */ public static constructor_ok(o: boolean): Result_boolLightningErrorZ { - const ret: number = bindings.CResult_boolLightningErrorZ_ok(o); + const ret: bigint = bindings.CResult_boolLightningErrorZ_ok(o); const ret_hu_conv: Result_boolLightningErrorZ = Result_boolLightningErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,8 +382,9 @@ export class Result_boolLightningErrorZ extends CommonBase { * Creates a new CResult_boolLightningErrorZ in the error state. */ public static constructor_err(e: LightningError): Result_boolLightningErrorZ { - const ret: number = bindings.CResult_boolLightningErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_boolLightningErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_boolLightningErrorZ = Result_boolLightningErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +396,8 @@ export class Result_boolLightningErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_boolLightningErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_boolLightningErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +406,7 @@ export class Result_boolLightningErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_boolLightningErrorZ { - const ret: number = bindings.CResult_boolLightningErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_boolLightningErrorZ_clone(this.ptr); const ret_hu_conv: Result_boolLightningErrorZ = Result_boolLightningErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,7 +416,7 @@ export class Result_boolLightningErrorZ_OK extends Result_boolLightningErrorZ { public res: boolean; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); this.res = bindings.CResult_boolLightningErrorZ_get_ok(ptr); } @@ -424,9 +425,9 @@ export class Result_boolLightningErrorZ_Err extends Result_boolLightningErrorZ { public err: LightningError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_boolLightningErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_boolLightningErrorZ_get_err(ptr); const err_hu_conv: LightningError = new LightningError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Result_boolPeerHandleErrorZ.mts b/ts/structs/Result_boolPeerHandleErrorZ.mts index a249f80c..b216cfeb 100644 --- a/ts/structs/Result_boolPeerHandleErrorZ.mts +++ b/ts/structs/Result_boolPeerHandleErrorZ.mts @@ -358,11 +358,11 @@ import * as bindings from '../bindings.mjs' export class Result_boolPeerHandleErrorZ extends CommonBase { - protected constructor(_dummy: object, ptr: number) { + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.CResult_boolPeerHandleErrorZ_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Result_boolPeerHandleErrorZ { + public static constr_from_ptr(ptr: bigint): Result_boolPeerHandleErrorZ { if (bindings.CResult_boolPeerHandleErrorZ_is_ok(ptr)) { return new Result_boolPeerHandleErrorZ_OK(null, ptr); } else { @@ -373,7 +373,7 @@ export class Result_boolPeerHandleErrorZ extends CommonBase { * Creates a new CResult_boolPeerHandleErrorZ in the success state. */ public static constructor_ok(o: boolean): Result_boolPeerHandleErrorZ { - const ret: number = bindings.CResult_boolPeerHandleErrorZ_ok(o); + const ret: bigint = bindings.CResult_boolPeerHandleErrorZ_ok(o); const ret_hu_conv: Result_boolPeerHandleErrorZ = Result_boolPeerHandleErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -382,8 +382,9 @@ export class Result_boolPeerHandleErrorZ extends CommonBase { * Creates a new CResult_boolPeerHandleErrorZ in the error state. */ public static constructor_err(e: PeerHandleError): Result_boolPeerHandleErrorZ { - const ret: number = bindings.CResult_boolPeerHandleErrorZ_err(e == null ? 0 : CommonBase.get_ptr_of(e) & ~1); + const ret: bigint = bindings.CResult_boolPeerHandleErrorZ_err(e == null ? 0n : CommonBase.get_ptr_of(e)); const ret_hu_conv: Result_boolPeerHandleErrorZ = Result_boolPeerHandleErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(ret_hu_conv, e); return ret_hu_conv; } @@ -395,8 +396,8 @@ export class Result_boolPeerHandleErrorZ extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.CResult_boolPeerHandleErrorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.CResult_boolPeerHandleErrorZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +406,7 @@ export class Result_boolPeerHandleErrorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): Result_boolPeerHandleErrorZ { - const ret: number = bindings.CResult_boolPeerHandleErrorZ_clone(this.ptr); + const ret: bigint = bindings.CResult_boolPeerHandleErrorZ_clone(this.ptr); const ret_hu_conv: Result_boolPeerHandleErrorZ = Result_boolPeerHandleErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -415,7 +416,7 @@ export class Result_boolPeerHandleErrorZ_OK extends Result_boolPeerHandleErrorZ public res: boolean; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); this.res = bindings.CResult_boolPeerHandleErrorZ_get_ok(ptr); } @@ -424,9 +425,9 @@ export class Result_boolPeerHandleErrorZ_Err extends Result_boolPeerHandleErrorZ public err: PeerHandleError; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(_dummy, ptr); - const err: number = bindings.CResult_boolPeerHandleErrorZ_get_err(ptr); + const err: bigint = bindings.CResult_boolPeerHandleErrorZ_get_err(ptr); const err_hu_conv: PeerHandleError = new PeerHandleError(null, err); CommonBase.add_ref_from(err_hu_conv, this); this.err = err_hu_conv; diff --git a/ts/structs/Retry.mts b/ts/structs/Retry.mts index a1ae6d0c..e70d92f2 100644 --- a/ts/structs/Retry.mts +++ b/ts/structs/Retry.mts @@ -359,9 +359,9 @@ import * as bindings from '../bindings.mjs' * Strategies available to retry payment path failures for an [`Invoice`]. */ export class Retry extends CommonBase { - protected constructor(_dummy: object, ptr: number) { super(ptr, bindings.Retry_free); } + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.Retry_free); } /* @internal */ - public static constr_from_ptr(ptr: number): Retry { + public static constr_from_ptr(ptr: bigint): Retry { const raw_ty: number = bindings.LDKRetry_ty_from_ptr(ptr); switch (raw_ty) { case 0: return new Retry_Attempts(ptr); @@ -370,8 +370,8 @@ export class Retry extends CommonBase { } } - public clone_ptr(): number { - const ret: number = bindings.Retry_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.Retry_clone_ptr(this.ptr); return ret; } @@ -379,7 +379,7 @@ export class Retry extends CommonBase { * Creates a copy of the Retry */ public clone(): Retry { - const ret: number = bindings.Retry_clone(this.ptr); + const ret: bigint = bindings.Retry_clone(this.ptr); const ret_hu_conv: Retry = Retry.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -389,7 +389,7 @@ export class Retry extends CommonBase { * Utility method to constructs a new Attempts-variant Retry */ public static constructor_attempts(a: number): Retry { - const ret: number = bindings.Retry_attempts(a); + const ret: bigint = bindings.Retry_attempts(a); const ret_hu_conv: Retry = Retry.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -400,7 +400,7 @@ export class Retry extends CommonBase { * This ignores pointers and is_owned flags and looks at the values in fields. */ public eq(b: Retry): boolean { - const ret: boolean = bindings.Retry_eq(this.ptr, b == null ? 0 : CommonBase.get_ptr_of(b) & ~1); + const ret: boolean = bindings.Retry_eq(this.ptr, b == null ? 0n : CommonBase.get_ptr_of(b)); return ret; } @@ -417,7 +417,7 @@ export class Retry extends CommonBase { export class Retry_Attempts extends Retry { public attempts: number; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); this.attempts = bindings.LDKRetry_Attempts_get_attempts(ptr); } diff --git a/ts/structs/RevokeAndACK.mts b/ts/structs/RevokeAndACK.mts index 25aa8bfd..c6c57821 100644 --- a/ts/structs/RevokeAndACK.mts +++ b/ts/structs/RevokeAndACK.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class RevokeAndACK extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.RevokeAndACK_free); } @@ -417,14 +417,14 @@ export class RevokeAndACK extends CommonBase { * Constructs a new RevokeAndACK given each field */ public static constructor_new(channel_id_arg: Uint8Array, per_commitment_secret_arg: Uint8Array, next_per_commitment_point_arg: Uint8Array): RevokeAndACK { - const ret: number = bindings.RevokeAndACK_new(bindings.encodeUint8Array(bindings.check_arr_len(channel_id_arg, 32)), bindings.encodeUint8Array(bindings.check_arr_len(per_commitment_secret_arg, 32)), bindings.encodeUint8Array(bindings.check_arr_len(next_per_commitment_point_arg, 33))); + const ret: bigint = bindings.RevokeAndACK_new(bindings.encodeUint8Array(bindings.check_arr_len(channel_id_arg, 32)), bindings.encodeUint8Array(bindings.check_arr_len(per_commitment_secret_arg, 32)), bindings.encodeUint8Array(bindings.check_arr_len(next_per_commitment_point_arg, 33))); const ret_hu_conv: RevokeAndACK = new RevokeAndACK(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.RevokeAndACK_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.RevokeAndACK_clone_ptr(this.ptr); return ret; } @@ -432,7 +432,7 @@ export class RevokeAndACK extends CommonBase { * Creates a copy of the RevokeAndACK */ public clone(): RevokeAndACK { - const ret: number = bindings.RevokeAndACK_clone(this.ptr); + const ret: bigint = bindings.RevokeAndACK_clone(this.ptr); const ret_hu_conv: RevokeAndACK = new RevokeAndACK(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -451,7 +451,7 @@ export class RevokeAndACK extends CommonBase { * Read a RevokeAndACK from a byte array, created by RevokeAndACK_write */ public static constructor_read(ser: Uint8Array): Result_RevokeAndACKDecodeErrorZ { - const ret: number = bindings.RevokeAndACK_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.RevokeAndACK_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_RevokeAndACKDecodeErrorZ = Result_RevokeAndACKDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/Route.mts b/ts/structs/Route.mts index 8dc3ee48..a8a4de05 100644 --- a/ts/structs/Route.mts +++ b/ts/structs/Route.mts @@ -362,7 +362,7 @@ import * as bindings from '../bindings.mjs' */ export class Route extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.Route_free); } @@ -382,7 +382,7 @@ export class Route extends CommonBase { const ret_conv_12_conv_10_len: number = bindings.getArrayLength(ret_conv_12); const ret_conv_12_conv_10_arr: RouteHop[] = new Array(ret_conv_12_conv_10_len).fill(null); for (var k = 0; k < ret_conv_12_conv_10_len; k++) { - const ret_conv_12_conv_10: number = bindings.getU32ArrayElem(ret_conv_12, k); + const ret_conv_12_conv_10: bigint = bindings.getU64ArrayElem(ret_conv_12, k); const ret_conv_12_conv_10_hu_conv: RouteHop = new RouteHop(null, ret_conv_12_conv_10); CommonBase.add_ref_from(ret_conv_12_conv_10_hu_conv, this); ret_conv_12_conv_10_arr[k] = ret_conv_12_conv_10_hu_conv; @@ -402,7 +402,8 @@ export class Route extends CommonBase { * of any path less or equal to 19 should currently ensure it is viable. */ public set_paths(val: RouteHop[][]): void { - bindings.Route_set_paths(this.ptr, bindings.encodeUint32Array(val != null ? val.map(val_conv_12 => bindings.encodeUint32Array(val_conv_12 != null ? val_conv_12.map(val_conv_12_conv_10 => val_conv_12_conv_10 == null ? 0 : CommonBase.get_ptr_of(val_conv_12_conv_10) & ~1) : null)) : null)); + bindings.Route_set_paths(this.ptr, bindings.encodeUint32Array(val != null ? val.map(val_conv_12 => bindings.encodeUint64Array(val_conv_12 != null ? val_conv_12.map(val_conv_12_conv_10 => val_conv_12_conv_10 == null ? 0n : CommonBase.get_ptr_of(val_conv_12_conv_10)) : null)) : null)); + val.forEach((val_conv_12: RouteHop[]) => { val_conv_12.forEach((val_conv_12_conv_10: RouteHop) => { CommonBase.add_ref_from(this, val_conv_12_conv_10); }); }); } /** @@ -415,7 +416,7 @@ export class Route extends CommonBase { * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None */ public get_payment_params(): PaymentParameters { - const ret: number = bindings.Route_get_payment_params(this.ptr); + const ret: bigint = bindings.Route_get_payment_params(this.ptr); const ret_hu_conv: PaymentParameters = new PaymentParameters(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -431,21 +432,24 @@ export class Route extends CommonBase { * Note that val (or a relevant inner pointer) may be NULL or all-0s to represent None */ public set_payment_params(val: PaymentParameters): void { - bindings.Route_set_payment_params(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.Route_set_payment_params(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** * Constructs a new Route given each field */ public static constructor_new(paths_arg: RouteHop[][], payment_params_arg: PaymentParameters): Route { - const ret: number = bindings.Route_new(bindings.encodeUint32Array(paths_arg != null ? paths_arg.map(paths_arg_conv_12 => bindings.encodeUint32Array(paths_arg_conv_12 != null ? paths_arg_conv_12.map(paths_arg_conv_12_conv_10 => paths_arg_conv_12_conv_10 == null ? 0 : CommonBase.get_ptr_of(paths_arg_conv_12_conv_10) & ~1) : null)) : null), payment_params_arg == null ? 0 : CommonBase.get_ptr_of(payment_params_arg) & ~1); + const ret: bigint = bindings.Route_new(bindings.encodeUint32Array(paths_arg != null ? paths_arg.map(paths_arg_conv_12 => bindings.encodeUint64Array(paths_arg_conv_12 != null ? paths_arg_conv_12.map(paths_arg_conv_12_conv_10 => paths_arg_conv_12_conv_10 == null ? 0n : CommonBase.get_ptr_of(paths_arg_conv_12_conv_10)) : null)) : null), payment_params_arg == null ? 0n : CommonBase.get_ptr_of(payment_params_arg)); const ret_hu_conv: Route = new Route(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + paths_arg.forEach((paths_arg_conv_12: RouteHop[]) => { paths_arg_conv_12.forEach((paths_arg_conv_12_conv_10: RouteHop) => { CommonBase.add_ref_from(ret_hu_conv, paths_arg_conv_12_conv_10); }); }); + CommonBase.add_ref_from(ret_hu_conv, payment_params_arg); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.Route_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.Route_clone_ptr(this.ptr); return ret; } @@ -453,7 +457,7 @@ export class Route extends CommonBase { * Creates a copy of the Route */ public clone(): Route { - const ret: number = bindings.Route_clone(this.ptr); + const ret: bigint = bindings.Route_clone(this.ptr); const ret_hu_conv: Route = new Route(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -473,7 +477,7 @@ export class Route extends CommonBase { * Two objects with NULL inner values will be considered "equal" here. */ public eq(b: Route): boolean { - const ret: boolean = bindings.Route_eq(this.ptr, b == null ? 0 : CommonBase.get_ptr_of(b) & ~1); + const ret: boolean = bindings.Route_eq(this.ptr, b == null ? 0n : CommonBase.get_ptr_of(b)); CommonBase.add_ref_from(this, b); return ret; } @@ -510,7 +514,7 @@ export class Route extends CommonBase { * Read a Route from a byte array, created by Route_write */ public static constructor_read(ser: Uint8Array): Result_RouteDecodeErrorZ { - const ret: number = bindings.Route_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.Route_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_RouteDecodeErrorZ = Result_RouteDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/RouteHint.mts b/ts/structs/RouteHint.mts index 8e3ed421..3db531dd 100644 --- a/ts/structs/RouteHint.mts +++ b/ts/structs/RouteHint.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class RouteHint extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.RouteHint_free); } @@ -370,7 +370,7 @@ export class RouteHint extends CommonBase { const ret_conv_14_len: number = bindings.getArrayLength(ret); const ret_conv_14_arr: RouteHintHop[] = new Array(ret_conv_14_len).fill(null); for (var o = 0; o < ret_conv_14_len; o++) { - const ret_conv_14: number = bindings.getU32ArrayElem(ret, o); + const ret_conv_14: bigint = bindings.getU64ArrayElem(ret, o); const ret_conv_14_hu_conv: RouteHintHop = new RouteHintHop(null, ret_conv_14); CommonBase.add_ref_from(ret_conv_14_hu_conv, this); ret_conv_14_arr[o] = ret_conv_14_hu_conv; @@ -380,21 +380,23 @@ export class RouteHint extends CommonBase { } public set_a(val: RouteHintHop[]): void { - bindings.RouteHint_set_a(this.ptr, bindings.encodeUint32Array(val != null ? val.map(val_conv_14 => val_conv_14 == null ? 0 : CommonBase.get_ptr_of(val_conv_14) & ~1) : null)); + bindings.RouteHint_set_a(this.ptr, bindings.encodeUint64Array(val != null ? val.map(val_conv_14 => val_conv_14 == null ? 0n : CommonBase.get_ptr_of(val_conv_14)) : null)); + val.forEach((val_conv_14: RouteHintHop) => { CommonBase.add_ref_from(this, val_conv_14); }); } /** * Constructs a new RouteHint given each field */ public static constructor_new(a_arg: RouteHintHop[]): RouteHint { - const ret: number = bindings.RouteHint_new(bindings.encodeUint32Array(a_arg != null ? a_arg.map(a_arg_conv_14 => a_arg_conv_14 == null ? 0 : CommonBase.get_ptr_of(a_arg_conv_14) & ~1) : null)); + const ret: bigint = bindings.RouteHint_new(bindings.encodeUint64Array(a_arg != null ? a_arg.map(a_arg_conv_14 => a_arg_conv_14 == null ? 0n : CommonBase.get_ptr_of(a_arg_conv_14)) : null)); const ret_hu_conv: RouteHint = new RouteHint(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + a_arg.forEach((a_arg_conv_14: RouteHintHop) => { CommonBase.add_ref_from(ret_hu_conv, a_arg_conv_14); }); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.RouteHint_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.RouteHint_clone_ptr(this.ptr); return ret; } @@ -402,7 +404,7 @@ export class RouteHint extends CommonBase { * Creates a copy of the RouteHint */ public clone(): RouteHint { - const ret: number = bindings.RouteHint_clone(this.ptr); + const ret: bigint = bindings.RouteHint_clone(this.ptr); const ret_hu_conv: RouteHint = new RouteHint(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -422,7 +424,7 @@ export class RouteHint extends CommonBase { * Two objects with NULL inner values will be considered "equal" here. */ public eq(b: RouteHint): boolean { - const ret: boolean = bindings.RouteHint_eq(this.ptr, b == null ? 0 : CommonBase.get_ptr_of(b) & ~1); + const ret: boolean = bindings.RouteHint_eq(this.ptr, b == null ? 0n : CommonBase.get_ptr_of(b)); CommonBase.add_ref_from(this, b); return ret; } @@ -440,7 +442,7 @@ export class RouteHint extends CommonBase { * Read a RouteHint from a byte array, created by RouteHint_write */ public static constructor_read(ser: Uint8Array): Result_RouteHintDecodeErrorZ { - const ret: number = bindings.RouteHint_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.RouteHint_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_RouteHintDecodeErrorZ = Result_RouteHintDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/RouteHintHop.mts b/ts/structs/RouteHintHop.mts index ea99f031..9dd6767d 100644 --- a/ts/structs/RouteHintHop.mts +++ b/ts/structs/RouteHintHop.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class RouteHintHop extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.RouteHintHop_free); } @@ -400,7 +400,7 @@ export class RouteHintHop extends CommonBase { * The fees which must be paid to use this channel */ public get_fees(): RoutingFees { - const ret: number = bindings.RouteHintHop_get_fees(this.ptr); + const ret: bigint = bindings.RouteHintHop_get_fees(this.ptr); const ret_hu_conv: RoutingFees = new RoutingFees(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -410,7 +410,8 @@ export class RouteHintHop extends CommonBase { * The fees which must be paid to use this channel */ public set_fees(val: RoutingFees): void { - bindings.RouteHintHop_set_fees(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.RouteHintHop_set_fees(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** @@ -432,7 +433,7 @@ export class RouteHintHop extends CommonBase { * The minimum value, in msat, which must be relayed to the next hop. */ public get_htlc_minimum_msat(): Option_u64Z { - const ret: number = bindings.RouteHintHop_get_htlc_minimum_msat(this.ptr); + const ret: bigint = bindings.RouteHintHop_get_htlc_minimum_msat(this.ptr); const ret_hu_conv: Option_u64Z = Option_u64Z.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -449,7 +450,7 @@ export class RouteHintHop extends CommonBase { * The maximum value in msat available for routing with a single HTLC. */ public get_htlc_maximum_msat(): Option_u64Z { - const ret: number = bindings.RouteHintHop_get_htlc_maximum_msat(this.ptr); + const ret: bigint = bindings.RouteHintHop_get_htlc_maximum_msat(this.ptr); const ret_hu_conv: Option_u64Z = Option_u64Z.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -466,14 +467,15 @@ export class RouteHintHop extends CommonBase { * Constructs a new RouteHintHop given each field */ public static constructor_new(src_node_id_arg: Uint8Array, short_channel_id_arg: bigint, fees_arg: RoutingFees, cltv_expiry_delta_arg: number, htlc_minimum_msat_arg: Option_u64Z, htlc_maximum_msat_arg: Option_u64Z): RouteHintHop { - const ret: number = bindings.RouteHintHop_new(bindings.encodeUint8Array(bindings.check_arr_len(src_node_id_arg, 33)), short_channel_id_arg, fees_arg == null ? 0 : CommonBase.get_ptr_of(fees_arg) & ~1, cltv_expiry_delta_arg, CommonBase.get_ptr_of(htlc_minimum_msat_arg), CommonBase.get_ptr_of(htlc_maximum_msat_arg)); + const ret: bigint = bindings.RouteHintHop_new(bindings.encodeUint8Array(bindings.check_arr_len(src_node_id_arg, 33)), short_channel_id_arg, fees_arg == null ? 0n : CommonBase.get_ptr_of(fees_arg), cltv_expiry_delta_arg, CommonBase.get_ptr_of(htlc_minimum_msat_arg), CommonBase.get_ptr_of(htlc_maximum_msat_arg)); const ret_hu_conv: RouteHintHop = new RouteHintHop(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, fees_arg); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.RouteHintHop_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.RouteHintHop_clone_ptr(this.ptr); return ret; } @@ -481,7 +483,7 @@ export class RouteHintHop extends CommonBase { * Creates a copy of the RouteHintHop */ public clone(): RouteHintHop { - const ret: number = bindings.RouteHintHop_clone(this.ptr); + const ret: bigint = bindings.RouteHintHop_clone(this.ptr); const ret_hu_conv: RouteHintHop = new RouteHintHop(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -501,7 +503,7 @@ export class RouteHintHop extends CommonBase { * Two objects with NULL inner values will be considered "equal" here. */ public eq(b: RouteHintHop): boolean { - const ret: boolean = bindings.RouteHintHop_eq(this.ptr, b == null ? 0 : CommonBase.get_ptr_of(b) & ~1); + const ret: boolean = bindings.RouteHintHop_eq(this.ptr, b == null ? 0n : CommonBase.get_ptr_of(b)); CommonBase.add_ref_from(this, b); return ret; } @@ -519,7 +521,7 @@ export class RouteHintHop extends CommonBase { * Read a RouteHintHop from a byte array, created by RouteHintHop_write */ public static constructor_read(ser: Uint8Array): Result_RouteHintHopDecodeErrorZ { - const ret: number = bindings.RouteHintHop_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.RouteHintHop_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_RouteHintHopDecodeErrorZ = Result_RouteHintHopDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/RouteHop.mts b/ts/structs/RouteHop.mts index ae030233..58f9e567 100644 --- a/ts/structs/RouteHop.mts +++ b/ts/structs/RouteHop.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class RouteHop extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.RouteHop_free); } @@ -386,7 +386,7 @@ export class RouteHop extends CommonBase { * amended to match the features present in the invoice this node generated. */ public get_node_features(): NodeFeatures { - const ret: number = bindings.RouteHop_get_node_features(this.ptr); + const ret: bigint = bindings.RouteHop_get_node_features(this.ptr); const ret_hu_conv: NodeFeatures = new NodeFeatures(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -397,7 +397,8 @@ export class RouteHop extends CommonBase { * amended to match the features present in the invoice this node generated. */ public set_node_features(val: NodeFeatures): void { - bindings.RouteHop_set_node_features(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.RouteHop_set_node_features(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** @@ -420,7 +421,7 @@ export class RouteHop extends CommonBase { * to reach this node. */ public get_channel_features(): ChannelFeatures { - const ret: number = bindings.RouteHop_get_channel_features(this.ptr); + const ret: bigint = bindings.RouteHop_get_channel_features(this.ptr); const ret_hu_conv: ChannelFeatures = new ChannelFeatures(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -431,7 +432,8 @@ export class RouteHop extends CommonBase { * to reach this node. */ public set_channel_features(val: ChannelFeatures): void { - bindings.RouteHop_set_channel_features(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.RouteHop_set_channel_features(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** @@ -474,14 +476,16 @@ export class RouteHop extends CommonBase { * Constructs a new RouteHop given each field */ public static constructor_new(pubkey_arg: Uint8Array, node_features_arg: NodeFeatures, short_channel_id_arg: bigint, channel_features_arg: ChannelFeatures, fee_msat_arg: bigint, cltv_expiry_delta_arg: number): RouteHop { - const ret: number = bindings.RouteHop_new(bindings.encodeUint8Array(bindings.check_arr_len(pubkey_arg, 33)), node_features_arg == null ? 0 : CommonBase.get_ptr_of(node_features_arg) & ~1, short_channel_id_arg, channel_features_arg == null ? 0 : CommonBase.get_ptr_of(channel_features_arg) & ~1, fee_msat_arg, cltv_expiry_delta_arg); + const ret: bigint = bindings.RouteHop_new(bindings.encodeUint8Array(bindings.check_arr_len(pubkey_arg, 33)), node_features_arg == null ? 0n : CommonBase.get_ptr_of(node_features_arg), short_channel_id_arg, channel_features_arg == null ? 0n : CommonBase.get_ptr_of(channel_features_arg), fee_msat_arg, cltv_expiry_delta_arg); const ret_hu_conv: RouteHop = new RouteHop(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, node_features_arg); + CommonBase.add_ref_from(ret_hu_conv, channel_features_arg); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.RouteHop_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.RouteHop_clone_ptr(this.ptr); return ret; } @@ -489,7 +493,7 @@ export class RouteHop extends CommonBase { * Creates a copy of the RouteHop */ public clone(): RouteHop { - const ret: number = bindings.RouteHop_clone(this.ptr); + const ret: bigint = bindings.RouteHop_clone(this.ptr); const ret_hu_conv: RouteHop = new RouteHop(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -509,7 +513,7 @@ export class RouteHop extends CommonBase { * Two objects with NULL inner values will be considered "equal" here. */ public eq(b: RouteHop): boolean { - const ret: boolean = bindings.RouteHop_eq(this.ptr, b == null ? 0 : CommonBase.get_ptr_of(b) & ~1); + const ret: boolean = bindings.RouteHop_eq(this.ptr, b == null ? 0n : CommonBase.get_ptr_of(b)); CommonBase.add_ref_from(this, b); return ret; } @@ -527,7 +531,7 @@ export class RouteHop extends CommonBase { * Read a RouteHop from a byte array, created by RouteHop_write */ public static constructor_read(ser: Uint8Array): Result_RouteHopDecodeErrorZ { - const ret: number = bindings.RouteHop_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.RouteHop_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_RouteHopDecodeErrorZ = Result_RouteHopDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/RouteParameters.mts b/ts/structs/RouteParameters.mts index 5754b617..6a60c856 100644 --- a/ts/structs/RouteParameters.mts +++ b/ts/structs/RouteParameters.mts @@ -366,7 +366,7 @@ import * as bindings from '../bindings.mjs' */ export class RouteParameters extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.RouteParameters_free); } @@ -374,7 +374,7 @@ export class RouteParameters extends CommonBase { * The parameters of the failed payment path. */ public get_payment_params(): PaymentParameters { - const ret: number = bindings.RouteParameters_get_payment_params(this.ptr); + const ret: bigint = bindings.RouteParameters_get_payment_params(this.ptr); const ret_hu_conv: PaymentParameters = new PaymentParameters(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -384,7 +384,8 @@ export class RouteParameters extends CommonBase { * The parameters of the failed payment path. */ public set_payment_params(val: PaymentParameters): void { - bindings.RouteParameters_set_payment_params(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.RouteParameters_set_payment_params(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** @@ -421,14 +422,15 @@ export class RouteParameters extends CommonBase { * Constructs a new RouteParameters given each field */ public static constructor_new(payment_params_arg: PaymentParameters, final_value_msat_arg: bigint, final_cltv_expiry_delta_arg: number): RouteParameters { - const ret: number = bindings.RouteParameters_new(payment_params_arg == null ? 0 : CommonBase.get_ptr_of(payment_params_arg) & ~1, final_value_msat_arg, final_cltv_expiry_delta_arg); + const ret: bigint = bindings.RouteParameters_new(payment_params_arg == null ? 0n : CommonBase.get_ptr_of(payment_params_arg), final_value_msat_arg, final_cltv_expiry_delta_arg); const ret_hu_conv: RouteParameters = new RouteParameters(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, payment_params_arg); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.RouteParameters_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.RouteParameters_clone_ptr(this.ptr); return ret; } @@ -436,7 +438,7 @@ export class RouteParameters extends CommonBase { * Creates a copy of the RouteParameters */ public clone(): RouteParameters { - const ret: number = bindings.RouteParameters_clone(this.ptr); + const ret: bigint = bindings.RouteParameters_clone(this.ptr); const ret_hu_conv: RouteParameters = new RouteParameters(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -455,7 +457,7 @@ export class RouteParameters extends CommonBase { * Read a RouteParameters from a byte array, created by RouteParameters_write */ public static constructor_read(ser: Uint8Array): Result_RouteParametersDecodeErrorZ { - const ret: number = bindings.RouteParameters_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.RouteParameters_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_RouteParametersDecodeErrorZ = Result_RouteParametersDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/Router.mts b/ts/structs/Router.mts index 0c575ede..b2d17973 100644 --- a/ts/structs/Router.mts +++ b/ts/structs/Router.mts @@ -379,7 +379,7 @@ export class Router extends CommonBase { public bindings_instance?: bindings.LDKRouter; /* @internal */ - constructor(_dummy: object, ptr: number) { + constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.Router_free); this.bindings_instance = null; } @@ -388,14 +388,14 @@ export class Router extends CommonBase { public static new_impl(arg: RouterInterface): Router { const impl_holder: LDKRouterHolder = new LDKRouterHolder(); let structImplementation = { - find_route (payer: number, route_params: number, payment_hash: number, first_hops: number, scorer: number): number { + find_route (payer: number, route_params: bigint, payment_hash: number, first_hops: number, scorer: bigint): bigint { const payer_conv: Uint8Array = bindings.decodeUint8Array(payer); const route_params_hu_conv: RouteParameters = new RouteParameters(null, route_params); const payment_hash_conv: Uint8Array = bindings.decodeUint8Array(payment_hash); const first_hops_conv_16_len: number = bindings.getArrayLength(first_hops); const first_hops_conv_16_arr: ChannelDetails[] = new Array(first_hops_conv_16_len).fill(null); for (var q = 0; q < first_hops_conv_16_len; q++) { - const first_hops_conv_16: number = bindings.getU32ArrayElem(first_hops, q); + const first_hops_conv_16: bigint = bindings.getU64ArrayElem(first_hops, q); const first_hops_conv_16_hu_conv: ChannelDetails = new ChannelDetails(null, first_hops_conv_16); CommonBase.add_ref_from(first_hops_conv_16_hu_conv, this); first_hops_conv_16_arr[q] = first_hops_conv_16_hu_conv; @@ -404,11 +404,11 @@ export class Router extends CommonBase { const ret_hu_conv: Score = new Score(null, scorer); CommonBase.add_ref_from(ret_hu_conv, this); const ret: Result_RouteLightningErrorZ = arg.find_route(payer_conv, route_params_hu_conv, payment_hash_conv, first_hops_conv_16_arr, ret_hu_conv); - const result: number = ret == null ? 0 : ret.clone_ptr(); + const result: bigint = ret == null ? 0n : ret.clone_ptr(); return result; }, } as bindings.LDKRouter; - const ptr: number = bindings.LDKRouter_new(structImplementation); + const ptr: bigint = bindings.LDKRouter_new(structImplementation); impl_holder.held = new Router(null, ptr); impl_holder.held.bindings_instance = structImplementation; @@ -421,7 +421,7 @@ export class Router extends CommonBase { * Note that first_hops (or a relevant inner pointer) may be NULL or all-0s to represent None */ public find_route(payer: Uint8Array, route_params: RouteParameters, payment_hash: Uint8Array, first_hops: ChannelDetails[], scorer: Score): Result_RouteLightningErrorZ { - const ret: number = bindings.Router_find_route(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(payer, 33)), route_params == null ? 0 : CommonBase.get_ptr_of(route_params) & ~1, bindings.encodeUint8Array(bindings.check_arr_len(payment_hash, 32)), bindings.encodeUint32Array(first_hops != null ? first_hops.map(first_hops_conv_16 => first_hops_conv_16 == null ? 0 : CommonBase.get_ptr_of(first_hops_conv_16) & ~1) : null), scorer == null ? 0 : CommonBase.get_ptr_of(scorer)); + const ret: bigint = bindings.Router_find_route(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(payer, 33)), route_params == null ? 0n : CommonBase.get_ptr_of(route_params), bindings.encodeUint8Array(bindings.check_arr_len(payment_hash, 32)), bindings.encodeUint64Array(first_hops != null ? first_hops.map(first_hops_conv_16 => first_hops_conv_16 == null ? 0n : CommonBase.get_ptr_of(first_hops_conv_16)) : null), scorer == null ? 0n : CommonBase.get_ptr_of(scorer)); const ret_hu_conv: Result_RouteLightningErrorZ = Result_RouteLightningErrorZ.constr_from_ptr(ret); CommonBase.add_ref_from(this, route_params); first_hops.forEach((first_hops_conv_16: ChannelDetails) => { CommonBase.add_ref_from(this, first_hops_conv_16); }); diff --git a/ts/structs/RoutingFees.mts b/ts/structs/RoutingFees.mts index 772d8857..80eb7664 100644 --- a/ts/structs/RoutingFees.mts +++ b/ts/structs/RoutingFees.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class RoutingFees extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.RoutingFees_free); } @@ -401,7 +401,7 @@ export class RoutingFees extends CommonBase { * Constructs a new RoutingFees given each field */ public static constructor_new(base_msat_arg: number, proportional_millionths_arg: number): RoutingFees { - const ret: number = bindings.RoutingFees_new(base_msat_arg, proportional_millionths_arg); + const ret: bigint = bindings.RoutingFees_new(base_msat_arg, proportional_millionths_arg); const ret_hu_conv: RoutingFees = new RoutingFees(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -413,13 +413,13 @@ export class RoutingFees extends CommonBase { * Two objects with NULL inner values will be considered "equal" here. */ public eq(b: RoutingFees): boolean { - const ret: boolean = bindings.RoutingFees_eq(this.ptr, b == null ? 0 : CommonBase.get_ptr_of(b) & ~1); + const ret: boolean = bindings.RoutingFees_eq(this.ptr, b == null ? 0n : CommonBase.get_ptr_of(b)); CommonBase.add_ref_from(this, b); return ret; } - public clone_ptr(): number { - const ret: number = bindings.RoutingFees_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.RoutingFees_clone_ptr(this.ptr); return ret; } @@ -427,7 +427,7 @@ export class RoutingFees extends CommonBase { * Creates a copy of the RoutingFees */ public clone(): RoutingFees { - const ret: number = bindings.RoutingFees_clone(this.ptr); + const ret: bigint = bindings.RoutingFees_clone(this.ptr); const ret_hu_conv: RoutingFees = new RoutingFees(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -454,7 +454,7 @@ export class RoutingFees extends CommonBase { * Read a RoutingFees from a byte array, created by RoutingFees_write */ public static constructor_read(ser: Uint8Array): Result_RoutingFeesDecodeErrorZ { - const ret: number = bindings.RoutingFees_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.RoutingFees_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_RoutingFeesDecodeErrorZ = Result_RoutingFeesDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/RoutingMessageHandler.mts b/ts/structs/RoutingMessageHandler.mts index 7a5b8279..fa292e8b 100644 --- a/ts/structs/RoutingMessageHandler.mts +++ b/ts/structs/RoutingMessageHandler.mts @@ -429,7 +429,7 @@ export class RoutingMessageHandler extends CommonBase { public bindings_instance?: bindings.LDKRoutingMessageHandler; /* @internal */ - constructor(_dummy: object, ptr: number) { + constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.RoutingMessageHandler_free); this.bindings_instance = null; } @@ -438,75 +438,75 @@ export class RoutingMessageHandler extends CommonBase { public static new_impl(arg: RoutingMessageHandlerInterface, messageSendEventsProvider_impl: MessageSendEventsProviderInterface): RoutingMessageHandler { const impl_holder: LDKRoutingMessageHandlerHolder = new LDKRoutingMessageHandlerHolder(); let structImplementation = { - handle_node_announcement (msg: number): number { + handle_node_announcement (msg: bigint): bigint { const msg_hu_conv: NodeAnnouncement = new NodeAnnouncement(null, msg); const ret: Result_boolLightningErrorZ = arg.handle_node_announcement(msg_hu_conv); - const result: number = ret == null ? 0 : ret.clone_ptr(); + const result: bigint = ret == null ? 0n : ret.clone_ptr(); return result; }, - handle_channel_announcement (msg: number): number { + handle_channel_announcement (msg: bigint): bigint { const msg_hu_conv: ChannelAnnouncement = new ChannelAnnouncement(null, msg); const ret: Result_boolLightningErrorZ = arg.handle_channel_announcement(msg_hu_conv); - const result: number = ret == null ? 0 : ret.clone_ptr(); + const result: bigint = ret == null ? 0n : ret.clone_ptr(); return result; }, - handle_channel_update (msg: number): number { + handle_channel_update (msg: bigint): bigint { const msg_hu_conv: ChannelUpdate = new ChannelUpdate(null, msg); const ret: Result_boolLightningErrorZ = arg.handle_channel_update(msg_hu_conv); - const result: number = ret == null ? 0 : ret.clone_ptr(); + const result: bigint = ret == null ? 0n : ret.clone_ptr(); return result; }, get_next_channel_announcements (starting_point: bigint, batch_amount: number): number { const ret: ThreeTuple_ChannelAnnouncementChannelUpdateChannelUpdateZ[] = arg.get_next_channel_announcements(starting_point, batch_amount); - const result: number = bindings.encodeUint32Array(ret != null ? ret.map(ret_conv_59 => ret_conv_59 == null ? 0 : ret_conv_59.clone_ptr()) : null); + const result: number = bindings.encodeUint64Array(ret != null ? ret.map(ret_conv_59 => ret_conv_59 == null ? 0n : ret_conv_59.clone_ptr()) : null); return result; }, get_next_node_announcements (starting_point: number, batch_amount: number): number { const starting_point_conv: Uint8Array = bindings.decodeUint8Array(starting_point); const ret: NodeAnnouncement[] = arg.get_next_node_announcements(starting_point_conv, batch_amount); - const result: number = bindings.encodeUint32Array(ret != null ? ret.map(ret_conv_18 => ret_conv_18 == null ? 0 : ret_conv_18.clone_ptr()) : null); + const result: number = bindings.encodeUint64Array(ret != null ? ret.map(ret_conv_18 => ret_conv_18 == null ? 0n : ret_conv_18.clone_ptr()) : null); return result; }, - peer_connected (their_node_id: number, init: number): void { + peer_connected (their_node_id: number, init: bigint): void { const their_node_id_conv: Uint8Array = bindings.decodeUint8Array(their_node_id); const init_hu_conv: Init = new Init(null, init); arg.peer_connected(their_node_id_conv, init_hu_conv); }, - handle_reply_channel_range (their_node_id: number, msg: number): number { + handle_reply_channel_range (their_node_id: number, msg: bigint): bigint { const their_node_id_conv: Uint8Array = bindings.decodeUint8Array(their_node_id); const msg_hu_conv: ReplyChannelRange = new ReplyChannelRange(null, msg); CommonBase.add_ref_from(msg_hu_conv, this); const ret: Result_NoneLightningErrorZ = arg.handle_reply_channel_range(their_node_id_conv, msg_hu_conv); - const result: number = ret == null ? 0 : ret.clone_ptr(); + const result: bigint = ret == null ? 0n : ret.clone_ptr(); return result; }, - handle_reply_short_channel_ids_end (their_node_id: number, msg: number): number { + handle_reply_short_channel_ids_end (their_node_id: number, msg: bigint): bigint { const their_node_id_conv: Uint8Array = bindings.decodeUint8Array(their_node_id); const msg_hu_conv: ReplyShortChannelIdsEnd = new ReplyShortChannelIdsEnd(null, msg); CommonBase.add_ref_from(msg_hu_conv, this); const ret: Result_NoneLightningErrorZ = arg.handle_reply_short_channel_ids_end(their_node_id_conv, msg_hu_conv); - const result: number = ret == null ? 0 : ret.clone_ptr(); + const result: bigint = ret == null ? 0n : ret.clone_ptr(); return result; }, - handle_query_channel_range (their_node_id: number, msg: number): number { + handle_query_channel_range (their_node_id: number, msg: bigint): bigint { const their_node_id_conv: Uint8Array = bindings.decodeUint8Array(their_node_id); const msg_hu_conv: QueryChannelRange = new QueryChannelRange(null, msg); CommonBase.add_ref_from(msg_hu_conv, this); const ret: Result_NoneLightningErrorZ = arg.handle_query_channel_range(their_node_id_conv, msg_hu_conv); - const result: number = ret == null ? 0 : ret.clone_ptr(); + const result: bigint = ret == null ? 0n : ret.clone_ptr(); return result; }, - handle_query_short_channel_ids (their_node_id: number, msg: number): number { + handle_query_short_channel_ids (their_node_id: number, msg: bigint): bigint { const their_node_id_conv: Uint8Array = bindings.decodeUint8Array(their_node_id); const msg_hu_conv: QueryShortChannelIds = new QueryShortChannelIds(null, msg); CommonBase.add_ref_from(msg_hu_conv, this); const ret: Result_NoneLightningErrorZ = arg.handle_query_short_channel_ids(their_node_id_conv, msg_hu_conv); - const result: number = ret == null ? 0 : ret.clone_ptr(); + const result: bigint = ret == null ? 0n : ret.clone_ptr(); return result; }, } as bindings.LDKRoutingMessageHandler; const messageSendEventsProvider = MessageSendEventsProvider.new_impl(messageSendEventsProvider_impl, ); - const ptr: number = bindings.LDKRoutingMessageHandler_new(structImplementation, messageSendEventsProvider.bindings_instance); + const ptr: bigint = bindings.LDKRoutingMessageHandler_new(structImplementation, messageSendEventsProvider.bindings_instance); impl_holder.held = new RoutingMessageHandler(null, ptr); impl_holder.held.bindings_instance = structImplementation; @@ -519,7 +519,7 @@ export class RoutingMessageHandler extends CommonBase { * false or returning an Err otherwise. */ public handle_node_announcement(msg: NodeAnnouncement): Result_boolLightningErrorZ { - const ret: number = bindings.RoutingMessageHandler_handle_node_announcement(this.ptr, msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + const ret: bigint = bindings.RoutingMessageHandler_handle_node_announcement(this.ptr, msg == null ? 0n : CommonBase.get_ptr_of(msg)); const ret_hu_conv: Result_boolLightningErrorZ = Result_boolLightningErrorZ.constr_from_ptr(ret); CommonBase.add_ref_from(this, msg); return ret_hu_conv; @@ -530,7 +530,7 @@ export class RoutingMessageHandler extends CommonBase { * or returning an Err otherwise. */ public handle_channel_announcement(msg: ChannelAnnouncement): Result_boolLightningErrorZ { - const ret: number = bindings.RoutingMessageHandler_handle_channel_announcement(this.ptr, msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + const ret: bigint = bindings.RoutingMessageHandler_handle_channel_announcement(this.ptr, msg == null ? 0n : CommonBase.get_ptr_of(msg)); const ret_hu_conv: Result_boolLightningErrorZ = Result_boolLightningErrorZ.constr_from_ptr(ret); CommonBase.add_ref_from(this, msg); return ret_hu_conv; @@ -541,7 +541,7 @@ export class RoutingMessageHandler extends CommonBase { * false or returning an Err otherwise. */ public handle_channel_update(msg: ChannelUpdate): Result_boolLightningErrorZ { - const ret: number = bindings.RoutingMessageHandler_handle_channel_update(this.ptr, msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + const ret: bigint = bindings.RoutingMessageHandler_handle_channel_update(this.ptr, msg == null ? 0n : CommonBase.get_ptr_of(msg)); const ret_hu_conv: Result_boolLightningErrorZ = Result_boolLightningErrorZ.constr_from_ptr(ret); CommonBase.add_ref_from(this, msg); return ret_hu_conv; @@ -557,7 +557,7 @@ export class RoutingMessageHandler extends CommonBase { const ret_conv_59_len: number = bindings.getArrayLength(ret); const ret_conv_59_arr: ThreeTuple_ChannelAnnouncementChannelUpdateChannelUpdateZ[] = new Array(ret_conv_59_len).fill(null); for (var h = 0; h < ret_conv_59_len; h++) { - const ret_conv_59: number = bindings.getU32ArrayElem(ret, h); + const ret_conv_59: bigint = bindings.getU64ArrayElem(ret, h); const ret_conv_59_hu_conv: ThreeTuple_ChannelAnnouncementChannelUpdateChannelUpdateZ = new ThreeTuple_ChannelAnnouncementChannelUpdateChannelUpdateZ(null, ret_conv_59); CommonBase.add_ref_from(ret_conv_59_hu_conv, this); ret_conv_59_arr[h] = ret_conv_59_hu_conv; @@ -579,7 +579,7 @@ export class RoutingMessageHandler extends CommonBase { const ret_conv_18_len: number = bindings.getArrayLength(ret); const ret_conv_18_arr: NodeAnnouncement[] = new Array(ret_conv_18_len).fill(null); for (var s = 0; s < ret_conv_18_len; s++) { - const ret_conv_18: number = bindings.getU32ArrayElem(ret, s); + const ret_conv_18: bigint = bindings.getU64ArrayElem(ret, s); const ret_conv_18_hu_conv: NodeAnnouncement = new NodeAnnouncement(null, ret_conv_18); CommonBase.add_ref_from(ret_conv_18_hu_conv, this); ret_conv_18_arr[s] = ret_conv_18_hu_conv; @@ -594,7 +594,7 @@ export class RoutingMessageHandler extends CommonBase { * implementor. */ public peer_connected(their_node_id: Uint8Array, init: Init): void { - bindings.RoutingMessageHandler_peer_connected(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), init == null ? 0 : CommonBase.get_ptr_of(init) & ~1); + bindings.RoutingMessageHandler_peer_connected(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), init == null ? 0n : CommonBase.get_ptr_of(init)); CommonBase.add_ref_from(this, init); } @@ -604,8 +604,9 @@ export class RoutingMessageHandler extends CommonBase { * replies to a single query. */ public handle_reply_channel_range(their_node_id: Uint8Array, msg: ReplyChannelRange): Result_NoneLightningErrorZ { - const ret: number = bindings.RoutingMessageHandler_handle_reply_channel_range(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + const ret: bigint = bindings.RoutingMessageHandler_handle_reply_channel_range(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), msg == null ? 0n : CommonBase.get_ptr_of(msg)); const ret_hu_conv: Result_NoneLightningErrorZ = Result_NoneLightningErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(this, msg); return ret_hu_conv; } @@ -616,8 +617,9 @@ export class RoutingMessageHandler extends CommonBase { * gossip messages. */ public handle_reply_short_channel_ids_end(their_node_id: Uint8Array, msg: ReplyShortChannelIdsEnd): Result_NoneLightningErrorZ { - const ret: number = bindings.RoutingMessageHandler_handle_reply_short_channel_ids_end(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + const ret: bigint = bindings.RoutingMessageHandler_handle_reply_short_channel_ids_end(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), msg == null ? 0n : CommonBase.get_ptr_of(msg)); const ret_hu_conv: Result_NoneLightningErrorZ = Result_NoneLightningErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(this, msg); return ret_hu_conv; } @@ -626,8 +628,9 @@ export class RoutingMessageHandler extends CommonBase { * for the requested range of blocks. */ public handle_query_channel_range(their_node_id: Uint8Array, msg: QueryChannelRange): Result_NoneLightningErrorZ { - const ret: number = bindings.RoutingMessageHandler_handle_query_channel_range(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + const ret: bigint = bindings.RoutingMessageHandler_handle_query_channel_range(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), msg == null ? 0n : CommonBase.get_ptr_of(msg)); const ret_hu_conv: Result_NoneLightningErrorZ = Result_NoneLightningErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(this, msg); return ret_hu_conv; } @@ -636,8 +639,9 @@ export class RoutingMessageHandler extends CommonBase { * list of short_channel_ids. */ public handle_query_short_channel_ids(their_node_id: Uint8Array, msg: QueryShortChannelIds): Result_NoneLightningErrorZ { - const ret: number = bindings.RoutingMessageHandler_handle_query_short_channel_ids(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), msg == null ? 0 : CommonBase.get_ptr_of(msg) & ~1); + const ret: bigint = bindings.RoutingMessageHandler_handle_query_short_channel_ids(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), msg == null ? 0n : CommonBase.get_ptr_of(msg)); const ret_hu_conv: Result_NoneLightningErrorZ = Result_NoneLightningErrorZ.constr_from_ptr(ret); + CommonBase.add_ref_from(this, msg); return ret_hu_conv; } diff --git a/ts/structs/Score.mts b/ts/structs/Score.mts index bf781fd7..0312462c 100644 --- a/ts/structs/Score.mts +++ b/ts/structs/Score.mts @@ -401,7 +401,7 @@ export class Score extends CommonBase { public bindings_instance?: bindings.LDKScore; /* @internal */ - constructor(_dummy: object, ptr: number) { + constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.Score_free); this.bindings_instance = null; } @@ -410,7 +410,7 @@ export class Score extends CommonBase { public static new_impl(arg: ScoreInterface): Score { const impl_holder: LDKScoreHolder = new LDKScoreHolder(); let structImplementation = { - channel_penalty_msat (short_channel_id: bigint, source: number, target: number, usage: number): bigint { + channel_penalty_msat (short_channel_id: bigint, source: bigint, target: bigint, usage: bigint): bigint { const source_hu_conv: NodeId = new NodeId(null, source); const target_hu_conv: NodeId = new NodeId(null, target); const usage_hu_conv: ChannelUsage = new ChannelUsage(null, usage); @@ -422,7 +422,7 @@ export class Score extends CommonBase { const path_conv_10_len: number = bindings.getArrayLength(path); const path_conv_10_arr: RouteHop[] = new Array(path_conv_10_len).fill(null); for (var k = 0; k < path_conv_10_len; k++) { - const path_conv_10: number = bindings.getU32ArrayElem(path, k); + const path_conv_10: bigint = bindings.getU64ArrayElem(path, k); const path_conv_10_hu_conv: RouteHop = new RouteHop(null, path_conv_10); CommonBase.add_ref_from(path_conv_10_hu_conv, this); path_conv_10_arr[k] = path_conv_10_hu_conv; @@ -434,7 +434,7 @@ export class Score extends CommonBase { const path_conv_10_len: number = bindings.getArrayLength(path); const path_conv_10_arr: RouteHop[] = new Array(path_conv_10_len).fill(null); for (var k = 0; k < path_conv_10_len; k++) { - const path_conv_10: number = bindings.getU32ArrayElem(path, k); + const path_conv_10: bigint = bindings.getU64ArrayElem(path, k); const path_conv_10_hu_conv: RouteHop = new RouteHop(null, path_conv_10); CommonBase.add_ref_from(path_conv_10_hu_conv, this); path_conv_10_arr[k] = path_conv_10_hu_conv; @@ -446,7 +446,7 @@ export class Score extends CommonBase { const path_conv_10_len: number = bindings.getArrayLength(path); const path_conv_10_arr: RouteHop[] = new Array(path_conv_10_len).fill(null); for (var k = 0; k < path_conv_10_len; k++) { - const path_conv_10: number = bindings.getU32ArrayElem(path, k); + const path_conv_10: bigint = bindings.getU64ArrayElem(path, k); const path_conv_10_hu_conv: RouteHop = new RouteHop(null, path_conv_10); CommonBase.add_ref_from(path_conv_10_hu_conv, this); path_conv_10_arr[k] = path_conv_10_hu_conv; @@ -458,7 +458,7 @@ export class Score extends CommonBase { const path_conv_10_len: number = bindings.getArrayLength(path); const path_conv_10_arr: RouteHop[] = new Array(path_conv_10_len).fill(null); for (var k = 0; k < path_conv_10_len; k++) { - const path_conv_10: number = bindings.getU32ArrayElem(path, k); + const path_conv_10: bigint = bindings.getU64ArrayElem(path, k); const path_conv_10_hu_conv: RouteHop = new RouteHop(null, path_conv_10); CommonBase.add_ref_from(path_conv_10_hu_conv, this); path_conv_10_arr[k] = path_conv_10_hu_conv; @@ -472,7 +472,7 @@ export class Score extends CommonBase { return result; }, } as bindings.LDKScore; - const ptr: number = bindings.LDKScore_new(structImplementation); + const ptr: bigint = bindings.LDKScore_new(structImplementation); impl_holder.held = new Score(null, ptr); impl_holder.held.bindings_instance = structImplementation; @@ -490,9 +490,10 @@ export class Score extends CommonBase { * Thus, implementations should be overflow-safe. */ public channel_penalty_msat(short_channel_id: bigint, source: NodeId, target: NodeId, usage: ChannelUsage): bigint { - const ret: bigint = bindings.Score_channel_penalty_msat(this.ptr, short_channel_id, source == null ? 0 : CommonBase.get_ptr_of(source) & ~1, target == null ? 0 : CommonBase.get_ptr_of(target) & ~1, usage == null ? 0 : CommonBase.get_ptr_of(usage) & ~1); + const ret: bigint = bindings.Score_channel_penalty_msat(this.ptr, short_channel_id, source == null ? 0n : CommonBase.get_ptr_of(source), target == null ? 0n : CommonBase.get_ptr_of(target), usage == null ? 0n : CommonBase.get_ptr_of(usage)); CommonBase.add_ref_from(this, source); CommonBase.add_ref_from(this, target); + CommonBase.add_ref_from(this, usage); return ret; } @@ -500,28 +501,32 @@ export class Score extends CommonBase { * Handles updating channel penalties after failing to route through a channel. */ public payment_path_failed(path: RouteHop[], short_channel_id: bigint): void { - bindings.Score_payment_path_failed(this.ptr, bindings.encodeUint32Array(path != null ? path.map(path_conv_10 => path_conv_10 == null ? 0 : CommonBase.get_ptr_of(path_conv_10) & ~1) : null), short_channel_id); + bindings.Score_payment_path_failed(this.ptr, bindings.encodeUint64Array(path != null ? path.map(path_conv_10 => path_conv_10 == null ? 0n : CommonBase.get_ptr_of(path_conv_10)) : null), short_channel_id); + path.forEach((path_conv_10: RouteHop) => { CommonBase.add_ref_from(this, path_conv_10); }); } /** * Handles updating channel penalties after successfully routing along a path. */ public payment_path_successful(path: RouteHop[]): void { - bindings.Score_payment_path_successful(this.ptr, bindings.encodeUint32Array(path != null ? path.map(path_conv_10 => path_conv_10 == null ? 0 : CommonBase.get_ptr_of(path_conv_10) & ~1) : null)); + bindings.Score_payment_path_successful(this.ptr, bindings.encodeUint64Array(path != null ? path.map(path_conv_10 => path_conv_10 == null ? 0n : CommonBase.get_ptr_of(path_conv_10)) : null)); + path.forEach((path_conv_10: RouteHop) => { CommonBase.add_ref_from(this, path_conv_10); }); } /** * Handles updating channel penalties after a probe over the given path failed. */ public probe_failed(path: RouteHop[], short_channel_id: bigint): void { - bindings.Score_probe_failed(this.ptr, bindings.encodeUint32Array(path != null ? path.map(path_conv_10 => path_conv_10 == null ? 0 : CommonBase.get_ptr_of(path_conv_10) & ~1) : null), short_channel_id); + bindings.Score_probe_failed(this.ptr, bindings.encodeUint64Array(path != null ? path.map(path_conv_10 => path_conv_10 == null ? 0n : CommonBase.get_ptr_of(path_conv_10)) : null), short_channel_id); + path.forEach((path_conv_10: RouteHop) => { CommonBase.add_ref_from(this, path_conv_10); }); } /** * Handles updating channel penalties after a probe over the given path succeeded. */ public probe_successful(path: RouteHop[]): void { - bindings.Score_probe_successful(this.ptr, bindings.encodeUint32Array(path != null ? path.map(path_conv_10 => path_conv_10 == null ? 0 : CommonBase.get_ptr_of(path_conv_10) & ~1) : null)); + bindings.Score_probe_successful(this.ptr, bindings.encodeUint64Array(path != null ? path.map(path_conv_10 => path_conv_10 == null ? 0n : CommonBase.get_ptr_of(path_conv_10)) : null)); + path.forEach((path_conv_10: RouteHop) => { CommonBase.add_ref_from(this, path_conv_10); }); } /** diff --git a/ts/structs/Sha256.mts b/ts/structs/Sha256.mts index f3eeeb41..7bc89032 100644 --- a/ts/structs/Sha256.mts +++ b/ts/structs/Sha256.mts @@ -361,12 +361,12 @@ import * as bindings from '../bindings.mjs' */ export class Sha256 extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.Sha256_free); } - public clone_ptr(): number { - const ret: number = bindings.Sha256_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.Sha256_clone_ptr(this.ptr); return ret; } @@ -374,7 +374,7 @@ export class Sha256 extends CommonBase { * Creates a copy of the Sha256 */ public clone(): Sha256 { - const ret: number = bindings.Sha256_clone(this.ptr); + const ret: bigint = bindings.Sha256_clone(this.ptr); const ret_hu_conv: Sha256 = new Sha256(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -394,7 +394,7 @@ export class Sha256 extends CommonBase { * Two objects with NULL inner values will be considered "equal" here. */ public eq(b: Sha256): boolean { - const ret: boolean = bindings.Sha256_eq(this.ptr, b == null ? 0 : CommonBase.get_ptr_of(b) & ~1); + const ret: boolean = bindings.Sha256_eq(this.ptr, b == null ? 0n : CommonBase.get_ptr_of(b)); CommonBase.add_ref_from(this, b); return ret; } diff --git a/ts/structs/Shutdown.mts b/ts/structs/Shutdown.mts index afcb5290..4feacea9 100644 --- a/ts/structs/Shutdown.mts +++ b/ts/structs/Shutdown.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class Shutdown extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.Shutdown_free); } @@ -403,14 +403,14 @@ export class Shutdown extends CommonBase { * Constructs a new Shutdown given each field */ public static constructor_new(channel_id_arg: Uint8Array, scriptpubkey_arg: Uint8Array): Shutdown { - const ret: number = bindings.Shutdown_new(bindings.encodeUint8Array(bindings.check_arr_len(channel_id_arg, 32)), bindings.encodeUint8Array(scriptpubkey_arg)); + const ret: bigint = bindings.Shutdown_new(bindings.encodeUint8Array(bindings.check_arr_len(channel_id_arg, 32)), bindings.encodeUint8Array(scriptpubkey_arg)); const ret_hu_conv: Shutdown = new Shutdown(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.Shutdown_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.Shutdown_clone_ptr(this.ptr); return ret; } @@ -418,7 +418,7 @@ export class Shutdown extends CommonBase { * Creates a copy of the Shutdown */ public clone(): Shutdown { - const ret: number = bindings.Shutdown_clone(this.ptr); + const ret: bigint = bindings.Shutdown_clone(this.ptr); const ret_hu_conv: Shutdown = new Shutdown(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -437,7 +437,7 @@ export class Shutdown extends CommonBase { * Read a Shutdown from a byte array, created by Shutdown_write */ public static constructor_read(ser: Uint8Array): Result_ShutdownDecodeErrorZ { - const ret: number = bindings.Shutdown_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.Shutdown_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_ShutdownDecodeErrorZ = Result_ShutdownDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/ShutdownScript.mts b/ts/structs/ShutdownScript.mts index ff2044f2..3f81c6ed 100644 --- a/ts/structs/ShutdownScript.mts +++ b/ts/structs/ShutdownScript.mts @@ -363,12 +363,12 @@ import * as bindings from '../bindings.mjs' */ export class ShutdownScript extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.ShutdownScript_free); } - public clone_ptr(): number { - const ret: number = bindings.ShutdownScript_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.ShutdownScript_clone_ptr(this.ptr); return ret; } @@ -376,7 +376,7 @@ export class ShutdownScript extends CommonBase { * Creates a copy of the ShutdownScript */ public clone(): ShutdownScript { - const ret: number = bindings.ShutdownScript_clone(this.ptr); + const ret: bigint = bindings.ShutdownScript_clone(this.ptr); const ret_hu_conv: ShutdownScript = new ShutdownScript(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -395,7 +395,7 @@ export class ShutdownScript extends CommonBase { * Read a ShutdownScript from a byte array, created by ShutdownScript_write */ public static constructor_read(ser: Uint8Array): Result_ShutdownScriptDecodeErrorZ { - const ret: number = bindings.ShutdownScript_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.ShutdownScript_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_ShutdownScriptDecodeErrorZ = Result_ShutdownScriptDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -404,7 +404,7 @@ export class ShutdownScript extends CommonBase { * Generates a P2WPKH script pubkey from the given [`WPubkeyHash`]. */ public static constructor_new_p2wpkh(pubkey_hash: Uint8Array): ShutdownScript { - const ret: number = bindings.ShutdownScript_new_p2wpkh(bindings.encodeUint8Array(bindings.check_arr_len(pubkey_hash, 20))); + const ret: bigint = bindings.ShutdownScript_new_p2wpkh(bindings.encodeUint8Array(bindings.check_arr_len(pubkey_hash, 20))); const ret_hu_conv: ShutdownScript = new ShutdownScript(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -414,7 +414,7 @@ export class ShutdownScript extends CommonBase { * Generates a P2WSH script pubkey from the given [`WScriptHash`]. */ public static constructor_new_p2wsh(script_hash: Uint8Array): ShutdownScript { - const ret: number = bindings.ShutdownScript_new_p2wsh(bindings.encodeUint8Array(bindings.check_arr_len(script_hash, 32))); + const ret: bigint = bindings.ShutdownScript_new_p2wsh(bindings.encodeUint8Array(bindings.check_arr_len(script_hash, 32))); const ret_hu_conv: ShutdownScript = new ShutdownScript(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -431,7 +431,7 @@ export class ShutdownScript extends CommonBase { * This function may return an error if `program` is invalid for the segwit `version`. */ public static constructor_new_witness_program(version: WitnessVersion, program: Uint8Array): Result_ShutdownScriptInvalidShutdownScriptZ { - const ret: number = bindings.ShutdownScript_new_witness_program(version.getVal(), bindings.encodeUint8Array(program)); + const ret: bigint = bindings.ShutdownScript_new_witness_program(version.getVal(), bindings.encodeUint8Array(program)); const ret_hu_conv: Result_ShutdownScriptInvalidShutdownScriptZ = Result_ShutdownScriptInvalidShutdownScriptZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -462,7 +462,7 @@ export class ShutdownScript extends CommonBase { * Specifically, checks for compliance with feature `option_shutdown_anysegwit`. */ public is_compatible(features: InitFeatures): boolean { - const ret: boolean = bindings.ShutdownScript_is_compatible(this.ptr, features == null ? 0 : CommonBase.get_ptr_of(features) & ~1); + const ret: boolean = bindings.ShutdownScript_is_compatible(this.ptr, features == null ? 0n : CommonBase.get_ptr_of(features)); CommonBase.add_ref_from(this, features); return ret; } diff --git a/ts/structs/Sign.mts b/ts/structs/Sign.mts index 7f94e257..1e2c2534 100644 --- a/ts/structs/Sign.mts +++ b/ts/structs/Sign.mts @@ -381,7 +381,7 @@ export class Sign extends CommonBase { public bindings_instance?: bindings.LDKSign; /* @internal */ - constructor(_dummy: object, ptr: number) { + constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.Sign_free); this.bindings_instance = null; } @@ -397,7 +397,7 @@ export class Sign extends CommonBase { }, } as bindings.LDKSign; const baseSign = BaseSign.new_impl(baseSign_impl, pubkeys, ); - const ptr: number = bindings.LDKSign_new(structImplementation, baseSign.bindings_instance, pubkeys == null ? 0 : pubkeys.clone_ptr()); + const ptr: bigint = bindings.LDKSign_new(structImplementation, baseSign.bindings_instance, pubkeys == null ? 0n : pubkeys.clone_ptr()); impl_holder.held = new Sign(null, ptr); impl_holder.held.bindings_instance = structImplementation; @@ -414,8 +414,8 @@ export class Sign extends CommonBase { return ret_conv; } - public clone_ptr(): number { - const ret: number = bindings.Sign_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.Sign_clone_ptr(this.ptr); return ret; } @@ -423,7 +423,7 @@ export class Sign extends CommonBase { * Creates a copy of a Sign */ public clone(): Sign { - const ret: number = bindings.Sign_clone(this.ptr); + const ret: bigint = bindings.Sign_clone(this.ptr); const ret_hu_conv: Sign = new Sign(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; diff --git a/ts/structs/SignOrCreationError.mts b/ts/structs/SignOrCreationError.mts index f45f1488..e2e6037c 100644 --- a/ts/structs/SignOrCreationError.mts +++ b/ts/structs/SignOrCreationError.mts @@ -360,9 +360,9 @@ import * as bindings from '../bindings.mjs' * may occur. */ export class SignOrCreationError extends CommonBase { - protected constructor(_dummy: object, ptr: number) { super(ptr, bindings.SignOrCreationError_free); } + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.SignOrCreationError_free); } /* @internal */ - public static constr_from_ptr(ptr: number): SignOrCreationError { + public static constr_from_ptr(ptr: bigint): SignOrCreationError { const raw_ty: number = bindings.LDKSignOrCreationError_ty_from_ptr(ptr); switch (raw_ty) { case 0: return new SignOrCreationError_SignError(ptr); @@ -372,8 +372,8 @@ export class SignOrCreationError extends CommonBase { } } - public clone_ptr(): number { - const ret: number = bindings.SignOrCreationError_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.SignOrCreationError_clone_ptr(this.ptr); return ret; } @@ -381,7 +381,7 @@ export class SignOrCreationError extends CommonBase { * Creates a copy of the SignOrCreationError */ public clone(): SignOrCreationError { - const ret: number = bindings.SignOrCreationError_clone(this.ptr); + const ret: bigint = bindings.SignOrCreationError_clone(this.ptr); const ret_hu_conv: SignOrCreationError = SignOrCreationError.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -391,7 +391,7 @@ export class SignOrCreationError extends CommonBase { * Utility method to constructs a new SignError-variant SignOrCreationError */ public static constructor_sign_error(): SignOrCreationError { - const ret: number = bindings.SignOrCreationError_sign_error(); + const ret: bigint = bindings.SignOrCreationError_sign_error(); const ret_hu_conv: SignOrCreationError = SignOrCreationError.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -401,7 +401,7 @@ export class SignOrCreationError extends CommonBase { * Utility method to constructs a new CreationError-variant SignOrCreationError */ public static constructor_creation_error(a: CreationError): SignOrCreationError { - const ret: number = bindings.SignOrCreationError_creation_error(a); + const ret: bigint = bindings.SignOrCreationError_creation_error(a); const ret_hu_conv: SignOrCreationError = SignOrCreationError.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -412,7 +412,7 @@ export class SignOrCreationError extends CommonBase { * This ignores pointers and is_owned flags and looks at the values in fields. */ public eq(b: SignOrCreationError): boolean { - const ret: boolean = bindings.SignOrCreationError_eq(this.ptr, b == null ? 0 : CommonBase.get_ptr_of(b) & ~1); + const ret: boolean = bindings.SignOrCreationError_eq(this.ptr, b == null ? 0n : CommonBase.get_ptr_of(b)); return ret; } @@ -429,7 +429,7 @@ export class SignOrCreationError extends CommonBase { /** A SignOrCreationError of type SignError */ export class SignOrCreationError_SignError extends SignOrCreationError { /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); } } @@ -437,7 +437,7 @@ export class SignOrCreationError_SignError extends SignOrCreationError { export class SignOrCreationError_CreationError extends SignOrCreationError { public creation_error: CreationError; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); this.creation_error = bindings.LDKSignOrCreationError_CreationError_get_creation_error(ptr); } diff --git a/ts/structs/SignedRawInvoice.mts b/ts/structs/SignedRawInvoice.mts index 13fbb8c1..26896e2d 100644 --- a/ts/structs/SignedRawInvoice.mts +++ b/ts/structs/SignedRawInvoice.mts @@ -365,7 +365,7 @@ import * as bindings from '../bindings.mjs' */ export class SignedRawInvoice extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.SignedRawInvoice_free); } @@ -375,13 +375,13 @@ export class SignedRawInvoice extends CommonBase { * Two objects with NULL inner values will be considered "equal" here. */ public eq(b: SignedRawInvoice): boolean { - const ret: boolean = bindings.SignedRawInvoice_eq(this.ptr, b == null ? 0 : CommonBase.get_ptr_of(b) & ~1); + const ret: boolean = bindings.SignedRawInvoice_eq(this.ptr, b == null ? 0n : CommonBase.get_ptr_of(b)); CommonBase.add_ref_from(this, b); return ret; } - public clone_ptr(): number { - const ret: number = bindings.SignedRawInvoice_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.SignedRawInvoice_clone_ptr(this.ptr); return ret; } @@ -389,7 +389,7 @@ export class SignedRawInvoice extends CommonBase { * Creates a copy of the SignedRawInvoice */ public clone(): SignedRawInvoice { - const ret: number = bindings.SignedRawInvoice_clone(this.ptr); + const ret: bigint = bindings.SignedRawInvoice_clone(this.ptr); const ret_hu_conv: SignedRawInvoice = new SignedRawInvoice(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -402,7 +402,7 @@ export class SignedRawInvoice extends CommonBase { * 3. signature */ public into_parts(): ThreeTuple_RawInvoice_u832InvoiceSignatureZ { - const ret: number = bindings.SignedRawInvoice_into_parts(this.ptr); + const ret: bigint = bindings.SignedRawInvoice_into_parts(this.ptr); const ret_hu_conv: ThreeTuple_RawInvoice_u832InvoiceSignatureZ = new ThreeTuple_RawInvoice_u832InvoiceSignatureZ(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -412,7 +412,7 @@ export class SignedRawInvoice extends CommonBase { * The `RawInvoice` which was signed. */ public raw_invoice(): RawInvoice { - const ret: number = bindings.SignedRawInvoice_raw_invoice(this.ptr); + const ret: bigint = bindings.SignedRawInvoice_raw_invoice(this.ptr); const ret_hu_conv: RawInvoice = new RawInvoice(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -431,7 +431,7 @@ export class SignedRawInvoice extends CommonBase { * InvoiceSignature for the invoice. */ public signature(): InvoiceSignature { - const ret: number = bindings.SignedRawInvoice_signature(this.ptr); + const ret: bigint = bindings.SignedRawInvoice_signature(this.ptr); const ret_hu_conv: InvoiceSignature = new InvoiceSignature(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -441,7 +441,7 @@ export class SignedRawInvoice extends CommonBase { * Recovers the public key used for signing the invoice from the recoverable signature. */ public recover_payee_pub_key(): Result_PayeePubKeyErrorZ { - const ret: number = bindings.SignedRawInvoice_recover_payee_pub_key(this.ptr); + const ret: bigint = bindings.SignedRawInvoice_recover_payee_pub_key(this.ptr); const ret_hu_conv: Result_PayeePubKeyErrorZ = Result_PayeePubKeyErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -459,7 +459,7 @@ export class SignedRawInvoice extends CommonBase { * Read a SignedRawInvoice object from a string */ public static constructor_from_str(s: string): Result_SignedRawInvoiceParseErrorZ { - const ret: number = bindings.SignedRawInvoice_from_str(bindings.encodeString(s)); + const ret: bigint = bindings.SignedRawInvoice_from_str(bindings.encodeString(s)); const ret_hu_conv: Result_SignedRawInvoiceParseErrorZ = Result_SignedRawInvoiceParseErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/SocketDescriptor.mts b/ts/structs/SocketDescriptor.mts index 06d4bf19..dd872a1b 100644 --- a/ts/structs/SocketDescriptor.mts +++ b/ts/structs/SocketDescriptor.mts @@ -417,7 +417,7 @@ export class SocketDescriptor extends CommonBase { public bindings_instance?: bindings.LDKSocketDescriptor; /* @internal */ - constructor(_dummy: object, ptr: number) { + constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.SocketDescriptor_free); this.bindings_instance = null; } @@ -434,7 +434,7 @@ export class SocketDescriptor extends CommonBase { disconnect_socket (): void { arg.disconnect_socket(); }, - eq (other_arg: number): boolean { + eq (other_arg: bigint): boolean { const ret_hu_conv: SocketDescriptor = new SocketDescriptor(null, other_arg); CommonBase.add_ref_from(ret_hu_conv, this); const ret: boolean = arg.eq(ret_hu_conv); @@ -445,7 +445,7 @@ export class SocketDescriptor extends CommonBase { return ret; }, } as bindings.LDKSocketDescriptor; - const ptr: number = bindings.LDKSocketDescriptor_new(structImplementation); + const ptr: bigint = bindings.LDKSocketDescriptor_new(structImplementation); impl_holder.held = new SocketDescriptor(null, ptr); impl_holder.held.bindings_instance = structImplementation; @@ -495,8 +495,8 @@ export class SocketDescriptor extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.SocketDescriptor_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.SocketDescriptor_clone_ptr(this.ptr); return ret; } @@ -504,7 +504,7 @@ export class SocketDescriptor extends CommonBase { * Creates a copy of a SocketDescriptor */ public clone(): SocketDescriptor { - const ret: number = bindings.SocketDescriptor_clone(this.ptr); + const ret: bigint = bindings.SocketDescriptor_clone(this.ptr); const ret_hu_conv: SocketDescriptor = new SocketDescriptor(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; diff --git a/ts/structs/SpendableOutputDescriptor.mts b/ts/structs/SpendableOutputDescriptor.mts index 020e09de..681706f5 100644 --- a/ts/structs/SpendableOutputDescriptor.mts +++ b/ts/structs/SpendableOutputDescriptor.mts @@ -363,9 +363,9 @@ import * as bindings from '../bindings.mjs' * that txid/index, and any keys or other information required to sign. */ export class SpendableOutputDescriptor extends CommonBase { - protected constructor(_dummy: object, ptr: number) { super(ptr, bindings.SpendableOutputDescriptor_free); } + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.SpendableOutputDescriptor_free); } /* @internal */ - public static constr_from_ptr(ptr: number): SpendableOutputDescriptor { + public static constr_from_ptr(ptr: bigint): SpendableOutputDescriptor { const raw_ty: number = bindings.LDKSpendableOutputDescriptor_ty_from_ptr(ptr); switch (raw_ty) { case 0: return new SpendableOutputDescriptor_StaticOutput(ptr); @@ -376,8 +376,8 @@ export class SpendableOutputDescriptor extends CommonBase { } } - public clone_ptr(): number { - const ret: number = bindings.SpendableOutputDescriptor_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.SpendableOutputDescriptor_clone_ptr(this.ptr); return ret; } @@ -385,7 +385,7 @@ export class SpendableOutputDescriptor extends CommonBase { * Creates a copy of the SpendableOutputDescriptor */ public clone(): SpendableOutputDescriptor { - const ret: number = bindings.SpendableOutputDescriptor_clone(this.ptr); + const ret: bigint = bindings.SpendableOutputDescriptor_clone(this.ptr); const ret_hu_conv: SpendableOutputDescriptor = SpendableOutputDescriptor.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -395,9 +395,10 @@ export class SpendableOutputDescriptor extends CommonBase { * Utility method to constructs a new StaticOutput-variant SpendableOutputDescriptor */ public static constructor_static_output(outpoint: OutPoint, output: TxOut): SpendableOutputDescriptor { - const ret: number = bindings.SpendableOutputDescriptor_static_output(outpoint == null ? 0 : CommonBase.get_ptr_of(outpoint) & ~1, CommonBase.get_ptr_of(output)); + const ret: bigint = bindings.SpendableOutputDescriptor_static_output(outpoint == null ? 0n : CommonBase.get_ptr_of(outpoint), CommonBase.get_ptr_of(output)); const ret_hu_conv: SpendableOutputDescriptor = SpendableOutputDescriptor.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, outpoint); return ret_hu_conv; } @@ -405,9 +406,10 @@ export class SpendableOutputDescriptor extends CommonBase { * Utility method to constructs a new DelayedPaymentOutput-variant SpendableOutputDescriptor */ public static constructor_delayed_payment_output(a: DelayedPaymentOutputDescriptor): SpendableOutputDescriptor { - const ret: number = bindings.SpendableOutputDescriptor_delayed_payment_output(a == null ? 0 : CommonBase.get_ptr_of(a) & ~1); + const ret: bigint = bindings.SpendableOutputDescriptor_delayed_payment_output(a == null ? 0n : CommonBase.get_ptr_of(a)); const ret_hu_conv: SpendableOutputDescriptor = SpendableOutputDescriptor.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, a); return ret_hu_conv; } @@ -415,9 +417,10 @@ export class SpendableOutputDescriptor extends CommonBase { * Utility method to constructs a new StaticPaymentOutput-variant SpendableOutputDescriptor */ public static constructor_static_payment_output(a: StaticPaymentOutputDescriptor): SpendableOutputDescriptor { - const ret: number = bindings.SpendableOutputDescriptor_static_payment_output(a == null ? 0 : CommonBase.get_ptr_of(a) & ~1); + const ret: bigint = bindings.SpendableOutputDescriptor_static_payment_output(a == null ? 0n : CommonBase.get_ptr_of(a)); const ret_hu_conv: SpendableOutputDescriptor = SpendableOutputDescriptor.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, a); return ret_hu_conv; } @@ -434,7 +437,7 @@ export class SpendableOutputDescriptor extends CommonBase { * Read a SpendableOutputDescriptor from a byte array, created by SpendableOutputDescriptor_write */ public static constructor_read(ser: Uint8Array): Result_SpendableOutputDescriptorDecodeErrorZ { - const ret: number = bindings.SpendableOutputDescriptor_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.SpendableOutputDescriptor_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_SpendableOutputDescriptorDecodeErrorZ = Result_SpendableOutputDescriptorDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -451,13 +454,13 @@ export class SpendableOutputDescriptor_StaticOutput extends SpendableOutputDescr */ public output: TxOut; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); - const outpoint: number = bindings.LDKSpendableOutputDescriptor_StaticOutput_get_outpoint(ptr); + const outpoint: bigint = bindings.LDKSpendableOutputDescriptor_StaticOutput_get_outpoint(ptr); const outpoint_hu_conv: OutPoint = new OutPoint(null, outpoint); CommonBase.add_ref_from(outpoint_hu_conv, this); this.outpoint = outpoint_hu_conv; - const output: number = bindings.LDKSpendableOutputDescriptor_StaticOutput_get_output(ptr); + const output: bigint = bindings.LDKSpendableOutputDescriptor_StaticOutput_get_output(ptr); const output_conv: TxOut = new TxOut(null, output); this.output = output_conv; } @@ -466,9 +469,9 @@ export class SpendableOutputDescriptor_StaticOutput extends SpendableOutputDescr export class SpendableOutputDescriptor_DelayedPaymentOutput extends SpendableOutputDescriptor { public delayed_payment_output: DelayedPaymentOutputDescriptor; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); - const delayed_payment_output: number = bindings.LDKSpendableOutputDescriptor_DelayedPaymentOutput_get_delayed_payment_output(ptr); + const delayed_payment_output: bigint = bindings.LDKSpendableOutputDescriptor_DelayedPaymentOutput_get_delayed_payment_output(ptr); const delayed_payment_output_hu_conv: DelayedPaymentOutputDescriptor = new DelayedPaymentOutputDescriptor(null, delayed_payment_output); CommonBase.add_ref_from(delayed_payment_output_hu_conv, this); this.delayed_payment_output = delayed_payment_output_hu_conv; @@ -478,9 +481,9 @@ export class SpendableOutputDescriptor_DelayedPaymentOutput extends SpendableOut export class SpendableOutputDescriptor_StaticPaymentOutput extends SpendableOutputDescriptor { public static_payment_output: StaticPaymentOutputDescriptor; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); - const static_payment_output: number = bindings.LDKSpendableOutputDescriptor_StaticPaymentOutput_get_static_payment_output(ptr); + const static_payment_output: bigint = bindings.LDKSpendableOutputDescriptor_StaticPaymentOutput_get_static_payment_output(ptr); const static_payment_output_hu_conv: StaticPaymentOutputDescriptor = new StaticPaymentOutputDescriptor(null, static_payment_output); CommonBase.add_ref_from(static_payment_output_hu_conv, this); this.static_payment_output = static_payment_output_hu_conv; diff --git a/ts/structs/StaticPaymentOutputDescriptor.mts b/ts/structs/StaticPaymentOutputDescriptor.mts index a546cbb0..6d8389ef 100644 --- a/ts/structs/StaticPaymentOutputDescriptor.mts +++ b/ts/structs/StaticPaymentOutputDescriptor.mts @@ -362,7 +362,7 @@ import * as bindings from '../bindings.mjs' */ export class StaticPaymentOutputDescriptor extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.StaticPaymentOutputDescriptor_free); } @@ -370,7 +370,7 @@ export class StaticPaymentOutputDescriptor extends CommonBase { * The outpoint which is spendable */ public get_outpoint(): OutPoint { - const ret: number = bindings.StaticPaymentOutputDescriptor_get_outpoint(this.ptr); + const ret: bigint = bindings.StaticPaymentOutputDescriptor_get_outpoint(this.ptr); const ret_hu_conv: OutPoint = new OutPoint(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -380,7 +380,8 @@ export class StaticPaymentOutputDescriptor extends CommonBase { * The outpoint which is spendable */ public set_outpoint(val: OutPoint): void { - bindings.StaticPaymentOutputDescriptor_set_outpoint(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.StaticPaymentOutputDescriptor_set_outpoint(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** @@ -389,7 +390,7 @@ export class StaticPaymentOutputDescriptor extends CommonBase { * Returns a copy of the field. */ public get_output(): TxOut { - const ret: number = bindings.StaticPaymentOutputDescriptor_get_output(this.ptr); + const ret: bigint = bindings.StaticPaymentOutputDescriptor_get_output(this.ptr); const ret_conv: TxOut = new TxOut(null, ret); return ret_conv; } @@ -440,14 +441,15 @@ export class StaticPaymentOutputDescriptor extends CommonBase { * Constructs a new StaticPaymentOutputDescriptor given each field */ public static constructor_new(outpoint_arg: OutPoint, output_arg: TxOut, channel_keys_id_arg: Uint8Array, channel_value_satoshis_arg: bigint): StaticPaymentOutputDescriptor { - const ret: number = bindings.StaticPaymentOutputDescriptor_new(outpoint_arg == null ? 0 : CommonBase.get_ptr_of(outpoint_arg) & ~1, CommonBase.get_ptr_of(output_arg), bindings.encodeUint8Array(bindings.check_arr_len(channel_keys_id_arg, 32)), channel_value_satoshis_arg); + const ret: bigint = bindings.StaticPaymentOutputDescriptor_new(outpoint_arg == null ? 0n : CommonBase.get_ptr_of(outpoint_arg), CommonBase.get_ptr_of(output_arg), bindings.encodeUint8Array(bindings.check_arr_len(channel_keys_id_arg, 32)), channel_value_satoshis_arg); const ret_hu_conv: StaticPaymentOutputDescriptor = new StaticPaymentOutputDescriptor(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, outpoint_arg); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.StaticPaymentOutputDescriptor_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.StaticPaymentOutputDescriptor_clone_ptr(this.ptr); return ret; } @@ -455,7 +457,7 @@ export class StaticPaymentOutputDescriptor extends CommonBase { * Creates a copy of the StaticPaymentOutputDescriptor */ public clone(): StaticPaymentOutputDescriptor { - const ret: number = bindings.StaticPaymentOutputDescriptor_clone(this.ptr); + const ret: bigint = bindings.StaticPaymentOutputDescriptor_clone(this.ptr); const ret_hu_conv: StaticPaymentOutputDescriptor = new StaticPaymentOutputDescriptor(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -474,7 +476,7 @@ export class StaticPaymentOutputDescriptor extends CommonBase { * Read a StaticPaymentOutputDescriptor from a byte array, created by StaticPaymentOutputDescriptor_write */ public static constructor_read(ser: Uint8Array): Result_StaticPaymentOutputDescriptorDecodeErrorZ { - const ret: number = bindings.StaticPaymentOutputDescriptor_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.StaticPaymentOutputDescriptor_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_StaticPaymentOutputDescriptorDecodeErrorZ = Result_StaticPaymentOutputDescriptorDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/ThreeTuple_ChannelAnnouncementChannelUpdateChannelUpdateZ.mts b/ts/structs/ThreeTuple_ChannelAnnouncementChannelUpdateChannelUpdateZ.mts index 2c75f3d8..6b890ebd 100644 --- a/ts/structs/ThreeTuple_ChannelAnnouncementChannelUpdateChannelUpdateZ.mts +++ b/ts/structs/ThreeTuple_ChannelAnnouncementChannelUpdateChannelUpdateZ.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class ThreeTuple_ChannelAnnouncementChannelUpdateChannelUpdateZ extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_free); } @@ -369,7 +369,7 @@ export class ThreeTuple_ChannelAnnouncementChannelUpdateChannelUpdateZ extends C * */ public get_a(): ChannelAnnouncement { - const ret: number = bindings.C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_a(this.ptr); + const ret: bigint = bindings.C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_a(this.ptr); const ret_hu_conv: ChannelAnnouncement = new ChannelAnnouncement(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -379,7 +379,7 @@ export class ThreeTuple_ChannelAnnouncementChannelUpdateChannelUpdateZ extends C * */ public get_b(): ChannelUpdate { - const ret: number = bindings.C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_b(this.ptr); + const ret: bigint = bindings.C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_b(this.ptr); const ret_hu_conv: ChannelUpdate = new ChannelUpdate(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -389,14 +389,14 @@ export class ThreeTuple_ChannelAnnouncementChannelUpdateChannelUpdateZ extends C * */ public get_c(): ChannelUpdate { - const ret: number = bindings.C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_c(this.ptr); + const ret: bigint = bindings.C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_c(this.ptr); const ret_hu_conv: ChannelUpdate = new ChannelUpdate(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone_ptr(this.ptr); return ret; } @@ -405,7 +405,7 @@ export class ThreeTuple_ChannelAnnouncementChannelUpdateChannelUpdateZ extends C * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): ThreeTuple_ChannelAnnouncementChannelUpdateChannelUpdateZ { - const ret: number = bindings.C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone(this.ptr); + const ret: bigint = bindings.C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone(this.ptr); const ret_hu_conv: ThreeTuple_ChannelAnnouncementChannelUpdateChannelUpdateZ = new ThreeTuple_ChannelAnnouncementChannelUpdateChannelUpdateZ(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -415,9 +415,12 @@ export class ThreeTuple_ChannelAnnouncementChannelUpdateChannelUpdateZ extends C * Creates a new C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ from the contained elements. */ public static constructor_new(a: ChannelAnnouncement, b: ChannelUpdate, c: ChannelUpdate): ThreeTuple_ChannelAnnouncementChannelUpdateChannelUpdateZ { - const ret: number = bindings.C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_new(a == null ? 0 : CommonBase.get_ptr_of(a) & ~1, b == null ? 0 : CommonBase.get_ptr_of(b) & ~1, c == null ? 0 : CommonBase.get_ptr_of(c) & ~1); + const ret: bigint = bindings.C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_new(a == null ? 0n : CommonBase.get_ptr_of(a), b == null ? 0n : CommonBase.get_ptr_of(b), c == null ? 0n : CommonBase.get_ptr_of(c)); const ret_hu_conv: ThreeTuple_ChannelAnnouncementChannelUpdateChannelUpdateZ = new ThreeTuple_ChannelAnnouncementChannelUpdateChannelUpdateZ(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, a); + CommonBase.add_ref_from(ret_hu_conv, b); + CommonBase.add_ref_from(ret_hu_conv, c); return ret_hu_conv; } diff --git a/ts/structs/ThreeTuple_OutPointCVec_MonitorEventZPublicKeyZ.mts b/ts/structs/ThreeTuple_OutPointCVec_MonitorEventZPublicKeyZ.mts index 3727e5f2..bdf8153e 100644 --- a/ts/structs/ThreeTuple_OutPointCVec_MonitorEventZPublicKeyZ.mts +++ b/ts/structs/ThreeTuple_OutPointCVec_MonitorEventZPublicKeyZ.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class ThreeTuple_OutPointCVec_MonitorEventZPublicKeyZ extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_free); } @@ -369,7 +369,7 @@ export class ThreeTuple_OutPointCVec_MonitorEventZPublicKeyZ extends CommonBase * */ public get_a(): OutPoint { - const ret: number = bindings.C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_a(this.ptr); + const ret: bigint = bindings.C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_a(this.ptr); const ret_hu_conv: OutPoint = new OutPoint(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -383,7 +383,7 @@ export class ThreeTuple_OutPointCVec_MonitorEventZPublicKeyZ extends CommonBase const ret_conv_14_len: number = bindings.getArrayLength(ret); const ret_conv_14_arr: MonitorEvent[] = new Array(ret_conv_14_len).fill(null); for (var o = 0; o < ret_conv_14_len; o++) { - const ret_conv_14: number = bindings.getU32ArrayElem(ret, o); + const ret_conv_14: bigint = bindings.getU64ArrayElem(ret, o); const ret_conv_14_hu_conv: MonitorEvent = MonitorEvent.constr_from_ptr(ret_conv_14); CommonBase.add_ref_from(ret_conv_14_hu_conv, this); ret_conv_14_arr[o] = ret_conv_14_hu_conv; @@ -401,8 +401,8 @@ export class ThreeTuple_OutPointCVec_MonitorEventZPublicKeyZ extends CommonBase return ret_conv; } - public clone_ptr(): number { - const ret: number = bindings.C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone_ptr(this.ptr); return ret; } @@ -411,7 +411,7 @@ export class ThreeTuple_OutPointCVec_MonitorEventZPublicKeyZ extends CommonBase * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): ThreeTuple_OutPointCVec_MonitorEventZPublicKeyZ { - const ret: number = bindings.C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone(this.ptr); + const ret: bigint = bindings.C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone(this.ptr); const ret_hu_conv: ThreeTuple_OutPointCVec_MonitorEventZPublicKeyZ = new ThreeTuple_OutPointCVec_MonitorEventZPublicKeyZ(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -421,9 +421,10 @@ export class ThreeTuple_OutPointCVec_MonitorEventZPublicKeyZ extends CommonBase * Creates a new C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ from the contained elements. */ public static constructor_new(a: OutPoint, b: MonitorEvent[], c: Uint8Array): ThreeTuple_OutPointCVec_MonitorEventZPublicKeyZ { - const ret: number = bindings.C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_new(a == null ? 0 : CommonBase.get_ptr_of(a) & ~1, bindings.encodeUint32Array(b != null ? b.map(b_conv_14 => CommonBase.get_ptr_of(b_conv_14)) : null), bindings.encodeUint8Array(bindings.check_arr_len(c, 33))); + const ret: bigint = bindings.C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_new(a == null ? 0n : CommonBase.get_ptr_of(a), bindings.encodeUint64Array(b != null ? b.map(b_conv_14 => CommonBase.get_ptr_of(b_conv_14)) : null), bindings.encodeUint8Array(bindings.check_arr_len(c, 33))); const ret_hu_conv: ThreeTuple_OutPointCVec_MonitorEventZPublicKeyZ = new ThreeTuple_OutPointCVec_MonitorEventZPublicKeyZ(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, a); return ret_hu_conv; } diff --git a/ts/structs/ThreeTuple_RawInvoice_u832InvoiceSignatureZ.mts b/ts/structs/ThreeTuple_RawInvoice_u832InvoiceSignatureZ.mts index bbb5e545..d993c50b 100644 --- a/ts/structs/ThreeTuple_RawInvoice_u832InvoiceSignatureZ.mts +++ b/ts/structs/ThreeTuple_RawInvoice_u832InvoiceSignatureZ.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class ThreeTuple_RawInvoice_u832InvoiceSignatureZ extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.C3Tuple_RawInvoice_u832InvoiceSignatureZ_free); } @@ -369,7 +369,7 @@ export class ThreeTuple_RawInvoice_u832InvoiceSignatureZ extends CommonBase { * */ public get_a(): RawInvoice { - const ret: number = bindings.C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_a(this.ptr); + const ret: bigint = bindings.C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_a(this.ptr); const ret_hu_conv: RawInvoice = new RawInvoice(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -388,14 +388,14 @@ export class ThreeTuple_RawInvoice_u832InvoiceSignatureZ extends CommonBase { * */ public get_c(): InvoiceSignature { - const ret: number = bindings.C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_c(this.ptr); + const ret: bigint = bindings.C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_c(this.ptr); const ret_hu_conv: InvoiceSignature = new InvoiceSignature(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone_ptr(this.ptr); return ret; } @@ -404,7 +404,7 @@ export class ThreeTuple_RawInvoice_u832InvoiceSignatureZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): ThreeTuple_RawInvoice_u832InvoiceSignatureZ { - const ret: number = bindings.C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone(this.ptr); + const ret: bigint = bindings.C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone(this.ptr); const ret_hu_conv: ThreeTuple_RawInvoice_u832InvoiceSignatureZ = new ThreeTuple_RawInvoice_u832InvoiceSignatureZ(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -414,9 +414,11 @@ export class ThreeTuple_RawInvoice_u832InvoiceSignatureZ extends CommonBase { * Creates a new C3Tuple_RawInvoice_u832InvoiceSignatureZ from the contained elements. */ public static constructor_new(a: RawInvoice, b: Uint8Array, c: InvoiceSignature): ThreeTuple_RawInvoice_u832InvoiceSignatureZ { - const ret: number = bindings.C3Tuple_RawInvoice_u832InvoiceSignatureZ_new(a == null ? 0 : CommonBase.get_ptr_of(a) & ~1, bindings.encodeUint8Array(bindings.check_arr_len(b, 32)), c == null ? 0 : CommonBase.get_ptr_of(c) & ~1); + const ret: bigint = bindings.C3Tuple_RawInvoice_u832InvoiceSignatureZ_new(a == null ? 0n : CommonBase.get_ptr_of(a), bindings.encodeUint8Array(bindings.check_arr_len(b, 32)), c == null ? 0n : CommonBase.get_ptr_of(c)); const ret_hu_conv: ThreeTuple_RawInvoice_u832InvoiceSignatureZ = new ThreeTuple_RawInvoice_u832InvoiceSignatureZ(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, a); + CommonBase.add_ref_from(ret_hu_conv, c); return ret_hu_conv; } diff --git a/ts/structs/TrustedClosingTransaction.mts b/ts/structs/TrustedClosingTransaction.mts index 46a03124..fea0ea5c 100644 --- a/ts/structs/TrustedClosingTransaction.mts +++ b/ts/structs/TrustedClosingTransaction.mts @@ -366,7 +366,7 @@ import * as bindings from '../bindings.mjs' */ export class TrustedClosingTransaction extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.TrustedClosingTransaction_free); } diff --git a/ts/structs/TrustedCommitmentTransaction.mts b/ts/structs/TrustedCommitmentTransaction.mts index fbeca9fb..88d2330d 100644 --- a/ts/structs/TrustedCommitmentTransaction.mts +++ b/ts/structs/TrustedCommitmentTransaction.mts @@ -366,7 +366,7 @@ import * as bindings from '../bindings.mjs' */ export class TrustedCommitmentTransaction extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.TrustedCommitmentTransaction_free); } @@ -383,7 +383,7 @@ export class TrustedCommitmentTransaction extends CommonBase { * The pre-built Bitcoin commitment transaction */ public built_transaction(): BuiltCommitmentTransaction { - const ret: number = bindings.TrustedCommitmentTransaction_built_transaction(this.ptr); + const ret: bigint = bindings.TrustedCommitmentTransaction_built_transaction(this.ptr); const ret_hu_conv: BuiltCommitmentTransaction = new BuiltCommitmentTransaction(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -393,7 +393,7 @@ export class TrustedCommitmentTransaction extends CommonBase { * The pre-calculated transaction creation public keys. */ public keys(): TxCreationKeys { - const ret: number = bindings.TrustedCommitmentTransaction_keys(this.ptr); + const ret: bigint = bindings.TrustedCommitmentTransaction_keys(this.ptr); const ret_hu_conv: TxCreationKeys = new TxCreationKeys(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -416,7 +416,7 @@ export class TrustedCommitmentTransaction extends CommonBase { * This function is only valid in the holder commitment context, it always uses EcdsaSighashType::All. */ public get_htlc_sigs(htlc_base_key: Uint8Array, channel_parameters: DirectedChannelTransactionParameters): Result_CVec_SignatureZNoneZ { - const ret: number = bindings.TrustedCommitmentTransaction_get_htlc_sigs(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(htlc_base_key, 32)), channel_parameters == null ? 0 : CommonBase.get_ptr_of(channel_parameters) & ~1); + const ret: bigint = bindings.TrustedCommitmentTransaction_get_htlc_sigs(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(htlc_base_key, 32)), channel_parameters == null ? 0n : CommonBase.get_ptr_of(channel_parameters)); const ret_hu_conv: Result_CVec_SignatureZNoneZ = Result_CVec_SignatureZNoneZ.constr_from_ptr(ret); CommonBase.add_ref_from(this, channel_parameters); return ret_hu_conv; diff --git a/ts/structs/TwoTuple_BlockHashChannelManagerZ.mts b/ts/structs/TwoTuple_BlockHashChannelManagerZ.mts index 2ec1bffe..0b2e3a62 100644 --- a/ts/structs/TwoTuple_BlockHashChannelManagerZ.mts +++ b/ts/structs/TwoTuple_BlockHashChannelManagerZ.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class TwoTuple_BlockHashChannelManagerZ extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.C2Tuple_BlockHashChannelManagerZ_free); } @@ -378,7 +378,7 @@ export class TwoTuple_BlockHashChannelManagerZ extends CommonBase { * */ public get_b(): ChannelManager { - const ret: number = bindings.C2Tuple_BlockHashChannelManagerZ_get_b(this.ptr); + const ret: bigint = bindings.C2Tuple_BlockHashChannelManagerZ_get_b(this.ptr); const ret_hu_conv: ChannelManager = new ChannelManager(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -388,7 +388,7 @@ export class TwoTuple_BlockHashChannelManagerZ extends CommonBase { * Creates a new C2Tuple_BlockHashChannelManagerZ from the contained elements. */ public static constructor_new(a: Uint8Array, b_fee_est: FeeEstimator, b_chain_monitor: Watch, b_tx_broadcaster: BroadcasterInterface, b_logger: Logger, b_keys_manager: KeysInterface, b_config: UserConfig, b_params: ChainParameters): TwoTuple_BlockHashChannelManagerZ { - const ret: number = bindings.C2Tuple_BlockHashChannelManagerZ_new(bindings.encodeUint8Array(bindings.check_arr_len(a, 32)), bindings.ChannelManager_new(b_fee_est == null ? 0 : CommonBase.get_ptr_of(b_fee_est), b_chain_monitor == null ? 0 : CommonBase.get_ptr_of(b_chain_monitor), b_tx_broadcaster == null ? 0 : CommonBase.get_ptr_of(b_tx_broadcaster), b_logger == null ? 0 : CommonBase.get_ptr_of(b_logger), b_keys_manager == null ? 0 : CommonBase.get_ptr_of(b_keys_manager), b_config == null ? 0 : CommonBase.get_ptr_of(b_config) & ~1, b_params == null ? 0 : CommonBase.get_ptr_of(b_params) & ~1)); + const ret: bigint = bindings.C2Tuple_BlockHashChannelManagerZ_new(bindings.encodeUint8Array(bindings.check_arr_len(a, 32)), bindings.ChannelManager_new(b_fee_est == null ? 0n : CommonBase.get_ptr_of(b_fee_est), b_chain_monitor == null ? 0n : CommonBase.get_ptr_of(b_chain_monitor), b_tx_broadcaster == null ? 0n : CommonBase.get_ptr_of(b_tx_broadcaster), b_logger == null ? 0n : CommonBase.get_ptr_of(b_logger), b_keys_manager == null ? 0n : CommonBase.get_ptr_of(b_keys_manager), b_config == null ? 0n : CommonBase.get_ptr_of(b_config), b_params == null ? 0n : CommonBase.get_ptr_of(b_params))); const ret_hu_conv: TwoTuple_BlockHashChannelManagerZ = new TwoTuple_BlockHashChannelManagerZ(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); CommonBase.add_ref_from(ret_hu_conv, b_fee_est); @@ -396,8 +396,8 @@ export class TwoTuple_BlockHashChannelManagerZ extends CommonBase { CommonBase.add_ref_from(ret_hu_conv, b_tx_broadcaster); CommonBase.add_ref_from(ret_hu_conv, b_logger); CommonBase.add_ref_from(ret_hu_conv, b_keys_manager); - ; - ; + CommonBase.add_ref_from(ret_hu_conv, b_config); + CommonBase.add_ref_from(ret_hu_conv, b_params); return ret_hu_conv; } diff --git a/ts/structs/TwoTuple_BlockHashChannelMonitorZ.mts b/ts/structs/TwoTuple_BlockHashChannelMonitorZ.mts index 794edd6f..a9aa8d19 100644 --- a/ts/structs/TwoTuple_BlockHashChannelMonitorZ.mts +++ b/ts/structs/TwoTuple_BlockHashChannelMonitorZ.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class TwoTuple_BlockHashChannelMonitorZ extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.C2Tuple_BlockHashChannelMonitorZ_free); } @@ -378,14 +378,14 @@ export class TwoTuple_BlockHashChannelMonitorZ extends CommonBase { * */ public get_b(): ChannelMonitor { - const ret: number = bindings.C2Tuple_BlockHashChannelMonitorZ_get_b(this.ptr); + const ret: bigint = bindings.C2Tuple_BlockHashChannelMonitorZ_get_b(this.ptr); const ret_hu_conv: ChannelMonitor = new ChannelMonitor(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.C2Tuple_BlockHashChannelMonitorZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.C2Tuple_BlockHashChannelMonitorZ_clone_ptr(this.ptr); return ret; } @@ -394,7 +394,7 @@ export class TwoTuple_BlockHashChannelMonitorZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): TwoTuple_BlockHashChannelMonitorZ { - const ret: number = bindings.C2Tuple_BlockHashChannelMonitorZ_clone(this.ptr); + const ret: bigint = bindings.C2Tuple_BlockHashChannelMonitorZ_clone(this.ptr); const ret_hu_conv: TwoTuple_BlockHashChannelMonitorZ = new TwoTuple_BlockHashChannelMonitorZ(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -404,9 +404,10 @@ export class TwoTuple_BlockHashChannelMonitorZ extends CommonBase { * Creates a new C2Tuple_BlockHashChannelMonitorZ from the contained elements. */ public static constructor_new(a: Uint8Array, b: ChannelMonitor): TwoTuple_BlockHashChannelMonitorZ { - const ret: number = bindings.C2Tuple_BlockHashChannelMonitorZ_new(bindings.encodeUint8Array(bindings.check_arr_len(a, 32)), b == null ? 0 : CommonBase.get_ptr_of(b) & ~1); + const ret: bigint = bindings.C2Tuple_BlockHashChannelMonitorZ_new(bindings.encodeUint8Array(bindings.check_arr_len(a, 32)), b == null ? 0n : CommonBase.get_ptr_of(b)); const ret_hu_conv: TwoTuple_BlockHashChannelMonitorZ = new TwoTuple_BlockHashChannelMonitorZ(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, b); return ret_hu_conv; } diff --git a/ts/structs/TwoTuple_OutPointScriptZ.mts b/ts/structs/TwoTuple_OutPointScriptZ.mts index 06b3d0ea..aedc1004 100644 --- a/ts/structs/TwoTuple_OutPointScriptZ.mts +++ b/ts/structs/TwoTuple_OutPointScriptZ.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class TwoTuple_OutPointScriptZ extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.C2Tuple_OutPointScriptZ_free); } @@ -369,7 +369,7 @@ export class TwoTuple_OutPointScriptZ extends CommonBase { * */ public get_a(): OutPoint { - const ret: number = bindings.C2Tuple_OutPointScriptZ_get_a(this.ptr); + const ret: bigint = bindings.C2Tuple_OutPointScriptZ_get_a(this.ptr); const ret_hu_conv: OutPoint = new OutPoint(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -384,8 +384,8 @@ export class TwoTuple_OutPointScriptZ extends CommonBase { return ret_conv; } - public clone_ptr(): number { - const ret: number = bindings.C2Tuple_OutPointScriptZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.C2Tuple_OutPointScriptZ_clone_ptr(this.ptr); return ret; } @@ -394,7 +394,7 @@ export class TwoTuple_OutPointScriptZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): TwoTuple_OutPointScriptZ { - const ret: number = bindings.C2Tuple_OutPointScriptZ_clone(this.ptr); + const ret: bigint = bindings.C2Tuple_OutPointScriptZ_clone(this.ptr); const ret_hu_conv: TwoTuple_OutPointScriptZ = new TwoTuple_OutPointScriptZ(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -404,9 +404,10 @@ export class TwoTuple_OutPointScriptZ extends CommonBase { * Creates a new C2Tuple_OutPointScriptZ from the contained elements. */ public static constructor_new(a: OutPoint, b: Uint8Array): TwoTuple_OutPointScriptZ { - const ret: number = bindings.C2Tuple_OutPointScriptZ_new(a == null ? 0 : CommonBase.get_ptr_of(a) & ~1, bindings.encodeUint8Array(b)); + const ret: bigint = bindings.C2Tuple_OutPointScriptZ_new(a == null ? 0n : CommonBase.get_ptr_of(a), bindings.encodeUint8Array(b)); const ret_hu_conv: TwoTuple_OutPointScriptZ = new TwoTuple_OutPointScriptZ(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, a); return ret_hu_conv; } diff --git a/ts/structs/TwoTuple_PaymentHashPaymentIdZ.mts b/ts/structs/TwoTuple_PaymentHashPaymentIdZ.mts index eab03137..efbfc7da 100644 --- a/ts/structs/TwoTuple_PaymentHashPaymentIdZ.mts +++ b/ts/structs/TwoTuple_PaymentHashPaymentIdZ.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class TwoTuple_PaymentHashPaymentIdZ extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.C2Tuple_PaymentHashPaymentIdZ_free); } @@ -383,8 +383,8 @@ export class TwoTuple_PaymentHashPaymentIdZ extends CommonBase { return ret_conv; } - public clone_ptr(): number { - const ret: number = bindings.C2Tuple_PaymentHashPaymentIdZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.C2Tuple_PaymentHashPaymentIdZ_clone_ptr(this.ptr); return ret; } @@ -393,7 +393,7 @@ export class TwoTuple_PaymentHashPaymentIdZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): TwoTuple_PaymentHashPaymentIdZ { - const ret: number = bindings.C2Tuple_PaymentHashPaymentIdZ_clone(this.ptr); + const ret: bigint = bindings.C2Tuple_PaymentHashPaymentIdZ_clone(this.ptr); const ret_hu_conv: TwoTuple_PaymentHashPaymentIdZ = new TwoTuple_PaymentHashPaymentIdZ(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -403,7 +403,7 @@ export class TwoTuple_PaymentHashPaymentIdZ extends CommonBase { * Creates a new C2Tuple_PaymentHashPaymentIdZ from the contained elements. */ public static constructor_new(a: Uint8Array, b: Uint8Array): TwoTuple_PaymentHashPaymentIdZ { - const ret: number = bindings.C2Tuple_PaymentHashPaymentIdZ_new(bindings.encodeUint8Array(bindings.check_arr_len(a, 32)), bindings.encodeUint8Array(bindings.check_arr_len(b, 32))); + const ret: bigint = bindings.C2Tuple_PaymentHashPaymentIdZ_new(bindings.encodeUint8Array(bindings.check_arr_len(a, 32)), bindings.encodeUint8Array(bindings.check_arr_len(b, 32))); const ret_hu_conv: TwoTuple_PaymentHashPaymentIdZ = new TwoTuple_PaymentHashPaymentIdZ(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; diff --git a/ts/structs/TwoTuple_PaymentHashPaymentSecretZ.mts b/ts/structs/TwoTuple_PaymentHashPaymentSecretZ.mts index 29de6e8c..a0d148d6 100644 --- a/ts/structs/TwoTuple_PaymentHashPaymentSecretZ.mts +++ b/ts/structs/TwoTuple_PaymentHashPaymentSecretZ.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class TwoTuple_PaymentHashPaymentSecretZ extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.C2Tuple_PaymentHashPaymentSecretZ_free); } @@ -383,8 +383,8 @@ export class TwoTuple_PaymentHashPaymentSecretZ extends CommonBase { return ret_conv; } - public clone_ptr(): number { - const ret: number = bindings.C2Tuple_PaymentHashPaymentSecretZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.C2Tuple_PaymentHashPaymentSecretZ_clone_ptr(this.ptr); return ret; } @@ -393,7 +393,7 @@ export class TwoTuple_PaymentHashPaymentSecretZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): TwoTuple_PaymentHashPaymentSecretZ { - const ret: number = bindings.C2Tuple_PaymentHashPaymentSecretZ_clone(this.ptr); + const ret: bigint = bindings.C2Tuple_PaymentHashPaymentSecretZ_clone(this.ptr); const ret_hu_conv: TwoTuple_PaymentHashPaymentSecretZ = new TwoTuple_PaymentHashPaymentSecretZ(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -403,7 +403,7 @@ export class TwoTuple_PaymentHashPaymentSecretZ extends CommonBase { * Creates a new C2Tuple_PaymentHashPaymentSecretZ from the contained elements. */ public static constructor_new(a: Uint8Array, b: Uint8Array): TwoTuple_PaymentHashPaymentSecretZ { - const ret: number = bindings.C2Tuple_PaymentHashPaymentSecretZ_new(bindings.encodeUint8Array(bindings.check_arr_len(a, 32)), bindings.encodeUint8Array(bindings.check_arr_len(b, 32))); + const ret: bigint = bindings.C2Tuple_PaymentHashPaymentSecretZ_new(bindings.encodeUint8Array(bindings.check_arr_len(a, 32)), bindings.encodeUint8Array(bindings.check_arr_len(b, 32))); const ret_hu_conv: TwoTuple_PaymentHashPaymentSecretZ = new TwoTuple_PaymentHashPaymentSecretZ(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; diff --git a/ts/structs/TwoTuple_PublicKeyTypeZ.mts b/ts/structs/TwoTuple_PublicKeyTypeZ.mts index 3b1cffa0..76cd9f0e 100644 --- a/ts/structs/TwoTuple_PublicKeyTypeZ.mts +++ b/ts/structs/TwoTuple_PublicKeyTypeZ.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class TwoTuple_PublicKeyTypeZ extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.C2Tuple_PublicKeyTypeZ_free); } @@ -378,14 +378,14 @@ export class TwoTuple_PublicKeyTypeZ extends CommonBase { * */ public get_b(): Type { - const ret: number = bindings.C2Tuple_PublicKeyTypeZ_get_b(this.ptr); + const ret: bigint = bindings.C2Tuple_PublicKeyTypeZ_get_b(this.ptr); const ret_hu_conv: Type = new Type(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.C2Tuple_PublicKeyTypeZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.C2Tuple_PublicKeyTypeZ_clone_ptr(this.ptr); return ret; } @@ -394,7 +394,7 @@ export class TwoTuple_PublicKeyTypeZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): TwoTuple_PublicKeyTypeZ { - const ret: number = bindings.C2Tuple_PublicKeyTypeZ_clone(this.ptr); + const ret: bigint = bindings.C2Tuple_PublicKeyTypeZ_clone(this.ptr); const ret_hu_conv: TwoTuple_PublicKeyTypeZ = new TwoTuple_PublicKeyTypeZ(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -404,7 +404,7 @@ export class TwoTuple_PublicKeyTypeZ extends CommonBase { * Creates a new C2Tuple_PublicKeyTypeZ from the contained elements. */ public static constructor_new(a: Uint8Array, b: Type): TwoTuple_PublicKeyTypeZ { - const ret: number = bindings.C2Tuple_PublicKeyTypeZ_new(bindings.encodeUint8Array(bindings.check_arr_len(a, 33)), b == null ? 0 : CommonBase.get_ptr_of(b)); + const ret: bigint = bindings.C2Tuple_PublicKeyTypeZ_new(bindings.encodeUint8Array(bindings.check_arr_len(a, 33)), b == null ? 0n : CommonBase.get_ptr_of(b)); const ret_hu_conv: TwoTuple_PublicKeyTypeZ = new TwoTuple_PublicKeyTypeZ(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); CommonBase.add_ref_from(ret_hu_conv, b); diff --git a/ts/structs/TwoTuple_SignatureCVec_SignatureZZ.mts b/ts/structs/TwoTuple_SignatureCVec_SignatureZZ.mts index e1a0f1a4..dea074af 100644 --- a/ts/structs/TwoTuple_SignatureCVec_SignatureZZ.mts +++ b/ts/structs/TwoTuple_SignatureCVec_SignatureZZ.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class TwoTuple_SignatureCVec_SignatureZZ extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.C2Tuple_SignatureCVec_SignatureZZ_free); } @@ -390,8 +390,8 @@ export class TwoTuple_SignatureCVec_SignatureZZ extends CommonBase { return ret_conv_12_arr; } - public clone_ptr(): number { - const ret: number = bindings.C2Tuple_SignatureCVec_SignatureZZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.C2Tuple_SignatureCVec_SignatureZZ_clone_ptr(this.ptr); return ret; } @@ -400,7 +400,7 @@ export class TwoTuple_SignatureCVec_SignatureZZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): TwoTuple_SignatureCVec_SignatureZZ { - const ret: number = bindings.C2Tuple_SignatureCVec_SignatureZZ_clone(this.ptr); + const ret: bigint = bindings.C2Tuple_SignatureCVec_SignatureZZ_clone(this.ptr); const ret_hu_conv: TwoTuple_SignatureCVec_SignatureZZ = new TwoTuple_SignatureCVec_SignatureZZ(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -410,7 +410,7 @@ export class TwoTuple_SignatureCVec_SignatureZZ extends CommonBase { * Creates a new C2Tuple_SignatureCVec_SignatureZZ from the contained elements. */ public static constructor_new(a: Uint8Array, b: Uint8Array[]): TwoTuple_SignatureCVec_SignatureZZ { - const ret: number = bindings.C2Tuple_SignatureCVec_SignatureZZ_new(bindings.encodeUint8Array(bindings.check_arr_len(a, 64)), bindings.encodeUint32Array(b != null ? b.map(b_conv_12 => bindings.encodeUint8Array(bindings.check_arr_len(b_conv_12, 64))) : null)); + const ret: bigint = bindings.C2Tuple_SignatureCVec_SignatureZZ_new(bindings.encodeUint8Array(bindings.check_arr_len(a, 64)), bindings.encodeUint32Array(b != null ? b.map(b_conv_12 => bindings.encodeUint8Array(bindings.check_arr_len(b_conv_12, 64))) : null)); const ret_hu_conv: TwoTuple_SignatureCVec_SignatureZZ = new TwoTuple_SignatureCVec_SignatureZZ(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; diff --git a/ts/structs/TwoTuple_SignatureSignatureZ.mts b/ts/structs/TwoTuple_SignatureSignatureZ.mts index b04d941c..e50421e5 100644 --- a/ts/structs/TwoTuple_SignatureSignatureZ.mts +++ b/ts/structs/TwoTuple_SignatureSignatureZ.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class TwoTuple_SignatureSignatureZ extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.C2Tuple_SignatureSignatureZ_free); } @@ -383,8 +383,8 @@ export class TwoTuple_SignatureSignatureZ extends CommonBase { return ret_conv; } - public clone_ptr(): number { - const ret: number = bindings.C2Tuple_SignatureSignatureZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.C2Tuple_SignatureSignatureZ_clone_ptr(this.ptr); return ret; } @@ -393,7 +393,7 @@ export class TwoTuple_SignatureSignatureZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): TwoTuple_SignatureSignatureZ { - const ret: number = bindings.C2Tuple_SignatureSignatureZ_clone(this.ptr); + const ret: bigint = bindings.C2Tuple_SignatureSignatureZ_clone(this.ptr); const ret_hu_conv: TwoTuple_SignatureSignatureZ = new TwoTuple_SignatureSignatureZ(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -403,7 +403,7 @@ export class TwoTuple_SignatureSignatureZ extends CommonBase { * Creates a new C2Tuple_SignatureSignatureZ from the contained elements. */ public static constructor_new(a: Uint8Array, b: Uint8Array): TwoTuple_SignatureSignatureZ { - const ret: number = bindings.C2Tuple_SignatureSignatureZ_new(bindings.encodeUint8Array(bindings.check_arr_len(a, 64)), bindings.encodeUint8Array(bindings.check_arr_len(b, 64))); + const ret: bigint = bindings.C2Tuple_SignatureSignatureZ_new(bindings.encodeUint8Array(bindings.check_arr_len(a, 64)), bindings.encodeUint8Array(bindings.check_arr_len(b, 64))); const ret_hu_conv: TwoTuple_SignatureSignatureZ = new TwoTuple_SignatureSignatureZ(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; diff --git a/ts/structs/TwoTuple_TxidCVec_C2Tuple_u32ScriptZZZ.mts b/ts/structs/TwoTuple_TxidCVec_C2Tuple_u32ScriptZZZ.mts index 4fc1e0d7..9661a0e3 100644 --- a/ts/structs/TwoTuple_TxidCVec_C2Tuple_u32ScriptZZZ.mts +++ b/ts/structs/TwoTuple_TxidCVec_C2Tuple_u32ScriptZZZ.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class TwoTuple_TxidCVec_C2Tuple_u32ScriptZZZ extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_free); } @@ -382,7 +382,7 @@ export class TwoTuple_TxidCVec_C2Tuple_u32ScriptZZZ extends CommonBase { const ret_conv_21_len: number = bindings.getArrayLength(ret); const ret_conv_21_arr: TwoTuple_u32ScriptZ[] = new Array(ret_conv_21_len).fill(null); for (var v = 0; v < ret_conv_21_len; v++) { - const ret_conv_21: number = bindings.getU32ArrayElem(ret, v); + const ret_conv_21: bigint = bindings.getU64ArrayElem(ret, v); const ret_conv_21_hu_conv: TwoTuple_u32ScriptZ = new TwoTuple_u32ScriptZ(null, ret_conv_21); CommonBase.add_ref_from(ret_conv_21_hu_conv, this); ret_conv_21_arr[v] = ret_conv_21_hu_conv; @@ -391,8 +391,8 @@ export class TwoTuple_TxidCVec_C2Tuple_u32ScriptZZZ extends CommonBase { return ret_conv_21_arr; } - public clone_ptr(): number { - const ret: number = bindings.C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone_ptr(this.ptr); return ret; } @@ -401,7 +401,7 @@ export class TwoTuple_TxidCVec_C2Tuple_u32ScriptZZZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): TwoTuple_TxidCVec_C2Tuple_u32ScriptZZZ { - const ret: number = bindings.C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone(this.ptr); + const ret: bigint = bindings.C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone(this.ptr); const ret_hu_conv: TwoTuple_TxidCVec_C2Tuple_u32ScriptZZZ = new TwoTuple_TxidCVec_C2Tuple_u32ScriptZZZ(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -411,7 +411,7 @@ export class TwoTuple_TxidCVec_C2Tuple_u32ScriptZZZ extends CommonBase { * Creates a new C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ from the contained elements. */ public static constructor_new(a: Uint8Array, b: TwoTuple_u32ScriptZ[]): TwoTuple_TxidCVec_C2Tuple_u32ScriptZZZ { - const ret: number = bindings.C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_new(bindings.encodeUint8Array(bindings.check_arr_len(a, 32)), bindings.encodeUint32Array(b != null ? b.map(b_conv_21 => b_conv_21 != null ? CommonBase.get_ptr_of(b_conv_21) : 0) : null)); + const ret: bigint = bindings.C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_new(bindings.encodeUint8Array(bindings.check_arr_len(a, 32)), bindings.encodeUint64Array(b != null ? b.map(b_conv_21 => b_conv_21 != null ? CommonBase.get_ptr_of(b_conv_21) : 0n) : null)); const ret_hu_conv: TwoTuple_TxidCVec_C2Tuple_u32ScriptZZZ = new TwoTuple_TxidCVec_C2Tuple_u32ScriptZZZ(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; diff --git a/ts/structs/TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ.mts b/ts/structs/TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ.mts index 726cf967..70f4eb3d 100644 --- a/ts/structs/TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ.mts +++ b/ts/structs/TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_free); } @@ -382,7 +382,7 @@ export class TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ extends CommonBase { const ret_conv_20_len: number = bindings.getArrayLength(ret); const ret_conv_20_arr: TwoTuple_u32TxOutZ[] = new Array(ret_conv_20_len).fill(null); for (var u = 0; u < ret_conv_20_len; u++) { - const ret_conv_20: number = bindings.getU32ArrayElem(ret, u); + const ret_conv_20: bigint = bindings.getU64ArrayElem(ret, u); const ret_conv_20_hu_conv: TwoTuple_u32TxOutZ = new TwoTuple_u32TxOutZ(null, ret_conv_20); CommonBase.add_ref_from(ret_conv_20_hu_conv, this); ret_conv_20_arr[u] = ret_conv_20_hu_conv; @@ -391,8 +391,8 @@ export class TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ extends CommonBase { return ret_conv_20_arr; } - public clone_ptr(): number { - const ret: number = bindings.C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone_ptr(this.ptr); return ret; } @@ -401,7 +401,7 @@ export class TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ { - const ret: number = bindings.C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone(this.ptr); + const ret: bigint = bindings.C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone(this.ptr); const ret_hu_conv: TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ = new TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -411,7 +411,7 @@ export class TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ extends CommonBase { * Creates a new C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ from the contained elements. */ public static constructor_new(a: Uint8Array, b: TwoTuple_u32TxOutZ[]): TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ { - const ret: number = bindings.C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_new(bindings.encodeUint8Array(bindings.check_arr_len(a, 32)), bindings.encodeUint32Array(b != null ? b.map(b_conv_20 => b_conv_20 != null ? CommonBase.get_ptr_of(b_conv_20) : 0) : null)); + const ret: bigint = bindings.C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_new(bindings.encodeUint8Array(bindings.check_arr_len(a, 32)), bindings.encodeUint64Array(b != null ? b.map(b_conv_20 => b_conv_20 != null ? CommonBase.get_ptr_of(b_conv_20) : 0n) : null)); const ret_hu_conv: TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ = new TwoTuple_TxidCVec_C2Tuple_u32TxOutZZZ(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; diff --git a/ts/structs/TwoTuple_u32ScriptZ.mts b/ts/structs/TwoTuple_u32ScriptZ.mts index 8fbe8c24..c5b7bfb6 100644 --- a/ts/structs/TwoTuple_u32ScriptZ.mts +++ b/ts/structs/TwoTuple_u32ScriptZ.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class TwoTuple_u32ScriptZ extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.C2Tuple_u32ScriptZ_free); } @@ -382,8 +382,8 @@ export class TwoTuple_u32ScriptZ extends CommonBase { return ret_conv; } - public clone_ptr(): number { - const ret: number = bindings.C2Tuple_u32ScriptZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.C2Tuple_u32ScriptZ_clone_ptr(this.ptr); return ret; } @@ -392,7 +392,7 @@ export class TwoTuple_u32ScriptZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): TwoTuple_u32ScriptZ { - const ret: number = bindings.C2Tuple_u32ScriptZ_clone(this.ptr); + const ret: bigint = bindings.C2Tuple_u32ScriptZ_clone(this.ptr); const ret_hu_conv: TwoTuple_u32ScriptZ = new TwoTuple_u32ScriptZ(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -402,7 +402,7 @@ export class TwoTuple_u32ScriptZ extends CommonBase { * Creates a new C2Tuple_u32ScriptZ from the contained elements. */ public static constructor_new(a: number, b: Uint8Array): TwoTuple_u32ScriptZ { - const ret: number = bindings.C2Tuple_u32ScriptZ_new(a, bindings.encodeUint8Array(b)); + const ret: bigint = bindings.C2Tuple_u32ScriptZ_new(a, bindings.encodeUint8Array(b)); const ret_hu_conv: TwoTuple_u32ScriptZ = new TwoTuple_u32ScriptZ(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; diff --git a/ts/structs/TwoTuple_u32TxOutZ.mts b/ts/structs/TwoTuple_u32TxOutZ.mts index e827c8f0..db9eb41d 100644 --- a/ts/structs/TwoTuple_u32TxOutZ.mts +++ b/ts/structs/TwoTuple_u32TxOutZ.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class TwoTuple_u32TxOutZ extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.C2Tuple_u32TxOutZ_free); } @@ -377,13 +377,13 @@ export class TwoTuple_u32TxOutZ extends CommonBase { * */ public get_b(): TxOut { - const ret: number = bindings.C2Tuple_u32TxOutZ_get_b(this.ptr); + const ret: bigint = bindings.C2Tuple_u32TxOutZ_get_b(this.ptr); const ret_conv: TxOut = new TxOut(null, ret); return ret_conv; } - public clone_ptr(): number { - const ret: number = bindings.C2Tuple_u32TxOutZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.C2Tuple_u32TxOutZ_clone_ptr(this.ptr); return ret; } @@ -392,7 +392,7 @@ export class TwoTuple_u32TxOutZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): TwoTuple_u32TxOutZ { - const ret: number = bindings.C2Tuple_u32TxOutZ_clone(this.ptr); + const ret: bigint = bindings.C2Tuple_u32TxOutZ_clone(this.ptr); const ret_hu_conv: TwoTuple_u32TxOutZ = new TwoTuple_u32TxOutZ(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -402,7 +402,7 @@ export class TwoTuple_u32TxOutZ extends CommonBase { * Creates a new C2Tuple_u32TxOutZ from the contained elements. */ public static constructor_new(a: number, b: TxOut): TwoTuple_u32TxOutZ { - const ret: number = bindings.C2Tuple_u32TxOutZ_new(a, CommonBase.get_ptr_of(b)); + const ret: bigint = bindings.C2Tuple_u32TxOutZ_new(a, CommonBase.get_ptr_of(b)); const ret_hu_conv: TwoTuple_u32TxOutZ = new TwoTuple_u32TxOutZ(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; diff --git a/ts/structs/TwoTuple_u64u64Z.mts b/ts/structs/TwoTuple_u64u64Z.mts index fac4c566..3dc63c0d 100644 --- a/ts/structs/TwoTuple_u64u64Z.mts +++ b/ts/structs/TwoTuple_u64u64Z.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class TwoTuple_u64u64Z extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.C2Tuple_u64u64Z_free); } @@ -381,8 +381,8 @@ export class TwoTuple_u64u64Z extends CommonBase { return ret; } - public clone_ptr(): number { - const ret: number = bindings.C2Tuple_u64u64Z_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.C2Tuple_u64u64Z_clone_ptr(this.ptr); return ret; } @@ -391,7 +391,7 @@ export class TwoTuple_u64u64Z extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): TwoTuple_u64u64Z { - const ret: number = bindings.C2Tuple_u64u64Z_clone(this.ptr); + const ret: bigint = bindings.C2Tuple_u64u64Z_clone(this.ptr); const ret_hu_conv: TwoTuple_u64u64Z = new TwoTuple_u64u64Z(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -401,7 +401,7 @@ export class TwoTuple_u64u64Z extends CommonBase { * Creates a new C2Tuple_u64u64Z from the contained elements. */ public static constructor_new(a: bigint, b: bigint): TwoTuple_u64u64Z { - const ret: number = bindings.C2Tuple_u64u64Z_new(a, b); + const ret: bigint = bindings.C2Tuple_u64u64Z_new(a, b); const ret_hu_conv: TwoTuple_u64u64Z = new TwoTuple_u64u64Z(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; diff --git a/ts/structs/TwoTuple_usizeTransactionZ.mts b/ts/structs/TwoTuple_usizeTransactionZ.mts index e1715c66..e14510fd 100644 --- a/ts/structs/TwoTuple_usizeTransactionZ.mts +++ b/ts/structs/TwoTuple_usizeTransactionZ.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class TwoTuple_usizeTransactionZ extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.C2Tuple_usizeTransactionZ_free); } @@ -382,8 +382,8 @@ export class TwoTuple_usizeTransactionZ extends CommonBase { return ret_conv; } - public clone_ptr(): number { - const ret: number = bindings.C2Tuple_usizeTransactionZ_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.C2Tuple_usizeTransactionZ_clone_ptr(this.ptr); return ret; } @@ -392,7 +392,7 @@ export class TwoTuple_usizeTransactionZ extends CommonBase { * but with all dynamically-allocated buffers duplicated in new buffers. */ public clone(): TwoTuple_usizeTransactionZ { - const ret: number = bindings.C2Tuple_usizeTransactionZ_clone(this.ptr); + const ret: bigint = bindings.C2Tuple_usizeTransactionZ_clone(this.ptr); const ret_hu_conv: TwoTuple_usizeTransactionZ = new TwoTuple_usizeTransactionZ(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -402,7 +402,7 @@ export class TwoTuple_usizeTransactionZ extends CommonBase { * Creates a new C2Tuple_usizeTransactionZ from the contained elements. */ public static constructor_new(a: number, b: Uint8Array): TwoTuple_usizeTransactionZ { - const ret: number = bindings.C2Tuple_usizeTransactionZ_new(a, bindings.encodeUint8Array(b)); + const ret: bigint = bindings.C2Tuple_usizeTransactionZ_new(a, bindings.encodeUint8Array(b)); const ret_hu_conv: TwoTuple_usizeTransactionZ = new TwoTuple_usizeTransactionZ(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; diff --git a/ts/structs/TxCreationKeys.mts b/ts/structs/TxCreationKeys.mts index 249628ad..66a885f2 100644 --- a/ts/structs/TxCreationKeys.mts +++ b/ts/structs/TxCreationKeys.mts @@ -371,7 +371,7 @@ import * as bindings from '../bindings.mjs' */ export class TxCreationKeys extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.TxCreationKeys_free); } @@ -463,14 +463,14 @@ export class TxCreationKeys extends CommonBase { * Constructs a new TxCreationKeys given each field */ public static constructor_new(per_commitment_point_arg: Uint8Array, revocation_key_arg: Uint8Array, broadcaster_htlc_key_arg: Uint8Array, countersignatory_htlc_key_arg: Uint8Array, broadcaster_delayed_payment_key_arg: Uint8Array): TxCreationKeys { - const ret: number = bindings.TxCreationKeys_new(bindings.encodeUint8Array(bindings.check_arr_len(per_commitment_point_arg, 33)), bindings.encodeUint8Array(bindings.check_arr_len(revocation_key_arg, 33)), bindings.encodeUint8Array(bindings.check_arr_len(broadcaster_htlc_key_arg, 33)), bindings.encodeUint8Array(bindings.check_arr_len(countersignatory_htlc_key_arg, 33)), bindings.encodeUint8Array(bindings.check_arr_len(broadcaster_delayed_payment_key_arg, 33))); + const ret: bigint = bindings.TxCreationKeys_new(bindings.encodeUint8Array(bindings.check_arr_len(per_commitment_point_arg, 33)), bindings.encodeUint8Array(bindings.check_arr_len(revocation_key_arg, 33)), bindings.encodeUint8Array(bindings.check_arr_len(broadcaster_htlc_key_arg, 33)), bindings.encodeUint8Array(bindings.check_arr_len(countersignatory_htlc_key_arg, 33)), bindings.encodeUint8Array(bindings.check_arr_len(broadcaster_delayed_payment_key_arg, 33))); const ret_hu_conv: TxCreationKeys = new TxCreationKeys(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.TxCreationKeys_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.TxCreationKeys_clone_ptr(this.ptr); return ret; } @@ -478,7 +478,7 @@ export class TxCreationKeys extends CommonBase { * Creates a copy of the TxCreationKeys */ public clone(): TxCreationKeys { - const ret: number = bindings.TxCreationKeys_clone(this.ptr); + const ret: bigint = bindings.TxCreationKeys_clone(this.ptr); const ret_hu_conv: TxCreationKeys = new TxCreationKeys(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -497,7 +497,7 @@ export class TxCreationKeys extends CommonBase { * Read a TxCreationKeys from a byte array, created by TxCreationKeys_write */ public static constructor_read(ser: Uint8Array): Result_TxCreationKeysDecodeErrorZ { - const ret: number = bindings.TxCreationKeys_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.TxCreationKeys_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_TxCreationKeysDecodeErrorZ = Result_TxCreationKeysDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -507,7 +507,7 @@ export class TxCreationKeys extends CommonBase { * Key set is asymmetric and can't be used as part of counter-signatory set of transactions. */ public static constructor_derive_new(per_commitment_point: Uint8Array, broadcaster_delayed_payment_base: Uint8Array, broadcaster_htlc_base: Uint8Array, countersignatory_revocation_base: Uint8Array, countersignatory_htlc_base: Uint8Array): Result_TxCreationKeysErrorZ { - const ret: number = bindings.TxCreationKeys_derive_new(bindings.encodeUint8Array(bindings.check_arr_len(per_commitment_point, 33)), bindings.encodeUint8Array(bindings.check_arr_len(broadcaster_delayed_payment_base, 33)), bindings.encodeUint8Array(bindings.check_arr_len(broadcaster_htlc_base, 33)), bindings.encodeUint8Array(bindings.check_arr_len(countersignatory_revocation_base, 33)), bindings.encodeUint8Array(bindings.check_arr_len(countersignatory_htlc_base, 33))); + const ret: bigint = bindings.TxCreationKeys_derive_new(bindings.encodeUint8Array(bindings.check_arr_len(per_commitment_point, 33)), bindings.encodeUint8Array(bindings.check_arr_len(broadcaster_delayed_payment_base, 33)), bindings.encodeUint8Array(bindings.check_arr_len(broadcaster_htlc_base, 33)), bindings.encodeUint8Array(bindings.check_arr_len(countersignatory_revocation_base, 33)), bindings.encodeUint8Array(bindings.check_arr_len(countersignatory_htlc_base, 33))); const ret_hu_conv: Result_TxCreationKeysErrorZ = Result_TxCreationKeysErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -517,7 +517,7 @@ export class TxCreationKeys extends CommonBase { * Key set is asymmetric and can't be used as part of counter-signatory set of transactions. */ public static constructor_from_channel_static_keys(per_commitment_point: Uint8Array, broadcaster_keys: ChannelPublicKeys, countersignatory_keys: ChannelPublicKeys): Result_TxCreationKeysErrorZ { - const ret: number = bindings.TxCreationKeys_from_channel_static_keys(bindings.encodeUint8Array(bindings.check_arr_len(per_commitment_point, 33)), broadcaster_keys == null ? 0 : CommonBase.get_ptr_of(broadcaster_keys) & ~1, countersignatory_keys == null ? 0 : CommonBase.get_ptr_of(countersignatory_keys) & ~1); + const ret: bigint = bindings.TxCreationKeys_from_channel_static_keys(bindings.encodeUint8Array(bindings.check_arr_len(per_commitment_point, 33)), broadcaster_keys == null ? 0n : CommonBase.get_ptr_of(broadcaster_keys), countersignatory_keys == null ? 0n : CommonBase.get_ptr_of(countersignatory_keys)); const ret_hu_conv: Result_TxCreationKeysErrorZ = Result_TxCreationKeysErrorZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, broadcaster_keys); CommonBase.add_ref_from(ret_hu_conv, countersignatory_keys); diff --git a/ts/structs/TxOut.mts b/ts/structs/TxOut.mts index 55c7b272..ece06ecb 100644 --- a/ts/structs/TxOut.mts +++ b/ts/structs/TxOut.mts @@ -362,7 +362,7 @@ export class TxOut extends CommonBase { public value: bigint; /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.TxOut_free); this.script_pubkey = bindings.decodeUint8Array(bindings.TxOut_get_script_pubkey(ptr)); this.value = bindings.TxOut_get_value(ptr); diff --git a/ts/structs/Type.mts b/ts/structs/Type.mts index ed075c85..5f396c21 100644 --- a/ts/structs/Type.mts +++ b/ts/structs/Type.mts @@ -385,7 +385,7 @@ export class Type extends CommonBase { public bindings_instance?: bindings.LDKType; /* @internal */ - constructor(_dummy: object, ptr: number) { + constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.Type_free); this.bindings_instance = null; } @@ -409,7 +409,7 @@ export class Type extends CommonBase { return result; }, } as bindings.LDKType; - const ptr: number = bindings.LDKType_new(structImplementation); + const ptr: bigint = bindings.LDKType_new(structImplementation); impl_holder.held = new Type(null, ptr); impl_holder.held.bindings_instance = structImplementation; @@ -442,8 +442,8 @@ export class Type extends CommonBase { return ret_conv; } - public clone_ptr(): number { - const ret: number = bindings.Type_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.Type_clone_ptr(this.ptr); return ret; } @@ -451,7 +451,7 @@ export class Type extends CommonBase { * Creates a copy of a Type */ public clone(): Type { - const ret: number = bindings.Type_clone(this.ptr); + const ret: bigint = bindings.Type_clone(this.ptr); const ret_hu_conv: Type = new Type(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; diff --git a/ts/structs/UnsignedChannelAnnouncement.mts b/ts/structs/UnsignedChannelAnnouncement.mts index a3574cfc..a82b4a34 100644 --- a/ts/structs/UnsignedChannelAnnouncement.mts +++ b/ts/structs/UnsignedChannelAnnouncement.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class UnsignedChannelAnnouncement extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.UnsignedChannelAnnouncement_free); } @@ -369,7 +369,7 @@ export class UnsignedChannelAnnouncement extends CommonBase { * The advertised channel features */ public get_features(): ChannelFeatures { - const ret: number = bindings.UnsignedChannelAnnouncement_get_features(this.ptr); + const ret: bigint = bindings.UnsignedChannelAnnouncement_get_features(this.ptr); const ret_hu_conv: ChannelFeatures = new ChannelFeatures(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -379,7 +379,8 @@ export class UnsignedChannelAnnouncement extends CommonBase { * The advertised channel features */ public set_features(val: ChannelFeatures): void { - bindings.UnsignedChannelAnnouncement_set_features(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.UnsignedChannelAnnouncement_set_features(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** @@ -477,8 +478,8 @@ export class UnsignedChannelAnnouncement extends CommonBase { bindings.UnsignedChannelAnnouncement_set_bitcoin_key_2(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(val, 33))); } - public clone_ptr(): number { - const ret: number = bindings.UnsignedChannelAnnouncement_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.UnsignedChannelAnnouncement_clone_ptr(this.ptr); return ret; } @@ -486,7 +487,7 @@ export class UnsignedChannelAnnouncement extends CommonBase { * Creates a copy of the UnsignedChannelAnnouncement */ public clone(): UnsignedChannelAnnouncement { - const ret: number = bindings.UnsignedChannelAnnouncement_clone(this.ptr); + const ret: bigint = bindings.UnsignedChannelAnnouncement_clone(this.ptr); const ret_hu_conv: UnsignedChannelAnnouncement = new UnsignedChannelAnnouncement(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -505,7 +506,7 @@ export class UnsignedChannelAnnouncement extends CommonBase { * Read a UnsignedChannelAnnouncement from a byte array, created by UnsignedChannelAnnouncement_write */ public static constructor_read(ser: Uint8Array): Result_UnsignedChannelAnnouncementDecodeErrorZ { - const ret: number = bindings.UnsignedChannelAnnouncement_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.UnsignedChannelAnnouncement_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_UnsignedChannelAnnouncementDecodeErrorZ = Result_UnsignedChannelAnnouncementDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/UnsignedChannelUpdate.mts b/ts/structs/UnsignedChannelUpdate.mts index 180a95a2..285b5f7b 100644 --- a/ts/structs/UnsignedChannelUpdate.mts +++ b/ts/structs/UnsignedChannelUpdate.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class UnsignedChannelUpdate extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.UnsignedChannelUpdate_free); } @@ -541,14 +541,14 @@ export class UnsignedChannelUpdate extends CommonBase { * Constructs a new UnsignedChannelUpdate given each field */ public static constructor_new(chain_hash_arg: Uint8Array, short_channel_id_arg: bigint, timestamp_arg: number, flags_arg: number, cltv_expiry_delta_arg: number, htlc_minimum_msat_arg: bigint, htlc_maximum_msat_arg: bigint, fee_base_msat_arg: number, fee_proportional_millionths_arg: number, excess_data_arg: Uint8Array): UnsignedChannelUpdate { - const ret: number = bindings.UnsignedChannelUpdate_new(bindings.encodeUint8Array(bindings.check_arr_len(chain_hash_arg, 32)), short_channel_id_arg, timestamp_arg, flags_arg, cltv_expiry_delta_arg, htlc_minimum_msat_arg, htlc_maximum_msat_arg, fee_base_msat_arg, fee_proportional_millionths_arg, bindings.encodeUint8Array(excess_data_arg)); + const ret: bigint = bindings.UnsignedChannelUpdate_new(bindings.encodeUint8Array(bindings.check_arr_len(chain_hash_arg, 32)), short_channel_id_arg, timestamp_arg, flags_arg, cltv_expiry_delta_arg, htlc_minimum_msat_arg, htlc_maximum_msat_arg, fee_base_msat_arg, fee_proportional_millionths_arg, bindings.encodeUint8Array(excess_data_arg)); const ret_hu_conv: UnsignedChannelUpdate = new UnsignedChannelUpdate(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.UnsignedChannelUpdate_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.UnsignedChannelUpdate_clone_ptr(this.ptr); return ret; } @@ -556,7 +556,7 @@ export class UnsignedChannelUpdate extends CommonBase { * Creates a copy of the UnsignedChannelUpdate */ public clone(): UnsignedChannelUpdate { - const ret: number = bindings.UnsignedChannelUpdate_clone(this.ptr); + const ret: bigint = bindings.UnsignedChannelUpdate_clone(this.ptr); const ret_hu_conv: UnsignedChannelUpdate = new UnsignedChannelUpdate(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -575,7 +575,7 @@ export class UnsignedChannelUpdate extends CommonBase { * Read a UnsignedChannelUpdate from a byte array, created by UnsignedChannelUpdate_write */ public static constructor_read(ser: Uint8Array): Result_UnsignedChannelUpdateDecodeErrorZ { - const ret: number = bindings.UnsignedChannelUpdate_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.UnsignedChannelUpdate_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_UnsignedChannelUpdateDecodeErrorZ = Result_UnsignedChannelUpdateDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/UnsignedNodeAnnouncement.mts b/ts/structs/UnsignedNodeAnnouncement.mts index ad5e4730..7275c397 100644 --- a/ts/structs/UnsignedNodeAnnouncement.mts +++ b/ts/structs/UnsignedNodeAnnouncement.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class UnsignedNodeAnnouncement extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.UnsignedNodeAnnouncement_free); } @@ -369,7 +369,7 @@ export class UnsignedNodeAnnouncement extends CommonBase { * The advertised features */ public get_features(): NodeFeatures { - const ret: number = bindings.UnsignedNodeAnnouncement_get_features(this.ptr); + const ret: bigint = bindings.UnsignedNodeAnnouncement_get_features(this.ptr); const ret_hu_conv: NodeFeatures = new NodeFeatures(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -379,7 +379,8 @@ export class UnsignedNodeAnnouncement extends CommonBase { * The advertised features */ public set_features(val: NodeFeatures): void { - bindings.UnsignedNodeAnnouncement_set_features(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.UnsignedNodeAnnouncement_set_features(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** @@ -459,7 +460,7 @@ export class UnsignedNodeAnnouncement extends CommonBase { const ret_conv_12_len: number = bindings.getArrayLength(ret); const ret_conv_12_arr: NetAddress[] = new Array(ret_conv_12_len).fill(null); for (var m = 0; m < ret_conv_12_len; m++) { - const ret_conv_12: number = bindings.getU32ArrayElem(ret, m); + const ret_conv_12: bigint = bindings.getU64ArrayElem(ret, m); const ret_conv_12_hu_conv: NetAddress = NetAddress.constr_from_ptr(ret_conv_12); CommonBase.add_ref_from(ret_conv_12_hu_conv, this); ret_conv_12_arr[m] = ret_conv_12_hu_conv; @@ -472,11 +473,11 @@ export class UnsignedNodeAnnouncement extends CommonBase { * List of addresses on which this node is reachable */ public set_addresses(val: NetAddress[]): void { - bindings.UnsignedNodeAnnouncement_set_addresses(this.ptr, bindings.encodeUint32Array(val != null ? val.map(val_conv_12 => CommonBase.get_ptr_of(val_conv_12)) : null)); + bindings.UnsignedNodeAnnouncement_set_addresses(this.ptr, bindings.encodeUint64Array(val != null ? val.map(val_conv_12 => CommonBase.get_ptr_of(val_conv_12)) : null)); } - public clone_ptr(): number { - const ret: number = bindings.UnsignedNodeAnnouncement_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.UnsignedNodeAnnouncement_clone_ptr(this.ptr); return ret; } @@ -484,7 +485,7 @@ export class UnsignedNodeAnnouncement extends CommonBase { * Creates a copy of the UnsignedNodeAnnouncement */ public clone(): UnsignedNodeAnnouncement { - const ret: number = bindings.UnsignedNodeAnnouncement_clone(this.ptr); + const ret: bigint = bindings.UnsignedNodeAnnouncement_clone(this.ptr); const ret_hu_conv: UnsignedNodeAnnouncement = new UnsignedNodeAnnouncement(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -503,7 +504,7 @@ export class UnsignedNodeAnnouncement extends CommonBase { * Read a UnsignedNodeAnnouncement from a byte array, created by UnsignedNodeAnnouncement_write */ public static constructor_read(ser: Uint8Array): Result_UnsignedNodeAnnouncementDecodeErrorZ { - const ret: number = bindings.UnsignedNodeAnnouncement_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.UnsignedNodeAnnouncement_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_UnsignedNodeAnnouncementDecodeErrorZ = Result_UnsignedNodeAnnouncementDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/UpdateAddHTLC.mts b/ts/structs/UpdateAddHTLC.mts index d61b5770..0960d300 100644 --- a/ts/structs/UpdateAddHTLC.mts +++ b/ts/structs/UpdateAddHTLC.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class UpdateAddHTLC extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.UpdateAddHTLC_free); } @@ -442,8 +442,8 @@ export class UpdateAddHTLC extends CommonBase { bindings.UpdateAddHTLC_set_cltv_expiry(this.ptr, val); } - public clone_ptr(): number { - const ret: number = bindings.UpdateAddHTLC_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.UpdateAddHTLC_clone_ptr(this.ptr); return ret; } @@ -451,7 +451,7 @@ export class UpdateAddHTLC extends CommonBase { * Creates a copy of the UpdateAddHTLC */ public clone(): UpdateAddHTLC { - const ret: number = bindings.UpdateAddHTLC_clone(this.ptr); + const ret: bigint = bindings.UpdateAddHTLC_clone(this.ptr); const ret_hu_conv: UpdateAddHTLC = new UpdateAddHTLC(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -470,7 +470,7 @@ export class UpdateAddHTLC extends CommonBase { * Read a UpdateAddHTLC from a byte array, created by UpdateAddHTLC_write */ public static constructor_read(ser: Uint8Array): Result_UpdateAddHTLCDecodeErrorZ { - const ret: number = bindings.UpdateAddHTLC_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.UpdateAddHTLC_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_UpdateAddHTLCDecodeErrorZ = Result_UpdateAddHTLCDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/UpdateFailHTLC.mts b/ts/structs/UpdateFailHTLC.mts index ff902ba0..0b434f52 100644 --- a/ts/structs/UpdateFailHTLC.mts +++ b/ts/structs/UpdateFailHTLC.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class UpdateFailHTLC extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.UpdateFailHTLC_free); } @@ -396,8 +396,8 @@ export class UpdateFailHTLC extends CommonBase { bindings.UpdateFailHTLC_set_htlc_id(this.ptr, val); } - public clone_ptr(): number { - const ret: number = bindings.UpdateFailHTLC_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.UpdateFailHTLC_clone_ptr(this.ptr); return ret; } @@ -405,7 +405,7 @@ export class UpdateFailHTLC extends CommonBase { * Creates a copy of the UpdateFailHTLC */ public clone(): UpdateFailHTLC { - const ret: number = bindings.UpdateFailHTLC_clone(this.ptr); + const ret: bigint = bindings.UpdateFailHTLC_clone(this.ptr); const ret_hu_conv: UpdateFailHTLC = new UpdateFailHTLC(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -424,7 +424,7 @@ export class UpdateFailHTLC extends CommonBase { * Read a UpdateFailHTLC from a byte array, created by UpdateFailHTLC_write */ public static constructor_read(ser: Uint8Array): Result_UpdateFailHTLCDecodeErrorZ { - const ret: number = bindings.UpdateFailHTLC_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.UpdateFailHTLC_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_UpdateFailHTLCDecodeErrorZ = Result_UpdateFailHTLCDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/UpdateFailMalformedHTLC.mts b/ts/structs/UpdateFailMalformedHTLC.mts index 53d3a9d1..bba09700 100644 --- a/ts/structs/UpdateFailMalformedHTLC.mts +++ b/ts/structs/UpdateFailMalformedHTLC.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class UpdateFailMalformedHTLC extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.UpdateFailMalformedHTLC_free); } @@ -411,8 +411,8 @@ export class UpdateFailMalformedHTLC extends CommonBase { bindings.UpdateFailMalformedHTLC_set_failure_code(this.ptr, val); } - public clone_ptr(): number { - const ret: number = bindings.UpdateFailMalformedHTLC_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.UpdateFailMalformedHTLC_clone_ptr(this.ptr); return ret; } @@ -420,7 +420,7 @@ export class UpdateFailMalformedHTLC extends CommonBase { * Creates a copy of the UpdateFailMalformedHTLC */ public clone(): UpdateFailMalformedHTLC { - const ret: number = bindings.UpdateFailMalformedHTLC_clone(this.ptr); + const ret: bigint = bindings.UpdateFailMalformedHTLC_clone(this.ptr); const ret_hu_conv: UpdateFailMalformedHTLC = new UpdateFailMalformedHTLC(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -439,7 +439,7 @@ export class UpdateFailMalformedHTLC extends CommonBase { * Read a UpdateFailMalformedHTLC from a byte array, created by UpdateFailMalformedHTLC_write */ public static constructor_read(ser: Uint8Array): Result_UpdateFailMalformedHTLCDecodeErrorZ { - const ret: number = bindings.UpdateFailMalformedHTLC_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.UpdateFailMalformedHTLC_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_UpdateFailMalformedHTLCDecodeErrorZ = Result_UpdateFailMalformedHTLCDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/UpdateFee.mts b/ts/structs/UpdateFee.mts index 1c53ce5e..cdd1de9e 100644 --- a/ts/structs/UpdateFee.mts +++ b/ts/structs/UpdateFee.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class UpdateFee extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.UpdateFee_free); } @@ -400,14 +400,14 @@ export class UpdateFee extends CommonBase { * Constructs a new UpdateFee given each field */ public static constructor_new(channel_id_arg: Uint8Array, feerate_per_kw_arg: number): UpdateFee { - const ret: number = bindings.UpdateFee_new(bindings.encodeUint8Array(bindings.check_arr_len(channel_id_arg, 32)), feerate_per_kw_arg); + const ret: bigint = bindings.UpdateFee_new(bindings.encodeUint8Array(bindings.check_arr_len(channel_id_arg, 32)), feerate_per_kw_arg); const ret_hu_conv: UpdateFee = new UpdateFee(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.UpdateFee_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.UpdateFee_clone_ptr(this.ptr); return ret; } @@ -415,7 +415,7 @@ export class UpdateFee extends CommonBase { * Creates a copy of the UpdateFee */ public clone(): UpdateFee { - const ret: number = bindings.UpdateFee_clone(this.ptr); + const ret: bigint = bindings.UpdateFee_clone(this.ptr); const ret_hu_conv: UpdateFee = new UpdateFee(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -434,7 +434,7 @@ export class UpdateFee extends CommonBase { * Read a UpdateFee from a byte array, created by UpdateFee_write */ public static constructor_read(ser: Uint8Array): Result_UpdateFeeDecodeErrorZ { - const ret: number = bindings.UpdateFee_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.UpdateFee_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_UpdateFeeDecodeErrorZ = Result_UpdateFeeDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/UpdateFulfillHTLC.mts b/ts/structs/UpdateFulfillHTLC.mts index 75e8fc98..9e5a219f 100644 --- a/ts/structs/UpdateFulfillHTLC.mts +++ b/ts/structs/UpdateFulfillHTLC.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class UpdateFulfillHTLC extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.UpdateFulfillHTLC_free); } @@ -416,14 +416,14 @@ export class UpdateFulfillHTLC extends CommonBase { * Constructs a new UpdateFulfillHTLC given each field */ public static constructor_new(channel_id_arg: Uint8Array, htlc_id_arg: bigint, payment_preimage_arg: Uint8Array): UpdateFulfillHTLC { - const ret: number = bindings.UpdateFulfillHTLC_new(bindings.encodeUint8Array(bindings.check_arr_len(channel_id_arg, 32)), htlc_id_arg, bindings.encodeUint8Array(bindings.check_arr_len(payment_preimage_arg, 32))); + const ret: bigint = bindings.UpdateFulfillHTLC_new(bindings.encodeUint8Array(bindings.check_arr_len(channel_id_arg, 32)), htlc_id_arg, bindings.encodeUint8Array(bindings.check_arr_len(payment_preimage_arg, 32))); const ret_hu_conv: UpdateFulfillHTLC = new UpdateFulfillHTLC(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.UpdateFulfillHTLC_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.UpdateFulfillHTLC_clone_ptr(this.ptr); return ret; } @@ -431,7 +431,7 @@ export class UpdateFulfillHTLC extends CommonBase { * Creates a copy of the UpdateFulfillHTLC */ public clone(): UpdateFulfillHTLC { - const ret: number = bindings.UpdateFulfillHTLC_clone(this.ptr); + const ret: bigint = bindings.UpdateFulfillHTLC_clone(this.ptr); const ret_hu_conv: UpdateFulfillHTLC = new UpdateFulfillHTLC(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -450,7 +450,7 @@ export class UpdateFulfillHTLC extends CommonBase { * Read a UpdateFulfillHTLC from a byte array, created by UpdateFulfillHTLC_write */ public static constructor_read(ser: Uint8Array): Result_UpdateFulfillHTLCDecodeErrorZ { - const ret: number = bindings.UpdateFulfillHTLC_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.UpdateFulfillHTLC_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_UpdateFulfillHTLCDecodeErrorZ = Result_UpdateFulfillHTLCDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/UserConfig.mts b/ts/structs/UserConfig.mts index 7ac8f680..219fea8f 100644 --- a/ts/structs/UserConfig.mts +++ b/ts/structs/UserConfig.mts @@ -364,7 +364,7 @@ import * as bindings from '../bindings.mjs' */ export class UserConfig extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.UserConfig_free); } @@ -372,7 +372,7 @@ export class UserConfig extends CommonBase { * Channel handshake config that we propose to our counterparty. */ public get_channel_handshake_config(): ChannelHandshakeConfig { - const ret: number = bindings.UserConfig_get_channel_handshake_config(this.ptr); + const ret: bigint = bindings.UserConfig_get_channel_handshake_config(this.ptr); const ret_hu_conv: ChannelHandshakeConfig = new ChannelHandshakeConfig(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -382,14 +382,15 @@ export class UserConfig extends CommonBase { * Channel handshake config that we propose to our counterparty. */ public set_channel_handshake_config(val: ChannelHandshakeConfig): void { - bindings.UserConfig_set_channel_handshake_config(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.UserConfig_set_channel_handshake_config(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** * Limits applied to our counterparty's proposed channel handshake config settings. */ public get_channel_handshake_limits(): ChannelHandshakeLimits { - const ret: number = bindings.UserConfig_get_channel_handshake_limits(this.ptr); + const ret: bigint = bindings.UserConfig_get_channel_handshake_limits(this.ptr); const ret_hu_conv: ChannelHandshakeLimits = new ChannelHandshakeLimits(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -399,14 +400,15 @@ export class UserConfig extends CommonBase { * Limits applied to our counterparty's proposed channel handshake config settings. */ public set_channel_handshake_limits(val: ChannelHandshakeLimits): void { - bindings.UserConfig_set_channel_handshake_limits(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.UserConfig_set_channel_handshake_limits(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** * Channel config which affects behavior during channel lifetime. */ public get_channel_config(): ChannelConfig { - const ret: number = bindings.UserConfig_get_channel_config(this.ptr); + const ret: bigint = bindings.UserConfig_get_channel_config(this.ptr); const ret_hu_conv: ChannelConfig = new ChannelConfig(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -416,7 +418,8 @@ export class UserConfig extends CommonBase { * Channel config which affects behavior during channel lifetime. */ public set_channel_config(val: ChannelConfig): void { - bindings.UserConfig_set_channel_config(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.UserConfig_set_channel_config(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** @@ -524,14 +527,17 @@ export class UserConfig extends CommonBase { * Constructs a new UserConfig given each field */ public static constructor_new(channel_handshake_config_arg: ChannelHandshakeConfig, channel_handshake_limits_arg: ChannelHandshakeLimits, channel_config_arg: ChannelConfig, accept_forwards_to_priv_channels_arg: boolean, accept_inbound_channels_arg: boolean, manually_accept_inbound_channels_arg: boolean): UserConfig { - const ret: number = bindings.UserConfig_new(channel_handshake_config_arg == null ? 0 : CommonBase.get_ptr_of(channel_handshake_config_arg) & ~1, channel_handshake_limits_arg == null ? 0 : CommonBase.get_ptr_of(channel_handshake_limits_arg) & ~1, channel_config_arg == null ? 0 : CommonBase.get_ptr_of(channel_config_arg) & ~1, accept_forwards_to_priv_channels_arg, accept_inbound_channels_arg, manually_accept_inbound_channels_arg); + const ret: bigint = bindings.UserConfig_new(channel_handshake_config_arg == null ? 0n : CommonBase.get_ptr_of(channel_handshake_config_arg), channel_handshake_limits_arg == null ? 0n : CommonBase.get_ptr_of(channel_handshake_limits_arg), channel_config_arg == null ? 0n : CommonBase.get_ptr_of(channel_config_arg), accept_forwards_to_priv_channels_arg, accept_inbound_channels_arg, manually_accept_inbound_channels_arg); const ret_hu_conv: UserConfig = new UserConfig(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, channel_handshake_config_arg); + CommonBase.add_ref_from(ret_hu_conv, channel_handshake_limits_arg); + CommonBase.add_ref_from(ret_hu_conv, channel_config_arg); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.UserConfig_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.UserConfig_clone_ptr(this.ptr); return ret; } @@ -539,7 +545,7 @@ export class UserConfig extends CommonBase { * Creates a copy of the UserConfig */ public clone(): UserConfig { - const ret: number = bindings.UserConfig_clone(this.ptr); + const ret: bigint = bindings.UserConfig_clone(this.ptr); const ret_hu_conv: UserConfig = new UserConfig(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -549,7 +555,7 @@ export class UserConfig extends CommonBase { * Creates a "default" UserConfig. See struct and individual field documentaiton for details on which values are used. */ public static constructor_default(): UserConfig { - const ret: number = bindings.UserConfig_default(); + const ret: bigint = bindings.UserConfig_default(); const ret_hu_conv: UserConfig = new UserConfig(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; diff --git a/ts/structs/UtilMethods.mts b/ts/structs/UtilMethods.mts index 4a633ad6..61d7ef1e 100644 --- a/ts/structs/UtilMethods.mts +++ b/ts/structs/UtilMethods.mts @@ -378,7 +378,7 @@ export class UtilMethods extends CommonBase { * Read a ClosureReason from a byte array, created by ClosureReason_write */ public static constructor_ClosureReason_read(ser: Uint8Array): Result_COption_ClosureReasonZDecodeErrorZ { - const ret: number = bindings.ClosureReason_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.ClosureReason_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_COption_ClosureReasonZDecodeErrorZ = Result_COption_ClosureReasonZDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -387,7 +387,7 @@ export class UtilMethods extends CommonBase { * Read a HTLCDestination from a byte array, created by HTLCDestination_write */ public static constructor_HTLCDestination_read(ser: Uint8Array): Result_COption_HTLCDestinationZDecodeErrorZ { - const ret: number = bindings.HTLCDestination_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.HTLCDestination_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_COption_HTLCDestinationZDecodeErrorZ = Result_COption_HTLCDestinationZDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -396,7 +396,7 @@ export class UtilMethods extends CommonBase { * Read a Event from a byte array, created by Event_write */ public static constructor_Event_read(ser: Uint8Array): Result_COption_EventZDecodeErrorZ { - const ret: number = bindings.Event_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.Event_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_COption_EventZDecodeErrorZ = Result_COption_EventZDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -407,7 +407,7 @@ export class UtilMethods extends CommonBase { * Signatures are EC recoverable, meaning that given the message and the signature the PublicKey of the signer can be extracted. */ public static constructor_sign(msg: Uint8Array, sk: Uint8Array): Result_StringErrorZ { - const ret: number = bindings.sign(bindings.encodeUint8Array(msg), bindings.encodeUint8Array(bindings.check_arr_len(sk, 32))); + const ret: bigint = bindings.sign(bindings.encodeUint8Array(msg), bindings.encodeUint8Array(bindings.check_arr_len(sk, 32))); const ret_hu_conv: Result_StringErrorZ = Result_StringErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -416,7 +416,7 @@ export class UtilMethods extends CommonBase { * Recovers the PublicKey of the signer of the message given the message and the signature. */ public static constructor_recover_pk(msg: Uint8Array, sig: string): Result_PublicKeyErrorZ { - const ret: number = bindings.recover_pk(bindings.encodeUint8Array(msg), bindings.encodeString(sig)); + const ret: bigint = bindings.recover_pk(bindings.encodeUint8Array(msg), bindings.encodeString(sig)); const ret_hu_conv: Result_PublicKeyErrorZ = Result_PublicKeyErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -443,7 +443,7 @@ export class UtilMethods extends CommonBase { * Read a MonitorEvent from a byte array, created by MonitorEvent_write */ public static constructor_MonitorEvent_read(ser: Uint8Array): Result_COption_MonitorEventZDecodeErrorZ { - const ret: number = bindings.MonitorEvent_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.MonitorEvent_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_COption_MonitorEventZDecodeErrorZ = Result_COption_MonitorEventZDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -452,7 +452,7 @@ export class UtilMethods extends CommonBase { * Read a C2Tuple_BlockHashChannelMonitorZ from a byte array, created by C2Tuple_BlockHashChannelMonitorZ_write */ public static constructor_C2Tuple_BlockHashChannelMonitorZ_read(ser: Uint8Array, arg: KeysInterface): Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ { - const ret: number = bindings.C2Tuple_BlockHashChannelMonitorZ_read(bindings.encodeUint8Array(ser), arg == null ? 0 : CommonBase.get_ptr_of(arg)); + const ret: bigint = bindings.C2Tuple_BlockHashChannelMonitorZ_read(bindings.encodeUint8Array(ser), arg == null ? 0n : CommonBase.get_ptr_of(arg)); const ret_hu_conv: Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ = Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, arg); return ret_hu_conv; @@ -462,14 +462,14 @@ export class UtilMethods extends CommonBase { * Read a C2Tuple_BlockHashChannelManagerZ from a byte array, created by C2Tuple_BlockHashChannelManagerZ_write */ public static constructor_C2Tuple_BlockHashChannelManagerZ_read(ser: Uint8Array, arg_keys_manager: KeysInterface, arg_fee_estimator: FeeEstimator, arg_chain_monitor: Watch, arg_tx_broadcaster: BroadcasterInterface, arg_logger: Logger, arg_default_config: UserConfig, arg_channel_monitors: ChannelMonitor[]): Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ { - const ret: number = bindings.C2Tuple_BlockHashChannelManagerZ_read(bindings.encodeUint8Array(ser), bindings.ChannelManagerReadArgs_new(arg_keys_manager == null ? 0 : CommonBase.get_ptr_of(arg_keys_manager), arg_fee_estimator == null ? 0 : CommonBase.get_ptr_of(arg_fee_estimator), arg_chain_monitor == null ? 0 : CommonBase.get_ptr_of(arg_chain_monitor), arg_tx_broadcaster == null ? 0 : CommonBase.get_ptr_of(arg_tx_broadcaster), arg_logger == null ? 0 : CommonBase.get_ptr_of(arg_logger), arg_default_config == null ? 0 : CommonBase.get_ptr_of(arg_default_config) & ~1, bindings.encodeUint32Array(arg_channel_monitors != null ? arg_channel_monitors.map(arg_channel_monitors_conv_16 => arg_channel_monitors_conv_16 == null ? 0 : CommonBase.get_ptr_of(arg_channel_monitors_conv_16) & ~1) : null))); + const ret: bigint = bindings.C2Tuple_BlockHashChannelManagerZ_read(bindings.encodeUint8Array(ser), bindings.ChannelManagerReadArgs_new(arg_keys_manager == null ? 0n : CommonBase.get_ptr_of(arg_keys_manager), arg_fee_estimator == null ? 0n : CommonBase.get_ptr_of(arg_fee_estimator), arg_chain_monitor == null ? 0n : CommonBase.get_ptr_of(arg_chain_monitor), arg_tx_broadcaster == null ? 0n : CommonBase.get_ptr_of(arg_tx_broadcaster), arg_logger == null ? 0n : CommonBase.get_ptr_of(arg_logger), arg_default_config == null ? 0n : CommonBase.get_ptr_of(arg_default_config), bindings.encodeUint64Array(arg_channel_monitors != null ? arg_channel_monitors.map(arg_channel_monitors_conv_16 => arg_channel_monitors_conv_16 == null ? 0n : CommonBase.get_ptr_of(arg_channel_monitors_conv_16)) : null))); const ret_hu_conv: Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ = Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, arg_keys_manager); CommonBase.add_ref_from(ret_hu_conv, arg_fee_estimator); CommonBase.add_ref_from(ret_hu_conv, arg_chain_monitor); CommonBase.add_ref_from(ret_hu_conv, arg_tx_broadcaster); CommonBase.add_ref_from(ret_hu_conv, arg_logger); - ; + CommonBase.add_ref_from(ret_hu_conv, arg_default_config); arg_channel_monitors.forEach((arg_channel_monitors_conv_16: ChannelMonitor) => { CommonBase.add_ref_from(ret_hu_conv, arg_channel_monitors_conv_16); }); return ret_hu_conv; } @@ -488,7 +488,7 @@ export class UtilMethods extends CommonBase { * [phantom node payments]: crate::chain::keysinterface::PhantomKeysManager */ public static constructor_create(keys: ExpandedKey, min_value_msat: Option_u64Z, invoice_expiry_delta_secs: number, keys_manager: KeysInterface, current_time: bigint): Result_C2Tuple_PaymentHashPaymentSecretZNoneZ { - const ret: number = bindings.create(keys == null ? 0 : CommonBase.get_ptr_of(keys) & ~1, CommonBase.get_ptr_of(min_value_msat), invoice_expiry_delta_secs, keys_manager == null ? 0 : CommonBase.get_ptr_of(keys_manager), current_time); + const ret: bigint = bindings.create(keys == null ? 0n : CommonBase.get_ptr_of(keys), CommonBase.get_ptr_of(min_value_msat), invoice_expiry_delta_secs, keys_manager == null ? 0n : CommonBase.get_ptr_of(keys_manager), current_time); const ret_hu_conv: Result_C2Tuple_PaymentHashPaymentSecretZNoneZ = Result_C2Tuple_PaymentHashPaymentSecretZNoneZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, keys); CommonBase.add_ref_from(ret_hu_conv, keys_manager); @@ -505,7 +505,7 @@ export class UtilMethods extends CommonBase { * [phantom node payments]: crate::chain::keysinterface::PhantomKeysManager */ public static constructor_create_from_hash(keys: ExpandedKey, min_value_msat: Option_u64Z, payment_hash: Uint8Array, invoice_expiry_delta_secs: number, current_time: bigint): Result_PaymentSecretNoneZ { - const ret: number = bindings.create_from_hash(keys == null ? 0 : CommonBase.get_ptr_of(keys) & ~1, CommonBase.get_ptr_of(min_value_msat), bindings.encodeUint8Array(bindings.check_arr_len(payment_hash, 32)), invoice_expiry_delta_secs, current_time); + const ret: bigint = bindings.create_from_hash(keys == null ? 0n : CommonBase.get_ptr_of(keys), CommonBase.get_ptr_of(min_value_msat), bindings.encodeUint8Array(bindings.check_arr_len(payment_hash, 32)), invoice_expiry_delta_secs, current_time); const ret_hu_conv: Result_PaymentSecretNoneZ = Result_PaymentSecretNoneZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, keys); return ret_hu_conv; @@ -540,7 +540,7 @@ export class UtilMethods extends CommonBase { * Build a closing transaction */ public static constructor_build_closing_transaction(to_holder_value_sat: bigint, to_counterparty_value_sat: bigint, to_holder_script: Uint8Array, to_counterparty_script: Uint8Array, funding_outpoint: OutPoint): Uint8Array { - const ret: number = bindings.build_closing_transaction(to_holder_value_sat, to_counterparty_value_sat, bindings.encodeUint8Array(to_holder_script), bindings.encodeUint8Array(to_counterparty_script), funding_outpoint == null ? 0 : CommonBase.get_ptr_of(funding_outpoint) & ~1); + const ret: number = bindings.build_closing_transaction(to_holder_value_sat, to_counterparty_value_sat, bindings.encodeUint8Array(to_holder_script), bindings.encodeUint8Array(to_counterparty_script), funding_outpoint == null ? 0n : CommonBase.get_ptr_of(funding_outpoint)); const ret_conv: Uint8Array = bindings.decodeUint8Array(ret); return ret_conv; } @@ -553,7 +553,7 @@ export class UtilMethods extends CommonBase { * generated (ie our own). */ public static constructor_derive_private_key(per_commitment_point: Uint8Array, base_secret: Uint8Array): Result_SecretKeyErrorZ { - const ret: number = bindings.derive_private_key(bindings.encodeUint8Array(bindings.check_arr_len(per_commitment_point, 33)), bindings.encodeUint8Array(bindings.check_arr_len(base_secret, 32))); + const ret: bigint = bindings.derive_private_key(bindings.encodeUint8Array(bindings.check_arr_len(per_commitment_point, 33)), bindings.encodeUint8Array(bindings.check_arr_len(base_secret, 32))); const ret_hu_conv: Result_SecretKeyErrorZ = Result_SecretKeyErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -567,7 +567,7 @@ export class UtilMethods extends CommonBase { * generated (ie our own). */ public static constructor_derive_public_key(per_commitment_point: Uint8Array, base_point: Uint8Array): Result_PublicKeyErrorZ { - const ret: number = bindings.derive_public_key(bindings.encodeUint8Array(bindings.check_arr_len(per_commitment_point, 33)), bindings.encodeUint8Array(bindings.check_arr_len(base_point, 33))); + const ret: bigint = bindings.derive_public_key(bindings.encodeUint8Array(bindings.check_arr_len(per_commitment_point, 33)), bindings.encodeUint8Array(bindings.check_arr_len(base_point, 33))); const ret_hu_conv: Result_PublicKeyErrorZ = Result_PublicKeyErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -584,7 +584,7 @@ export class UtilMethods extends CommonBase { * generated (ie our own). */ public static constructor_derive_private_revocation_key(per_commitment_secret: Uint8Array, countersignatory_revocation_base_secret: Uint8Array): Result_SecretKeyErrorZ { - const ret: number = bindings.derive_private_revocation_key(bindings.encodeUint8Array(bindings.check_arr_len(per_commitment_secret, 32)), bindings.encodeUint8Array(bindings.check_arr_len(countersignatory_revocation_base_secret, 32))); + const ret: bigint = bindings.derive_private_revocation_key(bindings.encodeUint8Array(bindings.check_arr_len(per_commitment_secret, 32)), bindings.encodeUint8Array(bindings.check_arr_len(countersignatory_revocation_base_secret, 32))); const ret_hu_conv: Result_SecretKeyErrorZ = Result_SecretKeyErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -603,7 +603,7 @@ export class UtilMethods extends CommonBase { * generated (ie our own). */ public static constructor_derive_public_revocation_key(per_commitment_point: Uint8Array, countersignatory_revocation_base_point: Uint8Array): Result_PublicKeyErrorZ { - const ret: number = bindings.derive_public_revocation_key(bindings.encodeUint8Array(bindings.check_arr_len(per_commitment_point, 33)), bindings.encodeUint8Array(bindings.check_arr_len(countersignatory_revocation_base_point, 33))); + const ret: bigint = bindings.derive_public_revocation_key(bindings.encodeUint8Array(bindings.check_arr_len(per_commitment_point, 33)), bindings.encodeUint8Array(bindings.check_arr_len(countersignatory_revocation_base_point, 33))); const ret_hu_conv: Result_PublicKeyErrorZ = Result_PublicKeyErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -624,7 +624,7 @@ export class UtilMethods extends CommonBase { * does not need to have its previous_output_index filled. */ public static constructor_get_htlc_redeemscript(htlc: HTLCOutputInCommitment, opt_anchors: boolean, keys: TxCreationKeys): Uint8Array { - const ret: number = bindings.get_htlc_redeemscript(htlc == null ? 0 : CommonBase.get_ptr_of(htlc) & ~1, opt_anchors, keys == null ? 0 : CommonBase.get_ptr_of(keys) & ~1); + const ret: number = bindings.get_htlc_redeemscript(htlc == null ? 0n : CommonBase.get_ptr_of(htlc), opt_anchors, keys == null ? 0n : CommonBase.get_ptr_of(keys)); const ret_conv: Uint8Array = bindings.decodeUint8Array(ret); return ret_conv; } @@ -649,7 +649,7 @@ export class UtilMethods extends CommonBase { * commitment transaction). */ public static constructor_build_htlc_transaction(commitment_txid: Uint8Array, feerate_per_kw: number, contest_delay: number, htlc: HTLCOutputInCommitment, opt_anchors: boolean, broadcaster_delayed_payment_key: Uint8Array, revocation_key: Uint8Array): Uint8Array { - const ret: number = bindings.build_htlc_transaction(bindings.encodeUint8Array(bindings.check_arr_len(commitment_txid, 32)), feerate_per_kw, contest_delay, htlc == null ? 0 : CommonBase.get_ptr_of(htlc) & ~1, opt_anchors, bindings.encodeUint8Array(bindings.check_arr_len(broadcaster_delayed_payment_key, 33)), bindings.encodeUint8Array(bindings.check_arr_len(revocation_key, 33))); + const ret: number = bindings.build_htlc_transaction(bindings.encodeUint8Array(bindings.check_arr_len(commitment_txid, 32)), feerate_per_kw, contest_delay, htlc == null ? 0n : CommonBase.get_ptr_of(htlc), opt_anchors, bindings.encodeUint8Array(bindings.check_arr_len(broadcaster_delayed_payment_key, 33)), bindings.encodeUint8Array(bindings.check_arr_len(revocation_key, 33))); const ret_conv: Uint8Array = bindings.decodeUint8Array(ret); return ret_conv; } @@ -685,7 +685,7 @@ export class UtilMethods extends CommonBase { * Read a NetworkUpdate from a byte array, created by NetworkUpdate_write */ public static constructor_NetworkUpdate_read(ser: Uint8Array): Result_COption_NetworkUpdateZDecodeErrorZ { - const ret: number = bindings.NetworkUpdate_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.NetworkUpdate_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_COption_NetworkUpdateZDecodeErrorZ = Result_COption_NetworkUpdateZDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -724,7 +724,7 @@ export class UtilMethods extends CommonBase { * Note that first_hops (or a relevant inner pointer) may be NULL or all-0s to represent None */ public static constructor_find_route(our_node_pubkey: Uint8Array, route_params: RouteParameters, network_graph: NetworkGraph, first_hops: ChannelDetails[], logger: Logger, scorer: Score, random_seed_bytes: Uint8Array): Result_RouteLightningErrorZ { - const ret: number = bindings.find_route(bindings.encodeUint8Array(bindings.check_arr_len(our_node_pubkey, 33)), route_params == null ? 0 : CommonBase.get_ptr_of(route_params) & ~1, network_graph == null ? 0 : CommonBase.get_ptr_of(network_graph) & ~1, bindings.encodeUint32Array(first_hops != null ? first_hops.map(first_hops_conv_16 => first_hops_conv_16 == null ? 0 : CommonBase.get_ptr_of(first_hops_conv_16) & ~1) : null), logger == null ? 0 : CommonBase.get_ptr_of(logger), scorer == null ? 0 : CommonBase.get_ptr_of(scorer), bindings.encodeUint8Array(bindings.check_arr_len(random_seed_bytes, 32))); + const ret: bigint = bindings.find_route(bindings.encodeUint8Array(bindings.check_arr_len(our_node_pubkey, 33)), route_params == null ? 0n : CommonBase.get_ptr_of(route_params), network_graph == null ? 0n : CommonBase.get_ptr_of(network_graph), bindings.encodeUint64Array(first_hops != null ? first_hops.map(first_hops_conv_16 => first_hops_conv_16 == null ? 0n : CommonBase.get_ptr_of(first_hops_conv_16)) : null), logger == null ? 0n : CommonBase.get_ptr_of(logger), scorer == null ? 0n : CommonBase.get_ptr_of(scorer), bindings.encodeUint8Array(bindings.check_arr_len(random_seed_bytes, 32))); const ret_hu_conv: Result_RouteLightningErrorZ = Result_RouteLightningErrorZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, route_params); CommonBase.add_ref_from(ret_hu_conv, network_graph); @@ -741,7 +741,7 @@ export class UtilMethods extends CommonBase { * Re-uses logic from `find_route`, so the restrictions described there also apply here. */ public static constructor_build_route_from_hops(our_node_pubkey: Uint8Array, hops: Uint8Array[], route_params: RouteParameters, network_graph: NetworkGraph, logger: Logger, random_seed_bytes: Uint8Array): Result_RouteLightningErrorZ { - const ret: number = bindings.build_route_from_hops(bindings.encodeUint8Array(bindings.check_arr_len(our_node_pubkey, 33)), bindings.encodeUint32Array(hops != null ? hops.map(hops_conv_12 => bindings.encodeUint8Array(bindings.check_arr_len(hops_conv_12, 33))) : null), route_params == null ? 0 : CommonBase.get_ptr_of(route_params) & ~1, network_graph == null ? 0 : CommonBase.get_ptr_of(network_graph) & ~1, logger == null ? 0 : CommonBase.get_ptr_of(logger), bindings.encodeUint8Array(bindings.check_arr_len(random_seed_bytes, 32))); + const ret: bigint = bindings.build_route_from_hops(bindings.encodeUint8Array(bindings.check_arr_len(our_node_pubkey, 33)), bindings.encodeUint32Array(hops != null ? hops.map(hops_conv_12 => bindings.encodeUint8Array(bindings.check_arr_len(hops_conv_12, 33))) : null), route_params == null ? 0n : CommonBase.get_ptr_of(route_params), network_graph == null ? 0n : CommonBase.get_ptr_of(network_graph), logger == null ? 0n : CommonBase.get_ptr_of(logger), bindings.encodeUint8Array(bindings.check_arr_len(random_seed_bytes, 32))); const ret_hu_conv: Result_RouteLightningErrorZ = Result_RouteLightningErrorZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, route_params); CommonBase.add_ref_from(ret_hu_conv, network_graph); @@ -755,10 +755,11 @@ export class UtilMethods extends CommonBase { * available and the current time is supplied by the caller. */ public static constructor_create_invoice_from_channelmanager_with_description_hash_and_duration_since_epoch(channelmanager: ChannelManager, keys_manager: KeysInterface, network: Currency, amt_msat: Option_u64Z, description_hash: Sha256, duration_since_epoch: bigint, invoice_expiry_delta_secs: number): Result_InvoiceSignOrCreationErrorZ { - const ret: number = bindings.create_invoice_from_channelmanager_with_description_hash_and_duration_since_epoch(channelmanager == null ? 0 : CommonBase.get_ptr_of(channelmanager) & ~1, keys_manager == null ? 0 : CommonBase.get_ptr_of(keys_manager), network, CommonBase.get_ptr_of(amt_msat), description_hash == null ? 0 : CommonBase.get_ptr_of(description_hash) & ~1, duration_since_epoch, invoice_expiry_delta_secs); + const ret: bigint = bindings.create_invoice_from_channelmanager_with_description_hash_and_duration_since_epoch(channelmanager == null ? 0n : CommonBase.get_ptr_of(channelmanager), keys_manager == null ? 0n : CommonBase.get_ptr_of(keys_manager), network, CommonBase.get_ptr_of(amt_msat), description_hash == null ? 0n : CommonBase.get_ptr_of(description_hash), duration_since_epoch, invoice_expiry_delta_secs); const ret_hu_conv: Result_InvoiceSignOrCreationErrorZ = Result_InvoiceSignOrCreationErrorZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, channelmanager); CommonBase.add_ref_from(ret_hu_conv, keys_manager); + CommonBase.add_ref_from(ret_hu_conv, description_hash); return ret_hu_conv; } @@ -768,7 +769,7 @@ export class UtilMethods extends CommonBase { * available and the current time is supplied by the caller. */ public static constructor_create_invoice_from_channelmanager_and_duration_since_epoch(channelmanager: ChannelManager, keys_manager: KeysInterface, network: Currency, amt_msat: Option_u64Z, description: string, duration_since_epoch: bigint, invoice_expiry_delta_secs: number): Result_InvoiceSignOrCreationErrorZ { - const ret: number = bindings.create_invoice_from_channelmanager_and_duration_since_epoch(channelmanager == null ? 0 : CommonBase.get_ptr_of(channelmanager) & ~1, keys_manager == null ? 0 : CommonBase.get_ptr_of(keys_manager), network, CommonBase.get_ptr_of(amt_msat), bindings.encodeString(description), duration_since_epoch, invoice_expiry_delta_secs); + const ret: bigint = bindings.create_invoice_from_channelmanager_and_duration_since_epoch(channelmanager == null ? 0n : CommonBase.get_ptr_of(channelmanager), keys_manager == null ? 0n : CommonBase.get_ptr_of(keys_manager), network, CommonBase.get_ptr_of(amt_msat), bindings.encodeString(description), duration_since_epoch, invoice_expiry_delta_secs); const ret_hu_conv: Result_InvoiceSignOrCreationErrorZ = Result_InvoiceSignOrCreationErrorZ.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, channelmanager); CommonBase.add_ref_from(ret_hu_conv, keys_manager); diff --git a/ts/structs/WarningMessage.mts b/ts/structs/WarningMessage.mts index 879c1d08..27a3b425 100644 --- a/ts/structs/WarningMessage.mts +++ b/ts/structs/WarningMessage.mts @@ -361,7 +361,7 @@ import * as bindings from '../bindings.mjs' */ export class WarningMessage extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.WarningMessage_free); } @@ -411,14 +411,14 @@ export class WarningMessage extends CommonBase { * Constructs a new WarningMessage given each field */ public static constructor_new(channel_id_arg: Uint8Array, data_arg: string): WarningMessage { - const ret: number = bindings.WarningMessage_new(bindings.encodeUint8Array(bindings.check_arr_len(channel_id_arg, 32)), bindings.encodeString(data_arg)); + const ret: bigint = bindings.WarningMessage_new(bindings.encodeUint8Array(bindings.check_arr_len(channel_id_arg, 32)), bindings.encodeString(data_arg)); const ret_hu_conv: WarningMessage = new WarningMessage(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.WarningMessage_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.WarningMessage_clone_ptr(this.ptr); return ret; } @@ -426,7 +426,7 @@ export class WarningMessage extends CommonBase { * Creates a copy of the WarningMessage */ public clone(): WarningMessage { - const ret: number = bindings.WarningMessage_clone(this.ptr); + const ret: bigint = bindings.WarningMessage_clone(this.ptr); const ret_hu_conv: WarningMessage = new WarningMessage(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -445,7 +445,7 @@ export class WarningMessage extends CommonBase { * Read a WarningMessage from a byte array, created by WarningMessage_write */ public static constructor_read(ser: Uint8Array): Result_WarningMessageDecodeErrorZ { - const ret: number = bindings.WarningMessage_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.WarningMessage_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_WarningMessageDecodeErrorZ = Result_WarningMessageDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } diff --git a/ts/structs/Watch.mts b/ts/structs/Watch.mts index 733ecc88..312346d6 100644 --- a/ts/structs/Watch.mts +++ b/ts/structs/Watch.mts @@ -425,7 +425,7 @@ export class Watch extends CommonBase { public bindings_instance?: bindings.LDKWatch; /* @internal */ - constructor(_dummy: object, ptr: number) { + constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.Watch_free); this.bindings_instance = null; } @@ -434,31 +434,31 @@ export class Watch extends CommonBase { public static new_impl(arg: WatchInterface): Watch { const impl_holder: LDKWatchHolder = new LDKWatchHolder(); let structImplementation = { - watch_channel (funding_txo: number, monitor: number): number { + watch_channel (funding_txo: bigint, monitor: bigint): bigint { const funding_txo_hu_conv: OutPoint = new OutPoint(null, funding_txo); CommonBase.add_ref_from(funding_txo_hu_conv, this); const monitor_hu_conv: ChannelMonitor = new ChannelMonitor(null, monitor); CommonBase.add_ref_from(monitor_hu_conv, this); const ret: Result_NoneChannelMonitorUpdateErrZ = arg.watch_channel(funding_txo_hu_conv, monitor_hu_conv); - const result: number = ret == null ? 0 : ret.clone_ptr(); + const result: bigint = ret == null ? 0n : ret.clone_ptr(); return result; }, - update_channel (funding_txo: number, update: number): number { + update_channel (funding_txo: bigint, update: bigint): bigint { const funding_txo_hu_conv: OutPoint = new OutPoint(null, funding_txo); CommonBase.add_ref_from(funding_txo_hu_conv, this); const update_hu_conv: ChannelMonitorUpdate = new ChannelMonitorUpdate(null, update); CommonBase.add_ref_from(update_hu_conv, this); const ret: Result_NoneChannelMonitorUpdateErrZ = arg.update_channel(funding_txo_hu_conv, update_hu_conv); - const result: number = ret == null ? 0 : ret.clone_ptr(); + const result: bigint = ret == null ? 0n : ret.clone_ptr(); return result; }, release_pending_monitor_events (): number { const ret: ThreeTuple_OutPointCVec_MonitorEventZPublicKeyZ[] = arg.release_pending_monitor_events(); - const result: number = bindings.encodeUint32Array(ret != null ? ret.map(ret_conv_49 => ret_conv_49 == null ? 0 : ret_conv_49.clone_ptr()) : null); + const result: number = bindings.encodeUint64Array(ret != null ? ret.map(ret_conv_49 => ret_conv_49 == null ? 0n : ret_conv_49.clone_ptr()) : null); return result; }, } as bindings.LDKWatch; - const ptr: number = bindings.LDKWatch_new(structImplementation); + const ptr: bigint = bindings.LDKWatch_new(structImplementation); impl_holder.held = new Watch(null, ptr); impl_holder.held.bindings_instance = structImplementation; @@ -480,8 +480,10 @@ export class Watch extends CommonBase { * [`block_disconnected`]: channelmonitor::ChannelMonitor::block_disconnected */ public watch_channel(funding_txo: OutPoint, monitor: ChannelMonitor): Result_NoneChannelMonitorUpdateErrZ { - const ret: number = bindings.Watch_watch_channel(this.ptr, funding_txo == null ? 0 : CommonBase.get_ptr_of(funding_txo) & ~1, monitor == null ? 0 : CommonBase.get_ptr_of(monitor) & ~1); + const ret: bigint = bindings.Watch_watch_channel(this.ptr, funding_txo == null ? 0n : CommonBase.get_ptr_of(funding_txo), monitor == null ? 0n : CommonBase.get_ptr_of(monitor)); const ret_hu_conv: Result_NoneChannelMonitorUpdateErrZ = Result_NoneChannelMonitorUpdateErrZ.constr_from_ptr(ret); + CommonBase.add_ref_from(this, funding_txo); + CommonBase.add_ref_from(this, monitor); return ret_hu_conv; } @@ -494,8 +496,10 @@ export class Watch extends CommonBase { * [`update_monitor`]: channelmonitor::ChannelMonitor::update_monitor */ public update_channel(funding_txo: OutPoint, update: ChannelMonitorUpdate): Result_NoneChannelMonitorUpdateErrZ { - const ret: number = bindings.Watch_update_channel(this.ptr, funding_txo == null ? 0 : CommonBase.get_ptr_of(funding_txo) & ~1, update == null ? 0 : CommonBase.get_ptr_of(update) & ~1); + const ret: bigint = bindings.Watch_update_channel(this.ptr, funding_txo == null ? 0n : CommonBase.get_ptr_of(funding_txo), update == null ? 0n : CommonBase.get_ptr_of(update)); const ret_hu_conv: Result_NoneChannelMonitorUpdateErrZ = Result_NoneChannelMonitorUpdateErrZ.constr_from_ptr(ret); + CommonBase.add_ref_from(this, funding_txo); + CommonBase.add_ref_from(this, update); return ret_hu_conv; } @@ -515,7 +519,7 @@ export class Watch extends CommonBase { const ret_conv_49_len: number = bindings.getArrayLength(ret); const ret_conv_49_arr: ThreeTuple_OutPointCVec_MonitorEventZPublicKeyZ[] = new Array(ret_conv_49_len).fill(null); for (var x = 0; x < ret_conv_49_len; x++) { - const ret_conv_49: number = bindings.getU32ArrayElem(ret, x); + const ret_conv_49: bigint = bindings.getU64ArrayElem(ret, x); const ret_conv_49_hu_conv: ThreeTuple_OutPointCVec_MonitorEventZPublicKeyZ = new ThreeTuple_OutPointCVec_MonitorEventZPublicKeyZ(null, ret_conv_49); CommonBase.add_ref_from(ret_conv_49_hu_conv, this); ret_conv_49_arr[x] = ret_conv_49_hu_conv; diff --git a/ts/structs/WatchedOutput.mts b/ts/structs/WatchedOutput.mts index e9b0f649..f2528ba9 100644 --- a/ts/structs/WatchedOutput.mts +++ b/ts/structs/WatchedOutput.mts @@ -371,7 +371,7 @@ import * as bindings from '../bindings.mjs' */ export class WatchedOutput extends CommonBase { /* @internal */ - public constructor(_dummy: object, ptr: number) { + public constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.WatchedOutput_free); } @@ -399,7 +399,7 @@ export class WatchedOutput extends CommonBase { * Outpoint identifying the transaction output. */ public get_outpoint(): OutPoint { - const ret: number = bindings.WatchedOutput_get_outpoint(this.ptr); + const ret: bigint = bindings.WatchedOutput_get_outpoint(this.ptr); const ret_hu_conv: OutPoint = new OutPoint(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -409,7 +409,8 @@ export class WatchedOutput extends CommonBase { * Outpoint identifying the transaction output. */ public set_outpoint(val: OutPoint): void { - bindings.WatchedOutput_set_outpoint(this.ptr, val == null ? 0 : CommonBase.get_ptr_of(val) & ~1); + bindings.WatchedOutput_set_outpoint(this.ptr, val == null ? 0n : CommonBase.get_ptr_of(val)); + CommonBase.add_ref_from(this, val); } /** @@ -432,14 +433,15 @@ export class WatchedOutput extends CommonBase { * Constructs a new WatchedOutput given each field */ public static constructor_new(block_hash_arg: Uint8Array, outpoint_arg: OutPoint, script_pubkey_arg: Uint8Array): WatchedOutput { - const ret: number = bindings.WatchedOutput_new(bindings.encodeUint8Array(bindings.check_arr_len(block_hash_arg, 32)), outpoint_arg == null ? 0 : CommonBase.get_ptr_of(outpoint_arg) & ~1, bindings.encodeUint8Array(script_pubkey_arg)); + const ret: bigint = bindings.WatchedOutput_new(bindings.encodeUint8Array(bindings.check_arr_len(block_hash_arg, 32)), outpoint_arg == null ? 0n : CommonBase.get_ptr_of(outpoint_arg), bindings.encodeUint8Array(script_pubkey_arg)); const ret_hu_conv: WatchedOutput = new WatchedOutput(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, outpoint_arg); return ret_hu_conv; } - public clone_ptr(): number { - const ret: number = bindings.WatchedOutput_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.WatchedOutput_clone_ptr(this.ptr); return ret; } @@ -447,7 +449,7 @@ export class WatchedOutput extends CommonBase { * Creates a copy of the WatchedOutput */ public clone(): WatchedOutput { - const ret: number = bindings.WatchedOutput_clone(this.ptr); + const ret: bigint = bindings.WatchedOutput_clone(this.ptr); const ret_hu_conv: WatchedOutput = new WatchedOutput(null, ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv;